diff --git a/src/app/theme/components/baSidebar/baSidebar.component.ts b/src/app/theme/components/baSidebar/baSidebar.component.ts index 08f2aa2b..225f09e1 100644 --- a/src/app/theme/components/baSidebar/baSidebar.component.ts +++ b/src/app/theme/components/baSidebar/baSidebar.component.ts @@ -16,7 +16,7 @@ export class BaSidebar { public menuItems:Array; public menuHeight:number; - public isMenuCollapsed:boolean; + public isMenuCollapsed:boolean = false; public showHoverElem:boolean; public hoverElemHeight:number; @@ -33,6 +33,7 @@ export class BaSidebar { this.menuItems = this._sidebarService.getMenuItems(); this._router.root.subscribe((path) => this._selectMenuItem(path)); + this._state.subscribe('menu.isCollapsed', (isCollapsed) => { this.isMenuCollapsed = isCollapsed; }); } public ngOnInit():void { @@ -65,7 +66,7 @@ export class BaSidebar { this.menuCollapseStateChange(true); } - public menuCollapseStateChange(isCollapsed):void { + public menuCollapseStateChange(isCollapsed:boolean):void { this.isMenuCollapsed = isCollapsed; this._state.notifyDataChanged('menu.isCollapsed', this.isMenuCollapsed); } @@ -88,13 +89,13 @@ export class BaSidebar { if (this.isMenuCollapsed) { this.menuExpand(); if (!item.expanded) { - item.expanded = !item.expanded; - submenu.slideToggle(); + item.expanded = true; } } else { item.expanded = !item.expanded; submenu.slideToggle(); } + return false; } @@ -106,5 +107,9 @@ export class BaSidebar { let currentMenu = this._sidebarService.setRouter(this._router).selectMenuItem(this.menuItems, currentPath); this._state.notifyDataChanged('menu.activeLink', currentMenu); + // hide menu after natigation on mobile devises + if (this._shouldMenuCollapse()) { + this.menuCollapse(); + } } } diff --git a/src/app/theme/components/baSidebar/baSidebar.scss b/src/app/theme/components/baSidebar/baSidebar.scss index 6010ed8a..5dab9d42 100644 --- a/src/app/theme/components/baSidebar/baSidebar.scss +++ b/src/app/theme/components/baSidebar/baSidebar.scss @@ -49,6 +49,13 @@ $angle-right: "\f101"; } } +.ba-sidebar-item-expanded { + > ul.al-sidebar-sublist { + display: block!important; + } + +} + .al-sidebar-list-item, .ba-sidebar-sublist-item { &.ba-sidebar-item-expanded { > .al-sidebar-list-link {