From d0212bd1b099055cc2e670568e1cb3454b111402 Mon Sep 17 00:00:00 2001
From: Will Martin <contact@willmartian.com>
Date: Thu, 1 Feb 2024 16:23:05 -0500
Subject: [PATCH] [CL-173] hide nav-group active styles when expanded (#7695)

* hide nav-group active styles when open

* update org-switcher to show child nav-item active styles
---
 .../app/secrets-manager/layout/org-switcher.component.html   | 2 +-
 libs/components/src/navigation/nav-group.component.html      | 1 +
 libs/components/src/navigation/nav-group.component.ts        | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.html
index d7a404bf1d..5e641b1c52 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.html
@@ -19,7 +19,7 @@
       [ariaLabel]="['organization' | i18n, org.name].join(' ')"
       [route]="['../', org.id]"
       (mainContentClicked)="toggle()"
-      [hideActiveStyles]="true"
+      [exactMatch]="true"
     >
       <i
         slot="end"
diff --git a/libs/components/src/navigation/nav-group.component.html b/libs/components/src/navigation/nav-group.component.html
index 118f78a186..d6af779aff 100644
--- a/libs/components/src/navigation/nav-group.component.html
+++ b/libs/components/src/navigation/nav-group.component.html
@@ -9,6 +9,7 @@
   (mainContentClicked)="mainContentClicked.emit()"
   [ariaLabel]="ariaLabel"
   [exactMatch]="exactMatch"
+  [hideActiveStyles]="parentHideActiveStyles"
 >
   <ng-template #button>
     <button
diff --git a/libs/components/src/navigation/nav-group.component.ts b/libs/components/src/navigation/nav-group.component.ts
index 8a7c79be97..868f3e1dd8 100644
--- a/libs/components/src/navigation/nav-group.component.ts
+++ b/libs/components/src/navigation/nav-group.component.ts
@@ -27,6 +27,11 @@ export class NavGroupComponent extends NavBaseComponent implements AfterContentI
   })
   nestedItems!: QueryList<NavItemComponent>;
 
+  /** The parent nav item should not show active styles when open. */
+  protected get parentHideActiveStyles(): boolean {
+    return this.hideActiveStyles || this.open;
+  }
+
   /**
    * UID for `[attr.aria-controls]`
    */