Extract a reusable entity table

Fix entity filter selection races
2026-09-25 22:40:24 +00:00 · 2026-09-08 08:33:37 +01:00 · 2026-09-08 08:33:37 +01:00
526 changed files with 9513 additions and 29416 deletions
@@ -7,12 +7,6 @@ description: Home Assistant frontend PR and review guidance, including implement

 Use this skill when reviewing Home Assistant frontend changes or preparing a pull request.

-## Review Preparation
-
-1. Establish the review scope from the diff and the behavior changed by it.
-2. Before identifying findings, use the [project skill catalogue](../../../AGENTS.md#project-skills) to load every matching companion's `SKILL.md`. Follow applicable companion references in those skills as well; this review skill supplies the workflow, and companions supply the domain-specific criteria.
-3. Apply all loaded guidance within that scope. Report only problems introduced or worsened by the changeset, anchored to changed lines. Read surrounding code to understand affected behavior, not to generate unrelated cleanup or migration requests.
-
 ## Pull Request Body

 When creating a pull request, use `.github/PULL_REQUEST_TEMPLATE.md` as the body.
@@ -122,3 +116,4 @@ For user-facing changes, establish the existing design context as part of fronte
 - Record the applicable UI/UX evidence for user-facing changes, whether or not further input is needed.
 - Keep style-only comments secondary unless they affect maintainability or user experience.
 - Prefer small, direct fixes over large refactors during review follow-up.
+- Load the matching `ha-frontend-*` skill when a finding falls within its area.
@@ -32,12 +32,12 @@ jobs:
          persist-credentials: false

      - name: Initialize CodeQL
-        uses: github/codeql-action/init@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0
+        uses: github/codeql-action/init@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
        with:
          languages: javascript-typescript
          build-mode: none

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0
+        uses: github/codeql-action/analyze@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
        with:
          category: "/language:javascript-typescript"
@@ -36,7 +36,7 @@ jobs:
          python-version: ${{ env.PYTHON_VERSION }}

      - name: Verify version
-        uses: home-assistant/actions/helpers/verify-version@58bff37c8947f690ace498be413a9b78d6f30f93 # master
+        uses: home-assistant/actions/helpers/verify-version@a7c616ce81ccda50150bf1595786c71b1883fabb # master

      - name: Setup Node and install
        uses: ./.github/actions/setup
@@ -1 +1 @@
-24.21.0
+24.20.0
@@ -37,7 +37,7 @@ Never run `tsc` or `yarn lint:types` with file arguments. When `tsc` receives fi

 ## Project Skills

-Detailed guidance lives in `.agents/skills/<name>/SKILL.md`. Load every matching skill before detailed implementation or review. For reviews, load `ha-frontend-review` alongside all companions that apply to the changed code or behavior:
+Detailed guidance lives in project skills under `.agents/skills/`. Load the matching skill before detailed implementation or review:

 - `ha-frontend-contexts`: Lit contexts, `hass` migration, and rerender-sensitive state access.
 - `ha-frontend-components`: dialogs, forms, alerts, shortcuts, tooltips, panels, and Lovelace cards.
@@ -81,8 +81,6 @@ async function copyMapPanel(staticDir) {
    npmPath("@mapbox/mapbox-gl-rtl-text/dist/mapbox-gl-rtl-text.js"),
    staticPath("map/")
  );
-  // Controls and popups of the native MapLibre engine
-  copyFileDir(npmPath("maplibre-gl/dist/maplibre-gl.css"), staticPath("map/"));
 }

 function copyZXingWasm(staticDir) {
@@ -1,7 +1,6 @@
 import { bluetoothFixtures } from "./bluetooth/fixtures";
 import { infraredFixtures } from "./infrared/fixtures";
 import { matterFixtures } from "./matter/fixtures";
-import { modbusFixtures } from "./modbus/fixtures";
 import { mqttFixtures } from "./mqtt/fixtures";
 import { radioFrequencyFixtures } from "./radio_frequency/fixtures";
 import { serialFixtures } from "./serial/fixtures";
@@ -17,7 +16,6 @@ import { zwaveJsFixtures } from "./zwave_js/fixtures";
 const INTEGRATIONS: ConnectivityFixtures[] = [
  bluetoothFixtures,
  serialFixtures,
-  modbusFixtures,
  mqttFixtures,
  matterFixtures,
  infraredFixtures,
@@ -1,7 +1,6 @@
 import type { MockHomeAssistant } from "../../../../src/fake_data/provide_hass";
 import { mockBluetooth } from "./bluetooth/mock";
 import { mockMatter } from "./matter/mock";
-import { mockModbus } from "./modbus/mock";
 import { mockMqtt } from "./mqtt/mock";
 import { mockRadioFrequency } from "./radio_frequency/mock";
 import { mockSerial } from "./serial/mock";
@@ -13,7 +12,6 @@ import { mockZwaveJs } from "./zwave_js/mock";
 const MOCKS = [
  mockBluetooth,
  mockSerial,
-  mockModbus,
  mockMatter,
  mockMqtt,
  mockZwaveJs,
@@ -1,47 +0,0 @@
-import { manifest } from "../../manifest";
-import { configEntry } from "../helpers";
-import type { ConnectivityFixtures } from "../types";
-
-export const FLEXIT_ENTRY_ID = "mock-flexit";
-export const SOLAREDGE_ENTRY_ID = "mock-solaredge";
-export const FRONIUS_ENTRY_ID = "mock-fronius";
-
-/** The RS-485 adapter the two serial devices share, as the Serial panel lists it. */
-export const RS485_PORT = "/dev/ttyUSB1";
-
-export const modbusFixtures: ConnectivityFixtures = {
-  components: ["modbus"],
-  commands: ["modbus/"],
-  manifests: [
-    manifest("flexit", "Flexit", {
-      integration_type: "device",
-      iot_class: "local_polling",
-    }),
-    manifest("solaredge_modbus", "SolarEdge Modbus", {
-      integration_type: "device",
-      iot_class: "local_polling",
-    }),
-    manifest("fronius", "Fronius", {
-      integration_type: "device",
-      iot_class: "local_polling",
-    }),
-  ],
-  configEntries: [
-    {
-      type: "device",
-      entry: configEntry(FLEXIT_ENTRY_ID, "flexit", "Flexit Nordic S4"),
-    },
-    {
-      type: "device",
-      entry: configEntry(
-        SOLAREDGE_ENTRY_ID,
-        "solaredge_modbus",
-        "SolarEdge SE7K"
-      ),
-    },
-    {
-      type: "device",
-      entry: configEntry(FRONIUS_ENTRY_ID, "fronius", "Fronius Symo"),
-    },
-  ],
-};
@@ -1,42 +0,0 @@
-import type { ModbusConnection } from "../../../../../src/data/modbus";
-import type { MockHomeAssistant } from "../../../../../src/fake_data/provide_hass";
-import {
-  FLEXIT_ENTRY_ID,
-  FRONIUS_ENTRY_ID,
-  RS485_PORT,
-  SOLAREDGE_ENTRY_ID,
-} from "./fixtures";
-
-const CONNECTIONS: ModbusConnection[] = [
-  // Two integrations on one RS-485 bus, which is what the panel exists to show
-  {
-    endpoint: ["serial", RS485_PORT],
-    connected: true,
-    source: "config_entry",
-    units: { [FLEXIT_ENTRY_ID]: [1], [SOLAREDGE_ENTRY_ID]: [2] },
-  },
-  {
-    endpoint: ["tcp", "192.168.1.42", 502],
-    connected: true,
-    source: "config_entry",
-    units: { [FRONIUS_ENTRY_ID]: [1] },
-  },
-  // A second inverter behind a gateway that is not answering
-  {
-    endpoint: ["tcp", "modbus-gateway.local", 502],
-    connected: false,
-    source: "config_entry",
-    units: { [FRONIUS_ENTRY_ID]: [2] },
-  },
-  // A YAML hub keeps a link of its own to a device an integration also talks to
-  {
-    endpoint: ["tcp", "192.168.1.42", 502],
-    connected: true,
-    source: "yaml",
-    units: { modbus_hub: [10, 11] },
-  },
-];
-
-export const mockModbus = (hass: MockHomeAssistant) => {
-  hass.mockWS("modbus/connections/list", () => ({ connections: CONNECTIONS }));
-};
@@ -1,12 +1,5 @@
 import type { SerialPortUsage } from "../../../../../src/data/usb";
 import type { MockHomeAssistant } from "../../../../../src/fake_data/provide_hass";
-// The RS-485 port below carries the Modbus connections, so both sides name the
-// same config entries.
-import {
-  FLEXIT_ENTRY_ID,
-  RS485_PORT,
-  SOLAREDGE_ENTRY_ID,
-} from "../modbus/fixtures";

 const PORTS: SerialPortUsage[] = [
  {
@@ -62,7 +55,7 @@ const PORTS: SerialPortUsage[] = [
    discovery_flows: [],
  },
  {
-    device: RS485_PORT,
+    device: "/dev/ttyUSB1",
    resolved_device:
      "/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A50285BI-if00-port0",
    serial_number: "A50285BI",
@@ -75,24 +68,7 @@ const PORTS: SerialPortUsage[] = [
    bcd_device: 1536,
    matching_integrations: [],
    present: true,
-    consumers: [
-      {
-        kind: "config_entry",
-        title: "Flexit Nordic S4",
-        active: true,
-        domain: "flexit",
-        config_entry_id: FLEXIT_ENTRY_ID,
-        slug: null,
-      },
-      {
-        kind: "config_entry",
-        title: "SolarEdge SE7K",
-        active: true,
-        domain: "solaredge_modbus",
-        config_entry_id: SOLAREDGE_ENTRY_ID,
-        slug: null,
-      },
-    ],
+    consumers: [],
    discovery_flows: [],
  },
  {
@@ -358,12 +358,6 @@ export const mockHassioSupervisor = (hass: MockHomeAssistant) => {
      return data;
    }

-    if (msg.endpoint === "/ingress/panels") {
-      // The navigation picker waits for this collection before it enables
-      // itself, so it has to answer even when no add-on exposes a panel.
-      return { panels: {} };
-    }
-
    if (msg.endpoint === "/store/reload") {
      return null;
    }
@@ -3,6 +3,7 @@ import { customElement, property } from "lit/decorators";
 import "../../../src/components/ha-card";
 import "../../../src/dialogs/more-info/more-info-content";
 import "../../../src/state-summary/state-card-content";
+import "../ha-demo-options";
 import type { HomeAssistant } from "../../../src/types";
 import { computeShowNewMoreInfo } from "../../../src/dialogs/more-info/const";

@@ -1,7 +1,9 @@
 import { html, css, LitElement } from "lit";
 import { customElement } from "lit/decorators";
 import "../../src/components/ha-icon-button";
+import "../../src/managers/notification-manager";
 import { haStyle } from "../../src/resources/styles";
+import "./components/page-description";

@customElement("ha-demo-options")
 class HaDemoOptions extends LitElement {
@@ -9,7 +9,6 @@ import { ifDefined } from "lit/directives/if-defined";
 import { applyThemesOnElement } from "../../src/common/dom/apply_themes_on_element";
 import { dynamicElement } from "../../src/common/dom/dynamic-element-directive";
 import type { HASSDomEvent } from "../../src/common/dom/fire_event";
-import { computeEntityNameDisplayWithoutContext } from "../../src/common/entity/compute_entity_name_display";
 import { setDirectionStyles } from "../../src/common/util/compute_rtl";
 import "../../src/components/ha-button";
 import "../../src/components/ha-drawer";
@@ -683,7 +682,10 @@ class HaGallery extends LitElement {
      formatEntityAttributeName: (_stateObj, attribute) => attribute,
      formatEntityAttributeValue: (stateObj, attribute, value) =>
        value != null ? value : (stateObj.attributes[attribute] ?? ""),
-      formatEntityName: computeEntityNameDisplayWithoutContext,
+      formatEntityName: (stateObj, type) =>
+        typeof type === "string"
+          ? type
+          : (stateObj.attributes.friendly_name ?? stateObj.entity_id),
    } as unknown as HomeAssistant;
  }

@@ -57,7 +57,6 @@ This component is based on the webawesome input component.
 | invalid              | Boolean                                                                                        | false      | Marks the input as invalid.                                                                                |
 | inset-label          | Boolean                                                                                        | false      | Uses an inset label style where the label stays inside the input.                                          |
 | validation-message   | String                                                                                         | ""         | Custom validation message shown when the input is invalid.                                                 |
-| input-id             | String                                                                                         | -          | Sets the native input's `id` and associated label `for` on the inner `wa-input`. Defaults to `"input"`.    |
 | pattern              | String                                                                                         | -          | A regular expression pattern to validate input against.                                                    |
 | minlength            | Number                                                                                         | -          | The minimum length of input that will be considered valid.                                                 |
 | maxlength            | Number                                                                                         | -          | The maximum length of input that will be considered valid.                                                 |
@@ -21,8 +21,6 @@ import "../../../../src/components/ha-settings-row";
 import type { BlueprintInput } from "../../../../src/data/blueprint";
 import type { DeviceRegistryEntry } from "../../../../src/data/device/device_registry";
 import type { LabelRegistryEntry } from "../../../../src/data/label/label_registry";
-import { StatisticMeanType } from "../../../../src/data/recorder";
-import type { SerialPort } from "../../../../src/data/usb";
 import {
  showDialog,
  type ShowDialogParams,
@@ -295,72 +293,9 @@ const LABELS: LabelRegistryEntry[] = [
  },
 ];

-const serialPort = (port: Partial<SerialPort>): SerialPort => ({
-  device: "/dev/ttyUSB0",
-  resolved_device: null,
-  serial_number: null,
-  manufacturer: null,
-  description: null,
-  matching_integrations: [],
-  present: true,
-  ...port,
-});
-
-// One port per section the picker groups by, relative to the "zha" domain the
-// serial port selector below is given as its flow context
-const SERIAL_PORTS: SerialPort[] = [
-  serialPort({
-    device:
-      "/dev/serial/by-id/usb-Nabu_Casa_SkyConnect_v1.0_9e2adbd75b8beb119fe564a0f320645d-if00-port0",
-    description: "SkyConnect v1.0",
-    manufacturer: "Nabu Casa",
-    serial_number: "9e2adbd75b8beb119fe564a0f320645d",
-    vid: "10C4",
-    pid: "EA60",
-    matching_integrations: ["zha"],
-  }),
-  serialPort({
-    device: "esphome-hass://01JQ8Z5X9WQ0/?port_name=UART0",
-  }),
-  serialPort({
-    device: "socket://192.168.1.10:6638",
-  }),
-  serialPort({
-    device: "/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_AB0KVD1L-if00-port0",
-    description: "FT232R USB UART",
-    manufacturer: "FTDI",
-    serial_number: "AB0KVD1L",
-    vid: "0403",
-    pid: "6001",
-  }),
-  serialPort({
-    device: "/dev/ttyS0",
-    description: "ttyS0",
-    manufacturer: "Intel",
-  }),
-  serialPort({ device: "/dev/ttyAMA0" }),
-  serialPort({
-    device:
-      "/dev/serial/by-id/usb-Silicon_Labs_CP2102_USB_to_UART_Bridge_Controller_0001-if00-port0",
-    description: "CP2102 USB to UART Bridge Controller",
-    manufacturer: "Silicon Labs",
-    serial_number: "0001",
-    vid: "10C4",
-    pid: "EA60",
-    matching_integrations: ["matter"],
-  }),
-];
-
 const SCHEMAS: {
  name: string;
-  input: Record<
-    string,
-    | (BlueprintInput & {
-        required?: boolean;
-        context?: Record<string, unknown>;
-      })
-    | null
-  >;
+  input: Record<string, (BlueprintInput & { required?: boolean }) | null>;
 }[] = [
  {
    name: "One of each",
@@ -385,13 +320,6 @@ const SCHEMAS: {
      },
      duration: { name: "Duration", selector: { duration: {} } },
      app: { name: "App", selector: { app: {} } },
-      serial_port: {
-        name: "Serial port",
-        selector: { serial_port: {} },
-        // A config flow passes its own domain as context, which is what the
-        // picker groups recommended and not recommended ports by
-        context: { domain: "zha" },
-      },
      number_box: {
        name: "Number Box",
        selector: {
@@ -576,99 +504,6 @@ const SCHEMAS: {
          },
        },
      },
-      addon: { name: "Add-on", selector: { addon: {} } },
-      areas_display: {
-        name: "Areas display",
-        selector: { areas_display: {} },
-      },
-      assist_pipeline: {
-        name: "Assist pipeline",
-        selector: { assist_pipeline: {} },
-      },
-      automation_behavior: {
-        name: "Automation behavior",
-        selector: { automation_behavior: { mode: "trigger" } },
-      },
-      backup_location: {
-        name: "Backup location",
-        selector: { backup_location: {} },
-      },
-      button_toggle: {
-        name: "Button toggle",
-        selector: {
-          button_toggle: {
-            options: [
-              { label: "Left", value: "left" },
-              { label: "Center", value: "center" },
-              { label: "Right", value: "right" },
-            ],
-          },
-        },
-      },
-      condition: { name: "Condition", selector: { condition: {} } },
-      conversation_agent: {
-        name: "Conversation agent",
-        selector: { conversation_agent: {} },
-      },
-      country: {
-        name: "Country",
-        selector: { country: { countries: ["DE", "GB", "NL", "US"] } },
-      },
-      entity_name: {
-        name: "Entity name",
-        selector: { entity_name: { entity_id: "light.bedroom" } },
-      },
-      file: {
-        name: "File",
-        selector: { file: { accept: "image/png,image/jpeg" } },
-      },
-      language: { name: "Language", selector: { language: {} } },
-      navigation: { name: "Navigation", selector: { navigation: {} } },
-      numeric_threshold: {
-        name: "Numeric threshold",
-        selector: { numeric_threshold: {} },
-      },
-      period: {
-        name: "Period",
-        selector: {
-          period: {
-            options: ["today", "yesterday", "this_week", "this_month"],
-          },
-        },
-        // Without a value that matches one of the options the selector offers
-        // its custom-period editor instead of the list
-        default: { calendar: { period: "day" } },
-      },
-      selector: {
-        name: "Selector",
-        selector: { selector: {} },
-        default: { text: {} },
-      },
-      state_class: { name: "State class", selector: { state_class: {} } },
-      statistic: { name: "Statistic", selector: { statistic: {} } },
-      stt: { name: "Speech-to-text", selector: { stt: {} } },
-      theme: { name: "Theme", selector: { theme: {} } },
-      timezone: { name: "Time zone", selector: { timezone: {} } },
-      trigger: { name: "Trigger", selector: { trigger: {} } },
-      tts: { name: "Text-to-speech", selector: { tts: {} } },
-      tts_voice: {
-        name: "Text-to-speech voice",
-        selector: { tts_voice: { engineId: "tts.cloud", language: "en-US" } },
-      },
-      ui_action: { name: "UI action", selector: { ui_action: {} } },
-      ui_clock_date_format: {
-        name: "Clock date format",
-        selector: { ui_clock_date_format: {} },
-      },
-      ui_color: { name: "UI color", selector: { ui_color: {} } },
-      ui_state_content: {
-        name: "State content",
-        selector: { ui_state_content: { entity_id: "light.bedroom" } },
-      },
-      ui_time_format: {
-        name: "Time format",
-        selector: { ui_time_format: {} },
-      },
    },
  },
  {
@@ -770,98 +605,8 @@ class DemoHaSelector extends LitElement implements ProvideHassElement {
    mockFloorRegistry(hass, FLOORS);
    mockLabelRegistry(hass, LABELS);
    mockHassioSupervisor(hass);
-    hass.addTranslations({
-      "component.matter.title": "Matter",
-      "component.zha.title": "Zigbee Home Automation",
-    });
-    hass.updateHass({
-      config: {
-        ...hass.config,
-        components: [...hass.config.components, "usb"],
-      },
-    });
    hass.mockWS("auth/sign_path", (params) => params);
    hass.mockWS("media_player/browse_media", this._browseMedia);
-    hass.mockWS("usb/list_serial_ports", () => SERIAL_PORTS);
-    hass.mockWS("recorder/list_statistic_ids", () => [
-      {
-        statistic_id: "sensor.energy_consumption",
-        statistics_unit_of_measurement: "kWh",
-        source: "recorder",
-        name: null,
-        has_sum: true,
-        mean_type: StatisticMeanType.NONE,
-        unit_class: "energy",
-      },
-      {
-        statistic_id: "sensor.outside_temperature",
-        statistics_unit_of_measurement: "\u00b0C",
-        source: "recorder",
-        name: null,
-        has_sum: false,
-        mean_type: StatisticMeanType.ARITHMETIC,
-        unit_class: "temperature",
-      },
-    ]);
-    hass.mockWS("assist_pipeline/pipeline/list", () => ({
-      pipelines: [
-        {
-          id: "pipeline_home",
-          name: "Home Assistant",
-          language: "en",
-          conversation_engine: "conversation.home_assistant",
-          conversation_language: "en",
-          stt_engine: "stt.cloud",
-          stt_language: "en-US",
-          tts_engine: "tts.cloud",
-          tts_language: "en-US",
-          tts_voice: "JennyNeural",
-          wake_word_entity: null,
-          wake_word_id: null,
-        },
-      ],
-      preferred_pipeline: "pipeline_home",
-    }));
-    hass.mockWS("conversation/agent/list", () => ({
-      agents: [
-        {
-          id: "conversation.home_assistant",
-          name: "Home Assistant",
-          supported_languages: "*",
-        },
-        {
-          id: "conversation.openai",
-          name: "OpenAI Conversation",
-          supported_languages: ["en"],
-        },
-      ],
-    }));
-    hass.mockWS("stt/engine/list", () => ({
-      providers: [
-        {
-          engine_id: "stt.cloud",
-          name: "Home Assistant Cloud",
-          supported_languages: ["en-US"],
-          deprecated: false,
-        },
-      ],
-    }));
-    hass.mockWS("tts/engine/list", () => ({
-      providers: [
-        {
-          engine_id: "tts.cloud",
-          name: "Home Assistant Cloud",
-          supported_languages: ["en-US"],
-          deprecated: false,
-        },
-      ],
-    }));
-    hass.mockWS("tts/engine/voices", () => ({
-      voices: [
-        { voice_id: "JennyNeural", name: "Jenny" },
-        { voice_id: "GuyNeural", name: "Guy" },
-      ],
-    }));
  }

  public provideHass(el) {
@@ -1031,7 +776,6 @@ class DemoHaSelector extends LitElement implements ProvideHassElement {
                    <ha-selector
                      .hass=${this.hass}
                      .selector=${value!.selector}
-                      .context=${value!.context}
                      .key=${key}
                      .label=${this._label ? value!.name : undefined}
                      .value=${data[key] ?? value!.default}
@@ -21,8 +21,7 @@ const ENTITIES = [
    state: "on",
    attributes: {
      friendly_name: "Dining Room",
-      supported_color_modes: ["brightness"],
-      color_mode: "brightness",
+      supported_features: 1,
      brightness: 100,
    },
  },
@@ -31,7 +30,7 @@ const ENTITIES = [
    state: "off",
    attributes: {
      friendly_name: "Dining Room",
-      supported_color_modes: ["brightness"],
+      supported_features: 1,
    },
  },
  {
@@ -39,7 +38,7 @@ const ENTITIES = [
    state: "unavailable",
    attributes: {
      friendly_name: "Lost Light",
-      supported_color_modes: ["brightness"],
+      supported_features: 1,
    },
  },
 ];
@@ -12,10 +12,7 @@ import "../../components/demo-cards";
 import { mockIcons } from "../../../../demo/src/stubs/icons";
 import { ClimateEntityFeature } from "../../../../src/data/climate";
 import { FanEntityFeature } from "../../../../src/data/fan";
-import type {
-  GridCardConfig,
-  TileCardConfig,
-} from "../../../../src/panels/lovelace/cards/types";
+import type { TileCardConfig } from "../../../../src/panels/lovelace/cards/types";

 const ENTITIES = [
  {
@@ -166,39 +163,6 @@ const ENTITIES = [
        FanEntityFeature.OSCILLATE,
    },
  },
-  {
-    entity_id: "fan.three_speed_fan",
-    state: "on",
-    attributes: {
-      friendly_name: "Desk fan",
-      device_class: "fan",
-      percentage: 67,
-      percentage_step: 100 / 3,
-      supported_features: FanEntityFeature.SET_SPEED,
-    },
-  },
-  {
-    entity_id: "fan.four_speed_fan",
-    state: "on",
-    attributes: {
-      friendly_name: "Bedroom fan",
-      device_class: "fan",
-      percentage: 50,
-      percentage_step: 25,
-      supported_features: FanEntityFeature.SET_SPEED,
-    },
-  },
-  {
-    entity_id: "fan.five_speed_fan",
-    state: "on",
-    attributes: {
-      friendly_name: "Attic fan",
-      device_class: "fan",
-      percentage: 80,
-      percentage_step: 20,
-      supported_features: FanEntityFeature.SET_SPEED,
-    },
-  },
 ];

 const CONFIGS = [
@@ -368,50 +332,6 @@ const CONFIGS = [
      features: [{ type: "fan-speed" }],
    },
  },
-  {
-    heading: "Fan speed feature (3 speeds)",
-    config: {
-      type: "tile",
-      entity: "fan.three_speed_fan",
-      features: [{ type: "fan-speed" }],
-    },
-  },
-  {
-    heading: "Fan speed feature (4 speeds)",
-    config: {
-      type: "tile",
-      entity: "fan.four_speed_fan",
-      features: [{ type: "fan-speed" }],
-    },
-  },
-  {
-    heading: "Fan speed feature (5 speeds)",
-    config: {
-      type: "tile",
-      entity: "fan.five_speed_fan",
-      features: [{ type: "fan-speed" }],
-    },
-  },
-  {
-    heading: "Fan speed feature (half width)",
-    config: {
-      type: "grid",
-      columns: 2,
-      square: false,
-      cards: [
-        {
-          type: "tile",
-          entity: "fan.four_speed_fan",
-          features: [{ type: "fan-speed" }],
-        },
-        {
-          type: "tile",
-          entity: "fan.five_speed_fan",
-          features: [{ type: "fan-speed" }],
-        },
-      ],
-    },
-  },
  {
    heading: "Fan oscillate feature",
    config: {
@@ -498,7 +418,7 @@ const CONFIGS = [
      ],
    },
  },
-] satisfies DemoCardConfig<TileCardConfig | GridCardConfig>[];
+] satisfies DemoCardConfig<TileCardConfig>[];

@customElement("demo-lovelace-tile-card")
 class DemoTile extends LitElement {
@@ -21,61 +21,6 @@ const ENTITIES = [
        FanEntityFeature.SET_SPEED,
    },
  },
-  {
-    entity_id: "fan.one_speed_fan",
-    state: "on",
-    attributes: {
-      friendly_name: "One speed fan",
-      device_class: "fan",
-      percentage: 100,
-      percentage_step: 100,
-      supported_features: FanEntityFeature.SET_SPEED,
-    },
-  },
-  {
-    entity_id: "fan.two_speed_fan",
-    state: "on",
-    attributes: {
-      friendly_name: "Two speed fan",
-      device_class: "fan",
-      percentage: 50,
-      percentage_step: 50,
-      supported_features: FanEntityFeature.SET_SPEED,
-    },
-  },
-  {
-    entity_id: "fan.three_speed_fan",
-    state: "on",
-    attributes: {
-      friendly_name: "Three speed fan",
-      device_class: "fan",
-      percentage: 67,
-      percentage_step: 100 / 3,
-      supported_features: FanEntityFeature.SET_SPEED,
-    },
-  },
-  {
-    entity_id: "fan.four_speed_fan",
-    state: "on",
-    attributes: {
-      friendly_name: "Four speed fan",
-      device_class: "fan",
-      percentage: 50,
-      percentage_step: 25,
-      supported_features: FanEntityFeature.SET_SPEED,
-    },
-  },
-  {
-    entity_id: "fan.five_speed_fan",
-    state: "on",
-    attributes: {
-      friendly_name: "Five speed fan",
-      device_class: "fan",
-      percentage: 80,
-      percentage_step: 20,
-      supported_features: FanEntityFeature.SET_SPEED,
-    },
-  },
 ];

@customElement("demo-more-info-fan")
@@ -11,7 +11,6 @@ import { LawnMowerEntityFeature } from "../../../../src/data/lawn_mower";
 const ALL_FEATURES =
  LawnMowerEntityFeature.START_MOWING +
  LawnMowerEntityFeature.PAUSE +
-  LawnMowerEntityFeature.STOP +
  LawnMowerEntityFeature.DOCK;

 const ENTITIES = [
@@ -50,14 +49,6 @@ const ENTITIES = [
      supported_features: ALL_FEATURES,
    },
  },
-  {
-    entity_id: "lawn_mower.idle",
-    state: "idle",
-    attributes: {
-      friendly_name: "Idle",
-      supported_features: ALL_FEATURES,
-    },
-  },
  {
    entity_id: "lawn_mower.error",
    state: "error",
@@ -1,9 +1,8 @@
 import { IntersectionController } from "@lit-labs/observers/intersection-controller.js";
 import { mdiArrowCollapseDown, mdiDownload } from "@mdi/js";
 import { LitElement, type PropertyValues, css, html, nothing } from "lit";
-import { customElement, query, state } from "lit/decorators";
+import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
-import { consumeLocalize } from "../../../src/common/decorators/consume-context-entry";
 import { fireEvent } from "../../../src/common/dom/fire_event";
 import type {
  LandingPageKeys,
@@ -35,6 +34,9 @@ const SCHEDULE_FETCH_OBSERVER_LOGS = 5;

@customElement("landing-page-logs")
 class LandingPageLogs extends LitElement {
+  @property({ attribute: false })
+  public localize!: LocalizeFunc<LandingPageKeys>;
+
  @query("ha-ansi-to-html") private _ansiToHtmlElement?: HaAnsiToHtml;

  @query(".logs") private _logElement?: HTMLElement;
@@ -42,10 +44,6 @@ class LandingPageLogs extends LitElement {
  @query("#scroll-bottom-marker")
  private _scrollBottomMarkerElement?: HTMLElement;

-  @state()
-  @consumeLocalize()
-  private _localize!: LocalizeFunc<LandingPageKeys>;
-
  @state() private _show = false;

  @state() private _scrolledToBottomController =
@@ -65,12 +63,12 @@ class LandingPageLogs extends LitElement {
    return html`
      <div class="actions">
        <ha-button appearance="plain" @click=${this._toggleLogDetails}>
-          ${this._localize(this._show ? "hide_details" : "show_details")}
+          ${this.localize(this._show ? "hide_details" : "show_details")}
        </ha-button>
        ${
          this._show
            ? html`<ha-icon-button
-                .label=${this._localize("logs.download_logs")}
+                .label=${this.localize("logs.download_logs")}
                .path=${mdiDownload}
                @click=${this._downloadLogs}
              ></ha-icon-button>`
@@ -82,14 +80,14 @@ class LandingPageLogs extends LitElement {
          ? html`
              <ha-alert
                alert-type="error"
-                .title=${this._localize("logs.fetch_error")}
+                .title=${this.localize("logs.fetch_error")}
              >
                <ha-button
                  size="small"
                  variant="danger"
                  @click=${this._startLogStream}
                >
-                  ${this._localize("logs.retry")}
+                  ${this.localize("logs.retry")}
                </ha-button>
              </ha-alert>
            `
@@ -117,7 +115,7 @@ class LandingPageLogs extends LitElement {
        @click=${this._scrollToBottom}
      >
        <ha-svg-icon .path=${mdiArrowCollapseDown} slot="start"></ha-svg-icon>
-        ${this._localize("logs.scroll_down_button")}
+        ${this.localize("logs.scroll_down_button")}
        <ha-svg-icon .path=${mdiArrowCollapseDown} slot="end"></ha-svg-icon>
      </ha-button>
    `;
@@ -1,37 +1,35 @@
-import { LitElement, css, html, nothing, type CSSResultGroup } from "lit";
-import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
-import { consumeLocalize } from "../../../src/common/decorators/consume-context-entry";
-import { fireEvent } from "../../../src/common/dom/fire_event";
+import { type CSSResultGroup, LitElement, css, html, nothing } from "lit";
+import { customElement, property } from "lit/decorators";
 import type {
  LandingPageKeys,
  LocalizeFunc,
 } from "../../../src/common/translations/localize";
-import "../../../src/components/ha-alert";
 import "../../../src/components/ha-button";
-import type { NetworkInterface } from "../../../src/data/hassio/network";
-import { showAlertDialog } from "../../../src/dialogs/generic/show-dialog-box";
+import "../../../src/components/ha-alert";
 import {
  ALTERNATIVE_DNS_SERVERS,
  setSupervisorNetworkDns,
  type NetworkInfo,
 } from "../data/supervisor";
+import { showAlertDialog } from "../../../src/dialogs/generic/show-dialog-box";
+import type { NetworkInterface } from "../../../src/data/hassio/network";
+import { fireEvent } from "../../../src/common/dom/fire_event";

@customElement("landing-page-network")
 class LandingPageNetwork extends LitElement {
+  @property({ attribute: false })
+  public localize!: LocalizeFunc<LandingPageKeys>;
+
  @property({ attribute: false }) public networkInfo?: NetworkInfo;

  @property({ type: Boolean }) public error = false;

-  @state()
-  @consumeLocalize()
-  private _localize!: LocalizeFunc<LandingPageKeys>;
-
  protected render() {
    if (this.error) {
      return html`
        <ha-alert alert-type="error">
-          <p>${this._localize("network_issue.error_get_network_info")}</p>
+          <p>${this.localize("network_issue.error_get_network_info")}</p>
        </ha-alert>
      `;
    }
@@ -49,21 +47,19 @@ class LandingPageNetwork extends LitElement {
    return html`
      <ha-alert
        alert-type="warning"
-        .title=${this._localize("network_issue.title")}
+        .title=${this.localize("network_issue.title")}
      >
        <p>
-          ${this._localize("network_issue.description", {
+          ${this.localize("network_issue.description", {
            dns: dnsPrimaryInterfaceNameservers || "?",
          })}
        </p>
-        <p>${this._localize("network_issue.resolve_different")}</p>
+        <p>${this.localize("network_issue.resolve_different")}</p>
        ${
          !dnsPrimaryInterfaceNameservers
            ? html`
                <p>
-                  <b
-                    >${this._localize("network_issue.no_primary_interface")}
-                  </b>
+                  <b>${this.localize("network_issue.no_primary_interface")} </b>
                </p>
              `
            : nothing
@@ -76,7 +72,7 @@ class LandingPageNetwork extends LitElement {
                .index=${key}
                .disabled=${!dnsPrimaryInterfaceNameservers}
                @click=${this._setDns}
-                >${this._localize(translationKey)}</ha-button
+                >${this.localize(translationKey)}</ha-button
              >`
          )}
        </div>
@@ -122,12 +118,12 @@ class LandingPageNetwork extends LitElement {
      // eslint-disable-next-line no-console
      console.error(err);
      showAlertDialog(this, {
-        title: this._localize("network_issue.failed"),
+        title: this.localize("network_issue.failed"),
        warning: true,
-        text: `${this._localize(
+        text: `${this.localize(
          "network_issue.set_dns_failed"
-        )}${err?.message ? ` ${this._localize("network_issue.error")}: ${err.message}` : ""}`,
-        confirmText: this._localize("network_issue.close"),
+        )}${err?.message ? ` ${this.localize("network_issue.error")}: ${err.message}` : ""}`,
+        confirmText: this.localize("network_issue.close"),
      });
    }
  }
@@ -9,7 +9,6 @@ import "../../src/components/ha-spinner";
 import "../../src/components/ha-svg-icon";
 import "../../src/components/progress/ha-progress-bar";
 import { makeDialogManager } from "../../src/dialogs/make-dialog-manager";
-import { provideLiteI18nMixin } from "../../src/mixins/provide-lite-i18n-mixin";
 import "../../src/onboarding/onboarding-welcome-links";
 import { onBoardingStyles } from "../../src/onboarding/styles";
 import { haStyle } from "../../src/resources/styles";
@@ -29,7 +28,7 @@ const SCHEDULE_FETCH_NETWORK_INFO_SECONDS = 5;
 const SCHEDULE_FETCH_JOBS_INFO_SECONDS = 2;

@customElement("ha-landing-page")
-class HaLandingPage extends provideLiteI18nMixin(LandingPageBaseElement) {
+class HaLandingPage extends LandingPageBaseElement {
  @property({ attribute: false }) public translationFragment = "landing-page";

  @state() private _supervisorError = false;
@@ -83,6 +82,7 @@ class HaLandingPage extends provideLiteI18nMixin(LandingPageBaseElement) {
            networkIssue || this._networkInfoError
              ? html`
                  <landing-page-network
+                    .localize=${this.localize}
                    .networkInfo=${this._networkInfo}
                    .error=${this._networkInfoError}
                    @dns-set=${this._fetchSupervisorInfo}
@@ -103,11 +103,13 @@ class HaLandingPage extends provideLiteI18nMixin(LandingPageBaseElement) {
              : nothing
          }
          <landing-page-logs
+            .localize=${this.localize}
            @landing-page-error=${this._showError}
          ></landing-page-logs>
        </div>
      </ha-card>
      <onboarding-welcome-links
+        .localize=${this.localize}
        .mobileApp=${this._mobileApp}
      ></onboarding-welcome-links>
      <div class="footer">
@@ -39,7 +39,7 @@
  "license": "Apache-2.0",
  "type": "module",
  "dependencies": {
-    "@babel/runtime": "8.0.5",
+    "@babel/runtime": "8.0.0",
    "@braintree/sanitize-url": "7.1.2",
    "@codemirror/autocomplete": "6.20.3",
    "@codemirror/commands": "6.11.0",
@@ -52,22 +52,22 @@
    "@codemirror/view": "6.43.11",
    "@date-fns/tz": "1.5.0",
    "@egjs/hammerjs": "2.0.17",
-    "@formatjs/intl-datetimeformat": "7.6.2",
-    "@formatjs/intl-displaynames": "7.3.14",
-    "@formatjs/intl-durationformat": "0.11.0",
-    "@formatjs/intl-getcanonicallocales": "3.2.12",
-    "@formatjs/intl-listformat": "8.3.14",
-    "@formatjs/intl-locale": "5.3.11",
-    "@formatjs/intl-numberformat": "9.4.1",
-    "@formatjs/intl-pluralrules": "6.3.14",
-    "@formatjs/intl-relativetimeformat": "12.3.14",
+    "@formatjs/intl-datetimeformat": "7.6.1",
+    "@formatjs/intl-displaynames": "7.3.13",
+    "@formatjs/intl-durationformat": "0.10.18",
+    "@formatjs/intl-getcanonicallocales": "3.2.11",
+    "@formatjs/intl-listformat": "8.3.13",
+    "@formatjs/intl-locale": "5.3.10",
+    "@formatjs/intl-numberformat": "9.4.0",
+    "@formatjs/intl-pluralrules": "6.3.13",
+    "@formatjs/intl-relativetimeformat": "12.3.13",
    "@fullcalendar/core": "6.1.21",
    "@fullcalendar/daygrid": "6.1.21",
    "@fullcalendar/interaction": "6.1.21",
    "@fullcalendar/list": "6.1.21",
    "@fullcalendar/luxon3": "6.1.21",
    "@fullcalendar/timegrid": "6.1.21",
-    "@home-assistant/webawesome": "3.7.0-ha.1",
+    "@home-assistant/webawesome": "3.7.0-ha.0",
    "@lezer/highlight": "1.2.3",
    "@lit-labs/motion": "1.1.0",
    "@lit-labs/observers": "2.1.0",
@@ -84,6 +84,7 @@
    "@mdi/svg": "7.4.47",
    "@replit/codemirror-indentation-markers": "6.5.3",
    "@swc/helpers": "0.5.23",
+    "@thomasloven/round-slider": "0.6.0",
    "@tsparticles/engine": "4.4.0",
    "@tsparticles/preset-links": "4.4.0",
    "@vibrant/color": "4.0.4",
@@ -103,20 +104,20 @@
    "echarts-extension-chart2music": "0.1.1",
    "element-internals-polyfill": "3.0.2",
    "fuse.js": "7.5.0",
-    "hls.js": "1.7.3",
+    "hls.js": "1.7.2",
    "home-assistant-js-websocket": "9.6.0",
    "idb-keyval": "6.3.0",
-    "intl-messageformat": "11.2.15",
+    "intl-messageformat": "11.2.14",
    "js-yaml": "5.4.1",
    "leaflet": "1.9.4",
+    "leaflet-draw": "patch:leaflet-draw@npm%3A1.0.4#./.yarn/patches/leaflet-draw-npm-1.0.4-0ca0ebcf65.patch",
    "leaflet.markercluster": "1.5.3",
    "lit": "3.3.3",
    "lit-html": "3.3.3",
    "luxon": "3.7.2",
    "maplibre-gl": "5.24.0",
-    "marked": "18.0.12",
+    "marked": "18.0.11",
    "memoize-one": "6.0.0",
-    "nanoid": "6.0.1",
    "node-vibrant": "4.0.4",
    "object-hash": "3.0.0",
    "punycode": "2.3.1",
@@ -139,10 +140,10 @@
  },
  "devDependencies": {
    "@ampproject/remapping": "2.3.0",
-    "@babel/core": "8.0.5",
+    "@babel/core": "8.0.1",
    "@babel/helper-define-polyfill-provider": "1.0.0",
    "@babel/plugin-transform-runtime": "8.0.1",
-    "@babel/preset-env": "8.0.5",
+    "@babel/preset-env": "8.0.2",
    "@bundle-stats/plugin-webpack-filter": "4.22.3",
    "@eslint/js": "10.0.1",
    "@gfx/zopfli": "1.0.15",
@@ -152,8 +153,8 @@
    "@octokit/plugin-retry": "8.1.1",
    "@octokit/rest": "22.0.1",
    "@playwright/test": "1.62.1",
-    "@rsdoctor/rspack-plugin": "1.6.4",
-    "@rspack/core": "2.2.3",
+    "@rsdoctor/rspack-plugin": "1.6.3",
+    "@rspack/core": "2.2.2",
    "@rspack/dev-server": "2.2.1",
    "@types/babel__plugin-transform-runtime": "7.9.5",
    "@types/chromecast-caf-receiver": "6.0.26",
@@ -162,6 +163,7 @@
    "@types/culori": "4.0.1",
    "@types/html-minifier-terser": "7.0.2",
    "@types/leaflet": "1.9.22",
+    "@types/leaflet-draw": "1.0.13",
    "@types/leaflet.markercluster": "1.5.6",
    "@types/lodash.merge": "4.6.9",
    "@types/luxon": "3.7.5",
@@ -170,7 +172,7 @@
    "@types/tar": "7.0.87",
    "@typescript/native": "npm:[email protected]",
    "@versatiles/style": "5.13.1",
-    "@vitest/coverage-v8": "5.0.0",
+    "@vitest/coverage-v8": "4.1.11",
    "babel-loader": "10.1.1",
    "babel-plugin-polyfill-corejs3": "1.0.0",
    "browserslist": "4.28.9",
@@ -195,10 +197,10 @@
    "html-minifier-terser": "7.2.0",
    "husky": "9.1.7",
    "jsdom": "30.0.1",
-    "jszip": "3.10.2",
+    "jszip": "3.10.1",
    "license-checker-rseidelsohn": "5.0.1",
    "lightningcss": "1.33.0",
-    "lint-staged": "17.5.1",
+    "lint-staged": "17.4.1",
    "lit-analyzer": "2.0.3",
    "lodash.merge": "4.6.2",
    "lodash.template": "4.18.1",
@@ -213,10 +215,9 @@
    "terser-webpack-plugin": "5.6.1",
    "ts-lit-plugin": "2.0.2",
    "typescript": "6.0.3",
-    "typescript-eslint": "8.70.0",
-    "vite": "8.3.0",
+    "typescript-eslint": "8.69.0",
    "vite-tsconfig-paths": "6.1.1",
-    "vitest": "5.0.0",
+    "vitest": "4.1.11",
    "webpack-stats-plugin": "1.1.3",
    "webpackbar": "7.0.0",
    "workbox-build": "patch:workbox-build@npm%3A7.4.1#~/.yarn/patches/workbox-build-npm-7.4.1-c84561662c.patch"
@@ -232,6 +233,6 @@
  },
  "packageManager": "[email protected]",
  "volta": {
-    "node": "24.21.0"
+    "node": "24.20.0"
  }
 }
@@ -23,7 +23,6 @@ import type {
 } from "../data/data_entry_flow";
 import "./ha-auth-form";
 import type { HaAuthForm } from "./ha-auth-form";
-import { consumeLocalize } from "../common/decorators/consume-context-entry";

 type State = "loading" | "error" | "step";

@@ -37,14 +36,12 @@ export class HaAuthFlow extends LitElement {

  @property({ attribute: false }) public oauth2State?: string;

+  @property({ attribute: false }) public localize!: LocalizeFunc;
+
  @property({ attribute: false }) public step?: DataEntryFlowStep;

  @property({ attribute: false }) public initStoreToken = false;

-  @state()
-  @consumeLocalize()
-  private _localize!: LocalizeFunc;
-
  @state() private _storeToken = false;

  @state() private _state: State = "loading";
@@ -127,7 +124,7 @@ export class HaAuthFlow extends LitElement {
          width: 100%;
        }
      </style>
-      <form @submit=${this._handleSubmit}>${this._renderForm()}</form>
+      <form>${this._renderForm()}</form>
    `;
  }

@@ -187,8 +184,8 @@ export class HaAuthFlow extends LitElement {
            >
              ${
                this.step.type === "form"
-                  ? this._localize("ui.panel.page-authorize.form.next")
-                  : this._localize("ui.panel.page-authorize.form.start_over")
+                  ? this.localize("ui.panel.page-authorize.form.next")
+                  : this.localize("ui.panel.page-authorize.form.start_over")
              }
            </ha-button>
          </div>
@@ -196,20 +193,20 @@ export class HaAuthFlow extends LitElement {
      case "error":
        return html`
          <ha-alert alert-type="error">
-            ${this._localize("ui.panel.page-authorize.form.error", {
+            ${this.localize("ui.panel.page-authorize.form.error", {
              error: this._errorMessage,
            })}
          </ha-alert>
          <div class="action">
            <ha-button @click=${this._startOver}>
-              ${this._localize("ui.panel.page-authorize.form.start_over")}
+              ${this.localize("ui.panel.page-authorize.form.start_over")}
            </ha-button>
          </div>
        `;
      case "loading":
        return html`
          <ha-alert alert-type="info">
-            ${this._localize("ui.panel.page-authorize.form.working")}
+            ${this.localize("ui.panel.page-authorize.form.working")}
          </ha-alert>
        `;
      default:
@@ -221,8 +218,8 @@ export class HaAuthFlow extends LitElement {
    switch (step.type) {
      case "abort":
        return html`
-          ${this._localize("ui.panel.page-authorize.abort_intro")}:
-          ${this._localize(
+          ${this.localize("ui.panel.page-authorize.abort_intro")}:
+          ${this.localize(
            `ui.panel.page-authorize.form.providers.${step.handler[0]}.abort.${step.reason}`
          )}
        `;
@@ -231,14 +228,15 @@ export class HaAuthFlow extends LitElement {
          <h1>
            ${
              !["select_mfa_module", "mfa"].includes(step.step_id)
-                ? this._localize("ui.panel.page-authorize.welcome_home")
-                : this._localize("ui.panel.page-authorize.just_checking")
+                ? this.localize("ui.panel.page-authorize.welcome_home")
+                : this.localize("ui.panel.page-authorize.just_checking")
            }
          </h1>
          ${this._computeStepDescription(step)}
          ${keyed(
            step.step_id,
            html`<ha-auth-form
+              .localize=${this.localize}
              .data=${this._stepData!}
              .schema=${autocompleteLoginFields(step.data_schema)}
              .error=${step.errors}
@@ -258,7 +256,7 @@ export class HaAuthFlow extends LitElement {
                      .checked=${this._storeToken}
                      @change=${this._storeTokenChanged}
                    >
-                      ${this._localize("ui.panel.page-authorize.store_token")}
+                      ${this.localize("ui.panel.page-authorize.store_token")}
                    </ha-checkbox>
                  `
                : ""
@@ -268,7 +266,7 @@ export class HaAuthFlow extends LitElement {
              href="https://www.home-assistant.io/docs/locked_out/#forgot-password"
              target="_blank"
              rel="noreferrer noopener"
-              >${this._localize("ui.panel.page-authorize.forgot_password")}</a
+              >${this.localize("ui.panel.page-authorize.forgot_password")}</a
            >
          </div>
        `;
@@ -338,13 +336,13 @@ export class HaAuthFlow extends LitElement {
  private _computeStepDescription(step: DataEntryFlowStepForm) {
    const resourceKey =
      `ui.panel.page-authorize.form.providers.${step.handler[0]}.step.${step.step_id}.description` as const;
-    return this._localize(resourceKey, step.description_placeholders);
+    return this.localize(resourceKey, step.description_placeholders);
  }

  private _computeLabelCallback(step: DataEntryFlowStepForm) {
    // Returns a callback for ha-form to calculate labels per schema object
    return (schema) =>
-      this._localize(
+      this.localize(
        `ui.panel.page-authorize.form.providers.${step.handler[0]}.step.${step.step_id}.data.${schema.name}`
      );
  }
@@ -352,13 +350,13 @@ export class HaAuthFlow extends LitElement {
  private _computeErrorCallback(step: DataEntryFlowStepForm) {
    // Returns a callback for ha-form to calculate error messages
    return (error) =>
-      this._localize(
+      this.localize(
        `ui.panel.page-authorize.form.providers.${step.handler[0]}.error.${error}`
      );
  }

  private _unknownError() {
-    return this._localize("ui.panel.page-authorize.form.unknown_error");
+    return this.localize("ui.panel.page-authorize.form.unknown_error");
  }

  private _startOver() {
@@ -1,66 +1,17 @@
-import type { TemplateResult } from "lit";
-import { html } from "lit";
-import { customElement, query } from "lit/decorators";
-import { fireEvent } from "../common/dom/fire_event";
+import { customElement } from "lit/decorators";
 import { HaFormString } from "../components/ha-form/ha-form-string";
-import "./ha-auth-textfield";
-import type { HaAuthTextField } from "./ha-auth-textfield";
+import "../components/ha-icon-button";
+import "../components/input/ha-input";

@customElement("ha-auth-form-string")
 export class HaAuthFormString extends HaFormString {
-  @query("ha-auth-textfield") private _textfield?: HaAuthTextField;
-
-  protected override createRenderRoot() {
+  protected createRenderRoot() {
    return this;
  }

-  public override focus(): void {
-    this._textfield?.focus();
-  }
-
-  public override reportValidity(): boolean {
-    const textfield = this._textfield;
-    if (!textfield) {
-      return true;
-    }
-    const valid = textfield.reportValidity();
-    // Adopt a value a password manager wrote without an event reaching us.
-    const value = textfield.value ?? "";
-    if ((this.data ?? "") !== value) {
-      fireEvent(this, "value-changed", { value });
-    }
-    return valid;
-  }
-
-  protected override render(): TemplateResult {
-    return html`
-      <ha-auth-textfield
-        .passwordToggle=${this.isPassword}
-        .type=${!this.isPassword ? this.stringType : "password"}
-        .label=${this.label}
-        .value=${this.data || ""}
-        .hint=${this.helper}
-        .disabled=${this.disabled}
-        .required=${!!this.schema.required}
-        .autoValidate=${!!this.schema.required}
-        .name=${this.schema.name}
-        .autofocus=${!!this.schema.autofocus}
-        .autocomplete=${this.schema.autocomplete}
-        .validationMessage=${
-          this.schema.required
-            ? this.localize?.("ui.panel.page-authorize.form.error_required")
-            : undefined
-        }
-        .showPasswordLabel=${this.localize?.(
-          "ui.panel.page-authorize.form.show_password"
-        )}
-        .hidePasswordLabel=${this.localize?.(
-          "ui.panel.page-authorize.form.hide_password"
-        )}
-        @input=${this._valueChanged}
-        @change=${this._valueChanged}
-      ></ha-auth-textfield>
-    `;
+  public connectedCallback(): void {
+    super.connectedCallback();
+    this.style.position = "relative";
  }
 }

@@ -1,7 +1,6 @@
 /* eslint-disable lit/prefer-static-styles */
 import { html } from "lit";
-import { customElement, state } from "lit/decorators";
-import { consumeLocalize } from "../common/decorators/consume-context-entry";
+import { customElement, property } from "lit/decorators";
 import type { LocalizeFunc } from "../common/translations/localize";
 import { HaForm } from "../components/ha-form/ha-form";
 import "./ha-auth-form-string";
@@ -10,13 +9,11 @@ const localizeBaseKey = "ui.panel.page-authorize.form";

@customElement("ha-auth-form")
 export class HaAuthForm extends HaForm {
-  @state()
-  @consumeLocalize()
-  private _localize!: LocalizeFunc;
+  @property({ attribute: false }) public localize?: LocalizeFunc;

  protected getFormProperties(): Record<string, any> {
    return {
-      localize: this._localize,
+      localize: this.localize,
      localizeBaseKey,
    };
  }
@@ -1,250 +0,0 @@
-/* eslint-disable lit/prefer-static-styles */
-import { mdiEye, mdiEyeOff } from "@mdi/js";
-import type { PropertyValues, TemplateResult } from "lit";
-import { html, LitElement, nothing } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
-import { ifDefined } from "lit/directives/if-defined";
-import { stopPropagation } from "../common/dom/stop_propagation";
-import "../components/ha-icon-button";
-import { WaInputMixin } from "../components/input/wa-input-mixin";
-
-/**
- * Text field for the login page. It renders the native input in the light DOM
- * so browsers and password manager extensions can find it (#51620).
- */
-@customElement("ha-auth-textfield")
-export class HaAuthTextField extends WaInputMixin(LitElement) {
-  @property() public type: "text" | "password" | "email" | "url" = "text";
-
-  @property({ type: Boolean, attribute: "password-toggle" })
-  public passwordToggle = false;
-
-  @property({ attribute: false }) public showPasswordLabel?: string;
-
-  @property({ attribute: false }) public hidePasswordLabel?: string;
-
-  @state() private _passwordVisible = false;
-
-  @query("input") private _input?: HTMLInputElement;
-
-  protected override get _formControl(): HTMLInputElement | undefined {
-    return this._input;
-  }
-
-  protected override createRenderRoot() {
-    return this;
-  }
-
-  protected override firstUpdated(changedProps: PropertyValues<this>): void {
-    super.firstUpdated(changedProps);
-    if (this.autofocus) {
-      this.focus();
-    }
-  }
-
-  public override focus(): void {
-    this._input?.focus();
-  }
-
-  public override checkValidity(): boolean {
-    return this._input?.checkValidity() ?? true;
-  }
-
-  public override reportValidity(): boolean {
-    // Adopt a value a password manager wrote to the input without events.
-    this._handleInput();
-    return super.reportValidity();
-  }
-
-  protected override render(): TemplateResult {
-    const invalid = this.invalid || this._invalid;
-    const hintId = this.name ? `${this.name}-hint` : undefined;
-
-    // The blank placeholder lets :placeholder-shown raise the label when a
-    // password manager fills the field without firing events.
-    return html`
-      <style>
-        ha-auth-textfield {
-          display: block;
-          padding-bottom: var(--ha-space-2);
-          text-align: start;
-        }
-        ha-auth-textfield .base {
-          position: relative;
-          display: flex;
-          align-items: center;
-          box-sizing: border-box;
-          height: 56px;
-          padding: 0 var(--ha-space-4);
-          background-color: var(--ha-color-form-background);
-          border-radius: var(--ha-border-radius-sm) var(--ha-border-radius-sm)
-            var(--ha-border-radius-square) var(--ha-border-radius-square);
-          cursor: text;
-          transition: background-color var(--wa-transition-normal) ease-in-out;
-        }
-        ha-auth-textfield .base:hover {
-          background-color: var(--ha-color-form-background-hover);
-        }
-        ha-auth-textfield .base.disabled {
-          background-color: var(--ha-color-form-background-disabled);
-          opacity: 0.5;
-          cursor: not-allowed;
-        }
-        ha-auth-textfield .base::after {
-          content: "";
-          position: absolute;
-          bottom: 0;
-          left: 0;
-          right: 0;
-          height: 1px;
-          background-color: var(--ha-color-border-neutral-loud);
-          transition:
-            height var(--wa-transition-normal) ease-in-out,
-            background-color var(--wa-transition-normal) ease-in-out;
-        }
-        ha-auth-textfield .base:focus-within::after {
-          height: 2px;
-          background-color: var(--primary-color);
-        }
-        ha-auth-textfield .base.invalid:not(.disabled)::after {
-          background-color: var(--ha-color-border-danger-normal);
-        }
-        ha-auth-textfield label {
-          position: absolute;
-          top: 0;
-          left: 0;
-          right: 0;
-          z-index: 1;
-          padding: var(--ha-space-5) var(--ha-space-4) 0;
-          pointer-events: none;
-          font-family: var(--ha-font-family-body);
-          font-size: var(--ha-font-size-m);
-          font-weight: var(--ha-font-weight-normal);
-          line-height: var(--ha-line-height-condensed);
-          color: var(--secondary-text-color);
-          transition: all var(--wa-transition-normal) ease-in-out;
-        }
-        ha-auth-textfield input:focus + label,
-        ha-auth-textfield input:not(:placeholder-shown) + label {
-          padding-top: var(--ha-space-3);
-          font-size: var(--ha-font-size-xs);
-        }
-        ha-auth-textfield .base:focus-within label {
-          color: var(--primary-color);
-        }
-        ha-auth-textfield .base.invalid:not(.disabled) label {
-          color: var(--ha-color-fill-danger-loud-resting);
-        }
-        ha-auth-textfield .base.disabled label {
-          opacity: 0.5;
-        }
-        ha-auth-textfield input {
-          flex: 1 1 auto;
-          min-width: 0;
-          height: 100%;
-          margin: 0;
-          padding: var(--ha-space-3) 0 0;
-          border: none;
-          outline: none;
-          box-shadow: none;
-          background: transparent;
-          color: var(--primary-text-color);
-          font-family: var(--ha-font-family-body);
-          font-size: var(--ha-font-size-m);
-          -webkit-appearance: none;
-          box-sizing: border-box;
-        }
-        ha-auth-textfield input:-webkit-autofill,
-        ha-auth-textfield input:-webkit-autofill:hover,
-        ha-auth-textfield input:-webkit-autofill:focus,
-        ha-auth-textfield input:-webkit-autofill:active {
-          -webkit-background-clip: text;
-          -webkit-text-fill-color: var(--primary-text-color);
-          background-color: transparent;
-          box-shadow: none;
-          caret-color: var(--primary-text-color);
-        }
-        ha-auth-textfield input::-ms-reveal {
-          display: none;
-        }
-        ha-auth-textfield ha-icon-button {
-          display: flex;
-          align-items: center;
-          color: var(--ha-color-text-secondary);
-        }
-        ha-auth-textfield .hint {
-          display: flex;
-          align-items: center;
-          min-height: var(--ha-space-5);
-          margin-inline-start: var(--ha-space-3);
-          font-size: var(--ha-font-size-s);
-          color: var(--ha-color-text-secondary);
-        }
-        ha-auth-textfield .hint.error {
-          color: var(--ha-color-on-danger-quiet);
-        }
-      </style>
-      <div class=${classMap({ base: true, invalid, disabled: this.disabled })}>
-        <input
-          id=${ifDefined(this.name)}
-          name=${ifDefined(this.name)}
-          type=${
-            this.type === "password" && this._passwordVisible
-              ? "text"
-              : this.type
-          }
-          placeholder=" "
-          autocomplete=${ifDefined(this.autocomplete)}
-          ?required=${this.required}
-          ?disabled=${this.disabled}
-          .value=${this.value ?? ""}
-          aria-describedby=${ifDefined(hintId)}
-          aria-invalid=${ifDefined(invalid ? "true" : undefined)}
-          @input=${this._handleInput}
-          @change=${this._handleChange}
-          @blur=${this._handleBlur}
-        />
-        <label for=${ifDefined(this.name)}
-          >${this._renderLabel(this.label ?? "", this.required)}</label
-        >
-        ${
-          this.passwordToggle && !this.disabled
-            ? html`<ha-icon-button
-                .path=${this._passwordVisible ? mdiEyeOff : mdiEye}
-                .label=${
-                  this._passwordVisible
-                    ? this.hidePasswordLabel
-                    : this.showPasswordLabel
-                }
-                @click=${this._togglePasswordVisibility}
-                @keypress=${stopPropagation}
-              ></ha-icon-button>`
-            : nothing
-        }
-      </div>
-      <div
-        id=${ifDefined(hintId)}
-        class=${classMap({ hint: true, error: invalid })}
-        role=${ifDefined(invalid ? "alert" : undefined)}
-        aria-live="polite"
-      >
-        ${
-          invalid
-            ? this.validationMessage || this._input?.validationMessage
-            : this.hint
-        }
-      </div>
-    `;
-  }
-
-  private _togglePasswordVisibility(): void {
-    this._passwordVisible = !this._passwordVisible;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-auth-textfield": HaAuthTextField;
-  }
-}
@@ -12,7 +12,6 @@ import "../components/ha-svg-icon";
 import type { AuthProvider, AuthUrlSearchParams } from "../data/auth";
 import { fetchAuthProviders } from "../data/auth";
 import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
-import { provideLiteI18nMixin } from "../mixins/provide-lite-i18n-mixin";
 import { registerServiceWorker } from "../util/register-service-worker";
 import "./ha-auth-flow";

@@ -24,9 +23,7 @@ const appNames = {
 };

@customElement("ha-authorize")
-export class HaAuthorize extends provideLiteI18nMixin(
-  litLocalizeLiteMixin(LitElement)
-) {
+export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
  @property({ attribute: false }) public clientId?: string;

  @property({ attribute: false }) public redirectUri?: string;
@@ -186,12 +183,14 @@ export class HaAuthorize extends provideLiteI18nMixin(
                  .redirectUri=${this.redirectUri}
                  .oauth2State=${this.oauth2State}
                  .authProvider=${this._authProvider}
+                  .localize=${this.localize}
                  .initStoreToken=${this._preselectStoreToken}
                ></ha-auth-flow>
                ${
                  inactiveProviders!.length > 0
                    ? html`
                        <ha-pick-auth-provider
+                          .localize=${this.localize}
                          .clientId=${this.clientId}
                          .authProviders=${inactiveProviders!}
                          @pick-auth-provider=${this._handleAuthProviderPick}
@@ -1,6 +1,5 @@
 import { css, html, LitElement } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { consumeLocalize } from "../common/decorators/consume-context-entry";
+import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import type { LocalizeFunc } from "../common/translations/localize";
 import "../components/ha-icon-next";
@@ -21,15 +20,13 @@ declare global {
 export class HaPickAuthProvider extends LitElement {
  @property({ attribute: false }) public authProviders: AuthProvider[] = [];

-  @state()
-  @consumeLocalize()
-  private _localize!: LocalizeFunc;
+  @property({ attribute: false }) public localize!: LocalizeFunc;

  protected render() {
    return html`
      <h3>
        <span
-          >${this._localize("ui.panel.page-authorize.pick_auth_provider")}</span
+          >${this.localize("ui.panel.page-authorize.pick_auth_provider")}</span
        >
      </h3>
      <ha-list>
@@ -1,144 +0,0 @@
-import type {
-  Condition,
-  ConditionContext,
-  VisibilityCondition,
-} from "../../panels/lovelace/common/validate-condition";
-import { checkConditionsMet } from "../../panels/lovelace/common/validate-condition";
-import type { HomeAssistant } from "../../types";
-import { ensureArray } from "../array/ensure-array";
-import {
-  isClientCondition,
-  isDisabledCondition,
-  isEntityReference,
-  isLogicalCondition,
-  logicalChildren,
-} from "./translate";
-
-// Combinators: true / false / undefined (unknown)
-const andOf = (values: (boolean | undefined)[]): boolean | undefined => {
-  let unknown = false;
-  for (const value of values) {
-    if (value === false) return false;
-    if (value === undefined) unknown = true;
-  }
-  return unknown ? undefined : true;
-};
-
-const orOf = (values: (boolean | undefined)[]): boolean | undefined => {
-  let unknown = false;
-  for (const value of values) {
-    if (value === true) return true;
-    if (value === undefined) unknown = true;
-  }
-  return unknown ? undefined : false;
-};
-
-/**
- * True when `checkConditionsMet` matches core for this leaf, so we can
- * show a result before `subscribe_condition` replies.
- */
-const isLocallyEvaluableServerLeaf = (
-  condition: VisibilityCondition,
-  states: HomeAssistant["states"],
-  context: ConditionContext
-): boolean => {
-  const type = "condition" in condition ? condition.condition : "state";
-  if (type !== "state" && type !== "numeric_state") {
-    return false;
-  }
-
-  if (!("entity_id" in condition)) {
-    // Empty `entity: ""` falls back to the host entity, like checkStateCondition.
-    const target =
-      ("entity" in condition ? condition.entity : undefined) ||
-      context.entity_id;
-    return !!target && target in states;
-  }
-
-  const core = condition as {
-    entity_id?: unknown;
-    attribute?: unknown;
-    for?: unknown;
-    match?: unknown;
-    value_template?: unknown;
-    state?: unknown;
-    above?: unknown;
-    below?: unknown;
-  };
-  if (
-    typeof core.entity_id !== "string" ||
-    !(core.entity_id in states) ||
-    core.attribute !== undefined ||
-    core.for !== undefined ||
-    core.match !== undefined ||
-    core.value_template !== undefined
-  ) {
-    return false;
-  }
-  if (type === "numeric_state") {
-    const bounds = [core.above, core.below].filter((b) => b !== undefined);
-    return bounds.length > 0 && bounds.every((b) => typeof b === "number");
-  }
-  return !ensureArray(core.state as string | string[] | undefined)?.some(
-    isEntityReference
-  );
-};
-
-/**
- * Evaluate the parts of a visibility tree the client can know exactly.
- * Unknown leaves stay unknown (`not: [template]` is not treated as visible).
- * Returns `undefined` when the result still depends on core.
- */
-export const evaluateConditionsLocally = (
-  conditions: VisibilityCondition[],
-  hass: HomeAssistant,
-  context: ConditionContext
-): boolean | undefined => {
-  const evaluateLeaf = (condition: VisibilityCondition): boolean => {
-    try {
-      return checkConditionsMet([condition as Condition], hass, context);
-    } catch (_err) {
-      return false;
-    }
-  };
-
-  const evaluateNode = (
-    condition: VisibilityCondition
-  ): boolean | undefined => {
-    // Template `enabled` is only known to core; the local evaluator ignores it.
-    if ("enabled" in condition && typeof condition.enabled !== "boolean") {
-      return undefined;
-    }
-    if (isLogicalCondition(condition)) {
-      // Missing `conditions` is treated as true, matching checkAnd/Or/NotCondition.
-      if (condition.conditions === undefined) {
-        return true;
-      }
-      const values = logicalChildren(condition)
-        .filter((child) => !isDisabledCondition(child))
-        .map(evaluateNode);
-      if (condition.condition === "or") {
-        return orOf(values);
-      }
-      const all = andOf(values);
-      // Lovelace `not` is NOT(AND of children).
-      return condition.condition === "not"
-        ? all === undefined
-          ? undefined
-          : !all
-        : all;
-    }
-    if (
-      isClientCondition(condition) ||
-      isLocallyEvaluableServerLeaf(condition, hass.states, context)
-    ) {
-      return evaluateLeaf(condition);
-    }
-    return undefined;
-  };
-
-  // Top-level list is AND. Skip `enabled: false` nodes, as core does.
-  return andOf(
-    conditions.filter((c) => !isDisabledCondition(c)).map(evaluateNode)
-  );
-};
@@ -1,25 +1,17 @@
 import type {
+  Condition,
  TimeCondition,
-  VisibilityCondition,
 } from "../../panels/lovelace/common/validate-condition";
-import { ensureArray } from "../array/ensure-array";

 /**
 * Extract media queries from conditions recursively
 */
-export function extractMediaQueries(
-  conditions: VisibilityCondition[]
-): string[] {
+export function extractMediaQueries(conditions: Condition[]): string[] {
  return conditions.reduce<string[]>((array, c) => {
    if ("conditions" in c && c.conditions) {
-      array.push(...extractMediaQueries(ensureArray(c.conditions)));
+      array.push(...extractMediaQueries(c.conditions));
    }
-    if (
-      "condition" in c &&
-      c.condition === "screen" &&
-      "media_query" in c &&
-      c.media_query
-    ) {
+    if (c.condition === "screen" && c.media_query) {
      array.push(c.media_query);
    }
    return array;
@@ -30,15 +22,14 @@ export function extractMediaQueries(
 * Extract time conditions from conditions recursively
 */
 export function extractTimeConditions(
-  conditions: VisibilityCondition[]
+  conditions: Condition[]
 ): TimeCondition[] {
  return conditions.reduce<TimeCondition[]>((array, c) => {
    if ("conditions" in c && c.conditions) {
-      array.push(...extractTimeConditions(ensureArray(c.conditions)));
+      array.push(...extractTimeConditions(c.conditions));
    }
-    if ("condition" in c && c.condition === "time") {
-      // Dashboard `time` is always the client lovelace shape.
-      array.push(c as TimeCondition);
+    if (c.condition === "time") {
+      array.push(c);
    }
    return array;
  }, []);
@@ -1,9 +1,10 @@
 import { listenMediaQuery } from "../dom/media_query";
 import type { HomeAssistant } from "../../types";
 import type {
-  TimeCondition,
-  VisibilityCondition,
+  Condition,
+  ConditionContext,
 } from "../../panels/lovelace/common/validate-condition";
+import { checkConditionsMet } from "../../panels/lovelace/common/validate-condition";
 import { extractMediaQueries, extractTimeConditions } from "./extract";
 import { calculateNextTimeUpdate } from "./time-calculator";

@@ -15,65 +16,95 @@ import { calculateNextTimeUpdate } from "./time-calculator";
 const MAX_TIMEOUT_DELAY = 2147483647;

 /**
- * Fire onChange at the next time-condition boundary, then reschedule.
- * Delays past the setTimeout max are capped and retried without firing.
+ * Helper to setup media query listeners for conditional visibility
 */
-function scheduleTimeBoundaryListener(
-  getHass: () => HomeAssistant,
-  timeCondition: Omit<TimeCondition, "condition">,
+export function setupMediaQueryListeners(
+  conditions: Condition[],
+  hass: HomeAssistant,
  addListener: (unsub: () => void) => void,
-  onBoundary: () => void
+  onUpdate: (conditionsMet: boolean) => void,
+  getContext?: () => ConditionContext
 ): void {
-  let timeoutId: ReturnType<typeof setTimeout> | undefined;
+  const mediaQueries = extractMediaQueries(conditions);

-  const scheduleUpdate = () => {
-    // Read hass here so a timezone change applies at the next boundary.
-    const delay = calculateNextTimeUpdate(getHass(), timeCondition);
+  if (mediaQueries.length === 0) return;

-    if (delay === undefined) return;
+  // Optimization for single media query
+  const hasOnlyMediaQuery =
+    conditions.length === 1 &&
+    conditions[0].condition === "screen" &&
+    !!conditions[0].media_query;

-    // Cap delay to prevent setTimeout overflow
-    const cappedDelay = Math.min(delay, MAX_TIMEOUT_DELAY);
-
-    timeoutId = setTimeout(() => {
-      if (delay <= MAX_TIMEOUT_DELAY) {
-        onBoundary();
+  mediaQueries.forEach((mediaQuery) => {
+    const unsub = listenMediaQuery(mediaQuery, (matches) => {
+      if (hasOnlyMediaQuery) {
+        onUpdate(matches);
+      } else {
+        const context = getContext?.() ?? {};
+        const conditionsMet = checkConditionsMet(conditions, hass, context);
+        onUpdate(conditionsMet);
      }
-      scheduleUpdate();
-    }, cappedDelay);
-  };
-
-  // Register cleanup function once, outside of scheduleUpdate
-  addListener(() => {
-    if (timeoutId !== undefined) {
-      clearTimeout(timeoutId);
-    }
+    });
+    addListener(unsub);
  });
-
-  scheduleUpdate();
 }

 /**
- * Observe the client-evaluated parts of a condition tree — `screen` media
- * queries and `time` boundaries — and invoke `onChange` whenever one of them
- * could have flipped.
- *
- * This does not evaluate the conditions itself: the caller recombines client
- * and server results on notification. Used by `ConditionEvaluatorController`,
- * which merges these client signals with the results of `subscribe_condition`
- * subscriptions.
+ * Helper to setup time-based listeners for conditional visibility
 */
-export function observeConditionChanges(
-  conditions: VisibilityCondition[],
-  getHass: () => HomeAssistant,
+export function setupTimeListeners(
+  conditions: Condition[],
+  hass: HomeAssistant,
  addListener: (unsub: () => void) => void,
-  onChange: () => void
+  onUpdate: (conditionsMet: boolean) => void,
+  getContext?: () => ConditionContext
 ): void {
-  extractMediaQueries(conditions).forEach((mediaQuery) => {
-    addListener(listenMediaQuery(mediaQuery, () => onChange()));
-  });
+  const timeConditions = extractTimeConditions(conditions);

-  extractTimeConditions(conditions).forEach((timeCondition) => {
-    scheduleTimeBoundaryListener(getHass, timeCondition, addListener, onChange);
+  if (timeConditions.length === 0) return;
+
+  timeConditions.forEach((timeCondition) => {
+    let timeoutId: ReturnType<typeof setTimeout> | undefined;
+
+    const scheduleUpdate = () => {
+      const delay = calculateNextTimeUpdate(hass, timeCondition);
+
+      if (delay === undefined) return;
+
+      // Cap delay to prevent setTimeout overflow
+      const cappedDelay = Math.min(delay, MAX_TIMEOUT_DELAY);
+
+      timeoutId = setTimeout(() => {
+        if (delay <= MAX_TIMEOUT_DELAY) {
+          const context = getContext?.() ?? {};
+          const conditionsMet = checkConditionsMet(conditions, hass, context);
+          onUpdate(conditionsMet);
+        }
+        scheduleUpdate();
+      }, cappedDelay);
+    };
+
+    // Register cleanup function once, outside of scheduleUpdate
+    addListener(() => {
+      if (timeoutId !== undefined) {
+        clearTimeout(timeoutId);
+      }
+    });
+
+    scheduleUpdate();
  });
 }
+
+/**
+ * Sets up all condition listeners (media query, time) for conditional visibility.
+ */
+export function setupConditionListeners(
+  conditions: Condition[],
+  hass: HomeAssistant,
+  addListener: (unsub: () => void) => void,
+  onUpdate: (conditionsMet: boolean) => void,
+  getContext?: () => ConditionContext
+): void {
+  setupMediaQueryListeners(conditions, hass, addListener, onUpdate, getContext);
+  setupTimeListeners(conditions, hass, addListener, onUpdate, getContext);
+}
@@ -1,170 +0,0 @@
-import type { Condition as CoreCondition } from "../../data/automation";
-import type { VisibilityCondition } from "../../panels/lovelace/common/validate-condition";
-import {
-  isDisabledCondition,
-  isLogicalCondition,
-  isServerCondition,
-  logicalChildren,
-  translateToCoreCondition,
-} from "./translate";
-
-/** One `subscribe_condition` (largest server subtree we can group). */
-export interface ServerSubtree {
-  id: string;
-  coreCondition: CoreCondition;
-}
-
-/** Evaluate a client-only leaf. `undefined` if it cannot be decided yet. */
-export type ClientConditionEvaluator = (
-  condition: VisibilityCondition
-) => boolean | undefined;
-
-/** Results by subtree id. `undefined` means not reported yet. */
-export type ServerConditionResults = Record<string, boolean | undefined>;
-
-export interface SplitConditionTree {
-  serverSubtrees: ServerSubtree[];
-  /**
-   * Combine client and server results. Returns `undefined` while a needed
-   * server subtree has not reported.
-   */
-  evaluate: (
-    clientEvaluator: ClientConditionEvaluator,
-    serverResults: ServerConditionResults
-  ) => boolean | undefined;
-}
-
-type EvalNode = (
-  clientEvaluator: ClientConditionEvaluator,
-  serverResults: ServerConditionResults
-) => boolean | undefined;
-
-// false wins AND, true wins OR, even if a sibling is still unknown.
-const andNode =
-  (children: EvalNode[]): EvalNode =>
-  (clientEvaluator, serverResults) => {
-    let unknown = false;
-    for (const child of children) {
-      const value = child(clientEvaluator, serverResults);
-      if (value === false) return false;
-      if (value === undefined) unknown = true;
-    }
-    return unknown ? undefined : true;
-  };
-
-const orNode =
-  (children: EvalNode[]): EvalNode =>
-  (clientEvaluator, serverResults) => {
-    let unknown = false;
-    for (const child of children) {
-      const value = child(clientEvaluator, serverResults);
-      if (value === true) return true;
-      if (value === undefined) unknown = true;
-    }
-    return unknown ? undefined : false;
-  };
-
-const notNode =
-  (child: EvalNode): EvalNode =>
-  (clientEvaluator, serverResults) => {
-    const value = child(clientEvaluator, serverResults);
-    return value === undefined ? undefined : !value;
-  };
-
-const serverLeaf =
-  (id: string): EvalNode =>
-  (_clientEvaluator, serverResults) =>
-    serverResults[id];
-
-const clientLeaf =
-  (condition: VisibilityCondition): EvalNode =>
-  (clientEvaluator) =>
-    clientEvaluator(condition);
-
-const unknownLeaf: EvalNode = () => undefined;
-
-/**
- * Split a visibility tree into server subscriptions and a local combiner.
- *
- * Sibling server conditions under the same parent share one subscription.
- * `enabled: false` is skipped. A template `enabled` on a client node stays
- * unknown. Lovelace `not` is NOT(AND of children).
- */
-export const splitConditionTree = (
-  conditions: VisibilityCondition[]
-): SplitConditionTree => {
-  const serverSubtrees: ServerSubtree[] = [];
-  let nextId = 0;
-
-  const addSubtree = (coreCondition: CoreCondition): EvalNode => {
-    const id = String(nextId);
-    nextId += 1;
-    serverSubtrees.push({ id, coreCondition });
-    return serverLeaf(id);
-  };
-
-  // Group server siblings into one subscription; recurse into client children.
-  const buildSiblings = (
-    children: VisibilityCondition[],
-    groupOperator: "and" | "or"
-  ): EvalNode[] => {
-    const serverChildren: VisibilityCondition[] = [];
-    const clientChildren: VisibilityCondition[] = [];
-    for (const child of children) {
-      // Core skips disabled nodes; don't subscribe or combine them.
-      if (isDisabledCondition(child)) {
-        continue;
-      }
-      (isServerCondition(child) ? serverChildren : clientChildren).push(child);
-    }
-
-    const nodes: EvalNode[] = [];
-
-    if (serverChildren.length === 1) {
-      nodes.push(addSubtree(translateToCoreCondition(serverChildren[0])));
-    } else if (serverChildren.length > 1) {
-      nodes.push(
-        addSubtree({
-          condition: groupOperator,
-          conditions: serverChildren.map(translateToCoreCondition),
-        })
-      );
-    }
-
-    for (const child of clientChildren) {
-      nodes.push(build(child));
-    }
-
-    return nodes;
-  };
-
-  const build = (condition: VisibilityCondition): EvalNode => {
-    // Template `enabled` on a client node can't be rendered here; stay unknown.
-    if ("enabled" in condition && typeof condition.enabled !== "boolean") {
-      return unknownLeaf;
-    }
-    if (isLogicalCondition(condition)) {
-      const children = logicalChildren(condition);
-      if (condition.condition === "or") {
-        return orNode(buildSiblings(children, "or"));
-      }
-      if (condition.condition === "not") {
-        return notNode(andNode(buildSiblings(children, "and")));
-      }
-      return andNode(buildSiblings(children, "and"));
-    }
-    // Should only happen if a server leaf slipped past grouping.
-    if (isServerCondition(condition)) {
-      return addSubtree(translateToCoreCondition(condition));
-    }
-    return clientLeaf(condition);
-  };
-
-  const root = andNode(buildSiblings(conditions, "and"));
-
-  return {
-    serverSubtrees,
-    evaluate: (clientEvaluator, serverResults) =>
-      root(clientEvaluator, serverResults),
-  };
-};
@@ -1,304 +0,0 @@
-import type {
-  Condition as CoreCondition,
-  NumericStateCondition as CoreNumericStateCondition,
-  StateCondition as CoreStateCondition,
-  TemplateCondition as CoreTemplateCondition,
-} from "../../data/automation";
-import {
-  CONDITION_ROW_CONFIG_KEYS,
-  pickRowConfig,
-} from "../../data/automation";
-import type {
-  LegacyCondition,
-  NumericStateCondition as LovelaceNumericStateCondition,
-  StateCondition as LovelaceStateCondition,
-  VisibilityCondition,
-  VisibilityLogicalCondition,
-} from "../../panels/lovelace/common/validate-condition";
-import { ensureArray } from "../array/ensure-array";
-import { isValidEntityId } from "../entity/valid_entity_id";
-
-/** Client-only types. Never sent to `subscribe_condition`. */
-const CLIENT_CONDITION_TYPES = new Set([
-  "screen",
-  "user",
-  "view_columns",
-  "location",
-  "time",
-]);
-
-const LOGICAL_CONDITION_TYPES = new Set(["and", "or", "not"]);
-
-/** `and` / `or` / `not`. */
-export const isLogicalCondition = (
-  condition: VisibilityCondition
-): condition is VisibilityLogicalCondition =>
-  "condition" in condition && LOGICAL_CONDITION_TYPES.has(condition.condition);
-
-/** Children of a logical condition. Core allows a single item or a list. */
-export const logicalChildren = (
-  condition: VisibilityLogicalCondition
-): VisibilityCondition[] => ensureArray(condition.conditions) ?? [];
-
-/** True if `value` looks like an entity id, not a numeric literal. */
-export const isEntityReference = (value: unknown): value is string =>
-  typeof value === "string" && isNaN(Number(value)) && isValidEntityId(value);
-
-/**
- * Lovelace `state` / `numeric_state` that core would evaluate differently,
- * so existing dashboards keep the client result until the user edits them:
- * stringified attributes, any-entity comparison values, entity-id bounds.
- */
-const hasLegacyOnlySemantics = (
-  condition:
-    LovelaceStateCondition | LovelaceNumericStateCondition | LegacyCondition
-): boolean => {
-  if ("condition" in condition && condition.condition === "numeric_state") {
-    return [condition.above, condition.below].some(isEntityReference);
-  }
-  const state = condition as LovelaceStateCondition | LegacyCondition;
-  if ("attribute" in state && state.attribute !== undefined) {
-    return true;
-  }
-  return [
-    ...(ensureArray(state.state) ?? []),
-    ...(ensureArray(state.state_not) ?? []),
-  ].some(isEntityReference);
-};
-
-/**
- * True if this node should go to `subscribe_condition`.
- * A mixed `and`/`or`/`not` is client-side so it can wrap server subtrees.
- * Lovelace `state`/`numeric_state` with {@link hasLegacyOnlySemantics} stay local.
- */
-export const isServerCondition = (condition: VisibilityCondition): boolean => {
-  if (isLogicalCondition(condition)) {
-    return logicalChildren(condition).every(isServerCondition);
-  }
-  // `{ entity, state }` with no `condition` key is a state condition.
-  if (!("condition" in condition)) {
-    return !hasLegacyOnlySemantics(condition);
-  }
-  if (CLIENT_CONDITION_TYPES.has(condition.condition)) {
-    return false;
-  }
-  if (
-    (condition.condition === "state" ||
-      condition.condition === "numeric_state") &&
-    !("entity_id" in condition)
-  ) {
-    return !hasLegacyOnlySemantics(
-      condition as LovelaceStateCondition | LovelaceNumericStateCondition
-    );
-  }
-  return true;
-};
-
-/** `enabled: false`. Core skips these inside `and` / `or` / `not`. */
-export const isDisabledCondition = (condition: VisibilityCondition): boolean =>
-  "enabled" in condition && condition.enabled === false;
-
-/** Inverse of {@link isServerCondition}. True if any leaf is client-side. */
-export const isClientCondition = (condition: VisibilityCondition): boolean =>
-  !isServerCondition(condition);
-
-/** True if every leaf is client-only (no `subscribe_condition` needed). */
-export const isPureClientCondition = (
-  condition: VisibilityCondition
-): boolean =>
-  isLogicalCondition(condition)
-    ? logicalChildren(condition).every(isPureClientCondition)
-    : isClientCondition(condition);
-
-/**
- * Lovelace → core automation condition. Already-core types pass through.
- * Client-only conditions should not be passed in.
- */
-export const translateToCoreCondition = (
-  condition: VisibilityCondition
-): CoreCondition => {
-  // `{ entity, state, state_not }` with no `condition` key.
-  if (!("condition" in condition)) {
-    return translateStateCondition({ condition: "state", ...condition });
-  }
-
-  if (isLogicalCondition(condition)) {
-    return translateLogicalCondition(condition);
-  }
-
-  switch (condition.condition) {
-    case "state":
-      return translateStateCondition(condition as LovelaceStateCondition);
-    case "numeric_state":
-      return translateNumericStateCondition(
-        condition as LovelaceNumericStateCondition
-      );
-    default:
-      return condition as CoreCondition;
-  }
-};
-
-// Always-false: not(and of nothing). Used for incomplete configs so we don't
-// emit something core's schema would reject (that would fail a grouped subscription).
-const alwaysFalseCondition = (): CoreCondition => ({
-  condition: "not",
-  conditions: [{ condition: "and", conditions: [] }],
-});
-
-const translateStateCondition = (
-  condition: LovelaceStateCondition | CoreStateCondition | LegacyCondition
-): CoreCondition => {
-  if ("entity_id" in condition) {
-    return condition as CoreStateCondition;
-  }
-
-  const lovelace = condition as LovelaceStateCondition;
-
-  const rowConfig = pickRowConfig(lovelace, CONDITION_ROW_CONFIG_KEYS);
-
-  // Missing entity or comparison value: checkConditionsMet is false; core
-  // would reject the schema.
-  if (
-    !lovelace.entity ||
-    (lovelace.state === undefined && lovelace.state_not === undefined)
-  ) {
-    return { ...rowConfig, ...alwaysFalseCondition() };
-  }
-  const base = {
-    condition: "state" as const,
-    entity_id: lovelace.entity,
-    ...(lovelace.attribute !== undefined
-      ? { attribute: lovelace.attribute }
-      : {}),
-  };
-
-  // Prefer `state` when both are set, matching checkConditionsMet.
-  if (lovelace.state !== undefined) {
-    return {
-      ...rowConfig,
-      ...base,
-      state: lovelace.state,
-    } as CoreStateCondition;
-  }
-
-  // Core has no `state_not`; wrap a positive `state` in `not`.
-  return {
-    ...rowConfig,
-    condition: "not",
-    conditions: [{ ...base, state: lovelace.state_not } as CoreStateCondition],
-  };
-};
-
-const translateNumericStateCondition = (
-  condition: LovelaceNumericStateCondition | CoreNumericStateCondition
-): CoreCondition => {
-  if ("entity_id" in condition) {
-    return condition as CoreNumericStateCondition;
-  }
-  const lovelace = condition as LovelaceNumericStateCondition;
-  const rowConfig = pickRowConfig(lovelace, CONDITION_ROW_CONFIG_KEYS);
-
-  // Missing entity: checkConditionsMet is false; core would reject the schema.
-  if (!lovelace.entity) {
-    return { ...rowConfig, ...alwaysFalseCondition() };
-  }
-
-  const above = translateNumericBound(lovelace.above, "above");
-  const below = translateNumericBound(lovelace.below, "below");
-
-  if (typeof above === "symbol" || typeof below === "symbol") {
-    // `above: +∞` / `below: -∞` can never pass.
-    return { ...rowConfig, ...alwaysFalseCondition() };
-  }
-
-  if (above === undefined && below === undefined) {
-    // No usable bound. Lovelace only checks that the value is numeric; core
-    // requires a bound, so express that as a template.
-    return {
-      ...rowConfig,
-      ...numericValueCondition(lovelace.entity, lovelace.attribute),
-    };
-  }
-
-  const core: CoreNumericStateCondition = {
-    ...rowConfig,
-    condition: "numeric_state",
-    entity_id: lovelace.entity,
-  };
-  if (lovelace.attribute !== undefined) {
-    core.attribute = lovelace.attribute;
-  }
-  if (above !== undefined) {
-    core.above = above;
-  }
-  if (below !== undefined) {
-    core.below = below;
-  }
-  return core;
-};
-
-// Numeric-only check when lovelace ignored every bound.
-const numericValueCondition = (
-  entityId: string,
-  attribute?: string
-): CoreTemplateCondition => ({
-  condition: "template",
-  value_template:
-    attribute === undefined
-      ? `{{ is_number(states(${JSON.stringify(entityId)})) }}`
-      : `{{ is_number(state_attr(${JSON.stringify(entityId)}, ${JSON.stringify(attribute)})) }}`,
-});
-
-// Bound that can never pass (see `translateNumericBound`).
-const NEVER_SATISFIED = Symbol("never-satisfied");
-
-/**
- * Map a lovelace numeric bound onto core.
- * Numeric strings become numbers (try Number() first — `"10.5"` looks like an id).
- * Real entity ids pass through. Junk is dropped. ±Infinity: never-pass sides
- * become {@link NEVER_SATISFIED}; always-pass sides are dropped (not JSON-safe).
- */
-const translateNumericBound = (
-  bound: string | number | null | undefined,
-  side: "above" | "below"
-): string | number | undefined | typeof NEVER_SATISFIED => {
-  // YAML `null` is the same as a missing bound.
-  if (bound == null) {
-    return undefined;
-  }
-  const numeric = typeof bound === "number" ? bound : Number(bound);
-  if (isNaN(numeric)) {
-    return typeof bound === "string" && isValidEntityId(bound)
-      ? bound
-      : undefined;
-  }
-  if (!isFinite(numeric)) {
-    return (side === "above") === numeric > 0 ? NEVER_SATISFIED : undefined;
-  }
-  return numeric;
-};
-
-const translateLogicalCondition = (
-  condition: VisibilityLogicalCondition
-): CoreCondition => {
-  const rowConfig = pickRowConfig(condition, CONDITION_ROW_CONFIG_KEYS);
-
-  // Missing `conditions` is treated as true.
-  if (condition.conditions === undefined) {
-    return { ...rowConfig, condition: "and", conditions: [] };
-  }
-
-  const conditions = logicalChildren(condition).map(translateToCoreCondition);
-
-  if (condition.condition === "not") {
-    // Lovelace `not` is NOT(AND); core `not` is NOT(OR). Keep the `and`
-    // wrapper even for one child: a skipped disabled child must stay false.
-    return {
-      ...rowConfig,
-      condition: "not",
-      conditions: [{ condition: "and", conditions }],
-    };
-  }
-
-  return { ...rowConfig, condition: condition.condition, conditions };
-};
@@ -1,353 +0,0 @@
-import type {
-  ReactiveController,
-  ReactiveControllerHost,
-} from "@lit/reactive-element/reactive-controller";
-import type { Connection, UnsubscribeFunc } from "home-assistant-js-websocket";
-import { subscribeCondition } from "../../data/automation";
-import type {
-  Condition,
-  ConditionContext,
-  VisibilityCondition,
-} from "../../panels/lovelace/common/validate-condition";
-import { checkConditionsMet } from "../../panels/lovelace/common/validate-condition";
-import type { HomeAssistant } from "../../types";
-import { observeConditionChanges } from "../condition/listeners";
-import { isPureClientCondition } from "../condition/translate";
-import type {
-  ClientConditionEvaluator,
-  ServerConditionResults,
-  SplitConditionTree,
-} from "../condition/split";
-import { splitConditionTree } from "../condition/split";
-
-/** `unknown` until a server subtree reports. */
-export type ConditionEvaluation = "visible" | "hidden" | "unknown";
-
-export interface ConditionEvaluatorOptions {
-  onResult: (result: ConditionEvaluation, error?: string) => void;
-  /** Wait this long before (re)opening subscriptions after the tree changes. */
-  resubscribeDelay?: number;
-}
-
-const DEFAULT_RESUBSCRIBE_DELAY = 50;
-
-const firstDefined = (
-  values: Record<string, string | undefined>
-): string | undefined => Object.values(values).find((value) => !!value);
-
-/**
- * Live evaluation of a visibility tree: `subscribe_condition` for server
- * subtrees, local checks for screen/user/time/etc. Call {@link observe} when
- * inputs change. Result stays `unknown` until server replies so nothing flashes.
- */
-export class ConditionEvaluatorController implements ReactiveController {
-  private _host: ReactiveControllerHost;
-
-  private readonly _onResult: ConditionEvaluatorOptions["onResult"];
-
-  private readonly _resubscribeDelay: number;
-
-  private _conditions?: VisibilityCondition[];
-
-  private _hass?: HomeAssistant;
-
-  private _getContext?: () => ConditionContext;
-
-  private _connected = false;
-
-  // Value of the live tree vs the tree a pending resubscribe will switch to.
-  // Compared by content so a new array each render does not churn subscriptions.
-  // `undefined` is a real signature, so pending work uses `_hasPendingResubscribe`.
-  private _subscribedSignature?: string;
-
-  private _pendingSignature?: string;
-
-  private _hasPendingResubscribe = false;
-
-  // Resubscribe if hass.connection is replaced even when the tree is unchanged.
-  private _subscribedConnection?: Connection;
-
-  // Skip JSON.stringify when the same array is observed again.
-  private _lastConditionsRef?: VisibilityCondition[];
-
-  private _lastSignature?: string;
-
-  private _split?: SplitConditionTree;
-
-  private _serverResults: ServerConditionResults = {};
-
-  private _subtreeErrors: Record<string, string | undefined> = {};
-
-  // Template errors from core that still produced a result. Shown in editors,
-  // but they do not force hidden.
-  private _subtreeTemplateErrors: Record<string, string | undefined> = {};
-
-  private _subscriptions: Promise<UnsubscribeFunc>[] = [];
-
-  private _listeners: (() => void)[] = [];
-
-  // Ignore callbacks from a torn-down generation.
-  private _generation = 0;
-
-  private _resubscribeTimeout?: ReturnType<typeof setTimeout>;
-
-  private _result: ConditionEvaluation = "unknown";
-
-  private _error?: string;
-
-  private _notifiedResult?: ConditionEvaluation;
-
-  private _notifiedError?: string;
-
-  constructor(
-    host: ReactiveControllerHost,
-    options: ConditionEvaluatorOptions
-  ) {
-    this._host = host;
-    this._onResult = options.onResult;
-    this._resubscribeDelay =
-      options.resubscribeDelay ?? DEFAULT_RESUBSCRIBE_DELAY;
-    host.addController(this);
-  }
-
-  public get result(): ConditionEvaluation {
-    return this._result;
-  }
-
-  public get error(): string | undefined {
-    return this._error;
-  }
-
-  /**
-   * Update inputs. Resubscribes only when the tree (or connection) changes.
-   */
-  public observe(
-    conditions: VisibilityCondition[] | undefined,
-    hass: HomeAssistant | undefined,
-    getContext?: () => ConditionContext
-  ): void {
-    this._conditions = conditions;
-    this._hass = hass;
-    this._getContext = getContext;
-    this._sync();
-  }
-
-  public hostConnected(): void {
-    this._connected = true;
-    this._sync();
-  }
-
-  public hostDisconnected(): void {
-    this._connected = false;
-    this._teardown();
-    // Subscriptions are gone; don't keep showing a stale result.
-    this._notifiedResult = undefined;
-    this._notifiedError = undefined;
-    this._setResult("unknown", undefined);
-  }
-
-  private _signatureOf(
-    conditions: VisibilityCondition[] | undefined
-  ): string | undefined {
-    if (conditions === undefined) {
-      return undefined;
-    }
-    if (conditions === this._lastConditionsRef) {
-      return this._lastSignature;
-    }
-    this._lastConditionsRef = conditions;
-    // JSON turns ±Infinity into null; append them so `.inf` bound flips resubscribe.
-    const nonFinite: string[] = [];
-    const json = JSON.stringify(conditions, (_key, value) => {
-      if (typeof value === "number" && !isFinite(value)) {
-        nonFinite.push(String(value));
-      }
-      return value;
-    });
-    this._lastSignature = nonFinite.length
-      ? `${json}|${nonFinite.join(",")}`
-      : json;
-    return this._lastSignature;
-  }
-
-  private _sync(): void {
-    if (!this._connected) {
-      return;
-    }
-    const signature = this._signatureOf(this._conditions);
-    // Resubscribe when the tree content or hass.connection changed.
-    const targetSignature = this._hasPendingResubscribe
-      ? this._pendingSignature
-      : this._subscribedSignature;
-    const connectionReplaced =
-      this._subscribedConnection !== undefined &&
-      this._hass !== undefined &&
-      this._hass.connection !== this._subscribedConnection;
-    if (signature !== targetSignature || connectionReplaced) {
-      // Drop the old subscriptions immediately so their result can't leak through.
-      this._teardown();
-      this._hasPendingResubscribe = true;
-      this._pendingSignature = signature;
-      if (
-        this._conditions === undefined ||
-        this._conditions.every(isPureClientCondition)
-      ) {
-        // All client-side; no server subscription to debounce.
-        this._subscribe();
-        return;
-      }
-      this._scheduleResubscribe();
-    }
-    // Keep client leaves live. Pending resubscribe has no split → `unknown`.
-    this._recompute();
-  }
-
-  private _scheduleResubscribe(): void {
-    if (this._resubscribeTimeout !== undefined) {
-      clearTimeout(this._resubscribeTimeout);
-    }
-    this._resubscribeTimeout = setTimeout(() => {
-      this._resubscribeTimeout = undefined;
-      this._subscribe();
-    }, this._resubscribeDelay);
-  }
-
-  private _subscribe(): void {
-    this._teardown();
-
-    const conditions = this._conditions;
-    const hass = this._hass;
-    this._pendingSignature = undefined;
-    this._hasPendingResubscribe = false;
-
-    if (!conditions || !hass) {
-      // Don't mark subscribed yet; hass often arrives after connect.
-      this._setResult("unknown", undefined);
-      return;
-    }
-    this._subscribedSignature = this._signatureOf(conditions);
-
-    const split = splitConditionTree(conditions);
-    this._split = split;
-
-    const generation = this._generation;
-    const connection: Connection = hass.connection;
-    this._subscribedConnection = connection;
-
-    for (const subtree of split.serverSubtrees) {
-      this._serverResults[subtree.id] = undefined;
-      const subscription = subscribeCondition(
-        connection,
-        (message) => {
-          if (generation !== this._generation) {
-            return;
-          }
-          if (message.error !== undefined) {
-            this._serverResults[subtree.id] = false;
-            this._subtreeErrors[subtree.id] =
-              typeof message.error === "string"
-                ? message.error
-                : message.error.message;
-          } else {
-            this._serverResults[subtree.id] = message.result;
-            this._subtreeErrors[subtree.id] = undefined;
-          }
-          this._subtreeTemplateErrors[subtree.id] = message.template_errors
-            ?.length
-            ? message.template_errors.join("\n")
-            : undefined;
-          this._recompute();
-        },
-        subtree.coreCondition
-      );
-      subscription.catch((err: unknown) => {
-        if (generation !== this._generation) {
-          return;
-        }
-        this._serverResults[subtree.id] = false;
-        this._subtreeErrors[subtree.id] =
-          err instanceof Error ? err.message : String(err);
-        this._recompute();
-      });
-      this._subscriptions.push(subscription);
-    }
-
-    observeConditionChanges(
-      conditions,
-      () => this._hass ?? hass,
-      (unsub) => this._listeners.push(unsub),
-      () => this._recompute()
-    );
-
-    this._recompute();
-  }
-
-  private _recompute(): void {
-    if (!this._split || !this._hass) {
-      this._setResult("unknown", undefined);
-      return;
-    }
-
-    const hass = this._hass;
-    const context = this._getContext?.() ?? {};
-    const clientEvaluator: ClientConditionEvaluator = (condition) => {
-      try {
-        return checkConditionsMet([condition as Condition], hass, context);
-      } catch (_err) {
-        return false;
-      }
-    };
-
-    const error = firstDefined(this._subtreeErrors);
-    // Don't treat a server error as `false` that a client `not` would invert.
-    if (error !== undefined) {
-      this._setResult("hidden", error);
-      return;
-    }
-
-    const value = this._split.evaluate(clientEvaluator, this._serverResults);
-    const result: ConditionEvaluation =
-      value === undefined ? "unknown" : value ? "visible" : "hidden";
-
-    this._setResult(result, firstDefined(this._subtreeTemplateErrors));
-  }
-
-  private _setResult(
-    result: ConditionEvaluation,
-    error: string | undefined
-  ): void {
-    this._result = result;
-    this._error = error;
-    if (result === this._notifiedResult && error === this._notifiedError) {
-      return;
-    }
-    this._notifiedResult = result;
-    this._notifiedError = error;
-    this._onResult(result, error);
-    this._host.requestUpdate();
-  }
-
-  private _teardown(): void {
-    this._generation += 1;
-    if (this._resubscribeTimeout !== undefined) {
-      clearTimeout(this._resubscribeTimeout);
-      this._resubscribeTimeout = undefined;
-    }
-    for (const subscription of this._subscriptions) {
-      subscription.then((unsub) => unsub()).catch(() => undefined);
-    }
-    this._subscriptions = [];
-    for (const unsub of this._listeners) {
-      unsub();
-    }
-    this._listeners = [];
-    this._split = undefined;
-    this._serverResults = {};
-    this._subtreeErrors = {};
-    this._subtreeTemplateErrors = {};
-    this._subscribedSignature = undefined;
-    this._pendingSignature = undefined;
-    this._hasPendingResubscribe = false;
-    this._subscribedConnection = undefined;
-  }
-}
@@ -0,0 +1,59 @@
+import type {
+  ReactiveController,
+  ReactiveControllerHost,
+} from "@lit/reactive-element/reactive-controller";
+import type {
+  Condition,
+  ConditionContext,
+} from "../../panels/lovelace/common/validate-condition";
+import type { HomeAssistant } from "../../types";
+import { setupConditionListeners } from "../condition/listeners";
+
+/**
+ * Reactive controller that manages the media-query and time-based listeners
+ * needed to keep a set of lovelace visibility conditions evaluated live.
+ *
+ * The host is responsible for the actual evaluation (e.g. computing visible /
+ * hidden / invalid state); the controller only triggers it via the supplied
+ * `onUpdate` callback when something the conditions depend on changes. Call
+ * `setup()` whenever the conditions change; the controller clears previous
+ * listeners and re-subscribes. Listeners are automatically released when the
+ * host disconnects.
+ */
+export class ConditionListenersController implements ReactiveController {
+  private _unsubs: (() => void)[] = [];
+
+  constructor(host: ReactiveControllerHost) {
+    host.addController(this);
+  }
+
+  public hostDisconnected(): void {
+    this.clear();
+  }
+
+  public setup(
+    conditions: Condition[],
+    hass: HomeAssistant,
+    onUpdate: () => void,
+    getContext?: () => ConditionContext
+  ): void {
+    this.clear();
+    if (!conditions.length) {
+      return;
+    }
+    setupConditionListeners(
+      conditions,
+      hass,
+      (unsub) => this._unsubs.push(unsub),
+      () => onUpdate(),
+      getContext
+    );
+  }
+
+  public clear(): void {
+    for (const unsub of this._unsubs) {
+      unsub();
+    }
+    this._unsubs = [];
+  }
+}
@@ -9,34 +9,36 @@ export const createDurationData = (
  }
  if (typeof duration !== "object") {
    if (typeof duration === "string" || isNaN(duration)) {
-      const durationString = duration.toString().trim();
-      // A leading "-" negates the whole period, matching
-      // `cv.time_period_str` in core.
-      const negative = durationString[0] === "-";
-      const parts = durationString
-        .split(":")
-        .map((part) =>
-          negative && part ? -Math.abs(Number(part)) : Number(part)
-        );
-
+      const parts = duration?.toString().split(":") || [];
      if (parts.length === 1) {
-        return { seconds: parts[0] };
+        return { seconds: Number(parts[0]) };
      }
      if (parts.length > 3) {
        return undefined;
      }
-      const seconds = parts[2] || 0;
-      const secondsWhole = Math.trunc(seconds);
+      const seconds = Number(parts[2]) || 0;
+      const seconds_whole = Math.floor(seconds);
      return {
-        hours: parts[0] || 0,
-        minutes: parts[1] || 0,
-        seconds: secondsWhole,
-        milliseconds: Math.trunc(
-          Number((seconds - secondsWhole).toFixed(4)) * 1000
+        hours: Number(parts[0]) || 0,
+        minutes: Number(parts[1]) || 0,
+        seconds: seconds_whole,
+        milliseconds: Math.floor(
+          Number((seconds - seconds_whole).toFixed(4)) * 1000
        ),
      };
    }
    return { seconds: duration };
  }
-  return duration;
+  if (!("days" in duration)) {
+    return duration;
+  }
+  const { days, minutes, seconds, milliseconds } = duration;
+  let hours = duration.hours || 0;
+  hours = (hours || 0) + (days || 0) * 24;
+  return {
+    hours,
+    minutes,
+    seconds,
+    milliseconds,
+  };
 };
@@ -1,7 +1 @@
 export const stopPropagation = (ev) => ev.stopPropagation();
-
-export const stopKeydownEnterSpacePropagation = (ev: KeyboardEvent) => {
-  if (ev.key === "Enter" || ev.key === " " || ev.key === "Spacebar") {
-    ev.stopPropagation();
-  }
-};
@@ -1,70 +1,33 @@
 import type { HassEntity } from "home-assistant-js-websocket";
-import type {
-  EntityRegistryDisplayEntry,
-  EntityRegistryEntry,
-} from "../../data/entity/entity_registry";
 import type { HomeAssistant } from "../../types";
 import { ensureArray } from "../array/ensure-array";
 import { computeRTL } from "../util/compute_rtl";
 import { computeAreaName } from "./compute_area_name";
 import { computeDeviceName } from "./compute_device_name";
-import {
-  computeEntityEntryName,
-  computeEntityName,
-  entityUseDeviceName,
-} from "./compute_entity_name";
+import { computeEntityName, entityUseDeviceName } from "./compute_entity_name";
 import { computeFloorName } from "./compute_floor_name";
 import { computeStateName } from "./compute_state_name";
-import {
-  getEntityContext,
-  getEntityEntryContext,
-} from "./context/get_entity_context";
-import type { EntityNameItem, EntityNameOptions } from "./entity_name_config";
+import { getEntityContext } from "./context/get_entity_context";

 const DEFAULT_SEPARATOR = " ";

-export { DEFAULT_ENTITY_NAME, ENTITY_NAME_TYPES } from "./entity_name_config";
-export type {
-  EntityNameItem,
-  EntityNameOptions,
-  EntityNameType,
-} from "./entity_name_config";
+export const DEFAULT_ENTITY_NAME = [
+  { type: "device" },
+  { type: "entity" },
+] satisfies EntityNameItem[];

-// Joins items that need no entity context. Returns undefined as soon as one
-// item references the registries (device, area, ...).
-const computeTextOnlyName = (
-  items: EntityNameItem[],
-  options?: EntityNameOptions
-): string | undefined =>
-  items.every((n) => n.type === "text")
-    ? items
-        .map((item) => item.text)
-        .join(options?.separator ?? DEFAULT_SEPARATOR)
-    : undefined;
+export type EntityNameItem =
+  | {
+      type: "entity" | "device" | "area" | "floor";
+    }
+  | {
+      type: "text";
+      text: string;
+    };

-/**
- * Name formatter used before the registry-aware one is installed
- * (see state/connection-mixin and state/state-display-mixin). It honours a
- * configured string or text-only name and falls back to the friendly name for
- * anything that needs entity context, so a configured name is never dropped
- * while the real formatter is still loading.
- */
-export const computeEntityNameDisplayWithoutContext = (
-  stateObj: HassEntity,
-  name: string | EntityNameItem | EntityNameItem[] | undefined,
-  options?: EntityNameOptions
-): string => {
-  if (typeof name === "string") {
-    return name;
-  }
-  if (!name) {
-    return computeStateName(stateObj);
-  }
-  return (
-    computeTextOnlyName(ensureArray(name), options) ??
-    computeStateName(stateObj)
-  );
-};
+export interface EntityNameOptions {
+  separator?: string;
+}

 export const computeEntityNameDisplay = (
  stateObj: HassEntity,
@@ -89,9 +52,8 @@ export const computeEntityNameDisplay = (
  const separator = options?.separator ?? DEFAULT_SEPARATOR;

  // If all items are text, just join them
-  const textOnlyName = computeTextOnlyName(items, options);
-  if (textOnlyName !== undefined) {
-    return textOnlyName;
+  if (items.every((n) => n.type === "text")) {
+    return items.map((item) => item.text).join(separator);
  }

  const useDeviceName = entityUseDeviceName(stateObj, entities, devices);
@@ -129,53 +91,20 @@ export const computeEntityNameList = (
  areas: HomeAssistant["areas"],
  floors: HomeAssistant["floors"]
 ): (string | undefined)[] => {
-  const entry = entities[stateObj.entity_id] as
-    EntityRegistryDisplayEntry | undefined;
-
-  if (!entry) {
-    return name.map((item) =>
-      item.type === "entity"
-        ? computeStateName(stateObj)
-        : item.type === "text"
-          ? item.text
-          : undefined
-    );
-  }
-
-  return computeEntityEntryNameList(
-    entry,
-    name,
-    entities,
-    devices,
-    areas,
-    floors
-  );
-};
-
-export const computeEntityEntryNameList = (
-  entry: EntityRegistryDisplayEntry | EntityRegistryEntry,
-  name: EntityNameItem[],
-  entities: HomeAssistant["entities"],
-  devices: HomeAssistant["devices"],
-  areas: HomeAssistant["areas"],
-  floors: HomeAssistant["floors"]
-): (string | undefined)[] => {
-  const { device, parentDevice, area, floor } = getEntityEntryContext(
-    entry,
+  const { device, area, floor } = getEntityContext(
+    stateObj,
    entities,
    devices,
    areas,
    floors
  );

-  return name.map((item) => {
+  const names = name.map((item) => {
    switch (item.type) {
      case "entity":
-        return computeEntityEntryName(entry, devices);
+        return computeEntityName(stateObj, entities, devices);
      case "device":
        return device ? computeDeviceName(device) : undefined;
-      case "parent_device":
-        return parentDevice ? computeDeviceName(parentDevice) : undefined;
      case "area":
        return area ? computeAreaName(area) : undefined;
      case "floor":
@@ -186,29 +115,8 @@ export const computeEntityEntryNameList = (
        return "";
    }
  });
-};

-export const computeEntitySearchLabels = (
-  stateObj: HassEntity,
-  entities: HomeAssistant["entities"],
-  devices: HomeAssistant["devices"],
-  areas: HomeAssistant["areas"],
-  floors: HomeAssistant["floors"]
-) => {
-  const { device, parentDevice, area } = getEntityContext(
-    stateObj,
-    entities,
-    devices,
-    areas,
-    floors
-  );
-  return {
-    entityName: computeEntityName(stateObj, entities, devices) || null,
-    friendlyName: computeStateName(stateObj) || null,
-    deviceName: (device && computeDeviceName(device)) || null,
-    parentDeviceName: (parentDevice && computeDeviceName(parentDevice)) || null,
-    areaName: (area && computeAreaName(area)) || null,
-  };
+  return names;
 };

 export interface EntityPickerDisplay {
@@ -228,20 +136,14 @@ export const computeEntityPickerDisplay = (
  >,
  stateObj: HassEntity
 ): EntityPickerDisplay => {
-  const [entityName, deviceName, parentDeviceName, areaName] =
-    computeEntityNameList(
-      stateObj,
-      [
-        { type: "entity" },
-        { type: "device" },
-        { type: "parent_device" },
-        { type: "area" },
-      ],
-      hass.entities,
-      hass.devices,
-      hass.areas,
-      hass.floors
-    );
+  const [entityName, deviceName, areaName] = computeEntityNameList(
+    stateObj,
+    [{ type: "entity" }, { type: "device" }, { type: "area" }],
+    hass.entities,
+    hass.devices,
+    hass.areas,
+    hass.floors
+  );

  const isRTL = computeRTL(
    hass.language,
@@ -250,7 +152,7 @@ export const computeEntityPickerDisplay = (

  const primary = entityName || deviceName || stateObj.entity_id;
  const secondary =
-    [areaName, parentDeviceName, entityName ? deviceName : undefined]
+    [areaName, entityName ? deviceName : undefined]
      .filter(Boolean)
      .join(isRTL ? " ◂ " : " ▸ ") || undefined;

@@ -13,7 +13,6 @@ import { getDeviceAreaId } from "./get_device_context";
 interface EntityContext {
  entity: EntityRegistryDisplayEntry | null;
  device: DeviceRegistryEntry | null;
-  parentDevice: DeviceRegistryEntry | null;
  area: AreaRegistryEntry | null;
  floor: FloorRegistryEntry | null;
 }
@@ -32,7 +31,6 @@ export const getEntityContext = (
    return {
      entity: null,
      device: null,
-      parentDevice: null,
      area: null,
      floor: null,
    };
@@ -67,9 +65,6 @@ export const getEntityEntryContext = (
  const entity = entities[entry.entity_id];
  const deviceId = entry?.device_id;
  const device = deviceId ? devices[deviceId] : undefined;
-  const parentDevice = device?.parent_device_id
-    ? devices[device.parent_device_id]
-    : undefined;
  const areaId =
    entry?.area_id || (device ? getDeviceAreaId(device, devices) : undefined);
  const area = areaId ? areas[areaId] : undefined;
@@ -79,7 +74,6 @@ export const getEntityEntryContext = (
  return {
    entity: entity,
    device: device || null,
-    parentDevice: parentDevice || null,
    area: area || null,
    floor: floor || null,
  };
@@ -1,34 +0,0 @@
-/**
- * Shape of a composed entity name, kept free of runtime dependencies so that
- * modules in the core entry chunk can name an entity without pulling in the
- * registry-aware formatters from `compute_entity_name_display`.
- */
-
-export const ENTITY_NAME_TYPES = [
-  "floor",
-  "area",
-  "parent_device",
-  "device",
-  "entity",
-] as const;
-
-export type EntityNameType = (typeof ENTITY_NAME_TYPES)[number];
-
-export type EntityNameItem =
-  | {
-      type: EntityNameType;
-    }
-  | {
-      type: "text";
-      text: string;
-    };
-
-export interface EntityNameOptions {
-  separator?: string;
-}
-
-export const DEFAULT_ENTITY_NAME = [
-  { type: "parent_device" },
-  { type: "device" },
-  { type: "entity" },
-] satisfies EntityNameItem[];
@@ -29,7 +29,7 @@ export const FIXED_DOMAIN_STATES = {
  fan: ["on", "off"],
  humidifier: ["on", "off"],
  input_boolean: ["on", "off"],
-  lawn_mower: ["error", "paused", "mowing", "returning", "docked", "idle"],
+  lawn_mower: ["error", "paused", "mowing", "returning", "docked"],
  light: ["on", "off"],
  lock: [
    "jammed",
@@ -95,7 +95,6 @@ const FIXED_DOMAIN_ATTRIBUTE_STATES = {
      "door",
      "garage_door",
      "gas",
-      "glass_break",
      "heat",
      "light",
      "lock",
@@ -36,7 +36,7 @@ export function stateActive(stateObj: HassEntity, state?: string): boolean {
    case "person":
      return compareState !== "not_home";
    case "lawn_mower":
-      return !["docked", "paused", "idle"].includes(compareState);
+      return !["docked", "paused"].includes(compareState);
    case "lock":
      return compareState !== "locked";
    case "media_player":
@@ -12,14 +12,14 @@ import {

 // Generated by build-scripts/gulp/map-assets.js. The attribution comes from the
 // TileJSON, deliberately: it follows whoever serves the tiles.
-export const VECTOR_STYLES = {
+const VECTOR_STYLES = {
  light: "/static/map/light.json",
  dark: "/static/map/dark.json",
 } as const;

 // Without it Arabic and Hebrew labels render reversed. Loaded by MapLibre's
 // worker, hence a URL rather than an import.
-export const RTL_TEXT_PLUGIN_URL = "/static/map/mapbox-gl-rtl-text.js";
+const RTL_TEXT_PLUGIN_URL = "/static/map/mapbox-gl-rtl-text.js";

 // MapLibre needs WebGL2 even for raster, so the fallback stays a Leaflet layer.
 // OSM serves no @2x variant.
@@ -33,8 +33,8 @@ const OSM_ATTRIBUTION =

 // Browsers keep about 16 live WebGL contexts and drop the oldest, which a
 // dashboard full of map cards hits. A transient loss is restored, hence a grace.
-export const CONTEXT_RESTORE_GRACE = 2000;
-export const RECOVERY_THROTTLE = 30000;
+const CONTEXT_RESTORE_GRACE = 2000;
+const RECOVERY_THROTTLE = 30000;

 // On the map, not the layer: marker clustering throws without a maximum. The
 // floor is 1 because at Leaflet zoom 0 the adapter drives MapLibre to -1.
@@ -55,7 +55,7 @@ export interface MapBaseLayer {
 let webGL2Supported: boolean | undefined;

 // Rules out iOS below 15, older Android tablets and blocklisted drivers.
-export const supportsWebGL2 = (): boolean => {
+const supportsWebGL2 = (): boolean => {
  if (webGL2Supported === undefined) {
    try {
      const context = document.createElement("canvas").getContext("webgl2");
@@ -91,7 +91,7 @@ const useDemoUpstream = (style: StyleSpecification): StyleSpecification => {
  return style;
 };

-export const loadStyle = async (url: string): Promise<StyleSpecification> => {
+const loadStyle = async (url: string): Promise<StyleSpecification> => {
  const style: StyleSpecification = await (await fetch(url)).json();

  if (__DEMO__) {
@@ -111,7 +111,7 @@ export const loadStyle = async (url: string): Promise<StyleSpecification> => {

 // Global to MapLibre, and it throws when set twice.
 let rtlTextPluginRequested = false;
-export const ensureRTLTextPlugin = (setPlugin: typeof setRTLTextPlugin) => {
+const ensureRTLTextPlugin = (setPlugin: typeof setRTLTextPlugin) => {
  if (rtlTextPluginRequested) {
    return;
  }
@@ -303,11 +303,9 @@ export const createBaseLayer = async (
  leaflet: LeafletModuleType,
  map: LeafletMap,
  darkMode: boolean,
-  token: string | undefined,
-  // Skip the vector layer, e.g. after a permanent WebGL context loss
-  rasterOnly = false
+  token: string | undefined
 ): Promise<MapBaseLayer> => {
-  if (!rasterOnly && supportsWebGL2()) {
+  if (supportsWebGL2()) {
    let vectorLayer: MapBaseLayer | undefined;
    try {
      const [{ maplibreGL: createLayer }, maplibre] = await Promise.all([
@@ -1,59 +0,0 @@
-/** Handle DOM and styles of the editable circle (MapEngine.addEditableCircle) */
-
-/** Hit target for the radius handle; comfortably above touch minimums */
-export const RESIZE_HANDLE_SIZE = 24;
-
-/** The visible dot inside the hit target */
-export const RESIZE_HANDLE_DOT_SIZE = 12;
-
-/** Relative radius change per arrow key press on the handle */
-export const RESIZE_KEY_STEP = 0.1;
-
-/** Advertised slider maximum; a larger radius raises it (see the engine) */
-export const RADIUS_ARIA_MAX = 100000;
-
-export const createResizeHandleElement = (label?: string): HTMLElement => {
-  const element = document.createElement("div");
-  element.className = "editable-circle-resize";
-  element.tabIndex = 0;
-  element.setAttribute("role", "slider");
-  element.setAttribute("aria-valuemin", "1");
-  element.setAttribute("aria-valuemax", String(RADIUS_ARIA_MAX));
-  if (label) {
-    element.setAttribute("aria-label", label);
-  }
-  const dot = document.createElement("div");
-  dot.className = "editable-circle-resize-dot";
-  element.appendChild(dot);
-  return element;
-};
-
-/** Styles for the handles, included by ha-map for both engines */
-export const editableCircleStyles = `
-  .editable-circle-center {
-    width: 16px;
-    height: 16px;
-    border-radius: 50%;
-    background: var(--primary-color);
-    border: 2px solid var(--card-background-color, #fff);
-    box-sizing: border-box;
-    box-shadow: var(--ha-box-shadow-s);
-  }
-  .editable-circle-resize {
-    width: ${RESIZE_HANDLE_SIZE}px;
-    height: ${RESIZE_HANDLE_SIZE}px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    cursor: ew-resize;
-  }
-  .editable-circle-resize-dot {
-    width: ${RESIZE_HANDLE_DOT_SIZE}px;
-    height: ${RESIZE_HANDLE_DOT_SIZE}px;
-    border-radius: 50%;
-    background: var(--card-background-color, #fff);
-    border: 2px solid var(--primary-color);
-    box-sizing: border-box;
-    box-shadow: var(--ha-box-shadow-s);
-  }
-`;
@@ -1,353 +0,0 @@
-import type {
-  CircleMarker,
-  Control,
-  Map,
-  MarkerClusterGroup,
-  Polyline,
-} from "leaflet";
-import type { LeafletModuleType } from "../../dom/setup-leaflet-map";
-import type { MapBaseLayer } from "../base-layer";
-import { createBaseLayer, MAP_MAX_ZOOM, MAP_MIN_ZOOM } from "../base-layer";
-import { DecoratedMarker } from "../decorated_marker";
-import { isTouch } from "../../../util/is_touch";
-import type {
-  MapClusterOptions,
-  MapCircleOptions,
-  MapControlPosition,
-  MapEngine,
-  MapEngineOptions,
-  MapFitOptions,
-  MapItemHandle,
-  MapLatLng,
-  MapMarkerHandle,
-  MapMarkerOptions,
-  MapPath,
-} from "../map-engine";
-import { setMarkerAccessibility } from "../marker-accessibility";
-
-/** A leaflet marker that knows the engine handle it was created for */
-interface HandledMarker extends DecoratedMarker {
-  engineHandle?: LeafletMarkerHandle;
-}
-
-interface LeafletMarkerHandle extends MapMarkerHandle {
-  marker: HandledMarker;
-}
-
-/** The Leaflet engine: raster viewing fallback without WebGL2, no editing */
-export class LeafletMapEngine implements MapEngine {
-  /** For the ha-map jsdom tests only */
-  public leafletMap?: Map;
-
-  public Leaflet?: LeafletModuleType;
-
-  private _baseLayer?: MapBaseLayer;
-
-  private _clusterable: HandledMarker[] = [];
-
-  private _cluster?: MarkerClusterGroup;
-
-  private _clusterOptions: MapClusterOptions | null = null;
-
-  private _scaleControl?: Control.Scale;
-
-  public async init(
-    container: HTMLElement,
-    options: MapEngineOptions
-  ): Promise<void> {
-    const root = container.parentNode;
-    if (!root) {
-      throw new Error("Cannot set up a Leaflet map on a detached element");
-    }
-    // eslint-disable-next-line
-    const Leaflet = (await import("leaflet")).default as LeafletModuleType;
-    Leaflet.Icon.Default.imagePath = "/static/images/leaflet/images/";
-    await import("leaflet.markercluster");
-
-    const map = Leaflet.map(container, {
-      minZoom: MAP_MIN_ZOOM,
-      maxZoom: MAP_MAX_ZOOM,
-    });
-    map.attributionControl.setPrefix("");
-    for (const href of [
-      "/static/images/leaflet/leaflet.css",
-      "/static/images/leaflet/MarkerCluster.css",
-    ]) {
-      const style = document.createElement("link");
-      style.setAttribute("href", href);
-      style.setAttribute("rel", "stylesheet");
-      root.appendChild(style);
-    }
-    map.setView(options.center, options.zoom);
-
-    // The base layer adds itself; a vector layer may still fall back to raster
-    this._baseLayer = await createBaseLayer(
-      Leaflet,
-      map,
-      options.darkMode,
-      options.token,
-      options.rasterOnly ?? false
-    );
-    this.leafletMap = map;
-    this.Leaflet = Leaflet;
-    map.zoomControl?.setPosition(options.zoomControlPosition);
-
-    const { events } = options;
-    if (events.click) {
-      map.on("click", (ev) => {
-        events.click!([ev.latlng.lat, ev.latlng.lng]);
-      });
-    }
-    if (events.zoomStart) {
-      map.on("zoomstart", () => events.zoomStart!());
-    }
-    if (events.moveStart) {
-      map.on("movestart", () => events.moveStart!());
-    }
-  }
-
-  public destroy(): void {
-    this.leafletMap?.remove();
-    this.leafletMap = undefined;
-    this.Leaflet = undefined;
-    this._baseLayer = undefined;
-    this._cluster = undefined;
-    this._clusterable = [];
-    this._scaleControl = undefined;
-  }
-
-  public invalidateSize(): void {
-    this.leafletMap?.invalidateSize({ debounceMoveend: true });
-  }
-
-  public hasUsableSize(): boolean {
-    if (!this.leafletMap) {
-      return false;
-    }
-    const size = this.leafletMap.getSize();
-    if (size.x > 0 && size.y > 0) {
-      return true;
-    }
-    const container = this.leafletMap.getContainer();
-    if (container.clientWidth > 0 && container.clientHeight > 0) {
-      // The container was laid out since Leaflet last measured it
-      this.leafletMap.invalidateSize(false);
-      return true;
-    }
-    return false;
-  }
-
-  public setDarkMode(darkMode: boolean): void {
-    this._baseLayer?.setDarkMode(darkMode);
-  }
-
-  public setZoomControlPosition(position: MapControlPosition): void {
-    this.leafletMap?.zoomControl?.setPosition(position);
-  }
-
-  public setScaleRuler(options: { metric: boolean } | null): void {
-    if (this._scaleControl) {
-      this.leafletMap?.removeControl(this._scaleControl);
-      this._scaleControl = undefined;
-    }
-    if (!options || !this.leafletMap || !this.Leaflet) {
-      return;
-    }
-    this._scaleControl = this.Leaflet.control.scale({
-      position: "bottomleft",
-      metric: options.metric,
-      imperial: !options.metric,
-    });
-    this._scaleControl.addTo(this.leafletMap!);
-  }
-
-  public setView(center: MapLatLng, zoom?: number): void {
-    this.leafletMap?.setView(center, zoom);
-  }
-
-  public setZoom(zoom: number): void {
-    this.leafletMap?.setZoom(zoom);
-  }
-
-  private _getZoom(): number {
-    return this.leafletMap?.getZoom() ?? 0;
-  }
-
-  private _project(location: MapLatLng): { x: number; y: number } {
-    const point = this.leafletMap!.project(location, this._getZoom());
-    return { x: point.x, y: point.y };
-  }
-
-  public fitBounds(points: MapLatLng[], options?: MapFitOptions): void {
-    if (!this.leafletMap || !this.Leaflet || !points.length) {
-      return;
-    }
-    const bounds = this.Leaflet.latLngBounds(points).pad(options?.pad ?? 0.5);
-    this.leafletMap.fitBounds(bounds, {
-      maxZoom: options?.maxZoom,
-      animate: options?.animate,
-      paddingTopLeft: [options?.padding?.left ?? 0, options?.padding?.top ?? 0],
-      paddingBottomRight: [
-        options?.padding?.right ?? 0,
-        options?.padding?.bottom ?? 0,
-      ],
-    });
-  }
-
-  public panTo(location: MapLatLng): void {
-    this.leafletMap?.panTo(location);
-  }
-
-  public containsLocation(location: MapLatLng): boolean {
-    return this.leafletMap?.getBounds().contains(location) ?? false;
-  }
-
-  public addMarker(
-    element: HTMLElement,
-    location: MapLatLng,
-    options: MapMarkerOptions
-  ): MapMarkerHandle {
-    const decoration = options.decoration
-      ? this.Leaflet!.circle(location, {
-          interactive: false,
-          color: options.decoration.color,
-          radius: options.decoration.radius,
-        })
-      : undefined;
-
-    // Leaflet's keyboard support focuses its own wrapper, where the element's
-    // activation handlers never hear a key; the element itself takes focus
-    const interactive = options.interactive ?? true;
-    const focusable = options.focusable ?? interactive;
-    setMarkerAccessibility(element, options.title, focusable);
-    const marker: HandledMarker = new DecoratedMarker(location, decoration, {
-      icon: this.Leaflet!.divIcon({
-        html: element,
-        iconSize: options.size,
-        iconAnchor: options.anchor,
-        className: "",
-      }),
-      interactive,
-      keyboard: false,
-      title: options.title,
-    });
-
-    const handle: LeafletMarkerHandle = {
-      marker,
-      location,
-      clusterData: options.clusterData,
-      remove: () => {
-        this._cluster?.removeLayer(marker);
-        marker.remove();
-        const index = this._clusterable.indexOf(marker);
-        if (index !== -1) {
-          this._clusterable.splice(index, 1);
-        }
-      },
-    };
-    marker.engineHandle = handle;
-
-    if (options.cluster) {
-      // Placed on the map by the next setClustering call
-      this._clusterable.push(marker);
-    } else {
-      marker.addTo(this.leafletMap!);
-    }
-    return handle;
-  }
-
-  public addCircle(
-    center: MapLatLng,
-    options: MapCircleOptions
-  ): MapItemHandle {
-    const circle = this.Leaflet!.circle(center, {
-      interactive: false,
-      color: options.color,
-      radius: options.radius,
-    }).addTo(this.leafletMap!);
-    return { remove: () => circle.remove() };
-  }
-
-  public addPath(path: MapPath): MapItemHandle {
-    const items: (Polyline | CircleMarker)[] = [];
-    for (const segment of path.segments) {
-      items.push(
-        this.Leaflet!.polyline(segment.points, {
-          color: path.color,
-          opacity: segment.opacity,
-          interactive: false,
-        })
-      );
-    }
-    for (const pathMarker of path.markers) {
-      items.push(
-        this.Leaflet!.circleMarker(pathMarker.location, {
-          radius: isTouch ? 8 : 3,
-          color: path.color,
-          opacity: pathMarker.opacity,
-          fillOpacity: pathMarker.opacity,
-          interactive: true,
-        }).bindTooltip(pathMarker.tooltipHtml, { direction: "top" })
-      );
-    }
-    items.forEach((item) => item.addTo(this.leafletMap!));
-    return { remove: () => items.forEach((item) => item.remove()) };
-  }
-
-  public setClustering(options: MapClusterOptions | null): void {
-    if (this._cluster) {
-      this._cluster.remove();
-      this._cluster = undefined;
-    }
-    this._clusterOptions = options;
-    if (!this.leafletMap || !this.Leaflet) {
-      return;
-    }
-    if (!options) {
-      this._clusterable.forEach((marker) => marker.addTo(this.leafletMap!));
-      return;
-    }
-    // markercluster groups by proximity only; groupKey is not supported here
-    this._cluster = this.Leaflet.markerClusterGroup({
-      showCoverageOnHover: false,
-      removeOutsideVisibleBounds: false,
-      maxClusterRadius: options.radius,
-      iconCreateFunction: (cluster) => {
-        const members = (cluster.getAllChildMarkers() as HandledMarker[]).map(
-          (marker) => marker.engineHandle!
-        );
-        const latLng = cluster.getLatLng();
-        const icon = this._clusterOptions!.iconBuilder(members, [
-          latLng.lat,
-          latLng.lng,
-        ]);
-        // The element fills the divIcon wrapper, which gets the size
-        icon.element.style.width = `${icon.size[0]}px`;
-        icon.element.style.height = `${icon.size[1]}px`;
-        // markercluster pins icons to the cluster, so a location override becomes an anchor shift
-        let anchor = icon.anchor;
-        if (icon.location) {
-          const clusterPoint = this._project([latLng.lat, latLng.lng]);
-          const targetPoint = this._project(icon.location);
-          const base = anchor ?? [icon.size[0] / 2, icon.size[1] / 2];
-          anchor = [
-            base[0] - (targetPoint.x - clusterPoint.x),
-            base[1] - (targetPoint.y - clusterPoint.y),
-          ];
-        }
-        return this.Leaflet!.divIcon({
-          html: icon.element,
-          iconSize: icon.size,
-          iconAnchor: anchor,
-          className: "",
-        });
-      },
-    });
-    this._cluster.addLayers(this._clusterable);
-    this.leafletMap!.addLayer(this._cluster!);
-  }
-
-  public refreshClusters(): void {
-    this._cluster?.refreshClusters();
-  }
-}
@@ -1,88 +0,0 @@
-import memoizeOne from "memoize-one";
-import { getColorByIndex } from "../color/colors";
-import { computeDomain } from "../entity/compute_domain";
-import type { EntityRegistryEntry } from "../../data/entity/entity_registry";
-
-/**
- * Map colors for entities, by registry creation order, so an entity has the
- * same color on every map. The registry comes from the fullEntitiesContext;
- * entities without an entry (e.g. YAML zones) get a color derived from their
- * id.
- */
-
-export const HOME_ZONE_ENTITY_ID = "zone.home";
-
-/** Domains whose entities are colored by creation order */
-const ORDERED_DOMAINS = ["zone", "person", "device_tracker"];
-
-// One index per registry update, shared by every map on the page. Zones,
-// persons and trackers share one sequence, so a person never has the color
-// of the zone it is in.
-const creationIndex = memoizeOne(
-  (entries: EntityRegistryEntry[]): Record<string, number> => {
-    const index: Record<string, number> = {};
-    entries
-      .filter(
-        (entry) =>
-          ORDERED_DOMAINS.includes(computeDomain(entry.entity_id)) &&
-          // The home zone has a fixed color and does not take a palette slot
-          entry.entity_id !== HOME_ZONE_ENTITY_ID
-      )
-      .sort((a, b) => a.created_at - b.created_at || a.id.localeCompare(b.id))
-      .forEach((entry, i) => {
-        index[entry.entity_id] = i;
-      });
-    return index;
-  }
-);
-
-// For entities without a registry entry
-const hashIndex = (entityId: string): number => {
-  let hash = 5381;
-  for (let i = 0; i < entityId.length; i++) {
-    hash = (hash * 33 + entityId.charCodeAt(i)) % 2147483647;
-  }
-  return hash;
-};
-
-/** The palette color of an entity on a map */
-export const entityMapColor = (
-  entityId: string,
-  entries: EntityRegistryEntry[],
-  computedStyles: CSSStyleDeclaration
-): string =>
-  getColorByIndex(
-    creationIndex(entries)[entityId] ?? hashIndex(entityId),
-    computedStyles
-  );
-
-/** The color a new zone will take once created, from the next creation-order slot */
-export const nextZoneColor = (
-  passive: boolean,
-  entries: EntityRegistryEntry[],
-  computedStyles: CSSStyleDeclaration
-): string => {
-  if (passive) {
-    return computedStyles.getPropertyValue("--secondary-text-color");
-  }
-  return getColorByIndex(
-    Object.keys(creationIndex(entries)).length,
-    computedStyles
-  );
-};
-
-/** A zone's color: primary for home, muted for passive, its entity map color otherwise */
-export const zoneColor = (
-  entityId: string,
-  passive: boolean,
-  entries: EntityRegistryEntry[],
-  computedStyles: CSSStyleDeclaration
-): string => {
-  if (entityId === HOME_ZONE_ENTITY_ID) {
-    return computedStyles.getPropertyValue("--primary-color");
-  }
-  if (passive) {
-    return computedStyles.getPropertyValue("--secondary-text-color");
-  }
-  return entityMapColor(entityId, entries, computedStyles);
-};
@@ -1,311 +0,0 @@
-/**
- * Map engine abstraction for ha-map: MapLibre GL where WebGL2 is available,
- * Leaflet as the viewing fallback. The Leaflet engine is frozen at this
- * contract; new capabilities go on MapLibre only, as optional members like
- * `editing`.
- *
- * Positions are [latitude, longitude]; zoom levels use Leaflet semantics.
- */
-
-export type MapLatLng = [latitude: number, longitude: number];
-
-export type MapControlPosition =
-  "topleft" | "topright" | "bottomleft" | "bottomright";
-
-export interface MapEngineEvents {
-  /** Click on the map surface, not on a marker */
-  click(location: MapLatLng): void;
-  /** Zoom is starting, programmatic or not */
-  zoomStart(): void;
-  /** The map starts moving, programmatic or not */
-  moveStart(): void;
-  /** The engine can no longer render; the host switches to the fallback */
-  fatal(): void;
-}
-
-export interface MapEngineOptions {
-  center: MapLatLng;
-  zoom: number;
-  darkMode: boolean;
-  /** Token for core's tile proxy */
-  token?: string;
-  zoomControlPosition: MapControlPosition;
-  /** Render without WebGL after a permanent context loss; WebGL engines reject init */
-  rasterOnly?: boolean;
-  events: Partial<MapEngineEvents>;
-}
-
-export interface MapFitOptions {
-  /** Do not zoom in beyond this level even if the bounds would allow it */
-  maxZoom?: number;
-  /** Relative padding around the bounds, e.g. 0.5 grows them by 50% */
-  pad?: number;
-  /** Ease the camera to the bounds instead of jumping; defaults to true */
-  animate?: boolean;
-  /** Viewport pixels covered by overlays; the bounds fit inside the rest */
-  padding?: MapFitPadding;
-}
-
-export interface MapFitPadding {
-  top?: number;
-  right?: number;
-  bottom?: number;
-  left?: number;
-}
-
-export interface MapMarkerOptions {
-  /** Rendered size of the element in pixels */
-  size: [width: number, height: number];
-  /** Point of the element placed on the coordinate, from its top left; defaults to the center */
-  anchor?: [x: number, y: number];
-  /** Takes pointer input; defaults to true */
-  interactive?: boolean;
-  /** A keyboard-focusable button, for markers that act on activation; defaults to interactive */
-  focusable?: boolean;
-  /** Accessible name */
-  title?: string;
-  /** A meter-radius circle sharing the marker's lifecycle (GPS accuracy) */
-  decoration?: MapCircleOptions;
-  /** Cluster this marker; it appears once setClustering is called */
-  cluster?: boolean;
-  /** Caller data handed back to the cluster icon builder */
-  clusterData?: unknown;
-}
-
-export interface MapCircleOptions {
-  /** Radius in meters */
-  radius: number;
-  /** Stroke color; the fill is derived from it, translucent */
-  color: string;
-}
-
-export interface MapPathSegment {
-  points: MapLatLng[];
-  opacity?: number;
-}
-
-export interface MapPathMarker {
-  location: MapLatLng;
-  opacity?: number;
-  /** Tooltip/popup HTML shown on hover; caller is responsible for escaping */
-  tooltipHtml: string;
-}
-
-export interface MapPath {
-  color: string;
-  segments: MapPathSegment[];
-  markers: MapPathMarker[];
-}
-
-/** Handle to anything placed on the map; remove() must be idempotent */
-export interface MapItemHandle {
-  remove(): void;
-}
-
-export interface MapMarkerHandle extends MapItemHandle {
-  readonly location: MapLatLng;
-  readonly clusterData?: unknown;
-}
-
-export interface MapDraggableMarkerOptions extends MapMarkerOptions {
-  onDragEnd?(location: MapLatLng): void;
-}
-
-export interface MapEditableCircleOptions {
-  /** Radius in meters */
-  radius: number;
-  /** Stroke color; the fill is derived from it, translucent */
-  color: string;
-  /** Element shown at the center, e.g. the zone icon; a plain dot otherwise */
-  centerElement?: HTMLElement;
-  centerSize?: [width: number, height: number];
-  title?: string;
-  /** The center can be dragged */
-  moveable?: boolean;
-  /** A handle on the edge can be dragged to change the radius */
-  resizable?: boolean;
-  /** Accessible name of the radius handle, e.g. "Radius of Home in meters" */
-  resizeLabel?: string;
-  onMove?(center: MapLatLng): void;
-  onResize?(radius: number): void;
-  onClick?(): void;
-}
-
-export interface MapEditingSupport {
-  /** Place a draggable HTML element marker */
-  addDraggableMarker(
-    element: HTMLElement,
-    location: MapLatLng,
-    options: MapDraggableMarkerOptions
-  ): MapEditableMarkerHandle;
-
-  /** Draw a circle whose center and radius can be dragged */
-  addEditableCircle(
-    center: MapLatLng,
-    options: MapEditableCircleOptions
-  ): MapEditableCircleHandle;
-}
-
-/** A circle with drag handles for its center and radius */
-export interface MapEditableCircleHandle extends MapItemHandle {
-  readonly center: MapLatLng;
-  readonly radius: number;
-  /** Move and resize without recreating (no-op mid-drag) */
-  update(center: MapLatLng, radius: number): void;
-}
-
-export interface MapEditableMarkerHandle extends MapMarkerHandle {
-  /** Move without recreating (no-op mid-drag) */
-  setLocation(location: MapLatLng): void;
-}
-
-export interface MapClusterIcon {
-  element: HTMLElement;
-  size: [width: number, height: number];
-  /** Like MapMarkerOptions.anchor; defaults to the element's center */
-  anchor?: [x: number, y: number];
-  /** Show the icon here instead of at the cluster, e.g. attached to a zone */
-  location?: MapLatLng;
-}
-
-export interface MapClusterOptions {
-  /** Cluster markers closer than this many screen pixels */
-  radius: number;
-  /**
-   * Markers sharing a key (e.g. their zone) form one group while they span
-   * at most groupRadius pixels; beyond that, and without a key, they cluster
-   * by proximity.
-   */
-  groupKey?(marker: MapMarkerHandle): string | undefined;
-  groupRadius?: number;
-  /** Builds a cluster's element; called when its members change and on refreshClusters() */
-  iconBuilder(members: MapMarkerHandle[], location: MapLatLng): MapClusterIcon;
-}
-
-export interface MapEngine {
-  /** Create the map in the container; call once */
-  init(container: HTMLElement, options: MapEngineOptions): Promise<void>;
-
-  /** Tear down the map and release its resources (DOM, workers, WebGL) */
-  destroy(): void;
-
-  /** Re-measure the container after a size change */
-  invalidateSize(): void;
-
-  /** Whether the map has a non-zero size, re-measuring if needed */
-  hasUsableSize(): boolean;
-
-  setDarkMode(darkMode: boolean): void;
-
-  setZoomControlPosition(position: MapControlPosition): void;
-
-  /** Show a scale ruler (bottom start); null hides it */
-  setScaleRuler(options: { metric: boolean } | null): void;
-
-  setView(center: MapLatLng, zoom?: number): void;
-
-  setZoom(zoom: number): void;
-
-  /** Fit the given points into view; a single point centers on it */
-  fitBounds(points: MapLatLng[], options?: MapFitOptions): void;
-
-  /** Pan to the location, keeping the zoom */
-  panTo(location: MapLatLng): void;
-
-  /** Whether the location is inside the current viewport */
-  containsLocation(location: MapLatLng): boolean;
-
-  /** Place a caller-owned element on the map */
-  addMarker(
-    element: HTMLElement,
-    location: MapLatLng,
-    options: MapMarkerOptions
-  ): MapMarkerHandle;
-
-  /** Draw a meter-radius circle (zone radius) */
-  addCircle(center: MapLatLng, options: MapCircleOptions): MapItemHandle;
-
-  /** Editing support, MapLibre only; undefined on the Leaflet fallback */
-  editing?: MapEditingSupport;
-
-  /** Draw one history trail (points with tooltips, connecting segments) */
-  addPath(path: MapPath): MapItemHandle;
-
-  /** Cluster the markers added with cluster: true; call after each batch of addMarker calls */
-  setClustering(options: MapClusterOptions | null): void;
-
-  /** Rebuild cluster icons without regrouping (e.g. after a style change) */
-  refreshClusters(): void;
-}
-
-const EARTH_RADIUS = 6371008.8;
-
-const toRadians = (degrees: number) => (degrees * Math.PI) / 180;
-const toDegrees = (radians: number) => (radians * 180) / Math.PI;
-
-/**
- * The point a distance away from center along a bearing (degrees clockwise
- * from north), on the great circle. Longitude is left unwrapped so a ring of
- * points stays continuous across the antimeridian.
- */
-export const destinationPoint = (
-  center: MapLatLng,
-  distanceInMeters: number,
-  bearingDegrees: number
-): MapLatLng => {
-  const angular = distanceInMeters / EARTH_RADIUS;
-  const lat = toRadians(center[0]);
-  const bearing = toRadians(bearingDegrees);
-  const destLat = Math.asin(
-    Math.sin(lat) * Math.cos(angular) +
-      Math.cos(lat) * Math.sin(angular) * Math.cos(bearing)
-  );
-  const dLng = Math.atan2(
-    Math.sin(bearing) * Math.sin(angular) * Math.cos(lat),
-    Math.cos(angular) - Math.sin(lat) * Math.sin(destLat)
-  );
-  return [toDegrees(destLat), center[1] + toDegrees(dLng)];
-};
-
-/** Great-circle distance in meters */
-export const distanceMeters = (a: MapLatLng, b: MapLatLng): number => {
-  const dLat = toRadians(b[0] - a[0]);
-  const dLng = toRadians(b[1] - a[1]);
-  const h =
-    Math.sin(dLat / 2) ** 2 +
-    Math.cos(toRadians(a[0])) *
-      Math.cos(toRadians(b[0])) *
-      Math.sin(dLng / 2) ** 2;
-  return 2 * EARTH_RADIUS * Math.asin(Math.sqrt(h));
-};
-
-/** The point the given distance due east of center, e.g. for a resize handle */
-export const pointEastOf = (
-  center: MapLatLng,
-  distanceInMeters: number
-): MapLatLng => destinationPoint(center, distanceInMeters, 90);
-
-/**
- * Bounding box corners of a circle, for fitting a radius into view. A circle
- * that reaches a pole spans every longitude.
- */
-export const circleBoundsPoints = (
-  center: MapLatLng,
-  radiusMeters: number
-): MapLatLng[] => {
-  const angular = radiusMeters / EARTH_RADIUS;
-  const latMin = Math.max(-90, center[0] - toDegrees(angular));
-  const latMax = Math.min(90, center[0] + toDegrees(angular));
-  const sinRatio = Math.sin(angular) / Math.cos(toRadians(center[0]));
-  if (latMin <= -90 || latMax >= 90 || Math.abs(sinRatio) >= 1) {
-    return [
-      [latMin, -180],
-      [latMax, 180],
-    ];
-  }
-  const dLng = toDegrees(Math.asin(sinRatio));
-  return [
-    [latMin, center[1] - dLng],
-    [latMax, center[1] + dLng],
-  ];
-};
@@ -1,57 +0,0 @@
-/**
- * Marker elements may be focusable buttons on both engines, so the caller's
- * element is the keyboard target and needs a name and a role. MapLibre would
- * otherwise label it "Map marker".
- *
- * What the engine sets is recorded on the element, so a rebuilt marker on a
- * reused element gets fresh attributes while the caller's own are left alone.
- */
-
-const OWNED = "haMapA11y";
-
-export const setMarkerAccessibility = (
-  element: HTMLElement,
-  title: string | undefined,
-  focusable: boolean
-): void => {
-  clearMarkerAccessibility(element);
-  const owned: string[] = [];
-  if (
-    title &&
-    !element.hasAttribute("aria-label") &&
-    !element.hasAttribute("aria-labelledby")
-  ) {
-    element.setAttribute("aria-label", title);
-    owned.push("aria-label");
-  }
-  if (!element.hasAttribute("role")) {
-    if (focusable) {
-      element.setAttribute("role", "button");
-      owned.push("role");
-    } else if (title) {
-      element.setAttribute("role", "img");
-      owned.push("role");
-    } else {
-      element.setAttribute("aria-hidden", "true");
-      owned.push("aria-hidden");
-    }
-  }
-  if (focusable && !element.hasAttribute("tabindex")) {
-    element.tabIndex = 0;
-    owned.push("tabindex");
-  }
-  element.dataset[OWNED] = owned.join(" ");
-};
-
-/** Removes what setMarkerAccessibility set on the element */
-export const clearMarkerAccessibility = (element: HTMLElement): void => {
-  const owned = element.dataset[OWNED];
-  if (owned === undefined) {
-    return;
-  }
-  owned
-    .split(" ")
-    .filter(Boolean)
-    .forEach((name) => element.removeAttribute(name));
-  delete element.dataset[OWNED];
-};
@@ -1,67 +0,0 @@
-import { getContrastedColorHex } from "../color/rgb";
-
-/** The zone marker: a colored circle with the zone's icon or initials, shared by the map and the zone editor */
-
-export const ZONE_CIRCLE_SIZE = 36;
-
-// Content color contrasting the fill; not every theme color parses
-export const contrastingZoneContent = (color: string): string => {
-  try {
-    return getContrastedColorHex(color.trim());
-  } catch {
-    return "#ffffff";
-  }
-};
-
-export const zoneInitials = (name: string): string =>
-  name
-    .split(" ")
-    .map((part) => part[0])
-    .join("")
-    .slice(0, 2);
-
-export const createZoneMarkerElement = (options: {
-  color: string;
-  icon?: string;
-  /** Path for an ha-svg-icon, when there is no icon name */
-  iconPath?: string;
-  name: string;
-}): HTMLElement => {
-  const element = document.createElement("div");
-  element.className = "zone-circle";
-  element.style.backgroundColor = options.color;
-  element.style.color = contrastingZoneContent(options.color);
-  if (options.icon) {
-    const icon = document.createElement("ha-icon");
-    icon.setAttribute("icon", options.icon);
-    element.appendChild(icon);
-  } else if (options.iconPath) {
-    const icon = document.createElement("ha-svg-icon");
-    icon.setAttribute("path", options.iconPath);
-    element.appendChild(icon);
-  } else {
-    const initials = document.createElement("span");
-    initials.textContent = zoneInitials(options.name);
-    element.appendChild(initials);
-  }
-  return element;
-};
-
-/** Styles for the zone marker, included by ha-map */
-export const zoneMarkerStyles = `
-  .zone-circle {
-    width: ${ZONE_CIRCLE_SIZE}px;
-    height: ${ZONE_CIRCLE_SIZE}px;
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border: 2px solid var(--card-background-color, #fff);
-    box-sizing: border-box;
-    box-shadow: var(--ha-box-shadow-s);
-    overflow: hidden;
-    font-size: var(--ha-font-size-s);
-    font-weight: var(--ha-font-weight-medium);
-    --mdc-icon-size: ${ZONE_CIRCLE_SIZE / 2}px;
-  }
-`;
@@ -31,9 +31,11 @@ export type FormatEntityAttributeNameFunc = (
  attribute: string
 ) => string;

+export type EntityNameType = "entity" | "device" | "area" | "floor";
+
 export type FormatEntityNameFunc = (
  stateObj: HassEntity,
-  name: string | EntityNameItem | EntityNameItem[] | undefined,
+  name: EntityNameItem | EntityNameItem[],
  options?: EntityNameOptions
 ) => string;

@@ -1,48 +0,0 @@
-import {
-  DateFormat,
-  FirstWeekday,
-  NumberFormat,
-  TimeFormat,
-  TimeZone,
-} from "../../data/translation";
-import { translationMetadata } from "../../resources/translations-metadata";
-import type { HomeAssistantInternationalization } from "../../types";
-import type { LocalizeFunc } from "./localize";
-
-/**
- * Builds an internationalization context value for the "lite" localize mode
- * used before a `hass` object exists. Locale falls back to browser defaults and
- * the lazy loaders are stubs that warn when called.
- */
-export const buildLiteInternationalization = (
-  language: string,
-  localize: LocalizeFunc
-): HomeAssistantInternationalization => ({
-  language,
-  selectedLanguage: language,
-  locale: {
-    language,
-    number_format: NumberFormat.language,
-    time_format: TimeFormat.language,
-    date_format: DateFormat.language,
-    time_zone: TimeZone.local,
-    first_weekday: FirstWeekday.language,
-  },
-  localize,
-  translationMetadata,
-  loadBackendTranslation: async (category, integrations, configFlow) => {
-    // eslint-disable-next-line no-console
-    console.warn(
-      "loadBackendTranslation called in lite i18n mode; backend strings are not available",
-      { category, integrations, configFlow }
-    );
-    return localize;
-  },
-  loadFragmentTranslation: async (fragment) => {
-    // eslint-disable-next-line no-console
-    console.warn(
-      `loadFragmentTranslation("${fragment}") called in lite i18n mode; fragment not loaded`
-    );
-    return undefined;
-  },
-});
@@ -1,155 +0,0 @@
-import { consume, type ContextType } from "@lit/context";
-import { mdiCommentTextOutline } from "@mdi/js";
-import type { HassServiceTarget } from "home-assistant-js-websocket";
-import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import { truncateWithEllipsis } from "../../common/string/truncate-with-ellipsis";
-import type { Condition } from "../../data/automation";
-import type { ConditionDescription } from "../../data/condition";
-import { internationalizationContext } from "../../data/context";
-import "../../panels/config/automation/ha-automation-row-behavior";
-import "../../panels/config/automation/ha-automation-row-options";
-import { getDeviceTarget } from "../../panels/config/automation/target/get_device_target";
-import { getEntityTarget } from "../../panels/config/automation/target/get_entity_target";
-import "../../panels/config/automation/target/ha-automation-row-targets";
-import "../ha-svg-icon";
-import "../ha-tooltip";
-
-@customElement("ha-automation-condition-summary")
-export class HaAutomationConditionSummary extends LitElement {
-  @property() public label = "";
-
-  @property({ attribute: false }) public condition?: Condition;
-
-  @property({ attribute: false }) public description?: ConditionDescription;
-
-  @property({ attribute: false }) public isNew = false;
-
-  @state()
-  @consume({ context: internationalizationContext, subscribe: true })
-  private _i18n!: ContextType<typeof internationalizationContext>;
-
-  private _getEntityTarget = memoizeOne(getEntityTarget);
-
-  private _getDeviceTarget = memoizeOne(getDeviceTarget);
-
-  protected render() {
-    const descriptionHasTarget = "target" in (this.description || {});
-    const hasEntityTarget =
-      this.condition?.condition === "state" ||
-      this.condition?.condition === "numeric_state";
-    const targetRequired =
-      (descriptionHasTarget || hasEntityTarget) && !this.isNew;
-    const note = this.condition?.note?.trim();
-
-    let target: HassServiceTarget | undefined;
-    if (this.condition) {
-      if (descriptionHasTarget && "target" in this.condition) {
-        target = this.condition.target;
-      } else if (
-        hasEntityTarget &&
-        "entity_id" in this.condition &&
-        this.condition.entity_id
-      ) {
-        target = this._getEntityTarget(this.condition.entity_id);
-      } else if ("device_id" in this.condition && this.condition.device_id) {
-        target = this._getDeviceTarget(this.condition.device_id);
-      }
-    }
-
-    return html`
-      <h3>
-        ${this.label}
-        ${
-          this.description && this.condition
-            ? html`<ha-automation-row-behavior
-                mode="condition"
-                .config=${this.condition}
-              ></ha-automation-row-behavior>`
-            : nothing
-        }
-        ${
-          target !== undefined || targetRequired
-            ? html`<ha-automation-row-targets
-                .target=${target}
-                .targetRequired=${targetRequired}
-                .selector=${
-                  this.description?.target
-                    ? { target: this.description.target }
-                    : undefined
-                }
-                .interactive=${this.condition?.condition !== "device"}
-              ></ha-automation-row-targets>`
-            : nothing
-        }
-        ${
-          this.description && this.condition
-            ? html`<ha-automation-row-options
-                .config=${this.condition}
-              ></ha-automation-row-options>`
-            : nothing
-        }
-        <slot name="references"></slot>
-        ${
-          note
-            ? html`
-                <ha-svg-icon
-                  id="note-icon"
-                  tabindex="0"
-                  role="img"
-                  .path=${mdiCommentTextOutline}
-                  aria-label=${this._i18n.localize(
-                    "ui.panel.config.automation.editor.note.label"
-                  )}
-                  class="note-indicator"
-                ></ha-svg-icon>
-                <ha-tooltip for="note-icon"
-                  ><p>${truncateWithEllipsis(note, 250)}</p></ha-tooltip
-                >
-              `
-            : nothing
-        }
-      </h3>
-    `;
-  }
-
-  static styles = css`
-    :host {
-      display: block;
-      min-width: 0;
-    }
-    h3 {
-      margin: 0;
-      font-size: inherit;
-      font-weight: inherit;
-      display: flex;
-      align-items: center;
-      flex-wrap: wrap;
-      gap: var(--ha-space-2);
-      padding: var(--ha-space-2) 0;
-      min-height: 32px;
-      max-width: 100%;
-    }
-    .note-indicator {
-      color: var(--ha-color-on-neutral-normal);
-    }
-    ha-tooltip {
-      cursor: default;
-    }
-    ha-tooltip::part(body) {
-      cursor: default;
-      max-width: 300px;
-    }
-    ha-tooltip p {
-      white-space: pre-wrap;
-      margin: 0;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-automation-condition-summary": HaAutomationConditionSummary;
-  }
-}
@@ -93,9 +93,9 @@ export class HaAutomationRowEventChip extends LitElement {
    }

    :host([variant="neutral"]) {
-      --background-color: var(--ha-color-fill-neutral-loud-resting);
-      --background-color-hover: var(--ha-color-fill-neutral-loud-hover);
-      --text-color: var(--ha-color-on-neutral-loud);
+      --background-color: var(--ha-color-fill-neutral-normal-resting);
+      --background-color-hover: var(--ha-color-fill-neutral-normal-hover);
+      --text-color: var(--ha-color-on-neutral-normal);
    }

    :host([variant="success"]) {
@@ -152,7 +152,7 @@ export class HaAutomationRow extends LitElement {
      margin-inline-end: initial;
    }
    :host([building-block]) .leading-icon-wrapper {
-      border: 1px solid var(--ha-color-border-neutral-normal);
+      background-color: var(--ha-color-fill-neutral-loud-resting);
      border-radius: var(--ha-border-radius-md);
      padding: var(--ha-space-1);
      margin-top: 10px;
@@ -172,6 +172,7 @@ export class HaAutomationRow extends LitElement {
    :host([building-block]) ::slotted([slot="leading-icon"].action-icon),
    :host([building-block]) ::slotted(#condition-icon) {
      --mdc-icon-size: var(--ha-space-5);
+      color: var(--white-color);
      transform: rotate(-45deg);
    }
    :host([collapsed]) .expand-button {
@@ -184,16 +185,9 @@ export class HaAutomationRow extends LitElement {
      outline-offset: -2px;
      outline-width: 2px;
    }
-    :host([disabled]) .row,
-    :host([disabled]) ::slotted([slot="leading-icon"]) {
-      color: var(--ha-color-text-disabled);
-    }
-    :host([disabled]) .leading-icon-wrapper {
-      opacity: 0.6;
-    }
-    :host([disabled]) ::slotted([slot="header"]) {
-      opacity: 0.6;
-      text-decoration: line-through;
+    :host([disabled]) .row {
+      border-top-right-radius: var(--ha-border-radius-square);
+      border-top-left-radius: var(--ha-border-radius-square);
    }
    .header {
      position: relative;
@@ -39,7 +39,7 @@ const FRAME_SIZES = [
 ].flat();

 // Always rounds down, so no chart ends up with fewer frames than it asked for.
-export function snapFrameSize(step: number): number {
+function snapFrameSize(step: number): number {
  if (step >= DAY) {
    return Math.floor(step / DAY) * DAY;
  }
@@ -34,7 +34,6 @@ import type {
 import { fireEvent } from "../../common/dom/fire_event";
 import { listenMediaQuery } from "../../common/dom/media_query";
 import { afterNextRender } from "../../common/util/render-status";
-import { MobileAwareMixin } from "../../mixins/mobile-aware-mixin";
 import { uiContext } from "../../data/context";
 import type { Themes } from "../../data/ws-themes";
 import type {
@@ -58,17 +57,7 @@ export const MIN_TIME_BETWEEN_UPDATES = 60 * 5 * 1000;
 const LEGEND_OVERFLOW_LIMIT = 10;
 const LEGEND_OVERFLOW_LIMIT_MOBILE = 6;
 const DOUBLE_TAP_TIME = 300;
-export const DEFAULT_CHART_WIDTH = 500;
-// Slack so a chart is up to date before a scroll can reach it. A phone screen
-// is short enough for a whole screenful; on a desktop that would cover the page.
-const VISIBILITY_ROOT_MARGIN_NARROW = "100%";
-const VISIBILITY_ROOT_MARGIN = "300px";
-const DEFERRED_PROPS = [
-  "options",
-  "data",
-  "_hiddenDatasets",
-  "_isZoomed",
-] as const;
+const DEFAULT_CHART_WIDTH = 500;

 type RawSeriesOption = Exclude<
  NonNullable<ECOption["series"]>,
@@ -117,7 +106,7 @@ export type CustomLegendOption = ECOption["legend"] & {
 };

@customElement("ha-chart-base")
-export class HaChartBase extends MobileAwareMixin(LitElement) {
+export class HaChartBase extends LitElement {
  public chart?: EChartsType;

  @property({ attribute: false }) public hass!: HomeAssistant;
@@ -194,38 +183,20 @@ export class HaChartBase extends MobileAwareMixin(LitElement) {

  private _layoutTransitionActive = false;

-  // Both start visible so a chart on screen renders on its first update rather
-  // than waiting a frame for the observers. A chart that starts off screen is
-  // therefore still built once; only its later updates are gated.
-  private _intersecting = true;
-
-  private _hasSize = true;
-
-  // Reported by the ResizeObserver, so rendering and downsampling need not
-  // measure layout themselves once it has fired.
-  private _contentWidth?: number;
-
  // @ts-ignore
  private _resizeController = new ResizeController(this, {
-    callback: (entries) => {
-      // The controller also fires once with no entries when it starts observing.
-      const contentRect = entries[entries.length - 1]?.contentRect;
-      if (contentRect) {
-        this._contentWidth = contentRect.width;
-        this._hasSize = contentRect.width > 0 && contentRect.height > 0;
-      }
+    callback: () => {
      if (this.chart) {
        if (this._suspendResize) {
          this._shouldResizeChart = true;
-        } else if (!this.chart.getZr().animation.isFinished()) {
+          return;
+        }
+        if (!this.chart.getZr().animation.isFinished()) {
          this._shouldResizeChart = true;
        } else {
          this.chart.resize();
        }
      }
-      if (!this._suspendResize) {
-        this._applyDeferredWork();
-      }
    },
  });

@@ -239,24 +210,10 @@ export class HaChartBase extends MobileAwareMixin(LitElement) {

  private _pendingSetup = false;

-  private _pendingUpdate?: Set<PropertyKey>;
-
-  private _pendingOptions?: HaECOption;
-
-  private _pendingZoom?: [number, number, boolean];
-
  public disconnectedCallback() {
    super.disconnectedCallback();
    this._legendPointerCancel();
    this._pendingSetup = false;
-    this._pendingUpdate = undefined;
-    this._pendingOptions = undefined;
-    this._pendingZoom = undefined;
-    // The observers are about to be torn down, so nothing would correct a stale
-    // value if this element is reattached inside a hidden container.
-    this._intersecting = false;
-    this._hasSize = false;
-    this._contentWidth = undefined;
    while (this._listeners.length) {
      this._listeners.pop()!();
    }
@@ -270,30 +227,13 @@ export class HaChartBase extends MobileAwareMixin(LitElement) {
    super.connectedCallback();
    if (this.hasUpdated) {
      this._pendingSetup = true;
-      afterNextRender(() => this._applyDeferredWork());
-    }
-
-    const handleVisibilityChange = () => this._applyDeferredWork();
-    document.addEventListener("visibilitychange", handleVisibilityChange);
-    this._listeners.push(() =>
-      document.removeEventListener("visibilitychange", handleVisibilityChange)
-    );
-
-    const intersectionObserver = new IntersectionObserver(
-      (entries) => {
-        this._intersecting = entries[entries.length - 1].isIntersecting;
-        if (!this._suspendResize) {
-          this._applyDeferredWork();
+      afterNextRender(() => {
+        if (this.isConnected && this._pendingSetup) {
+          this._pendingSetup = false;
+          this._setupChart();
        }
-      },
-      {
-        rootMargin: this._isMobileSize
-          ? VISIBILITY_ROOT_MARGIN_NARROW
-          : VISIBILITY_ROOT_MARGIN,
-      }
-    );
-    intersectionObserver.observe(this);
-    this._listeners.push(() => intersectionObserver.disconnect());
+      });
+    }

    this._listeners.push(
      listenMediaQuery("(prefers-reduced-motion)", (matches) => {
@@ -360,7 +300,6 @@ export class HaChartBase extends MobileAwareMixin(LitElement) {
      this._suspendResize = this._layoutTransitionActive;
      if (!this._suspendResize) {
        this._resizeChartIfNeeded();
-        this._applyDeferredWork();
      }
    };
    window.addEventListener("hass-layout-transition", handleLayoutTransition);
@@ -373,105 +312,24 @@ export class HaChartBase extends MobileAwareMixin(LitElement) {
  }

  protected firstUpdated() {
-    if (!this.isConnected) {
-      return;
-    }
-    // The only measurement taken here: neither observer has reported yet, and a
-    // chart first rendered inside a hidden container has to defer its setup
-    // rather than build against a guessed width.
-    this._hasSize = this.clientWidth > 0 && this.clientHeight > 0;
-    if (this._isVisible()) {
+    if (this.isConnected) {
      this._setupChart();
-    } else {
-      this._pendingSetup = true;
    }
  }

-  private _isVisible() {
-    return (
-      document.visibilityState !== "hidden" &&
-      this._hasSize &&
-      this._intersecting
-    );
-  }
-
-  private _deferUpdate(changedProps: PropertyValues) {
-    for (const prop of DEFERRED_PROPS) {
-      if (!changedProps.has(prop)) {
-        continue;
-      }
-      if (!this._pendingUpdate) {
-        this._pendingUpdate = new Set();
-      }
-      if (prop === "options" && !this._pendingUpdate.has(prop)) {
-        // The one previous value a replay reads, and it has to stay the options
-        // the chart currently renders, not those of a later deferred change.
-        this._pendingOptions = changedProps.get(prop) as HaECOption | undefined;
-      }
-      this._pendingUpdate.add(prop);
-    }
-  }
-
-  private async _applyDeferredWork() {
-    if (!this._pendingSetup && !this._pendingUpdate) {
-      return;
-    }
-    if (!this.isConnected || !this._isVisible()) {
-      return;
-    }
-    if (this._pendingSetup) {
-      await this._setupChart();
-      return;
-    }
-    const pending = this._pendingUpdate!;
-    const previousOptions = this._pendingOptions;
-    this._pendingUpdate = undefined;
-    this._pendingOptions = undefined;
-    this._applyChartUpdate(pending, previousOptions);
-  }
-
  public willUpdate(changedProps: PropertyValues): void {
    if (!this.chart) {
      return;
    }
-    const themeChanged = changedProps.has("_themes") && this.hasUpdated;
-    if (!themeChanged && !DEFERRED_PROPS.some((p) => changedProps.has(p))) {
-      return;
-    }
-    const invisible = !this._isVisible();
-    if (themeChanged) {
-      if (invisible) {
-        this._pendingSetup = true;
-        this._pendingUpdate = undefined;
-        this._pendingOptions = undefined;
-      } else {
-        this._setupChart();
-      }
+    if (changedProps.has("_themes") && this.hasUpdated) {
+      this._setupChart();
      return;
    }
+    let chartOptions: ECOption = {};
    if (changedProps.has("options")) {
-      // Separate 'if' from below since this must be updated before _getSeries().
-      // It stays out of _applyChartUpdate so a replay cannot request another
-      // update and turn one catch-up render into two.
+      // Separate 'if' from below since this must updated before _getSeries()
      this._updateHiddenStatsFromOptions(this.options);
    }
-    if (invisible) {
-      if (!this._pendingSetup) {
-        this._deferUpdate(changedProps);
-      }
-      return;
-    }
-    this._applyChartUpdate(
-      changedProps,
-      changedProps.get("options") as HaECOption | undefined
-    );
-  }
-
-  private _applyChartUpdate(
-    changedProps: { has: (prop: string) => boolean },
-    previousOptions: HaECOption | undefined
-  ) {
-    let chartOptions: ECOption = {};
    if (changedProps.has("data") || changedProps.has("_hiddenDatasets")) {
      chartOptions.series = this._getSeries();
      // New data, or a series shown again, may well be convertible where the
@@ -489,7 +347,12 @@ export class HaChartBase extends MobileAwareMixin(LitElement) {
    }
    if (changedProps.has("options")) {
      chartOptions = { ...chartOptions, ...this._createOptions() };
-      if (this._compareCustomLegendOptions(previousOptions, this.options)) {
+      if (
+        this._compareCustomLegendOptions(
+          changedProps.get("options"),
+          this.options
+        )
+      ) {
        // custom legend changes may require a resize to layout properly
        this._shouldResizeChart = true;
        this._resizeAnimationDuration = 250;
@@ -600,7 +463,10 @@ export class HaChartBase extends MobileAwareMixin(LitElement) {
      }
    }

-    const overflowLimit = this._isMobileSize
+    const isMobile = window.matchMedia(
+      "all and (max-width: 450px), all and (max-height: 500px)"
+    ).matches;
+    const overflowLimit = isMobile
      ? LEGEND_OVERFLOW_LIMIT_MOBILE
      : LEGEND_OVERFLOW_LIMIT;
    return html`<div
@@ -712,11 +578,7 @@ export class HaChartBase extends MobileAwareMixin(LitElement) {
    // costs the user their place in the tab order, so stay programmatically
    // focusable for as long as we hold focus, however we stop being sonifiable.
    this._sonificationFocusHeld = true;
-    if (this._sonification || this._sonificationLoading) {
-      return;
-    }
-    await this._applyDeferredWork();
-    if (!this.chart) {
+    if (this._sonification || this._sonificationLoading || !this.chart) {
      return;
    }
    this._sonificationLoading = true;
@@ -773,22 +635,14 @@ export class HaChartBase extends MobileAwareMixin(LitElement) {
    );

  private async _setupChart() {
-    if (this._loading) {
-      this._pendingSetup = true;
-      return;
-    }
+    if (this._loading) return;
    this._loading = true;
-    this._pendingSetup = false;
-    this._pendingUpdate = undefined;
-    this._pendingOptions = undefined;
    try {
      // The connection holds a reference to the chart instance, so it cannot
      // outlive it. Focusing the chart again reconnects.
      this._disposeSonification();
      if (this.chart) {
        this.chart.dispose();
-        this.chart = undefined;
-        this._originalZrFlush = undefined;
      }
      const echarts = (await import("../../resources/echarts/echarts")).default;

@@ -926,14 +780,8 @@ export class HaChartBase extends MobileAwareMixin(LitElement) {
        series: this._getSeries(),
      });
      this._updateSankeyRoam();
-      if (this._pendingZoom) {
-        const [start, end, silent] = this._pendingZoom;
-        this._pendingZoom = undefined;
-        this.chart.dispatchAction({ type: "dataZoom", start, end, silent });
-      }
    } finally {
      this._loading = false;
-      this._applyDeferredWork();
    }
  }

@@ -1079,7 +927,9 @@ export class HaChartBase extends MobileAwareMixin(LitElement) {
    };

    if (options.tooltip) {
-      const isMobile = this._isMobileSize;
+      const isMobile = window.matchMedia(
+        "all and (max-width: 450px), all and (max-height: 500px)"
+      ).matches;
      // Shallow-copy each tooltip object so wrap/mobile mutations don't leak
      // back into the caller's options.tooltip reference (callers may cache the
      // options object via memoizeOne, in which case in-place mutation would
@@ -1316,8 +1166,8 @@ export class HaChartBase extends MobileAwareMixin(LitElement) {
            data: downSampleLineData(
              data as LineSeriesOption["data"],
              // 0 while inside a hidden container, e.g. a section with a visibility condition
-              ((this._contentWidth ?? this.clientWidth) ||
-                DEFAULT_CHART_WIDTH) * window.devicePixelRatio,
+              (this.clientWidth || DEFAULT_CHART_WIDTH) *
+                window.devicePixelRatio,
              minX,
              maxX
            ),
@@ -1330,7 +1180,7 @@ export class HaChartBase extends MobileAwareMixin(LitElement) {
  }

  private _getDefaultHeight() {
-    return Math.max((this._contentWidth ?? this.clientWidth) / 2, 200);
+    return Math.max(this.clientWidth / 2, 200);
  }

  private _setChartOptions(options: ECOption) {
@@ -1397,16 +1247,7 @@ export class HaChartBase extends MobileAwareMixin(LitElement) {
  };

  public zoom(start: number, end: number, silent = false) {
-    if (!this.chart || this._pendingSetup) {
-      // Sibling charts sync their zoom imperatively, so a range that arrives
-      // before a deferred setup or rebuild has to be replayed rather than
-      // dropped. A reset to the full range is what a fresh chart is built with,
-      // so it just clears.
-      this._pendingZoom =
-        start === 0 && end === 100 ? undefined : [start, end, silent];
-      return;
-    }
-    this.chart.dispatchAction({
+    this.chart?.dispatchAction({
      type: "dataZoom",
      start,
      end,
@@ -12,6 +12,7 @@ import type { HaECOption } from "../../resources/echarts/echarts";
 import { measureTextWidth } from "../../util/text";
 import "./ha-chart-base";
 import "./ha-chart-tooltip-marker";
+import { NODE_SIZE } from "../trace/hat-graph-const";
 import "../ha-alert";

 export interface Node {
@@ -42,9 +43,6 @@ const OVERFLOW_MARGIN = 5;
 const FONT_SIZE = 12;
 const NODE_GAP = 6;
 const LABEL_DISTANCE = 5;
-const NODE_SIZE = 30;
-const LABEL_MIN_MARGIN = 5;
-const BIDI_MARKS = /[\u200E\u200F\u202A-\u202E\u2066-\u2069]/g;

@customElement("ha-sankey-chart")
 export class HaSankeyChart extends LitElement {
@@ -57,9 +55,6 @@ export class HaSankeyChart extends LitElement {

  @property({ type: Boolean }) public vertical = false;

-  @property({ type: Boolean, attribute: "show-values" }) public showValues =
-    false;
-
  @property({ attribute: false }) public valueFormatter?: (
    value: number
  ) => string;
@@ -89,11 +84,7 @@ export class HaSankeyChart extends LitElement {

    return html`<ha-chart-base
      .hass=${this.hass}
-      .data=${this._createData(
-        this.data,
-        this._sizeController.value?.width,
-        this.showValues
-      )}
+      .data=${this._createData(this.data, this._sizeController.value?.width)}
      .options=${options}
      height="100%"
      .extraComponents=${[SankeyChart]}
@@ -151,11 +142,7 @@ export class HaSankeyChart extends LitElement {
    }
  };

-  private _computeData = (
-    data: SankeyChartData,
-    width = 0,
-    showValues = false
-  ) => {
+  private _createData = memoizeOne((data: SankeyChartData, width = 0) => {
    const filteredNodes = data.nodes.filter((n) => n.value > 0);
    const indexes = [...new Set(filteredNodes.map((n) => n.index))].sort();
    const depthMap = new Map<number, number>();
@@ -196,10 +183,6 @@ export class HaSankeyChart extends LitElement {
    const links = this._processLinks(filteredNodes, data.links);
    const sectionWidth = width / indexes.length;
    const labelSpace = sectionWidth - NODE_SIZE - LABEL_DISTANCE;
-    // Two-line values can wrap the unit onto a third line; keep that text inside the chart.
-    const verticalBottom = showValues
-      ? LABEL_DISTANCE + FONT_SIZE * 3 + OVERFLOW_MARGIN
-      : 25;

    return {
      id: "sankey",
@@ -226,48 +209,29 @@ export class HaSankeyChart extends LitElement {
      layoutIterations: 0,
      animationDuration: 500,
      label: {
-        formatter: (params) => {
-          const nodeData = params.data as { id: string; value: number };
-          const node = data.nodes.find((n) => n.id === nodeData.id);
-          const label = node?.label ?? nodeData.id;
-          if (!showValues || !nodeData.id) return label;
-          const formatted = this.valueFormatter
-            ? this.valueFormatter(nodeData.value).trim()
-            : String(nodeData.value);
-          // LRM keeps numeric values LTR on the canvas without creating wrap points.
-          return `${label}\n\u200E${formatted}`;
-        },
+        formatter: (params) =>
+          data.nodes.find((node) => node.id === (params.data as Node).id)
+            ?.label ?? (params.data as Node).id,
        position: this.vertical ? "bottom" : "right",
        distance: LABEL_DISTANCE,
-        minMargin: LABEL_MIN_MARGIN,
+        minMargin: 5,
        overflow: "break",
      },
      labelLayout: (params) => {
        if (this.vertical) {
          // reduce the label font size so the longest word fits on one line
          const longestWord = params.text
-            .replace(BIDI_MARKS, "")
-            .split(/[ \n]+/)
-            .reduce((longest, current) => {
-              if (!current) {
-                return longest;
-              }
-              if (!longest) {
-                return current;
-              }
-              return measureTextWidth(current, FONT_SIZE) >
-                measureTextWidth(longest, FONT_SIZE)
-                ? current
-                : longest;
-            }, "");
-          const wordWidth = measureTextWidth(longestWord, FONT_SIZE) || 1;
+            .split(" ")
+            .reduce(
+              (longest, current) =>
+                longest.length > current.length ? longest : current,
+              ""
+            );
+          const wordWidth = measureTextWidth(longestWord, FONT_SIZE);
          const availableWidth = (params.rect.width + 6) * this._currentZoom;
-          // minMargin is applied as padding on the label box, so words must
-          // fit in the inner wrap width or overflow:break splits them.
-          const wrapWidth = Math.max(availableWidth - LABEL_MIN_MARGIN, 1);
          const fontSize = Math.min(
            FONT_SIZE,
-            (wrapWidth / wordWidth) * FONT_SIZE
+            (availableWidth / wordWidth) * FONT_SIZE
          );
          return {
            fontSize: fontSize > 1 ? fontSize : 0,
@@ -290,16 +254,14 @@ export class HaSankeyChart extends LitElement {
        };
      },
      top: this.vertical ? 0 : OVERFLOW_MARGIN,
-      bottom: this.vertical ? verticalBottom : OVERFLOW_MARGIN,
+      bottom: this.vertical ? 25 : OVERFLOW_MARGIN,
      left: this.vertical ? OVERFLOW_MARGIN : 0,
      right: this.vertical ? OVERFLOW_MARGIN : labelSpace + LABEL_DISTANCE,
      emphasis: {
        focus: "adjacency",
      },
    } as SankeySeriesOption;
-  };
-
-  private _createData = memoizeOne(this._computeData);
+  });

  private _processLinks(nodes: Node[], rawLinks: Link[]) {
    const accountedIn = new Map<string, number>();
@@ -1,258 +0,0 @@
-import type {
-  CustomSeriesOption,
-  CustomSeriesRenderItem,
-} from "echarts/types/dist/shared";
-import type { HassEntities } from "home-assistant-js-websocket";
-import { hex2rgb } from "../../common/color/convert-color";
-import { luminosity } from "../../common/color/rgb";
-import type { TimelineEntity } from "../../data/history";
-import { snapFrameSize } from "./down-sample";
-import { computeTimelineColor } from "./timeline-color";
-
-export interface StateHistoryChartTimelineDataParams {
-  states: HassEntities;
-  data: TimelineEntity[];
-  startTime: Date;
-  endTime: Date;
-  names?: Record<string, string>;
-  showNames: boolean;
-  computedStyles: CSSStyleDeclaration;
-  renderItem: CustomSeriesRenderItem;
-  /** Chart width in device pixels; bounds how many rectangles are emitted. */
-  chartWidth: number;
-}
-
-export interface TimelineSegment {
-  state: string;
-  locState: string | null;
-  start: number;
-  end: number;
-}
-
-/** Resolves each frame of a run to the state covering most of that frame. */
-function collapseRun(
-  segments: TimelineSegment[],
-  from: number,
-  to: number,
-  frameMs: number,
-  push: (segment: TimelineSegment) => void
-) {
-  const runEnd = segments[to - 1].end;
-  const frameStates = new Map<
-    string,
-    { duration: number; locState: string | null }
-  >();
-  let frameStart = segments[from].start;
-  let index = from;
-
-  while (frameStart < runEnd) {
-    const boundary = (Math.floor(frameStart / frameMs) + 1) * frameMs;
-    // a frame size that rounds back onto frameStart would never advance
-    const next = boundary > frameStart ? boundary : frameStart + frameMs;
-    const frameEnd = next < runEnd ? next : runEnd;
-
-    frameStates.clear();
-    let bestState: string | null = null;
-    let bestLocState: string | null = null;
-    let bestDuration = 0;
-    // Segments are narrower than a frame, so each is visited at most twice:
-    // index stops at the one spilling into the next frame.
-    let cursor = index;
-    while (cursor < to && segments[cursor].start < frameEnd) {
-      const segment = segments[cursor];
-      cursor++;
-      const overlapStart =
-        segment.start > frameStart ? segment.start : frameStart;
-      const overlapEnd = segment.end < frameEnd ? segment.end : frameEnd;
-      if (overlapEnd <= overlapStart) {
-        continue;
-      }
-      let entry = frameStates.get(segment.state);
-      if (entry) {
-        entry.duration += overlapEnd - overlapStart;
-      } else {
-        entry = {
-          duration: overlapEnd - overlapStart,
-          locState: segment.locState,
-        };
-        frameStates.set(segment.state, entry);
-      }
-      if (entry.duration > bestDuration) {
-        bestDuration = entry.duration;
-        bestState = segment.state;
-        bestLocState = entry.locState;
-      }
-    }
-    while (index < to && segments[index].end <= frameEnd) {
-      index++;
-    }
-    if (bestState !== null) {
-      push({
-        state: bestState,
-        locState: bestLocState,
-        start: frameStart,
-        end: frameEnd,
-      });
-    }
-    frameStart = frameEnd;
-  }
-}
-
-/**
- * Bounds the rectangle count by the chart's pixel width. Segments at least one
- * frame wide are kept as they are; narrower ones are resolved per frame, and
- * neighbours resolving to the same state merge into one rectangle.
- */
-export function downSampleTimelineSegments(
-  segments: TimelineSegment[],
-  frameMs: number
-): TimelineSegment[] {
-  if (!(frameMs > 0)) {
-    return segments;
-  }
-  const result: TimelineSegment[] = [];
-  const push = (segment: TimelineSegment) => {
-    const last = result[result.length - 1];
-    if (last && last.state === segment.state && last.end === segment.start) {
-      last.end = segment.end;
-      return;
-    }
-    result.push(segment);
-  };
-
-  let index = 0;
-  while (index < segments.length) {
-    if (segments[index].end - segments[index].start >= frameMs) {
-      push({ ...segments[index] });
-      index++;
-      continue;
-    }
-    const from = index;
-    index++;
-    // A gap of its own frame or more stays a gap; a narrower one is invisible
-    // and is absorbed, so that a row of gap-separated slivers stays bounded.
-    while (
-      index < segments.length &&
-      segments[index].end - segments[index].start < frameMs &&
-      segments[index].start - segments[index - 1].end < frameMs
-    ) {
-      index++;
-    }
-    collapseRun(segments, from, index, frameMs, push);
-  }
-  return result;
-}
-
-/**
- * Transforms processed history (`TimelineEntity[]`) into ECharts custom series
- * for `state-history-chart-timeline`. Pure data processing: all environment
- * inputs (theme style, entity states, chart width, the render callback) are injected so
- * the transform is deterministic and benchmarkable.
- */
-export function generateStateHistoryChartTimelineData(
-  params: StateHistoryChartTimelineDataParams
-): CustomSeriesOption[] {
-  const { states, computedStyles, startTime, endTime, renderItem } = params;
-  const stateHistory = params.data ?? [];
-  const startTimeMs = startTime.getTime();
-  const endTimeMs = endTime.getTime();
-  // Snapped, and placed on absolute time, so a chart following "now" keeps
-  // resolving the same frames instead of reshaping on every refresh.
-  const rawFrameMs = Math.ceil(
-    (endTimeMs - startTimeMs) / Math.floor(params.chartWidth)
-  );
-  const frameMs =
-    Number.isFinite(rawFrameMs) && rawFrameMs > 0
-      ? snapFrameSize(rawFrameMs)
-      : 0;
-  const datasets: CustomSeriesOption[] = [];
-  const names = params.names || {};
-  // stateHistory is a list of lists of sorted state objects
-  stateHistory.forEach((stateInfo) => {
-    let prevState: string | null = null;
-    let locState: string | null = null;
-    let prevLastChanged = startTimeMs;
-    const entityDisplay: string = params.showNames
-      ? names[stateInfo.entity_id] || stateInfo.name || stateInfo.entity_id
-      : "";
-
-    const segments: TimelineSegment[] = [];
-    stateInfo.data.forEach((entityState) => {
-      let newState: string | null = entityState.state;
-      const timeStamp = entityState.last_changed;
-      if (!newState) {
-        newState = null;
-      }
-      if (timeStamp > endTimeMs) {
-        // Drop datapoints that are after the requested endTime. This could happen if
-        // endTime is 'now' and client time is not in sync with server time.
-        return;
-      }
-      if (prevState === null) {
-        prevState = newState;
-        locState = entityState.state_localize;
-        prevLastChanged = timeStamp;
-      } else if (newState !== prevState) {
-        segments.push({
-          state: prevState,
-          locState,
-          start: prevLastChanged,
-          end: timeStamp,
-        });
-        prevState = newState;
-        locState = entityState.state_localize;
-        prevLastChanged = timeStamp;
-      }
-    });
-
-    if (prevState !== null) {
-      segments.push({
-        state: prevState,
-        locState,
-        start: prevLastChanged,
-        end: endTimeMs,
-      });
-    }
-
-    const stateObj = states[stateInfo.entity_id];
-    const dataRow = downSampleTimelineSegments(segments, frameMs).map(
-      (segment) => {
-        const color = computeTimelineColor(
-          segment.state,
-          computedStyles,
-          stateObj
-        );
-        return {
-          value: [
-            stateInfo.entity_id,
-            new Date(segment.start),
-            new Date(segment.end),
-            segment.locState,
-            color,
-            luminosity(hex2rgb(color)) > 0.5 ? "#000" : "#fff",
-          ],
-          itemStyle: {
-            color,
-          },
-        };
-      }
-    );
-
-    datasets.push({
-      id: stateInfo.entity_id,
-      data: dataRow,
-      name: entityDisplay,
-      dimensions: ["id", "start", "end", "name", "color", "textColor"],
-      type: "custom",
-      encode: {
-        x: [1, 2],
-        y: 0,
-        itemName: 3,
-      },
-      renderItem,
-      progressive: 0,
-    });
-  });
-
-  return datasets;
-}
@@ -11,18 +11,18 @@ import millisecondsToDuration from "../../common/datetime/milliseconds_to_durati
 import { computeRTL } from "../../common/util/compute_rtl";
 import type { TimelineEntity } from "../../data/history";
 import type { HomeAssistant } from "../../types";
-import { DEFAULT_CHART_WIDTH, MIN_TIME_BETWEEN_UPDATES } from "./ha-chart-base";
+import { MIN_TIME_BETWEEN_UPDATES } from "./ha-chart-base";
 import { itemTooltipPosition } from "./chart-tooltip-position";
 import "./ha-chart-tooltip-marker";
+import { computeTimelineColor } from "./timeline-color";
 import type { HaECOption, HaECSeries } from "../../resources/echarts/echarts";
 import echarts from "../../resources/echarts/echarts";
+import { luminosity } from "../../common/color/rgb";
+import { hex2rgb } from "../../common/color/convert-color";
 import { measureTextWidth } from "../../util/text";
 import { fireEvent, type HASSDomEvent } from "../../common/dom/fire_event";
-import { generateStateHistoryChartTimelineData } from "./state-history-chart-timeline-data";

 const ROW_HEIGHT = 30;
-// Taller rows when the name is drawn under the bar instead of in a column.
-const ROW_HEIGHT_INSIDE_LABELS = 64;
 const GRID_BOTTOM = 30;

@customElement("state-history-chart-timeline")
@@ -41,12 +41,6 @@ export class StateHistoryChartTimeline extends LitElement {

  @property({ attribute: "show-names", type: Boolean }) public showNames = true;

-  // Render each row's name inside the plot (under its bar) instead of in a
-  // left-hand category-label column. Opt-in; used by the history panel and
-  // history-graph card.
-  @property({ attribute: "inside-labels", type: Boolean })
-  public insideLabels = false;
-
  @property({ attribute: "click-for-more-info", type: Boolean })
  public clickForMoreInfo = true;

@@ -76,13 +70,7 @@ export class StateHistoryChartTimeline extends LitElement {
      <ha-chart-base
        .hass=${this.hass}
        .options=${this._chartOptions}
-        .height=${`${
-          this.data.length *
-            (this.insideLabels && (this.chunked || this.showNames)
-              ? ROW_HEIGHT_INSIDE_LABELS
-              : ROW_HEIGHT) +
-          GRID_BOTTOM
-        }px`}
+        .height=${`${this.data.length * ROW_HEIGHT + GRID_BOTTOM}px`}
        .data=${this._chartData as HaECSeries}
        small-controls
        @chart-click=${this._handleChartClick}
@@ -197,7 +185,6 @@ export class StateHistoryChartTimeline extends LitElement {
      changedProps.has("startTime") ||
      changedProps.has("endTime") ||
      changedProps.has("showNames") ||
-      changedProps.has("insideLabels") ||
      changedProps.has("paddingYAxis") ||
      changedProps.has("_yWidth")
    ) {
@@ -209,11 +196,9 @@ export class StateHistoryChartTimeline extends LitElement {
    const narrow = this.narrow;
    const showNames = this.chunked || this.showNames;
    const maxInternalLabelWidth = narrow ? 105 : 185;
-    const insideLabels = this.insideLabels;
-    const labelWidth =
-      showNames && !insideLabels
-        ? Math.max(this.paddingYAxis, this._yWidth)
-        : 0;
+    const labelWidth = showNames
+      ? Math.max(this.paddingYAxis, this._yWidth)
+      : 0;
    const labelMargin = 5;
    const rtl = computeRTL(
      this.hass.language,
@@ -242,47 +227,31 @@ export class StateHistoryChartTimeline extends LitElement {
        axisLine: {
          show: false,
        },
-        axisLabel: insideLabels
-          ? {
-              // Draw the name inside the plot, under each row's bar, matching
-              // the line charts whose legend sits under the plot. The taller
-              // rows keep a name clear of the next row's bar.
-              show: showNames,
-              inside: true,
-              margin: 0,
-              padding: [18, 0, 0, rtl ? 0 : 2],
-              align: rtl ? "right" : "left",
-              verticalAlign: "top",
-              formatter: (id: string) =>
-                (this._chartData.find((d) => d.id === id)?.name as string) ??
-                "",
-              hideOverlap: true,
+        axisLabel: {
+          show: showNames,
+          width: labelWidth,
+          overflow: "truncate",
+          margin: labelMargin,
+          formatter: (id: string) => {
+            const label = this._chartData.find((d) => d.id === id)
+              ?.name as string;
+            const width = label
+              ? Math.min(
+                  measureTextWidth(label, 12) + labelMargin,
+                  maxInternalLabelWidth
+                )
+              : 0;
+            if (width > this._yWidth) {
+              this._yWidth = width;
+              fireEvent(this, "y-width-changed", {
+                value: this._yWidth,
+                chartIndex: this.chartIndex,
+              });
            }
-          : {
-              show: showNames,
-              width: labelWidth,
-              overflow: "truncate",
-              margin: labelMargin,
-              formatter: (id: string) => {
-                const label = this._chartData.find((d) => d.id === id)
-                  ?.name as string;
-                const width = label
-                  ? Math.min(
-                      measureTextWidth(label, 12) + labelMargin,
-                      maxInternalLabelWidth
-                    )
-                  : 0;
-                if (width > this._yWidth) {
-                  this._yWidth = width;
-                  fireEvent(this, "y-width-changed", {
-                    value: this._yWidth,
-                    chartIndex: this.chartIndex,
-                  });
-                }
-                return label;
-              },
-              hideOverlap: true,
-            },
+            return label;
+          },
+          hideOverlap: true,
+        },
      },
      grid: {
        top: 10,
@@ -313,20 +282,109 @@ export class StateHistoryChartTimeline extends LitElement {
  }

  private _generateData() {
+    const computedStyles = getComputedStyle(this);
+    let stateHistory = this.data;
+
+    if (!stateHistory) {
+      stateHistory = [];
+    }
+
    this._chartTime = new Date();
-    this._chartData = generateStateHistoryChartTimelineData({
-      states: this.hass.states,
-      data: this.data,
-      startTime: this.startTime,
-      endTime: this.endTime,
-      names: this.names,
-      showNames: this.showNames,
-      computedStyles: getComputedStyle(this),
-      renderItem: this._renderItem,
-      // 0 while inside a hidden container, e.g. a section with a visibility condition
-      chartWidth:
-        (this.clientWidth || DEFAULT_CHART_WIDTH) * window.devicePixelRatio,
+    const startTime = this.startTime;
+    const endTime = this.endTime;
+    const datasets: CustomSeriesOption[] = [];
+    const names = this.names || {};
+    // stateHistory is a list of lists of sorted state objects
+    stateHistory.forEach((stateInfo) => {
+      let newLastChanged: Date;
+      let prevState: string | null = null;
+      let locState: string | null = null;
+      let prevLastChanged = startTime;
+      const entityDisplay: string = this.showNames
+        ? names[stateInfo.entity_id] || stateInfo.name || stateInfo.entity_id
+        : "";
+
+      const dataRow: unknown[] = [];
+      stateInfo.data.forEach((entityState) => {
+        let newState: string | null = entityState.state;
+        const timeStamp = new Date(entityState.last_changed);
+        if (!newState) {
+          newState = null;
+        }
+        if (timeStamp > endTime) {
+          // Drop datapoints that are after the requested endTime. This could happen if
+          // endTime is 'now' and client time is not in sync with server time.
+          return;
+        }
+        if (prevState === null) {
+          prevState = newState;
+          locState = entityState.state_localize;
+          prevLastChanged = new Date(entityState.last_changed);
+        } else if (newState !== prevState) {
+          newLastChanged = new Date(entityState.last_changed);
+
+          const color = computeTimelineColor(
+            prevState,
+            computedStyles,
+            this.hass.states[stateInfo.entity_id]
+          );
+          dataRow.push({
+            value: [
+              stateInfo.entity_id,
+              prevLastChanged,
+              newLastChanged,
+              locState,
+              color,
+              luminosity(hex2rgb(color)) > 0.5 ? "#000" : "#fff",
+            ],
+            itemStyle: {
+              color,
+            },
+          });
+
+          prevState = newState;
+          locState = entityState.state_localize;
+          prevLastChanged = newLastChanged;
+        }
+      });
+
+      if (prevState !== null) {
+        const color = computeTimelineColor(
+          prevState,
+          computedStyles,
+          this.hass.states[stateInfo.entity_id]
+        );
+        dataRow.push({
+          value: [
+            stateInfo.entity_id,
+            prevLastChanged,
+            endTime,
+            locState,
+            color,
+            luminosity(hex2rgb(color)) > 0.5 ? "#000" : "#fff",
+          ],
+          itemStyle: {
+            color,
+          },
+        });
+      }
+      datasets.push({
+        id: stateInfo.entity_id,
+        data: dataRow,
+        name: entityDisplay,
+        dimensions: ["id", "start", "end", "name", "color", "textColor"],
+        type: "custom",
+        encode: {
+          x: [1, 2],
+          y: 0,
+          itemName: 3,
+        },
+        renderItem: this._renderItem,
+        progressive: 0,
+      });
    });
+
+    this._chartData = datasets;
  }

  private _handleChartClick(
@@ -343,9 +401,6 @@ export class StateHistoryChartTimeline extends LitElement {
  }

  static styles = css`
-    :host {
-      display: block;
-    }
    ha-chart-base {
      --chart-max-height: none;
    }
@@ -79,11 +79,6 @@ export class StateHistoryCharts extends LitElement {

  @property({ attribute: "show-names", type: Boolean }) public showNames = true;

-  // Render timeline row names inside the plot (under each bar) instead of in a
-  // left-hand column. Opt-in; used by the history panel and history-graph card.
-  @property({ attribute: "inside-labels", type: Boolean })
-  public insideLabels = false;
-
  @property({ attribute: "click-for-more-info", type: Boolean })
  public clickForMoreInfo = true;

@@ -232,7 +227,6 @@ export class StateHistoryCharts extends LitElement {
        .startTime=${this._computedStartTime}
        .endTime=${this._computedEndTime}
        .showNames=${this.showNames}
-        .insideLabels=${this.insideLabels}
        .names=${this.names}
        .narrow=${this.narrow}
        .chunked=${this.virtualize}
@@ -375,7 +369,7 @@ export class StateHistoryCharts extends LitElement {
        const chartBase =
          chartComponent.renderRoot?.querySelector("ha-chart-base");

-        if (chartBase) {
+        if (chartBase && chartBase.chart) {
          chartBase.zoom(0, 100);
        }
      });
@@ -450,10 +444,6 @@ export class StateHistoryCharts extends LitElement {
      margin-top: 16px;
    }

-    .entry-container.timeline:not(:first-child) {
-      margin-top: var(--ha-space-8);
-    }
-
    .container,
    lit-virtualizer {
      height: 100%;
@@ -53,41 +53,6 @@ export interface StatisticsChartData {
  yAxisFractionDigits: number;
 }

-// ECharts stacks a time axis by data index. Merge the sorted point lists so
-// every stacked line has the same x at every index, padding with null.
-function alignStackedLines(datasets: LineSeriesOption[]) {
-  const sources = datasets.map((d) => d.data as [number, number | null][]);
-  const cursors = sources.map(() => 0);
-  const counts = sources.map(() => 0);
-  const aligned = sources.map((): [number, number | null][] => []);
-  while (cursors.some((cursor, i) => cursor < sources[i].length)) {
-    let x = Infinity;
-    for (let i = 0; i < sources.length; i++) {
-      const point = sources[i][cursors[i]];
-      if (point && point[0] < x) x = point[0];
-    }
-    let slots = 1;
-    for (let i = 0; i < sources.length; i++) {
-      let count = 0;
-      while (sources[i][cursors[i] + count]?.[0] === x) count++;
-      counts[i] = count;
-      if (count > slots) slots = count;
-    }
-    for (let i = 0; i < sources.length; i++) {
-      const count = counts[i];
-      for (let slot = 0; slot < slots; slot++) {
-        aligned[i].push(
-          count ? sources[i][cursors[i] + Math.min(slot, count - 1)] : [x, null]
-        );
-      }
-      cursors[i] += count;
-    }
-  }
-  datasets.forEach((d, i) => {
-    d.data = aligned[i];
-  });
-}
-
 /**
 * Transforms raw statistics into ECharts series for `statistics-chart`.
 * Pure data processing: all environment inputs (current time, theme style,
@@ -298,10 +263,8 @@ export function generateStatisticsChartData(
              ),
          symbol: "none",
          // minmax sampling operates independently per series, breaking stacking alignment
-          // echarts stacks before it samples, so its lttb keeps stacks aligned
          // https://github.com/apache/echarts/issues/11879
-          sampling:
-            band || (chartStacked && chartType === "line") ? "lttb" : "minmax",
+          sampling: band && drawBands ? "lttb" : "minmax",
          animationDurationUpdate: 0,
          lineStyle: {
            width: 1.5,
@@ -476,15 +439,6 @@ export function generateStatisticsChartData(
    Array.prototype.push.apply(legendData, statLegendData);
  });

-  if (chartType === "line" && chartStacked) {
-    const stacked = (totalDataSets as LineSeriesOption[]).filter(
-      (d) => d.data?.length
-    );
-    if (stacked.length > 1) {
-      alignStackedLines(stacked);
-    }
-  }
-
  if (chartType === "bar") {
    fillDataGapsAndRoundCaps(totalDataSets as BarSeriesOption[], chartStacked);
  }
@@ -125,23 +125,7 @@ export class StatisticsChart extends LitElement {
  private _yAxisFractionDigits = 1;

  protected shouldUpdate(changedProps: PropertyValues<this>): boolean {
-    return (
-      changedProps.size > 1 ||
-      !changedProps.has("hass") ||
-      this._entityNamesChanged(changedProps)
-    );
-  }
-
-  // Series names are resolved once and cached in _chartData, so a hass update
-  // that only replaces the formatters has to regenerate them. The formatters are
-  // swapped as a set whenever the registries change, which is what renames a
-  // series.
-  private _entityNamesChanged(changedProps: PropertyValues): boolean {
-    if (!changedProps.has("hass")) {
-      return false;
-    }
-    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
-    return !!oldHass && oldHass.formatEntityName !== this.hass.formatEntityName;
+    return changedProps.size > 1 || !changedProps.has("hass");
  }

  public willUpdate(changedProps: PropertyValues) {
@@ -151,8 +135,7 @@ export class StatisticsChart extends LitElement {
      changedProps.has("chartType") ||
      changedProps.has("hideLegend") ||
      changedProps.has("_hiddenStats") ||
-      changedProps.has("names") ||
-      this._entityNamesChanged(changedProps)
+      changedProps.has("names")
    ) {
      this._generateData();
    }
@@ -270,8 +253,6 @@ export class StatisticsChart extends LitElement {
    }[] = [];
    for (const param of params) {
      if (rendered[param.seriesIndex]) continue;
-      // stacked lines are padded with null where a statistic has no data
-      if (!chartIsBar && param.value[1] === null) continue;
      rendered[param.seriesIndex] = true;

      const statisticId = this._statisticIds[param.seriesIndex];
@@ -549,26 +530,17 @@ export class StatisticsChart extends LitElement {
    this.unit = data.unit;
    this._yAxisFractionDigits = data.yAxisFractionDigits;
    this._chartData = data.datasets;
-    const legendData =
-      data.legendData.length > 1
-        ? data.legendData.map(({ id, name, noLabelClick }) => ({
-            id,
-            name,
-            noLabelClick,
-          }))
-        : // if there is only one entity, let the base chart handle the legend
-          undefined;
-    if (
-      legendData?.length !== this._legendData?.length ||
-      legendData?.some(
-        (item, index) =>
-          item.id !== this._legendData?.[index]?.id ||
-          item.name !== this._legendData?.[index]?.name ||
-          item.noLabelClick !== this._legendData?.[index]?.noLabelClick
-      )
-    ) {
+    if (data.legendData.length !== this._legendData?.length) {
      // only update the legend if it has changed or it will trigger options update
-      this._legendData = legendData;
+      this._legendData =
+        data.legendData.length > 1
+          ? data.legendData.map(({ id, name, noLabelClick }) => ({
+              id,
+              name,
+              noLabelClick,
+            }))
+          : // if there is only one entity, let the base chart handle the legend
+            undefined;
    }
    this._statisticIds = data.statisticIds;
  }
@@ -35,14 +35,6 @@ export class HaFilterChip extends FilterChip {
    `,
  ];

-  protected getContainerClasses() {
-    const classes = super.getContainerClasses();
-    if (this.noLeadingIcon) {
-      classes["has-icon"] = false;
-    }
-    return classes;
-  }
-
  protected renderLeadingIcon() {
    if (this.noLeadingIcon) {
      // eslint-disable-next-line lit/prefer-nothing
@@ -1202,20 +1202,6 @@ export class HaDataTable extends LitElement {
          overflow: auto;
        }

-        :host([narrow]) .mdc-data-table {
-          width: calc(
-            100% + var(--safe-area-inset-left, 0px) +
-              var(--safe-area-inset-right, 0px)
-          );
-          margin-left: calc(-1 * var(--safe-area-inset-left, 0px));
-          margin-right: calc(-1 * var(--safe-area-inset-right, 0px));
-          overflow: visible;
-        }
-
-        :host([narrow]) .mdc-data-table__header-row {
-          overflow: visible;
-        }
-
        /* Hide scrollbar for Chrome, Safari and Opera */
        .mdc-data-table__header-row::-webkit-scrollbar {
          display: none;
@@ -1513,16 +1499,6 @@ export class HaDataTable extends LitElement {
          overflow: overlay !important;
        }

-        :host([narrow]) .mdc-data-table__row {
-          box-sizing: border-box;
-          padding-left: var(--safe-area-inset-left, 0px);
-          padding-right: var(--safe-area-inset-right, 0px);
-        }
-
-        :host([narrow]) .mdc-data-table__row:has(.group-header) {
-          background-color: var(--primary-background-color);
-        }
-
        .mdc-data-table__table.auto-height .scroller {
          overflow-y: hidden !important;
        }
@@ -7,12 +7,9 @@ import { repeat } from "lit/directives/repeat";
 import memoizeOne from "memoize-one";
 import { ensureArray } from "../../common/array/ensure-array";
 import { fireEvent } from "../../common/dom/fire_event";
-import {
-  ENTITY_NAME_TYPES,
-  type EntityNameItem,
-  type EntityNameType,
-} from "../../common/entity/compute_entity_name_display";
+import type { EntityNameItem } from "../../common/entity/compute_entity_name_display";
 import { getEntityContext } from "../../common/entity/context/get_entity_context";
+import type { EntityNameType } from "../../common/translations/entity-state";
 import type { LocalizeKeys } from "../../common/translations/localize";
 import type { HomeAssistant, ValueChangedEvent } from "../../types";
 import "../chips/ha-assist-chip";
@@ -38,7 +35,9 @@ const rowRenderer: RenderItemFunction<PickerComboBoxItem> = (item) => html`
  </ha-combo-box-item>
 `;

-const KNOWN_TYPES = new Set<string>(ENTITY_NAME_TYPES);
+const KNOWN_TYPES = new Set(["entity", "device", "area", "floor"]);
+
+const UNIQUE_TYPES = new Set(["entity", "device", "area", "floor"]);

 const formatOptionValue = (item: EntityNameItem) => {
  if (item.type === "text" && item.text) {
@@ -136,7 +135,9 @@ export class HaEntityNamePicker extends LitElement {
      ${
        this.helper
          ? html`
-              <ha-input-helper-text> ${this.helper} </ha-input-helper-text>
+              <ha-input-helper-text .disabled=${this.disabled}>
+                ${this.helper}
+              </ha-input-helper-text>
            `
          : nothing
      }
@@ -169,7 +170,6 @@ export class HaEntityNamePicker extends LitElement {
        .getItems=${this._getFilteredItems}
        .rowRenderer=${rowRenderer}
        .value=${this._getPickerValue()}
-        no-sort
        allow-custom-value
        .customValueLabel=${this.hass.localize(
          "ui.components.entity.entity-name-picker.custom_name"
@@ -387,7 +387,6 @@ export class HaEntityNamePicker extends LitElement {
    );

    if (context.device) options.add("device");
-    if (context.parentDevice) options.add("parent_device");
    if (context.area) options.add("area");
    if (context.floor) options.add("floor");
    return options;
@@ -400,8 +399,8 @@ export class HaEntityNamePicker extends LitElement {

    const types = this._validTypes(entityId);

-    const items = ENTITY_NAME_TYPES.filter(
-      (name) => name !== "parent_device" || types.has(name)
+    const items = (
+      ["entity", "device", "area", "floor"] as const
    ).map<PickerComboBoxItem>((name) => {
      const stateObj = this.hass.states[entityId];
      const isValid = types.has(name);
@@ -465,7 +464,7 @@ export class HaEntityNamePicker extends LitElement {

    const excludedValues = new Set(
      this._items
-        .filter((item) => KNOWN_TYPES.has(item.type))
+        .filter((item) => UNIQUE_TYPES.has(item.type))
        .map((item) => formatOptionValue(item))
    );

@@ -178,17 +178,6 @@ export class HaStateContentPicker extends LitElement {
                  ),
                });
              }
-              if (context.parentDevice) {
-                contextItems.push({
-                  id: "parent_device_name",
-                  primary: this.hass.localize(
-                    "ui.components.state-content-picker.parent_device_name"
-                  ),
-                  sorting_label: this.hass.localize(
-                    "ui.components.state-content-picker.parent_device_name"
-                  ),
-                });
-              }
              if (context.area) {
                contextItems.push({
                  id: "area_name",
@@ -329,7 +318,11 @@ export class HaStateContentPicker extends LitElement {

  private _renderHelper() {
    return this.helper
-      ? html` <ha-input-helper-text> ${this.helper} </ha-input-helper-text> `
+      ? html`
+          <ha-input-helper-text .disabled=${this.disabled}>
+            ${this.helper}
+          </ha-input-helper-text>
+        `
      : nothing;
  }

@@ -11,10 +11,9 @@ import { customElement, property, query } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { ensureArray } from "../../common/array/ensure-array";
 import { type HASSDomEvent, fireEvent } from "../../common/dom/fire_event";
-import {
-  computeEntityPickerDisplay,
-  computeEntitySearchLabels,
-} from "../../common/entity/compute_entity_name_display";
+import { computeEntityNameList } from "../../common/entity/compute_entity_name_display";
+import { computeStateName } from "../../common/entity/compute_state_name";
+import { computeRTL } from "../../common/util/compute_rtl";
 import { domainToName } from "../../data/integration";
 import {
  getStatisticLabel,
@@ -53,7 +52,6 @@ const SEARCH_KEYS = [
  { name: "search_labels.entityName", weight: 10 },
  { name: "search_labels.friendlyName", weight: 9 },
  { name: "search_labels.deviceName", weight: 8 },
-  { name: "search_labels.parentDeviceName", weight: 6 },
  { name: "search_labels.areaName", weight: 6 },
  { name: "search_labels.domainName", weight: 4 },
  { name: "statisticId", weight: 3 },
@@ -234,6 +232,11 @@ export class HaStatisticPicker extends LitElement {
        });
      }

+      const isRTL = computeRTL(
+        hass.language,
+        hass.translationMetadata.translations
+      );
+
      const output: StatisticComboBoxItem[] = [];

      statisticIds.forEach((meta) => {
@@ -287,18 +290,22 @@ export class HaStatisticPicker extends LitElement {
        }
        const id = meta.statistic_id;

-        const { primary, secondary } = computeEntityPickerDisplay(
-          hass,
-          stateObj
-        );
-        const searchLabels = computeEntitySearchLabels(
+        const friendlyName = computeStateName(stateObj); // Keep this for search
+
+        const [entityName, deviceName, areaName] = computeEntityNameList(
          stateObj,
+          [{ type: "entity" }, { type: "device" }, { type: "area" }],
          hass.entities,
          hass.devices,
          hass.areas,
          hass.floors
        );

+        const primary = entityName || deviceName || id;
+        const secondary = [areaName, entityName ? deviceName : undefined]
+          .filter(Boolean)
+          .join(isRTL ? " ◂ " : " ▸ ");
+
        const sortingPrefix = `${TYPE_ORDER.indexOf("entity")}`;
        output.push({
          id,
@@ -307,12 +314,13 @@ export class HaStatisticPicker extends LitElement {
          secondary,
          stateObj: stateObj,
          type: "entity",
-          sorting_label: [
-            sortingPrefix,
-            searchLabels.deviceName,
-            searchLabels.entityName,
-          ].join("_"),
-          search_labels: searchLabels,
+          sorting_label: [sortingPrefix, deviceName, entityName].join("_"),
+          search_labels: {
+            entityName: entityName || null,
+            deviceName: deviceName || null,
+            areaName: areaName || null,
+            friendlyName,
+          },
        });
      });

@@ -387,18 +395,26 @@ export class HaStatisticPicker extends LitElement {
    const stateObj = this.hass.states[statisticId];

    if (stateObj) {
-      const { primary, secondary } = computeEntityPickerDisplay(
-        this.hass,
-        stateObj
-      );
-      const searchLabels = computeEntitySearchLabels(
+      const [entityName, deviceName, areaName] = computeEntityNameList(
        stateObj,
+        [{ type: "entity" }, { type: "device" }, { type: "area" }],
        this.hass.entities,
        this.hass.devices,
        this.hass.areas,
        this.hass.floors
      );

+      const isRTL = computeRTL(
+        this.hass.language,
+        this.hass.translationMetadata.translations
+      );
+
+      const primary = entityName || deviceName || statisticId;
+      const secondary = [areaName, entityName ? deviceName : undefined]
+        .filter(Boolean)
+        .join(isRTL ? " ◂ " : " ▸ ");
+      const friendlyName = computeStateName(stateObj); // Keep this for search
+
      const sortingPrefix = `${TYPE_ORDER.indexOf("entity")}`;
      return {
        id: statisticId,
@@ -407,12 +423,14 @@ export class HaStatisticPicker extends LitElement {
        secondary,
        stateObj: stateObj,
        type: "entity",
-        sorting_label: [
-          sortingPrefix,
-          searchLabels.deviceName,
-          searchLabels.entityName,
-        ].join("_"),
-        search_labels: { ...searchLabels, statisticId },
+        sorting_label: [sortingPrefix, deviceName, entityName].join("_"),
+        search_labels: {
+          entityName: entityName || null,
+          deviceName: deviceName || null,
+          areaName: areaName || null,
+          friendlyName,
+          statisticId,
+        },
      };
    }

@@ -1,7 +1,6 @@
 import type { CSSResultGroup, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { consumeLocalize } from "../common/decorators/consume-context-entry";
+import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import type { LocalizeFunc } from "../common/translations/localize";
 import type { Analytics, AnalyticsPreferences } from "../data/analytics";
@@ -21,15 +20,13 @@ declare global {

@customElement("ha-analytics")
 export class HaAnalytics extends LitElement {
+  @property({ attribute: false }) public localize!: LocalizeFunc;
+
  @property({ attribute: false }) public analytics?: Analytics;

  @property({ attribute: "translation_key_panel" }) public translationKeyPanel:
    "page-onboarding" | "config" = "config";

-  @state()
-  @consumeLocalize()
-  private _localize!: LocalizeFunc;
-
  protected render(): TemplateResult {
    const loading = this.analytics === undefined;
    const baseEnabled = !loading && this.analytics!.preferences.base;
@@ -37,12 +34,12 @@ export class HaAnalytics extends LitElement {
    return html`
      <ha-row-item>
        <span slot="headline"
-          >${this._localize(
+          >${this.localize(
            `ui.panel.${this.translationKeyPanel}.analytics.preferences.base.title`
          )}</span
        >
        <span slot="supporting-text"
-          >${this._localize(
+          >${this.localize(
            `ui.panel.${this.translationKeyPanel}.analytics.preferences.base.description`
          )}</span
        >
@@ -53,22 +50,18 @@ export class HaAnalytics extends LitElement {
          .preference=${"base"}
          .disabled=${loading}
          name="base"
-        >
-          ${this._localize(
-            `ui.panel.${this.translationKeyPanel}.analytics.preferences.base.title`
-          )}
-        </ha-switch>
+        ></ha-switch>
      </ha-row-item>
      ${ADDITIONAL_PREFERENCES.map(
        (preference) => html`
          <ha-row-item>
            <span slot="headline"
-              >${this._localize(
+              >${this.localize(
                `ui.panel.${this.translationKeyPanel}.analytics.preferences.${preference}.title`
              )}</span
            >
            <span slot="supporting-text"
-              >${this._localize(
+              >${this.localize(
                `ui.panel.${this.translationKeyPanel}.analytics.preferences.${preference}.description`
              )}</span
            >
@@ -79,11 +72,7 @@ export class HaAnalytics extends LitElement {
              .checked=${!!this.analytics?.preferences[preference]}
              .preference=${preference}
              name=${preference}
-            >
-              ${this._localize(
-                `ui.panel.${this.translationKeyPanel}.analytics.preferences.${preference}.title`
-              )}
-            </ha-switch>
+            ></ha-switch>
            ${
              baseEnabled
                ? nothing
@@ -91,7 +80,7 @@ export class HaAnalytics extends LitElement {
                    .for="switch-${preference}"
                    placement="right"
                  >
-                    ${this._localize(
+                    ${this.localize(
                      `ui.panel.${this.translationKeyPanel}.analytics.need_base_enabled`
                    )}
                  </ha-tooltip>`
@@ -101,12 +90,12 @@ export class HaAnalytics extends LitElement {
      )}
      <ha-row-item>
        <span slot="headline"
-          >${this._localize(
+          >${this.localize(
            `ui.panel.${this.translationKeyPanel}.analytics.preferences.diagnostics.title`
          )}</span
        >
        <span slot="supporting-text"
-          >${this._localize(
+          >${this.localize(
            `ui.panel.${this.translationKeyPanel}.analytics.preferences.diagnostics.description`
          )}</span
        >
@@ -117,11 +106,7 @@ export class HaAnalytics extends LitElement {
          .preference=${"diagnostics"}
          .disabled=${loading}
          name="diagnostics"
-        >
-          ${this._localize(
-            `ui.panel.${this.translationKeyPanel}.analytics.preferences.diagnostics.title`
-          )}
-        </ha-switch>
+        ></ha-switch>
      </ha-row-item>
    `;
  }
@@ -158,19 +143,6 @@ export class HaAnalytics extends LitElement {
          color: var(--error-color);
        }

-        /* The visible headline already names the row. Keep the switch's
-           slotted label available to assistive technology without repeating it. */
-        ha-switch::part(label) {
-          position: absolute;
-          overflow: hidden;
-          clip: rect(0 0 0 0);
-          height: 1px;
-          width: 1px;
-          margin: -1px;
-          padding: 0;
-          border: 0;
-        }
-
        ha-row-item {
          --ha-row-item-padding-inline: 0;
        }
@@ -3,7 +3,8 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
 import Fuse from "fuse.js";
 import memoizeOne from "memoize-one";
-import { computeEntityPickerDisplay } from "../common/entity/compute_entity_name_display";
+import { computeEntityNameList } from "../common/entity/compute_entity_name_display";
+import { computeRTL } from "../common/util/compute_rtl";
 import type { LocalizeFunc } from "../common/translations/localize";
 import {
  multiTermSortedSearch,
@@ -182,6 +183,11 @@ export class HaAreaControlsPicker extends LitElement {
          const allEntityIds = Object.values(controlEntities).flat();
          const uniqueEntityIds = Array.from(new Set(allEntityIds));

+          const isRTL = computeRTL(
+            this.hass.language,
+            this.hass.translationMetadata.translations
+          );
+
          uniqueEntityIds.forEach((entityId) => {
            if (isSelected(entityId)) {
              return;
@@ -191,11 +197,20 @@ export class HaAreaControlsPicker extends LitElement {
              return;
            }

-            const { primary, secondary } = computeEntityPickerDisplay(
-              this.hass!,
-              stateObj
+            const [entityName, deviceName, areaName] = computeEntityNameList(
+              stateObj,
+              [{ type: "entity" }, { type: "device" }, { type: "area" }],
+              this.hass!.entities,
+              this.hass!.devices,
+              this.hass!.areas,
+              this.hass!.floors
            );

+            const primary = entityName || deviceName || entityId;
+            const secondary = [areaName, entityName ? deviceName : undefined]
+              .filter(Boolean)
+              .join(isRTL ? " ◂ " : " ▸ ");
+
            entityItems.push({
              type: "entity",
              id: entityId,
@@ -312,7 +312,9 @@ export class HaBaseTimeInput extends LitElement {
      </div>
      ${
        this.helper
-          ? html`<ha-input-helper-text>${this.helper}</ha-input-helper-text>`
+          ? html`<ha-input-helper-text .disabled=${this.disabled}
+              >${this.helper}</ha-input-helper-text
+            >`
          : nothing
      }
    `;
@@ -42,8 +42,8 @@ export class HaCard extends LitElement {
      font-family: var(--ha-card-header-font-family, inherit);
      font-size: var(--ha-card-header-font-size, var(--ha-font-size-2xl));
      letter-spacing: -0.012em;
-      line-height: var(--ha-line-height-condensed);
-      padding: var(--ha-space-5) var(--ha-space-4) var(--ha-space-6);
+      line-height: var(--ha-line-height-expanded);
+      padding: var(--ha-space-3) var(--ha-space-4) var(--ha-space-4);
      display: block;
      margin-block-start: 0;
      margin-block-end: 0;
@@ -198,7 +198,11 @@ export class HaClockDateFormatPicker extends LitElement {

  private _renderHelper() {
    return this.helper
-      ? html` <ha-input-helper-text> ${this.helper} </ha-input-helper-text> `
+      ? html`
+          <ha-input-helper-text .disabled=${this.disabled}>
+            ${this.helper}
+          </ha-input-helper-text>
+        `
      : nothing;
  }

@@ -761,9 +761,6 @@ export class HaCodeEditor extends ReactiveElement {
    const deviceName = context.device
      ? computeDeviceName(context.device)
      : undefined;
-    const parentDeviceName = context.parentDevice
-      ? computeDeviceName(context.parentDevice)
-      : undefined;
    const areaName = context.area ? computeAreaName(context.area) : undefined;
    const floorName = context.floor
      ? computeFloorName(context.floor)
@@ -798,15 +795,6 @@ export class HaCodeEditor extends ReactiveElement {
      });
    }

-    if (parentDeviceName) {
-      completionItems.push({
-        label: this._i18n!.localize(
-          "ui.components.device-picker.parent_device"
-        ),
-        value: parentDeviceName,
-      });
-    }
-
    if (areaName) {
      completionItems.push({
        label: this._i18n!.localize("ui.components.area-picker.area"),
@@ -103,87 +103,69 @@ export class HaDurationInput extends LitElement {
    `;
  }

-  // Fold units we do not render into the smallest unit we do, so a value the
-  // user cannot see is not silently dropped on the next edit.
-  private get _data(): HaDurationData | undefined {
-    if (!this.data) {
-      return this.data;
-    }
-    const data = { ...this.data };
-    if (!this.enableDay && data.days) {
-      data.hours = (data.hours || 0) + data.days * 24;
-      delete data.days;
-    }
-    if (!this.enableMillisecond && data.milliseconds) {
-      data.seconds = (data.seconds || 0) + data.milliseconds / 1000;
-      delete data.milliseconds;
-    }
-    return data;
-  }
-
  private get _negative() {
    return (
      this._toggleNegative ||
-      (this._data?.days
-        ? this._data.days < 0
-        : this._data?.hours
-          ? this._data.hours < 0
-          : this._data?.minutes
-            ? this._data.minutes < 0
-            : this._data?.seconds
-              ? this._data.seconds < 0
-              : this._data?.milliseconds
-                ? this._data.milliseconds < 0
+      (this.data?.days
+        ? this.data.days < 0
+        : this.data?.hours
+          ? this.data.hours < 0
+          : this.data?.minutes
+            ? this.data.minutes < 0
+            : this.data?.seconds
+              ? this.data.seconds < 0
+              : this.data?.milliseconds
+                ? this.data.milliseconds < 0
                : false)
    );
  }

  private get _days() {
-    return this._data?.days
+    return this.data?.days
      ? this.allowNegative
-        ? Math.abs(Number(this._data.days))
-        : Number(this._data.days)
-      : this.required || this._data
+        ? Math.abs(Number(this.data.days))
+        : Number(this.data.days)
+      : this.required || this.data
        ? 0
        : NaN;
  }

  private get _hours() {
-    return this._data?.hours
+    return this.data?.hours
      ? this.allowNegative
-        ? Math.abs(Number(this._data.hours))
-        : Number(this._data.hours)
-      : this.required || this._data
+        ? Math.abs(Number(this.data.hours))
+        : Number(this.data.hours)
+      : this.required || this.data
        ? 0
        : NaN;
  }

  private get _minutes() {
-    return this._data?.minutes
+    return this.data?.minutes
      ? this.allowNegative
-        ? Math.abs(Number(this._data.minutes))
-        : Number(this._data.minutes)
-      : this.required || this._data
+        ? Math.abs(Number(this.data.minutes))
+        : Number(this.data.minutes)
+      : this.required || this.data
        ? 0
        : NaN;
  }

  private get _seconds() {
-    return this._data?.seconds
+    return this.data?.seconds
      ? this.allowNegative
-        ? Math.abs(Number(this._data.seconds))
-        : Number(this._data.seconds)
-      : this.required || this._data
+        ? Math.abs(Number(this.data.seconds))
+        : Number(this.data.seconds)
+      : this.required || this.data
        ? 0
        : NaN;
  }

  private get _milliseconds() {
-    return this._data?.milliseconds
+    return this.data?.milliseconds
      ? this.allowNegative
-        ? Math.abs(Number(this._data.milliseconds))
-        : Number(this._data.milliseconds)
-      : this.required || this._data
+        ? Math.abs(Number(this.data.milliseconds))
+        : Number(this.data.milliseconds)
+      : this.required || this.data
        ? 0
        : NaN;
  }
@@ -254,8 +236,8 @@ export class HaDurationInput extends LitElement {
    ev.stopPropagation();
    const negative = (ev.detail?.value || ev.target.value) === "-";
    this._toggleNegative = negative;
-    if (this._data) {
-      const value = { ...this._data };
+    if (this.data) {
+      const value = { ...this.data };
      FIELDS.forEach((t) => {
        if (value[t]) {
          value[t] = negative ? -Math.abs(value[t]) : Math.abs(value[t]);
@@ -272,11 +254,6 @@ export class HaDurationInput extends LitElement {
      display: flex;
      align-items: center;
    }
-    /* Full width: bigger touch targets, no ragged right edge in a form. */
-    ha-base-time-input {
-      flex: 1;
-      --time-input-flex: 1;
-    }
    ha-button-toggle-group {
      margin: var(--ha-space-2);
    }
@@ -27,9 +27,9 @@ declare global {

@customElement("ha-file-upload")
 export class HaFileUpload extends LitElement {
-  @state()
-  @consumeLocalize()
-  private _localize!: LocalizeFunc;
+  @property({ attribute: false }) public localize?: LocalizeFunc;
+
+  @state() @consumeLocalize() private _localize?: LocalizeFunc;

  @state()
  @consume({ context: internationalizationContext, subscribe: true })
@@ -92,6 +92,7 @@ export class HaFileUpload extends LitElement {
  }

  public render(): TemplateResult {
+    const localize = this.localize || this._localize!;
    return html`
      ${
        this.uploading
@@ -101,13 +102,10 @@ export class HaFileUpload extends LitElement {
                  >${
                    this.uploadingLabel ||
                    (this.value
-                      ? this._localize(
-                          "ui.components.file-upload.uploading_name",
-                          {
-                            name: this._name,
-                          }
-                        )
-                      : this._localize("ui.components.file-upload.uploading"))
+                      ? localize("ui.components.file-upload.uploading_name", {
+                          name: this._name,
+                        })
+                      : localize("ui.components.file-upload.uploading"))
                  }</span
                >
                ${
@@ -149,12 +147,12 @@ export class HaFileUpload extends LitElement {
                          slot="start"
                          .path=${this.icon || mdiFileUpload}
                        ></ha-svg-icon>
-                        ${this.label || this._localize("ui.components.file-upload.label")}
+                        ${this.label || localize("ui.components.file-upload.label")}
                      </ha-button>
                      <span class="secondary"
                        >${
                          this.secondary ||
-                          this._localize("ui.components.file-upload.secondary")
+                          localize("ui.components.file-upload.secondary")
                        }</span
                      >
                      <span class="supports">${this.supports}</span>`
@@ -168,7 +166,7 @@ export class HaFileUpload extends LitElement {
                        </div>
                        <ha-icon-button
                          @click=${this._clearValue}
-                          .label=${this.deleteLabel || this._localize("ui.common.delete")}
+                          .label=${this.deleteLabel || localize("ui.common.delete")}
                          .path=${mdiDelete}
                        ></ha-icon-button>
                      </div>`
@@ -187,8 +185,7 @@ export class HaFileUpload extends LitElement {
                            <ha-icon-button
                              @click=${this._clearValue}
                              .label=${
-                                this.deleteLabel ||
-                                this._localize("ui.common.delete")
+                                this.deleteLabel || localize("ui.common.delete")
                              }
                              .path=${mdiDelete}
                            ></ha-icon-button>
@@ -60,9 +60,6 @@ export class HaFilterDevices extends LitElement {

  @property() public type?: keyof RelatedResult;

-  @property({ type: Boolean, attribute: "include-disabled-entities" })
-  public includeDisabledEntities = false;
-
  @property({ type: Boolean, reflect: true }) public expanded = false;

  @property({ type: Boolean }) public narrow = false;
@@ -80,8 +77,9 @@ export class HaFilterDevices extends LitElement {
    super.willUpdate(properties);

    if (
-      properties.has("value") &&
-      !deepEqual(this.value, properties.get("value"))
+      properties.has("type") ||
+      (properties.has("value") &&
+        !deepEqual(this.value, properties.get("value")))
    ) {
      this._findRelated();
    }
@@ -127,7 +125,7 @@ export class HaFilterDevices extends LitElement {
                  this._states,
                  this._i18n.locale.language
                )}
-                .rowRenderer=${this._renderItem}
+                .rowRenderer=${this._renderItem(this.value)}
                @ha-list-item-selected=${this._handleAdded}
                @ha-list-item-deselected=${this._handleRemoved}
              ></ha-list-selectable-virtualized>
@@ -137,18 +135,20 @@ export class HaFilterDevices extends LitElement {
    `;
  }

-  private _renderItem = (item?: HaFilterDevicesItem) =>
-    !item
-      ? nothing
-      : html`<ha-list-item-option
-          style="width: 100%;"
-          appearance="checkbox"
-          selection-position="end"
-          .value=${item.id}
-          .selected=${this.value?.includes(item.id) ?? false}
-        >
-          <span slot="headline">${item.name}</span>
-        </ha-list-item-option>`;
+  private _renderItem = memoizeOne(
+    (value: string[] | undefined) => (item?: HaFilterDevicesItem) =>
+      !item
+        ? nothing
+        : html`<ha-list-item-option
+            style="width: 100%;"
+            appearance="checkbox"
+            selection-position="end"
+            .value=${item.id}
+            .selected=${value?.includes(item.id) ?? false}
+          >
+            <span slot="headline">${item.name}</span>
+          </ha-list-item-option>`
+  );

  private _handleAdded(ev: CustomEvent<number>) {
    this.value = [
@@ -214,9 +214,11 @@ export class HaFilterDevices extends LitElement {
  );

  private async _findRelated() {
+    const value = this.value;
+    const type = this.type;
    const relatedPromises: Promise<RelatedResult>[] = [];

-    if (!this.value?.length) {
+    if (!value?.length) {
      this.value = [];
      fireEvent(this, "data-table-filter-changed", {
        value: [],
@@ -225,32 +227,25 @@ export class HaFilterDevices extends LitElement {
      return;
    }

-    const value: string[] = [];
-
-    for (const deviceId of this.value) {
-      value.push(deviceId);
-      if (this.type) {
-        relatedPromises.push(
-          findRelated(
-            this._api,
-            "device",
-            deviceId,
-            this.includeDisabledEntities
-          )
-        );
+    for (const deviceId of value) {
+      if (type) {
+        relatedPromises.push(findRelated(this._api, "device", deviceId));
      }
    }
    const results = await Promise.all(relatedPromises);
+    if (!deepEqual(value, this.value) || type !== this.type) {
+      return;
+    }
    const items = new Set<string>();
    for (const result of results) {
-      if (result[this.type!]) {
-        result[this.type!]!.forEach((item) => items.add(item));
+      if (type && result[type]) {
+        result[type].forEach((item) => items.add(item));
      }
    }

    fireEvent(this, "data-table-filter-changed", {
      value,
-      items: this.type ? items : undefined,
+      items: type ? items : undefined,
    });
  }

@@ -65,9 +65,6 @@ export class HaFilterFloorAreas extends LitElement {

  @property() public type?: keyof RelatedResult;

-  @property({ type: Boolean, attribute: "include-disabled-entities" })
-  public includeDisabledEntities = false;
-
  @property({ type: Boolean }) public narrow = false;

  @property({ type: Boolean, reflect: true }) public expanded = false;
@@ -82,8 +79,9 @@ export class HaFilterFloorAreas extends LitElement {
    super.willUpdate(properties);

    if (
-      properties.has("value") &&
-      !deepEqual(this.value, properties.get("value"))
+      properties.has("type") ||
+      (properties.has("value") &&
+        !deepEqual(this.value, properties.get("value")))
    ) {
      this._findRelated();
    }
@@ -281,12 +279,11 @@ export class HaFilterFloorAreas extends LitElement {
  );

  private async _findRelated() {
+    const value = this.value;
+    const type = this.type;
    const relatedPromises: Promise<RelatedResult>[] = [];

-    if (
-      !this.value ||
-      (!this.value.areas?.length && !this.value.floors?.length)
-    ) {
+    if (!value || (!value.areas?.length && !value.floors?.length)) {
      this.value = {};
      fireEvent(this, "data-table-filter-changed", {
        value: {},
@@ -295,42 +292,36 @@ export class HaFilterFloorAreas extends LitElement {
      return;
    }

-    if (this.value.areas) {
-      for (const areaId of this.value.areas) {
-        if (this.type) {
-          relatedPromises.push(
-            findRelated(this._api, "area", areaId, this.includeDisabledEntities)
-          );
+    if (value.areas) {
+      for (const areaId of value.areas) {
+        if (type) {
+          relatedPromises.push(findRelated(this._api, "area", areaId));
        }
      }
    }

-    if (this.value.floors) {
-      for (const floorId of this.value.floors) {
-        if (this.type) {
-          relatedPromises.push(
-            findRelated(
-              this._api,
-              "floor",
-              floorId,
-              this.includeDisabledEntities
-            )
-          );
+    if (value.floors) {
+      for (const floorId of value.floors) {
+        if (type) {
+          relatedPromises.push(findRelated(this._api, "floor", floorId));
        }
      }
    }

    const results = await Promise.all(relatedPromises);
+    if (!deepEqual(value, this.value) || type !== this.type) {
+      return;
+    }
    const items = new Set<string>();
    for (const result of results) {
-      if (result[this.type!]) {
-        result[this.type!]!.forEach((item) => items.add(item));
+      if (type && result[type]) {
+        result[type].forEach((item) => items.add(item));
      }
    }

    fireEvent(this, "data-table-filter-changed", {
-      value: this.value,
-      items: this.type ? items : undefined,
+      value,
+      items: type ? items : undefined,
    });
  }

@@ -22,6 +22,7 @@ import "./ha-list";
 import "./ha-list-item";
 import "./voice-assistant-brand-icon";
 import { voiceAssistants } from "../data/expose";
+import "../panels/config/voice-assistants/expose/expose-assistant-icon";

@customElement("ha-filter-voice-assistants")
 export class HaFilterVoiceAssistants extends LitElement {
@@ -91,7 +91,7 @@ export class HaFormInteger extends LitElement implements HaFormElement {
          </div>
          ${
            this.helper
-              ? html`<ha-input-helper-text
+              ? html`<ha-input-helper-text .disabled=${this.disabled}
                  >${this.helper}</ha-input-helper-text
                >`
              : nothing
@@ -3,6 +3,7 @@ import { css, html, LitElement } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import type { HASSDomTargetEvent } from "../../common/dom/fire_event";
+import "../ha-check-list-item";
 import "../ha-checkbox";
 import type { HaCheckbox } from "../ha-checkbox";
 import "../ha-dropdown";
@@ -57,7 +57,6 @@ export class HaFormString extends LitElement implements HaFormElement {
        .name=${this.schema.name}
        .autofocus=${!!this.schema.autofocus}
        .autocomplete=${this.schema.autocomplete}
-        .inputId=${this.schema.name}
        .validationMessage=${
          this.schema.required
            ? this.localize?.("ui.common.error_required")
@@ -329,7 +329,7 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
      return nothing;
    }

-    return html`<ha-input-helper-text>
+    return html`<ha-input-helper-text .disabled=${this.disabled}>
      ${
        showError
          ? html`<span class="error">${this.errorMessage}</span> ${
@@ -360,7 +360,7 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
        this._initialFieldValue = undefined;
      }
      if (
-        this._hassConfig?.auth?.external &&
+        this._hassConfig?.auth.external &&
        isIosApp(this._hassConfig.auth.external)
      ) {
        this._hassConfig.auth.external.fireMessage({
@@ -1,16 +0,0 @@
-import { mdiArrowLeft, mdiArrowRight } from "@mdi/js";
-import { customElement, property } from "lit/decorators";
-import { mainWindow } from "../common/dom/get_main_window";
-import { HaSvgIcon } from "./ha-svg-icon";
-
-@customElement("ha-icon-arrow-next")
-export class HaIconArrowNext extends HaSvgIcon {
-  @property() public override path =
-    mainWindow.document.dir === "rtl" ? mdiArrowLeft : mdiArrowRight;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-icon-arrow-next": HaIconArrowNext;
-  }
-}
@@ -1,16 +0,0 @@
-import { mdiArrowLeft, mdiArrowRight } from "@mdi/js";
-import { customElement, property } from "lit/decorators";
-import { mainWindow } from "../common/dom/get_main_window";
-import { HaSvgIcon } from "./ha-svg-icon";
-
-@customElement("ha-icon-arrow-prev")
-export class HaIconArrowPrev extends HaSvgIcon {
-  @property() public override path =
-    mainWindow.document.dir === "rtl" ? mdiArrowRight : mdiArrowLeft;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-icon-arrow-prev": HaIconArrowPrev;
-  }
-}
@@ -1,52 +0,0 @@
-import { mdiChevronDoubleLeft, mdiChevronDoubleRight } from "@mdi/js";
-import type { TemplateResult } from "lit";
-import { html, LitElement } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { mainWindow } from "../common/dom/get_main_window";
-import "./ha-icon-button";
-import { consumeLocalize } from "../common/decorators/consume-context-entry";
-import type { LocalizeFunc } from "../common/translations/localize";
-
-@customElement("ha-icon-button-first")
-export class HaIconButtonFirst extends LitElement {
-  @property({ type: Boolean }) public disabled = false;
-
-  @property() public label?: string;
-
-  @property() href?: string;
-
-  @property() target?: "_blank" | "_parent" | "_self" | "_top";
-
-  @property() rel?: string;
-
-  @property() download?: string;
-
-  @state() private _icon =
-    mainWindow.document.dir === "rtl"
-      ? mdiChevronDoubleRight
-      : mdiChevronDoubleLeft;
-
-  @state()
-  @consumeLocalize()
-  private _localize!: LocalizeFunc;
-
-  protected render(): TemplateResult {
-    return html`
-      <ha-icon-button
-        .disabled=${this.disabled}
-        .label=${this.label || this._localize("ui.common.first") || "First"}
-        .path=${this._icon}
-        .href=${this.href}
-        .target=${this.target}
-        .rel=${this.rel}
-        .download=${this.download}
-      ></ha-icon-button>
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-icon-button-first": HaIconButtonFirst;
-  }
-}
@@ -1,52 +0,0 @@
-import { mdiChevronDoubleLeft, mdiChevronDoubleRight } from "@mdi/js";
-import type { TemplateResult } from "lit";
-import { html, LitElement } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { mainWindow } from "../common/dom/get_main_window";
-import "./ha-icon-button";
-import { consumeLocalize } from "../common/decorators/consume-context-entry";
-import type { LocalizeFunc } from "../common/translations/localize";
-
-@customElement("ha-icon-button-last")
-export class HaIconButtonLast extends LitElement {
-  @property({ type: Boolean }) public disabled = false;
-
-  @property() public label?: string;
-
-  @property() href?: string;
-
-  @property() target?: "_blank" | "_parent" | "_self" | "_top";
-
-  @property() rel?: string;
-
-  @property() download?: string;
-
-  @state() private _icon =
-    mainWindow.document.dir === "rtl"
-      ? mdiChevronDoubleLeft
-      : mdiChevronDoubleRight;
-
-  @state()
-  @consumeLocalize()
-  private _localize!: LocalizeFunc;
-
-  protected render(): TemplateResult {
-    return html`
-      <ha-icon-button
-        .disabled=${this.disabled}
-        .label=${this.label || this._localize("ui.common.last") || "Last"}
-        .path=${this._icon}
-        .href=${this.href}
-        .target=${this.target}
-        .rel=${this.rel}
-        .download=${this.download}
-      ></ha-icon-button>
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-icon-button-last": HaIconButtonLast;
-  }
-}
@@ -1,9 +1,11 @@
 import type { TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
-import { customElement } from "lit/decorators";
+import { customElement, property } from "lit/decorators";

@customElement("ha-input-helper-text")
 class InputHelperText extends LitElement {
+  @property({ type: Boolean, reflect: true }) disabled = false;
+
  protected render(): TemplateResult {
    return html`<slot></slot>`;
  }
@@ -23,6 +25,9 @@ class InputHelperText extends LitElement {
      );
      line-height: normal;
    }
+    :host([disabled]) {
+      color: var(--mdc-text-field-disabled-ink-color, rgba(0, 0, 0, 0.6));
+    }
  `;
 }

@@ -50,7 +50,9 @@ class HaLabeledSlider extends LitElement {
      </div>
      ${
        this.helper
-          ? html`<ha-input-helper-text> ${this.helper} </ha-input-helper-text>`
+          ? html`<ha-input-helper-text .disabled=${this.disabled}>
+              ${this.helper}
+            </ha-input-helper-text>`
          : nothing
      }
    `;
@@ -28,11 +28,6 @@ const LAWN_MOWER_ACTIONS: Partial<
    service: "start_mowing",
    feature: LawnMowerEntityFeature.START_MOWING,
  },
-  idle: {
-    action: "start_mowing",
-    service: "start_mowing",
-    feature: LawnMowerEntityFeature.START_MOWING,
-  },
  returning: {
    action: "pause",
    service: "pause",
@@ -239,7 +239,9 @@ export class HaMediaItemPicker extends LitElement {
      }
      ${
        hideEntityPicker && this.helper
-          ? html`<ha-input-helper-text>${this.helper}</ha-input-helper-text>`
+          ? html`<ha-input-helper-text .disabled=${this.disabled}
+              >${this.helper}</ha-input-helper-text
+            >`
          : nothing
      }
    `;
@@ -0,0 +1,26 @@
+import { OutlinedButton } from "@material/web/button/internal/outlined-button";
+import { styles as sharedStyles } from "@material/web/button/internal/shared-styles.cssresult.js";
+import { styles } from "@material/web/button/internal/outlined-styles.cssresult.js";
+import { css } from "lit";
+import { customElement } from "lit/decorators";
+
+@customElement("ha-outlined-button")
+export class HaOutlinedButton extends OutlinedButton {
+  static override styles = [
+    sharedStyles,
+    styles,
+    css`
+      :host {
+        --ha-icon-display: block;
+        --md-sys-color-primary: var(--primary-text-color);
+        --md-sys-color-outline: var(--outline-color);
+      }
+    `,
+  ];
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-outlined-button": HaOutlinedButton;
+  }
+}
@@ -0,0 +1,36 @@
+import { OutlinedField } from "@material/web/field/internal/outlined-field";
+import { styles } from "@material/web/field/internal/outlined-styles.cssresult.js";
+import { styles as sharedStyles } from "@material/web/field/internal/shared-styles.cssresult.js";
+import { css } from "lit";
+import { customElement } from "lit/decorators";
+import { literal } from "lit/static-html";
+
+@customElement("ha-outlined-field")
+export class HaOutlinedField extends OutlinedField {
+  protected readonly fieldTag = literal`ha-outlined-field`;
+
+  static override styles = [
+    sharedStyles,
+    styles,
+    css`
+      .container::before {
+        display: block;
+        content: "";
+        position: absolute;
+        inset: 0;
+        background-color: var(--ha-outlined-field-container-color, transparent);
+        opacity: var(--ha-outlined-field-container-opacity, 1);
+        border-start-start-radius: var(--_container-shape-start-start);
+        border-start-end-radius: var(--_container-shape-start-end);
+        border-end-start-radius: var(--_container-shape-end-start);
+        border-end-end-radius: var(--_container-shape-end-end);
+      }
+    `,
+  ];
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-outlined-field": HaOutlinedField;
+  }
+}
@@ -1,6 +1,6 @@
 import type { PropertyValues } from "lit";
 import { css, html, LitElement } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { customElement, query, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import { BOTTOM_SHEET_ANIMATION_DURATION_MS } from "./ha-bottom-sheet";

@@ -11,80 +11,39 @@ import { BOTTOM_SHEET_ANIMATION_DURATION_MS } from "./ha-bottom-sheet";
 * the sheet by dragging the handle at the top. It supports both mouse and touch
 * interactions and automatically closes when dragged below a 20% of screen height.
 *
- * A persistent sheet never closes by dragging; it stops at its minimum height
- * instead, so a host can keep a collapsed strip of content reachable.
- *
 * @fires bottom-sheet-closed - Fired when the bottom sheet is closed
- * @fires bottom-sheet-resized - Fired with the sheet's height in pixels once
- * it has opened and whenever a drag ends
 *
 * @cssprop --ha-bottom-sheet-border-width - Border width for the sheet
 * @cssprop --ha-bottom-sheet-border-style - Border style for the sheet
 * @cssprop --ha-bottom-sheet-border-color - Border color for the sheet
- * @cssprop --ha-bottom-sheet-handle-padding - How far below the handle the
- * grab area reaches; shrink it when content sits right under the handle
 */
@customElement("ha-resizable-bottom-sheet")
 export class HaResizableBottomSheet extends LitElement {
  @query("dialog") private _dialog!: HTMLDialogElement;

-  /** Dragging down stops at the minimum height instead of closing the sheet */
-  @property({ type: Boolean }) public persistent = false;
-
-  /**
-   * The height in pixels the sheet cannot be dragged below, e.g. what a host
-   * measures for the strip it wants to keep visible. Without it the sheet
-   * stops at 20% of the viewport.
-   */
-  @property({ type: Number, attribute: "min-height" })
-  public minHeight?: number;
-
-  /**
-   * The largest share of the viewport the sheet opens at, in percent. It
-   * opens at its content height up to this, and can be dragged to 90 after.
-   */
-  @property({ type: Number, attribute: "open-max-viewport-height" })
-  public openMaxViewportHeight = 70;
-
-  /**
-   * Whether the sheet may open smaller than 55% of the viewport, down to its
-   * content height and the minimum it can be dragged to.
-   */
-  @property({ type: Boolean, attribute: "open-at-content-height" })
-  public openAtContentHeight = false;
-
  private _dragging = false;

  private _dragStartY = 0;

  private _initialSize = 0;

-  private _opened = false;
+  @state() private _dialogMaxViewpointHeight = 70;

-  @state() private _dialogMaxViewpointHeight?: number;
-
-  @state() private _dialogMinViewpointHeight?: number;
+  @state() private _dialogMinViewpointHeight = 55;

  @state() private _dialogViewportHeight?: number;

  render() {
-    // Until it has opened, the sheet sizes to its content within the opening
-    // bounds; afterwards it keeps the height it settled on or was dragged to
-    const maxHeight =
-      this._dialogMaxViewpointHeight ?? this.openMaxViewportHeight;
-    const minHeight =
-      this._dialogMinViewpointHeight ??
-      (this.openAtContentHeight ? this._minViewportHeight() : 55);
    return html`<dialog
      open
      @transitionend=${this._handleTransitionEnd}
      style=${`
        --height: ${this._dialogViewportHeight}vh;
        --height: ${this._dialogViewportHeight}dvh;
-        --max-height: ${maxHeight}vh;
-        --max-height: ${maxHeight}dvh;
-        --min-height: ${minHeight}vh;
-        --min-height: ${minHeight}dvh;
+        --max-height: ${this._dialogMaxViewpointHeight}vh;
+        --max-height: ${this._dialogMaxViewpointHeight}dvh;
+        --min-height: ${this._dialogMinViewpointHeight}vh;
+        --min-height: ${this._dialogMinViewpointHeight}dvh;
      `}
    >
      <div class="handle-wrapper">
@@ -124,9 +83,7 @@ export class HaResizableBottomSheet extends LitElement {
      this._dialogViewportHeight =
        (this._dialog.offsetHeight / window.innerHeight) * 100;
      this._dialogMaxViewpointHeight = 90;
-      this._dialogMinViewpointHeight = this._minViewportHeight();
-      this._opened = true;
-      this._fireResized();
+      this._dialogMinViewpointHeight = 20;
    } else {
      // after close animation is done close dialog element and fire closed event
      this._dialog.close();
@@ -145,7 +102,6 @@ export class HaResizableBottomSheet extends LitElement {
    });
    document.addEventListener("touchend", this._handleTouchEnd);
    document.addEventListener("touchcancel", this._handleTouchEnd);
-    window.addEventListener("resize", this._handleViewportResize);
  }

  disconnectedCallback() {
@@ -157,16 +113,8 @@ export class HaResizableBottomSheet extends LitElement {
    document.removeEventListener("touchmove", this._handleTouchMove);
    document.removeEventListener("touchend", this._handleTouchEnd);
    document.removeEventListener("touchcancel", this._handleTouchEnd);
-    window.removeEventListener("resize", this._handleViewportResize);
  }

-  // minHeight is a pixel value, so its viewport-relative minimum depends on the
-  // window height; recompute it when the viewport changes (for example on
-  // rotation) so the cached percentage cannot clip the persistent peek content.
-  private _handleViewportResize = () => {
-    this._applyMinViewportHeight();
-  };
-
  private _handleMouseDown = (ev: MouseEvent) => {
    this._startDrag(ev.clientY);
  };
@@ -208,10 +156,8 @@ export class HaResizableBottomSheet extends LitElement {
    let newSize = this._initialSize + deltaVh;
    newSize = Math.max(10, Math.min(90, newSize));

-    if (this.persistent) {
-      newSize = Math.max(this._minViewportHeight(), newSize);
-    } else if (newSize < 20 && deltaY < 0) {
-      // on drag down and below 20vh
+    // on drag down and below 20vh
+    if (newSize < 20 && deltaY < 0) {
      this._endDrag();
      this.closeSheet();
      return;
@@ -220,45 +166,6 @@ export class HaResizableBottomSheet extends LitElement {
    this._dialogViewportHeight = newSize;
  }

-  private _minViewportHeight(): number {
-    return this.minHeight === undefined
-      ? 20
-      : (this.minHeight / window.innerHeight) * 100;
-  }
-
-  protected updated(changedProperties: PropertyValues<this>) {
-    super.updated(changedProperties);
-    // A minimum set after opening applies right away
-    if (changedProperties.has("minHeight") && this._opened) {
-      this._applyMinViewportHeight();
-    }
-  }
-
-  // Applies the current pixel minimum as a viewport percentage and, once it has
-  // rendered, reports the size if it changed: raising the minimum can grow a
-  // sheet resting at the old one, and the host needs the new height to keep its
-  // overlay padding in step.
-  private _applyMinViewportHeight() {
-    if (!this._opened) {
-      return;
-    }
-    this._dialogMinViewpointHeight = this._minViewportHeight();
-    this.updateComplete.then(() => {
-      if (this._dialog.offsetHeight !== this._lastReportedHeight) {
-        this._fireResized();
-      }
-    });
-  }
-
-  private _lastReportedHeight?: number;
-
-  private _fireResized() {
-    this._lastReportedHeight = this._dialog.offsetHeight;
-    fireEvent(this, "bottom-sheet-resized", {
-      height: this._lastReportedHeight,
-    });
-  }
-
  private _handleMouseUp = () => {
    this._endDrag();
  };
@@ -273,8 +180,6 @@ export class HaResizableBottomSheet extends LitElement {
    }
    this._dragging = false;
    document.body.style.removeProperty("cursor");
-    // Hosts lay out around the sheet once, not on every move
-    this.updateComplete.then(() => this._fireResized());
  }

  static styles = css`
@@ -296,8 +201,7 @@ export class HaResizableBottomSheet extends LitElement {
      justify-content: center;
      align-items: center;
      z-index: 7;
-      /* Extends the grab area over the content below the handle */
-      padding-bottom: var(--ha-bottom-sheet-handle-padding, 76px);
+      padding-bottom: 76px;
    }
    .handle-wrapper .handle::after {
      content: "";
@@ -330,20 +234,8 @@ export class HaResizableBottomSheet extends LitElement {
      top: 0;
      inset-inline-start: 0;
      position: fixed;
-      --sheet-inset-left: var(
-        --ha-bottom-sheet-inset-left,
-        var(--safe-area-inset-left)
-      );
-      --sheet-inset-right: var(
-        --ha-bottom-sheet-inset-right,
-        var(--safe-area-inset-right)
-      );
-      --sheet-border-width: var(--ha-bottom-sheet-border-width, 0px);
-      --sheet-side-borders: calc(2 * var(--sheet-border-width));
      width: calc(
-        100% - var(--sheet-side-borders) - var(--sheet-inset-left) - var(
-            --sheet-inset-right
-          )
+        100% - 4px - var(--safe-area-inset-left) - var(--safe-area-inset-right)
      );
      max-width: 100%;
      border: none;
@@ -365,14 +257,14 @@ export class HaResizableBottomSheet extends LitElement {
      );
      transform: translateY(100%);
      transition: transform ${BOTTOM_SHEET_ANIMATION_DURATION_MS}ms ease;
-      border-top-width: var(--sheet-border-width);
-      border-right-width: var(--sheet-border-width);
-      border-left-width: var(--sheet-border-width);
+      border-top-width: var(--ha-bottom-sheet-border-width);
+      border-right-width: var(--ha-bottom-sheet-border-width);
+      border-left-width: var(--ha-bottom-sheet-border-width);
      border-bottom-width: 0;
      border-style: var(--ha-bottom-sheet-border-style);
      border-color: var(--ha-bottom-sheet-border-color);
-      margin-left: var(--sheet-inset-left);
-      margin-right: var(--sheet-inset-right);
+      margin-left: var(--safe-area-inset-left);
+      margin-right: var(--safe-area-inset-right);
    }

    dialog.show {
@@ -388,6 +280,5 @@ declare global {

  interface HASSDomEvents {
    "bottom-sheet-closed": undefined;
-    "bottom-sheet-resized": { height: number };
  }
 }
@@ -164,7 +164,9 @@ export class HaSelect extends LitElement {

  private _renderHelper() {
    return this.helper
-      ? html`<ha-input-helper-text>${this.helper}</ha-input-helper-text>`
+      ? html`<ha-input-helper-text .disabled=${this.disabled}
+          >${this.helper}</ha-input-helper-text
+        >`
      : nothing;
  }

@@ -72,7 +72,9 @@ export class HaSelectorAutomationBehavior extends LitElement {
      ></ha-select-box>
      ${
        this.helper
-          ? html`<ha-input-helper-text>${this.helper}</ha-input-helper-text>`
+          ? html`<ha-input-helper-text .disabled=${this.disabled}
+              >${this.helper}</ha-input-helper-text
+            >`
          : nothing
      }
    `;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aidan Timson	d95dea4911	Extract a reusable entity table	2026-09-08 08:33:37 +01:00
Aidan Timson	4032ead018	Fix entity filter selection races	2026-09-08 08:33:37 +01:00
@@ -1 +1 @@
 .21.0
 .20.0