Merge branch 'w2p-89741_Add-themeable-components_conntribute-7.2' into w2p-91272_Add-themed-components-to-upstream-branch

src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts

@@ -0,0 +1,29 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { ExpandableNavbarSectionComponent } from './expandable-navbar-section.component';
+import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator';
+import { MenuID } from '../../shared/menu/initial-menus-state';
+
+/**
+ * Themed wrapper for ExpandableNavbarSectionComponent
+ */
+@Component({
+  /* tslint:disable:component-selector */
+  selector: 'li[ds-themed-expandable-navbar-section]',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+@rendersSectionForMenu(MenuID.PUBLIC, true)
+export class ThemedExpandableNavbarSectionComponent  extends ThemedComponent<ExpandableNavbarSectionComponent> {
+  protected getComponentName(): string {
+    return 'ExpandableNavbarSectionComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/navbar/expandable-navbar-section/expandable-navbar-section.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./expandable-navbar-section.component`);
+  }
+}

src/app/navbar/navbar.module.ts

@@ -7,6 +7,7 @@ import { CoreModule } from '../core/core.module';
 import { NavbarEffects } from './navbar.effects';
 import { NavbarSectionComponent } from './navbar-section/navbar-section.component';
 import { ExpandableNavbarSectionComponent } from './expandable-navbar-section/expandable-navbar-section.component';
+import { ThemedExpandableNavbarSectionComponent } from './expandable-navbar-section/themed-expandable-navbar-section.component';
 import { NavbarComponent } from './navbar.component';
 import { MenuModule } from '../shared/menu/menu.module';
 import { SharedModule } from '../shared/shared.module';
@@ -20,30 +21,31 @@ const effects = [
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
   NavbarSectionComponent,
-  ExpandableNavbarSectionComponent,
+  ThemedExpandableNavbarSectionComponent,
 ];
 
 @NgModule({
-    imports: [
-        CommonModule,
-        SharedModule,
-        MenuModule,
-        FormsModule,
-        EffectsModule.forFeature(effects),
-        CoreModule.forRoot()
-    ],
-    declarations: [
-        NavbarComponent,
-        ThemedNavbarComponent,
-        NavbarSectionComponent,
-        ExpandableNavbarSectionComponent
-    ],
-    providers: [],
-    exports: [
-        ThemedNavbarComponent,
-        NavbarSectionComponent,
-        ExpandableNavbarSectionComponent
-    ]
+  imports: [
+    CommonModule,
+    SharedModule,
+    MenuModule,
+    FormsModule,
+    EffectsModule.forFeature(effects),
+    CoreModule.forRoot()
+  ],
+  declarations: [
+    NavbarComponent,
+    ThemedNavbarComponent,
+    NavbarSectionComponent,
+    ExpandableNavbarSectionComponent,
+    ThemedExpandableNavbarSectionComponent,
+  ],
+  providers: [],
+  exports: [
+    ThemedNavbarComponent,
+    NavbarSectionComponent,
+    ThemedExpandableNavbarSectionComponent
+  ]
 })
 
 /**

src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts

@@ -0,0 +1,23 @@
+import { Component } from '@angular/core';
+import {
+  ExpandableNavbarSectionComponent as BaseComponent
+} from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component';
+import { slide } from '../../../../../app/shared/animations/slide';
+import { rendersSectionForMenu } from '../../../../../app/shared/menu/menu-section.decorator';
+import { MenuID } from '../../../../../app/shared/menu/initial-menus-state';
+
+/**
+ * Represents an expandable section in the navbar
+ */
+@Component({
+  /* tslint:disable:component-selector */
+  selector: 'li[ds-expandable-navbar-section]',
+  // templateUrl: './expandable-navbar-section.component.html',
+  templateUrl: '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.html',
+  // styleUrls: ['./expandable-navbar-section.component.scss'],
+  styleUrls: ['../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss'],
+  animations: [slide]
+})
+@rendersSectionForMenu(MenuID.PUBLIC, true)
+export class ExpandableNavbarSectionComponent extends BaseComponent {
+}

src/themes/custom/theme.module.ts

@@ -86,6 +86,9 @@ import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { FeedbackComponent } from './app/info/feedback/feedback.component';
 import { CommunityListComponent } from './app/community-list-page/community-list/community-list.component';
 import { AuthNavMenuComponent } from './app/shared/auth-nav-menu/auth-nav-menu.component';
+import {
+  ExpandableNavbarSectionComponent
+} from './app/navbar/expandable-navbar-section/expandable-navbar-section.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -131,6 +134,7 @@ const DECLARATIONS = [
   FeedbackComponent,
   CommunityListComponent,
   AuthNavMenuComponent,
+  ExpandableNavbarSectionComponent,
 ];
 
 @NgModule({