From c71f441cbc73a148b3d2a6bb951bda33fc38c76d Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Sun, 8 May 2022 11:24:02 +0100
Subject: [PATCH 1/6] Make totp countdown `aria-hidden`, add copy of countdown
 as `sr-only` inside totp button, only make it conditionally "exist" on parent
 focus

---
 apps/browser/src/popup/scss/misc.scss            | 4 ++++
 apps/browser/src/popup/vault/view.component.html | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/browser/src/popup/scss/misc.scss b/apps/browser/src/popup/scss/misc.scss
index 8752ad70882f..9b9edce8a612 100644
--- a/apps/browser/src/popup/scss/misc.scss
+++ b/apps/browser/src/popup/scss/misc.scss
@@ -146,6 +146,10 @@ p.lead {
   border: 0 !important;
 }
 
+:not(:focus)>.exists-only-on-parent-focus {
+  display: none;
+}
+
 .password-wrapper {
   overflow-wrap: break-word;
   white-space: pre-wrap;
diff --git a/apps/browser/src/popup/vault/view.component.html b/apps/browser/src/popup/vault/view.component.html
index fa69a3c34ae8..dd5deb27e40c 100644
--- a/apps/browser/src/popup/vault/view.component.html
+++ b/apps/browser/src/popup/vault/view.component.html
@@ -151,7 +151,7 @@ <h2 class="box-header">
             >
             <span class="totp-code">{{ totpCodeFormatted }}</span>
           </div>
-          <span class="totp-countdown">
+          <span class="totp-countdown" aria-hidden="true">
             <span class="totp-sec">{{ totpSec }}</span>
             <svg>
               <g>
@@ -175,6 +175,7 @@ <h2 class="box-header">
               (click)="copy(totpCode, 'verificationCodeTotp', 'TOTP')"
             >
               <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
+              <span class="sr-only exists-only-on-parent-focus" aria-live="polite">{{ totpSec }}</span>
             </button>
           </div>
         </div>

From 05213cb2ecb1de80d6017c89051ab9c0cd7b2a34 Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Sun, 8 May 2022 11:30:28 +0100
Subject: [PATCH 2/6] Make exact same changes to desktop totp

---
 apps/desktop/src/app/vault/view.component.html | 3 ++-
 apps/desktop/src/scss/misc.scss                | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/desktop/src/app/vault/view.component.html b/apps/desktop/src/app/vault/view.component.html
index a033cdd8272f..41bacc9a2cfe 100644
--- a/apps/desktop/src/app/vault/view.component.html
+++ b/apps/desktop/src/app/vault/view.component.html
@@ -111,7 +111,7 @@
               >
               <span class="totp-code">{{ totpCodeFormatted }}</span>
             </div>
-            <span class="totp-countdown">
+            <span class="totp-countdown" aria-hidden="true">
               <span class="totp-sec">{{ totpSec }}</span>
               <svg>
                 <g>
@@ -135,6 +135,7 @@
                 (click)="copy(totpCode, 'verificationCodeTotp', 'TOTP')"
               >
                 <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
+                <span class="sr-only exists-only-on-parent-focus" aria-live="polite">{{ totpSec }}</span>
               </button>
             </div>
           </div>
diff --git a/apps/desktop/src/scss/misc.scss b/apps/desktop/src/scss/misc.scss
index 250ecc1973e8..54689a507eb4 100644
--- a/apps/desktop/src/scss/misc.scss
+++ b/apps/desktop/src/scss/misc.scss
@@ -112,6 +112,10 @@ p.lead {
   border: 0 !important;
 }
 
+:not(:focus)>.exists-only-on-parent-focus {
+  display: none;
+}
+
 .totp {
   .totp-code {
     font-family: $font-family-monospace;

From 5a9109720729c24f37e75e45d002c459356acb44 Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Sun, 8 May 2022 13:16:59 +0100
Subject: [PATCH 3/6] Tweak copy button accessible name approach

instead of `aria-label`, which overrides the content of the button and, because JAWS has trouble announcing the live region in the desktop app, results in JAWS not announcing ANY countdown at all, this at least announces the current countdown number when the button receives focus in JAWS
---
 apps/browser/src/popup/vault/view.component.html | 3 ++-
 apps/desktop/src/app/vault/view.component.html   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/browser/src/popup/vault/view.component.html b/apps/browser/src/popup/vault/view.component.html
index dd5deb27e40c..8be8e8f0e013 100644
--- a/apps/browser/src/popup/vault/view.component.html
+++ b/apps/browser/src/popup/vault/view.component.html
@@ -171,10 +171,11 @@ <h2 class="box-header">
               type="button"
               class="row-btn"
               appStopClick
-              appA11yTitle="{{ 'copyVerificationCode' | i18n }}"
+              title="{{ 'copyVerificationCode' | i18n }}"
               (click)="copy(totpCode, 'verificationCodeTotp', 'TOTP')"
             >
               <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
+              <span class="sr-only">{{ 'copyValue' | i18n }}</span>
               <span class="sr-only exists-only-on-parent-focus" aria-live="polite">{{ totpSec }}</span>
             </button>
           </div>
diff --git a/apps/desktop/src/app/vault/view.component.html b/apps/desktop/src/app/vault/view.component.html
index 41bacc9a2cfe..d85323426412 100644
--- a/apps/desktop/src/app/vault/view.component.html
+++ b/apps/desktop/src/app/vault/view.component.html
@@ -131,10 +131,11 @@
                 type="button"
                 class="row-btn"
                 appStopClick
-                appA11yTitle="{{ 'copyValue' | i18n }}"
+                title="{{ 'copyValue' | i18n }}"
                 (click)="copy(totpCode, 'verificationCodeTotp', 'TOTP')"
               >
                 <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
+                <span class="sr-only">{{ 'copyValue' | i18n }}</span>
                 <span class="sr-only exists-only-on-parent-focus" aria-live="polite">{{ totpSec }}</span>
               </button>
             </div>

From 2f8c09c005f54f1de1f5ef414fa2eb3319a95ce4 Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Sun, 8 May 2022 14:05:50 +0100
Subject: [PATCH 4/6] Add `aria-atomic="true"`

avoid JAWS/Firefox only announcing the specific digit that updates, rather than the number as a whole
---
 apps/browser/src/popup/vault/view.component.html | 2 +-
 apps/desktop/src/app/vault/view.component.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/browser/src/popup/vault/view.component.html b/apps/browser/src/popup/vault/view.component.html
index 8be8e8f0e013..dac924f4c229 100644
--- a/apps/browser/src/popup/vault/view.component.html
+++ b/apps/browser/src/popup/vault/view.component.html
@@ -176,7 +176,7 @@ <h2 class="box-header">
             >
               <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
               <span class="sr-only">{{ 'copyValue' | i18n }}</span>
-              <span class="sr-only exists-only-on-parent-focus" aria-live="polite">{{ totpSec }}</span>
+              <span class="sr-only exists-only-on-parent-focus" aria-live="polite" aria-atomic="true">{{ totpSec }}</span>
             </button>
           </div>
         </div>
diff --git a/apps/desktop/src/app/vault/view.component.html b/apps/desktop/src/app/vault/view.component.html
index d85323426412..85e33bfa89c3 100644
--- a/apps/desktop/src/app/vault/view.component.html
+++ b/apps/desktop/src/app/vault/view.component.html
@@ -136,7 +136,7 @@
               >
                 <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
                 <span class="sr-only">{{ 'copyValue' | i18n }}</span>
-                <span class="sr-only exists-only-on-parent-focus" aria-live="polite">{{ totpSec }}</span>
+                <span class="sr-only exists-only-on-parent-focus" aria-live="polite" aria-atomic="true">{{ totpSec }}</span>
               </button>
             </div>
           </div>

From 10b68048a3db6a6099bc711f97eea09958180d00 Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Tue, 21 Jun 2022 20:14:07 +0100
Subject: [PATCH 5/6] Update, run prettier, lint

---
 apps/browser/jslib                               | 2 +-
 apps/browser/src/popup/scss/misc.scss            | 2 +-
 apps/browser/src/popup/vault/view.component.html | 9 +++++++--
 apps/cli/jslib                                   | 1 +
 apps/desktop/jslib                               | 2 +-
 apps/desktop/src/app/vault/view.component.html   | 9 +++++++--
 apps/desktop/src/scss/misc.scss                  | 2 +-
 apps/web/jslib                                   | 1 +
 8 files changed, 20 insertions(+), 8 deletions(-)
 create mode 160000 apps/cli/jslib
 create mode 160000 apps/web/jslib

diff --git a/apps/browser/jslib b/apps/browser/jslib
index 2f54893854da..1ea2824c24ae 160000
--- a/apps/browser/jslib
+++ b/apps/browser/jslib
@@ -1 +1 @@
-Subproject commit 2f54893854da61a742f87b02ec4328f7933bfe27
+Subproject commit 1ea2824c24aeb7188046d3cc4313b3550c90bb07
diff --git a/apps/browser/src/popup/scss/misc.scss b/apps/browser/src/popup/scss/misc.scss
index 9b9edce8a612..788bcbb50b5c 100644
--- a/apps/browser/src/popup/scss/misc.scss
+++ b/apps/browser/src/popup/scss/misc.scss
@@ -146,7 +146,7 @@ p.lead {
   border: 0 !important;
 }
 
-:not(:focus)>.exists-only-on-parent-focus {
+:not(:focus) > .exists-only-on-parent-focus {
   display: none;
 }
 
diff --git a/apps/browser/src/popup/vault/view.component.html b/apps/browser/src/popup/vault/view.component.html
index dac924f4c229..1571c678df0a 100644
--- a/apps/browser/src/popup/vault/view.component.html
+++ b/apps/browser/src/popup/vault/view.component.html
@@ -175,8 +175,13 @@ <h2 class="box-header">
               (click)="copy(totpCode, 'verificationCodeTotp', 'TOTP')"
             >
               <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-              <span class="sr-only">{{ 'copyValue' | i18n }}</span>
-              <span class="sr-only exists-only-on-parent-focus" aria-live="polite" aria-atomic="true">{{ totpSec }}</span>
+              <span class="sr-only">{{ "copyValue" | i18n }}</span>
+              <span
+                class="sr-only exists-only-on-parent-focus"
+                aria-live="polite"
+                aria-atomic="true"
+                >{{ totpSec }}</span
+              >
             </button>
           </div>
         </div>
diff --git a/apps/cli/jslib b/apps/cli/jslib
new file mode 160000
index 000000000000..77ca5762e10d
--- /dev/null
+++ b/apps/cli/jslib
@@ -0,0 +1 @@
+Subproject commit 77ca5762e10d1892ee09186bccec2f3a025977f6
diff --git a/apps/desktop/jslib b/apps/desktop/jslib
index 2f54893854da..1ea2824c24ae 160000
--- a/apps/desktop/jslib
+++ b/apps/desktop/jslib
@@ -1 +1 @@
-Subproject commit 2f54893854da61a742f87b02ec4328f7933bfe27
+Subproject commit 1ea2824c24aeb7188046d3cc4313b3550c90bb07
diff --git a/apps/desktop/src/app/vault/view.component.html b/apps/desktop/src/app/vault/view.component.html
index 85e33bfa89c3..164e0ed1ef35 100644
--- a/apps/desktop/src/app/vault/view.component.html
+++ b/apps/desktop/src/app/vault/view.component.html
@@ -135,8 +135,13 @@
                 (click)="copy(totpCode, 'verificationCodeTotp', 'TOTP')"
               >
                 <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-                <span class="sr-only">{{ 'copyValue' | i18n }}</span>
-                <span class="sr-only exists-only-on-parent-focus" aria-live="polite" aria-atomic="true">{{ totpSec }}</span>
+                <span class="sr-only">{{ "copyValue" | i18n }}</span>
+                <span
+                  class="sr-only exists-only-on-parent-focus"
+                  aria-live="polite"
+                  aria-atomic="true"
+                  >{{ totpSec }}</span
+                >
               </button>
             </div>
           </div>
diff --git a/apps/desktop/src/scss/misc.scss b/apps/desktop/src/scss/misc.scss
index 54689a507eb4..1296a50bd6d0 100644
--- a/apps/desktop/src/scss/misc.scss
+++ b/apps/desktop/src/scss/misc.scss
@@ -112,7 +112,7 @@ p.lead {
   border: 0 !important;
 }
 
-:not(:focus)>.exists-only-on-parent-focus {
+:not(:focus) > .exists-only-on-parent-focus {
   display: none;
 }
 
diff --git a/apps/web/jslib b/apps/web/jslib
new file mode 160000
index 000000000000..f4066b4f58af
--- /dev/null
+++ b/apps/web/jslib
@@ -0,0 +1 @@
+Subproject commit f4066b4f58af2e6e4ce82275b72a2a8501f25e78

From 6af2a1e96c2c954900db418d8cfbd4e8836637c8 Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Tue, 21 Jun 2022 22:16:04 +0100
Subject: [PATCH 6/6] Remove orphaned jslibs

---
 apps/browser/jslib | 1 -
 apps/cli/jslib     | 1 -
 apps/desktop/jslib | 1 -
 apps/web/jslib     | 1 -
 4 files changed, 4 deletions(-)
 delete mode 160000 apps/browser/jslib
 delete mode 160000 apps/cli/jslib
 delete mode 160000 apps/desktop/jslib
 delete mode 160000 apps/web/jslib

diff --git a/apps/browser/jslib b/apps/browser/jslib
deleted file mode 160000
index 1ea2824c24ae..000000000000
--- a/apps/browser/jslib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1ea2824c24aeb7188046d3cc4313b3550c90bb07
diff --git a/apps/cli/jslib b/apps/cli/jslib
deleted file mode 160000
index 77ca5762e10d..000000000000
--- a/apps/cli/jslib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 77ca5762e10d1892ee09186bccec2f3a025977f6
diff --git a/apps/desktop/jslib b/apps/desktop/jslib
deleted file mode 160000
index 1ea2824c24ae..000000000000
--- a/apps/desktop/jslib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1ea2824c24aeb7188046d3cc4313b3550c90bb07
diff --git a/apps/web/jslib b/apps/web/jslib
deleted file mode 160000
index f4066b4f58af..000000000000
--- a/apps/web/jslib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f4066b4f58af2e6e4ce82275b72a2a8501f25e78