Show url in label

.github/workflows/ci.yaml

@@ -37,7 +37,7 @@ jobs:
       - name: Build resources
         run: ./node_modules/.bin/gulp gen-icons-json build-translations build-locale-data gather-gallery-pages
       - name: Setup lint cache
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: |
             node_modules/.cache/prettier
@@ -89,7 +89,7 @@ jobs:
         env:
           IS_TEST: "true"
       - name: Upload bundle stats
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: frontend-bundle-stats
           path: build/stats/*.json
@@ -113,7 +113,7 @@ jobs:
         env:
           IS_TEST: "true"
       - name: Upload bundle stats
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: supervisor-bundle-stats
           path: build/stats/*.json

.github/workflows/codeql-analysis.yml

@@ -36,14 +36,14 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+        uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
         with:
           languages: ${{ matrix.language }}
 
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+        uses: github/codeql-action/autobuild@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -57,4 +57,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+        uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7

.github/workflows/lock.yml

@@ -9,7 +9,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@7266a7ce5c1df01b1c6db85bf8cd86c737dadbe7 # v6.0.0
+      - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1
         with:
           github-token: ${{ github.token }}
           process-only: "issues, prs"

.github/workflows/nightly.yaml

@@ -57,14 +57,14 @@ jobs:
         run: tar -czvf translations.tar.gz translations
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: wheels
           path: dist/home_assistant_frontend*.whl
           if-no-files-found: error
 
       - name: Upload translations
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: translations
           path: translations.tar.gz

.gitignore

@@ -56,5 +56,4 @@ test/coverage/
 
 # AI tooling
 .claude
-.cursor
 

.nvmrc

@@ -1 +1 @@
-24.12.0
+22.21.1

demo/src/stubs/device_registry.ts

@@ -1,4 +1,4 @@
-import type { DeviceRegistryEntry } from "../../../src/data/device/device_registry";
+import type { DeviceRegistryEntry } from "../../../src/data/device_registry";
 import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockDeviceRegistry = (

demo/src/stubs/entity_registry.ts

@@ -1,4 +1,4 @@
-import type { EntityRegistryEntry } from "../../../src/data/entity/entity_registry";
+import type { EntityRegistryEntry } from "../../../src/data/entity_registry";
 import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockEntityRegistry = (

demo/src/stubs/label_registry.ts

@@ -1,4 +1,4 @@
-import type { LabelRegistryEntry } from "../../../src/data/label/label_registry";
+import type { LabelRegistryEntry } from "../../../src/data/label_registry";
 import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockLabelRegistry = (

gallery/src/pages/automation/describe-action.ts

@@ -142,7 +142,7 @@ export class DemoAutomationDescribeAction extends LitElement {
         <div class="action">
           <span>
             ${this._action
-              ? describeAction(this.hass, [], this._action)
+              ? describeAction(this.hass, [], [], {}, this._action)
               : "<invalid YAML>"}
           </span>
           <ha-yaml-editor
@@ -155,7 +155,7 @@ export class DemoAutomationDescribeAction extends LitElement {
         ${ACTIONS.map(
           (conf) => html`
             <div class="action">
-              <span>${describeAction(this.hass, [], conf as any)}</span>
+              <span>${describeAction(this.hass, [], [], {}, conf as any)}</span>
               <pre>${dump(conf)}</pre>
             </div>
           `

gallery/src/pages/components/ha-form.ts

@@ -11,11 +11,11 @@ import { computeInitialHaFormData } from "../../../../src/components/ha-form/com
 import "../../../../src/components/ha-form/ha-form";
 import type { HaFormSchema } from "../../../../src/components/ha-form/types";
 import type { AreaRegistryEntry } from "../../../../src/data/area_registry";
-import type { DeviceRegistryEntry } from "../../../../src/data/device/device_registry";
 import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import type { HomeAssistant } from "../../../../src/types";
 import "../../components/demo-black-white-row";
+import type { DeviceRegistryEntry } from "../../../../src/data/device_registry";
 
 const ENTITIES = [
   getEntity("alarm_control_panel", "alarm", "disarmed", {

gallery/src/pages/components/ha-selector.ts

@@ -13,9 +13,9 @@ import "../../../../src/components/ha-selector/ha-selector";
 import "../../../../src/components/ha-settings-row";
 import type { AreaRegistryEntry } from "../../../../src/data/area_registry";
 import type { BlueprintInput } from "../../../../src/data/blueprint";
-import type { DeviceRegistryEntry } from "../../../../src/data/device/device_registry";
+import type { DeviceRegistryEntry } from "../../../../src/data/device_registry";
 import type { FloorRegistryEntry } from "../../../../src/data/floor_registry";
-import type { LabelRegistryEntry } from "../../../../src/data/label/label_registry";
+import type { LabelRegistryEntry } from "../../../../src/data/label_registry";
 import { showDialog } from "../../../../src/dialogs/make-dialog-manager";
 import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";

gallery/src/pages/misc/integration-card.ts

@@ -6,8 +6,8 @@ import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import type { IntegrationManifest } from "../../../../src/data/integration";
 
-import type { DeviceRegistryEntry } from "../../../../src/data/device/device_registry";
-import type { EntityRegistryEntry } from "../../../../src/data/entity/entity_registry";
+import type { DeviceRegistryEntry } from "../../../../src/data/device_registry";
+import type { EntityRegistryEntry } from "../../../../src/data/entity_registry";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import "../../../../src/panels/config/integrations/ha-config-flow-card";
 import type {

package.json

@@ -34,7 +34,7 @@
     "@codemirror/legacy-modes": "6.5.2",
     "@codemirror/search": "6.5.11",
     "@codemirror/state": "6.5.2",
-    "@codemirror/view": "6.39.4",
+    "@codemirror/view": "6.38.8",
     "@date-fns/tz": "1.4.1",
     "@egjs/hammerjs": "2.0.17",
     "@formatjs/intl-datetimeformat": "6.18.2",
@@ -52,7 +52,7 @@
     "@fullcalendar/list": "6.1.19",
     "@fullcalendar/luxon3": "6.1.19",
     "@fullcalendar/timegrid": "6.1.19",
-    "@home-assistant/webawesome": "3.0.0-ha.2",
+    "@home-assistant/webawesome": "3.0.0-ha.1",
     "@lezer/highlight": "1.2.3",
     "@lit-labs/motion": "1.0.9",
     "@lit-labs/observers": "2.0.6",
@@ -135,7 +135,7 @@
     "stacktrace-js": "2.0.2",
     "superstruct": "2.0.2",
     "tinykeys": "3.0.0",
-    "ua-parser-js": "2.0.7",
+    "ua-parser-js": "2.0.6",
     "vue": "2.7.16",
     "vue2-daterange-picker": "0.6.8",
     "weekstart": "2.0.0",
@@ -157,8 +157,8 @@
     "@octokit/auth-oauth-device": "8.0.3",
     "@octokit/plugin-retry": "8.0.3",
     "@octokit/rest": "22.0.1",
-    "@rsdoctor/rspack-plugin": "1.3.15",
-    "@rspack/core": "1.6.7",
+    "@rsdoctor/rspack-plugin": "1.3.12",
+    "@rspack/core": "1.6.6",
     "@rspack/dev-server": "1.1.4",
     "@types/babel__plugin-transform-runtime": "7.9.5",
     "@types/chromecast-caf-receiver": "6.0.22",
@@ -183,7 +183,7 @@
     "babel-plugin-template-html-minifier": "4.1.0",
     "browserslist-useragent-regexp": "4.1.3",
     "del": "8.0.1",
-    "eslint": "9.39.2",
+    "eslint": "9.39.1",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "10.1.8",
     "eslint-import-resolver-webpack": "0.13.10",
@@ -201,7 +201,7 @@
     "gulp-rename": "2.1.0",
     "html-minifier-terser": "7.2.0",
     "husky": "9.1.7",
-    "jsdom": "27.3.0",
+    "jsdom": "27.2.0",
     "jszip": "3.10.1",
     "lint-staged": "16.2.7",
     "lit-analyzer": "2.0.3",
@@ -214,11 +214,11 @@
     "serve": "14.2.5",
     "sinon": "21.0.0",
     "tar": "7.5.2",
-    "terser-webpack-plugin": "5.3.16",
+    "terser-webpack-plugin": "5.3.15",
     "ts-lit-plugin": "2.0.2",
     "typescript": "5.9.3",
-    "typescript-eslint": "8.49.0",
-    "vite-tsconfig-paths": "6.0.1",
+    "typescript-eslint": "8.48.1",
+    "vite-tsconfig-paths": "5.1.4",
     "vitest": "4.0.15",
     "webpack-stats-plugin": "1.1.3",
     "webpackbar": "7.0.0",
@@ -238,6 +238,6 @@
   },
   "packageManager": "yarn@4.12.0",
   "volta": {
-    "node": "24.12.0"
+    "node": "22.21.1"
   }
 }

src/common/entity/compute_attribute_display.ts

@@ -3,8 +3,8 @@ import {
   DOMAIN_ATTRIBUTES_FORMATERS,
   DOMAIN_ATTRIBUTES_UNITS,
   TEMPERATURE_ATTRIBUTES,
-} from "../../data/entity/entity_attributes";
-import type { EntityRegistryDisplayEntry } from "../../data/entity/entity_registry";
+} from "../../data/entity_attributes";
+import type { EntityRegistryDisplayEntry } from "../../data/entity_registry";
 import type { FrontendLocaleData } from "../../data/translation";
 import type { WeatherEntity } from "../../data/weather";
 import { getWeatherUnit } from "../../data/weather";

src/common/entity/compute_device_name.ts

@@ -1,12 +1,12 @@
 import memoizeOne from "memoize-one";
-import type { DeviceRegistryEntry } from "../../data/device/device_registry";
+import type { DeviceRegistryEntry } from "../../data/device_registry";
 import type {
   EntityRegistryDisplayEntry,
   EntityRegistryEntry,
-} from "../../data/entity/entity_registry";
+} from "../../data/entity_registry";
 import type { HomeAssistant } from "../../types";
-import { getDuplicates } from "../string/get_duplicates";
 import { computeStateName } from "./compute_state_name";
+import { getDuplicates } from "../string/get_duplicates";
 
 export const computeDeviceName = (
   device: DeviceRegistryEntry

src/common/entity/compute_entity_name.ts

@@ -2,7 +2,7 @@ import type { HassEntity } from "home-assistant-js-websocket";
 import type {
   EntityRegistryDisplayEntry,
   EntityRegistryEntry,
-} from "../../data/entity/entity_registry";
+} from "../../data/entity_registry";
 import type { HomeAssistant } from "../../types";
 import { computeDeviceName } from "./compute_device_name";
 import { computeStateName } from "./compute_state_name";

src/common/entity/compute_state_display.ts

@@ -1,12 +1,12 @@
 import type { HassConfig, HassEntity } from "home-assistant-js-websocket";
-import { UNAVAILABLE, UNKNOWN } from "../../data/entity/entity";
-import type { EntityRegistryDisplayEntry } from "../../data/entity/entity_registry";
+import { UNAVAILABLE, UNKNOWN } from "../../data/entity";
+import type { EntityRegistryDisplayEntry } from "../../data/entity_registry";
 import type { FrontendLocaleData } from "../../data/translation";
 import { TimeZone } from "../../data/translation";
 import type { HomeAssistant } from "../../types";
+import { DURATION_UNITS, formatDuration } from "../datetime/format_duration";
 import { formatDate } from "../datetime/format_date";
 import { formatDateTime } from "../datetime/format_date_time";
-import { DURATION_UNITS, formatDuration } from "../datetime/format_duration";
 import { formatTime } from "../datetime/format_time";
 import {
   formatNumber,

src/common/entity/context/get_device_context.ts

@@ -1,5 +1,5 @@
 import type { AreaRegistryEntry } from "../../../data/area_registry";
-import type { DeviceRegistryEntry } from "../../../data/device/device_registry";
+import type { DeviceRegistryEntry } from "../../../data/device_registry";
 import type { FloorRegistryEntry } from "../../../data/floor_registry";
 import type { HomeAssistant } from "../../../types";
 

src/common/entity/context/get_entity_context.ts

@@ -1,11 +1,11 @@
 import type { HassEntity } from "home-assistant-js-websocket";
 import type { AreaRegistryEntry } from "../../../data/area_registry";
-import type { DeviceRegistryEntry } from "../../../data/device/device_registry";
+import type { DeviceRegistryEntry } from "../../../data/device_registry";
 import type {
   EntityRegistryDisplayEntry,
   EntityRegistryEntry,
   ExtEntityRegistryEntry,
-} from "../../../data/entity/entity_registry";
+} from "../../../data/entity_registry";
 import type { FloorRegistryEntry } from "../../../data/floor_registry";
 import type { HomeAssistant } from "../../../types";
 

src/common/entity/delete_entity.ts

@@ -1,14 +1,14 @@
-import type { ConfigEntry } from "../../data/config_entries";
-import { deleteConfigEntry } from "../../data/config_entries";
-import type { EntityRegistryEntry } from "../../data/entity/entity_registry";
-import { removeEntityRegistryEntry } from "../../data/entity/entity_registry";
-import { HELPERS_CRUD } from "../../data/helpers_crud";
+import type { HomeAssistant } from "../../types";
 import type { IntegrationManifest } from "../../data/integration";
+import { computeDomain } from "./compute_domain";
+import { HELPERS_CRUD } from "../../data/helpers_crud";
 import type { Helper } from "../../panels/config/helpers/const";
 import { isHelperDomain } from "../../panels/config/helpers/const";
-import type { HomeAssistant } from "../../types";
 import { isComponentLoaded } from "../config/is_component_loaded";
-import { computeDomain } from "./compute_domain";
+import type { EntityRegistryEntry } from "../../data/entity_registry";
+import { removeEntityRegistryEntry } from "../../data/entity_registry";
+import type { ConfigEntry } from "../../data/config_entries";
+import { deleteConfigEntry } from "../../data/config_entries";
 
 export const isDeletableEntity = (
   hass: HomeAssistant,

src/common/entity/get_states.ts

@@ -1,9 +1,9 @@
 import type { HassEntity } from "home-assistant-js-websocket";
-import { UNAVAILABLE_STATES } from "../../data/entity/entity";
-import type { HomeAssistant } from "../../types";
-import { stringCompare } from "../string/compare";
-import { computeDomain } from "./compute_domain";
 import { computeStateDomain } from "./compute_state_domain";
+import { UNAVAILABLE_STATES } from "../../data/entity";
+import type { HomeAssistant } from "../../types";
+import { computeDomain } from "./compute_domain";
+import { stringCompare } from "../string/compare";
 
 export const FIXED_DOMAIN_STATES = {
   alarm_control_panel: [

src/common/entity/group_entities.ts

@@ -1,7 +1,7 @@
 import type { HassEntity } from "home-assistant-js-websocket";
-import { isUnavailableState, UNAVAILABLE } from "../../data/entity/entity";
-import type { HomeAssistant } from "../../types";
 import { computeStateDomain } from "./compute_state_domain";
+import { isUnavailableState, UNAVAILABLE } from "../../data/entity";
+import type { HomeAssistant } from "../../types";
 
 export const computeGroupEntitiesState = (states: HassEntity[]): string => {
   if (!states.length) {

src/common/entity/state_active.ts

@@ -1,5 +1,5 @@
 import type { HassEntity } from "home-assistant-js-websocket";
-import { isUnavailableState, OFF, UNAVAILABLE } from "../../data/entity/entity";
+import { isUnavailableState, OFF, UNAVAILABLE } from "../../data/entity";
 import { computeDomain } from "./compute_domain";
 
 export function stateActive(stateObj: HassEntity, state?: string): boolean {

src/common/entity/state_card_type.ts

@@ -1,5 +1,5 @@
 import type { HassEntity } from "home-assistant-js-websocket";
-import { UNAVAILABLE } from "../../data/entity/entity";
+import { UNAVAILABLE } from "../../data/entity";
 import type { HomeAssistant } from "../../types";
 import { DOMAINS_WITH_CARD } from "../const";
 import { canToggleState } from "./can_toggle_state";

src/common/entity/state_color.ts

@@ -1,6 +1,6 @@
 /** Return a color representing a state. */
 import type { HassEntity } from "home-assistant-js-websocket";
-import { UNAVAILABLE } from "../../data/entity/entity";
+import { UNAVAILABLE } from "../../data/entity";
 import type { GroupEntity } from "../../data/group";
 import { computeGroupDomain } from "../../data/group";
 import { computeCssVariable } from "../../resources/css-variables";

src/common/navigate.ts

