diff --git a/.github/workflows/01-build-stencil-targets.yml b/.github/workflows/01-build-stencil-targets.yml index bffbcad98..893def202 100644 --- a/.github/workflows/01-build-stencil-targets.yml +++ b/.github/workflows/01-build-stencil-targets.yml @@ -32,6 +32,7 @@ jobs: run: | if echo ${{ matrix.targets }} | grep -c "ngx-elements" then + cat ./packages/db-ui-elements-angular/dist/lib/package.json echo "framework=angular" >> $GITHUB_OUTPUT elif echo ${{ matrix.targets }} | grep -c "react-elements" then diff --git a/packages/db-ui-elements-angular/projects/lib/src/config.testing.ts b/packages/db-ui-elements-angular/projects/lib/src/config.testing.ts deleted file mode 100644 index 5138c7719..000000000 --- a/packages/db-ui-elements-angular/projects/lib/src/config.testing.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -type CompilerOptions = Partial<{ - providers: any[]; - useJit: boolean; - preserveWhitespaces: boolean; -}>; -export type ConfigureFn = (testBed: typeof TestBed) => void; - -export const configureTests = ( - configure: ConfigureFn, - compilerOptions: CompilerOptions = {} -) => { - const compilerConfig: CompilerOptions = { - preserveWhitespaces: false, - ...compilerOptions - }; - - const configuredTestBed = TestBed.configureCompiler(compilerConfig); - - configure(configuredTestBed); - - return configuredTestBed.compileComponents().then(() => configuredTestBed); -}; diff --git a/packages/db-ui-elements-angular/projects/lib/src/db-ui-elements-module.ts b/packages/db-ui-elements-angular/projects/lib/src/db-ui-elements-module.ts deleted file mode 100644 index 841552b7a..000000000 --- a/packages/db-ui-elements-angular/projects/lib/src/db-ui-elements-module.ts +++ /dev/null @@ -1,102 +0,0 @@ -import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; -import { defineCustomElements } from '@db-ui/elements/loader'; - -import { BooleanValueAccessor } from './boolean-value-accessor'; -import { - DbBrand, - DbBreadcrumb, - DbButton, - DbChip, - DbCheckbox, - DbDropdown, - DbAccordion, - DbFooter, - DbHeader, - DbIcon, - DbImage, - DbInput, - DbLink, - DbLinklist, - DbLogo, - DbMeta, - DbMetanavigation, - DbOverflowMenu, - DbPage, - DbProgress, - DbRadio, - DbSelect, - DbSidenavi, - DbTabBar, - DbTable, - DbTag, - DbTextarea, - DbToggle, - DbPagination, - DbCards, - DbCard, - DbTab, - DbHeadline, - DbLanguageSwitcher, - DbMainnavigation, - DbNotification, - DbNotifications -} from './components'; -import { SelectValueAccessor } from './select-value-accessor'; -import { TextValueAccessor } from './text-value-accessor'; - -defineCustomElements(window); - -const DECLARATIONS = [ - // proxies - DbBrand, - DbBreadcrumb, - DbButton, - DbCard, - DbCards, - DbChip, - DbCheckbox, - DbDropdown, - DbAccordion, - DbFooter, - DbHeader, - DbHeadline, - DbIcon, - DbImage, - DbInput, - DbLanguageSwitcher, - DbLink, - DbLinklist, - DbLogo, - DbMainnavigation, - DbMeta, - DbMetanavigation, - DbNotification, - DbNotifications, - DbOverflowMenu, - DbPage, - DbPagination, - DbProgress, - DbRadio, - DbSelect, - DbSidenavi, - DbTab, - DbTabBar, - DbTable, - DbTag, - DbTextarea, - DbToggle, - - // Value Accessors - BooleanValueAccessor, - SelectValueAccessor, - TextValueAccessor -]; - -@NgModule({ - declarations: DECLARATIONS, - exports: DECLARATIONS, - imports: [], - providers: [], - schemas: [CUSTOM_ELEMENTS_SCHEMA] -}) -export class DBUIElementsModule {} diff --git a/packages/db-ui-elements-angular/projects/lib/src/index.ts b/packages/db-ui-elements-angular/projects/lib/src/index.ts index 85ce3d295..2db7acc71 100644 --- a/packages/db-ui-elements-angular/projects/lib/src/index.ts +++ b/packages/db-ui-elements-angular/projects/lib/src/index.ts @@ -10,6 +10,3 @@ export * from './text-value-accessor'; export * from './select-value-accessor'; export * from './value-accessor'; export * from './index'; - -// PACKAGE MODULE -export { DBUIElementsModule } from './db-ui-elements-module'; diff --git a/packages/db-ui-elements-angular/projects/lib/src/jestGlobalMocks.ts b/packages/db-ui-elements-angular/projects/lib/src/jestGlobalMocks.ts deleted file mode 100644 index 487896f63..000000000 --- a/packages/db-ui-elements-angular/projects/lib/src/jestGlobalMocks.ts +++ /dev/null @@ -1,40 +0,0 @@ -Object.defineProperty(window, 'CSS', { value: null }); -Object.defineProperty(document, 'doctype', { - value: '' -}); -Object.defineProperty(window, 'getComputedStyle', { - value: () => { - return { - display: 'none', - appearance: ['-webkit-appearance'] - }; - } -}); -/** - * ISSUE: https://github.com/angular/material2/issues/7101 - * Workaround for JSDOM missing transform property - */ -Object.defineProperty(document.body.style, 'transform', { - value: () => { - return { - enumerable: true, - configurable: true - }; - } -}); - -window.matchMedia = - window.matchMedia || - (function () { - return { - matches: false, - addListener() {}, - removeListener() {} - }; - } as any); - -(window as any).CSSStyleSheet = class { - constructor() { - throw Error(); - } -} as any; diff --git a/packages/db-ui-elements-angular/projects/lib/src/public_api.ts b/packages/db-ui-elements-angular/projects/lib/src/public_api.ts deleted file mode 100644 index 8dbcfd7c9..000000000 --- a/packages/db-ui-elements-angular/projects/lib/src/public_api.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Public API Surface of lib - */ - -export * from './boolean-value-accessor'; -export * from './text-value-accessor'; -export * from './select-value-accessor'; -export * from './value-accessor'; -export * from './index'; diff --git a/packages/db-ui-elements-stencil/src/components/db-mainnavigation/db-mainnavigation.tsx b/packages/db-ui-elements-stencil/src/components/db-mainnavigation/db-mainnavigation.tsx index 6aeb495a8..ec5630c8c 100644 --- a/packages/db-ui-elements-stencil/src/components/db-mainnavigation/db-mainnavigation.tsx +++ b/packages/db-ui-elements-stencil/src/components/db-mainnavigation/db-mainnavigation.tsx @@ -99,6 +99,33 @@ const addAreaPopupsRecursive = (children: Element[]) => { styleUrl: 'db-mainnavigation.scss' }) export class DbMainnavigation { + get onlyLinks(): DbMainnavigationItemType[] { + return this._onlyLinks; + } + + set onlyLinks(value: DbMainnavigationItemType[]) { + this._onlyLinks = value; + } + get hasItemsWrapper(): boolean { + return this._hasItemsWrapper; + } + + set hasItemsWrapper(value: boolean) { + this._hasItemsWrapper = value; + } + get compData(): DbMainnavigationDataType[] { + return this._compData; + } + + set compData(value: DbMainnavigationDataType[]) { + this._compData = value; + } + set children(value: Element[]) { + this._children = value; + } + get children(): Element[] { + return this._children; + } /** * The site-name attribute can be set to have the site name for small screens. */ @@ -109,24 +136,26 @@ export class DbMainnavigation { */ @Prop({ reflect: true }) data?: string; - private hasItemsWrapper: boolean; + private _hasItemsWrapper: boolean; - private compData: DbMainnavigationDataType[]; + private _compData: DbMainnavigationDataType[]; - private children: Element[]; - private onlyLinks: DbMainnavigationItemType[]; + private _children: Element[]; + private _onlyLinks: DbMainnavigationItemType[]; @Element() host: HTMLDbMainnavigationElement; componentWillLoad() { if (this.data) { - this.compData = parseData(this.data); - } else { - this.children = Array.from(this.host.children); - this.onlyLinks = setupOnlyDbLinkNavigation(this.children); - if (this.children.find((child) => child.tagName.toLowerCase() === 'li')) { - this.hasItemsWrapper = true; - addAreaPopupsRecursive(this.children); + this._compData = parseData(this.data); + } else if (this.host) { + this._children = Array.from(this.host.children); + this._onlyLinks = setupOnlyDbLinkNavigation(this._children); + if ( + this._children.find((child) => child.tagName.toLowerCase() === 'li') + ) { + this._hasItemsWrapper = true; + addAreaPopupsRecursive(this._children); } else { this.host.innerHTML = ''; } @@ -144,19 +173,19 @@ export class DbMainnavigation { > {this.siteName} - {this.compData &&