chore(isct-351): add timeout for menu state open/close on start fix

ironSource · Jul 10, 2024 · 618ddc8 · 618ddc8
1 parent 374b921
commit 618ddc8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/projects/fusion-ui/components/navigation-menu/v4/navigation-menu.component.html b/projects/fusion-ui/components/navigation-menu/v4/navigation-menu.component.html
@@ -8,7 +8,7 @@
         [menuHoverMode]="primaryMenuItemMode === 'hoverToShowSecondaryItems'"
         (primaryMenuItemClicked)="onPrimaryMainMenuItemClicked($event)"
         (changeColorTheme)="onChangeColorTheme($event)"
-        (toggleMenu)="toggleMenu($event)"
+        (toggleMenu)="toggleMenu()"
         (resetSecondaryMenu)="resetSecondaryMenu()"
         (menuItemClick)="onMenuItemClicked($event, true)"
     ></fusion-navigation-primary-menu>

diff --git a/projects/fusion-ui/components/navigation-menu/v4/navigation-menu.component.ts b/projects/fusion-ui/components/navigation-menu/v4/navigation-menu.component.ts
@@ -86,7 +86,10 @@ export class NavigationMenuComponent implements OnInit {
             .subscribe(this.onNavigationMenuMouseLeave.bind(this));
 
         if (this.selectedPrimaryMenuItem?.type !== NavigationBarItemType.Main && this.secondaryMenuOpen$.getValue()) {
-            this.secondaryMenuOpen$.next(false);
+            // if started from primary menu item that have NOT children and secondary menu is open
+            setTimeout(() => {
+                this.secondaryMenuOpen$.next(false);
+            });
         }
     }
 
@@ -155,13 +158,11 @@ export class NavigationMenuComponent implements OnInit {
         this.setNetworkTheme(cssTheme);
     }
 
-    toggleMenu($event?: MouseEvent) {
+    toggleMenu() {
         if (!(this.secondaryMenuOpen$.getValue() && this.secondaryMenuExpanded$.getValue())) {
             this.secondaryMenuOpen$.next(!this.secondaryMenuOpen$.getValue() && this.secondaryMenuItems$.getValue().length > 0);
         }
-        if (($event?.currentTarget as Element)?.matches('.fu-menu-toggle')) {
-            this.storageService.set(StorageType.SessionStorage, MENU_CACHE_KEY, this.secondaryMenuOpen$.getValue());
-        }
+        this.storageService.set(StorageType.SessionStorage, MENU_CACHE_KEY, this.secondaryMenuOpen$.getValue());
         if (this.secondaryMenuOpen$.getValue()) {
             if (this.needRestoreSelectedState) {
                 this.setSecondaryMenu(this.selectedPrimaryMenuItem);

diff --git a/...omponents/navigation-menu/v4/navigation-primary-menu/navigation-primary-menu.component.ts b/...omponents/navigation-menu/v4/navigation-primary-menu/navigation-primary-menu.component.ts
@@ -128,7 +128,7 @@ export class NavigationPrimaryMenuComponent {
 
     menuToggleButtonClicked($event: MouseEvent) {
         this.menuToggleCollapsed$.next(this.menuOpened && !this.menuExpanded);
-        this.toggleMenu.emit($event);
+        this.toggleMenu.emit();
     }
 
     private parseNavigationBarItems(value: PrimaryMenuItem[]) {