diff --git a/apps/browser/src/popup/vault/vault-filter.component.ts b/apps/browser/src/popup/vault/vault-filter.component.ts index 8249eda334..9c663d8a91 100644 --- a/apps/browser/src/popup/vault/vault-filter.component.ts +++ b/apps/browser/src/popup/vault/vault-filter.component.ts @@ -193,11 +193,10 @@ export class VaultFilterComponent implements OnInit, OnDestroy { clearTimeout(this.searchTimeout); } const filterDeleted = (c: CipherView) => !c.isDeleted; - const normalizedSearchText = this.searchText?.normalize("NFD").replace(/[\u0300-\u036f]/g, ""); if (timeout == null) { - this.hasSearched = this.searchService.isSearchable(normalizedSearchText); + this.hasSearched = this.searchService.isSearchable(this.searchText); this.ciphers = await this.searchService.searchCiphers( - normalizedSearchText, + this.searchText, filterDeleted, this.allCiphers ); @@ -208,12 +207,12 @@ export class VaultFilterComponent implements OnInit, OnDestroy { } this.searchPending = true; this.searchTimeout = setTimeout(async () => { - this.hasSearched = this.searchService.isSearchable(normalizedSearchText); + this.hasSearched = this.searchService.isSearchable(this.searchText); if (!this.hasLoadedAllCiphers && !this.hasSearched) { await this.loadCiphers(); } else { this.ciphers = await this.searchService.searchCiphers( - normalizedSearchText, + this.searchText, filterDeleted, this.allCiphers ); diff --git a/apps/desktop/src/app/layout/search/search-bar.service.ts b/apps/desktop/src/app/layout/search/search-bar.service.ts index 340ee3a698..db77a86de3 100644 --- a/apps/desktop/src/app/layout/search/search-bar.service.ts +++ b/apps/desktop/src/app/layout/search/search-bar.service.ts @@ -29,7 +29,7 @@ export class SearchBarService { } setSearchText(value: string) { - this.searchText.next(value); + this.searchText.next(value?.normalize("NFD").replace(/[\u0300-\u036f]/g, "")); } private updateState() { diff --git a/apps/desktop/src/app/layout/search/search.component.ts b/apps/desktop/src/app/layout/search/search.component.ts index 6fb8500527..c18ce729c8 100644 --- a/apps/desktop/src/app/layout/search/search.component.ts +++ b/apps/desktop/src/app/layout/search/search.component.ts @@ -17,7 +17,7 @@ export class SearchComponent { }); this.searchText.valueChanges.subscribe((value) => { - this.searchBarService.setSearchText(value.normalize("NFD").replace(/[\u0300-\u036f]/g, "")); + this.searchBarService.setSearchText(value); }); } }