fix(vertical-nav): close secondary and tertiary menus upon leaf node …

…click (#396) Fixes #372
patternfly · Jun 22, 2018 · 3117934 · 3117934
1 parent d7e5f59
commit 3117934
Showing 1 changed file with 21 additions and 7 deletions.
diff --git a/src/app/navigation/vertical-navigation/vertical-navigation.component.ts b/src/app/navigation/vertical-navigation/vertical-navigation.component.ts
@@ -697,10 +697,9 @@ export class VerticalNavigationComponent implements OnInit, OnDestroy {
 
   private navigateToItem(item: VerticalNavigationItem): void {
     let navItem = this.getFirstNavigateChild(item);
-    let navTo;
     if (navItem) {
       this._showMobileNav = false;
-      navTo = navItem.url;
+      let navTo = navItem.url;
       if (navTo) {
         this.router.navigateByUrl(navTo);
       }
@@ -709,17 +708,32 @@ export class VerticalNavigationComponent implements OnInit, OnDestroy {
       }
     }
 
-    if (this.itemClickEvent) {
-      this.itemClickEvent.emit(item);
-    }
-
     if (this.updateActiveItemsOnClick) {
       this.clearActiveItems();
       navItem.trackActiveState = true;
       this.setParentActive(navItem);
+    }
+
+    // Dismiss items (leaf nodes) immediately upon click
+    if (!item.children) {
+      this._hoverSecondaryNav = false;
+      this._hoverTertiaryNav = false;
+      this.items.forEach((primary) => {
+        if (!this.persistentSecondary) {
+          primary.trackHoverState = false;
+        }
+        if (primary.children !== undefined) {
+          primary.children.forEach((secondary) => {
+            if (!this.persistentSecondary) {
+              secondary.trackHoverState = false;
+            }
+          });
+        }
+      });
+    } else {
       this.setSecondaryItemVisible();
     }
-    this.setSecondaryItemVisible();
+    this.itemClickEvent.emit(item);
   }
 
   private primaryHover(): boolean {