From b0ee9efbbda37bc7caf99008a61da35493bf340b Mon Sep 17 00:00:00 2001
From: addison <addisonbeck1@gmail.com>
Date: Tue, 26 Apr 2022 09:12:33 -0400
Subject: [PATCH] [bug] Add aria-controls attributes to supplement
 aria-expanded attributes

---
 .../components/collection-filter.component.html     | 10 ++++++++--
 .../components/folder-filter.component.html         | 11 +++++++++--
 .../components/organization-filter.component.html   | 13 ++++++++++---
 .../components/type-filter.component.html           |  3 ++-
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/app/modules/vault-filter/components/collection-filter.component.html b/src/app/modules/vault-filter/components/collection-filter.component.html
index e5107cfa..40b969bd 100644
--- a/src/app/modules/vault-filter/components/collection-filter.component.html
+++ b/src/app/modules/vault-filter/components/collection-filter.component.html
@@ -3,6 +3,7 @@
     <button
       class="no-btn"
       [attr.aria-expanded]="!isCollapsed(collectionsGrouping)"
+      aria-controls="collection-filters"
       (click)="toggleCollapse(collectionsGrouping)"
       appA11yTitle="{{ 'toggleCollapse' | i18n }}"
     >
@@ -17,7 +18,7 @@
     </button>
     <h2>&nbsp;{{ collectionsGrouping.name | i18n }}</h2>
   </div>
-  <ul *ngIf="!isCollapsed(collectionsGrouping)" class="filter-options">
+  <ul id="collection-filters" *ngIf="!isCollapsed(collectionsGrouping)" class="filter-options">
     <ng-template #recursiveCollections let-collections>
       <li
         class="filter-option"
@@ -29,6 +30,7 @@
             *ngIf="c.children.length"
             class="toggle-button"
             [attr.aria-expanded]="!isCollapsed(c.node)"
+            [attr.aria-controls]="c.node.name + '_children'"
             (click)="toggleCollapse(c.node)"
             appA11yTitle="{{ 'toggleCollapse' | i18n }}"
           >
@@ -54,7 +56,11 @@
             &nbsp;{{ c.node.name }}
           </button>
         </span>
-        <ul class="nested-filter-options" *ngIf="c.children.length && !isCollapsed(c.node)">
+        <ul
+          [id]="c.node.name + '_children'"
+          class="nested-filter-options"
+          *ngIf="c.children.length && !isCollapsed(c.node)"
+        >
           <ng-container
             *ngTemplateOutlet="recursiveCollections; context: { $implicit: c.children }"
           >
diff --git a/src/app/modules/vault-filter/components/folder-filter.component.html b/src/app/modules/vault-filter/components/folder-filter.component.html
index 7c14917d..ba5c5aaf 100644
--- a/src/app/modules/vault-filter/components/folder-filter.component.html
+++ b/src/app/modules/vault-filter/components/folder-filter.component.html
@@ -3,6 +3,7 @@
     <button
       class="toggle-button"
       [attr.aria-expanded]="!isCollapsed(foldersGrouping)"
+      aria-controls="folder-filters"
       (click)="toggleCollapse(foldersGrouping)"
       appA11yTitle="{{ 'toggleCollapse' | i18n }}"
     >
@@ -20,7 +21,7 @@
       <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
     </button>
   </div>
-  <ul class="filter-options" *ngIf="!isCollapsed(foldersGrouping)">
+  <ul id="folder-filters" class="filter-options" *ngIf="!isCollapsed(foldersGrouping)">
     <ng-template #recursiveFolders let-folders>
       <li
         *ngFor="let f of folders"
@@ -35,6 +36,8 @@
             *ngIf="f.children.length"
             (click)="toggleCollapse(f.node)"
             appA11yTitle="{{ 'toggleCollapse' | i18n }}"
+            [attr.aria-expanded]="!isCollapsed(f.node)"
+            [attr.aria-controls]="f.node.name + '_children'"
           >
             <i
               class="bwi bwi-fw"
@@ -62,7 +65,11 @@
             <i class="bwi bwi-pencil bwi-fw" aria-hidden="true"></i>
           </button>
         </span>
-        <ul class="nested-filter-options" *ngIf="f.children.length && !isCollapsed(f.node)">
+        <ul
+          [id]="f.node.name + '_children'"
+          class="nested-filter-options"
+          *ngIf="f.children.length && !isCollapsed(f.node)"
+        >
           <ng-container *ngTemplateOutlet="recursiveFolders; context: { $implicit: f.children }">
           </ng-container>
         </ul>
diff --git a/src/app/modules/vault-filter/components/organization-filter.component.html b/src/app/modules/vault-filter/components/organization-filter.component.html
index 076a7e8e..4e667a55 100644
--- a/src/app/modules/vault-filter/components/organization-filter.component.html
+++ b/src/app/modules/vault-filter/components/organization-filter.component.html
@@ -6,6 +6,8 @@
           class="toggle-button"
           appA11yTitle="{{ 'toggleCollapse' | i18n }}"
           (click)="toggleCollapse()"
+          [attr.aria-expanded]="!isCollapsed"
+          aria-controls="organization-filters"
         >
           <i
             class="bwi bwi-fw"
@@ -24,7 +26,7 @@
           <h2>&nbsp;{{ organizationGrouping.name | i18n }}</h2>
         </button>
       </div>
-      <ul *ngIf="!isCollapsed" class="filter-options no-margin">
+      <ul id="organization-filters" *ngIf="!isCollapsed" class="filter-options no-margin">
         <li
           class="filter-option"
           *ngFor="let organization of organizations"
@@ -45,7 +47,12 @@
     </ng-container>
     <ng-container *ngSwitchCase="'organizationMember'">
       <div class="filter-heading" [ngClass]="{ active: !hasActiveFilter }">
-        <button appA11yTitle="{{ 'toggleCollapse' | i18n }}" (click)="toggleCollapse()">
+        <button
+          appA11yTitle="{{ 'toggleCollapse' | i18n }}"
+          (click)="toggleCollapse()"
+          [attr.aria-expanded]="!isCollapsed"
+          aria-controls="organization-filters"
+        >
           <i
             class="bwi bwi-fw"
             aria-hidden="true"
@@ -63,7 +70,7 @@
           <h2>&nbsp;{{ organizationGrouping.name | i18n }}</h2>
         </button>
       </div>
-      <ul *ngIf="!isCollapsed" class="filter-options no-margin">
+      <ul id="organization-filters" *ngIf="!isCollapsed" class="filter-options no-margin">
         <li class="filter-option" [ngClass]="{ active: activeFilter.myVaultOnly }">
           <span class="filter-buttons">
             <button
diff --git a/src/app/modules/vault-filter/components/type-filter.component.html b/src/app/modules/vault-filter/components/type-filter.component.html
index 808681df..d414e1cf 100644
--- a/src/app/modules/vault-filter/components/type-filter.component.html
+++ b/src/app/modules/vault-filter/components/type-filter.component.html
@@ -3,6 +3,7 @@
     class="no-btn"
     (click)="toggleCollapse()"
     aria-expanded="!isCollapsed"
+    aria-controls="type-filters"
     appA11yTitle="{{ 'toggleCollapse' | i18n }}"
   >
     <i
@@ -16,7 +17,7 @@
   </button>
   <h2>&nbsp;{{ typesNode.name | i18n }}</h2>
 </div>
-<ul *ngIf="!isCollapsed" class="filter-options">
+<ul id="type-filters" *ngIf="!isCollapsed" class="filter-options">
   <li
     class="filter-option"
     [ngClass]="{ active: activeFilter.cipherType === cipherTypeEnum.Login }"