From 40f2e15cecb1d15c21436a252a5a8581d504e46b Mon Sep 17 00:00:00 2001
From: Jason Ng <jng@bitwarden.com>
Date: Tue, 12 Nov 2024 10:38:48 -0500
Subject: [PATCH] [PM-13895] Autofocus on Vault Search Browser (#11888)

* use appAutoFocus directive for browser vault v2 search
---
 .../vault-v2/vault-search/vault-v2-search.component.html    | 1 +
 .../vault/popup/components/vault/vault-v2.component.html    | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.html b/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.html
index 55674aa83e..898d93da32 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.html
@@ -3,6 +3,7 @@
     [placeholder]="'search' | i18n"
     [(ngModel)]="searchText"
     (ngModelChange)="onSearchTextChanged()"
+    appAutofocus
   >
   </bit-search>
 </div>
diff --git a/apps/browser/src/vault/popup/components/vault/vault-v2.component.html b/apps/browser/src/vault/popup/components/vault/vault-v2.component.html
index e402e13143..04b6bed469 100644
--- a/apps/browser/src/vault/popup/components/vault/vault-v2.component.html
+++ b/apps/browser/src/vault/popup/components/vault/vault-v2.component.html
@@ -23,7 +23,11 @@
   </div>
 
   <!-- Show search & filters outside of the scroll area of the page -->
-  <div slot="above-scroll-area" class="tw-p-4" *ngIf="vaultState !== VaultStateEnum.Empty">
+  <div
+    slot="above-scroll-area"
+    class="tw-p-4"
+    *ngIf="vaultState !== VaultStateEnum.Empty && !(loading$ | async)"
+  >
     <app-vault-v2-search> </app-vault-v2-search>
     <app-vault-list-filters></app-vault-list-filters>
   </div>