support always showing header or footer

graycoreio · Jan 15, 2025 · b86543f · b86543f
1 parent 560ff20
commit b86543f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/apps/daffio/src/app/core/sidebar/containers/sidebar-viewport/sidebar-viewport.component.ts b/apps/daffio/src/app/core/sidebar/containers/sidebar-viewport/sidebar-viewport.component.ts
@@ -13,9 +13,9 @@ import {
 import {
   daffSidebarIsFloatingMode,
   DaffSidebarModeEnum,
-  DaffSidebarRegistration,
 } from '@daffodil/design/sidebar';
 
+import { DaffioSidebarRegistration } from '../../registration/type';
 import { DaffioSidebarService } from '../../services/sidebar.service';
 
 @Component({
@@ -29,7 +29,7 @@ export class DaffioSidebarViewportContainer implements OnInit {
   mode$: Observable<DaffSidebarModeEnum>;
   showSidebarHeader$: Observable<boolean>;
   showSidebarFooter$: Observable<boolean>;
-  component$: Observable<DaffSidebarRegistration>;
+  component$: Observable<DaffioSidebarRegistration>;
 
   ngOnInit() {
     this.component$ = this.sidebarService.activeRegistration$;
@@ -39,13 +39,13 @@ export class DaffioSidebarViewportContainer implements OnInit {
       this.component$,
       this.mode$,
     ]).pipe(
-      map(([component, mode]) => component?.header && daffSidebarIsFloatingMode(mode)),
+      map(([component, mode]) => component?.header && (component.alwaysShowHeader || daffSidebarIsFloatingMode(mode))),
     );
     this.showSidebarFooter$ = combineLatest([
       this.component$,
       this.mode$,
     ]).pipe(
-      map(([component, mode]) => component?.footer && daffSidebarIsFloatingMode(mode)),
+      map(([component, mode]) => component?.footer && (component.alwaysShowFooter || daffSidebarIsFloatingMode(mode))),
     );
   }
 

diff --git a/apps/daffio/src/app/core/sidebar/models/route.type.ts b/apps/daffio/src/app/core/sidebar/models/route.type.ts
@@ -1,20 +1,19 @@
 import { Route } from '@angular/router';
 
-import {
-  DaffSidebarModeEnum,
-  DaffSidebarRegistration,
-} from '@daffodil/design/sidebar';
+import { DaffSidebarModeEnum } from '@daffodil/design/sidebar';
+
+import { DaffioSidebarRegistration } from '../registration/type';
 
 export interface DaffioRouteWithSidebars extends Route {
   data?: Route['data'] & {
     /**
      * A collection of sidebars available on the current page.
      */
-    daffioSidebars?: Record<DaffSidebarRegistration['id'], DaffSidebarRegistration>;
+    daffioSidebars?: Record<DaffioSidebarRegistration['id'], DaffioSidebarRegistration>;
     /**
      * The sidebar that should be shown automatically (if any) when the viewport enters big tablet.
      */
-    daffioDockedSidebar?: DaffSidebarRegistration['id'];
+    daffioDockedSidebar?: DaffioSidebarRegistration['id'];
     sidebarMode?: DaffSidebarModeEnum;
   };
 }
diff --git a/apps/daffio/src/app/core/sidebar/registration/type.ts b/apps/daffio/src/app/core/sidebar/registration/type.ts
@@ -0,0 +1,12 @@
+import { DaffSidebarRegistration } from '@daffodil/design/sidebar';
+
+export interface DaffioSidebarRegistration extends DaffSidebarRegistration {
+  /**
+   * Whether to show the sidebar header regardless of sidebar mode.
+   */
+  alwaysShowHeader?: boolean;
+  /**
+   * Whether to show the sidebar footer regardless of sidebar mode.
+   */
+  alwaysShowFooter?: boolean;
+}