Add form/code editor switch

.github/workflows/cast_deployment.yaml

@@ -21,12 +21,12 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.2.0
+        uses: actions/checkout@v4.1.7
         with:
           ref: dev
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.0.3
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -57,12 +57,12 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.2.0
+        uses: actions/checkout@v4.1.7
         with:
           ref: master
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.0.3
         with:
           node-version-file: ".nvmrc"
           cache: yarn

.github/workflows/ci.yaml

@@ -24,9 +24,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.2.0
+        uses: actions/checkout@v4.1.7
       - name: Setup Node
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.0.3
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -58,9 +58,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.2.0
+        uses: actions/checkout@v4.1.7
       - name: Setup Node
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.0.3
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -76,9 +76,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.2.0
+        uses: actions/checkout@v4.1.7
       - name: Setup Node
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.0.3
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -100,9 +100,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.2.0
+        uses: actions/checkout@v4.1.7
       - name: Setup Node
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.0.3
         with:
           node-version-file: ".nvmrc"
           cache: yarn

.github/workflows/codeql-analysis.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.2.0
+        uses: actions/checkout@v4.1.7
         with:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.

.github/workflows/demo_deployment.yaml

@@ -22,12 +22,12 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.2.0
+        uses: actions/checkout@v4.1.7
         with:
           ref: dev
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.0.3
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -58,12 +58,12 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.2.0
+        uses: actions/checkout@v4.1.7
         with:
           ref: master
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.0.3
         with:
           node-version-file: ".nvmrc"
           cache: yarn

.github/workflows/design_deployment.yaml

@@ -16,10 +16,10 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.2.0
+        uses: actions/checkout@v4.1.7
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.0.3
         with:
           node-version-file: ".nvmrc"
           cache: yarn

.github/workflows/design_preview.yaml

@@ -21,10 +21,10 @@ jobs:
     if: github.repository == 'home-assistant/frontend' && contains(github.event.pull_request.labels.*.name, 'needs design preview')
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.2.0
+        uses: actions/checkout@v4.1.7
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.0.3
         with:
           node-version-file: ".nvmrc"
           cache: yarn

.github/workflows/nightly.yaml

@@ -20,7 +20,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.0
+        uses: actions/checkout@v4.1.7
 
       - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: actions/setup-python@v5
@@ -28,7 +28,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.0.3
         with:
           node-version-file: ".nvmrc"
           cache: yarn

.github/workflows/release.yaml

@@ -23,7 +23,7 @@ jobs:
       contents: write # Required to upload release assets
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.0
+        uses: actions/checkout@v4.1.7
 
       - name: Verify version
         uses: home-assistant/actions/helpers/verify-version@master
@@ -34,7 +34,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.0.3
         with:
           node-version-file: ".nvmrc"
           cache: yarn

.github/workflows/translations.yaml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.0
+        uses: actions/checkout@v4.1.7
 
       - name: Upload Translations
         run: |

.yarnrc.yml

@@ -6,4 +6,4 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.5.0.cjs
+yarnPath: .yarn/releases/yarn-4.4.1.cjs

README.md

