Support entities autocomplete for local characters

src/common/string/strip-diacritics.ts

@@ -1,2 +1,26 @@
+// Characters that don't decompose via NFD normalization (e.g. Polish ł, Danish ø)
+const NON_DECOMPOSABLE_MAP: Record<string, string> = {
+  ł: "l",
+  Ł: "L",
+  đ: "d",
+  Đ: "D",
+  ø: "o",
+  Ø: "O",
+  ħ: "h",
+  Ħ: "H",
+  ŧ: "t",
+  Ŧ: "T",
+  ı: "i",
+  ß: "ss",
+};
+
+const NON_DECOMPOSABLE_RE = new RegExp(
+  `[${Object.keys(NON_DECOMPOSABLE_MAP).join("")}]`,
+  "g"
+);
+
 export const stripDiacritics = (str: string) =>
-  str.normalize("NFD").replace(/[\u0300-\u036F]/g, "");
+  str
+    .replace(NON_DECOMPOSABLE_RE, (ch) => NON_DECOMPOSABLE_MAP[ch])
+    .normalize("NFD")
+    .replace(/[\u0300-\u036F]/g, "");

src/components/ha-area-controls-picker.ts

@@ -8,6 +8,7 @@ import { computeRTL } from "../common/util/compute_rtl";
 import type { LocalizeFunc } from "../common/translations/localize";
 import {
   multiTermSortedSearch,
+  normalizingGetFn,
   type FuseWeightedKey,
 } from "../resources/fuseMultiTerm";
 import {
@@ -96,7 +97,7 @@ export class HaAreaControlsPicker extends LitElement {
   private _createFuseIndex = (
     items: AreaControlPickerItem[],
     keys: FuseWeightedKey[]
-  ) => Fuse.createIndex(keys, items);
+  ) => Fuse.createIndex(keys, items, { getFn: normalizingGetFn });
 
   private _domainFuseIndex = memoizeOne((items: AreaControlPickerItem[]) =>
     this._createFuseIndex(items, this._domainSearchKeys)

src/components/ha-navigation-picker.ts

@@ -12,7 +12,10 @@ import { getPanelIcon, getPanelTitle } from "../data/panel";
 import { findRelated, type RelatedResult } from "../data/search";
 import { PANEL_DASHBOARDS } from "../panels/config/lovelace/dashboards/ha-config-lovelace-dashboards";
 import { computeAreaPath } from "../panels/lovelace/strategies/areas/helpers/areas-strategy-helper";
-import { multiTermSortedSearch } from "../resources/fuseMultiTerm";
+import {
+  multiTermSortedSearch,
+  normalizingGetFn,
+} from "../resources/fuseMultiTerm";
 import type { HomeAssistant, ValueChangedEvent } from "../types";
 import type { ActionRelatedContext } from "../panels/lovelace/components/hui-action-editor";
 import "./ha-generic-picker";
@@ -180,16 +183,24 @@ export class HaNavigationPicker extends LitElement {
 
   private _fuseIndexes = {
     related: memoizeOne((items: NavigationItem[]) =>
-      Fuse.createIndex(DEFAULT_SEARCH_KEYS, items)
+      Fuse.createIndex(DEFAULT_SEARCH_KEYS, items, {
+        getFn: normalizingGetFn,
+      })
     ),
     dashboards: memoizeOne((items: NavigationItem[]) =>
-      Fuse.createIndex(DEFAULT_SEARCH_KEYS, items)
+      Fuse.createIndex(DEFAULT_SEARCH_KEYS, items, {
+        getFn: normalizingGetFn,
+      })
     ),
     views: memoizeOne((items: NavigationItem[]) =>
-      Fuse.createIndex(DEFAULT_SEARCH_KEYS, items)
+      Fuse.createIndex(DEFAULT_SEARCH_KEYS, items, {
+        getFn: normalizingGetFn,
+      })
     ),
     other_routes: memoizeOne((items: NavigationItem[]) =>
-      Fuse.createIndex(DEFAULT_SEARCH_KEYS, items)
+      Fuse.createIndex(DEFAULT_SEARCH_KEYS, items, {
+        getFn: normalizingGetFn,
+      })
     ),
   };
 

src/components/ha-picker-combo-box.ts

@@ -19,6 +19,7 @@ import { localeContext, localizeContext } from "../data/context";
 import { ScrollableFadeMixin } from "../mixins/scrollable-fade-mixin";
 import {
   multiTermSortedSearch,
+  normalizingGetFn,
   type FuseWeightedKey,
 } from "../resources/fuseMultiTerm";
 import { haStyleScrollbar } from "../resources/styles";
@@ -451,7 +452,9 @@ export class HaPickerComboBox extends ScrollableFadeMixin(LitElement) {
 
   private _fuseIndex = memoizeOne(
     (states: PickerComboBoxItem[], searchKeys?: FuseWeightedKey[]) =>
-      Fuse.createIndex(searchKeys || DEFAULT_SEARCH_KEYS, states)
+      Fuse.createIndex(searchKeys || DEFAULT_SEARCH_KEYS, states, {
+        getFn: normalizingGetFn,
+      })
   );
 
   private _filterChanged = (ev: InputEvent) => {

src/components/ha-target-picker.ts

@@ -53,6 +53,7 @@ import { showHelperDetailDialog } from "../panels/config/helpers/show-dialog-hel
 import {
   multiTermSearch,
   multiTermSortedSearch,
+  normalizingGetFn,
   type FuseWeightedKey,
 } from "../resources/fuseMultiTerm";
 import type { HomeAssistant, ValueChangedEvent } from "../types";
@@ -165,7 +166,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
   }
 
   private _createFuseIndex = (states, keys: FuseWeightedKey[]) =>
-    Fuse.createIndex(keys, states);
+    Fuse.createIndex(keys, states, { getFn: normalizingGetFn });
 
   protected render() {
     if (this.addOnTop) {

src/dialogs/quick-bar/ha-quick-bar.ts

@@ -50,6 +50,7 @@ import {
 import type { RelatedResult } from "../../data/search";
 import {
   multiTermSortedSearch,
+  normalizingGetFn,
   type FuseWeightedKey,
 } from "../../resources/fuseMultiTerm";
 import { buttonLinkStyle } from "../../resources/styles";
@@ -655,7 +656,7 @@ export class QuickBar extends LitElement {
   private _generateActionCommandsMemoized = memoizeOne(generateActionCommands);
 
   private _createFuseIndex = (states, keys: FuseWeightedKey[]) =>
-    Fuse.createIndex(keys, states);
+    Fuse.createIndex(keys, states, { getFn: normalizingGetFn });
 
   private _fuseIndexes = {
     entity: memoizeOne((states: PickerComboBoxItem[]) =>

src/panels/config/apps/components/supervisor-apps-filter.ts

@@ -1,6 +1,8 @@
 import type { IFuseOptions } from "fuse.js";
 import Fuse from "fuse.js";
+import { stripDiacritics } from "../../../../common/string/strip-diacritics";
 import type { StoreAddon } from "../../../../data/supervisor/store";
+import { normalizingGetFn } from "../../../../resources/fuseMultiTerm";
 
 export function filterAndSort(addons: StoreAddon[], filter: string) {
   const options: IFuseOptions<StoreAddon> = {
@@ -9,7 +11,8 @@ export function filterAndSort(addons: StoreAddon[], filter: string) {
     minMatchCharLength: Math.min(filter.length, 2),
     threshold: 0.2,
     ignoreDiacritics: true,
+    getFn: normalizingGetFn,
   };
   const fuse = new Fuse(addons, options);
-  return fuse.search(filter).map((result) => result.item);
+  return fuse.search(stripDiacritics(filter)).map((result) => result.item);
 }

src/panels/config/automation/add-automation-element/ha-automation-add-search.ts

@@ -64,6 +64,7 @@ import {
 import {
   multiTermSearch,
   multiTermSortedSearch,
+  normalizingGetFn,
   type FuseWeightedKey,
 } from "../../../../resources/fuseMultiTerm";
 import { loadVirtualizer } from "../../../../resources/virtualizer";
@@ -452,7 +453,7 @@ export class HaAutomationAddSearch extends LitElement {
     typeof item === "string" ? item : item.id;
 
   private _createFuseIndex = (states, keys: FuseWeightedKey[]) =>
-    Fuse.createIndex(keys, states);
+    Fuse.createIndex(keys, states, { getFn: normalizingGetFn });
 
   private _fuseIndexes = {
     area: memoizeOne((states: PickerComboBoxItem[]) =>

src/panels/config/automation/dialog-new-automation.ts

@@ -36,6 +36,7 @@ import { showScriptEditor } from "../../../data/script";
 import {
   type FuseWeightedKey,
   multiTermSearch,
+  normalizingGetFn,
 } from "../../../resources/fuseMultiTerm";
 import { mdiHomeAssistant } from "../../../resources/home-assistant-logo-svg";
 import { haStyle, haStyleDialog } from "../../../resources/styles";
@@ -123,7 +124,9 @@ class DialogNewAutomation extends LitElement {
 
   private _blueprintFuseIndex = memoizeOne(
     (blueprints: ReturnType<DialogNewAutomation["_processedBlueprints"]>) =>
-      Fuse.createIndex(BLUEPRINT_SEARCH_KEYS, blueprints)
+      Fuse.createIndex(BLUEPRINT_SEARCH_KEYS, blueprints, {
+        getFn: normalizingGetFn,
+      })
   );
 
   private _filteredBlueprints = memoizeOne(

src/panels/config/dashboard/dialog-new-dashboard.ts

@@ -4,6 +4,8 @@ import type { CSSResultGroup } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
+import { normalizingGetFn } from "../../../resources/fuseMultiTerm";
+import { stripDiacritics } from "../../../common/string/strip-diacritics";
 import { fireEvent } from "../../../common/dom/fire_event";
 import type {
   LocalizeFunc,
@@ -227,9 +229,11 @@ class DialogNewDashboard extends LitElement implements HassDialog {
         threshold: 0.3,
         ignoreLocation: true,
         minMatchCharLength: Math.min(filter.length, 2),
+        ignoreDiacritics: true,
+        getFn: normalizingGetFn,
       };
       const fuse = new Fuse(strategies, options);
-      return fuse.search(filter).map((result) => result.item);
+      return fuse.search(stripDiacritics(filter)).map((result) => result.item);
     }
   );
 

src/panels/config/integrations/dialog-add-integration.ts

@@ -14,6 +14,8 @@ import {
 } from "../../../common/integrations/protocolIntegrationPicked";
 import { navigate } from "../../../common/navigate";
 import { caseInsensitiveStringCompare } from "../../../common/string/compare";
+import { stripDiacritics } from "../../../common/string/strip-diacritics";
+import { normalizingGetFn } from "../../../resources/fuseMultiTerm";
 import type { LocalizeFunc } from "../../../common/translations/localize";
 import "../../../components/ha-dialog";
 import "../../../components/ha-icon-button-prev";
@@ -317,7 +319,9 @@ class AddIntegrationDialog extends LitElement {
           minMatchCharLength: Math.min(filter.length, 2),
           threshold: 0.2,
           ignoreDiacritics: true,
+          getFn: normalizingGetFn,
         };
+        const normalizedFilter = stripDiacritics(filter);
         const helpers = Object.entries(h).map(([domain, integration]) => ({
           domain,
           name: integration.name || domainToName(localize, domain),
@@ -328,13 +332,13 @@ class AddIntegrationDialog extends LitElement {
         }));
         return [
           ...new Fuse(integrations, options)
-            .search(filter)
+            .search(normalizedFilter)
             .map((result) => result.item),
           ...new Fuse(yamlIntegrations, options)
-            .search(filter)
+            .search(normalizedFilter)
             .map((result) => result.item),
           ...new Fuse(helpers, options)
-            .search(filter)
+            .search(normalizedFilter)
             .map((result) => result.item),
         ];
       }

src/panels/config/integrations/ha-config-integrations-dashboard.ts

@@ -14,6 +14,8 @@ import {
 } from "../../../common/integrations/protocolIntegrationPicked";
 import { navigate } from "../../../common/navigate";
 import { caseInsensitiveStringCompare } from "../../../common/string/compare";
+import { stripDiacritics } from "../../../common/string/strip-diacritics";
+import { normalizingGetFn } from "../../../resources/fuseMultiTerm";
 import { extractSearchParam } from "../../../common/url/search-params";
 import { nextRender } from "../../../common/util/render-status";
 import "../../../components/ha-button";
@@ -362,9 +364,12 @@ class HaConfigIntegrationsDashboard extends KeyboardShortcutMixin(
           minMatchCharLength: Math.min(filter.length, 2),
           threshold: 0.2,
           ignoreDiacritics: true,
+          getFn: normalizingGetFn,
         };
         const fuse = new Fuse(inProgress, options);
-        filteredEntries = fuse.search(filter).map((result) => result.item);
+        filteredEntries = fuse
+          .search(stripDiacritics(filter))
+          .map((result) => result.item);
       } else {
         filteredEntries = inProgress;
       }

src/panels/lovelace/editor/badge-editor/hui-badge-picker.ts

@@ -10,6 +10,8 @@ import memoizeOne from "memoize-one";
 import { storage } from "../../../../common/decorators/storage";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { stringCompare } from "../../../../common/string/compare";
+import { stripDiacritics } from "../../../../common/string/strip-diacritics";
+import { normalizingGetFn } from "../../../../resources/fuseMultiTerm";
 import "../../../../components/ha-spinner";
 import "../../../../components/input/ha-input-search";
 import type { HaInputSearch } from "../../../../components/input/ha-input-search";
@@ -84,9 +86,12 @@ export class HuiBadgePicker extends LitElement {
         minMatchCharLength: Math.min(filter.length, 2),
         threshold: 0.2,
         ignoreDiacritics: true,
+        getFn: normalizingGetFn,
       };
       const fuse = new Fuse(badges, options);
-      badges = fuse.search(filter).map((result) => result.item);
+      badges = fuse
+        .search(stripDiacritics(filter))
+        .map((result) => result.item);
       return badgeElements.filter((badgeElement: BadgeElement) =>
         badges.includes(badgeElement.badge)
       );

src/panels/lovelace/editor/card-editor/hui-card-picker.ts

@@ -9,6 +9,8 @@ import memoizeOne from "memoize-one";
 import { storage } from "../../../../common/decorators/storage";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { stringCompare } from "../../../../common/string/compare";
+import { stripDiacritics } from "../../../../common/string/strip-diacritics";
+import { normalizingGetFn } from "../../../../resources/fuseMultiTerm";
 import "../../../../components/ha-expansion-panel";
 import "../../../../components/ha-spinner";
 import "../../../../components/input/ha-input-search";
@@ -90,9 +92,10 @@ export class HuiCardPicker extends LitElement {
         minMatchCharLength: Math.min(filter.length, 2),
         threshold: 0.2,
         ignoreDiacritics: true,
+        getFn: normalizingGetFn,
       };
       const fuse = new Fuse(cards, options);
-      cards = fuse.search(filter).map((result) => result.item);
+      cards = fuse.search(stripDiacritics(filter)).map((result) => result.item);
       return cardElements.filter((cardElement: CardElement) =>
         cards.includes(cardElement.card)
       );