@@ -17,36 +17,25 @@ export interface NavigateOptions {
 // max time to wait for dialogs to close before navigating
 const DIALOG_WAIT_TIMEOUT = 500;
 
-/**
- * Ensures all dialogs are closed before navigation.
- * Returns true if navigation can proceed, false if a dialog refused to close.
- */
-const ensureDialogsClosed = async (timestamp: number): Promise<boolean> => {
+export const navigate = async (
+  path: string,
+  options?: NavigateOptions,
+  timestamp = Date.now()
+) => {
   const { history } = mainWindow;
-
-  if (!history.state?.dialog || Date.now() - timestamp >= DIALOG_WAIT_TIMEOUT) {
-    return true;
-  }
-
+  if (history.state?.dialog && Date.now() - timestamp < DIALOG_WAIT_TIMEOUT) {
     const closed = await closeAllDialogs();
     if (!closed) {
       // eslint-disable-next-line no-console
       console.warn("Navigation blocked, because dialog refused to close");
       return false;
     }
-
-  // wait for history state to be updated after dialog closed
-  await new Promise<void>((resolve) => {
-    setTimeout(resolve);
+    return new Promise<boolean>((resolve) => {
+      // need to wait for history state to be updated in case a dialog was closed
+      setTimeout(() => {
+        navigate(path, options, timestamp).then(resolve);
+      });
     });
-
-  return ensureDialogsClosed(timestamp);
-};
-
-export const navigate = async (path: string, options?: NavigateOptions) => {
-  const canProceed = await ensureDialogsClosed(Date.now());
-  if (!canProceed) {
-    return false;
   }
   const replace = options?.replace || false;
 
@@ -79,14 +68,10 @@ export const navigate = async (path: string, options?: NavigateOptions) => {
  * Navigate back in history, with fallback to a default path if no history exists.
  * This prevents a user from getting stuck when they navigate directly to a page with no history.
  */
-export const goBack = async (fallbackPath?: string): Promise<void> => {
-  const canProceed = await ensureDialogsClosed(Date.now());
-  if (!canProceed) {
-    return;
-  }
+export const goBack = (fallbackPath?: string) => {
+  const { history } = mainWindow;
 
   // Check if we have history to go back to
-  const { history } = mainWindow;
   if (history.length > 1) {
     history.back();
     return;

src/common/number/format_number.ts

@@ -2,7 +2,7 @@ import type {
   HassEntity,
   HassEntityAttributeBase,
 } from "home-assistant-js-websocket";
-import type { EntityRegistryDisplayEntry } from "../../data/entity/entity_registry";
+import type { EntityRegistryDisplayEntry } from "../../data/entity_registry";
 import type { FrontendLocaleData } from "../../data/translation";
 import { NumberFormat } from "../../data/translation";
 import { round } from "./round";

src/common/util/configuration-url.ts

@@ -0,0 +1,29 @@
+export interface ProcessedConfigurationUrl {
+  url: string;
+  isLocal: boolean;
+}
+
+/**
+ * Get a processed configuration URL, converting homeassistant:// URLs to local paths
+ * and determining if it should be opened locally or in a new tab.
+ *
+ * @param configurationUrl - The configuration URL to process
+ * @returns Processed URL and whether it's a local link, or null if URL is empty
+ */
+export const getConfigurationUrl = (
+  configurationUrl: string | null | undefined
+): ProcessedConfigurationUrl | null => {
+  if (!configurationUrl) {
+    return null;
+  }
+
+  const isHomeAssistant = configurationUrl.startsWith("homeassistant://");
+  const url = isHomeAssistant
+    ? configurationUrl.replace("homeassistant://", "/")
+    : configurationUrl;
+
+  return {
+    url,
+    isLocal: isHomeAssistant,
+  };
+};

src/common/util/view-transition.ts

@@ -1,45 +1,30 @@
 /**
- * Executes a synchronous callback within a View Transition if supported, otherwise runs it directly.
+ * Executes a callback within a View Transition if supported, otherwise runs it directly.
  *
- * @param callback - Synchronous function to execute. The callback will be passed a boolean indicating whether the view transition is available.
+ * @param callback - Function to execute. Can be synchronous or return a Promise. The callback will be passed a boolean indicating whether the view transition is available.
  * @returns Promise that resolves when the transition completes (or immediately if not supported)
  *
  * @example
  * ```typescript
+ * // Synchronous callback
  * withViewTransition(() => {
  *   this.large = !this.large;
  * });
+ *
+ * // Async callback
+ * await withViewTransition(async () => {
+ *   await this.updateData();
+ * });
  * ```
  */
 export const withViewTransition = (
-  callback: (viewTransitionAvailable: boolean) => void
+  callback: (viewTransitionAvailable: boolean) => void | Promise<void>
 ): Promise<void> => {
-  if (!document.startViewTransition) {
-    callback(false);
-    return Promise.resolve();
+  if (document.startViewTransition) {
+    return document.startViewTransition(() => callback(true)).finished;
   }
 
-  let callbackInvoked = false;
-
-  try {
-    // View Transitions require DOM updates to happen synchronously within
-    // the callback. Execute the callback immediately (synchronously).
-    const transition = document.startViewTransition(() => {
-      callbackInvoked = true;
-      callback(true);
-    });
-    return transition.finished;
-  } catch (err) {
-    // eslint-disable-next-line no-console
-    console.warn(
-      "View transition failed, falling back to direct execution.",
-      err
-    );
-    // Make sure the callback is invoked exactly once.
-    if (!callbackInvoked) {
-      callback(false);
-      return Promise.resolve();
-    }
-    return Promise.reject(err);
-  }
+  // Fallback: Execute callback directly without transition
+  const result = callback(false);
+  return result instanceof Promise ? result : Promise.resolve();
 };

src/components/chart/ha-sunburst-chart.ts

@@ -1,207 +0,0 @@
-import type { EChartsType } from "echarts/core";
-import type { SunburstSeriesOption } from "echarts/types/dist/echarts";
-import type { CallbackDataParams } from "echarts/types/src/util/types";
-import { css, html, LitElement, nothing } from "lit";
-import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import { getGraphColorByIndex } from "../../common/color/colors";
-import { filterXSS } from "../../common/util/xss";
-import type { ECOption } from "../../resources/echarts/echarts";
-import type { HomeAssistant } from "../../types";
-import "./ha-chart-base";
-
-// eslint-disable-next-line @typescript-eslint/naming-convention, @typescript-eslint/consistent-type-imports
-let SunburstChart: typeof import("echarts/lib/chart/sunburst/install");
-
-export interface SunburstNode {
-  id: string;
-  name?: string;
-  value: number;
-  itemStyle?: {
-    color?: string;
-  };
-  children?: SunburstNode[];
-}
-
-@customElement("ha-sunburst-chart")
-export class HaSunburstChart extends LitElement {
-  public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public data?: SunburstNode;
-
-  @property({ type: String, attribute: false }) public valueFormatter?: (
-    value: number
-  ) => string;
-
-  public chart?: EChartsType;
-
-  constructor() {
-    super();
-    if (!SunburstChart) {
-      import("echarts/lib/chart/sunburst/install").then((module) => {
-        SunburstChart = module;
-        this.requestUpdate();
-      });
-    }
-  }
-
-  render() {
-    if (!SunburstChart || !this.data) {
-      return nothing;
-    }
-
-    const options = {
-      tooltip: {
-        trigger: "item",
-        formatter: this._renderTooltip,
-        appendTo: document.body,
-      },
-    } as ECOption;
-
-    return html`<ha-chart-base
-      .data=${this._createData(this.data)}
-      .options=${options}
-      height="100%"
-      .extraComponents=${[SunburstChart]}
-    ></ha-chart-base>`;
-  }
-
-  private _renderTooltip = (params: CallbackDataParams) => {
-    const data = params.data as { name: string; value: number };
-    const value = this.valueFormatter
-      ? this.valueFormatter(data.value)
-      : data.value;
-    return `${params.marker} ${filterXSS(data.name)}<br>${value}`;
-  };
-
-  private _createData = memoizeOne(
-    (data: SunburstNode): SunburstSeriesOption => {
-      const computedStyles = getComputedStyle(this);
-
-      // Transform to echarts format (uses 'name' instead of 'id')
-      const transformNode = (
-        node: SunburstNode,
-        index: number,
-        depth: number,
-        parentColor?: string
-      ) => {
-        const result = {
-          ...node,
-          name: node.name || node.id,
-        };
-
-        if (depth > 0 && !node.itemStyle?.color) {
-          // Don't assign color to root node
-          result.itemStyle = {
-            color: parentColor ?? getGraphColorByIndex(index, computedStyles),
-          };
-        }
-
-        if (node.children && node.children.length > 0) {
-          result.children = node.children.map((child, i) =>
-            transformNode(child, i, depth + 1, result.itemStyle?.color)
-          );
-        }
-
-        return result;
-      };
-
-      const transformedData = transformNode(data, 0, 0);
-
-      return {
-        type: "sunburst",
-        data: transformedData.children || [transformedData],
-        radius: [0, "90%"],
-        sort: undefined, // Keep original order
-        label: {
-          show: false,
-          align: "center",
-          rotate: "radial",
-          minAngle: 15,
-          hideOverlap: true,
-        },
-        emphasis: {
-          focus: "ancestor",
-          label: {
-            show: false,
-          },
-        },
-        itemStyle: {
-          borderRadius: 2,
-        },
-        levels: this._generateLevels(this._getMaxDepth(data)),
-      } as SunburstSeriesOption;
-    }
-  );
-
-  private _getMaxDepth(node: SunburstNode, currentDepth = 0): number {
-    if (!node.children || node.children.length === 0) {
-      return currentDepth;
-    }
-    return Math.max(
-      ...node.children.map((child) =>
-        this._getMaxDepth(child, currentDepth + 1)
-      )
-    );
-  }
-
-  private _generateLevels(depth: number): SunburstSeriesOption["levels"] {
-    const levels: SunburstSeriesOption["levels"] = [];
-
-    // Root level (center) - transparent, small fixed size
-    const rootRadius = 15;
-    const outerRadius = 95;
-    const availableRadius = outerRadius - rootRadius;
-
-    levels.push({
-      r0: "0%",
-      r: `${rootRadius}%`,
-      itemStyle: {
-        color: "transparent",
-      },
-    });
-
-    if (depth === 0) {
-      return levels;
-    }
-
-    // Distribute remaining radius among data levels using weighted distribution
-    // First level gets most space, each subsequent level gets progressively smaller
-    const weights = Array.from({ length: depth }, (_, i) => depth - i);
-    const totalWeight = weights.reduce((sum, w) => sum + w, 0);
-
-    let currentRadius = rootRadius;
-    for (let i = 0; i < depth; i++) {
-      const levelRadius = (weights[i] / totalWeight) * availableRadius;
-      const r0 = currentRadius;
-      const r = currentRadius + levelRadius;
-      currentRadius = r;
-
-      levels.push({
-        r0: `${r0}%`,
-        r: `${r}%`,
-        // Show labels only on first level
-        ...(i === 0 ? { label: { show: true } } : {}),
-      });
-    }
-
-    return levels;
-  }
-
-  static styles = css`
-    :host {
-      display: block;
-      flex: 1;
-    }
-    ha-chart-base {
-      width: 100%;
-      height: 100%;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-sunburst-chart": HaSunburstChart;
-  }
-}

src/components/chart/statistics-chart.ts

@@ -184,11 +184,17 @@ export class StatisticsChart extends LitElement {
   }
 
   private _datasetHidden(ev: CustomEvent) {
+    if (!this._legendData) {
+      return;
+    }
     this._hiddenStats.add(ev.detail.id);
     this.requestUpdate("_hiddenStats");
   }
 
   private _datasetUnhidden(ev: CustomEvent) {
+    if (!this._legendData) {
+      return;
+    }
     this._hiddenStats.delete(ev.detail.id);
     this.requestUpdate("_hiddenStats");
   }
@@ -515,9 +521,7 @@ export class StatisticsChart extends LitElement {
                   `ui.components.statistics_charts.statistic_types.${type}`
                 ),
             symbol: "none",
-            // minmax sampling operates independently per series, breaking stacking alignment
-            // https://github.com/apache/echarts/issues/11879
-            sampling: band && drawBands ? "lttb" : "minmax",
+            sampling: "minmax",
             animationDurationUpdate: 0,
             lineStyle: {
               width: 1.5,
@@ -535,19 +539,12 @@ export class StatisticsChart extends LitElement {
           if (band && this.chartType === "line") {
             series.stack = `band-${statistic_id}`;
             series.stackStrategy = "all";
-            if (this._hiddenStats.has(`${statistic_id}-${bandBottom}`)) {
-              // changing the stackOrder forces echarts to render the stacked series that are not hidden #28472
-              series.stackOrder = "seriesDesc";
-              (series as LineSeriesOption).areaStyle = undefined;
-            } else {
-              series.stackOrder = "seriesAsc";
             if (drawBands && type === bandTop) {
               (series as LineSeriesOption).areaStyle = {
                 color: color + "3F",
               };
             }
           }
-          }
           if (!this.hideLegend) {
             const showLegend = hasMean
               ? type === "mean"
@@ -589,8 +586,7 @@ export class StatisticsChart extends LitElement {
           } else if (
             type === bandTop &&
             this.chartType === "line" &&
-            drawBands &&
-            !this._hiddenStats.has(`${statistic_id}-${bandBottom}`)
+            drawBands
           ) {
             const top = stat[bandTop] || 0;
             val.push(Math.abs(top - (stat[bandBottom] || 0)));

src/components/chart/timeline-color.ts

@@ -3,11 +3,11 @@ import { getGraphColorByIndex } from "../../common/color/colors";
 import { hex2rgb, lab2hex, rgb2lab } from "../../common/color/convert-color";
 import { labBrighten } from "../../common/color/lab";
 import { computeDomain } from "../../common/entity/compute_domain";
+import { stateColorProperties } from "../../common/entity/state_color";
+import { UNAVAILABLE, UNKNOWN } from "../../data/entity";
+import { computeCssValue } from "../../resources/css-variables";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
 import { FIXED_DOMAIN_STATES } from "../../common/entity/get_states";
-import { stateColorProperties } from "../../common/entity/state_color";
-import { UNAVAILABLE, UNKNOWN } from "../../data/entity/entity";
-import { computeCssValue } from "../../resources/css-variables";
 
 const DOMAIN_STATE_SHADES: Record<string, Record<string, number>> = {
   media_player: {

src/components/data-table/ha-data-table-labels.ts

@@ -6,7 +6,7 @@ import { computeCssColor } from "../../common/color/compute-color";
 import { fireEvent } from "../../common/dom/fire_event";
 import { stopPropagation } from "../../common/dom/stop_propagation";
 import { stringCompare } from "../../common/string/compare";
-import type { LabelRegistryEntry } from "../../data/label/label_registry";
+import type { LabelRegistryEntry } from "../../data/label_registry";
 import "../chips/ha-chip-set";
 import "../ha-dropdown";
 import "../ha-dropdown-item";

src/components/data-table/ha-data-table.ts

@@ -1402,9 +1402,6 @@ export class HaDataTable extends LitElement {
         }
         .secondary {
           color: var(--secondary-text-color);
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
         }
         .scroller {
           height: calc(100% - 57px);

src/components/date-range-picker.ts

@@ -101,10 +101,6 @@ const Component = Vue.extend({
       type: String,
       default: "en",
     },
-    opensVertical: {
-      type: String,
-      default: undefined,
-    },
   },
   render(createElement) {
     // @ts-expect-error
@@ -133,11 +129,6 @@ const Component = Vue.extend({
         },
         expression: "dateRange",
       },
-      on: {
-        toggle: (open: boolean) => {
-          fireEvent(this.$el as HTMLElement, "toggle", { open });
-        },
-      },
       scopedSlots: {
         input() {
           return createElement("slot", {
@@ -318,10 +309,6 @@ class DateRangePickerElement extends WrappedElement {
             min-width: unset !important;
             display: block !important;
           }
-          :host([opens-vertical="up"]) .daterangepicker {
-            bottom: 100%;
-            top: auto !important;
-          }
         `;
     if (mainWindow.document.dir === "rtl") {
       style.innerHTML += `
@@ -353,7 +340,4 @@ declare global {
   interface HTMLElementTagNameMap {
     "date-range-picker": DateRangePickerElement;
   }
-  interface HASSDomEvents {
-    toggle: { open: boolean };
-  }
 }

src/components/device/ha-device-action-picker.ts

@@ -1,9 +1,9 @@
 import { customElement } from "lit/decorators";
-import type { DeviceAction } from "../../data/device/device_automation";
+import type { DeviceAction } from "../../data/device_automation";
 import {
   fetchDeviceActions,
   localizeDeviceAutomationAction,
-} from "../../data/device/device_automation";
+} from "../../data/device_automation";
 import { HaDeviceAutomationPicker } from "./ha-device-automation-picker";
 
 @customElement("ha-device-action-picker")

src/components/device/ha-device-automation-picker.ts

@@ -2,17 +2,17 @@ import { consume } from "@lit/context";
 import { css, html, LitElement, nothing } from "lit";
 import { property, state } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
-import { stopPropagation } from "../../common/dom/stop_propagation";
 import { fullEntitiesContext } from "../../data/context";
-import type { DeviceAutomation } from "../../data/device/device_automation";
+import type { DeviceAutomation } from "../../data/device_automation";
 import {
   deviceAutomationsEqual,
   sortDeviceAutomations,
-} from "../../data/device/device_automation";
-import type { EntityRegistryEntry } from "../../data/entity/entity_registry";
+} from "../../data/device_automation";
+import type { EntityRegistryEntry } from "../../data/entity_registry";
 import type { HomeAssistant } from "../../types";
-import "../ha-md-select";
 import "../ha-md-select-option";
+import "../ha-md-select";
+import { stopPropagation } from "../../common/dom/stop_propagation";
 
 const NO_AUTOMATION_KEY = "NO_AUTOMATION";
 const UNKNOWN_AUTOMATION_KEY = "UNKNOWN_AUTOMATION";

src/components/device/ha-device-condition-picker.ts

@@ -1,9 +1,9 @@
 import { customElement } from "lit/decorators";
-import type { DeviceCondition } from "../../data/device/device_automation";
+import type { DeviceCondition } from "../../data/device_automation";
 import {
   fetchDeviceConditions,
   localizeDeviceAutomationCondition,
-} from "../../data/device/device_automation";
+} from "../../data/device_automation";
 import { HaDeviceAutomationPicker } from "./ha-device-automation-picker";
 
 @customElement("ha-device-condition-picker")

src/components/device/ha-device-picker.ts

@@ -12,8 +12,8 @@ import {
   deviceComboBoxKeys,
   getDevices,
   type DevicePickerItem,
-} from "../../data/device/device_picker";
-import type { DeviceRegistryEntry } from "../../data/device/device_registry";
+  type DeviceRegistryEntry,
+} from "../../data/device_registry";
 import type { HomeAssistant } from "../../types";
 import { brandsUrl } from "../../util/brands-url";
 import "../ha-generic-picker";
@@ -205,8 +205,6 @@ export class HaDevicePicker extends LitElement {
       <ha-generic-picker
         .hass=${this.hass}
         .autofocus=${this.autofocus}
-        .disabled=${this.disabled}
-        .helper=${this.helper}
         .label=${this.label}
         .searchLabel=${this.searchLabel}
         .notFoundLabel=${this._notFoundLabel}

src/components/device/ha-device-trigger-picker.ts

@@ -1,9 +1,9 @@
 import { customElement } from "lit/decorators";
-import type { DeviceTrigger } from "../../data/device/device_automation";
+import type { DeviceTrigger } from "../../data/device_automation";
 import {
   fetchDeviceTriggers,
   localizeDeviceAutomationTrigger,
-} from "../../data/device/device_automation";
+} from "../../data/device_automation";
 import { HaDeviceAutomationPicker } from "./ha-device-automation-picker";
 
 @customElement("ha-device-trigger-picker")

src/components/device/ha-devices-picker.ts

@@ -61,6 +61,7 @@ class HaDevicesPicker extends LitElement {
         (entityId) => html`
           <div>
             <ha-device-picker
+              allow-custom-entity
               .curValue=${entityId}
               .hass=${this.hass}
               .deviceFilter=${this.deviceFilter}
@@ -78,6 +79,7 @@ class HaDevicesPicker extends LitElement {
       )}
       <div>
         <ha-device-picker
+          allow-custom-entity
           .hass=${this.hass}
           .helper=${this.helper}
           .deviceFilter=${this.deviceFilter}

src/components/entity/ha-entities-picker.ts

@@ -4,7 +4,7 @@ import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
 import { isValidEntityId } from "../../common/entity/valid_entity_id";
-import type { HaEntityPickerEntityFilterFunc } from "../../data/entity/entity";
+import type { HaEntityPickerEntityFilterFunc } from "../../data/entity";
 import type { HomeAssistant, ValueChangedEvent } from "../../types";
 import "../ha-sortable";
 import "./ha-entity-picker";
@@ -99,6 +99,7 @@ class HaEntitiesPicker extends LitElement {
             (entityId) => html`
               <div class="entity">
                 <ha-entity-picker
+                  allow-custom-entity
                   .curValue=${entityId}
                   .hass=${this.hass}
                   .includeDomains=${this.includeDomains}
@@ -128,6 +129,7 @@ class HaEntitiesPicker extends LitElement {
       </ha-sortable>
       <div>
         <ha-entity-picker
+          allow-custom-entity
           .hass=${this.hass}
           .includeDomains=${this.includeDomains}
           .excludeDomains=${this.excludeDomains}

src/components/entity/ha-entity-picker.ts

@@ -7,12 +7,12 @@ import { fireEvent } from "../../common/dom/fire_event";
 import { computeEntityNameList } from "../../common/entity/compute_entity_name_display";
 import { isValidEntityId } from "../../common/entity/valid_entity_id";
 import { computeRTL } from "../../common/util/compute_rtl";
-import type { HaEntityPickerEntityFilterFunc } from "../../data/entity/entity";
+import type { HaEntityPickerEntityFilterFunc } from "../../data/entity";
 import {
   entityComboBoxKeys,
   getEntities,
   type EntityComboBoxItem,
-} from "../../data/entity/entity_picker";
+} from "../../data/entity_registry";
 import { domainToName } from "../../data/integration";
 import {
   isHelperDomain,
@@ -228,7 +228,7 @@ export class HaEntityPicker extends LitElement {
       if (!createDomains?.length) {
         return [];
       }
-      this.hass.loadFragmentTranslation("config");
+
       return createDomains.map((domain) => {
         const primary = localize(
           "ui.components.entity.entity-picker.create_helper",
@@ -236,7 +236,7 @@ export class HaEntityPicker extends LitElement {
             domain: isHelperDomain(domain)
               ? localize(
                   `ui.panel.config.helpers.types.${domain as HelperDomain}`
-                ) || domain
+                )
               : domainToName(localize, domain),
           }
         );
@@ -277,13 +277,12 @@ export class HaEntityPicker extends LitElement {
         .disabled=${this.disabled}
         .autofocus=${this.autofocus}
         .allowCustomValue=${this.allowCustomEntity}
-        .required=${this.required}
         .label=${this.label}
-        .placeholder=${placeholder}
         .helper=${this.helper}
-        .value=${this.addButton ? undefined : this.value}
         .searchLabel=${this.searchLabel}
         .notFoundLabel=${this._notFoundLabel}
+        .placeholder=${placeholder}
+        .value=${this.addButton ? undefined : this.value}
         .rowRenderer=${this._rowRenderer}
         .getItems=${this._getItems}
         .getAdditionalItems=${this._getAdditionalItems}
@@ -291,7 +290,6 @@ export class HaEntityPicker extends LitElement {
         .searchFn=${this._searchFn}
         .valueRenderer=${this._valueRenderer}
         .searchKeys=${entityComboBoxKeys}
-        use-top-label
         .addButtonLabel=${this.addButton
           ? this.hass.localize("ui.components.entity.entity-picker.add")
           : undefined}

src/components/entity/ha-entity-toggle.ts

@@ -6,11 +6,7 @@ import { customElement, property, state } from "lit/decorators";
 import { STATES_OFF } from "../../common/const";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
 import { computeStateName } from "../../common/entity/compute_state_name";
-import {
-  UNAVAILABLE,
-  UNKNOWN,
-  isUnavailableState,
-} from "../../data/entity/entity";
+import { UNAVAILABLE, UNKNOWN, isUnavailableState } from "../../data/entity";
 import { forwardHaptic } from "../../data/haptics";
 import type { HomeAssistant } from "../../types";
 import "../ha-formfield";

src/components/entity/ha-state-label-badge.ts

@@ -14,12 +14,8 @@ import {
   getNumberFormatOptions,
   isNumericState,
 } from "../../common/number/format_number";
-import {
-  isUnavailableState,
-  UNAVAILABLE,
-  UNKNOWN,
-} from "../../data/entity/entity";
-import type { EntityRegistryDisplayEntry } from "../../data/entity/entity_registry";
+import { isUnavailableState, UNAVAILABLE, UNKNOWN } from "../../data/entity";
+import type { EntityRegistryDisplayEntry } from "../../data/entity_registry";
 import { timerTimeRemaining } from "../../data/timer";
 import type { HomeAssistant } from "../../types";
 import "../ha-label-badge";

src/components/entity/ha-statistic-picker.ts

@@ -471,14 +471,13 @@ export class HaStatisticPicker extends LitElement {
         .hass=${this.hass}
         .autofocus=${this.autofocus}
         .allowCustomValue=${this.allowCustomEntity}
-        .disabled=${this.disabled}
         .label=${this.label}
-        .placeholder=${placeholder}
-        .value=${this.value}
         .notFoundLabel=${this._notFoundLabel}
         .emptyLabel=${this.hass.localize(
           "ui.components.statistic-picker.no_statistics"
         )}
+        .placeholder=${placeholder}
+        .value=${this.value}
         .rowRenderer=${this._rowRenderer}
         .getItems=${this._getItems}
         .getAdditionalItems=${this._getAdditionalItems}

src/components/ha-addon-picker.ts

@@ -1,29 +1,29 @@
-import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { isComponentLoaded } from "../common/config/is_component_loaded";
 import { fireEvent } from "../common/dom/fire_event";
+import { stringCompare } from "../common/string/compare";
+import type { HassioAddonInfo } from "../data/hassio/addon";
 import { fetchHassioAddonsInfo } from "../data/hassio/addon";
 import type { HomeAssistant, ValueChangedEvent } from "../types";
 import "./ha-alert";
+import "./ha-combo-box";
+import type { HaComboBox } from "./ha-combo-box";
 import "./ha-combo-box-item";
-import "./ha-generic-picker";
-import type { HaGenericPicker } from "./ha-generic-picker";
-import type { PickerComboBoxItem } from "./ha-picker-combo-box";
 
-const SEARCH_KEYS = [
-  { name: "primary", weight: 10 },
-  { name: "secondary", weight: 8 },
-  { name: "search_labels.description", weight: 6 },
-  { name: "search_labels.repository", weight: 5 },
-];
-
-const rowRenderer: RenderItemFunction<PickerComboBoxItem> = (item) => html`
+const rowRenderer: ComboBoxLitRenderer<HassioAddonInfo> = (item) => html`
   <ha-combo-box-item type="button">
-    <span slot="headline">${item.primary}</span>
-    <span slot="supporting-text">${item.secondary}</span>
+    <span slot="headline">${item.name}</span>
+    <span slot="supporting-text">${item.slug}</span>
     ${item.icon
-      ? html` <img alt="" slot="start" .src=${item.icon} /> `
+      ? html`
+          <img
+            alt=""
+            slot="start"
+            .src="/api/hassio/addons/${item.slug}/icon"
+          />
+        `
       : nothing}
   </ha-combo-box-item>
 `;
@@ -38,22 +38,22 @@ class HaAddonPicker extends LitElement {
 
   @property() public helper?: string;
 
-  @state() private _addons?: PickerComboBoxItem[];
+  @state() private _addons?: HassioAddonInfo[];
 
   @property({ type: Boolean }) public disabled = false;
 
   @property({ type: Boolean }) public required = false;
 
-  @query("ha-generic-picker") private _genericPicker!: HaGenericPicker;
+  @query("ha-combo-box") private _comboBox!: HaComboBox;
 
   @state() private _error?: string;
 
   public open() {
-    this._genericPicker?.open();
+    this._comboBox?.open();
   }
 
   public focus() {
-    this._genericPicker?.focus();
+    this._comboBox?.focus();
   }
 
   protected firstUpdated() {
@@ -61,34 +61,29 @@ class HaAddonPicker extends LitElement {
   }
 
   protected render() {
-    const label =
-      this.label === undefined && this.hass
-        ? this.hass.localize("ui.components.addon-picker.addon")
-        : this.label;
-
     if (this._error) {
       return html`<ha-alert alert-type="error">${this._error}</ha-alert>`;
     }
     if (!this._addons) {
       return nothing;
     }
-
     return html`
-      <ha-generic-picker
+      <ha-combo-box
         .hass=${this.hass}
-        .autofocus=${this.autofocus}
-        .label=${label}
-        .valueRenderer=${this._valueRenderer}
-        .helper=${this.helper}
-        .disabled=${this.disabled}
+        .label=${this.label === undefined && this.hass
+          ? this.hass.localize("ui.components.addon-picker.addon")
+          : this.label}
+        .value=${this._value}
         .required=${this.required}
-        .value=${this.value}
-        .getItems=${this._getItems}
-        .searchKeys=${SEARCH_KEYS}
-        .rowRenderer=${rowRenderer}
+        .disabled=${this.disabled}
+        .helper=${this.helper}
+        .renderer=${rowRenderer}
+        .items=${this._addons}
+        item-value-path="slug"
+        item-id-path="slug"
+        item-label-path="name"
         @value-changed=${this._addonChanged}
-      >
-      </ha-generic-picker>
+      ></ha-combo-box>
     `;
   }
 
@@ -98,19 +93,9 @@ class HaAddonPicker extends LitElement {
         const addonsInfo = await fetchHassioAddonsInfo(this.hass);
         this._addons = addonsInfo.addons
           .filter((addon) => addon.version)
-          .map((addon) => ({
-            id: addon.slug,
-            primary: addon.name,
-            secondary: addon.slug,
-            icon: addon.icon
-              ? `/api/hassio/addons/${addon.slug}/icon`
-              : undefined,
-            search_labels: {
-              description: addon.description || null,
-              repository: addon.repository || null,
-            },
-            sorting_label: [addon.name, addon.slug].filter(Boolean).join("_"),
-          }));
+          .sort((a, b) =>
+            stringCompare(a.name, b.name, this.hass.locale.language)
+          );
       } else {
         this._error = this.hass.localize(
           "ui.components.addon-picker.error.no_supervisor"
@@ -123,8 +108,6 @@ class HaAddonPicker extends LitElement {
     }
   }
 
-  private _getItems = () => this._addons!;
-
   private get _value() {
     return this.value || "";
   }
@@ -145,17 +128,6 @@ class HaAddonPicker extends LitElement {
       fireEvent(this, "change");
     }, 0);
   }
-
-  private _valueRenderer = (itemId: string) => {
-    const item = this._addons!.find((addon) => addon.id === itemId);
-    return html`${item?.icon
-        ? html`<img
-            slot="start"
-            alt=${item.primary ?? "Unknown"}
-            .src=${item.icon}
-          />`
-        : nothing}<span slot="headline">${item?.primary || "Unknown"}</span>`;
-  };
 }
 
 declare global {

src/components/ha-area-picker.ts

@@ -13,9 +13,9 @@ import { createAreaRegistryEntry } from "../data/area_registry";
 import type {
   DeviceEntityDisplayLookup,
   DeviceRegistryEntry,
-} from "../data/device/device_registry";
-import { getDeviceEntityDisplayLookup } from "../data/device/device_registry";
-import type { EntityRegistryDisplayEntry } from "../data/entity/entity_registry";
+} from "../data/device_registry";
+import { getDeviceEntityDisplayLookup } from "../data/device_registry";
+import type { EntityRegistryDisplayEntry } from "../data/entity_registry";
 import { showAlertDialog } from "../dialogs/generic/show-dialog-box";
 import { showAreaRegistryDetailDialog } from "../panels/config/areas/show-dialog-area-registry-detail";
 import type { HomeAssistant, ValueChangedEvent } from "../types";
@@ -31,10 +31,10 @@ import "./ha-svg-icon";
 const ADD_NEW_ID = "___ADD_NEW___";
 
 const SEARCH_KEYS = [
-  { name: "search_labels.areaName", weight: 10 },
-  { name: "search_labels.aliases", weight: 8 },
-  { name: "search_labels.floorName", weight: 6 },
-  { name: "search_labels.id", weight: 3 },
+  { name: "areaName", weight: 10 },
+  { name: "aliases", weight: 8 },
+  { name: "floorName", weight: 6 },
+  { name: "id", weight: 3 },
 ];
 @customElement("ha-area-picker")
 export class HaAreaPicker extends LitElement {
@@ -296,6 +296,7 @@ export class HaAreaPicker extends LitElement {
           secondary: floorName,
           icon: area.icon || undefined,
           icon_path: area.icon ? undefined : mdiTextureBox,
+          sorting_label: areaName,
           search_labels: {
             areaName: areaName || null,
             floorName: floorName || null,
@@ -363,32 +364,22 @@ export class HaAreaPicker extends LitElement {
   };
 
   protected render(): TemplateResult {
-    const baseLabel =
-      this.label ?? this.hass.localize("ui.components.area-picker.area");
-    const valueRenderer = this._computeValueRenderer(this.hass.areas);
+    const placeholder =
+      this.placeholder ?? this.hass.localize("ui.components.area-picker.area");
 
-    // Only show label if there's no floor
-    let label: string | undefined = baseLabel;
-    if (this.value && baseLabel) {
-      const area = this.hass.areas[this.value];
-      if (area) {
-        const { floor } = getAreaContext(area, this.hass.floors);
-        if (floor) {
-          label = undefined;
-        }
-      }
-    }
+    const valueRenderer = this._computeValueRenderer(this.hass.areas);
 
     return html`
       <ha-generic-picker
         .hass=${this.hass}
         .autofocus=${this.autofocus}
-        .label=${label}
+        .label=${this.label}
         .helper=${this.helper}
         .notFoundLabel=${this._notFoundLabel}
         .emptyLabel=${this.hass.localize("ui.components.area-picker.no_areas")}
         .disabled=${this.disabled}
         .required=${this.required}
+        .placeholder=${placeholder}
         .value=${this.value}
         .getItems=${this._getItems}
         .getAdditionalItems=${this._getAdditionalItems}

src/components/ha-assist-chat.ts

@@ -134,6 +134,7 @@ export class HaAssistChat extends LitElement {
               })}"
               breaks
               cache
+              assist
               .content=${message.text}
             >
             </ha-markdown>
@@ -659,7 +660,7 @@ export class HaAssistChat extends LitElement {
       --markdown-table-border-color: var(--divider-color);
       --markdown-code-background-color: var(--primary-background-color);
       --markdown-code-text-color: var(--primary-text-color);
-      --markdown-list-indent: 1.15em;
+      --markdown-list-indent: 1rem;
       &:not(:has(ha-markdown-element)) {
         min-height: 1lh;
         min-width: 1lh;

src/components/ha-attributes.ts

@@ -3,15 +3,15 @@ import type { CSSResultGroup, PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { computeAttributeNameDisplay } from "../common/entity/compute_attribute_display";
-import { computeStateDomain } from "../common/entity/compute_state_domain";
 import {
   STATE_ATTRIBUTES,
   STATE_ATTRIBUTES_DOMAIN_CLASS,
-} from "../data/entity/entity_attributes";
+} from "../data/entity_attributes";
 import { haStyle } from "../resources/styles";
 import type { HomeAssistant } from "../types";
 import "./ha-attribute-value";
 import "./ha-expansion-panel";
+import { computeStateDomain } from "../common/entity/compute_state_domain";
 
 @customElement("ha-attributes")
 class HaAttributes extends LitElement {

src/components/ha-automation-row.ts

@@ -52,10 +52,8 @@ export class HaAutomationRow extends LitElement {
           <slot name="leading-icon"></slot>
         </div>
         <slot class="header" name="header"></slot>
-        <div class="icons">
         <slot name="icons"></slot>
       </div>
-      </div>
     `;
   }
 
@@ -120,11 +118,12 @@ export class HaAutomationRow extends LitElement {
     }
     .row {
       display: flex;
-      padding: 0 var(--ha-space-3);
+      padding: var(--ha-space-0) var(--ha-space-2);
       min-height: 48px;
-      align-items: flex-start;
+      align-items: center;
       cursor: pointer;
       overflow: hidden;
+      font-weight: var(--ha-font-weight-medium);
       outline: none;
       border-radius: var(--ha-card-border-radius, var(--ha-border-radius-lg));
     }
@@ -141,15 +140,11 @@ export class HaAutomationRow extends LitElement {
       background-color: var(--ha-color-fill-neutral-loud-resting);
       border-radius: var(--ha-border-radius-md);
       padding: var(--ha-space-1);
-      margin-top: 10px;
       display: flex;
       justify-content: center;
       align-items: center;
       transform: rotate(45deg);
     }
-    .leading-icon-wrapper {
-      padding-top: var(--ha-space-3);
-    }
     ::slotted([slot="leading-icon"]) {
       color: var(--ha-color-on-neutral-quiet);
     }
@@ -177,10 +172,6 @@ export class HaAutomationRow extends LitElement {
       overflow-wrap: anywhere;
       margin: var(--ha-space-0) var(--ha-space-3);
     }
-    .icons {
-      display: flex;
-      align-items: center;
-    }
     :host([sort-selected]) .row {
       outline: solid;
       outline-color: rgba(var(--rgb-accent-color), 0.6);

src/components/ha-climate-state.ts

@@ -3,7 +3,7 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
 import type { ClimateEntity } from "../data/climate";
 import { CLIMATE_PRESET_NONE } from "../data/climate";
-import { isUnavailableState, OFF } from "../data/entity/entity";
+import { isUnavailableState, OFF } from "../data/entity";
 import type { HomeAssistant } from "../types";
 
 @customElement("ha-climate-state")

src/components/ha-color-picker.ts

@@ -1,23 +1,25 @@
 import { mdiInvertColorsOff, mdiPalette } from "@mdi/js";
-import { html, LitElement } from "lit";
-import { customElement, property } from "lit/decorators";
+import { css, html, LitElement, nothing } from "lit";
+import { customElement, property, query } from "lit/decorators";
 import { styleMap } from "lit/directives/style-map";
 import { computeCssColor, THEME_COLORS } from "../common/color/compute-color";
 import { fireEvent } from "../common/dom/fire_event";
+import { stopPropagation } from "../common/dom/stop_propagation";
 import type { LocalizeKeys } from "../common/translations/localize";
 import type { HomeAssistant } from "../types";
-import "./ha-generic-picker";
-import type { PickerComboBoxItem } from "./ha-picker-combo-box";
-import type { PickerValueRenderer } from "./ha-picker-field";
+import "./ha-list-item";
+import "./ha-md-divider";
+import "./ha-select";
+import type { HaSelect } from "./ha-select";
 
 @customElement("ha-color-picker")
 export class HaColorPicker extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
   @property() public label?: string;
 
   @property() public helper?: string;
 
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
   @property() public value?: string;
 
   @property({ type: String, attribute: "default_color" })
@@ -31,178 +33,137 @@ export class HaColorPicker extends LitElement {
 
   @property({ type: Boolean }) public disabled = false;
 
-  @property({ type: Boolean }) public required = false;
+  @query("ha-select") private _select?: HaSelect;
+
+  connectedCallback(): void {
+    super.connectedCallback();
+    // Refresh layout options when the field is connected to the DOM to ensure current value displayed
+    this._select?.layoutOptions();
+  }
+
+  private _valueSelected(ev) {
+    ev.stopPropagation();
+    if (!this.isConnected) return;
+    const value = ev.target.value;
+    this.value = value === this.defaultColor ? undefined : value;
+    fireEvent(this, "value-changed", {
+      value: this.value,
+    });
+  }
 
   render() {
-    const effectiveValue = this.value ?? this.defaultColor ?? "";
+    const value = this.value || this.defaultColor || "";
+
+    const isCustom = !(
+      THEME_COLORS.has(value) ||
+      value === "none" ||
+      value === "state"
+    );
 
     return html`
-      <ha-generic-picker
-        .hass=${this.hass}
-        .disabled=${this.disabled}
-        .required=${this.required}
-        .hideClearIcon=${!this.value && !!this.defaultColor}
+      <ha-select
+        .icon=${Boolean(value)}
         .label=${this.label}
+        .value=${value}
         .helper=${this.helper}
-        .value=${effectiveValue}
-        .getItems=${this._getItems}
-        .rowRenderer=${this._rowRenderer}
-        .valueRenderer=${this._valueRenderer}
-        @value-changed=${this._valueChanged}
+        .disabled=${this.disabled}
+        @closed=${stopPropagation}
+        @selected=${this._valueSelected}
+        fixedMenuPosition
+        naturalMenuWidth
+        .clearable=${!this.defaultColor}
       >
-      </ha-generic-picker>
-    `;
-  }
-
-  private _getItems = () =>
-    this._getColors(
-      this.includeNone,
-      this.includeState,
-      this.defaultColor,
-      this.value
-    );
-
-  private _getColors = (
-    includeNone: boolean,
-    includeState: boolean,
-    defaultColor: string | undefined,
-    currentValue: string | undefined
-  ): PickerComboBoxItem[] => {
-    const items: PickerComboBoxItem[] = [];
-
-    const defaultSuffix = this.hass.localize(
-      "ui.components.color-picker.default"
-    );
-
-    const addDefaultSuffix = (label: string, isDefault: boolean) =>
-      isDefault && defaultSuffix ? `${label} (${defaultSuffix})` : label;
-
-    if (includeNone) {
-      const noneLabel =
-        this.hass.localize("ui.components.color-picker.none") || "None";
-      items.push({
-        id: "none",
-        primary: addDefaultSuffix(noneLabel, defaultColor === "none"),
-        icon_path: mdiInvertColorsOff,
-        sorting_label: noneLabel,
-      });
-    }
-
-    if (includeState) {
-      const stateLabel =
-        this.hass.localize("ui.components.color-picker.state") || "State";
-      items.push({
-        id: "state",
-        primary: addDefaultSuffix(stateLabel, defaultColor === "state"),
-        icon_path: mdiPalette,
-        sorting_label: stateLabel,
-      });
-    }
-
-    Array.from(THEME_COLORS).forEach((color) => {
-      const themeLabel =
-        this.hass.localize(
-          `ui.components.color-picker.colors.${color}` as LocalizeKeys
-        ) || color;
-      items.push({
-        id: color,
-        primary: addDefaultSuffix(themeLabel, defaultColor === color),
-        sorting_label: themeLabel,
-      });
-    });
-
-    const isSpecial =
-      currentValue === "none" ||
-      currentValue === "state" ||
-      THEME_COLORS.has(currentValue || "");
-
-    const hasValue = currentValue && currentValue.length > 0;
-
-    if (hasValue && !isSpecial) {
-      items.push({
-        id: currentValue!,
-        primary: currentValue!,
-        sorting_label: currentValue!,
-      });
-    }
-
-    return items;
-  };
-
-  private _rowRenderer: (
-    item: PickerComboBoxItem,
-    index?: number
-  ) => ReturnType<typeof html> = (item) => html`
-    <ha-combo-box-item type="button" compact>
-      ${item.id === "none"
-        ? html`<ha-svg-icon
-            slot="start"
-            .path=${mdiInvertColorsOff}
-          ></ha-svg-icon>`
-        : item.id === "state"
-          ? html`<ha-svg-icon slot="start" .path=${mdiPalette}></ha-svg-icon>`
-          : html`<span slot="start">
-              ${this._renderColorCircle(item.id)}
-            </span>`}
-      <span slot="headline">${item.primary}</span>
-    </ha-combo-box-item>
-  `;
-
-  private _valueRenderer: PickerValueRenderer = (value: string) => {
-    if (value === "none") {
-      return html`
-        <ha-svg-icon slot="start" .path=${mdiInvertColorsOff}></ha-svg-icon>
-        <span slot="headline">
+        ${value
+          ? html`
+              <span slot="icon">
+                ${value === "none"
+                  ? html`
+                      <ha-svg-icon path=${mdiInvertColorsOff}></ha-svg-icon>
+                    `
+                  : value === "state"
+                    ? html`<ha-svg-icon path=${mdiPalette}></ha-svg-icon>`
+                    : this._renderColorCircle(value || "grey")}
+              </span>
+            `
+          : nothing}
+        ${this.includeNone
+          ? html`
+              <ha-list-item value="none" graphic="icon">
                 ${this.hass.localize("ui.components.color-picker.none")}
-        </span>
-      `;
-    }
-    if (value === "state") {
-      return html`
-        <ha-svg-icon slot="start" .path=${mdiPalette}></ha-svg-icon>
-        <span slot="headline">
+                ${this.defaultColor === "none"
+                  ? ` (${this.hass.localize("ui.components.color-picker.default")})`
+                  : nothing}
+                <ha-svg-icon
+                  slot="graphic"
+                  path=${mdiInvertColorsOff}
+                ></ha-svg-icon>
+              </ha-list-item>
+            `
+          : nothing}
+        ${this.includeState
+          ? html`
+              <ha-list-item value="state" graphic="icon">
                 ${this.hass.localize("ui.components.color-picker.state")}
-        </span>
+                ${this.defaultColor === "state"
+                  ? ` (${this.hass.localize("ui.components.color-picker.default")})`
+                  : nothing}
+                <ha-svg-icon slot="graphic" path=${mdiPalette}></ha-svg-icon>
+              </ha-list-item>
+            `
+          : nothing}
+        ${this.includeState || this.includeNone
+          ? html`<ha-md-divider role="separator" tabindex="-1"></ha-md-divider>`
+          : nothing}
+        ${Array.from(THEME_COLORS).map(
+          (color) => html`
+            <ha-list-item .value=${color} graphic="icon">
+              ${this.hass.localize(
+                `ui.components.color-picker.colors.${color}` as LocalizeKeys
+              ) || color}
+              ${this.defaultColor === color
+                ? ` (${this.hass.localize("ui.components.color-picker.default")})`
+                : nothing}
+              <span slot="graphic">${this._renderColorCircle(color)}</span>
+            </ha-list-item>
+          `
+        )}
+        ${isCustom
+          ? html`
+              <ha-list-item .value=${value} graphic="icon">
+                ${value}
+                <span slot="graphic">${this._renderColorCircle(value)}</span>
+              </ha-list-item>
+            `
+          : nothing}
+      </ha-select>
     `;
   }
 
-    return html`
-      <span slot="start">${this._renderColorCircle(value)}</span>
-      <span slot="headline">
-        ${this.hass.localize(
-          `ui.components.color-picker.colors.${value}` as LocalizeKeys
-        ) || value}
-      </span>
-    `;
-  };
-
   private _renderColorCircle(color: string) {
     return html`
       <span
+        class="circle-color"
         style=${styleMap({
           "--circle-color": computeCssColor(color),
-          display: "block",
-          "background-color": "var(--circle-color, var(--divider-color))",
-          border: "1px solid var(--outline-color)",
-          "border-radius": "var(--ha-border-radius-pill)",
-          width: "20px",
-          height: "20px",
-          "box-sizing": "border-box",
         })}
       ></span>
     `;
   }
 
-  private _valueChanged(ev: CustomEvent<{ value?: string }>) {
-    ev.stopPropagation();
-    const selected = ev.detail.value;
-    const normalized =
-      selected && selected === this.defaultColor
-        ? undefined
-        : (selected ?? undefined);
-    this.value = normalized;
-    fireEvent(this, "value-changed", { value: this.value });
+  static styles = css`
+    .circle-color {
+      display: block;
+      background-color: var(--circle-color, var(--divider-color));
+      border: 1px solid var(--outline-color);
+      border-radius: var(--ha-border-radius-pill);
+      width: 20px;
+      height: 20px;
+      box-sizing: border-box;
     }
+    ha-select {
+      width: 100%;
+    }
+  `;
 }
 
 declare global {

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

@@ -20,17 +20,6 @@ export class HaComboBoxItem extends HaMdListItem {
       [slot="start"] {
         --state-icon-color: var(--secondary-text-color);
       }
-      [slot="overline"] {
-        /* mimicing a floating label of mdc-select */
-        line-height: 1.15rem;
-        font-size: calc(var(--mdc-typography-subtitle1-font-size, 1rem) * 0.75);
-        font-weight: var(--mdc-typography-subtitle1-font-weight, 400);
-        font-family: var(
-          --mdc-typography-subtitle1-font-family,
-          var(--mdc-typography-font-family)
-        );
-        color: var(--mdc-select-label-ink-color, rgba(0, 0, 0, 0.6));
-      }
       [slot="headline"] {
         line-height: var(--ha-line-height-normal);
         font-size: var(--ha-font-size-m);

src/components/ha-config-entry-picker.ts

@@ -1,22 +1,20 @@
-import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
+import { caseInsensitiveStringCompare } from "../common/string/compare";
 import type { ConfigEntry } from "../data/config_entries";
 import { getConfigEntries } from "../data/config_entries";
 import { domainToName } from "../data/integration";
-import type { HomeAssistant, ValueChangedEvent } from "../types";
+import type { ValueChangedEvent, HomeAssistant } from "../types";
+import { brandsUrl } from "../util/brands-url";
+import "./ha-combo-box";
+import type { HaComboBox } from "./ha-combo-box";
 import "./ha-combo-box-item";
-import "./ha-domain-icon";
-import "./ha-generic-picker";
-import type { HaGenericPicker } from "./ha-generic-picker";
-import type { PickerComboBoxItem } from "./ha-picker-combo-box";
 
-const SEARCH_KEYS = [
-  { name: "primary", weight: 10 },
-  { name: "secondary", weight: 8 },
-  { name: "icon", weight: 5 },
-];
+export interface ConfigEntryExtended extends ConfigEntry {
+  localized_domain_name?: string;
+}
 
 @customElement("ha-config-entry-picker")
 class HaConfigEntryPicker extends LitElement {
@@ -30,106 +28,119 @@ class HaConfigEntryPicker extends LitElement {
 
   @property() public helper?: string;
 
-  @state() private _configEntries?: PickerComboBoxItem[];
+  @state() private _configEntries?: ConfigEntryExtended[];
 
   @property({ type: Boolean }) public disabled = false;
 
   @property({ type: Boolean }) public required = false;
 
-  @query("ha-generic-picker") private _picker!: HaGenericPicker;
+  @query("ha-combo-box") private _comboBox!: HaComboBox;
 
   public open() {
-    this._picker?.open();
+    this._comboBox?.open();
   }
 
   public focus() {
-    this._picker?.focus();
+    this._comboBox?.focus();
   }
 
   protected firstUpdated() {
     this._getConfigEntries();
   }
 
+  private _rowRenderer: ComboBoxLitRenderer<ConfigEntryExtended> = (
+    item
+  ) => html`
+    <ha-combo-box-item type="button">
+      <span slot="headline">
+        ${item.title ||
+        this.hass.localize(
+          "ui.panel.config.integrations.config_entry.unnamed_entry"
+        )}
+      </span>
+      <span slot="supporting-text">${item.localized_domain_name}</span>
+      <img
+        alt=""
+        slot="start"
+        src=${brandsUrl({
+          domain: item.domain,
+          type: "icon",
+          darkOptimized: this.hass.themes?.darkMode,
+        })}
+        crossorigin="anonymous"
+        referrerpolicy="no-referrer"
+        @error=${this._onImageError}
+        @load=${this._onImageLoad}
+      />
+    </ha-combo-box-item>
+  `;
+
   protected render() {
     if (!this._configEntries) {
       return nothing;
     }
     return html`
-      <ha-generic-picker
+      <ha-combo-box
         .hass=${this.hass}
         .label=${this.label === undefined && this.hass
           ? this.hass.localize("ui.components.config-entry-picker.config_entry")
           : this.label}
-        .value=${this.value}
+        .value=${this._value}
         .required=${this.required}
         .disabled=${this.disabled}
         .helper=${this.helper}
-        .rowRenderer=${this._rowRenderer}
-        .getItems=${this._getItems}
-        .searchKeys=${SEARCH_KEYS}
-        .valueRenderer=${this._valueRenderer}
+        .renderer=${this._rowRenderer}
+        .items=${this._configEntries}
+        item-value-path="entry_id"
+        item-id-path="entry_id"
+        item-label-path="title"
         @value-changed=${this._valueChanged}
-      ></ha-generic-picker>
+      ></ha-combo-box>
     `;
   }
 
-  private _rowRenderer: RenderItemFunction<PickerComboBoxItem> = (item) => html`
-    <ha-combo-box-item type="button">
-      <span slot="headline">${item.primary}</span>
-      <span slot="supporting-text">${item.secondary}</span>
-      <ha-domain-icon
-        slot="start"
-        .hass=${this.hass}
-        .domain=${item.icon!}
-        brand-fallback
-      ></ha-domain-icon>
-    </ha-combo-box-item>
-  `;
+  private _onImageLoad(ev) {
+    ev.target.style.visibility = "initial";
+  }
+
+  private _onImageError(ev) {
+    ev.target.style.visibility = "hidden";
+  }
 
   private async _getConfigEntries() {
     getConfigEntries(this.hass, {
       type: ["device", "hub", "service"],
       domain: this.integration,
     }).then((configEntries) => {
-      this._configEntries = configEntries.map((entry: ConfigEntry) => {
-        const domainName = domainToName(this.hass.localize, entry.domain);
-        return {
-          id: entry.entry_id,
-          icon: entry.domain,
-          primary:
-            entry.title ||
-            this.hass.localize(
-              "ui.panel.config.integrations.config_entry.unnamed_entry"
+      this._configEntries = configEntries
+        .map(
+          (entry: ConfigEntry): ConfigEntryExtended => ({
+            ...entry,
+            localized_domain_name: domainToName(
+              this.hass.localize,
+              entry.domain
             ),
-          secondary: domainName,
-          sorting_label: [entry.title, domainName].filter(Boolean).join("_"),
-        };
-      });
+          })
+        )
+        .sort((conf1, conf2) =>
+          caseInsensitiveStringCompare(
+            conf1.localized_domain_name + conf1.title,
+            conf2.localized_domain_name + conf2.title,
+            this.hass.locale.language
+          )
+        );
     });
   }
 
-  private _valueRenderer = (itemId: string) => {
-    const item = this._configEntries!.find((entry) => entry.id === itemId);
-    return html`<span
-      style="display: flex; align-items: center; gap: var(--ha-space-2);"
-      slot="headline"
-      >${item?.icon
-        ? html`<ha-domain-icon
-            .hass=${this.hass}
-            .domain=${item.icon!}
-            brand-fallback
-          ></ha-domain-icon>`
-        : nothing}${item?.primary || "Unknown"}</span
-    >`;
-  };
-
-  private _getItems = () => this._configEntries!;
+  private get _value() {
+    return this.value || "";
+  }
 
   private _valueChanged(ev: ValueChangedEvent<string>) {
     ev.stopPropagation();
     const newValue = ev.detail.value;
 
-    if (newValue !== this.value) {
+    if (newValue !== this._value) {
       this._setValue(newValue);
     }
   }

src/components/ha-conversation-agent-picker.ts

@@ -9,14 +9,14 @@ import type { ConfigEntry, SubEntry } from "../data/config_entries";
 import { getConfigEntry, getSubEntries } from "../data/config_entries";
 import type { Agent } from "../data/conversation";
 import { listAgents } from "../data/conversation";
-import { getExtendedEntityRegistryEntry } from "../data/entity/entity_registry";
 import { fetchIntegrationManifest } from "../data/integration";
 import { showOptionsFlowDialog } from "../dialogs/config-flow/show-dialog-options-flow";
-import { showSubConfigFlowDialog } from "../dialogs/config-flow/show-dialog-sub-config-flow";
 import type { HomeAssistant } from "../types";
 import "./ha-list-item";
 import "./ha-select";
 import type { HaSelect } from "./ha-select";
+import { getExtendedEntityRegistryEntry } from "../data/entity_registry";
+import { showSubConfigFlowDialog } from "../dialogs/config-flow/show-dialog-sub-config-flow";
 
 const NONE = "__NONE_OPTION__";
 

src/components/ha-date-range-picker.ts

@@ -74,9 +74,6 @@ export class HaDateRangePicker extends LitElement {
   @property({ attribute: "extended-presets", type: Boolean })
   public extendedPresets = false;
 
-  @property({ attribute: "vertical-opening-direction" })
-  public verticalOpeningDirection?: "up" | "down";
-
   @property({ attribute: false }) public openingDirection?:
     | "right"
     | "left"
@@ -130,7 +127,6 @@ export class HaDateRangePicker extends LitElement {
         opening-direction=${ifDefined(
           this.openingDirection || this._calcedOpeningDirection
         )}
-        opens-vertical=${ifDefined(this.verticalOpeningDirection)}
         first-day=${firstWeekdayIndex(this.hass.locale)}
         language=${this.hass.locale.language}
         @change=${this._handleChange}

src/components/ha-domain-icon.ts

@@ -47,7 +47,6 @@ export class HaDomainIcon extends LitElement {
       if (icn) {
         return html`<ha-icon .icon=${icn}></ha-icon>`;
       }
-
       return this._renderFallback();
     });
 

src/components/ha-dropdown-item.ts

@@ -1,9 +1,6 @@
 import DropdownItem from "@home-assistant/webawesome/dist/components/dropdown-item/dropdown-item";
-import "@home-assistant/webawesome/dist/components/icon/icon";
-import { css, type CSSResultGroup, html } from "lit";
+import { css, type CSSResultGroup } from "lit";
 import { customElement } from "lit/decorators";
-import "./ha-svg-icon";
-import { mdiCheckboxBlankOutline, mdiCheckboxMarked } from "@mdi/js";
 
 /**
  * Home Assistant dropdown item component
@@ -17,16 +14,6 @@ import { mdiCheckboxBlankOutline, mdiCheckboxMarked } from "@mdi/js";
  */
 @customElement("ha-dropdown-item")
 export class HaDropdownItem extends DropdownItem {
-  protected renderCheckboxIcon() {
-    return html`
-      <ha-svg-icon
-        id="check"
-        part="checkmark"
-        .path=${this.checked ? mdiCheckboxMarked : mdiCheckboxBlankOutline}
-      ></ha-svg-icon>
-    `;
-  }
-
   static get styles(): CSSResultGroup {
     return [
       DropdownItem.styles,
@@ -35,10 +22,6 @@ export class HaDropdownItem extends DropdownItem {
           min-height: var(--ha-space-10);
         }
 
-        #check {
-          visibility: visible;
-        }
-
         #icon ::slotted(*) {
           color: var(--ha-color-on-neutral-normal);
         }

src/components/ha-filter-labels.ts

@@ -10,8 +10,8 @@ import { computeCssColor } from "../common/color/compute-color";
 import { fireEvent } from "../common/dom/fire_event";
 import { navigate } from "../common/navigate";
 import { stringCompare } from "../common/string/compare";
-import type { LabelRegistryEntry } from "../data/label/label_registry";
-import { subscribeLabelRegistry } from "../data/label/label_registry";
+import type { LabelRegistryEntry } from "../data/label_registry";
+import { subscribeLabelRegistry } from "../data/label_registry";
 import { SubscribeMixin } from "../mixins/subscribe-mixin";
 import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant } from "../types";

src/components/ha-floor-picker.ts

@@ -12,9 +12,9 @@ import { updateAreaRegistryEntry } from "../data/area_registry";
 import type {
   DeviceEntityDisplayLookup,
   DeviceRegistryEntry,
-} from "../data/device/device_registry";
-import { getDeviceEntityDisplayLookup } from "../data/device/device_registry";
-import type { EntityRegistryDisplayEntry } from "../data/entity/entity_registry";
+} from "../data/device_registry";
+import { getDeviceEntityDisplayLookup } from "../data/device_registry";
+import type { EntityRegistryDisplayEntry } from "../data/entity_registry";
 import {
   createFloorRegistryEntry,
   getFloorAreaLookup,
@@ -36,9 +36,9 @@ import "./ha-svg-icon";
 const ADD_NEW_ID = "___ADD_NEW___";
 
 const SEARCH_KEYS = [
-  { name: "search_labels.floorName", weight: 10 },
-  { name: "search_labels.aliases", weight: 8 },
-  { name: "search_labels.floor_id", weight: 3 },
+  { name: "floorName", weight: 10 },
+  { name: "aliases", weight: 8 },
+  { name: "floor_id", weight: 3 },
 ];
 
 interface FloorComboBoxItem extends PickerComboBoxItem {
@@ -291,6 +291,7 @@ export class HaFloorPicker extends LitElement {
           id: floor.floor_id,
           primary: floorName,
           floor: floor,
+          sorting_label: floor.level?.toString() || "zzzzz",
           search_labels: {
             floorName,
             floor_id: floor.floor_id,
@@ -389,14 +390,12 @@ export class HaFloorPicker extends LitElement {
       <ha-generic-picker
         .hass=${this.hass}
         .autofocus=${this.autofocus}
-        .disabled=${this.disabled}
         .label=${this.label}
-        .helper=${this.helper}
-        .placeholder=${placeholder}
         .notFoundLabel=${this._notFoundLabel}
         .emptyLabel=${this.hass.localize(
           "ui.components.floor-picker.no_floors"
         )}
+        .placeholder=${placeholder}
         .value=${this.value}
         .getItems=${this._getItems}
         .getAdditionalItems=${this._getAdditionalItems}

src/components/ha-generic-picker.ts

@@ -7,10 +7,8 @@ import { ifDefined } from "lit/directives/if-defined";
 import memoizeOne from "memoize-one";
 import { tinykeys } from "tinykeys";
 import { fireEvent } from "../common/dom/fire_event";
-import { PickerMixin } from "../mixins/picker-mixin";
 import type { FuseWeightedKey } from "../resources/fuseMultiTerm";
 import type { HomeAssistant } from "../types";
-import { isIosApp } from "../util/is_ios";
 import "./ha-bottom-sheet";
 import "./ha-button";
 import "./ha-combo-box-item";
@@ -22,18 +20,34 @@ import type {
   PickerComboBoxSearchFn,
 } from "./ha-picker-combo-box";
 import "./ha-picker-field";
+import type { PickerValueRenderer } from "./ha-picker-field";
 import "./ha-svg-icon";
 
 @customElement("ha-generic-picker")
-export class HaGenericPicker extends PickerMixin(LitElement) {
+export class HaGenericPicker extends LitElement {
   @property({ attribute: false }) public hass?: HomeAssistant;
 
+  @property({ type: Boolean }) public disabled = false;
+
+  @property({ type: Boolean }) public required = false;
+
   @property({ type: Boolean, attribute: "allow-custom-value" })
   public allowCustomValue;
 
+  @property() public label?: string;
+
+  @property() public value?: string;
+
+  @property() public helper?: string;
+
+  @property() public placeholder?: string;
+
   @property({ type: String, attribute: "search-label" })
   public searchLabel?: string;
 
+  @property({ attribute: "hide-clear-icon", type: Boolean })
+  public hideClearIcon = false;
+
   /** To prevent lags, getItems needs to be memoized */
   @property({ attribute: false })
   public getItems!: (
@@ -47,6 +61,9 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
   @property({ attribute: false })
   public rowRenderer?: RenderItemFunction<PickerComboBoxItem>;
 
+  @property({ attribute: false })
+  public valueRenderer?: PickerValueRenderer;
+
   @property({ attribute: false })
   public searchFn?: PickerComboBoxSearchFn<PickerComboBoxItem>;
 
@@ -96,11 +113,7 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
 
   @property({ attribute: "selected-section" }) public selectedSection?: string;
 
-  @property({ type: Boolean, attribute: "use-top-label" })
-  public useTopLabel = false;
-
-  @property({ attribute: "custom-value-label" })
-  public customValueLabel?: string;
+  @property({ attribute: "unknown-item-text" }) public unknownItemText?: string;
 
   @query(".container") private _containerElement?: HTMLDivElement;
 
@@ -124,20 +137,14 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
   // helper to set new value after closing picker, to avoid flicker
   private _newValue?: string;
 
-  @property({ attribute: "error-message" }) public errorMessage?: string;
-
-  @property({ type: Boolean, reflect: true }) public invalid = false;
-
   private _unsubscribeTinyKeys?: () => void;
 
   protected render() {
-    // Only show label if it's not a top label and there is a value.
-    const label = this.useTopLabel && this.value ? undefined : this.label;
-
-    return html`<div class="container">
-        ${this.useTopLabel && this.label
+    return html`
+      ${this.label
         ? html`<label ?disabled=${this.disabled}>${this.label}</label>`
         : nothing}
+      <div class="container">
         <div id="picker">
           <slot name="field">
             ${this.addButtonLabel && !this.value
@@ -157,28 +164,18 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
                   type="button"
                   class=${this._opened ? "opened" : ""}
                   compact
-                  .unknown=${this._unknownValue(
-                    this.allowCustomValue,
-                    this.value,
-                    this.getItems()
-                  )}
+                  .unknown=${this._unknownValue(this.value, this.getItems())}
                   .unknownItemText=${this.unknownItemText}
                   aria-label=${ifDefined(this.label)}
                   @click=${this.open}
                   @clear=${this._clear}
-                  .icon=${this.icon}
-                  .image=${this.image}
-                  .label=${label}
                   .placeholder=${this.placeholder}
-                  .helper=${this.helper}
                   .value=${this.value}
-                  .valueRenderer=${this.valueRenderer}
                   .required=${this.required}
                   .disabled=${this.disabled}
-                  .invalid=${this.invalid}
                   .hideClearIcon=${this.hideClearIcon}
+                  .valueRenderer=${this.valueRenderer}
                 >
-                  <slot name="start"></slot>
                 </ha-picker-field>`}
           </slot>
         </div>
@@ -217,7 +214,8 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
               </ha-bottom-sheet>`
             : nothing}
       </div>
-      ${this._renderHelper()}`;
+      ${this._renderHelper()}
+    `;
   }
 
   private _renderComboBox(dialogMode = false) {
@@ -226,7 +224,6 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
     }
     return html`
       <ha-picker-combo-box
-        id="combo-box"
         .hass=${this.hass}
         .allowCustomValue=${this.allowCustomValue}
         .label=${this.searchLabel}
@@ -243,24 +240,13 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
         .sectionTitleFunction=${this.sectionTitleFunction}
         .selectedSection=${this.selectedSection}
         .searchKeys=${this.searchKeys}
-        .customValueLabel=${this.customValueLabel}
       ></ha-picker-combo-box>
     `;
   }
 
   private _unknownValue = memoizeOne(
-    (
-      allowCustomValue: boolean,
-      value?: string,
-      items?: (PickerComboBoxItem | string)[]
-    ) => {
-      if (
-        allowCustomValue ||
-        value === undefined ||
-        value === null ||
-        value === "" ||
-        !items
-      ) {
+    (value?: string, items?: (PickerComboBoxItem | string)[]) => {
+      if (value === undefined || value === null || value === "" || !items) {
         return false;
       }
 
@@ -271,30 +257,16 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
   );
 
   private _renderHelper() {
-    const showError = this.invalid && this.errorMessage;
-    const showHelper = !showError && this.helper;
-
-    if (!showError && !showHelper) {
-      return nothing;
-    }
-
-    return html`<ha-input-helper-text .disabled=${this.disabled}>
-      ${showError ? this.errorMessage : this.helper}
-    </ha-input-helper-text>`;
+    return this.helper
+      ? html`<ha-input-helper-text .disabled=${this.disabled}
+          >${this.helper}</ha-input-helper-text
+        >`
+      : nothing;
   }
 
   private _dialogOpened = () => {
     this._opened = true;
     requestAnimationFrame(() => {
-      if (this.hass && isIosApp(this.hass)) {
-        this.hass.auth.external!.fireMessage({
-          type: "focus_element",
-          payload: {
-            element_id: "combo-box",
-          },
-        });
-        return;
-      }
       this._comboBox?.focus();
     });
   };
@@ -321,7 +293,7 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
     this._newValue = value;
   }
 
-  private _clear(e: CustomEvent) {
+  private _clear(e) {
     e.stopPropagation();
     this._setValue(undefined);
   }
@@ -388,9 +360,6 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
           display: block;
           margin: var(--ha-space-2) 0 0;
         }
-        :host([invalid]) ha-input-helper-text {
-          color: var(--mdc-theme-error, var(--error-color, #b00020));
-        }
 
         wa-popover {
           --wa-space-l: var(--ha-space-0);
@@ -398,10 +367,7 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
 
         wa-popover::part(body) {
           width: max(var(--body-width), 250px);
-          max-width: var(
-            --ha-generic-picker-max-width,
-            max(var(--body-width), 250px)
-          );
+          max-width: max(var(--body-width), 250px);
           max-height: 500px;
           height: 70vh;
           overflow: hidden;
@@ -413,6 +379,12 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
           }
         }
 
+        @media (max-height: 1000px) {
+          wa-popover::part(body) {
+            max-height: 400px;
+          }
+        }
+
         ha-bottom-sheet {
           --ha-bottom-sheet-height: 90vh;
           --ha-bottom-sheet-height: calc(100dvh - var(--ha-space-12));

src/components/ha-humidifier-state.ts

@@ -1,7 +1,7 @@
 import type { TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
-import { isUnavailableState, OFF } from "../data/entity/entity";
+import { isUnavailableState, OFF } from "../data/entity";
 import type { HumidifierEntity } from "../data/humidifier";
 import type { HomeAssistant } from "../types";
 

src/components/ha-icon-picker.ts

@@ -1,4 +1,8 @@
-import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
+import type {
+  ComboBoxDataProviderCallback,
+  ComboBoxDataProviderParams,
+} from "@vaadin/combo-box/vaadin-combo-box-light";
 import type { TemplateResult } from "lit";
 import { LitElement, css, html } from "lit";
 import { customElement, property } from "lit/decorators";
@@ -6,54 +10,35 @@ import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
 import { customIcons } from "../data/custom_icons";
 import type { HomeAssistant, ValueChangedEvent } from "../types";
-import "./ha-combo-box-item";
-import "./ha-generic-picker";
+import "./ha-combo-box";
 import "./ha-icon";
-import type { PickerComboBoxItem } from "./ha-picker-combo-box";
+import "./ha-combo-box-item";
+
+interface IconItem {
+  icon: string;
+  parts: Set<string>;
+  keywords: string[];
+}
 
 interface RankedIcon {
-  item: PickerComboBoxItem;
+  icon: string;
   rank: number;
 }
 
-let ICONS: PickerComboBoxItem[] = [];
+let ICONS: IconItem[] = [];
 let ICONS_LOADED = false;
 
-interface IconData {
-  name: string;
-  keywords?: string[];
-}
-
-const createIconItem = (icon: IconData, prefix: string): PickerComboBoxItem => {
-  const iconId = `${prefix}:${icon.name}`;
-  const iconName = icon.name;
-  const parts = iconName.split("-");
-  const keywords = icon.keywords ?? [];
-  const searchLabels: Record<string, string> = {
-    iconName,
-  };
-  parts.forEach((part, index) => {
-    searchLabels[`part${index}`] = part;
-  });
-  keywords.forEach((keyword, index) => {
-    searchLabels[`keyword${index}`] = keyword;
-  });
-  return {
-    id: iconId,
-    primary: iconId,
-    icon: iconId,
-    search_labels: searchLabels,
-    sorting_label: iconId,
-  };
-};
-
 const loadIcons = async () => {
   ICONS_LOADED = true;
 
   const iconList = await import("../../build/mdi/iconList.json");
-  ICONS = iconList.default.map((icon) => createIconItem(icon, "mdi"));
+  ICONS = iconList.default.map((icon) => ({
+    icon: `mdi:${icon.name}`,
+    parts: new Set(icon.name.split("-")),
+    keywords: icon.keywords,
+  }));
 
-  const customIconLoads: Promise<PickerComboBoxItem[]>[] = [];
+  const customIconLoads: Promise<IconItem[]>[] = [];
   Object.keys(customIcons).forEach((iconSet) => {
     customIconLoads.push(loadCustomIconItems(iconSet));
   });
@@ -62,16 +47,19 @@ const loadIcons = async () => {
   });
 };
 
-const loadCustomIconItems = async (
-  iconsetPrefix: string
-): Promise<PickerComboBoxItem[]> => {
+const loadCustomIconItems = async (iconsetPrefix: string) => {
   try {
     const getIconList = customIcons[iconsetPrefix].getIconList;
     if (typeof getIconList !== "function") {
       return [];
     }
     const iconList = await getIconList();
-    return iconList.map((icon) => createIconItem(icon, iconsetPrefix));
+    const customIconItems = iconList.map((icon) => ({
+      icon: `${iconsetPrefix}:${icon.name}`,
+      parts: new Set(icon.name.split("-")),
+      keywords: icon.keywords ?? [],
+    }));
+    return customIconItems;
   } catch (_err) {
     // eslint-disable-next-line no-console
     console.warn(`Unable to load icon list for ${iconsetPrefix} iconset`);
@@ -79,10 +67,10 @@ const loadCustomIconItems = async (
   }
 };
 
-const rowRenderer: RenderItemFunction<PickerComboBoxItem> = (item) => html`
+const rowRenderer: ComboBoxLitRenderer<IconItem | RankedIcon> = (item) => html`
   <ha-combo-box-item type="button">
-    <ha-icon .icon=${item.id} slot="start"></ha-icon>
-    ${item.id}
+    <ha-icon .icon=${item.icon} slot="start"></ha-icon>
+    ${item.icon}
   </ha-combo-box-item>
 `;
 
@@ -106,99 +94,85 @@ export class HaIconPicker extends LitElement {
 
   @property({ type: Boolean }) public invalid = false;
 
-  private _getIconPickerItems = (): PickerComboBoxItem[] => ICONS;
-
   protected render(): TemplateResult {
     return html`
-      <ha-generic-picker
+      <ha-combo-box
         .hass=${this.hass}
+        item-value-path="icon"
+        item-label-path="icon"
+        .value=${this._value}
         allow-custom-value
-        .getItems=${this._getIconPickerItems}
+        .dataProvider=${ICONS_LOADED ? this._iconProvider : undefined}
+        .label=${this.label}
         .helper=${this.helper}
         .disabled=${this.disabled}
         .required=${this.required}
+        .placeholder=${this.placeholder}
         .errorMessage=${this.errorMessage}
         .invalid=${this.invalid}
-        .rowRenderer=${rowRenderer}
-        .icon=${this._icon}
-        .label=${this.label}
-        .value=${this._value}
-        .searchFn=${this._filterIcons}
-        .notFoundLabel=${this.hass?.localize(
-          "ui.components.icon-picker.no_match"
-        )}
-        popover-placement="bottom-start"
+        .renderer=${rowRenderer}
+        icon
+        @opened-changed=${this._openedChanged}
         @value-changed=${this._valueChanged}
       >
-        <slot name="start"></slot>
-      </ha-generic-picker>
+        ${this._value || this.placeholder
+          ? html`
+              <ha-icon .icon=${this._value || this.placeholder} slot="icon">
+              </ha-icon>
+            `
+          : html`<slot slot="icon" name="fallback"></slot>`}
+      </ha-combo-box>
     `;
   }
 
   // Filter can take a significant chunk of frame (up to 3-5 ms)
   private _filterIcons = memoizeOne(
-    (
-      filter: string,
-      filteredItems: PickerComboBoxItem[],
-      allItems: PickerComboBoxItem[]
-    ): PickerComboBoxItem[] => {
-      const normalizedFilter = filter.toLowerCase().replace(/\s+/g, "-");
-      const iconItems = allItems?.length ? allItems : filteredItems;
-
-      if (!normalizedFilter.length) {
+    (filter: string, iconItems: IconItem[] = ICONS) => {
+      if (!filter) {
         return iconItems;
       }
 
-      const rankedItems: RankedIcon[] = [];
+      const filteredItems: RankedIcon[] = [];
+      const addIcon = (icon: string, rank: number) =>
+        filteredItems.push({ icon, rank });
 
       // Filter and rank such that exact matches rank higher, and prefer icon name matches over keywords
       for (const item of iconItems) {
-        const iconName = (item.id.split(":")[1] || item.id).toLowerCase();
-        const parts = iconName.split("-");
-        const keywords = item.search_labels
-          ? Object.values(item.search_labels)
-              .filter((v): v is string => v !== null)
-              .map((v) => v.toLowerCase())
-          : [];
-        const id = item.id.toLowerCase();
-
-        if (parts.includes(normalizedFilter)) {
-          rankedItems.push({ item, rank: 1 });
-        } else if (keywords.includes(normalizedFilter)) {
-          rankedItems.push({ item, rank: 2 });
-        } else if (id.includes(normalizedFilter)) {
-          rankedItems.push({ item, rank: 3 });
-        } else if (keywords.some((word) => word.includes(normalizedFilter))) {
-          rankedItems.push({ item, rank: 4 });
+        if (item.parts.has(filter)) {
+          addIcon(item.icon, 1);
+        } else if (item.keywords.includes(filter)) {
+          addIcon(item.icon, 2);
+        } else if (item.icon.includes(filter)) {
+          addIcon(item.icon, 3);
+        } else if (item.keywords.some((word) => word.includes(filter))) {
+          addIcon(item.icon, 4);
         }
       }
 
       // Allow preview for custom icon not in list
-      if (rankedItems.length === 0) {
-        rankedItems.push({
-          item: {
-            id: filter,
-            primary: filter,
-            icon: filter,
-            search_labels: { keyword: filter },
-            sorting_label: filter,
-          },
-          rank: 0,
-        });
+      if (filteredItems.length === 0) {
+        addIcon(filter, 0);
       }
 
-      return rankedItems
-        .sort((itemA, itemB) => itemA.rank - itemB.rank)
-        .map((item) => item.item);
+      return filteredItems.sort((itemA, itemB) => itemA.rank - itemB.rank);
     }
   );
 
-  protected firstUpdated() {
-    if (!ICONS_LOADED) {
-      loadIcons().then(() => {
-        this._getIconPickerItems = (): PickerComboBoxItem[] => ICONS;
+  private _iconProvider = (
+    params: ComboBoxDataProviderParams,
+    callback: ComboBoxDataProviderCallback<IconItem | RankedIcon>
+  ) => {
+    const filteredItems = this._filterIcons(params.filter.toLowerCase(), ICONS);
+    const iStart = params.page * params.pageSize;
+    const iEnd = iStart + params.pageSize;
+    callback(filteredItems.slice(iStart, iEnd), filteredItems.length);
+  };
+
+  private async _openedChanged(ev: ValueChangedEvent<boolean>) {
+    const opened = ev.detail.value;
+    if (opened && !ICONS_LOADED) {
+      await loadIcons();
       this.requestUpdate();
-      });
     }
   }
 
@@ -220,18 +194,20 @@ export class HaIconPicker extends LitElement {
     );
   }
 
-  private get _icon() {
-    return this.value?.length ? this.value : this.placeholder;
-  }
-
   private get _value() {
     return this.value || "";
   }
 
   static styles = css`
-    ha-generic-picker {
-      width: 100%;
-      display: block;
+    *[slot="icon"] {
+      color: var(--primary-text-color);
+      position: relative;
+      bottom: 2px;
+    }
+    *[slot="prefix"] {
+      margin-right: 8px;
+      margin-inline-end: 8px;
+      margin-inline-start: initial;
     }
   `;
 }

src/components/ha-label-picker.ts

@@ -11,12 +11,13 @@ import {
 } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
-import { getLabels, labelComboBoxKeys } from "../data/label/label_picker";
+import type { LabelRegistryEntry } from "../data/label_registry";
 import {
   createLabelRegistryEntry,
+  getLabels,
+  labelComboBoxKeys,
   subscribeLabelRegistry,
-  type LabelRegistryEntry,
-} from "../data/label/label_registry";
+} from "../data/label_registry";
 import { showAlertDialog } from "../dialogs/generic/show-dialog-box";
 import { SubscribeMixin } from "../mixins/subscribe-mixin";
 import { showLabelDetailDialog } from "../panels/config/labels/show-dialog-label-detail";
@@ -227,7 +228,6 @@ export class HaLabelPicker extends SubscribeMixin(LitElement) {
         .hass=${this.hass}
         .autofocus=${this.autofocus}
         .label=${this.label}
-        .helper=${this.helper}
         .notFoundLabel=${this._notFoundLabel}
         .emptyLabel=${this.hass.localize(
           "ui.components.label-picker.no_labels"

src/components/ha-labels-picker.ts

@@ -8,11 +8,11 @@ import memoizeOne from "memoize-one";
 import { computeCssColor } from "../common/color/compute-color";
 import { fireEvent } from "../common/dom/fire_event";
 import { stringCompare } from "../common/string/compare";
-import type { LabelRegistryEntry } from "../data/label/label_registry";
+import type { LabelRegistryEntry } from "../data/label_registry";
 import {
   subscribeLabelRegistry,
   updateLabelRegistryEntry,
-} from "../data/label/label_registry";
+} from "../data/label_registry";
 import { SubscribeMixin } from "../mixins/subscribe-mixin";
 import { showLabelDetailDialog } from "../panels/config/labels/show-dialog-label-detail";
 import type { HomeAssistant, ValueChangedEvent } from "../types";

src/components/ha-language-picker.ts

@@ -116,11 +116,6 @@ export class HaLanguagePicker extends LitElement {
     > `;
 
   protected render() {
-    const label =
-      this.label ??
-      (this.hass?.localize("ui.components.language-picker.language") ||
-        "Language");
-
     const value =
       this.value ??
       (this.required && !this.disabled ? this._getItems()[0].id : this.value);
@@ -134,7 +129,9 @@ export class HaLanguagePicker extends LitElement {
         .emptyLabel=${this.hass?.localize(
           "ui.components.language-picker.no_languages"
         ) || "No languages available"}
-        .label=${label}
+        .placeholder=${this.label ??
+        (this.hass?.localize("ui.components.language-picker.language") ||
+          "Language")}
         .value=${value}
         .valueRenderer=${this._valueRenderer}
         .disabled=${this.disabled}

src/components/ha-markdown.ts

@@ -70,6 +70,11 @@ export class HaMarkdown extends LitElement {
     a {
       color: var(--markdown-link-color, var(--primary-color));
     }
+    :host([assist]) img {
+      height: auto;
+      width: auto;
+      transition: height 0.2s ease-in-out;
+    }
     img {
       background-color: var(--markdown-image-background-color);
       border-radius: var(--markdown-image-border-radius);
@@ -81,7 +86,8 @@ export class HaMarkdown extends LitElement {
     p:first-child > img:last-child {
       vertical-align: top;
     }
-    ha-markdown-element > :is(ol, ul) {
+    :host > ul,
+    :host > ol {
       padding-inline-start: var(--markdown-list-indent, revert);
     }
     li {
@@ -132,18 +138,6 @@ export class HaMarkdown extends LitElement {
       border-bottom: none;
       margin: var(--ha-space-4) 0;
     }
-    table[role="presentation"] {
-      --markdown-table-border-collapse: separate;
-      --markdown-table-border-width: attr(border, 0);
-      --markdown-table-padding-inline: 0;
-      --markdown-table-padding-block: 0;
-      th {
-        vertical-align: attr(align, center);
-      }
-      td {
-        vertical-align: attr(align, left);
-      }
-    }
     table {
       border-collapse: var(--markdown-table-border-collapse, collapse);
     }
@@ -151,15 +145,14 @@ export class HaMarkdown extends LitElement {
       overflow: auto;
     }
     th {
-      text-align: var(--markdown-table-text-align, start);
+      text-align: start;
     }
     td,
     th {
       border-width: var(--markdown-table-border-width, 1px);
       border-style: var(--markdown-table-border-style, solid);
       border-color: var(--markdown-table-border-color, var(--divider-color));
-      padding-inline: var(--markdown-table-padding-inline, 0.5em);
-      padding-block: var(--markdown-table-padding-block, 0.25em);
+      padding: 0.25em 0.5em;
     }
     blockquote {
       border-left: 4px solid var(--divider-color);

src/components/ha-navigation-picker.ts

@@ -1,17 +1,55 @@
-import { html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
+import type { PropertyValues, TemplateResult } from "lit";
+import { css, html, LitElement, nothing } from "lit";
+import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import { titleCase } from "../common/string/title-case";
 import { fetchConfig } from "../data/lovelace/config/types";
+import type { LovelaceViewRawConfig } from "../data/lovelace/config/view";
 import { getPanelIcon, getPanelTitle } from "../data/panel";
-import type { HomeAssistant, ValueChangedEvent } from "../types";
-import "./ha-generic-picker";
+import type { HomeAssistant, PanelInfo, ValueChangedEvent } from "../types";
+import "./ha-combo-box";
+import type { HaComboBox } from "./ha-combo-box";
+import "./ha-combo-box-item";
 import "./ha-icon";
-import type { PickerComboBoxItem } from "./ha-picker-combo-box";
+
+interface NavigationItem {
+  path: string;
+  icon: string;
+  title: string;
+}
+
+const DEFAULT_ITEMS: NavigationItem[] = [];
+
+const rowRenderer: ComboBoxLitRenderer<NavigationItem> = (item) => html`
+  <ha-combo-box-item type="button">
+    <ha-icon .icon=${item.icon} slot="start"></ha-icon>
+    <span slot="headline">${item.title || item.path}</span>
+    ${item.title
+      ? html`<span slot="supporting-text">${item.path}</span>`
+      : nothing}
+  </ha-combo-box-item>
+`;
+
+const createViewNavigationItem = (
+  prefix: string,
+  view: LovelaceViewRawConfig,
+  index: number
+) => ({
+  path: `/${prefix}/${view.path ?? index}`,
+  icon: view.icon ?? "mdi:view-compact",
+  title: view.title ?? (view.path ? titleCase(view.path) : `${index}`),
+});
+
+const createPanelNavigationItem = (hass: HomeAssistant, panel: PanelInfo) => ({
+  path: `/${panel.url_path}`,
+  icon: getPanelIcon(panel) || "mdi:view-dashboard",
+  title: getPanelTitle(hass, panel) || "",
+});
 
 @customElement("ha-navigation-picker")
 export class HaNavigationPicker extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
+  @property({ attribute: false }) public hass?: HomeAssistant;
 
   @property() public label?: string;
 
@@ -23,51 +61,46 @@ export class HaNavigationPicker extends LitElement {
 
   @property({ type: Boolean }) public required = false;
 
-  @state() private _loading = true;
+  @state() private _opened = false;
 
-  protected firstUpdated() {
+  private navigationItemsLoaded = false;
+
+  private navigationItems: NavigationItem[] = DEFAULT_ITEMS;
+
+  @query("ha-combo-box", true) private comboBox!: HaComboBox;
+
+  protected render(): TemplateResult {
+    return html`
+      <ha-combo-box
+        .hass=${this.hass}
+        item-value-path="path"
+        item-label-path="path"
+        .value=${this._value}
+        allow-custom-value
+        .filteredItems=${this.navigationItems}
+        .label=${this.label}
+        .helper=${this.helper}
+        .disabled=${this.disabled}
+        .required=${this.required}
+        .renderer=${rowRenderer}
+        @opened-changed=${this._openedChanged}
+        @value-changed=${this._valueChanged}
+        @filter-changed=${this._filterChanged}
+      >
+      </ha-combo-box>
+    `;
+  }
+
+  private async _openedChanged(ev: ValueChangedEvent<boolean>) {
+    this._opened = ev.detail.value;
+    if (this._opened && !this.navigationItemsLoaded) {
       this._loadNavigationItems();
     }
-
-  private _navigationItems: PickerComboBoxItem[] = [];
-
-  protected render() {
-    return html`
-      <ha-generic-picker
-        .hass=${this.hass}
-        .value=${this._loading ? undefined : this.value}
-        allow-custom-value
-        .placeholder=${this.label}
-        .helper=${this.helper}
-        .disabled=${this._loading || this.disabled}
-        .required=${this.required}
-        .getItems=${this._getItems}
-        .valueRenderer=${this._valueRenderer}
-        .customValueLabel=${this.hass.localize(
-          "ui.components.navigation-picker.add_custom_path"
-        )}
-        @value-changed=${this._valueChanged}
-      >
-      </ha-generic-picker>
-    `;
   }
 
-  private _valueRenderer = (itemId: string) => {
-    const item = this._navigationItems.find((navItem) => navItem.id === itemId);
-    return html`
-      ${item?.icon
-        ? html`<ha-icon slot="start" .icon=${item.icon}></ha-icon>`
-        : nothing}
-      <span slot="headline">${item?.primary || itemId}</span>
-      ${item?.primary
-        ? html`<span slot="supporting-text">${itemId}</span>`
-        : nothing}
-    `;
-  };
-
-  private _getItems = () => this._navigationItems;
-
   private async _loadNavigationItems() {
+    this.navigationItemsLoaded = true;
+
     const panels = Object.entries(this.hass!.panels).map(([id, panel]) => ({
       id,
       ...panel,
@@ -91,47 +124,27 @@ export class HaNavigationPicker extends LitElement {
 
     const panelViewConfig = new Map(viewConfigs);
 
-    this._navigationItems = [];
+    this.navigationItems = [];
 
     for (const panel of panels) {
-      const path = `/${panel.url_path}`;
-      const panelTitle = getPanelTitle(this.hass, panel);
-      const primary = panelTitle || path;
-      this._navigationItems.push({
-        id: path,
-        primary,
-        secondary: panelTitle ? path : undefined,
-        icon: getPanelIcon(panel) || "mdi:view-dashboard",
-        sorting_label: [
-          primary.startsWith("/") ? `zzz${primary}` : primary,
-          path,
-        ]
-          .filter(Boolean)
-          .join("_"),
-      });
+      this.navigationItems.push(createPanelNavigationItem(this.hass!, panel));
 
       const config = panelViewConfig.get(panel.id);
 
       if (!config || !("views" in config)) continue;
 
-      config.views.forEach((view, index) => {
-        const viewPath = `/${panel.url_path}/${view.path ?? index}`;
-        const viewPrimary =
-          view.title ?? (view.path ? titleCase(view.path) : `${index}`);
-        this._navigationItems.push({
-          id: viewPath,
-          secondary: viewPath,
-          icon: view.icon ?? "mdi:view-compact",
-          primary: viewPrimary,
-          sorting_label: [
-            viewPrimary.startsWith("/") ? `zzz${viewPrimary}` : viewPrimary,
-            viewPath,
-          ].join("_"),
-        });
-      });
+      config.views.forEach((view, index) =>
+        this.navigationItems.push(
+          createViewNavigationItem(panel.url_path, view, index)
+        )
+      );
     }
 
-    this._loading = false;
+    this.comboBox.filteredItems = this.navigationItems;
+  }
+
+  protected shouldUpdate(changedProps: PropertyValues) {
+    return !this._opened || changedProps.has("_opened");
   }
 
   private _valueChanged(ev: ValueChangedEvent<string>) {
@@ -139,18 +152,61 @@ export class HaNavigationPicker extends LitElement {
     this._setValue(ev.detail.value);
   }
 
-  private _setValue(value = "") {
+  private _setValue(value: string) {
     this.value = value;
     fireEvent(
       this,
       "value-changed",
-      { value: this.value },
+      { value: this._value },
       {
         bubbles: false,
         composed: false,
       }
     );
   }
+
+  private _filterChanged(ev: CustomEvent): void {
+    const filterString = ev.detail.value.toLowerCase();
+    const characterCount = filterString.length;
+    if (characterCount >= 2) {
+      const filteredItems: NavigationItem[] = [];
+
+      this.navigationItems.forEach((item) => {
+        if (
+          item.path.toLowerCase().includes(filterString) ||
+          item.title.toLowerCase().includes(filterString)
+        ) {
+          filteredItems.push(item);
+        }
+      });
+
+      if (filteredItems.length > 0) {
+        this.comboBox.filteredItems = filteredItems;
+      } else {
+        this.comboBox.filteredItems = [];
+      }
+    } else {
+      this.comboBox.filteredItems = this.navigationItems;
+    }
+  }
+
+  private get _value() {
+    return this.value || "";
+  }
+
+  static styles = css`
+    ha-icon,
+    ha-svg-icon {
+      color: var(--primary-text-color);
+      position: relative;
+      bottom: 0px;
+    }
+    *[slot="prefix"] {
+      margin-right: 8px;
+      margin-inline-end: 8px;
+      margin-inline-start: initial;
+    }
+  `;
 }
 
 declare global {

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

@@ -1,6 +1,6 @@
 import type { LitVirtualizer } from "@lit-labs/virtualizer";
 import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
-import { mdiMagnify, mdiMinusBoxOutline, mdiPlus } from "@mdi/js";
+import { mdiMagnify, mdiMinusBoxOutline } from "@mdi/js";
 import Fuse from "fuse.js";
 import { css, html, LitElement, nothing } from "lit";
 import {
@@ -91,9 +91,6 @@ export class HaPickerComboBox extends ScrollableFadeMixin(LitElement) {
   @property({ type: Boolean, attribute: "allow-custom-value" })
   public allowCustomValue;
 
-  @property({ attribute: "custom-value-label" })
-  public customValueLabel?: string;
-
   @property() public label?: string;
 
   @property() public value?: string;
@@ -190,15 +187,10 @@ export class HaPickerComboBox extends ScrollableFadeMixin(LitElement) {
   }
 
   protected render() {
-    const searchLabel =
-      this.label ??
-      (this.allowCustomValue
-        ? (this.hass?.localize("ui.components.combo-box.search_or_custom") ??
-          "Search | Add custom value")
-        : (this.hass?.localize("ui.common.search") ?? "Search"));
-
     return html`<ha-textfield
-        .label=${searchLabel}
+        .label=${this.label ??
+        this.hass?.localize("ui.common.search") ??
+        "Search"}
         @input=${this._filterChanged}
       ></ha-textfield>
       ${this._renderSectionButtons()}
@@ -296,30 +288,13 @@ export class HaPickerComboBox extends ScrollableFadeMixin(LitElement) {
     let items = [...this.getItems(this._search, this.selectedSection)];
 
     if (!this.sections?.length) {
-      items = items.sort((entityA, entityB) => {
-        const sortLabelA =
-          typeof entityA === "string" ? entityA : entityA.sorting_label;
-        const sortLabelB =
-          typeof entityB === "string" ? entityB : entityB.sorting_label;
-
-        if (!sortLabelA || !sortLabelB) {
-          return 0;
-        }
-
-        if (!sortLabelB) {
-          return -1;
-        }
-
-        if (!sortLabelA) {
-          return 1;
-        }
-
-        return caseInsensitiveStringCompare(
-          sortLabelA,
-          sortLabelB,
+      items = items.sort((entityA, entityB) =>
+        caseInsensitiveStringCompare(
+          (entityA as PickerComboBoxItem).sorting_label!,
+          (entityB as PickerComboBoxItem).sorting_label!,
           this.hass?.locale.language ?? navigator.language
+        )
       );
-      });
     }
 
     if (!items.length) {
@@ -446,23 +421,13 @@ export class HaPickerComboBox extends ScrollableFadeMixin(LitElement) {
         );
       }
 
-      if (this.allowCustomValue && searchString) {
-        filteredItems.push({
-          id: searchString,
-          primary:
-            this.customValueLabel ??
-            this.hass?.localize("ui.components.combo-box.add_custom_item") ??
-            "Add custom item",
-          secondary: `"${searchString}"`,
-          icon_path: mdiPlus,
-        });
-      }
-
       this._items = filteredItems as PickerComboBoxItem[];
     }
 
     this._selectedItemIndex = -1;
-    this._valuePinned = true;
+    if (this._virtualizerElement) {
+      this._virtualizerElement.scrollTo(0, 0);
+    }
   };
 
   private _toggleSection(ev: Event) {
@@ -657,7 +622,7 @@ export class HaPickerComboBox extends ScrollableFadeMixin(LitElement) {
     typeof item === "string" ? item : item?.id;
 
   private _getInitialSelectedIndex() {
-    if (!this._virtualizerElement || this._search || !this.value) {
+    if (!this._virtualizerElement || !this.value) {
       return 0;
     }
 

src/components/ha-picker-field.ts

@@ -9,15 +9,12 @@ import {
   type TemplateResult,
 } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
-import { ifDefined } from "lit/directives/if-defined";
 import { fireEvent } from "../common/dom/fire_event";
-import { PickerMixin } from "../mixins/picker-mixin";
 import { localizeContext } from "../data/context";
 import type { HomeAssistant } from "../types";
 import "./ha-combo-box-item";
 import type { HaComboBoxItem } from "./ha-combo-box-item";
 import "./ha-icon-button";
-import "./ha-icon";
 
 declare global {
   interface HASSDomEvents {
@@ -28,8 +25,26 @@ declare global {
 export type PickerValueRenderer = (value: string) => TemplateResult<1>;
 
 @customElement("ha-picker-field")
-export class HaPickerField extends PickerMixin(LitElement) {
-  @property({ type: Boolean, reflect: true }) public invalid = false;
+export class HaPickerField extends LitElement {
+  @property({ type: Boolean }) public disabled = false;
+
+  @property({ type: Boolean }) public required = false;
+
+  @property() public value?: string;
+
+  @property() public helper?: string;
+
+  @property() public placeholder?: string;
+
+  @property({ type: Boolean, reflect: true }) public unknown = false;
+
+  @property({ attribute: "unknown-item-text" }) public unknownItemText?: string;
+
+  @property({ attribute: "hide-clear-icon", type: Boolean })
+  public hideClearIcon = false;
+
+  @property({ attribute: false })
+  public valueRenderer?: PickerValueRenderer;
 
   @query("ha-combo-box-item", true) public item!: HaComboBoxItem;
 
@@ -43,49 +58,20 @@ export class HaPickerField extends PickerMixin(LitElement) {
   }
 
   protected render() {
-    const hasValue = !!this.value;
-
     const showClearIcon =
       !!this.value && !this.required && !this.disabled && !this.hideClearIcon;
 
-    const placeholderText = this.placeholder ?? this.label;
-
-    const overlineLabel =
-      this.label && hasValue
-        ? html`<span slot="overline"
-            >${this.label}${this.required ? " *" : ""}</span
-          >`
-        : nothing;
-
-    const headlineContent = hasValue
-      ? this.valueRenderer
-        ? this.valueRenderer(this.value ?? "")
-        : html`<span slot="headline">${this.value}</span>`
-      : placeholderText
-        ? html`<span slot="headline" class="placeholder">
-            ${placeholderText}${this.required ? " *" : ""}
-          </span>`
-        : nothing;
-
     return html`
-      <ha-combo-box-item
-        aria-label=${ifDefined(this.label || this.placeholder)}
-        .disabled=${this.disabled}
-        type="button"
-        compact
-      >
-        ${this.image
-          ? html`<img
-              alt=${this.label ?? ""}
-              slot="start"
-              .src=${this.image}
-              crossorigin="anonymous"
-              referrerpolicy="no-referrer"
-            />`
-          : this.icon
-            ? html`<ha-icon slot="start" .icon=${this.icon}></ha-icon>`
-            : html`<slot name="start"></slot>`}
-        ${overlineLabel}${headlineContent}
+      <ha-combo-box-item .disabled=${this.disabled} type="button" compact>
+        ${this.value
+          ? this.valueRenderer
+            ? this.valueRenderer(this.value)
+            : html`<slot name="headline">${this.value}</slot>`
+          : html`
+              <span slot="headline" class="placeholder">
+                ${this.placeholder}
+              </span>
+            `}
         ${this.unknown
           ? html`<div slot="supporting-text" class="unknown">
               ${this.unknownItemText ||
@@ -111,7 +97,7 @@ export class HaPickerField extends PickerMixin(LitElement) {
     `;
   }
 
-  private _clear(e: CustomEvent) {
+  private _clear(e) {
     e.stopPropagation();
     fireEvent(this, "clear");
   }
@@ -177,11 +163,6 @@ export class HaPickerField extends PickerMixin(LitElement) {
           background-color: var(--ha-color-fill-warning-quiet-resting);
         }
 
-        :host([invalid]) ha-combo-box-item:after {
-          height: 2px;
-          background-color: var(--mdc-theme-error, var(--error-color, #b00020));
-        }
-
         .clear {
           margin: 0 -8px;
           --mdc-icon-button-size: 32px;

src/components/ha-selector/ha-selector-action.ts

@@ -7,7 +7,7 @@ import { fullEntitiesContext } from "../../data/context";
 import {
   subscribeEntityRegistry,
   type EntityRegistryEntry,
-} from "../../data/entity/entity_registry";
+} from "../../data/entity_registry";
 import type { Action } from "../../data/script";
 import { migrateAutomationAction } from "../../data/script";
 import type { ActionSelector } from "../../data/selector";

src/components/ha-selector/ha-selector-addon.ts

@@ -28,6 +28,7 @@ export class HaAddonSelector extends LitElement {
       .helper=${this.helper}
       .disabled=${this.disabled}
       .required=${this.required}
+      allow-custom-entity
     ></ha-addon-picker>`;
   }
 

src/components/ha-selector/ha-selector-area.ts

@@ -4,14 +4,14 @@ import { html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { ensureArray } from "../../common/array/ensure-array";
+import type { DeviceRegistryEntry } from "../../data/device_registry";
+import { getDeviceIntegrationLookup } from "../../data/device_registry";
 import { fireEvent } from "../../common/dom/fire_event";
+import type { EntitySources } from "../../data/entity_sources";
+import { fetchEntitySourcesWithCache } from "../../data/entity_sources";
+import type { AreaSelector } from "../../data/selector";
 import type { ConfigEntry } from "../../data/config_entries";
 import { getConfigEntries } from "../../data/config_entries";
-import type { DeviceRegistryEntry } from "../../data/device/device_registry";
-import { getDeviceIntegrationLookup } from "../../data/device/device_registry";
-import type { EntitySources } from "../../data/entity/entity_sources";
-import { fetchEntitySourcesWithCache } from "../../data/entity/entity_sources";
-import type { AreaSelector } from "../../data/selector";
 import {
   filterSelectorDevices,
   filterSelectorEntities,

src/components/ha-selector/ha-selector-config-entry.ts

@@ -29,6 +29,7 @@ export class HaConfigEntrySelector extends LitElement {
       .disabled=${this.disabled}
       .required=${this.required}
       .integration=${this.selector.config_entry?.integration}
+      allow-custom-entity
     ></ha-config-entry-picker>`;
   }
 

src/components/ha-selector/ha-selector-device.ts

@@ -5,13 +5,13 @@ import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { ensureArray } from "../../common/array/ensure-array";
 import { fireEvent } from "../../common/dom/fire_event";
+import type { DeviceRegistryEntry } from "../../data/device_registry";
+import { getDeviceIntegrationLookup } from "../../data/device_registry";
+import type { EntitySources } from "../../data/entity_sources";
+import { fetchEntitySourcesWithCache } from "../../data/entity_sources";
+import type { DeviceSelector } from "../../data/selector";
 import type { ConfigEntry } from "../../data/config_entries";
 import { getConfigEntries } from "../../data/config_entries";
-import type { DeviceRegistryEntry } from "../../data/device/device_registry";
-import { getDeviceIntegrationLookup } from "../../data/device/device_registry";
-import type { EntitySources } from "../../data/entity/entity_sources";
-import { fetchEntitySourcesWithCache } from "../../data/entity/entity_sources";
-import type { DeviceSelector } from "../../data/selector";
 import {
   filterSelectorDevices,
   filterSelectorEntities,
@@ -107,6 +107,7 @@ export class HaDeviceSelector extends LitElement {
           .placeholder=${this.placeholder}
           .disabled=${this.disabled}
           .required=${this.required}
+          allow-custom-entity
         ></ha-device-picker>
       `;
     }

src/components/ha-selector/ha-selector-entity.ts

@@ -4,12 +4,12 @@ import { html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { ensureArray } from "../../common/array/ensure-array";
 import { fireEvent } from "../../common/dom/fire_event";
-import type { EntitySources } from "../../data/entity/entity_sources";
-import { fetchEntitySourcesWithCache } from "../../data/entity/entity_sources";
+import type { EntitySources } from "../../data/entity_sources";
+import { fetchEntitySourcesWithCache } from "../../data/entity_sources";
 import type { EntitySelector } from "../../data/selector";
 import {
-  computeCreateDomains,
   filterSelectorEntities,
+  computeCreateDomains,
 } from "../../data/selector";
 import type { HomeAssistant } from "../../types";
 import "../entity/ha-entities-picker";
@@ -66,14 +66,15 @@ export class HaEntitySelector extends LitElement {
         .hass=${this.hass}
         .value=${this.value}
         .label=${this.label}
-        .placeholder=${this.placeholder}
         .helper=${this.helper}
         .includeEntities=${this.selector.entity?.include_entities}
         .excludeEntities=${this.selector.entity?.exclude_entities}
         .entityFilter=${this._filterEntities}
         .createDomains=${this._createDomains}
+        .placeholder=${this.placeholder}
         .disabled=${this.disabled}
         .required=${this.required}
+        allow-custom-entity
       ></ha-entity-picker>`;
     }
 
@@ -82,13 +83,13 @@ export class HaEntitySelector extends LitElement {
         .hass=${this.hass}
         .value=${this.value}
         .label=${this.label}
-        .placeholder=${this.placeholder}
         .helper=${this.helper}
         .includeEntities=${this.selector.entity.include_entities}
         .excludeEntities=${this.selector.entity.exclude_entities}
         .reorder=${this.selector.entity.reorder ?? false}
         .entityFilter=${this._filterEntities}
         .createDomains=${this._createDomains}
+        .placeholder=${this.placeholder}
         .disabled=${this.disabled}
         .required=${this.required}
       ></ha-entities-picker>

src/components/ha-selector/ha-selector-floor.ts

@@ -4,14 +4,14 @@ import { html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { ensureArray } from "../../common/array/ensure-array";
+import type { DeviceRegistryEntry } from "../../data/device_registry";
+import { getDeviceIntegrationLookup } from "../../data/device_registry";
 import { fireEvent } from "../../common/dom/fire_event";
+import type { EntitySources } from "../../data/entity_sources";
+import { fetchEntitySourcesWithCache } from "../../data/entity_sources";
+import type { FloorSelector } from "../../data/selector";
 import type { ConfigEntry } from "../../data/config_entries";
 import { getConfigEntries } from "../../data/config_entries";
-import type { DeviceRegistryEntry } from "../../data/device/device_registry";
-import { getDeviceIntegrationLookup } from "../../data/device/device_registry";
-import type { EntitySources } from "../../data/entity/entity_sources";
-import { fetchEntitySourcesWithCache } from "../../data/entity/entity_sources";
-import type { FloorSelector } from "../../data/selector";
 import {
   filterSelectorDevices,
   filterSelectorEntities,

src/components/ha-selector/ha-selector-icon.ts

@@ -52,7 +52,7 @@ export class HaIconSelector extends LitElement {
         ${!placeholder && stateObj
           ? html`
               <ha-state-icon
-                slot="start"
+                slot="fallback"
                 .hass=${this.hass}
                 .stateObj=${stateObj}
               ></ha-state-icon>

src/components/ha-selector/ha-selector-label.ts

@@ -36,7 +36,6 @@ export class HaLabelSelector extends LitElement {
           .required=${this.required}
           .disabled=${this.disabled}
           .label=${this.label}
-          .helper=${this.helper}
           @value-changed=${this._handleChange}
         >
         </ha-labels-picker>
@@ -50,7 +49,6 @@ export class HaLabelSelector extends LitElement {
         .required=${this.required}
         .disabled=${this.disabled}
         .label=${this.label}
-        .helper=${this.helper}
         @value-changed=${this._handleChange}
       >
       </ha-label-picker>

src/components/ha-selector/ha-selector-target.ts

@@ -7,15 +7,15 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { ensureArray } from "../../common/array/ensure-array";
-import type { DeviceRegistryEntry } from "../../data/device/device_registry";
-import { getDeviceIntegrationLookup } from "../../data/device/device_registry";
-import type { EntitySources } from "../../data/entity/entity_sources";
-import { fetchEntitySourcesWithCache } from "../../data/entity/entity_sources";
+import type { DeviceRegistryEntry } from "../../data/device_registry";
+import { getDeviceIntegrationLookup } from "../../data/device_registry";
+import type { EntitySources } from "../../data/entity_sources";
+import { fetchEntitySourcesWithCache } from "../../data/entity_sources";
 import type { TargetSelector } from "../../data/selector";
 import {
-  computeCreateDomains,
   filterSelectorDevices,
   filterSelectorEntities,
+  computeCreateDomains,
 } from "../../data/selector";
 import type { HomeAssistant } from "../../types";
 import "../ha-target-picker";

src/components/ha-service-picker.ts

@@ -22,10 +22,10 @@ interface ServiceComboBoxItem extends PickerComboBoxItem {
 }
 
 const SEARCH_KEYS = [
-  { name: "search_labels.name", weight: 10 },
-  { name: "search_labels.description", weight: 8 },
-  { name: "search_labels.domainName", weight: 6 },
-  { name: "search_labels.serviceId", weight: 3 },
+  { name: "name", weight: 10 },
+  { name: "description", weight: 8 },
+  { name: "domainName", weight: 6 },
+  { name: "serviceId", weight: 3 },
 ];
 
 @customElement("ha-service-picker")
@@ -135,6 +135,7 @@ class HaServicePicker extends LitElement {
       <ha-generic-picker
         .hass=${this.hass}
         .autofocus=${this.autofocus}
+        allow-custom-value
         .notFoundLabel=${this.hass.localize(
           "ui.components.service-picker.no_match"
         )}

src/components/ha-target-picker.ts

@@ -13,30 +13,32 @@ import memoizeOne from "memoize-one";
 import { ensureArray } from "../common/array/ensure-array";
 import { fireEvent } from "../common/dom/fire_event";
 import { isValidEntityId } from "../common/entity/valid_entity_id";
-import { caseInsensitiveStringCompare } from "../common/string/compare";
 import { computeRTL } from "../common/util/compute_rtl";
 import {
   areaFloorComboBoxKeys,
   getAreasAndFloors,
   type AreaFloorValue,
   type FloorComboBoxItem,
-} from "../data/area_floor_picker";
+} from "../data/area_floor";
 import { getConfigEntries, type ConfigEntry } from "../data/config_entries";
 import { labelsContext } from "../data/context";
 import {
   deviceComboBoxKeys,
   getDevices,
   type DevicePickerItem,
-} from "../data/device/device_picker";
-import type { HaEntityPickerEntityFilterFunc } from "../data/entity/entity";
+} from "../data/device_registry";
+import type { HaEntityPickerEntityFilterFunc } from "../data/entity";
 import {
   entityComboBoxKeys,
   getEntities,
   type EntityComboBoxItem,
-} from "../data/entity/entity_picker";
+} from "../data/entity_registry";
 import { domainToName } from "../data/integration";
-import { getLabels, labelComboBoxKeys } from "../data/label/label_picker";
-import type { LabelRegistryEntry } from "../data/label/label_registry";
+import {
+  getLabels,
+  labelComboBoxKeys,
+  type LabelRegistryEntry,
+} from "../data/label_registry";
 import {
   areaMeetsFilter,
   deviceMeetsFilter,
@@ -743,7 +745,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
             : undefined,
           undefined,
           `entity${SEPARATOR}`
-        ).sort(this._sortBySortingLabel);
+        );
 
         if (searchTerm) {
           entityItems = this._filterGroup(
@@ -776,7 +778,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
             : undefined,
           undefined,
           `device${SEPARATOR}`
-        ).sort(this._sortBySortingLabel);
+        );
 
         if (searchTerm) {
           deviceItems = this._filterGroup(
@@ -862,7 +864,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
           entityFilter,
           targetValue?.label_id ? ensureArray(targetValue.label_id) : undefined,
           `label${SEPARATOR}`
-        ).sort(this._sortBySortingLabel);
+        );
 
         if (searchTerm) {
           labels = this._filterGroup(
@@ -962,7 +964,10 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
     let hasFloor = false;
     let rtl = false;
     let showEntityId = false;
+
     if (type === "area" || type === "floor") {
+      item.id = item[type]?.[`${type}_id`];
+
       rtl = computeRTL(this.hass);
       hasFloor =
         type === "area" && !!(item as FloorComboBoxItem).area?.floor_id;
@@ -1068,13 +1073,6 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
       term: html`<b>‘${search}’</b>`,
     });
 
-  private _sortBySortingLabel = (entityA, entityB) =>
-    caseInsensitiveStringCompare(
-      (entityA as PickerComboBoxItem).sorting_label!,
-      (entityB as PickerComboBoxItem).sorting_label!,
-      this.hass?.locale.language ?? navigator.language
-    );
-
   static get styles(): CSSResultGroup {
     return css`
       .add-target-wrapper {

src/components/ha-toast.ts

@@ -13,7 +13,6 @@ export class HaToast extends Snackbar {
       }
 
       .mdc-snackbar {
-        z-index: 10;
         margin: 8px;
         right: calc(8px + var(--safe-area-inset-right));
         bottom: calc(8px + var(--safe-area-inset-bottom));

src/components/ha-wa-dialog.ts

@@ -13,7 +13,6 @@ import { fireEvent } from "../common/dom/fire_event";
 import { ScrollableFadeMixin } from "../mixins/scrollable-fade-mixin";
 import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant } from "../types";
-import { isIosApp } from "../util/is_ios";
 import "./ha-dialog-header";
 import "./ha-icon-button";
 
@@ -185,21 +184,6 @@ export class HaWaDialog extends ScrollableFadeMixin(LitElement) {
     await this.updateComplete;
 
     requestAnimationFrame(() => {
-      if (isIosApp(this.hass)) {
-        const element = this.querySelector("[autofocus]");
-        if (element !== null) {
-          if (!element.id) {
-            element.id = "ha-wa-dialog-autofocus";
-          }
-          this.hass.auth.external!.fireMessage({
-            type: "focus_element",
-            payload: {
-              element_id: element.id,
-            },
-          });
-        }
-        return;
-      }
       (this.querySelector("[autofocus]") as HTMLElement | null)?.focus();
     });
   };
@@ -251,12 +235,6 @@ export class HaWaDialog extends ScrollableFadeMixin(LitElement) {
           );
           max-width: var(--ha-dialog-max-width, var(--safe-width));
         }
-        @media (prefers-reduced-motion: reduce) {
-          wa-dialog {
-            --show-duration: 0ms;
-            --hide-duration: 0ms;
-          }
-        }
 
         :host([width="small"]) wa-dialog {
           --width: min(var(--ha-dialog-width-sm, 320px), var(--full-width));

src/components/map/ha-entity-marker.ts

@@ -68,8 +68,8 @@ class HaEntityMarker extends LitElement {
       text-align: center;
       align-items: center;
       box-sizing: border-box;
-      width: var(--ha-marker-size, 48px);
-      height: var(--ha-marker-size, 48px);
+      width: 48px;
+      height: 48px;
       font-size: var(--ha-marker-font-size, var(--ha-font-size-xl));
       border-radius: var(--ha-marker-border-radius, 50%);
       border: 1px solid var(--ha-marker-color, var(--primary-color));

src/components/map/ha-map.ts

@@ -560,11 +560,10 @@ export class HaMap extends ReactiveElement {
           radius,
         });
 
-        const markerIconSize = this._getMarkerSize(computedStyles) / 2;
         const marker = new DecoratedMarker([latitude, longitude], circle, {
           icon: Leaflet.divIcon({
             html: iconHTML,
-            iconSize: [markerIconSize, markerIconSize],
+            iconSize: [24, 24],
             className,
           }),
           interactive: this.interactiveZones,
@@ -619,11 +618,10 @@ export class HaMap extends ReactiveElement {
       }
 
       // create marker with the icon
-      const markerSize = this._getMarkerSize(computedStyles);
       const marker = new DecoratedMarker([latitude, longitude], undefined, {
         icon: Leaflet.divIcon({
           html: entityMarker,
-          iconSize: [markerSize, markerSize],
+          iconSize: [48, 48],
           className: "",
         }),
         title: title,
@@ -659,13 +657,6 @@ export class HaMap extends ReactiveElement {
     this._mapZones.forEach((marker) => map.addLayer(marker));
   }
 
-  private _getMarkerSize(computedStyles: CSSStyleDeclaration): number {
-    const markerSizeVarValue =
-      computedStyles.getPropertyValue("--ha-marker-size");
-    const parsed = parseFloat(markerSizeVarValue);
-    return Number.isNaN(parsed) ? 48 : parsed;
-  }
-
   private async _attachObserver(): Promise<void> {
     if (!this._resizeObserver) {
       this._resizeObserver = new ResizeObserver(() => {
@@ -748,19 +739,14 @@ export class HaMap extends ReactiveElement {
       text-align: center;
     }
 
-    ha-icon {
-      --mdc-icon-size: calc(var(--ha-marker-size, 48px) / 2);
-    }
-
     .marker-cluster div {
       background-clip: padding-box;
       background-color: var(--primary-color);
       border: 3px solid rgba(var(--rgb-primary-color), 0.2);
-      width: calc(var(--ha-marker-size, 48px) * 0.667);
-      height: calc(var(--ha-marker-size, 48px) * 0.667);
-      border-radius: 50%;
+      width: 32px;
+      height: 32px;
+      border-radius: var(--ha-border-radius-2xl);
       text-align: center;
-      align-content: center;
       color: var(--text-primary-color);
       font-size: var(--ha-font-size-m);
     }

src/components/media-player/dialog-join-media-players.ts

@@ -7,7 +7,7 @@ import { fireEvent } from "../../common/dom/fire_event";
 import { computeDomain } from "../../common/entity/compute_domain";
 import { computeStateName } from "../../common/entity/compute_state_name";
 import { supportsFeature } from "../../common/entity/supports-feature";
-import type { EntityRegistryDisplayEntry } from "../../data/entity/entity_registry";
+import type { EntityRegistryDisplayEntry } from "../../data/entity_registry";
 import { extractApiErrorMessage } from "../../data/hassio/common";
 import {
   type MediaPlayerEntity,

src/components/media-player/ha-media-player-browse.ts

@@ -17,7 +17,7 @@ import { until } from "lit/directives/until";
 import { fireEvent } from "../../common/dom/fire_event";
 import { slugify } from "../../common/string/slugify";
 import { debounce } from "../../common/util/debounce";
-import { isUnavailableState } from "../../data/entity/entity";
+import { isUnavailableState } from "../../data/entity";
 import type {
   MediaPickedEvent,
   MediaPlayerBrowseAction,

src/components/target-picker/dialog/show-dialog-target-details.ts

@@ -1,5 +1,5 @@
 import { fireEvent } from "../../../common/dom/fire_event";
-import type { HaEntityPickerEntityFilterFunc } from "../../../data/entity/entity";
+import type { HaEntityPickerEntityFilterFunc } from "../../../data/entity";
 import type { TargetType } from "../../../data/target";
 import type { HaDevicePickerDeviceFilterFunc } from "../../device/ha-device-picker";
 

src/components/target-picker/ha-target-picker-item-group.ts

@@ -1,6 +1,6 @@
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
-import type { HaEntityPickerEntityFilterFunc } from "../../data/entity/entity";
+import type { HaEntityPickerEntityFilterFunc } from "../../data/entity";
 import type { TargetType, TargetTypeFloorless } from "../../data/target";
 import type { HomeAssistant } from "../../types";
 import type { HaDevicePickerDeviceFilterFunc } from "../device/ha-device-picker";

src/components/target-picker/ha-target-picker-item-row.ts

@@ -23,11 +23,11 @@ import { computeRTL } from "../../common/util/compute_rtl";
 import type { AreaRegistryEntry } from "../../data/area_registry";
 import { getConfigEntry } from "../../data/config_entries";
 import { labelsContext } from "../../data/context";
-import type { DeviceRegistryEntry } from "../../data/device/device_registry";
-import type { HaEntityPickerEntityFilterFunc } from "../../data/entity/entity";
+import type { DeviceRegistryEntry } from "../../data/device_registry";
+import type { HaEntityPickerEntityFilterFunc } from "../../data/entity";
 import type { FloorRegistryEntry } from "../../data/floor_registry";
 import { domainToName } from "../../data/integration";
-import type { LabelRegistryEntry } from "../../data/label/label_registry";
+import type { LabelRegistryEntry } from "../../data/label_registry";
 import {
   areaMeetsFilter,
   deviceMeetsFilter,

src/components/target-picker/ha-target-picker-value-chip.ts

@@ -23,7 +23,7 @@ import { slugify } from "../../common/string/slugify";
 import { getConfigEntry } from "../../data/config_entries";
 import { labelsContext } from "../../data/context";
 import { domainToName } from "../../data/integration";
-import type { LabelRegistryEntry } from "../../data/label/label_registry";
+import type { LabelRegistryEntry } from "../../data/label_registry";
 import type { TargetType } from "../../data/target";
 import type { HomeAssistant } from "../../types";
 import { brandsUrl } from "../../util/brands-url";

src/components/trace/ha-trace-blueprint-config.ts

@@ -17,7 +17,6 @@ export class HaTraceBlueprintConfig extends LitElement {
     return html`
       <ha-code-editor
         .value=${dump(this.trace.blueprint_inputs || "").trimRight()}
-        .hass=${this.hass}
         read-only
         dir="ltr"
       ></ha-code-editor>

src/components/trace/ha-trace-config.ts

@@ -17,7 +17,6 @@ export class HaTraceConfig extends LitElement {
     return html`
       <ha-code-editor
         .value=${dump(this.trace.config).trimRight()}
-        .hass=${this.hass}
         read-only
         dir="ltr"
       ></ha-code-editor>

src/components/trace/ha-trace-path-details.ts

@@ -1,16 +1,14 @@
-import { consume } from "@lit/context";
 import { dump } from "js-yaml";
+import { consume } from "@lit/context";
 import type { CSSResultGroup, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { formatDateTimeWithSeconds } from "../../common/datetime/format_date_time";
-import { describeCondition, describeTrigger } from "../../data/automation_i18n";
-import { fullEntitiesContext, labelsContext } from "../../data/context";
-import type { EntityRegistryEntry } from "../../data/entity/entity_registry";
-import type { LabelRegistryEntry } from "../../data/label/label_registry";
+import "../ha-code-editor";
+import "../ha-icon-button";
+import "./hat-logbook-note";
 import type { LogbookEntry } from "../../data/logbook";
-import { describeAction } from "../../data/script_i18n";
 import type {
   ActionTraceStep,
   ChooseActionTraceStep,
@@ -18,12 +16,19 @@ import type {
 } from "../../data/trace";
 import { getDataFromPath } from "../../data/trace";
 import "../../panels/logbook/ha-logbook-renderer";
-import type { HomeAssistant } from "../../types";
-import "../ha-code-editor";
-import "../ha-icon-button";
-import "./hat-logbook-note";
-import type { NodeInfo } from "./hat-script-graph";
 import { traceTabStyles } from "./trace-tab-styles";
+import type { HomeAssistant } from "../../types";
+import type { NodeInfo } from "./hat-script-graph";
+import { describeCondition, describeTrigger } from "../../data/automation_i18n";
+import type { EntityRegistryEntry } from "../../data/entity_registry";
+import type { LabelRegistryEntry } from "../../data/label_registry";
+import type { FloorRegistryEntry } from "../../data/floor_registry";
+import {
+  floorsContext,
+  fullEntitiesContext,
+  labelsContext,
+} from "../../data/context";
+import { describeAction } from "../../data/script_i18n";
 
 const TRACE_PATH_TABS = [
   "step_config",
@@ -58,6 +63,10 @@ export class HaTracePathDetails extends LitElement {
   @consume({ context: labelsContext, subscribe: true })
   _labelReg!: LabelRegistryEntry[];
 
+  @state()
+  @consume({ context: floorsContext, subscribe: true })
+  _floorReg!: Record<string, FloorRegistryEntry>;
+
   protected render(): TemplateResult {
     return html`
       <div class="padded-box trace-info">
@@ -184,6 +193,8 @@ export class HaTracePathDetails extends LitElement {
                           ${describeAction(
                             this.hass,
                             this._entityReg,
+                            this._labelReg,
+                            this._floorReg,
                             currentDetail
                           )}
                         </h2>`
@@ -267,7 +278,6 @@ export class HaTracePathDetails extends LitElement {
     return config
       ? html`<ha-code-editor
           .value=${dump(config).trimEnd()}
-          .hass=${this.hass}
           read-only
           dir="ltr"
         ></ha-code-editor>`

src/components/trace/hat-trace-timeline.ts

@@ -15,13 +15,19 @@ import { formatDateTimeWithSeconds } from "../../common/datetime/format_date_tim
 import { relativeTime } from "../../common/datetime/relative_time";
 import { fireEvent } from "../../common/dom/fire_event";
 import { toggleAttribute } from "../../common/dom/toggle_attribute";
-import { fullEntitiesContext } from "../../data/context";
-import type { EntityRegistryEntry } from "../../data/entity/entity_registry";
+import {
+  floorsContext,
+  fullEntitiesContext,
+  labelsContext,
+} from "../../data/context";
+import type { EntityRegistryEntry } from "../../data/entity_registry";
+import type { FloorRegistryEntry } from "../../data/floor_registry";
+import type { LabelRegistryEntry } from "../../data/label_registry";
 import type { LogbookEntry } from "../../data/logbook";
 import type {
   ChooseAction,
-  IfAction,
   Option,
+  IfAction,
   ParallelAction,
   RepeatAction,
   SequenceAction,
@@ -191,6 +197,8 @@ class ActionRenderer {
   constructor(
     private hass: HomeAssistant,
     private entityReg: EntityRegistryEntry[],
+    private labelReg: LabelRegistryEntry[],
+    private floorReg: Record<string, FloorRegistryEntry>,
     private entries: TemplateResult[],
     private trace: AutomationTraceExtended,
     private logbookRenderer: LogbookRenderer,
@@ -305,7 +313,14 @@ class ActionRenderer {
 
     this._renderEntry(
       path,
-      describeAction(this.hass, this.entityReg, data, actionType),
+      describeAction(
+        this.hass,
+        this.entityReg,
+        this.labelReg,
+        this.floorReg,
+        data,
+        actionType
+      ),
       undefined,
       data.enabled === false
     );
@@ -470,7 +485,13 @@ class ActionRenderer {
 
     const name =
       repeatConfig.alias ||
-      describeAction(this.hass, this.entityReg, repeatConfig);
+      describeAction(
+        this.hass,
+        this.entityReg,
+        this.labelReg,
+        this.floorReg,
+        repeatConfig
+      );
 
     this._renderEntry(repeatPath, name, undefined, disabled);
 
@@ -564,7 +585,14 @@ class ActionRenderer {
     this._renderEntry(
       sequencePath,
       sequenceConfig.alias ||
-        describeAction(this.hass, this.entityReg, sequenceConfig, "sequence"),
+        describeAction(
+          this.hass,
+          this.entityReg,
+          this.labelReg,
+          this.floorReg,
+          sequenceConfig,
+          "sequence"
+        ),
       undefined,
       sequenceConfig.enabled === false
     );
@@ -655,6 +683,14 @@ export class HaAutomationTracer extends LitElement {
   @consume({ context: fullEntitiesContext, subscribe: true })
   _entityReg!: EntityRegistryEntry[];
 
+  @state()
+  @consume({ context: labelsContext, subscribe: true })
+  _labelReg!: LabelRegistryEntry[];
+
+  @state()
+  @consume({ context: floorsContext, subscribe: true })
+  _floorReg!: Record<string, FloorRegistryEntry>;
+
   protected render() {
     if (!this.trace) {
       return nothing;
@@ -671,6 +707,8 @@ export class HaAutomationTracer extends LitElement {
     const actionRenderer = new ActionRenderer(
       this.hass,
       this._entityReg,
+      this._labelReg,
+      this._floorReg,
       entries,
       this.trace,
       logbookRenderer,

src/components/user/ha-user-picker.ts

@@ -132,9 +132,9 @@ class HaUserPicker extends LitElement {
         .hass=${this.hass}
         .autofocus=${this.autofocus}
         .label=${this.label}
+        .notFoundLabel=${this._notFoundLabel}
         .placeholder=${placeholder}
         .value=${this.value}
-        .notFoundLabel=${this._notFoundLabel}
         .getItems=${this._getItems}
         .valueRenderer=${this._valueRenderer}
         .rowRenderer=${this._rowRenderer}

src/data/alarm_control_panel.ts

@@ -13,7 +13,7 @@ import type {
 import { supportsFeature } from "../common/entity/supports-feature";
 import { showEnterCodeDialog } from "../dialogs/enter-code/show-enter-code-dialog";
 import type { HomeAssistant } from "../types";
-import { getExtendedEntityRegistryEntry } from "./entity/entity_registry";
+import { getExtendedEntityRegistryEntry } from "./entity_registry";
 
 export const FORMAT_TEXT = "text";
 export const FORMAT_NUMBER = "number";