@@ -27,5 +27,3 @@ A complete guide can be found at the following [link](https://www.home-assistant
 Home Assistant is open-source and Apache 2 licensed. Feel free to browse the repository, learn and reuse parts in your own projects.
 
 We use [BrowserStack](https://www.browserstack.com) to test Home Assistant on a large variety of devices.
-
-[![Home Assistant - A project from the Open Home Foundation](https://www.openhomefoundation.org/badges/home-assistant.png)](https://www.openhomefoundation.org/)

build-scripts/gulp/gather-static.js

@@ -60,12 +60,6 @@ function copyPolyfills(staticDir) {
     npmPath("@webcomponents/webcomponentsjs/webcomponents-bundle.js.map"),
     staticPath("polyfills/")
   );
-
-  // dialog-polyfill css
-  copyFileDir(
-    npmPath("dialog-polyfill/dialog-polyfill.css"),
-    staticPath("polyfills/")
-  );
 }
 
 function copyLoaderJS(staticDir) {

cast/src/html/faq.html.template

@@ -139,7 +139,7 @@
         </p>
       </div>
 
-      <div class="section-header">What does Home Assistant Cast do?</div>
+      <div class="section-header">Wat does Home Assistant Cast do?</div>
       <div class="card-content">
         <p>
           Home Assistant Cast is a receiver application for the Chromecast. When

cast/src/receiver/layout/hc-main.ts

@@ -36,7 +36,6 @@ import { HassElement } from "../../../../src/state/hass-element";
 import { castContext } from "../cast_context";
 import "./hc-launch-screen";
 import { getPanelTitleFromUrlPath } from "../../../../src/data/panel";
-import { checkLovelaceConfig } from "../../../../src/panels/lovelace/common/check-lovelace-config";
 
 const DEFAULT_CONFIG: LovelaceDashboardStrategyConfig = {
   strategy: {
@@ -366,9 +365,7 @@ export class HcMain extends HassElement {
       this._urlPath || "lovelace"
     );
     castContext.setApplicationState(title || "");
-    this._lovelaceConfig = checkLovelaceConfig(
+    this._lovelaceConfig = lovelaceConfig;
-      lovelaceConfig
-    ) as LovelaceConfig;
   }
 
   private _handleShowDemo(_msg: ShowDemoMessage) {

demo/src/configs/sections/entities.ts

@@ -111,37 +111,9 @@ export const demoEntitiesSections: DemoConfig["entities"] = (localize) =>
         friendly_name: "Living room Temperature",
       },
     },
-    "sensor.outdoor_temperature": {
-      entity_id: "sensor.outdoor_temperature",
-      state: "10.5",
-      attributes: {
-        state_class: "measurement",
-        unit_of_measurement: "°C",
-        device_class: "temperature",
-        friendly_name: "Outdoor temperature",
-      },
-    },
-    "sensor.outdoor_humidity": {
-      entity_id: "sensor.outdoor_humidity",
-      state: "70.4",
-      attributes: {
-        state_class: "measurement",
-        unit_of_measurement: "%",
-        device_class: "humidity",
-        friendly_name: "Outdoor humidity",
-      },
-    },
-    "device_tracker.car": {
-      entity_id: "sensor.outdoor_humidity",
-      state: "not_home",
-      attributes: {
-        friendly_name: "Car",
-        icon: "mdi:car",
-      },
-    },
     "media_player.living_room_nest_mini": {
       entity_id: "media_player.living_room_nest_mini",
-      state: "playing",
+      state: "on",
       attributes: {
         device_class: "speaker",
         volume_level: 0.18,

demo/src/configs/sections/lovelace.ts

@@ -9,22 +9,6 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = (localize) => ({
       title: isFrontpageEmbed ? "Home Assistant" : "Demo",
       path: "home",
       icon: "mdi:home-assistant",
-      badges: [
-        {
-          type: "entity",
-          entity: "sensor.outdoor_temperature",
-          color: "red",
-        },
-        {
-          type: "entity",
-          entity: "sensor.outdoor_humidity",
-          color: "indigo",
-        },
-        {
-          type: "entity",
-          entity: "device_tracker.car",
-        },
-      ],
       sections: [
         ...(isFrontpageEmbed
           ? []

demo/src/stubs/config.ts

@@ -1,9 +0,0 @@
-import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
-
-export const mockConfig = (hass: MockHomeAssistant) => {
-  hass.mockWS("validate_config", () => ({
-    actions: { valid: true },
-    conditions: { valid: true },
-    triggers: { valid: true },
-  }));
-};

demo/src/stubs/tags.ts

@@ -1,6 +0,0 @@
-import { Tag } from "../../../src/data/tag";
-import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
-
-export const mockTags = (hass: MockHomeAssistant) => {
-  hass.mockWS("tag/list", () => [{ id: "my-tag", name: "My Tag" }] as Tag[]);
-};

gallery/src/data/traces/basic_trace.ts

@@ -217,22 +217,22 @@ export const basicTrace: DemoTrace = {
       id: "1615419646544",
       alias: "Ensure Party mode",
       description: "",
-      triggers: [
+      trigger: [
         {
-          trigger: "state",
+          platform: "state",
           entity_id: "input_boolean.toggle_1",
         },
       ],
-      conditions: [
+      condition: [
         {
           condition: "template",
           alias: "Test if Paulus is home",
           value_template: "{{ true }}",
         },
       ],
-      actions: [
+      action: [
         {
-          action: "input_boolean.toggle",
+          service: "input_boolean.toggle",
           target: {
             entity_id: "input_boolean.toggle_4",
           },
@@ -268,7 +268,7 @@ export const basicTrace: DemoTrace = {
           ],
           default: [
             {
-              action: "input_boolean.toggle",
+              service: "input_boolean.toggle",
               alias: "Toggle 2",
               target: {
                 entity_id: "input_boolean.toggle_2",
@@ -277,7 +277,7 @@ export const basicTrace: DemoTrace = {
           ],
         },
         {
-          action: "input_boolean.toggle",
+          service: "input_boolean.toggle",
           target: {
             entity_id: "input_boolean.toggle_4",
           },

gallery/src/data/traces/mock-demo-trace.ts

@@ -31,8 +31,8 @@ export const mockDemoTrace = (
       ],
     },
     config: {
-      triggers: [],
+      trigger: [],
-      actions: [],
+      action: [],
     },
     context: {
       id: "abcd",

gallery/src/data/traces/motion-light-trace.ts

@@ -133,17 +133,17 @@ export const motionLightTrace: DemoTrace = {
     config: {
       mode: "restart",
       max_exceeded: "silent",
-      triggers: [
+      trigger: [
         {
-          trigger: "state",
+          platform: "state",
           entity_id: "binary_sensor.pauluss_macbook_pro_camera_in_use",
           from: "off",
           to: "on",
         },
       ],
-      actions: [
+      action: [
         {
-          action: "light.turn_on",
+          service: "light.turn_on",
           target: {
             entity_id: "light.elgato_key_light_air",
           },
@@ -162,7 +162,7 @@ export const motionLightTrace: DemoTrace = {
           delay: 0,
         },
         {
-          action: "light.turn_off",
+          service: "light.turn_off",
           target: {
             entity_id: "light.elgato_key_light_air",
           },

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

@@ -48,7 +48,7 @@ const ACTIONS = [
   {
     wait_for_trigger: [
       {
-        trigger: "state",
+        platform: "state",
         entity_id: "input_boolean.toggle_1",
       },
     ],
@@ -121,7 +121,7 @@ const ACTIONS = [
 ];
 
 const initialAction: Action = {
-  action: "light.turn_on",
+  service: "light.turn_on",
   target: {
     entity_id: "light.kitchen",
   },
@@ -142,7 +142,7 @@ export class DemoAutomationDescribeAction extends LitElement {
         <div class="action">
           <span>
             ${this._action
-              ? describeAction(this.hass, [], [], this._action)
+              ? describeAction(this.hass, [], [], [], this._action)
               : "<invalid YAML>"}
           </span>
           <ha-yaml-editor
@@ -155,7 +155,7 @@ export class DemoAutomationDescribeAction extends LitElement {
         ${ACTIONS.map(
           (conf) => html`
             <div class="action">
-              <span>${describeAction(this.hass, [], [], conf as any)}</span>
+              <span>${describeAction(this.hass, [], [], [], conf as any)}</span>
               <pre>${dump(conf)}</pre>
             </div>
           `

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

@@ -22,52 +22,46 @@ const ENTITIES = [
 ];
 
 const triggers = [
-  { trigger: "state", entity_id: "light.kitchen", from: "off", to: "on" },
+  { platform: "state", entity_id: "light.kitchen", from: "off", to: "on" },
-  { trigger: "mqtt" },
+  { platform: "mqtt" },
   {
-    trigger: "geo_location",
+    platform: "geo_location",
     source: "test_source",
     zone: "zone.home",
     event: "enter",
   },
-  { trigger: "homeassistant", event: "start" },
+  { platform: "homeassistant", event: "start" },
   {
-    trigger: "numeric_state",
+    platform: "numeric_state",
     entity_id: "light.kitchen",
     attribute: "brightness",
     below: 80,
     above: 20,
   },
-  { trigger: "sun", event: "sunset" },
+  { platform: "sun", event: "sunset" },
-  { trigger: "time_pattern" },
+  { platform: "time_pattern" },
-  { trigger: "time_pattern", hours: "*", minutes: "/5", seconds: "10" },
+  { platform: "time_pattern", hours: "*", minutes: "/5", seconds: "10" },
-  { trigger: "webhook" },
+  { platform: "webhook" },
-  { trigger: "persistent_notification" },
+  { platform: "persistent_notification" },
   {
-    trigger: "zone",
+    platform: "zone",
     entity_id: "person.person",
     zone: "zone.home",
     event: "enter",
   },
-  { trigger: "tag" },
+  { platform: "tag" },
-  { trigger: "time", at: "15:32" },
+  { platform: "time", at: "15:32" },
-  { trigger: "template" },
+  { platform: "template" },
-  { trigger: "conversation", command: "Turn on the lights" },
+  { platform: "conversation", command: "Turn on the lights" },
   {
-    trigger: "conversation",
+    platform: "conversation",
     command: ["Turn on the lights", "Turn the lights on"],
   },
-  { trigger: "event", event_type: "homeassistant_started" },
+  { platform: "event", event_type: "homeassistant_started" },
-  {
-    triggers: [
-      { trigger: "state", entity_id: "light.kitchen", to: "on" },
-      { trigger: "state", entity_id: "light.kitchen", to: "off" },
-    ],
-  },
 ];
 
 const initialTrigger: Trigger = {
-  trigger: "state",
+  platform: "state",
   entity_id: "light.kitchen",
 };
 

gallery/src/pages/automation/editor-trigger.ts

@@ -8,9 +8,6 @@ import { mockEntityRegistry } from "../../../../demo/src/stubs/entity_registry";
 import { mockDeviceRegistry } from "../../../../demo/src/stubs/device_registry";
 import { mockAreaRegistry } from "../../../../demo/src/stubs/area_registry";
 import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
-import { mockConfig } from "../../../../demo/src/stubs/config";
-import { mockTags } from "../../../../demo/src/stubs/tags";
-import { mockAuth } from "../../../../demo/src/stubs/auth";
 import type { Trigger } from "../../../../src/data/automation";
 import { HaGeolocationTrigger } from "../../../../src/panels/config/automation/trigger/types/ha-automation-trigger-geo_location";
 import { HaEventTrigger } from "../../../../src/panels/config/automation/trigger/types/ha-automation-trigger-event";
@@ -29,7 +26,6 @@ import { HaStateTrigger } from "../../../../src/panels/config/automation/trigger
 import { HaMQTTTrigger } from "../../../../src/panels/config/automation/trigger/types/ha-automation-trigger-mqtt";
 import "../../../../src/panels/config/automation/trigger/ha-automation-trigger";
 import { HaConversationTrigger } from "../../../../src/panels/config/automation/trigger/types/ha-automation-trigger-conversation";
-import { HaTriggerList } from "../../../../src/panels/config/automation/trigger/types/ha-automation-trigger-list";
 
 const SCHEMAS: { name: string; triggers: Trigger[] }[] = [
   {
@@ -115,15 +111,11 @@ const SCHEMAS: { name: string; triggers: Trigger[] }[] = [
     triggers: [
       { ...HaConversationTrigger.defaultConfig },
       {
-        trigger: "conversation",
+        platform: "conversation",
         command: ["Turn on the lights", "Turn the lights on"],
       },
     ],
   },
-  {
-    name: "Trigger list",
-    triggers: [{ ...HaTriggerList.defaultConfig }],
-  },
 ];
 
 @customElement("demo-automation-editor-trigger")
@@ -143,9 +135,6 @@ export class DemoAutomationEditorTrigger extends LitElement {
     mockDeviceRegistry(hass);
     mockAreaRegistry(hass);
     mockHassioSupervisor(hass);
-    mockConfig(hass);
-    mockTags(hass);
-    mockAuth(hass);
   }
 
   protected render(): TemplateResult {

hassio/src/components/supervisor-backup-content.ts

@@ -15,7 +15,6 @@ import { LocalizeFunc } from "../../../src/common/translations/localize";
 import "../../../src/components/ha-checkbox";
 import "../../../src/components/ha-formfield";
 import "../../../src/components/ha-textfield";
-import "../../../src/components/ha-password-field";
 import "../../../src/components/ha-radio";
 import type { HaRadio } from "../../../src/components/ha-radio";
 import {
@@ -262,21 +261,23 @@ export class SupervisorBackupContent extends LitElement {
         : ""}
       ${this.backupHasPassword
         ? html`
-            <ha-password-field
+            <ha-textfield
               .label=${this._localize("password")}
+              type="password"
               name="backupPassword"
               .value=${this.backupPassword}
               @change=${this._handleTextValueChanged}
             >
-            </ha-password-field>
+            </ha-textfield>
             ${!this.backup
-              ? html`<ha-password-field
+              ? html`<ha-textfield
                   .label=${this._localize("confirm_password")}
+                  type="password"
                   name="confirmBackupPassword"
                   .value=${this.confirmBackupPassword}
                   @change=${this._handleTextValueChanged}
                 >
-                </ha-password-field>`
+                </ha-textfield>`
               : ""}
           `
         : ""}

hassio/src/dialogs/network/dialog-hassio-network.ts

@@ -13,12 +13,10 @@ import "../../../../src/components/ha-circular-progress";
 import "../../../../src/components/ha-dialog";
 import "../../../../src/components/ha-expansion-panel";
 import "../../../../src/components/ha-formfield";
+import "../../../../src/components/ha-textfield";
 import "../../../../src/components/ha-header-bar";
 import "../../../../src/components/ha-icon-button";
-import "../../../../src/components/ha-password-field";
 import "../../../../src/components/ha-radio";
-import "../../../../src/components/ha-textfield";
-import type { HaTextField } from "../../../../src/components/ha-textfield";
 import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
 import {
   AccessPoints,
@@ -36,6 +34,7 @@ import { HassDialog } from "../../../../src/dialogs/make-dialog-manager";
 import { haStyleDialog } from "../../../../src/resources/styles";
 import type { HomeAssistant } from "../../../../src/types";
 import { HassioNetworkDialogParams } from "./show-dialog-network";
+import type { HaTextField } from "../../../../src/components/ha-textfield";
 
 const IP_VERSIONS = ["ipv4", "ipv6"];
 
@@ -247,8 +246,9 @@ export class DialogHassioNetwork
                       ${this._wifiConfiguration.auth === "wpa-psk" ||
                       this._wifiConfiguration.auth === "wep"
                         ? html`
-                            <ha-password-field
+                            <ha-textfield
                               class="flex-auto"
+                              type="password"
                               id="psk"
                               .label=${this.supervisor.localize(
                                 "dialog.network.wifi_password"
@@ -256,7 +256,7 @@ export class DialogHassioNetwork
                               version="wifi"
                               @change=${this._handleInputValueChangedWifi}
                             >
-                            </ha-password-field>
+                            </ha-textfield>
                           `
                         : ""}
                     `

hassio/src/dialogs/repositories/dialog-hassio-repositories.ts

@@ -25,8 +25,8 @@ import type { HomeAssistant } from "../../../../src/types";
 import { HassioRepositoryDialogParams } from "./show-dialog-repositories";
 import type { HaTextField } from "../../../../src/components/ha-textfield";
 import "../../../../src/components/ha-textfield";
-import "../../../../src/components/ha-md-list";
+import "../../../../src/components/ha-list-new";
-import "../../../../src/components/ha-md-list-item";
+import "../../../../src/components/ha-list-item-new";
 
 @customElement("dialog-hassio-repositories")
 class HassioRepositoriesDialog extends LitElement {
@@ -107,11 +107,11 @@ class HassioRepositoriesDialog extends LitElement {
           ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
           : ""}
         <div class="form">
-          <ha-md-list>
+          <ha-list-new>
             ${repositories.length
               ? repositories.map(
                   (repo) => html`
-                    <ha-md-list-item class="option">
+                    <ha-list-item-new class="option">
                       ${repo.name}
                       <div slot="supporting-text">
                         <div>${repo.maintainer}</div>
@@ -142,11 +142,11 @@ class HassioRepositoriesDialog extends LitElement {
                           )}
                         </simple-tooltip>
                       </div>
-                    </ha-md-list-item>
+                    </ha-list-item-new>
                   `
                 )
-              : html`<ha-md-list-item> No repositories </ha-md-list-item>`}
+              : html`<ha-list-item-new> No repositories </ha-list-item-new>`}
-          </ha-md-list>
+          </ha-list-new>
           <div class="layout horizontal bottom">
             <ha-textfield
               class="flex-auto"
@@ -209,7 +209,7 @@ class HassioRepositoriesDialog extends LitElement {
         div.delete ha-icon-button {
           color: var(--error-color);
         }
-        ha-md-list-item {
+        ha-list-item-new {
           position: relative;
         }
       `,

package.json

@@ -27,13 +27,13 @@
   "dependencies": {
     "@babel/runtime": "7.25.6",
     "@braintree/sanitize-url": "7.1.0",
-    "@codemirror/autocomplete": "6.18.1",
+    "@codemirror/autocomplete": "6.18.0",
-    "@codemirror/commands": "6.6.2",
+    "@codemirror/commands": "6.6.1",
-    "@codemirror/language": "6.10.3",
+    "@codemirror/language": "6.10.2",
     "@codemirror/legacy-modes": "6.4.1",
     "@codemirror/search": "6.5.6",
     "@codemirror/state": "6.4.1",
-    "@codemirror/view": "6.34.1",
+    "@codemirror/view": "6.33.0",
     "@egjs/hammerjs": "2.0.17",
     "@formatjs/intl-datetimeformat": "6.12.5",
     "@formatjs/intl-displaynames": "6.6.8",
@@ -80,17 +80,16 @@
     "@material/mwc-top-app-bar": "0.27.0",
     "@material/mwc-top-app-bar-fixed": "0.27.0",
     "@material/top-app-bar": "=14.0.0-canary.53b3cad2f.0",
-    "@material/web": "2.2.0",
+    "@material/web": "2.1.0",
     "@mdi/js": "7.4.47",
     "@mdi/svg": "7.4.47",
     "@polymer/paper-item": "3.0.1",
     "@polymer/paper-listbox": "3.0.1",
     "@polymer/paper-tabs": "3.1.0",
     "@polymer/polymer": "3.5.1",
-    "@replit/codemirror-indentation-markers": "6.5.3",
     "@thomasloven/round-slider": "0.6.0",
-    "@vaadin/combo-box": "24.4.10",
+    "@vaadin/combo-box": "24.4.7",
-    "@vaadin/vaadin-themable-mixin": "24.4.10",
+    "@vaadin/vaadin-themable-mixin": "24.4.7",
     "@vibrant/color": "3.2.1-alpha.1",
     "@vibrant/core": "3.2.1-alpha.1",
     "@vibrant/quantizer-mmcq": "3.2.1-alpha.1",
@@ -103,11 +102,10 @@
     "comlink": "4.4.1",
     "core-js": "3.38.1",
     "cropperjs": "1.6.2",
-    "date-fns": "4.1.0",
+    "date-fns": "3.6.0",
     "date-fns-tz": "3.1.3",
     "deep-clone-simple": "1.1.1",
     "deep-freeze": "0.0.1",
-    "dialog-polyfill": "0.5.6",
     "element-internals-polyfill": "1.3.11",
     "fuse.js": "7.0.0",
     "google-timezones-json": "1.2.0",
@@ -117,10 +115,10 @@
     "intl-messageformat": "10.5.14",
     "js-yaml": "4.1.0",
     "leaflet": "1.9.4",
-    "leaflet-draw": "patch:leaflet-draw@npm%3A1.0.4#./.yarn/patches/leaflet-draw-npm-1.0.4-0ca0ebcf65.patch",
+    "leaflet-draw": "1.0.4",
     "lit": "2.8.0",
     "luxon": "3.5.0",
-    "marked": "14.1.2",
+    "marked": "14.1.1",
     "memoize-one": "6.0.0",
     "node-vibrant": "3.2.1-alpha.1",
     "proxy-polyfill": "0.3.2",
@@ -129,13 +127,13 @@
     "qrcode": "1.5.4",
     "roboto-fontface": "0.10.0",
     "rrule": "2.8.1",
-    "sortablejs": "patch:sortablejs@npm%3A1.15.3#~/.yarn/patches/sortablejs-npm-1.15.3-3235a8f83b.patch",
+    "sortablejs": "1.15.3",
     "stacktrace-js": "2.0.2",
     "superstruct": "2.0.2",
     "tinykeys": "3.0.0",
     "tsparticles-engine": "2.12.0",
     "tsparticles-preset-links": "2.12.0",
-    "ua-parser-js": "1.0.39",
+    "ua-parser-js": "1.0.38",
     "unfetch": "5.0.0",
     "vis-data": "7.1.9",
     "vis-network": "9.1.9",
@@ -157,22 +155,22 @@
     "@babel/plugin-transform-runtime": "7.25.4",
     "@babel/preset-env": "7.25.4",
     "@babel/preset-typescript": "7.24.7",
-    "@bundle-stats/plugin-webpack-filter": "4.15.1",
+    "@bundle-stats/plugin-webpack-filter": "4.15.0",
     "@koa/cors": "5.0.0",
     "@lokalise/node-api": "12.7.0",
     "@octokit/auth-oauth-device": "7.1.1",
-    "@octokit/plugin-retry": "7.1.2",
+    "@octokit/plugin-retry": "7.1.1",
     "@octokit/rest": "21.0.2",
     "@open-wc/dev-server-hmr": "0.1.4",
     "@rollup/plugin-babel": "6.0.4",
     "@rollup/plugin-commonjs": "26.0.1",
     "@rollup/plugin-json": "6.1.0",
-    "@rollup/plugin-node-resolve": "15.2.4",
+    "@rollup/plugin-node-resolve": "15.2.3",
     "@rollup/plugin-replace": "5.0.7",
     "@types/babel__plugin-transform-runtime": "7.9.5",
     "@types/chromecast-caf-receiver": "6.0.17",
     "@types/chromecast-caf-sender": "1.0.10",
-    "@types/color-name": "2.0.0",
+    "@types/color-name": "1.1.4",
     "@types/glob": "8.1.0",
     "@types/html-minifier-terser": "7.0.2",
     "@types/js-yaml": "4.0.9",
@@ -191,20 +189,20 @@
     "@typescript-eslint/parser": "7.18.0",
     "@web/dev-server": "0.1.38",
     "@web/dev-server-rollup": "0.4.1",
-    "babel-loader": "9.2.1",
+    "babel-loader": "9.1.3",
     "babel-plugin-template-html-minifier": "4.1.0",
     "browserslist-useragent-regexp": "4.1.3",
     "chai": "5.1.1",
     "del": "7.1.0",
-    "eslint": "8.57.1",
+    "eslint": "8.57.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-airbnb-typescript": "18.0.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-import-resolver-webpack": "0.13.9",
     "eslint-plugin-import": "2.30.0",
-    "eslint-plugin-lit": "1.15.0",
+    "eslint-plugin-lit": "1.14.0",
     "eslint-plugin-lit-a11y": "4.1.4",
-    "eslint-plugin-unused-imports": "4.1.4",
+    "eslint-plugin-unused-imports": "4.1.3",
     "eslint-plugin-wc": "2.1.1",
     "fancy-log": "2.0.0",
     "fs-extra": "11.2.0",
@@ -215,7 +213,7 @@
     "gulp-rename": "2.0.0",
     "gulp-zopfli-green": "6.0.2",
     "html-minifier-terser": "7.2.0",
-    "husky": "9.1.6",
+    "husky": "9.1.5",
     "instant-mocha": "1.5.2",
     "jszip": "3.10.1",
     "lint-staged": "15.2.10",
@@ -229,19 +227,19 @@
     "open": "10.1.0",
     "pinst": "3.0.0",
     "prettier": "3.3.3",
-    "rollup": "2.79.2",
+    "rollup": "2.79.1",
     "rollup-plugin-string": "3.0.0",
     "rollup-plugin-terser": "7.0.2",
     "rollup-plugin-visualizer": "5.12.0",
     "serve-handler": "6.1.5",
-    "sinon": "19.0.2",
+    "sinon": "18.0.0",
     "systemjs": "6.15.1",
     "tar": "7.4.3",
     "terser-webpack-plugin": "5.3.10",
     "transform-async-modules-webpack-plugin": "1.1.1",
     "ts-lit-plugin": "2.0.2",
-    "typescript": "5.6.2",
+    "typescript": "5.5.4",
-    "webpack": "5.95.0",
+    "webpack": "5.94.0",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.1.0",
     "webpack-manifest-plugin": "5.0.0",
@@ -256,7 +254,9 @@
     "lit": "2.8.0",
     "clean-css": "5.3.3",
     "@lit/reactive-element": "1.6.3",
-    "@fullcalendar/daygrid": "6.1.15"
+    "@fullcalendar/daygrid": "6.1.15",
+    "sortablejs@1.15.3": "patch:sortablejs@npm%3A1.15.3#~/.yarn/patches/sortablejs-npm-1.15.3-3235a8f83b.patch",
+    "leaflet-draw@1.0.4": "patch:leaflet-draw@npm%3A1.0.4#./.yarn/patches/leaflet-draw-npm-1.0.4-0ca0ebcf65.patch"
   },
-  "packageManager": "yarn@4.5.0"
+  "packageManager": "yarn@4.4.1"
 }

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name         = "home-assistant-frontend"
-version      = "20241002.1"
+version      = "20240909.1"
 license      = {text = "Apache-2.0"}
 description  = "The Home Assistant frontend"
 readme       = "README.md"

src/common/color/colors.ts

@@ -1,36 +1,36 @@
 import { theme2hex } from "./convert-color";
 
 export const COLORS = [
-  "#4269d0",
+  "#44739e",
-  "#f4bd4a",
+  "#984ea3",
-  "#ff725c",
+  "#00d2d5",
-  "#6cc5b0",
+  "#ff7f00",
-  "#a463f2",
+  "#af8d00",
-  "#ff8ab7",
+  "#7f80cd",
-  "#9c6b4e",
+  "#b3e900",
-  "#97bbf5",
+  "#c42e60",
-  "#01ab63",
+  "#a65628",
-  "#9498a0",
+  "#f781bf",
-  "#094bad",
+  "#8dd3c7",
-  "#c99000",
+  "#bebada",
-  "#d84f3e",
+  "#fb8072",
-  "#49a28f",
+  "#80b1d3",
-  "#048732",
+  "#fdb462",
-  "#d96895",
+  "#fccde5",
-  "#8043ce",
+  "#bc80bd",
-  "#7599d1",
+  "#ffed6f",
-  "#7a4c31",
+  "#c4eaff",
-  "#74787f",
+  "#cf8c00",
-  "#6989f4",
+  "#1b9e77",
-  "#ffd444",
+  "#d95f02",
-  "#ff957c",
+  "#e7298a",
-  "#8fe9d3",
+  "#e6ab02",
-  "#62cc71",
+  "#a6761d",
-  "#ffadda",
+  "#0097ff",
-  "#c884ff",
+  "#00d067",
-  "#badeff",
+  "#f43600",
-  "#bf8b6d",
+  "#4ba93b",
-  "#b6bac2",
+  "#5779bb",
   "#927acc",
   "#97ee3f",
   "#bf3947",

src/common/const.ts

@@ -234,12 +234,7 @@ export const SENSOR_ENTITIES = [
   "weather",
 ];
 
-export const ASSIST_ENTITIES = [
+export const ASSIST_ENTITIES = ["conversation", "stt", "tts"];
-  "assist_satellite",
-  "conversation",
-  "stt",
-  "tts",
-];
 
 /** Domains that render an input element instead of a text value when displayed in a row.
  *  Those rows should then not show a cursor pointer when hovered (which would normally

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

@@ -204,29 +204,6 @@ export class HaDataTable extends LitElement {
     this._checkedRowsChanged();
   }
 
-  public select(ids: string[], clear?: boolean): void {
-    if (clear) {
-      this._checkedRows = [];
-    }
-    ids.forEach((id) => {
-      const row = this._filteredData.find((data) => data[this.id] === id);
-      if (row?.selectable !== false && !this._checkedRows.includes(id)) {
-        this._checkedRows.push(id);
-      }
-    });
-    this._checkedRowsChanged();
-  }
-
-  public unselect(ids: string[]): void {
-    ids.forEach((id) => {
-      const index = this._checkedRows.indexOf(id);
-      if (index > -1) {
-        this._checkedRows.splice(index, 1);
-      }
-    });
-    this._checkedRowsChanged();
-  }
-
   public connectedCallback() {
     super.connectedCallback();
     if (this._filteredData.length) {
@@ -1034,7 +1011,6 @@ export class HaDataTable extends LitElement {
           /* @noflip */
           padding-inline-end: initial;
           width: 60px;
-          min-width: 60px;
         }
 
         .mdc-data-table__table {

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

@@ -26,7 +26,7 @@ class HaDeviceTriggerPicker extends HaDeviceAutomationPicker<DeviceTrigger> {
       fetchDeviceTriggers,
       (deviceId?: string) => ({
         device_id: deviceId || "",
-        trigger: "device",
+        platform: "device",
         domain: "",
         entity_id: "",
       })

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

@@ -1,9 +1,10 @@
+import type { HassEntity } from "home-assistant-js-websocket";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
 import { isValidEntityId } from "../../common/entity/valid_entity_id";
-import type { HomeAssistant, ValueChangedEvent } from "../../types";
+import type { ValueChangedEvent, HomeAssistant } from "../../types";
 import "./ha-entity-picker";
 import type { HaEntityPickerEntityFilterFunc } from "./ha-entity-picker";
 
@@ -97,7 +98,10 @@ class HaEntitiesPickerLight extends LitElement {
               .excludeEntities=${this.excludeEntities}
               .includeDeviceClasses=${this.includeDeviceClasses}
               .includeUnitOfMeasurement=${this.includeUnitOfMeasurement}
-              .entityFilter=${this.entityFilter}
+              .entityFilter=${this._getEntityFilter(
+                this.value,
+                this.entityFilter
+              )}
               .value=${entityId}
               .label=${this.pickedEntityLabel}
               .disabled=${this.disabled}
@@ -114,13 +118,10 @@ class HaEntitiesPickerLight extends LitElement {
           .includeDomains=${this.includeDomains}
           .excludeDomains=${this.excludeDomains}
           .includeEntities=${this.includeEntities}
-          .excludeEntities=${this._excludeEntities(
+          .excludeEntities=${this.excludeEntities}
-            this.value,
-            this.excludeEntities
-          )}
           .includeDeviceClasses=${this.includeDeviceClasses}
           .includeUnitOfMeasurement=${this.includeUnitOfMeasurement}
-          .entityFilter=${this.entityFilter}
+          .entityFilter=${this._getEntityFilter(this.value, this.entityFilter)}
           .label=${this.pickEntityLabel}
           .helper=${this.helper}
           .disabled=${this.disabled}
@@ -132,16 +133,14 @@ class HaEntitiesPickerLight extends LitElement {
     `;
   }
 
-  private _excludeEntities = memoizeOne(
+  private _getEntityFilter = memoizeOne(
     (
       value: string[] | undefined,
-      excludeEntities: string[] | undefined
+      entityFilter: HaEntityPickerEntityFilterFunc | undefined
-    ): string[] | undefined => {
+    ): HaEntityPickerEntityFilterFunc =>
-      if (value === undefined) {
+      (stateObj: HassEntity) =>
-        return excludeEntities;
+        (!value || !value.includes(stateObj.entity_id)) &&
-      }
+        (!entityFilter || entityFilter(stateObj))
-      return [...(excludeEntities || []), ...value];
-    }
   );
 
   private get _currentEntities() {

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

@@ -87,7 +87,7 @@ export class HaEntityPicker extends LitElement {
   public includeUnitOfMeasurement?: string[];
 
   /**
-   * List of allowed entities to show.
+   * List of allowed entities to show. Will ignore all other filters.
    * @type {Array}
    * @attr include-entities
    */
@@ -220,13 +220,30 @@ export class HaEntityPicker extends LitElement {
 
       if (includeEntities) {
         entityIds = entityIds.filter((entityId) =>
-          includeEntities.includes(entityId)
+          this.includeEntities!.includes(entityId)
+        );
+
+        return entityIds
+          .map((key) => {
+            const friendly_name = computeStateName(hass!.states[key]) || key;
+            return {
+              ...hass!.states[key],
+              friendly_name,
+              strings: [key, friendly_name],
+            };
+          })
+          .sort((entityA, entityB) =>
+            caseInsensitiveStringCompare(
+              entityA.friendly_name,
+              entityB.friendly_name,
+              this.hass.locale.language
+            )
           );
       }
 
       if (excludeEntities) {
         entityIds = entityIds.filter(
-          (entityId) => !excludeEntities.includes(entityId)
+          (entityId) => !excludeEntities!.includes(entityId)
         );
       }
 

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

@@ -173,7 +173,6 @@ class HaEntityStatePicker extends LitElement {
               no-style
               @item-moved=${this._moveItem}
               .disabled=${this.disabled}
-              filter="button.trailing.action"
             >
               <ha-chip-set>
                 ${repeat(

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

@@ -1,6 +1,6 @@
 import { mdiTextureBox } from "@mdi/js";
 import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
-import { HassEntity } from "home-assistant-js-websocket";
+import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
 import { LitElement, PropertyValues, TemplateResult, html, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { styleMap } from "lit/directives/style-map";
@@ -20,7 +20,12 @@ import {
   getDeviceEntityDisplayLookup,
 } from "../data/device_registry";
 import { EntityRegistryDisplayEntry } from "../data/entity_registry";
-import { FloorRegistryEntry, getFloorAreaLookup } from "../data/floor_registry";
+import {
+  FloorRegistryEntry,
+  getFloorAreaLookup,
+  subscribeFloorRegistry,
+} from "../data/floor_registry";
+import { SubscribeMixin } from "../mixins/subscribe-mixin";
 import { HomeAssistant, ValueChangedEvent } from "../types";
 import type { HaDevicePickerDeviceFilterFunc } from "./device/ha-device-picker";
 import "./ha-combo-box";
@@ -45,7 +50,7 @@ interface FloorAreaEntry {
 }
 
 @customElement("ha-area-floor-picker")
-export class HaAreaFloorPicker extends LitElement {
+export class HaAreaFloorPicker extends SubscribeMixin(LitElement) {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property() public label?: string;
@@ -106,12 +111,22 @@ export class HaAreaFloorPicker extends LitElement {
 
   @property({ type: Boolean }) public required = false;
 
+  @state() private _floors?: FloorRegistryEntry[];
+
   @state() private _opened?: boolean;
 
   @query("ha-combo-box", true) public comboBox!: HaComboBox;
 
   private _init = false;
 
+  protected hassSubscribe(): (UnsubscribeFunc | Promise<UnsubscribeFunc>)[] {
+    return [
+      subscribeFloorRegistry(this.hass.connection, (floors) => {
+        this._floors = floors;
+      }),
+    ];
+  }
+
   public async open() {
     await this.updateComplete;
     await this.comboBox?.open();
@@ -416,12 +431,12 @@ export class HaAreaFloorPicker extends LitElement {
 
   protected updated(changedProps: PropertyValues) {
     if (
-      (!this._init && this.hass) ||
+      (!this._init && this.hass && this._floors) ||
       (this._init && changedProps.has("_opened") && this._opened)
     ) {
       this._init = true;
       const areas = this._getAreas(
-        Object.values(this.hass.floors),
+        this._floors!,
         Object.values(this.hass.areas),
         Object.values(this.hass.devices),
         Object.values(this.hass.entities),

src/components/ha-button-menu-new.ts

@@ -1,4 +1,5 @@
 import { Button } from "@material/mwc-button";
+import { Corner } from "@material/web/menu/menu";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { FOCUS_TARGET } from "../dialogs/make-dialog-manager";
@@ -6,16 +7,28 @@ import type { HaIconButton } from "./ha-icon-button";
 import "./ha-menu";
 import type { HaMenu } from "./ha-menu";
 
-@customElement("ha-md-button-menu")
+@customElement("ha-button-menu-new")
-export class HaMdButtonMenu extends LitElement {
+export class HaButtonMenuNew extends LitElement {
   protected readonly [FOCUS_TARGET];
 
   @property({ type: Boolean }) public disabled = false;
 
   @property() public positioning?: "fixed" | "absolute" | "popover";
 
-  @property({ type: Boolean, attribute: "has-overflow" }) public hasOverflow =
+  @property({ type: Boolean, attribute: "no-horizontal-flip" })
-    false;
+  public noHorizontalFlip = false;
+
+  @property({ type: Boolean, attribute: "no-vertical-flip" })
+  public noVerticalFlip = false;
+
+  @property({ attribute: "anchor-corner" })
+  public anchorCorner: Corner = Corner.END_START;
+
+  @property({ attribute: "menu-corner" })
+  public menuCorner: Corner = Corner.START_START;
+
+  @property({ type: Boolean, attribute: "has-overflow" })
+  public hasOverflow = false;
 
   @query("ha-menu", true) private _menu!: HaMenu;
 
@@ -39,6 +52,10 @@ export class HaMdButtonMenu extends LitElement {
       <ha-menu
         .positioning=${this.positioning}
         .hasOverflow=${this.hasOverflow}
+        .anchorCorner=${this.anchorCorner}
+        .menuCorner=${this.menuCorner}
+        .noVerticalFlip=${this.noVerticalFlip}
+        .noHorizontalFlip=${this.noHorizontalFlip}
       >
         <slot></slot>
       </ha-menu>
@@ -84,6 +101,6 @@ export class HaMdButtonMenu extends LitElement {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "ha-md-button-menu": HaMdButtonMenu;
+    "ha-button-menu-new": HaButtonMenuNew;
   }
 }

src/components/ha-code-editor.ts

@@ -124,12 +124,9 @@ export class HaCodeEditor extends ReactiveElement {
     const transactions: TransactionSpec[] = [];
     if (changedProps.has("mode")) {
       transactions.push({
-        effects: [
+        effects: this._loadedCodeMirror!.langCompartment!.reconfigure(
-          this._loadedCodeMirror!.langCompartment!.reconfigure(this._mode),
+          this._mode
-          this._loadedCodeMirror!.foldingCompartment.reconfigure(
-            this._getFoldingExtensions()
         ),
-        ],
       });
     }
     if (changedProps.has("readOnly")) {
@@ -180,14 +177,6 @@ export class HaCodeEditor extends ReactiveElement {
       this._loadedCodeMirror.crosshairCursor(),
       this._loadedCodeMirror.highlightSelectionMatches(),
       this._loadedCodeMirror.highlightActiveLine(),
-      this._loadedCodeMirror.indentationMarkers({
-        thickness: 0,
-        activeThickness: 1,
-        colors: {
-          activeLight: "var(--secondary-text-color)",
-          activeDark: "var(--secondary-text-color)",
-        },
-      }),
       this._loadedCodeMirror.keymap.of([
         ...this._loadedCodeMirror.defaultKeymap,
         ...this._loadedCodeMirror.searchKeymap,
@@ -205,9 +194,6 @@ export class HaCodeEditor extends ReactiveElement {
         this.linewrap ? this._loadedCodeMirror.EditorView.lineWrapping : []
       ),
       this._loadedCodeMirror.EditorView.updateListener.of(this._onUpdate),
-      this._loadedCodeMirror.foldingCompartment.of(
-        this._getFoldingExtensions()
-      ),
     ];
 
     if (!this.readOnly) {
@@ -325,17 +311,6 @@ export class HaCodeEditor extends ReactiveElement {
     fireEvent(this, "value-changed", { value: this._value });
   };
 
-  private _getFoldingExtensions = (): Extension => {
-    if (this.mode === "yaml") {
-      return [
-        this._loadedCodeMirror!.foldGutter(),
-        this._loadedCodeMirror!.foldingOnIndent,
-      ];
-    }
-
-    return [];
-  };
-
   static get styles(): CSSResultGroup {
     return css`
       :host(.error-state) .cm-gutters {

src/components/ha-color-picker.ts

@@ -1,16 +1,14 @@
-import { mdiInvertColorsOff, mdiPalette } from "@mdi/js";
+import "@material/mwc-list/mwc-list-item";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, query } from "lit/decorators";
+import { customElement, property } from "lit/decorators";
 import { styleMap } from "lit/directives/style-map";
 import { computeCssColor, THEME_COLORS } from "../common/color/compute-color";
 import { fireEvent } from "../common/dom/fire_event";
 import { stopPropagation } from "../common/dom/stop_propagation";
-import { LocalizeKeys } from "../common/translations/localize";
-import { HomeAssistant } from "../types";
-import "./ha-list-item";
-import "./ha-md-divider";
 import "./ha-select";
-import type { HaSelect } from "./ha-select";
+import "./ha-list-item";
+import { HomeAssistant } from "../types";
+import { LocalizeKeys } from "../common/translations/localize";
 
 @customElement("ha-color-picker")
 export class HaColorPicker extends LitElement {
@@ -22,97 +20,43 @@ export class HaColorPicker extends LitElement {
 
   @property() public value?: string;
 
-  @property({ type: String, attribute: "default_color" })
+  @property({ type: Boolean }) public defaultColor = false;
-  public defaultColor?: string;
-
-  @property({ type: Boolean, attribute: "include_state" })
-  public includeState = false;
-
-  @property({ type: Boolean, attribute: "include_none" })
-  public includeNone = false;
 
   @property({ type: Boolean }) public disabled = false;
 
-  @query("ha-select") private _select!: HaSelect;
+  _valueSelected(ev) {
-
-  connectedCallback(): void {
-    super.connectedCallback();
-    // Refresh layout options when the field is connected to the DOM to ensure current value displayed
-    this._select.layoutOptions();
-  }
-
-  private _valueSelected(ev) {
-    ev.stopPropagation();
-    if (!this.isConnected) return;
     const value = ev.target.value;
-    this.value = value === this.defaultColor ? undefined : value;
+    if (value) {
       fireEvent(this, "value-changed", {
-      value: this.value,
+        value: value !== "default" ? value : undefined,
       });
     }
+  }
 
   render() {
-    const value = this.value || this.defaultColor || "";
-
-    const isCustom = !(
-      THEME_COLORS.has(value) ||
-      value === "none" ||
-      value === "state"
-    );
-
     return html`
       <ha-select
-        .icon=${Boolean(value)}
+        .icon=${Boolean(this.value)}
         .label=${this.label}
-        .value=${value}
+        .value=${this.value || "default"}
         .helper=${this.helper}
         .disabled=${this.disabled}
         @closed=${stopPropagation}
         @selected=${this._valueSelected}
         fixedMenuPosition
         naturalMenuWidth
-        .clearable=${!this.defaultColor}
       >
-        ${value
+        ${this.value
           ? html`
               <span slot="icon">
-                ${value === "none"
+                ${this.renderColorCircle(this.value || "grey")}
-                  ? html`
-                      <ha-svg-icon path=${mdiInvertColorsOff}></ha-svg-icon>
-                    `
-                  : value === "state"
-                    ? html`<ha-svg-icon path=${mdiPalette}></ha-svg-icon>`
-                    : this.renderColorCircle(value || "grey")}
               </span>
             `
           : nothing}
-        ${this.includeNone
+        ${this.defaultColor
-          ? html`
+          ? html` <ha-list-item value="default">
-              <ha-list-item value="none" graphic="icon">
+              ${this.hass.localize(`ui.components.color-picker.default_color`)}
-                ${this.hass.localize("ui.components.color-picker.none")}
+            </ha-list-item>`
-                ${this.defaultColor === "none"
-                  ? ` (${this.hass.localize("ui.components.color-picker.default")})`
-                  : nothing}
-                <ha-svg-icon
-                  slot="graphic"
-                  path=${mdiInvertColorsOff}
-                ></ha-svg-icon>
-              </ha-list-item>
-            `
-          : nothing}
-        ${this.includeState
-          ? html`
-              <ha-list-item value="state" graphic="icon">
-                ${this.hass.localize("ui.components.color-picker.state")}
-                ${this.defaultColor === "state"
-                  ? ` (${this.hass.localize("ui.components.color-picker.default")})`
-                  : nothing}
-                <ha-svg-icon slot="graphic" path=${mdiPalette}></ha-svg-icon>
-              </ha-list-item>
-            `
-          : nothing}
-        ${this.includeState || this.includeNone
-          ? html`<ha-md-divider role="separator" tabindex="-1"></ha-md-divider>`
           : nothing}
         ${Array.from(THEME_COLORS).map(
           (color) => html`
@@ -120,21 +64,10 @@ export class HaColorPicker extends LitElement {
               ${this.hass.localize(
                 `ui.components.color-picker.colors.${color}` as LocalizeKeys
               ) || color}
-              ${this.defaultColor === color
-                ? ` (${this.hass.localize("ui.components.color-picker.default")})`
-                : nothing}
               <span slot="graphic">${this.renderColorCircle(color)}</span>
             </ha-list-item>
           `
         )}
-        ${isCustom
-          ? html`
-              <ha-list-item .value=${value} graphic="icon">
-                ${value}
-                <span slot="graphic">${this.renderColorCircle(value)}</span>
-              </ha-list-item>
-            `
-          : nothing}
       </ha-select>
     `;
   }
@@ -154,11 +87,10 @@ export class HaColorPicker extends LitElement {
     return css`
       .circle-color {
         display: block;
-        background-color: var(--circle-color, var(--divider-color));
+        background-color: var(--circle-color);
         border-radius: 10px;
         width: 20px;
         height: 20px;
-        box-sizing: border-box;
       }
       ha-select {
         width: 100%;

src/components/ha-dialog-header.ts

@@ -10,13 +10,8 @@ export class HaDialogHeader extends LitElement {
           <section class="header-navigation-icon">
             <slot name="navigationIcon"></slot>
           </section>
-          <section class="header-content">
+          <section class="header-title">
-            <div class="header-title">
             <slot name="title"></slot>
-            </div>
-            <div class="header-subtitle">
-              <slot name="subtitle"></slot>
-            </div>
           </section>
           <section class="header-action-items">
             <slot name="actionItems"></slot>
@@ -44,24 +39,17 @@ export class HaDialogHeader extends LitElement {
           padding: 4px;
           box-sizing: border-box;
         }
-        .header-content {
+        .header-title {
           flex: 1;
+          font-size: 22px;
+          line-height: 28px;
+          font-weight: 400;
           padding: 10px 4px;
           min-width: 0;
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap;
         }
-        .header-title {
-          font-size: 22px;
-          line-height: 28px;
-          font-weight: 400;
-        }
-        .header-subtitle {
-          font-size: 14px;
-          line-height: 20px;
-          color: var(--secondary-text-color);
-        }
         @media all and (min-width: 450px) and (min-height: 500px) {
           .header-bar {
             padding: 12px;

src/components/ha-filter-floor-areas.ts

@@ -1,5 +1,6 @@
 import "@material/mwc-menu/mwc-menu-surface";
 import { mdiFilterVariantRemove, mdiTextureBox } from "@mdi/js";
+import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import {
   CSSResultGroup,
   LitElement,
@@ -14,8 +15,13 @@ import { repeat } from "lit/directives/repeat";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
 import { computeRTL } from "../common/util/compute_rtl";
-import { getFloorAreaLookup } from "../data/floor_registry";
+import {
+  FloorRegistryEntry,
+  getFloorAreaLookup,
+  subscribeFloorRegistry,
+} from "../data/floor_registry";
 import { RelatedResult, findRelated } from "../data/search";
+import { SubscribeMixin } from "../mixins/subscribe-mixin";
 import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant } from "../types";
 import "./ha-check-list-item";
@@ -25,7 +31,7 @@ import "./ha-svg-icon";
 import "./ha-tree-indicator";
 
 @customElement("ha-filter-floor-areas")
-export class HaFilterFloorAreas extends LitElement {
+export class HaFilterFloorAreas extends SubscribeMixin(LitElement) {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property({ attribute: false }) public value?: {
@@ -41,6 +47,8 @@ export class HaFilterFloorAreas extends LitElement {
 
   @state() private _shouldRender = false;
 
+  @state() private _floors?: FloorRegistryEntry[];
+
   public willUpdate(properties: PropertyValues) {
     super.willUpdate(properties);
 
@@ -52,7 +60,7 @@ export class HaFilterFloorAreas extends LitElement {
   }
 
   protected render() {
-    const areas = this._areas(this.hass.areas, this.hass.floors);
+    const areas = this._areas(this.hass.areas, this._floors);
 
     return html`
       <ha-expansion-panel
@@ -181,6 +189,14 @@ export class HaFilterFloorAreas extends LitElement {
     this._findRelated();
   }
 
+  protected hassSubscribe(): (UnsubscribeFunc | Promise<UnsubscribeFunc>)[] {
+    return [
+      subscribeFloorRegistry(this.hass.connection, (floors) => {
+        this._floors = floors;
+      }),
+    ];
+  }
+
   protected updated(changed) {
     if (changed.has("expanded") && this.expanded) {
       setTimeout(() => {
@@ -204,9 +220,9 @@ export class HaFilterFloorAreas extends LitElement {
   }
 
   private _areas = memoizeOne(
-    (areaReg: HomeAssistant["areas"], floorReg: HomeAssistant["floors"]) => {
+    (areaReg: HomeAssistant["areas"], floors?: FloorRegistryEntry[]) => {
       const areas = Object.values(areaReg);
-      const floors = Object.values(floorReg);
+
       const floorAreaLookup = getFloorAreaLookup(areas);
 
       const unassisgnedAreas = areas.filter(

src/components/ha-floor-picker.ts

@@ -1,5 +1,5 @@
 import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
-import { HassEntity } from "home-assistant-js-websocket";
+import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
 import { LitElement, PropertyValues, TemplateResult, html } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
@@ -24,8 +24,10 @@ import {
   FloorRegistryEntry,
   createFloorRegistryEntry,
   getFloorAreaLookup,
+  subscribeFloorRegistry,
 } from "../data/floor_registry";
 import { showAlertDialog } from "../dialogs/generic/show-dialog-box";
+import { SubscribeMixin } from "../mixins/subscribe-mixin";
 import { showFloorRegistryDetailDialog } from "../panels/config/areas/show-dialog-floor-registry-detail";
 import { HomeAssistant, ValueChangedEvent } from "../types";
 import type { HaDevicePickerDeviceFilterFunc } from "./device/ha-device-picker";
@@ -51,7 +53,7 @@ const rowRenderer: ComboBoxLitRenderer<FloorRegistryEntry> = (item) =>
   </ha-list-item>`;
 
 @customElement("ha-floor-picker")
-export class HaFloorPicker extends LitElement {
+export class HaFloorPicker extends SubscribeMixin(LitElement) {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property() public label?: string;
@@ -109,6 +111,8 @@ export class HaFloorPicker extends LitElement {
 
   @state() private _opened?: boolean;
 
+  @state() private _floors?: FloorRegistryEntry[];
+
   @query("ha-combo-box", true) public comboBox!: HaComboBox;
 
   private _suggestion?: string;
@@ -125,6 +129,14 @@ export class HaFloorPicker extends LitElement {
     await this.comboBox?.focus();
   }
 
+  protected hassSubscribe(): (UnsubscribeFunc | Promise<UnsubscribeFunc>)[] {
+    return [
+      subscribeFloorRegistry(this.hass.connection, (floors) => {
+        this._floors = floors;
+      }),
+    ];
+  }
+
   private _getFloors = memoizeOne(
     (
       floors: FloorRegistryEntry[],
@@ -308,12 +320,12 @@ export class HaFloorPicker extends LitElement {
 
   protected updated(changedProps: PropertyValues) {
     if (
-      (!this._init && this.hass) ||
+      (!this._init && this.hass && this._floors) ||
       (this._init && changedProps.has("_opened") && this._opened)
     ) {
       this._init = true;
       const floors = this._getFloors(
-        Object.values(this.hass.floors),
+        this._floors!,
         Object.values(this.hass.areas),
         Object.values(this.hass.devices),
         Object.values(this.hass.entities),
@@ -348,7 +360,8 @@ export class HaFloorPicker extends LitElement {
           ? this.hass.localize("ui.components.floor-picker.floor")
           : this.label}
         .placeholder=${this.placeholder
-          ? this.hass.floors[this.placeholder]?.name
+          ? this._floors?.find((floor) => floor.floor_id === this.placeholder)
+              ?.name
           : undefined}
         .renderer=${rowRenderer}
         @filter-changed=${this._filterChanged}
@@ -447,7 +460,7 @@ export class HaFloorPicker extends LitElement {
               floor_id: floor.floor_id,
             });
           });
-          const floors = [...Object.values(this.hass.floors), floor];
+          const floors = [...this._floors!, floor];
           this.comboBox.filteredItems = this._getFloors(
             floors,
             Object.values(this.hass.areas)!,

src/components/ha-form/ha-form-expandable.ts

@@ -30,10 +30,6 @@ export class HaFormExpendable extends LitElement implements HaFormElement {
     options?: { path?: string[] }
   ) => string;
 
-  @property({ attribute: false }) public localizeValue?: (
-    key: string
-  ) => string;
-
   private _renderDescription() {
     const description = this.computeHelper?.(this.schema);
     return description ? html`<p>${description}</p>` : nothing;
@@ -90,7 +86,6 @@ export class HaFormExpendable extends LitElement implements HaFormElement {
             .disabled=${this.disabled}
             .computeLabel=${this._computeLabel}
             .computeHelper=${this._computeHelper}
-            .localizeValue=${this.localizeValue}
           ></ha-form>
         </div>
       </ha-expansion-panel>

src/components/ha-form/ha-form-grid.ts

@@ -35,10 +35,6 @@ export class HaFormGrid extends LitElement implements HaFormElement {
     schema: HaFormSchema
   ) => string;
 
-  @property({ attribute: false }) public localizeValue?: (
-    key: string
-  ) => string;
-
   public async focus() {
     await this.updateComplete;
     this.renderRoot.querySelector("ha-form")?.focus();
@@ -69,7 +65,6 @@ export class HaFormGrid extends LitElement implements HaFormElement {
             .disabled=${this.disabled}
             .computeLabel=${this.computeLabel}
             .computeHelper=${this.computeHelper}
-            .localizeValue=${this.localizeValue}
           ></ha-form>
         `
       )}

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

@@ -163,7 +163,6 @@ export class HaForm extends LitElement implements HaFormElement {
                   localize: this.hass?.localize,
                   computeLabel: this.computeLabel,
                   computeHelper: this.computeHelper,
-                  localizeValue: this.localizeValue,
                   context: this._generateContext(item),
                   ...this.getFormProperties(),
                 })}

src/components/ha-heading-badge.ts

@@ -1,58 +0,0 @@
-import { css, CSSResultGroup, html, LitElement } from "lit";
-import { customElement, property } from "lit/decorators";
-import { ifDefined } from "lit/directives/if-defined";
-
-type HeadingBadgeType = "text" | "button";
-
-@customElement("ha-heading-badge")
-export class HaBadge extends LitElement {
-  @property() public type: HeadingBadgeType = "text";
-
-  protected render() {
-    return html`
-      <div
-        class="heading-badge"
-        role=${ifDefined(this.type === "button" ? "button" : undefined)}
-        tabindex=${ifDefined(this.type === "button" ? "0" : undefined)}
-      >
-        <slot name="icon"></slot>
-        <slot></slot>
-      </div>
-    `;
-  }
-
-  static get styles(): CSSResultGroup {
-    return css`
-      :host {
-        color: var(--secondary-text-color);
-      }
-      [role="button"] {
-        cursor: pointer;
-      }
-      .heading-badge {
-        display: flex;
-        flex-direction: row;
-        white-space: nowrap;
-        align-items: center;
-        gap: 3px;
-        font-family: Roboto;
-        font-size: 14px;
-        font-style: normal;
-        font-weight: 400;
-        line-height: 20px;
-        letter-spacing: 0.1px;
-        --mdc-icon-size: 14px;
-      }
-      ::slotted([slot="icon"]) {
-        --ha-icon-display: block;
-        color: var(--icon-color, inherit);
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-heading-badge": HaBadge;
-  }
-}

src/components/ha-list-item-new.ts

@@ -2,8 +2,8 @@ import { MdListItem } from "@material/web/list/list-item";
 import { css } from "lit";
 import { customElement } from "lit/decorators";
 
-@customElement("ha-md-list-item")
+@customElement("ha-list-item-new")
-export class HaMdListItem extends MdListItem {
+export class HaListItemNew extends MdListItem {
   static override styles = [
     ...super.styles,
     css`
@@ -21,6 +21,6 @@ export class HaMdListItem extends MdListItem {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "ha-md-list-item": HaMdListItem;
+    "ha-list-item-new": HaListItemNew;
   }
 }

src/components/ha-list-new.ts

@@ -2,8 +2,8 @@ import { MdList } from "@material/web/list/list";
 import { css } from "lit";
 import { customElement } from "lit/decorators";
 
-@customElement("ha-md-list")
+@customElement("ha-list-new")
-export class HaMdList extends MdList {
+export class HaListNew extends MdList {
   static override styles = [
     ...super.styles,
     css`
@@ -16,6 +16,6 @@ export class HaMdList extends MdList {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "ha-md-list": HaMdList;
+    "ha-list-new": HaListNew;
   }
 }

src/components/ha-md-dialog.ts

@@ -1,250 +0,0 @@
-import { MdDialog } from "@material/web/dialog/dialog";
-import {
-  type DialogAnimation,
-  DIALOG_DEFAULT_CLOSE_ANIMATION,
-  DIALOG_DEFAULT_OPEN_ANIMATION,
-} from "@material/web/dialog/internal/animations";
-import { css } from "lit";
-import { customElement, property } from "lit/decorators";
-
-// workaround to be able to overlay an dialog with another dialog
-MdDialog.addInitializer(async (instance) => {
-  await instance.updateComplete;
-
-  const dialogInstance = instance as MdDialog;
-
-  // @ts-expect-error dialog is private
-  dialogInstance.dialog.prepend(dialogInstance.scrim);
-  // @ts-expect-error scrim is private
-  dialogInstance.scrim.style.inset = 0;
-  // @ts-expect-error scrim is private
-  dialogInstance.scrim.style.zIndex = 0;
-
-  const { getOpenAnimation, getCloseAnimation } = dialogInstance;
-  dialogInstance.getOpenAnimation = () => {
-    const animations = getOpenAnimation.call(this);
-    animations.container = [
-      ...(animations.container ?? []),
-      ...(animations.dialog ?? []),
-    ];
-    animations.dialog = [];
-    return animations;
-  };
-  dialogInstance.getCloseAnimation = () => {
-    const animations = getCloseAnimation.call(this);
-    animations.container = [
-      ...(animations.container ?? []),
-      ...(animations.dialog ?? []),
-    ];
-    animations.dialog = [];
-    return animations;
-  };
-});
-
-let DIALOG_POLYFILL: Promise<typeof import("dialog-polyfill")>;
-
-/**
- * Based on the home assistant design: https://design.home-assistant.io/#components/ha-dialogs
- *
- */
-@customElement("ha-md-dialog")
-export class HaMdDialog extends MdDialog {
-  /**
-   * When true the dialog will not close when the user presses the esc key or press out of the dialog.
-   */
-  @property({ attribute: "disable-cancel-action", type: Boolean })
-  public disableCancelAction = false;
-
-  private _polyfillDialogRegistered = false;
-
-  constructor() {
-    super();
-    this.addEventListener("cancel", this._handleCancel);
-
-    if (typeof HTMLDialogElement !== "function") {
-      this.addEventListener("open", this._handleOpen);
-
-      if (!DIALOG_POLYFILL) {
-        DIALOG_POLYFILL = import("dialog-polyfill");
-      }
-    }
-
-    // if browser doesn't support animate API disable open/close animations
-    if (this.animate === undefined) {
-      this.quick = true;
-    }
-
-    // if browser doesn't support animate API disable open/close animations
-    if (this.animate === undefined) {
-      this.quick = true;
-    }
-  }
-
-  // prevent open in older browsers and wait for polyfill to load
-  private async _handleOpen(openEvent: Event) {
-    openEvent.preventDefault();
-
-    if (this._polyfillDialogRegistered) {
-      return;
-    }
-
-    this._polyfillDialogRegistered = true;
-    this._loadPolyfillStylesheet("/static/polyfills/dialog-polyfill.css");
-    const dialog = this.shadowRoot?.querySelector(
-      "dialog"
-    ) as HTMLDialogElement;
-
-    const dialogPolyfill = await DIALOG_POLYFILL;
-    dialogPolyfill.default.registerDialog(dialog);
-    this.removeEventListener("open", this._handleOpen);
-
-    this.show();
-  }
-
-  private async _loadPolyfillStylesheet(href) {
-    const link = document.createElement("link");
-    link.rel = "stylesheet";
-    link.href = href;
-
-    return new Promise<void>((resolve, reject) => {
-      link.onload = () => resolve();
-      link.onerror = () =>
-        reject(new Error(`Stylesheet failed to load: ${href}`));
-
-      this.shadowRoot?.appendChild(link);
-    });
-  }
-
-  _handleCancel(closeEvent: Event) {
-    if (this.disableCancelAction) {
-      closeEvent.preventDefault();
-      const dialogElement = this.shadowRoot?.querySelector("dialog .container");
-      if (this.animate !== undefined) {
-        dialogElement?.animate(
-          [
-            {
-              transform: "rotate(-1deg)",
-              "animation-timing-function": "ease-in",
-            },
-            {
-              transform: "rotate(1.5deg)",
-              "animation-timing-function": "ease-out",
-            },
-            {
-              transform: "rotate(0deg)",
-              "animation-timing-function": "ease-in",
-            },
-          ],
-          {
-            duration: 200,
-            iterations: 2,
-          }
-        );
-      }
-    }
-  }
-
-  static override styles = [
-    ...super.styles,
-    css`
-      :host {
-        --md-dialog-container-color: var(--card-background-color);
-        --md-dialog-headline-color: var(--primary-text-color);
-        --md-dialog-supporting-text-color: var(--primary-text-color);
-        --md-sys-color-scrim: #000000;
-
-        --md-dialog-headline-weight: 400;
-        --md-dialog-headline-size: 1.574rem;
-        --md-dialog-supporting-text-size: 1rem;
-        --md-dialog-supporting-text-line-height: 1.5rem;
-      }
-
-      :host([type="alert"]) {
-        min-width: 320px;
-      }
-
-      :host(:not([type="alert"])) {
-        @media all and (max-width: 450px), all and (max-height: 500px) {
-          min-width: calc(
-            100vw - env(safe-area-inset-right) - env(safe-area-inset-left)
-          );
-          max-width: calc(
-            100vw - env(safe-area-inset-right) - env(safe-area-inset-left)
-          );
-          min-height: 100%;
-          max-height: 100%;
-          --md-dialog-container-shape: 0;
-        }
-      }
-
-      :host ::slotted(ha-dialog-header) {
-        display: contents;
-      }
-
-      slot[name="content"]::slotted(*) {
-        padding: var(--dialog-content-padding, 24px);
-      }
-      .scrim {
-        z-index: 10; // overlay navigation
-      }
-    `,
-  ];
-}
-
-// by default the dialog open/close animation will be from/to the top
-// but if we have a special mobile dialog which is at the bottom of the screen, an from bottom animation can be used:
-const OPEN_FROM_BOTTOM_ANIMATION: DialogAnimation = {
-  ...DIALOG_DEFAULT_OPEN_ANIMATION,
-  dialog: [
-    [
-      // Dialog slide up
-      [{ transform: "translateY(50px)" }, { transform: "translateY(0)" }],
-      { duration: 500, easing: "cubic-bezier(.3,0,0,1)" },
-    ],
-  ],
-  container: [
-    [
-      // Container fade in
-      [{ opacity: 0 }, { opacity: 1 }],
-      { duration: 50, easing: "linear", pseudoElement: "::before" },
-    ],
-  ],
-};
-
-const CLOSE_TO_BOTTOM_ANIMATION: DialogAnimation = {
-  ...DIALOG_DEFAULT_CLOSE_ANIMATION,
-  dialog: [
-    [
-      // Dialog slide down
-      [{ transform: "translateY(0)" }, { transform: "translateY(50px)" }],
-      { duration: 150, easing: "cubic-bezier(.3,0,0,1)" },
-    ],
-  ],
-  container: [
-    [
-      // Container fade out
-      [{ opacity: "1" }, { opacity: "0" }],
-      { delay: 100, duration: 50, easing: "linear", pseudoElement: "::before" },
-    ],
-  ],
-};
-
-export const getMobileOpenFromBottomAnimation = () => {
-  const matches = window.matchMedia(
-    "all and (max-width: 450px), all and (max-height: 500px)"
-  ).matches;
-  return matches ? OPEN_FROM_BOTTOM_ANIMATION : DIALOG_DEFAULT_OPEN_ANIMATION;
-};
-
-export const getMobileCloseToBottomAnimation = () => {
-  const matches = window.matchMedia(
-    "all and (max-width: 450px), all and (max-height: 500px)"
-  ).matches;
-  return matches ? CLOSE_TO_BOTTOM_ANIMATION : DIALOG_DEFAULT_CLOSE_ANIMATION;
-};
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-md-dialog": HaMdDialog;
-  }
-}

src/components/ha-md-divider.ts

@@ -1,21 +0,0 @@
-import { MdDivider } from "@material/web/divider/divider";
-import { css } from "lit";
-import { customElement } from "lit/decorators";
-
-@customElement("ha-md-divider")
-export class HaMdDivider extends MdDivider {
-  static override styles = [
-    ...super.styles,
-    css`
-      :host {
-        --md-divider-color: var(--divider-color);
-      }
-    `,
-  ];
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-md-divider": HaMdDivider;
-  }
-}

src/components/ha-menu-item.ts

@@ -2,8 +2,8 @@ import { MdMenuItem } from "@material/web/menu/menu-item";
 import { css } from "lit";
 import { customElement, property } from "lit/decorators";
 
-@customElement("ha-md-menu-item")
+@customElement("ha-menu-item")
-export class HaMdMenuItem extends MdMenuItem {
+export class HaMenuItem extends MdMenuItem {
   @property({ attribute: false }) clickAction?: (item?: HTMLElement) => void;
 
   static override styles = [
@@ -41,6 +41,6 @@ export class HaMdMenuItem extends MdMenuItem {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "ha-md-menu-item": HaMdMenuItem;
+    "ha-menu-item": HaMenuItem;
   }
 }

src/components/ha-menu.ts

@@ -6,7 +6,7 @@ import {
 } from "@material/web/menu/internal/controllers/shared";
 import { css } from "lit";
 import { customElement } from "lit/decorators";
-import type { HaMdMenuItem } from "./ha-md-menu-item";
+import type { HaMenuItem } from "./ha-menu-item";
 
 @customElement("ha-menu")
 export class HaMenu extends MdMenu {
@@ -22,7 +22,7 @@ export class HaMenu extends MdMenu {
     ) {
       return;
     }
-    (ev.detail.initiator as HaMdMenuItem).clickAction?.(ev.detail.initiator);
+    (ev.detail.initiator as HaMenuItem).clickAction?.(ev.detail.initiator);
   }
 
   static override styles = [

src/components/ha-outlined-field.ts

@@ -24,11 +24,9 @@ export class HaOutlinedField extends MdOutlinedField {
       }
       .with-start .start {
         margin-inline-end: var(--ha-outlined-field-start-margin, 4px);
-        margin-inline-start: initial;
       }
       .with-end .end {
         margin-inline-start: var(--ha-outlined-field-end-margin, 4px);
-        margin-inline-end: initial;
       }
     `,
   ];

src/components/ha-outlined-segmented-button-set.ts

@@ -0,0 +1,22 @@
+import { MdOutlinedSegmentedButtonSet } from "@material/web/labs/segmentedbuttonset/outlined-segmented-button-set";
+import { css } from "lit";
+import { customElement } from "lit/decorators";
+
+@customElement("ha-outlined-segmented-button-set")
+export class HaOutlinedSegmentedButtonSet extends MdOutlinedSegmentedButtonSet {
+  static override styles = [
+    ...super.styles,
+    css`
+      :host {
+        --ha-icon-display: block;
+        --md-outlined-segmented-button-container-height: 32px;
+      }
+    `,
+  ];
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-outlined-segmented-button-set": HaOutlinedSegmentedButtonSet;
+  }
+}

src/components/ha-outlined-segmented-button.ts

@@ -0,0 +1,34 @@
+import { MdOutlinedSegmentedButton } from "@material/web/labs/segmentedbutton/outlined-segmented-button";
+import { css } from "lit";
+import { customElement } from "lit/decorators";
+
+@customElement("ha-outlined-segmented-button")
+export class HaOutlinedSegmentedButton extends MdOutlinedSegmentedButton {
+  static override styles = [
+    ...super.styles,
+    css`
+      :host {
+        --ha-icon-display: block;
+        --md-outlined-segmented-button-selected-container-color: var(
+          --light-primary-color
+        );
+        --md-outlined-segmented-button-container-height: 32px;
+        --md-outlined-segmented-button-disabled-label-text-color: var(
+          --disabled-text-color
+        );
+        --md-outlined-segmented-button-disabled-icon-color: var(
+          --disabled-text-color
+        );
+        --md-outlined-segmented-button-disabled-outline-color: var(
+          --disabled-text-color
+        );
+      }
+    `,
+  ];
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-outlined-segmented-button": HaOutlinedSegmentedButton;
+  }
+}

src/components/ha-password-field.ts

@@ -1,185 +0,0 @@
-import { TextAreaCharCounter } from "@material/mwc-textfield/mwc-textfield-base";
-import { mdiEye, mdiEyeOff } from "@mdi/js";
-import { LitElement, css, html } from "lit";
-import {
-  customElement,
-  eventOptions,
-  property,
-  query,
-  state,
-} from "lit/decorators";
-import { HomeAssistant } from "../types";
-import "./ha-icon-button";
-import "./ha-textfield";
-import type { HaTextField } from "./ha-textfield";
-
-@customElement("ha-password-field")
-export class HaPasswordField extends LitElement {
-  @property({ attribute: false }) public hass?: HomeAssistant;
-
-  @property({ type: Boolean }) public invalid?: boolean;
-
-  @property({ attribute: "error-message" }) public errorMessage?: string;
-
-  @property({ type: Boolean }) public icon = false;
-
-  @property({ type: Boolean }) public iconTrailing = false;
-
-  @property() public autocomplete?: string;
-
-  @property() public autocorrect?: string;
-
-  @property({ attribute: "input-spellcheck" })
-  public inputSpellcheck?: string;
-
-  @property({ type: String }) value = "";
-
-  @property({ type: String }) placeholder = "";
-
-  @property({ type: String }) label = "";
-
-  @property({ type: Boolean, reflect: true }) disabled = false;
-
-  @property({ type: Boolean }) required = false;
-
-  @property({ type: Number }) minLength = -1;
-
-  @property({ type: Number }) maxLength = -1;
-
-  @property({ type: Boolean, reflect: true }) outlined = false;
-
-  @property({ type: String }) helper = "";
-
-  @property({ type: Boolean }) validateOnInitialRender = false;
-
-  @property({ type: String }) validationMessage = "";
-
-  @property({ type: Boolean }) autoValidate = false;
-
-  @property({ type: String }) pattern = "";
-
-  @property({ type: Number }) size: number | null = null;
-
-  @property({ type: Boolean }) helperPersistent = false;
-
-  @property({ type: Boolean }) charCounter: boolean | TextAreaCharCounter =
-    false;
-
-  @property({ type: Boolean }) endAligned = false;
-
-  @property({ type: String }) prefix = "";
-
-  @property({ type: String }) suffix = "";
-
-  @property({ type: String }) name = "";
-
-  @property({ type: String, attribute: "input-mode" })
-  inputMode!: string;
-
-  @property({ type: Boolean }) readOnly = false;
-
-  @property({ type: String }) autocapitalize = "";
-
-  @state() private _unmaskedPassword = false;
-
-  @query("ha-textfield") private _textField!: HaTextField;
-
-  protected render() {
-    return html`<ha-textfield
-        .invalid=${this.invalid}
-        .errorMessage=${this.errorMessage}
-        .icon=${this.icon}
-        .iconTrailing=${this.iconTrailing}
-        .autocomplete=${this.autocomplete}
-        .autocorrect=${this.autocorrect}
-        .inputSpellcheck=${this.inputSpellcheck}
-        .value=${this.value}
-        .placeholder=${this.placeholder}
-        .label=${this.label}
-        .disabled=${this.disabled}
-        .required=${this.required}
-        .minLength=${this.minLength}
-        .maxLength=${this.maxLength}
-        .outlined=${this.outlined}
-        .helper=${this.helper}
-        .validateOnInitialRender=${this.validateOnInitialRender}
-        .validationMessage=${this.validationMessage}
-        .autoValidate=${this.autoValidate}
-        .pattern=${this.pattern}
-        .size=${this.size}
-        .helperPersistent=${this.helperPersistent}
-        .charCounter=${this.charCounter}
-        .endAligned=${this.endAligned}
-        .prefix=${this.prefix}
-        .name=${this.name}
-        .inputMode=${this.inputMode}
-        .readOnly=${this.readOnly}
-        .autocapitalize=${this.autocapitalize}
-        .type=${this._unmaskedPassword ? "text" : "password"}
-        .suffix=${html`<div style="width: 24px"></div>`}
-        @input=${this._handleInputChange}
-      ></ha-textfield>
-      <ha-icon-button
-        toggles
-        .label=${this.hass?.localize(
-          this._unmaskedPassword
-            ? "ui.components.selectors.text.hide_password"
-            : "ui.components.selectors.text.show_password"
-        ) || (this._unmaskedPassword ? "Hide password" : "Show password")}
-        @click=${this._toggleUnmaskedPassword}
-        .path=${this._unmaskedPassword ? mdiEyeOff : mdiEye}
-      ></ha-icon-button>`;
-  }
-
-  public checkValidity(): boolean {
-    return this._textField.checkValidity();
-  }
-
-  public reportValidity(): boolean {
-    return this._textField.reportValidity();
-  }
-
-  public setCustomValidity(message: string): void {
-    return this._textField.setCustomValidity(message);
-  }
-
-  public layout(): Promise<void> {
-    return this._textField.layout();
-  }
-
-  private _toggleUnmaskedPassword(): void {
-    this._unmaskedPassword = !this._unmaskedPassword;
-  }
-
-  @eventOptions({ passive: true })
-  private _handleInputChange(ev) {
-    this.value = ev.target.value;
-  }
-
-  static styles = css`
-    :host {
-      display: block;
-      position: relative;
-    }
-    ha-textfield {
-      width: 100%;
-    }
-    ha-icon-button {
-      position: absolute;
-      top: 8px;
-      right: 8px;
-      inset-inline-start: initial;
-      inset-inline-end: 8px;
-      --mdc-icon-button-size: 40px;
-      --mdc-icon-size: 20px;
-      color: var(--secondary-text-color);
-      direction: var(--direction);
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-password-field": HaPasswordField;
-  }
-}

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

@@ -1,7 +1,6 @@
 import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
+import { Action } from "../../data/script";
-import { Action, migrateAutomationAction } from "../../data/script";
 import { ActionSelector } from "../../data/selector";
 import "../../panels/config/automation/action/ha-automation-action";
 import { HomeAssistant } from "../../types";
@@ -18,19 +17,12 @@ export class HaActionSelector extends LitElement {
 
   @property({ type: Boolean, reflect: true }) public disabled = false;
 
-  private _actions = memoizeOne((action: Action | undefined) => {
-    if (!action) {
-      return [];
-    }
-    return migrateAutomationAction(action);
-  });
-
   protected render() {
     return html`
       ${this.label ? html`<label>${this.label}</label>` : nothing}
       <ha-automation-action
         .disabled=${this.disabled}
-        .actions=${this._actions(this.value)}
+        .actions=${this.value || []}
         .hass=${this.hass}
         .path=${this.selector.action?.path}
       ></ha-automation-action>

src/components/ha-selector/ha-selector-color-rgb.ts

@@ -31,7 +31,7 @@ export class HaColorRGBSelector extends LitElement {
         .label=${this.label || ""}
         .required=${this.required}
         .helper=${this.helper}
-        .disabled=${this.disabled}
+        .disalbled=${this.disabled}
         @change=${this._valueChanged}
       ></ha-textfield>
     `;

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

@@ -7,7 +7,12 @@ import "../ha-code-editor";
 import "../ha-input-helper-text";
 import "../ha-alert";
 
-const WARNING_STRINGS = ["template:", "sensor:", "state:", "trigger: template"];
+const WARNING_STRINGS = [
+  "template:",
+  "sensor:",
+  "state:",
+  "platform: template",
+];
 
 @customElement("ha-selector-template")
 export class HaTemplateSelector extends LitElement {

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

@@ -1,7 +1,6 @@
 import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
+import { Trigger } from "../../data/automation";
-import { migrateAutomationTrigger, Trigger } from "../../data/automation";
 import { TriggerSelector } from "../../data/selector";
 import "../../panels/config/automation/trigger/ha-automation-trigger";
 import { HomeAssistant } from "../../types";
@@ -18,19 +17,12 @@ export class HaTriggerSelector extends LitElement {
 
   @property({ type: Boolean, reflect: true }) public disabled = false;
 
-  private _triggers = memoizeOne((trigger: Trigger | undefined) => {
-    if (!trigger) {
-      return [];
-    }
-    return migrateAutomationTrigger(trigger);
-  });
-
   protected render() {
     return html`
       ${this.label ? html`<label>${this.label}</label>` : nothing}
       <ha-automation-trigger
         .disabled=${this.disabled}
-        .triggers=${this._triggers(this.value)}
+        .triggers=${this.value || []}
         .hass=${this.hass}
         .path=${this.selector.trigger?.path}
       ></ha-automation-trigger>

src/components/ha-selector/ha-selector-ui-color.ts

@@ -24,8 +24,6 @@ export class HaSelectorUiColor extends LitElement {
         .hass=${this.hass}
         .value=${this.value}
         .helper=${this.helper}
-        .includeNone=${this.selector.ui_color?.include_none}
-        .includeState=${this.selector.ui_color?.include_state}
         .defaultColor=${this.selector.ui_color?.default_color}
         @value-changed=${this._valueChanged}
       ></ha-color-picker>

src/components/ha-service-control.ts

@@ -240,24 +240,12 @@ export class HaServiceControl extends LitElement {
         ...value,
         selector: value.selector as Selector | undefined,
       }));
-
-      const hasSelector: string[] = [];
-      fields.forEach((field) => {
-        if ((field as any).fields) {
-          Object.entries((field as any).fields).forEach(([key, subField]) => {
-            if ((subField as any).selector) {
-              hasSelector.push(key);
-            }
-          });
-        } else if (field.selector) {
-          hasSelector.push(field.key);
-        }
-      });
-
       return {
         ...serviceDomains[domain][serviceName],
         fields,
-        hasSelector,
+        hasSelector: fields.length
+          ? fields.filter((field) => field.selector).map((field) => field.key)
+          : [],
       };
     }
   );
@@ -805,8 +793,7 @@ export class HaServiceControl extends LitElement {
     const value = ev.detail.value;
     if (
       this._value?.data?.[key] === value ||
-      ((!this._value?.data || !(key in this._value.data)) &&
+      (!this._value?.data?.[key] && (value === "" || value === undefined))
-        (value === "" || value === undefined))
     ) {
       return;
     }

src/components/ha-sortable.ts

@@ -43,13 +43,6 @@ export class HaSortable extends LitElement {
   @property({ type: String, attribute: "handle-selector" })
   public handleSelector?: string;
 
-  /**
-   * Selectors that do not lead to dragging (String or Function)
-   * https://github.com/SortableJS/Sortable?tab=readme-ov-file#filter-option
-   * */
-  @property({ type: String, attribute: "filter" })
-  public filter?: string;
-
   @property({ type: String })
   public group?: string | SortableInstance.GroupOptions;
 
@@ -152,9 +145,6 @@ export class HaSortable extends LitElement {
     if (this.group) {
       options.group = this.group;
     }
-    if (this.filter) {
-      options.filter = this.filter;
-    }
 
     this._sortable = new Sortable(container, options);
   }

src/components/ha-target-picker.ts

@@ -35,6 +35,10 @@ import {
   computeDeviceName,
 } from "../data/device_registry";
 import { EntityRegistryDisplayEntry } from "../data/entity_registry";
+import {
+  FloorRegistryEntry,
+  subscribeFloorRegistry,
+} from "../data/floor_registry";
 import {
   LabelRegistryEntry,
   subscribeLabelRegistry,
@@ -99,12 +103,17 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
 
   @query(".add-container", true) private _addContainer?: HTMLDivElement;
 
+  @state() private _floors?: FloorRegistryEntry[];
+
   @state() private _labels?: LabelRegistryEntry[];
 
   private _opened = false;
 
   protected hassSubscribe(): (UnsubscribeFunc | Promise<UnsubscribeFunc>)[] {
     return [
+      subscribeFloorRegistry(this.hass.connection, (floors) => {
+        this._floors = floors;
+      }),
       subscribeLabelRegistry(this.hass.connection, (labels) => {
         this._labels = labels;
       }),
@@ -123,7 +132,9 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
       <div class="mdc-chip-set items">
         ${this.value?.floor_id
           ? ensureArray(this.value.floor_id).map((floor_id) => {
-              const floor = this.hass.floors[floor_id];
+              const floor = this._floors?.find(
+                (flr) => flr.floor_id === floor_id
+              );
               return this._renderChip(
                 "floor_id",
                 floor_id,

src/components/ha-textfield.ts

@@ -6,7 +6,7 @@ import { mainWindow } from "../common/dom/get_main_window";
 
 @customElement("ha-textfield")
 export class HaTextField extends TextFieldBase {
-  @property({ type: Boolean }) public invalid?: boolean;
+  @property({ type: Boolean }) public invalid = false;
 
   @property({ attribute: "error-message" }) public errorMessage?: string;
 
@@ -28,25 +28,15 @@ export class HaTextField extends TextFieldBase {
   override updated(changedProperties: PropertyValues) {
     super.updated(changedProperties);
     if (
-      changedProperties.has("invalid") ||
+      (changedProperties.has("invalid") &&
+        (this.invalid || changedProperties.get("invalid") !== undefined)) ||
       changedProperties.has("errorMessage")
     ) {
       this.setCustomValidity(
-        this.invalid
+        this.invalid ? this.errorMessage || "Invalid" : ""
-          ? this.errorMessage || this.validationMessage || "Invalid"
-          : ""
       );
-      if (
-        this.invalid ||
-        this.validateOnInitialRender ||
-        (changedProperties.has("invalid") &&
-          changedProperties.get("invalid") !== undefined)
-      ) {
-        // Only report validity if the field is invalid or the invalid state has changed from
-        // true to false to prevent setting empty required fields to invalid on first render
       this.reportValidity();
     }
-    }
     if (changedProperties.has("autocomplete")) {
       if (this.autocomplete) {
         this.formElement.setAttribute("autocomplete", this.autocomplete);
@@ -119,7 +109,7 @@ export class HaTextField extends TextFieldBase {
         color: var(--secondary-text-color);
       }
 
-      .mdc-text-field:not(.mdc-text-field--disabled) .mdc-text-field__icon {
+      .mdc-text-field__icon {
         color: var(--secondary-text-color);
       }
 

src/components/ha-yaml-editor.ts

@@ -7,18 +7,16 @@ import {
   nothing,
   PropertyValues,
 } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import type { HomeAssistant } from "../types";
 import { haStyle } from "../resources/styles";
 import "./ha-code-editor";
 import { showToast } from "../util/toast";
 import { copyToClipboard } from "../common/util/copy-clipboard";
-import type { HaCodeEditor } from "./ha-code-editor";
-import "./ha-button";
 
 const isEmpty = (obj: Record<string, unknown>): boolean => {
-  if (typeof obj !== "object" || obj === null) {
+  if (typeof obj !== "object") {
     return false;
   }
   for (const key in obj) {
@@ -55,11 +53,10 @@ export class HaYamlEditor extends LitElement {
 
   @state() private _yaml = "";
 
-  @query("ha-code-editor") _codeEditor?: HaCodeEditor;
-
   public setValue(value): void {
     try {
-      this._yaml = !isEmpty(value)
+      this._yaml =
+        value && !isEmpty(value)
           ? dump(value, {
               schema: this.yamlSchema,
               quotingType: '"',
@@ -74,7 +71,7 @@ export class HaYamlEditor extends LitElement {
   }
 
   protected firstUpdated(): void {
-    if (this.defaultValue !== undefined) {
+    if (this.defaultValue) {
       this.setValue(this.defaultValue);
     }
   }
@@ -86,12 +83,6 @@ export class HaYamlEditor extends LitElement {
     }
   }
 
-  public focus(): void {
-    if (this._codeEditor?.codemirror) {
-      this._codeEditor?.codemirror.focus();
-    }
-  }
-
   protected render() {
     if (this._yaml === undefined) {
       return nothing;
@@ -99,7 +90,7 @@ export class HaYamlEditor extends LitElement {
     return html`
       ${this.label
         ? html`<p>${this.label}${this.required ? " *" : ""}</p>`
-        : nothing}
+        : ""}
       <ha-code-editor
         .hass=${this.hass}
         .value=${this._yaml}
@@ -112,20 +103,16 @@ export class HaYamlEditor extends LitElement {
         dir="ltr"
       ></ha-code-editor>
       ${this.copyClipboard || this.hasExtraActions
-        ? html`
+        ? html`<div class="card-actions">
-            <div class="card-actions">
             ${this.copyClipboard
-                ? html`
+              ? html` <mwc-button @click=${this._copyYaml}>
-                    <ha-button @click=${this._copyYaml}>
                   ${this.hass.localize(
                     "ui.components.yaml-editor.copy_to_clipboard"
                   )}
-                    </ha-button>
+                </mwc-button>`
-                  `
               : nothing}
             <slot name="extra-actions"></slot>
-            </div>
+          </div>`
-          `
         : nothing}
     `;
   }

src/components/trace/hat-script-graph.ts

@@ -22,7 +22,7 @@ import { LitElement, PropertyValues, css, html, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
 import { ensureArray } from "../../common/array/ensure-array";
 import { fireEvent } from "../../common/dom/fire_event";
-import { Condition, Trigger, flattenTriggers } from "../../data/automation";
+import { Condition, Trigger } from "../../data/automation";
 import {
   Action,
   ChooseAction,
@@ -94,7 +94,7 @@ export class HatScriptGraph extends LitElement {
         @focus=${this.selectNode(config, path)}
         ?active=${this.selected === path}
         .iconPath=${mdiAsterisk}
-        .notEnabled=${"enabled" in config && config.enabled === false}
+        .notEnabled=${config.enabled === false}
         .error=${this.trace.trace[path]?.some((tr) => tr.error)}
         tabindex=${track ? "0" : "-1"}
       ></hat-graph-node>
@@ -569,16 +569,11 @@ export class HatScriptGraph extends LitElement {
   }
 
   protected render() {
-    const triggerKey = "triggers" in this.trace.config ? "triggers" : "trigger";
-    const conditionKey =
-      "conditions" in this.trace.config ? "conditions" : "condition";
-    const actionKey = "actions" in this.trace.config ? "actions" : "action";
-
     const paths = Object.keys(this.trackedNodes);
     const trigger_nodes =
-      triggerKey in this.trace.config
+      "trigger" in this.trace.config
-        ? flattenTriggers(ensureArray(this.trace.config[triggerKey])).map(
+        ? ensureArray(this.trace.config.trigger).map((trigger, i) =>
-            (trigger, i) => this.render_trigger(trigger, i)
+            this.render_trigger(trigger, i)
           )
         : undefined;
     try {
@@ -589,14 +584,14 @@ export class HatScriptGraph extends LitElement {
                 ${trigger_nodes}
               </hat-graph-branch>`
             : ""}
-          ${conditionKey in this.trace.config
+          ${"condition" in this.trace.config
-            ? html`${ensureArray(this.trace.config[conditionKey])?.map(
+            ? html`${ensureArray(this.trace.config.condition)?.map(
                 (condition, i) => this.render_condition(condition, i)
               )}`
             : ""}
-          ${actionKey in this.trace.config
+          ${"action" in this.trace.config
-            ? html`${ensureArray(this.trace.config[actionKey]).map(
+            ? html`${ensureArray(this.trace.config.action).map((action, i) =>
-                (action, i) => this.render_action_node(action, `action/${i}`)
+                this.render_action_node(action, `action/${i}`)
               )}`
             : ""}
           ${"sequence" in this.trace.config

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

@@ -22,8 +22,13 @@ import { formatDateTimeWithSeconds } from "../../common/datetime/format_date_tim
 import { relativeTime } from "../../common/datetime/relative_time";
 import { fireEvent } from "../../common/dom/fire_event";
 import { toggleAttribute } from "../../common/dom/toggle_attribute";
-import { fullEntitiesContext, labelsContext } from "../../data/context";
+import {
+  floorsContext,
+  fullEntitiesContext,
+  labelsContext,
+} from "../../data/context";
 import { EntityRegistryEntry } from "../../data/entity_registry";
+import { FloorRegistryEntry } from "../../data/floor_registry";
 import { LabelRegistryEntry } from "../../data/label_registry";
 import { LogbookEntry } from "../../data/logbook";
 import {
@@ -201,6 +206,7 @@ class ActionRenderer {
     private hass: HomeAssistant,
     private entityReg: EntityRegistryEntry[],
     private labelReg: LabelRegistryEntry[],
+    private floorReg: FloorRegistryEntry[],
     private entries: TemplateResult[],
     private trace: AutomationTraceExtended,
     private logbookRenderer: LogbookRenderer,
@@ -319,6 +325,7 @@ class ActionRenderer {
         this.hass,
         this.entityReg,
         this.labelReg,
+        this.floorReg,
         data,
         actionType
       ),
@@ -486,7 +493,13 @@ class ActionRenderer {
 
     const name =
       repeatConfig.alias ||
-      describeAction(this.hass, this.entityReg, this.labelReg, repeatConfig);
+      describeAction(
+        this.hass,
+        this.entityReg,
+        this.labelReg,
+        this.floorReg,
+        repeatConfig
+      );
 
     this._renderEntry(repeatPath, name, undefined, disabled);
 
@@ -584,6 +597,7 @@ class ActionRenderer {
           this.hass,
           this.entityReg,
           this.labelReg,
+          this.floorReg,
           sequenceConfig,
           "sequence"
         ),
@@ -680,6 +694,10 @@ export class HaAutomationTracer extends LitElement {
   @consume({ context: labelsContext, subscribe: true })
   _labelReg!: LabelRegistryEntry[];
 
+  @state()
+  @consume({ context: floorsContext, subscribe: true })
+  _floorReg!: FloorRegistryEntry[];
+
   protected render() {
     if (!this.trace) {
       return nothing;
@@ -697,6 +715,7 @@ export class HaAutomationTracer extends LitElement {
       this.hass,
       this._entityReg,
       this._labelReg,
+      this._floorReg,
       entries,
       this.trace,
       logbookRenderer,

src/data/assist_satellite.ts

@@ -1,81 +0,0 @@
-import { HassEntity } from "home-assistant-js-websocket";
-import { HomeAssistant } from "../types";
-import { supportsFeature } from "../common/entity/supports-feature";
-import { UNAVAILABLE } from "./entity";
-
-export const enum AssistSatelliteEntityFeature {
-  ANNOUNCE = 1,
-}
-
-export interface WakeWordInterceptMessage {
-  wake_word_phrase: string;
-}
-
-export interface WakeWordOption {
-  id: string;
-  wake_word: string;
-  trained_languages: string[];
-}
-
-export interface AssistSatelliteConfiguration {
-  active_wake_words: string[];
-  available_wake_words: WakeWordOption[];
-  max_active_wake_words: number;
-  pipeline_entity_id: string;
-  vad_entity_id: string;
-}
-
-export const interceptWakeWord = (
-  hass: HomeAssistant,
-  entity_id: string,
-  callback: (result: WakeWordInterceptMessage) => void
-) =>
-  hass.connection.subscribeMessage(callback, {
-    type: "assist_satellite/intercept_wake_word",
-    entity_id,
-  });
-
-export const testAssistSatelliteConnection = (
-  hass: HomeAssistant,
-  entity_id: string
-) =>
-  hass.callWS<{
-    status: "success" | "timeout";
-  }>({
-    type: "assist_satellite/test_connection",
-    entity_id,
-  });
-
-export const assistSatelliteAnnounce = (
-  hass: HomeAssistant,
-  entity_id: string,
-  message: string
-) =>
-  hass.callService("assist_satellite", "announce", { message }, { entity_id });
-
-export const fetchAssistSatelliteConfiguration = (
-  hass: HomeAssistant,
-  entity_id: string
-) =>
-  hass.callWS<AssistSatelliteConfiguration>({
-    type: "assist_satellite/get_configuration",
-    entity_id,
-  });
-
-export const setWakeWords = (
-  hass: HomeAssistant,
-  entity_id: string,
-  wake_word_ids: string[]
-) =>
-  hass.callWS({
-    type: "assist_satellite/set_wake_words",
-    entity_id,
-    wake_word_ids,
-  });
-
-export const assistSatelliteSupportsSetupFlow = (
-  assistSatelliteEntity: HassEntity | undefined
-) =>
-  assistSatelliteEntity &&
-  assistSatelliteEntity.state !== UNAVAILABLE &&
-  supportsFeature(assistSatelliteEntity, AssistSatelliteEntityFeature.ANNOUNCE);

src/data/automation.ts

@@ -3,7 +3,6 @@ import {
   HassEntityBase,
 } from "home-assistant-js-websocket";
 import { navigate } from "../common/navigate";
-import { ensureArray } from "../common/array/ensure-array";
 import { Context, HomeAssistant } from "../types";
 import { BlueprintInput } from "./blueprint";
 import { DeviceCondition, DeviceTrigger } from "./device_automation";
@@ -27,14 +26,8 @@ export interface ManualAutomationConfig {
   id?: string;
   alias?: string;
   description?: string;
-  triggers: Trigger | Trigger[];
+  trigger: Trigger | Trigger[];
-  /** @deprecated Use `triggers` instead */
-  trigger?: Trigger | Trigger[];
-  conditions?: Condition | Condition[];
-  /** @deprecated Use `conditions` instead */
   condition?: Condition | Condition[];
-  actions: Action | Action[];
-  /** @deprecated Use `actions` instead */
   action?: Action | Action[];
   mode?: (typeof MODES)[number];
   max?: number;
@@ -69,22 +62,16 @@ export interface ContextConstraint {
   user_id?: string | string[];
 }
 
-export interface TriggerList {
-  triggers: Trigger | Trigger[] | undefined;
-}
-
 export interface BaseTrigger {
   alias?: string;
-  /** @deprecated Use `trigger` instead */
+  platform: string;
-  platform?: string;
-  trigger: string;
   id?: string;
   variables?: Record<string, unknown>;
   enabled?: boolean;
 }
 
 export interface StateTrigger extends BaseTrigger {
-  trigger: "state";
+  platform: "state";
   entity_id: string | string[];
   attribute?: string;
   from?: string | string[];
@@ -93,25 +80,25 @@ export interface StateTrigger extends BaseTrigger {
 }
 
 export interface MqttTrigger extends BaseTrigger {
-  trigger: "mqtt";
+  platform: "mqtt";
   topic: string;
   payload?: string;
 }
 
 export interface GeoLocationTrigger extends BaseTrigger {
-  trigger: "geo_location";
+  platform: "geo_location";
   source: string;
   zone: string;
   event: "enter" | "leave";
 }
 
 export interface HassTrigger extends BaseTrigger {
-  trigger: "homeassistant";
+  platform: "homeassistant";
   event: "start" | "shutdown";
 }
 
 export interface NumericStateTrigger extends BaseTrigger {
-  trigger: "numeric_state";
+  platform: "numeric_state";
   entity_id: string | string[];
   attribute?: string;
   above?: number;
@@ -121,69 +108,69 @@ export interface NumericStateTrigger extends BaseTrigger {
 }
 
 export interface ConversationTrigger extends BaseTrigger {
-  trigger: "conversation";
+  platform: "conversation";
   command: string | string[];
 }
 
 export interface SunTrigger extends BaseTrigger {
-  trigger: "sun";
+  platform: "sun";
   offset: number;
   event: "sunrise" | "sunset";
 }
 
 export interface TimePatternTrigger extends BaseTrigger {
-  trigger: "time_pattern";
+  platform: "time_pattern";
   hours?: number | string;
   minutes?: number | string;
   seconds?: number | string;
 }
 
 export interface WebhookTrigger extends BaseTrigger {
-  trigger: "webhook";
+  platform: "webhook";
   webhook_id: string;
   allowed_methods?: string[];
   local_only?: boolean;
 }
 
 export interface PersistentNotificationTrigger extends BaseTrigger {
-  trigger: "persistent_notification";
+  platform: "persistent_notification";
   notification_id?: string;
   update_type?: string[];
 }
 
 export interface ZoneTrigger extends BaseTrigger {
-  trigger: "zone";
+  platform: "zone";
   entity_id: string;
   zone: string;
   event: "enter" | "leave";
 }
 
 export interface TagTrigger extends BaseTrigger {
-  trigger: "tag";
+  platform: "tag";
   tag_id: string;
   device_id?: string;
 }
 
 export interface TimeTrigger extends BaseTrigger {
-  trigger: "time";
+  platform: "time";
   at: string;
 }
 
 export interface TemplateTrigger extends BaseTrigger {
-  trigger: "template";
+  platform: "template";
   value_template: string;
   for?: string | number | ForDict;
 }
 
 export interface EventTrigger extends BaseTrigger {
-  trigger: "event";
+  platform: "event";
   event_type: string;
   event_data?: any;
   context?: ContextConstraint;
 }
 
 export interface CalendarTrigger extends BaseTrigger {
-  trigger: "calendar";
+  platform: "calendar";
   event: "start" | "end";
   entity_id: string;
   offset: string;
@@ -206,8 +193,7 @@ export type Trigger =
   | TemplateTrigger
   | EventTrigger
   | DeviceTrigger
-  | CalendarTrigger
+  | CalendarTrigger;
-  | TriggerList;
 
 interface BaseCondition {
   condition: string;
@@ -371,97 +357,22 @@ export const normalizeAutomationConfig = <
 >(
   config: T
 ): T => {
-  config = migrateAutomationConfig(config);
-
   // Normalize data: ensure triggers, actions and conditions are lists
   // Happens when people copy paste their automations into the config
-  for (const key of ["triggers", "conditions", "actions"]) {
+  for (const key of ["trigger", "condition", "action"]) {
     const value = config[key];
     if (value && !Array.isArray(value)) {
       config[key] = [value];
     }
   }
 
-  return config;
+  if (config.action) {
-};
+    config.action = migrateAutomationAction(config.action);
-
-export const migrateAutomationConfig = <
-  T extends Partial<AutomationConfig> | AutomationConfig,
->(
-  config: T
-) => {
-  if ("trigger" in config) {
-    if (!("triggers" in config)) {
-      config.triggers = config.trigger;
-    }
-    delete config.trigger;
-  }
-  if ("condition" in config) {
-    if (!("conditions" in config)) {
-      config.conditions = config.condition;
-    }
-    delete config.condition;
-  }
-  if ("action" in config) {
-    if (!("actions" in config)) {
-      config.actions = config.action;
-    }
-    delete config.action;
-  }
-
-  if (config.triggers) {
-    config.triggers = migrateAutomationTrigger(config.triggers);
-  }
-
-  if (config.actions) {
-    config.actions = migrateAutomationAction(config.actions);
   }
 
   return config;
 };
 
-export const migrateAutomationTrigger = (
-  trigger: Trigger | Trigger[]
-): Trigger | Trigger[] => {
-  if (Array.isArray(trigger)) {
-    return trigger.map(migrateAutomationTrigger) as Trigger[];
-  }
-
-  if ("triggers" in trigger && trigger.triggers) {
-    trigger.triggers = migrateAutomationTrigger(trigger.triggers);
-  }
-
-  if ("platform" in trigger) {
-    if (!("trigger" in trigger)) {
-      // @ts-ignore
-      trigger.trigger = trigger.platform;
-    }
-    delete trigger.platform;
-  }
-  return trigger;
-};
-
-export const flattenTriggers = (
-  triggers: undefined | Trigger | Trigger[]
-): Trigger[] => {
-  if (!triggers) {
-    return [];
-  }
-
-  const flatTriggers: Trigger[] = [];
-
-  ensureArray(triggers).forEach((t) => {
-    if ("triggers" in t) {
-      if (t.triggers) {
-        flatTriggers.push(...flattenTriggers(t.triggers));
-      }
-    } else {
-      flatTriggers.push(t);
-    }
-  });
-  return flatTriggers;
-};
-
 export const showAutomationEditor = (data?: Partial<AutomationConfig>) => {
   initialAutomationEditorData = data;
   navigate("/config/automation/edit/new");

src/data/automation_i18n.ts

@@ -22,7 +22,6 @@ import {
   formatListWithAnds,
   formatListWithOrs,
 } from "../common/string/format-list";
-import { isTriggerList } from "./trigger";
 
 const triggerTranslationBaseKey =
   "ui.panel.config.automation.editor.triggers.type";
@@ -69,18 +68,9 @@ export const describeTrigger = (
   hass: HomeAssistant,
   entityRegistry: EntityRegistryEntry[],
   ignoreAlias = false
-): string => {
+) => {
   try {
-    const description = tryDescribeTrigger(
+    return tryDescribeTrigger(trigger, hass, entityRegistry, ignoreAlias);
-      trigger,
-      hass,
-      entityRegistry,
-      ignoreAlias
-    );
-    if (typeof description !== "string") {
-      throw new Error(String(description));
-    }
-    return description;
   } catch (error: any) {
     // eslint-disable-next-line no-console
     console.error(error);
@@ -99,26 +89,12 @@ const tryDescribeTrigger = (
   entityRegistry: EntityRegistryEntry[],
   ignoreAlias = false
 ) => {
-  if (isTriggerList(trigger)) {
-    const triggers = ensureArray(trigger.triggers);
-
-    if (!triggers || triggers.length === 0) {
-      return hass.localize(
-        `${triggerTranslationBaseKey}.list.description.no_trigger`
-      );
-    }
-    const count = triggers.length;
-    return hass.localize(`${triggerTranslationBaseKey}.list.description.full`, {
-      count: count,
-    });
-  }
-
   if (trigger.alias && !ignoreAlias) {
     return trigger.alias;
   }
 
   // Event Trigger
-  if (trigger.trigger === "event" && trigger.event_type) {
+  if (trigger.platform === "event" && trigger.event_type) {
     const eventTypes: string[] = [];
 
     if (Array.isArray(trigger.event_type)) {
@@ -137,7 +113,7 @@ const tryDescribeTrigger = (
   }
 
   // Home Assistant Trigger
-  if (trigger.trigger === "homeassistant" && trigger.event) {
+  if (trigger.platform === "homeassistant" && trigger.event) {
     return hass.localize(
       trigger.event === "start"
         ? `${triggerTranslationBaseKey}.homeassistant.description.started`
@@ -146,7 +122,7 @@ const tryDescribeTrigger = (
   }
 
   // Numeric State Trigger
-  if (trigger.trigger === "numeric_state" && trigger.entity_id) {
+  if (trigger.platform === "numeric_state" && trigger.entity_id) {
     const entities: string[] = [];
     const states = hass.states;
 
@@ -221,7 +197,7 @@ const tryDescribeTrigger = (
   }
 
   // State Trigger
-  if (trigger.trigger === "state") {
+  if (trigger.platform === "state") {
     const entities: string[] = [];
     const states = hass.states;
 
@@ -344,7 +320,7 @@ const tryDescribeTrigger = (
   }
 
   // Sun Trigger
-  if (trigger.trigger === "sun" && trigger.event) {
+  if (trigger.platform === "sun" && trigger.event) {
     let duration = "";
     if (trigger.offset) {
       if (typeof trigger.offset === "number") {
@@ -365,12 +341,12 @@ const tryDescribeTrigger = (
   }
 
   // Tag Trigger
-  if (trigger.trigger === "tag") {
+  if (trigger.platform === "tag") {
     return hass.localize(`${triggerTranslationBaseKey}.tag.description.full`);
   }
 
   // Time Trigger
-  if (trigger.trigger === "time" && trigger.at) {
+  if (trigger.platform === "time" && trigger.at) {
     const result = ensureArray(trigger.at).map((at) =>
       typeof at !== "string"
         ? at
@@ -385,7 +361,7 @@ const tryDescribeTrigger = (
   }
 
   // Time Pattern Trigger
-  if (trigger.trigger === "time_pattern") {
+  if (trigger.platform === "time_pattern") {
     if (!trigger.seconds && !trigger.minutes && !trigger.hours) {
       return hass.localize(
         `${triggerTranslationBaseKey}.time_pattern.description.initial`
@@ -562,7 +538,7 @@ const tryDescribeTrigger = (
   }
 
   // Zone Trigger
-  if (trigger.trigger === "zone" && trigger.entity_id && trigger.zone) {
+  if (trigger.platform === "zone" && trigger.entity_id && trigger.zone) {
     const entities: string[] = [];
     const zones: string[] = [];
 
@@ -605,7 +581,7 @@ const tryDescribeTrigger = (
   }
 
   // Geo Location Trigger
-  if (trigger.trigger === "geo_location" && trigger.source && trigger.zone) {
+  if (trigger.platform === "geo_location" && trigger.source && trigger.zone) {
     const sources: string[] = [];
     const zones: string[] = [];
     const states = hass.states;
@@ -644,12 +620,12 @@ const tryDescribeTrigger = (
   }
 
   // MQTT Trigger
-  if (trigger.trigger === "mqtt") {
+  if (trigger.platform === "mqtt") {
     return hass.localize(`${triggerTranslationBaseKey}.mqtt.description.full`);
   }
 
   // Template Trigger
-  if (trigger.trigger === "template") {
+  if (trigger.platform === "template") {
     let duration = "";
     if (trigger.for) {
       duration = describeDuration(hass.locale, trigger.for) ?? "";
@@ -662,14 +638,14 @@ const tryDescribeTrigger = (
   }
 
   // Webhook Trigger
-  if (trigger.trigger === "webhook") {
+  if (trigger.platform === "webhook") {
     return hass.localize(
       `${triggerTranslationBaseKey}.webhook.description.full`
     );
   }
 
   // Conversation Trigger
-  if (trigger.trigger === "conversation") {
+  if (trigger.platform === "conversation") {
     if (!trigger.command) {
       return hass.localize(
         `${triggerTranslationBaseKey}.conversation.description.empty`
@@ -688,14 +664,14 @@ const tryDescribeTrigger = (
   }
 
   // Persistent Notification Trigger
-  if (trigger.trigger === "persistent_notification") {
+  if (trigger.platform === "persistent_notification") {
     return hass.localize(
       `${triggerTranslationBaseKey}.persistent_notification.description.full`
     );
   }
 
   // Device Trigger
-  if (trigger.trigger === "device" && trigger.device_id) {
+  if (trigger.platform === "device" && trigger.device_id) {
     const config = trigger as DeviceTrigger;
     const localized = localizeDeviceAutomationTrigger(
       hass,
@@ -713,7 +689,7 @@ const tryDescribeTrigger = (
 
   return (
     hass.localize(
-      `ui.panel.config.automation.editor.triggers.type.${trigger.trigger}.label`
+      `ui.panel.config.automation.editor.triggers.type.${trigger.platform}.label`
     ) ||
     hass.localize(`ui.panel.config.automation.editor.triggers.unknown_trigger`)
   );
@@ -724,18 +700,9 @@ export const describeCondition = (
   hass: HomeAssistant,
   entityRegistry: EntityRegistryEntry[],
   ignoreAlias = false
-): string => {
+) => {
   try {
-    const description = tryDescribeCondition(
+    return tryDescribeCondition(condition, hass, entityRegistry, ignoreAlias);
-      condition,
-      hass,
-      entityRegistry,
-      ignoreAlias
-    );
-    if (typeof description !== "string") {
-      throw new Error(String(description));
-    }
-    return description;
   } catch (error: any) {
     // eslint-disable-next-line no-console
     console.error(error);
@@ -922,14 +889,8 @@ const tryDescribeCondition = (
 
   // Numeric State Condition
   if (condition.condition === "numeric_state" && condition.entity_id) {
-    const entity_ids = ensureArray(condition.entity_id);
+    const stateObj = hass.states[condition.entity_id];
-    const stateObj = hass.states[entity_ids[0]];
+    const entity = stateObj ? computeStateName(stateObj) : condition.entity_id;
-    const entity = formatListWithAnds(
-      hass.locale,
-      entity_ids.map((id) =>
-        hass.states[id] ? computeStateName(hass.states[id]) : id || ""
-      )
-    );
 
     const attribute = condition.attribute
       ? computeAttributeNameDisplay(
@@ -944,9 +905,8 @@ const tryDescribeCondition = (
       return hass.localize(
         `${conditionsTranslationBaseKey}.numeric_state.description.above-below`,
         {
-          attribute,
+          attribute: attribute,
-          entity,
+          entity: entity,
-          numberOfEntities: entity_ids.length,
           above: condition.above,
           below: condition.below,
         }
@@ -956,9 +916,8 @@ const tryDescribeCondition = (
       return hass.localize(
         `${conditionsTranslationBaseKey}.numeric_state.description.above`,
         {
-          attribute,
+          attribute: attribute,
-          entity,
+          entity: entity,
-          numberOfEntities: entity_ids.length,
           above: condition.above,
         }
       );
@@ -967,9 +926,8 @@ const tryDescribeCondition = (
       return hass.localize(
         `${conditionsTranslationBaseKey}.numeric_state.description.below`,
         {
-          attribute,
+          attribute: attribute,
-          entity,
+          entity: entity,
-          numberOfEntities: entity_ids.length,
           below: condition.below,
         }
       );

src/data/config.ts

@@ -10,7 +10,7 @@ interface InvalidConfig {
   error: string;
 }
 
-type ValidKeys = "triggers" | "actions" | "conditions";
+type ValidKeys = "trigger" | "action" | "condition";
 
 export const validateConfig = <
   T extends Partial<{ [key in ValidKeys]: unknown }>,

src/data/context.ts

@@ -2,6 +2,7 @@ import { createContext } from "@lit-labs/context";
 import { HassConfig } from "home-assistant-js-websocket";
 import { HomeAssistant } from "../types";
 import { EntityRegistryEntry } from "./entity_registry";
+import { FloorRegistryEntry } from "./floor_registry";
 import { LabelRegistryEntry } from "./label_registry";
 
 export const connectionContext =
@@ -27,4 +28,6 @@ export const panelsContext = createContext<HomeAssistant["panels"]>("panels");
 export const fullEntitiesContext =
   createContext<EntityRegistryEntry[]>("extendedEntities");
 
+export const floorsContext = createContext<FloorRegistryEntry[]>("floors");
+
 export const labelsContext = createContext<LabelRegistryEntry[]>("labels");

src/data/data_table_filters.ts

@@ -1,20 +1,10 @@
 export interface DataTableFilters {
   [key: string]: {
-    value: DataTableFiltersValue;
+    value: string[] | { key: string[] } | undefined;
     items: Set<string> | undefined;
   };
 }
 
-export type DataTableFiltersValue = string[] | { key: string[] } | undefined;
-
-export interface DataTableFiltersValues {
-  [key: string]: DataTableFiltersValue;
-}
-
-export interface DataTableFiltersItems {
-  [key: string]: Set<string> | undefined;
-}
-
 export const serializeFilters = (value: DataTableFilters) => {
   const serializedValue = {};
   Object.entries(value).forEach(([key, val]) => {

src/data/device_automation.ts

@@ -1,7 +1,7 @@
 import { computeStateName } from "../common/entity/compute_state_name";
 import type { HaFormSchema } from "../components/ha-form/types";
 import { HomeAssistant } from "../types";
-import { BaseTrigger, migrateAutomationTrigger } from "./automation";
+import { BaseTrigger } from "./automation";
 import {
   computeEntityRegistryName,
   entityRegistryByEntityId,
@@ -31,7 +31,7 @@ export interface DeviceCondition extends DeviceAutomation {
 
 export type DeviceTrigger = DeviceAutomation &
   BaseTrigger & {
-    trigger: "device";
+    platform: "device";
   };
 
 export interface DeviceCapabilities {
@@ -51,12 +51,10 @@ export const fetchDeviceConditions = (hass: HomeAssistant, deviceId: string) =>
   });
 
 export const fetchDeviceTriggers = (hass: HomeAssistant, deviceId: string) =>
-  hass
+  hass.callWS<DeviceTrigger[]>({
-    .callWS<DeviceTrigger[]>({
     type: "device_automation/trigger/list",
     device_id: deviceId,
-    })
+  });
-    .then((triggers) => migrateAutomationTrigger(triggers) as DeviceTrigger[]);
 
 export const fetchDeviceActionCapabilities = (
   hass: HomeAssistant,
@@ -93,7 +91,7 @@ const deviceAutomationIdentifiers = [
   "subtype",
   "event",
   "condition",
-  "trigger",
+  "platform",
 ];
 
 export const deviceAutomationsEqual = (

src/data/floor_registry.ts

@@ -1,4 +1,7 @@
+import { Connection, createCollection } from "home-assistant-js-websocket";
+import { Store } from "home-assistant-js-websocket/dist/store";
 import { stringCompare } from "../common/string/compare";
+import { debounce } from "../common/util/debounce";
 import { HomeAssistant } from "../types";
 import { AreaRegistryEntry } from "./area_registry";
 import { RegistryEntry } from "./registry";
@@ -24,6 +27,48 @@ export interface FloorRegistryEntryMutableParams {
   aliases?: string[];
 }
 
+const fetchFloorRegistry = (conn: Connection) =>
+  conn
+    .sendMessagePromise({
+      type: "config/floor_registry/list",
+    })
+    .then((floors) =>
+      (floors as FloorRegistryEntry[]).sort((ent1, ent2) => {
+        if (ent1.level !== ent2.level) {
+          return (ent1.level ?? 9999) - (ent2.level ?? 9999);
+        }
+        return stringCompare(ent1.name, ent2.name);
+      })
+    );
+
+const subscribeFloorRegistryUpdates = (
+  conn: Connection,
+  store: Store<FloorRegistryEntry[]>
+) =>
+  conn.subscribeEvents(
+    debounce(
+      () =>
+        fetchFloorRegistry(conn).then((areas: FloorRegistryEntry[]) =>
+          store.setState(areas, true)
+        ),
+      500,
+      true
+    ),
+    "floor_registry_updated"
+  );
+
+export const subscribeFloorRegistry = (
+  conn: Connection,
+  onChange: (floors: FloorRegistryEntry[]) => void
+) =>
+  createCollection<FloorRegistryEntry[]>(
+    "_floorRegistry",
+    fetchFloorRegistry,
+    subscribeFloorRegistryUpdates,
+    conn,
+    onChange
+  );
+
 export const createFloorRegistryEntry = (
   hass: HomeAssistant,
   values: FloorRegistryEntryMutableParams

src/data/lovelace/config/section.ts

@@ -3,13 +3,10 @@ import type { LovelaceCardConfig } from "./card";
 import type { LovelaceStrategyConfig } from "./strategy";
 
 export interface LovelaceBaseSectionConfig {
+  title?: string;
   visibility?: Condition[];
   column_span?: number;
   row_span?: number;
-  /**
-   * @deprecated Use heading card instead.
-   */
-  title?: string;
 }
 
 export interface LovelaceSectionConfig extends LovelaceBaseSectionConfig {

src/data/matter.ts

@@ -2,8 +2,6 @@ import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { navigate } from "../common/navigate";
 import { HomeAssistant } from "../types";
 import { subscribeDeviceRegistry } from "./device_registry";
-import { isComponentLoaded } from "../common/config/is_component_loaded";
-import { getThreadDataSetTLV, listThreadDataSets } from "./thread";
 
 export enum NetworkType {
   THREAD = "thread",
@@ -53,31 +51,10 @@ export interface MatterCommissioningParameters {
 export const canCommissionMatterExternal = (hass: HomeAssistant) =>
   hass.auth.external?.config.canCommissionMatter;
 
-export const startExternalCommissioning = async (hass: HomeAssistant) => {
+export const startExternalCommissioning = (hass: HomeAssistant) =>
-  if (isComponentLoaded(hass, "thread")) {
+  hass.auth.external!.fireMessage({
-    const datasets = await listThreadDataSets(hass);
-    const preferredDataset = datasets.datasets.find(
-      (dataset) => dataset.preferred
-    );
-    if (preferredDataset) {
-      return hass.auth.external!.fireMessage({
-        type: "matter/commission",
-        payload: {
-          active_operational_dataset: (
-            await getThreadDataSetTLV(hass, preferredDataset.dataset_id)
-          ).tlv,
-          border_agent_id: preferredDataset.preferred_border_agent_id,
-          mac_extended_address: preferredDataset.preferred_extended_address,
-          extended_pan_id: preferredDataset.extended_pan_id,
-        },
-      });
-    }
-  }
-
-  return hass.auth.external!.fireMessage({
     type: "matter/commission",
   });
-};
 
 export const redirectOnNewMatterDevice = (
   hass: HomeAssistant,

src/data/media-player.ts

@@ -245,8 +245,7 @@ export const computeMediaDescription = (
       secondaryTitle = stateObj.attributes.media_artist!;
       break;
     case "playlist":
-      secondaryTitle =
+      secondaryTitle = stateObj.attributes.media_playlist!;
-        stateObj.attributes.media_playlist || stateObj.attributes.media_artist!;
       break;
     case "tvshow":
       secondaryTitle = stateObj.attributes.media_series_title!;

src/data/recorder.ts

@@ -47,19 +47,11 @@ export interface StatisticsMetaData {
   unit_class: string | null;
 }
 
-export const STATISTIC_TYPES: StatisticsValidationResult["type"][] = [
-  "entity_not_recorded",
-  "entity_no_longer_recorded",
-  "state_class_removed",
-  "units_changed",
-  "no_state",
-];
-
 export type StatisticsValidationResult =
   | StatisticsValidationResultNoState
   | StatisticsValidationResultEntityNotRecorded
   | StatisticsValidationResultEntityNoLongerRecorded
-  | StatisticsValidationResultStateClassRemoved
+  | StatisticsValidationResultUnsupportedStateClass
   | StatisticsValidationResultUnitsChanged;
 
 export interface StatisticsValidationResultNoState {
@@ -77,9 +69,9 @@ export interface StatisticsValidationResultEntityNotRecorded {
   data: { statistic_id: string };
 }
 
-export interface StatisticsValidationResultStateClassRemoved {
+export interface StatisticsValidationResultUnsupportedStateClass {
-  type: "state_class_removed";
+  type: "unsupported_state_class";
-  data: { statistic_id: string };
+  data: { statistic_id: string; state_class: string };
 }
 
 export interface StatisticsValidationResultUnitsChanged {
@@ -332,6 +324,3 @@ export const getDisplayUnit = (
 
 export const isExternalStatistic = (statisticsId: string): boolean =>
   statisticsId.includes(":");
-
-export const updateStatisticsIssues = (hass: HomeAssistant) =>
-  hass.callWS({ type: "recorder/update_statistics_issues" });

src/data/script.ts

@@ -20,7 +20,6 @@ import { navigate } from "../common/navigate";
 import { HomeAssistant } from "../types";
 import {
   Condition,
-  migrateAutomationTrigger,
   ShorthandAndCondition,
   ShorthandNotCondition,
   ShorthandOrCondition,
@@ -405,7 +404,7 @@ export const getActionType = (action: Action): ActionType => {
   if ("set_conversation_response" in action) {
     return "set_conversation_response";
   }
-  if ("action" in action || "service" in action) {
+  if ("action" in action) {
     if ("metadata" in action) {
       if (is(action, activateSceneActionStruct)) {
         return "activate_scene";
@@ -481,10 +480,5 @@ export const migrateAutomationAction = (
     }
   }
 
-  if (actionType === "wait_for_trigger") {
-    const _action = action as WaitForTriggerAction;
-    migrateAutomationTrigger(_action.wait_for_trigger);
-  }
-
   return action;
 };

src/data/script_i18n.ts

@@ -14,6 +14,7 @@ import {
   computeEntityRegistryName,
   entityRegistryById,
 } from "./entity_registry";
+import { FloorRegistryEntry } from "./floor_registry";
 import { domainToName } from "./integration";
 import { LabelRegistryEntry } from "./label_registry";
 import {
@@ -43,23 +44,21 @@ export const describeAction = <T extends ActionType>(
   hass: HomeAssistant,
   entityRegistry: EntityRegistryEntry[],
   labelRegistry: LabelRegistryEntry[],
+  floorRegistry: FloorRegistryEntry[],
   action: ActionTypes[T],
   actionType?: T,
   ignoreAlias = false
 ): string => {
   try {
-    const description = tryDescribeAction(
+    return tryDescribeAction(
       hass,
       entityRegistry,
       labelRegistry,
+      floorRegistry,
       action,
       actionType,
       ignoreAlias
     );
-    if (typeof description !== "string") {
-      throw new Error(String(description));
-    }
-    return description;
   } catch (error: any) {
     // eslint-disable-next-line no-console
     console.error(error);
@@ -75,6 +74,7 @@ const tryDescribeAction = <T extends ActionType>(
   hass: HomeAssistant,
   entityRegistry: EntityRegistryEntry[],
   labelRegistry: LabelRegistryEntry[],
+  floorRegistry: FloorRegistryEntry[],
   action: ActionTypes[T],
   actionType?: T,
   ignoreAlias = false
@@ -164,7 +164,9 @@ const tryDescribeAction = <T extends ActionType>(
               );
             }
           } else if (key === "floor_id") {
-            const floor = hass.floors[targetThing] ?? undefined;
+            const floor = floorRegistry.find(
+              (flr) => flr.floor_id === targetThing
+            );
             if (floor?.name) {
               targets.push(floor.name);
             } else {

src/data/selector.ts

@@ -454,11 +454,7 @@ export interface UiActionSelector {
 
 export interface UiColorSelector {
   // eslint-disable-next-line @typescript-eslint/ban-types
-  ui_color: {
+  ui_color: { default_color?: boolean } | null;
-    default_color?: string;
-    include_none?: boolean;
-    include_state?: boolean;
-  } | null;
 }
 
 export interface UiStateContentSelector {

src/data/timer.ts

@@ -72,8 +72,8 @@ export const timerTimeRemaining = (
 
   if (stateObj.state === "active") {
     const now = new Date().getTime();
-    const finishes = new Date(stateObj.attributes.finishes_at).getTime();
+    const madeActive = new Date(stateObj.last_changed).getTime();
-    timeRemaining = Math.max((finishes - now) / 1000, 0);
+    timeRemaining = Math.max(timeRemaining - (now - madeActive) / 1000, 0);
   }
 
   return timeRemaining;

src/data/trace.ts

@@ -3,7 +3,6 @@ import { Context, HomeAssistant } from "../types";
 import {
   BlueprintAutomationConfig,
   ManualAutomationConfig,
-  flattenTriggers,
 } from "./automation";
 import { BlueprintScriptConfig, ScriptConfig } from "./script";
 
@@ -187,26 +186,11 @@ export const getDataFromPath = (
     const asNumber = Number(raw);
 
     if (isNaN(asNumber)) {
-      let tempResult = result[raw];
+      const tempResult = result[raw];
       if (!tempResult && raw === "sequence") {
         continue;
       }
-
-      if (!tempResult && raw === "trigger") {
-        tempResult = result.triggers;
-      }
-      if (!tempResult && raw === "condition") {
-        tempResult = result.conditions;
-      }
-      if (!tempResult && raw === "action") {
-        tempResult = result.actions;
-      }
-
-      if (raw === "trigger") {
-        result = flattenTriggers(tempResult);
-      } else {
       result = tempResult;
-      }
       continue;
     }
 

src/data/trigger.ts

@@ -5,7 +5,6 @@ import {
   mdiCodeBraces,
   mdiDevices,
   mdiDotsHorizontal,
-  mdiFormatListBulleted,
   mdiGestureDoubleTap,
   mdiMapClock,
   mdiMapMarker,
@@ -22,7 +21,7 @@ import {
 } from "@mdi/js";
 
 import { mdiHomeAssistant } from "../resources/home-assistant-logo-svg";
-import { AutomationElementGroup, Trigger, TriggerList } from "./automation";
+import { AutomationElementGroup } from "./automation";
 
 export const TRIGGER_ICONS = {
   calendar: mdiCalendar,
@@ -42,7 +41,6 @@ export const TRIGGER_ICONS = {
   webhook: mdiWebhook,
   persistent_notification: mdiMessageAlert,
   zone: mdiMapMarkerRadius,
-  list: mdiFormatListBulleted,
 };
 
 export const TRIGGER_GROUPS: AutomationElementGroup = {
@@ -67,6 +65,3 @@ export const TRIGGER_GROUPS: AutomationElementGroup = {
     },
   },
 } as const;
-
-export const isTriggerList = (trigger: Trigger): trigger is TriggerList =>
-  "triggers" in trigger;

src/data/ws-floor_registry.ts

@@ -1,47 +0,0 @@
-import { Connection, createCollection } from "home-assistant-js-websocket";
-import { Store } from "home-assistant-js-websocket/dist/store";
-import { stringCompare } from "../common/string/compare";
-import { debounce } from "../common/util/debounce";
-import { FloorRegistryEntry } from "./floor_registry";
-
-const fetchFloorRegistry = (conn: Connection) =>
-  conn
-    .sendMessagePromise({
-      type: "config/floor_registry/list",
-    })
-    .then((floors) =>
-      (floors as FloorRegistryEntry[]).sort((ent1, ent2) => {
-        if (ent1.level !== ent2.level) {
-          return (ent1.level ?? 9999) - (ent2.level ?? 9999);
-        }
-        return stringCompare(ent1.name, ent2.name);
-      })
-    );
-
-const subscribeFloorRegistryUpdates = (
-  conn: Connection,
-  store: Store<FloorRegistryEntry[]>
-) =>
-  conn.subscribeEvents(
-    debounce(
-      () =>
-        fetchFloorRegistry(conn).then((areas: FloorRegistryEntry[]) =>
-          store.setState(areas, true)
-        ),
-      500,
-      true
-    ),
-    "floor_registry_updated"
-  );
-
-export const subscribeFloorRegistry = (
-  conn: Connection,
-  onChange: (floors: FloorRegistryEntry[]) => void
-) =>
-  createCollection<FloorRegistryEntry[]>(
-    "_floorRegistry",
-    fetchFloorRegistry,
-    subscribeFloorRegistryUpdates,
-    conn,
-    onChange
-  );

src/data/zwave_js.ts

@@ -252,7 +252,6 @@ export interface ZWaveJSNodeConfigParamMetadata {
   type: string;
   unit: string;
   states: { [key: number]: string };
-  default: any;
 }
 
 export interface ZWaveJSSetConfigParamData {

src/dialogs/config-flow/show-dialog-data-entry-flow.ts

@@ -31,11 +31,6 @@ export interface FlowConfig {
 
   deleteFlow(hass: HomeAssistant, flowId: string): Promise<unknown>;
 
-  renderAbortHeader?(
-    hass: HomeAssistant,
-    step: DataEntryFlowStepAbort
-  ): TemplateResult | string;
-
   renderAbortDescription(
     hass: HomeAssistant,
     step: DataEntryFlowStepAbort
@@ -44,7 +39,7 @@ export interface FlowConfig {
   renderShowFormStepHeader(
     hass: HomeAssistant,
     step: DataEntryFlowStepForm
-  ): string | TemplateResult;
+  ): string;
 
   renderShowFormStepDescription(
     hass: HomeAssistant,
@@ -100,17 +95,14 @@ export interface FlowConfig {
   renderShowFormProgressHeader(
     hass: HomeAssistant,
     step: DataEntryFlowStepProgress
-  ): string | TemplateResult;
+  ): string;
 
   renderShowFormProgressDescription(
     hass: HomeAssistant,
     step: DataEntryFlowStepProgress
   ): TemplateResult | "";
 
-  renderMenuHeader(
+  renderMenuHeader(hass: HomeAssistant, step: DataEntryFlowStepMenu): string;
-    hass: HomeAssistant,
-    step: DataEntryFlowStepMenu
-  ): string | TemplateResult;
 
   renderMenuDescription(
     hass: HomeAssistant,

src/dialogs/config-flow/step-flow-abort.ts

@@ -31,11 +31,7 @@ class StepFlowAbort extends LitElement {
       return nothing;
     }
     return html`
-      <h2>
+      <h2>${this.hass.localize(`component.${this.domain}.title`)}</h2>
-        ${this.params.flowConfig.renderAbortHeader
-          ? this.params.flowConfig.renderAbortHeader(this.hass, this.step)
-          : this.hass.localize(`component.${this.domain}.title`)}
-      </h2>
       <div class="content">
         ${this.params.flowConfig.renderAbortDescription(this.hass, this.step)}
       </div>

src/dialogs/config-flow/step-flow-create-entry.ts

@@ -1,14 +1,6 @@
 import "@material/mwc-button";
-import {
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-  css,
-  CSSResultGroup,
-  html,
-  LitElement,
-  PropertyValues,
-  TemplateResult,
-} from "lit";
 import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
 import "../../components/ha-area-picker";
 import { DataEntryFlowStepCreateEntry } from "../../data/data_entry_flow";
@@ -17,14 +9,10 @@ import {
   DeviceRegistryEntry,
   updateDeviceRegistryEntry,
 } from "../../data/device_registry";
-import { EntityRegistryDisplayEntry } from "../../data/entity_registry";
 import { HomeAssistant } from "../../types";
 import { showAlertDialog } from "../generic/show-dialog-box";
 import { FlowConfig } from "./show-dialog-data-entry-flow";
 import { configFlowContentStyles } from "./styles";
-import { computeDomain } from "../../common/entity/compute_domain";
-import { showVoiceAssistantSetupDialog } from "../voice-assistant-setup/show-voice-assistant-setup-dialog";
-import { assistSatelliteSupportsSetupFlow } from "../../data/assist_satellite";
 
 @customElement("step-flow-create-entry")
 class StepFlowCreateEntry extends LitElement {
@@ -36,46 +24,6 @@ class StepFlowCreateEntry extends LitElement {
 
   @property({ attribute: false }) public devices!: DeviceRegistryEntry[];
 
-  private _deviceEntities = memoizeOne(
-    (
-      deviceId: string,
-      entities: EntityRegistryDisplayEntry[],
-      domain?: string
-    ): EntityRegistryDisplayEntry[] =>
-      entities.filter(
-        (entity) =>
-          entity.device_id === deviceId &&
-          (!domain || computeDomain(entity.entity_id) === domain)
-      )
-  );
-
-  protected willUpdate(changedProps: PropertyValues) {
-    if (
-      (changedProps.has("devices") || changedProps.has("hass")) &&
-      this.devices.length === 1
-    ) {
-      // integration_type === "device"
-      const assistSatellites = this._deviceEntities(
-        this.devices[0].id,
-        Object.values(this.hass.entities),
-        "assist_satellite"
-      );
-      if (
-        assistSatellites.length &&
-        assistSatellites.some((satellite) =>
-          assistSatelliteSupportsSetupFlow(
-            this.hass.states[satellite.entity_id]
-          )
-        )
-      ) {
-        this._flowDone();
-        showVoiceAssistantSetupDialog(this, {
-          deviceId: this.devices[0].id,
-        });
-      }
-    }
-  }
-
   protected render(): TemplateResult {
     const localize = this.hass.localize;