From babfa30c68bca243fc9bac4e33c8af8005dbad2d Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Wed, 17 Aug 2022 09:42:26 +0100
Subject: [PATCH] [PS-1222] Remove `appBlurClick` throughout the popup and web
 code (#3208)

* Remove appBlurClick throughout the popup code

`appBlurClick` leads to focus being lost/reset for assistive technology users. It should not be necessary in any case - if focus does need to move after an action, explicitly set it somewhere programmatically using `focus()` rather than relying on browser heuristics

* Remove now redundant blur-click directive
---
 .../src/popup/vault/vault-select.component.html      |  9 +--------
 .../app/components/password-reprompt.component.html  |  2 +-
 libs/angular/src/directives/blur-click.directive.ts  | 12 ------------
 libs/angular/src/jslib.module.ts                     |  3 ---
 4 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 libs/angular/src/directives/blur-click.directive.ts

diff --git a/apps/browser/src/popup/vault/vault-select.component.html b/apps/browser/src/popup/vault/vault-select.component.html
index 2101b7c019f..ec4d4ff9e3e 100644
--- a/apps/browser/src/popup/vault/vault-select.component.html
+++ b/apps/browser/src/popup/vault/vault-select.component.html
@@ -26,26 +26,19 @@
     >
       <button
         appStopClick
-        appBlurClick
         (click)="selectAllVaults()"
         [ngClass]="{ active: !myVaultOnly && !selectOrganizationId }"
       >
         <i class="bwi bwi-fw bwi-filter" aria-hidden="true"></i>
         &nbsp;{{ "allVaults" | i18n }}
       </button>
-      <button
-        *ngIf="!enforcePersonalOwnwership"
-        appStopClick
-        appBlurClick
-        (click)="selectMyVault()"
-      >
+      <button *ngIf="!enforcePersonalOwnwership" appStopClick (click)="selectMyVault()">
         <i class="bwi bwi-fw bwi-user" aria-hidden="true"></i>
         &nbsp;{{ "myVault" | i18n }}
       </button>
       <button
         *ngFor="let organization of organizations"
         appStopClick
-        appBlurClick
         (click)="selectOrganization(organization)"
       >
         <i
diff --git a/apps/web/src/app/components/password-reprompt.component.html b/apps/web/src/app/components/password-reprompt.component.html
index b2c068e9025..c61fcc394db 100644
--- a/apps/web/src/app/components/password-reprompt.component.html
+++ b/apps/web/src/app/components/password-reprompt.component.html
@@ -41,7 +41,7 @@
         </div>
       </div>
       <div class="modal-footer">
-        <button type="submit" class="btn btn-primary btn-submit" appBlurClick>
+        <button type="submit" class="btn btn-primary btn-submit">
           <span>{{ "ok" | i18n }}</span>
         </button>
         <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
diff --git a/libs/angular/src/directives/blur-click.directive.ts b/libs/angular/src/directives/blur-click.directive.ts
deleted file mode 100644
index 2fc1d36713d..00000000000
--- a/libs/angular/src/directives/blur-click.directive.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Directive, ElementRef, HostListener } from "@angular/core";
-
-@Directive({
-  selector: "[appBlurClick]",
-})
-export class BlurClickDirective {
-  constructor(private el: ElementRef) {}
-
-  @HostListener("click") onClick() {
-    this.el.nativeElement.blur();
-  }
-}
diff --git a/libs/angular/src/jslib.module.ts b/libs/angular/src/jslib.module.ts
index f5a6bbef248..1bd05be4d7f 100644
--- a/libs/angular/src/jslib.module.ts
+++ b/libs/angular/src/jslib.module.ts
@@ -11,7 +11,6 @@ import { A11yInvalidDirective } from "./directives/a11y-invalid.directive";
 import { A11yTitleDirective } from "./directives/a11y-title.directive";
 import { ApiActionDirective } from "./directives/api-action.directive";
 import { AutofocusDirective } from "./directives/autofocus.directive";
-import { BlurClickDirective } from "./directives/blur-click.directive";
 import { BoxRowDirective } from "./directives/box-row.directive";
 import { FallbackSrcDirective } from "./directives/fallback-src.directive";
 import { InputStripSpacesDirective } from "./directives/input-strip-spaces.directive";
@@ -48,7 +47,6 @@ import { PasswordStrengthComponent } from "./shared/components/password-strength
     ApiActionDirective,
     AutofocusDirective,
     AvatarComponent,
-    BlurClickDirective,
     BoxRowDirective,
     CalloutComponent,
     ColorPasswordCountPipe,
@@ -78,7 +76,6 @@ import { PasswordStrengthComponent } from "./shared/components/password-strength
     AutofocusDirective,
     AvatarComponent,
     BitwardenToastModule,
-    BlurClickDirective,
     BoxRowDirective,
     CalloutComponent,
     ColorPasswordCountPipe,