From 4ae43048cd8fc3a54e9e6602a958c9b1e0e1018e Mon Sep 17 00:00:00 2001
From: Leslie Xiong <lxiong@livefront.com>
Date: Mon, 5 Jan 2026 14:04:00 -0500
Subject: [PATCH] applied `forceActiveStyles` and `disableToggleOnClick` to
 `bit-nav-group` components

---
 .../vault-filter/filters/collection-filter.component.html     | 3 ++-
 .../vault-filter/filters/folder-filter.component.html         | 2 ++
 .../vault-filter/filters/organization-filter.component.html   | 4 +++-
 .../vault-v3/vault-filter/filters/type-filter.component.html  | 2 ++
 .../app/vault-v3/vault-filter/vault-filter.component.html     | 4 ++++
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/collection-filter.component.html b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/collection-filter.component.html
index ccb6eca3a0f..2ee78adcfb0 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/collection-filter.component.html
+++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/collection-filter.component.html
@@ -1,11 +1,12 @@
 @if (collection().children.length) {
   <bit-nav-group
     [icon]="collection().node.icon"
-    [class.active]="isActive()"
     [text]="displayName()"
     variant="tree"
     [appA11yTitle]="displayName()"
     (click)="applyFilter($event)"
+    [forceActiveStyles]="isActive()"
+    [disableToggleOnClick]="true"
   >
     @for (childCollection of collection().children; track childCollection.node.id) {
       <app-collection-filter [collection]="childCollection" [activeFilter]="activeFilter()" />
diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/folder-filter.component.html b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/folder-filter.component.html
index 0867c509c2b..f063167c48f 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/folder-filter.component.html
+++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/folder-filter.component.html
@@ -6,6 +6,8 @@
     variant="tree"
     [appA11yTitle]="displayName()"
     (click)="applyFilter($event)"
+    [forceActiveStyles]="isActive()"
+    [disableToggleOnClick]="true"
   >
     @if (folder()?.node.id) {
       <button
diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.html b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.html
index 79f89a39260..e4e11b82a8a 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.html
+++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.html
@@ -3,10 +3,12 @@
     icon="bwi-filter"
     (click)="applyAllVaultsFilter()"
     [text]="'allVaults' | i18n"
-    [attr.aria-pressed]="activeFilter()?.organizationId === null"
+    [attr.aria-pressed]="!activeFilter()?.selectedOrganizationNode"
     [appA11yTitle]="'allVaults' | i18n"
     variant="tree"
     [open]="true"
+    [forceActiveStyles]="!activeFilter()?.selectedOrganizationNode"
+    [disableToggleOnClick]="true"
   >
     @for (organization of organizations().children ?? []; track organization.node.id) {
       <bit-nav-item
diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/type-filter.component.html b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/type-filter.component.html
index 1c9e58e0656..c9807e62066 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/type-filter.component.html
+++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/type-filter.component.html
@@ -6,6 +6,8 @@
   [appA11yTitle]="'allItems' | i18n"
   variant="tree"
   [open]="true"
+  [forceActiveStyles]="activeFilter()?.selectedCipherTypeNode?.node?.id === 'AllItems'"
+  [disableToggleOnClick]="true"
 >
   @for (typeFilter of typeFilters$ | async; track typeFilter) {
     <bit-nav-item
diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/vault-filter.component.html b/apps/desktop/src/vault/app/vault-v3/vault-filter/vault-filter.component.html
index a782fe6c30e..fb3a67eeb46 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault-filter/vault-filter.component.html
+++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/vault-filter.component.html
@@ -18,6 +18,8 @@
         [text]="'collections' | i18n"
         variant="tree"
         [appA11yTitle]="'collections' | i18n"
+        [forceActiveStyles]="activeFilter()?.selectedCollectionNode"
+        [disableToggleOnClick]="true"
       >
         @for (collection of (collections$ | async)?.children ?? []; track collection.node.id) {
           <app-collection-filter [activeFilter]="activeFilter()" [collection]="collection" />
@@ -29,6 +31,8 @@
       [text]="'folders' | i18n"
       variant="tree"
       [appA11yTitle]="'folders' | i18n"
+      [forceActiveStyles]="activeFilter()?.selectedFolderNode"
+      [disableToggleOnClick]="true"
     >
       @for (folder of (folders$ | async)?.children ?? []; track folder.node.id) {
         <app-folder-filter