Dev tools -> Templates: observe tip height with ResizeObserver

Replaces the per-render scrollHeight read from #52012 with a ResizeObserver started in firstUpdated, writing --tip-height directly to the host style. Removes the need for a manual refresh when the viewport crosses a wrap threshold, drops the unreachable isNaN check, and lets the @query decorator stand in for the editor-tip id.
Dev tools -> Templates: fix editor height (#52012 )
2026-05-14 13:17:19 +00:00 · 2026-05-14 15:40:18 +03:00 · 2026-05-14 15:34:23 +03:00 · 2026-05-14 12:26:36 +00:00 · 2026-05-14 15:19:52 +03:00 · 2026-05-14 08:51:19 +00:00
393 changed files with 7211 additions and 3539 deletions
@@ -58,6 +58,8 @@ jobs:
        run: yarn run lint:lit --quiet
      - name: Run prettier
        run: yarn run lint:prettier
+      - name: Check dependency licenses
+        run: yarn run lint:licenses
  test:
    name: Run tests
    runs-on: ubuntu-latest
@@ -41,14 +41,14 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
+        uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
        with:
          languages: ${{ matrix.language }}

      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
      # If this step fails, then you should remove it and run the build manually (see below)
      - name: Autobuild
-        uses: github/codeql-action/autobuild@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
+        uses: github/codeql-action/autobuild@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3

      # ℹ️ Command-line programs to run using the OS shell.
      # 📚 https://git.io/JvXDl
@@ -62,4 +62,4 @@ jobs:
      #   make release

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
+        uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
@@ -18,6 +18,6 @@ jobs:
      pull-requests: read
    runs-on: ubuntu-latest
    steps:
-      - uses: release-drafter/release-drafter@5de93583980a40bd78603b6dfdcda5b4df377b32 # v7.2.0
+      - uses: release-drafter/release-drafter@563bf132657a13ded0b01fcb723c5a58cdd824e2 # v7.2.1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -1,11 +1,16 @@
-compressionLevel: mixed
+approvedGitRepositories:
+  - "**"

-npmMinimalAgeGate: "3d"
+compressionLevel: mixed

 defaultSemverRangePrefix: ""

 enableGlobalCache: false

+enableScripts: true
+
 nodeLinker: node-modules

+npmMinimalAgeGate: 3d
+
 yarnPath: .yarn/releases/yarn-4.14.1.cjs
@@ -5,6 +5,7 @@ import "./compress.js";
 import "./entry-html.js";
 import "./gather-static.js";
 import "./gen-icons-json.js";
+import "./licenses.js";
 import "./locale-data.js";
 import "./service-worker.js";
 import "./translations.js";
@@ -36,7 +37,12 @@ gulp.task(
      process.env.NODE_ENV = "production";
    },
    "clean",
-    gulp.parallel("gen-icons-json", "build-translations", "build-locale-data"),
+    gulp.parallel(
+      "gen-icons-json",
+      "build-translations",
+      "build-locale-data",
+      "gen-licenses"
+    ),
    "copy-static-app",
    "rspack-prod-app",
    gulp.parallel("gen-pages-app-prod", "gen-service-worker-app-prod"),
@@ -1,3 +1,4 @@
+/* global process */
 // Tasks to generate entry HTML

 import {
@@ -25,6 +26,7 @@ const SAFARI_TO_MACOS = {
  16: [11, 0, 0],
  17: [12, 0, 0],
  18: [13, 0, 0],
+  26: [26, 0, 0],
 };

 const getCommonTemplateVars = () => {
@@ -0,0 +1,81 @@
+// Gulp task to generate third-party license notices.
+
+import { readFile, access } from "fs/promises";
+import { generateLicenseFile } from "generate-license-file";
+import gulp from "gulp";
+import path from "path";
+import paths from "../paths.cjs";
+
+const OUTPUT_FILE = path.join(
+  paths.app_output_static,
+  "third-party-licenses.txt"
+);
+
+// The echarts package ships an Apache-2.0 NOTICE file that must be
+// redistributed alongside the compiled output per Apache License §4(d).
+const NOTICE_FILES = [
+  path.resolve(paths.root_dir, "node_modules/echarts/NOTICE"),
+];
+
+// type-fest ships two license files (MIT for code, CC0 for types).
+// We use the MIT license since that covers the bundled code.
+//
+// Each entry is pinned to a specific version. If a package is updated,
+// this list must be reviewed and the version updated after verifying
+// that the new version's license still matches. The build will fail
+// if the installed version does not match the pinned version.
+const LICENSE_OVERRIDES = [
+  {
+    // type-fest ships two license files (MIT for code, CC0 for types).
+    // We use the MIT license since that covers the bundled code.
+    packageName: "type-fest",
+    version: "5.6.0",
+    licensePath: path.resolve(
+      paths.root_dir,
+      "node_modules/type-fest/license-mit"
+    ),
+  },
+];
+
+gulp.task("gen-licenses", async () => {
+  const licenseOverrides = {};
+
+  for (const { packageName, version, licensePath } of LICENSE_OVERRIDES) {
+    const pkgJsonPath = path.resolve(
+      paths.root_dir,
+      `node_modules/${packageName}/package.json`
+    );
+
+    let packageJSON;
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      packageJSON = JSON.parse(await readFile(pkgJsonPath, "utf-8"));
+    } catch {
+      throw new Error(
+        `package.json for "${packageName}" not found or unreadable at ${pkgJsonPath}`
+      );
+    }
+
+    if (packageJSON.version !== version) {
+      throw new Error(
+        `License override for "${packageName}" is pinned to version ${version}, but found version ${packageJSON.version}. ` +
+          `Please verify the new version's license and update the override in build-scripts/gulp/licenses.js.`
+      );
+    }
+
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      await access(licensePath);
+    } catch {
+      throw new Error(`License file not found or unreadable: ${licensePath}`);
+    }
+
+    licenseOverrides[`${packageName}@${version}`] = licensePath;
+  }
+
+  await generateLicenseFile(
+    path.resolve(paths.root_dir, "package.json"),
+    OUTPUT_FILE,
+    { append: NOTICE_FILES, replace: licenseOverrides }
+  );
+});
@@ -1,6 +1,7 @@
 import {
  addDays,
  addHours,
+  addMinutes,
  addMonths,
  differenceInHours,
  endOfDay,
@@ -12,6 +13,19 @@ import type {
 } from "../../../src/data/recorder";
 import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";

+const getNextDate = (
+  currentDate: Date,
+  period: "5minute" | "hour" | "day" | "month"
+): Date => {
+  return period === "day"
+    ? addDays(currentDate, 1)
+    : period === "month"
+      ? addMonths(currentDate, 1)
+      : period === "hour"
+        ? addHours(currentDate, 1)
+        : addMinutes(currentDate, 5);
+};
+
 const generateMeanStatistics = (
  start: Date,
  end: Date,
@@ -25,9 +39,10 @@ const generateMeanStatistics = (
  while (end > currentDate && currentDate < now) {
    const delta = Math.random() * maxDiff;
    const mean = delta;
+    const nextDate = getNextDate(currentDate, period);
    statistics.push({
      start: currentDate.getTime(),
-      end: currentDate.getTime(),
+      end: nextDate.getTime(),
      mean,
      min: mean - Math.random() * maxDiff,
      max: mean + Math.random() * maxDiff,
@@ -35,12 +50,7 @@ const generateMeanStatistics = (
      state: mean,
      sum: null,
    });
-    currentDate =
-      period === "day"
-        ? addDays(currentDate, 1)
-        : period === "month"
-          ? addMonths(currentDate, 1)
-          : addHours(currentDate, 1);
+    currentDate = nextDate;
  }
  return statistics;
 };
@@ -58,11 +68,12 @@ const generateSumStatistics = (
  let sum = initValue;
  const now = new Date();
  while (end > currentDate && currentDate < now) {
+    const nextDate = getNextDate(currentDate, period);
    const add = Math.random() * maxDiff;
    sum += add;
    statistics.push({
      start: currentDate.getTime(),
-      end: currentDate.getTime(),
+      end: nextDate.getTime(),
      mean: null,
      min: null,
      max: null,
@@ -71,12 +82,7 @@ const generateSumStatistics = (
      state: initValue + sum,
      sum,
    });
-    currentDate =
-      period === "day"
-        ? addDays(currentDate, 1)
-        : period === "month"
-          ? addMonths(currentDate, 1)
-          : addHours(currentDate, 1);
+    currentDate = nextDate;
  }
  return statistics;
 };
@@ -84,7 +90,7 @@ const generateSumStatistics = (
 const generateCurvedStatistics = (
  start: Date,
  end: Date,
-  _period: "5minute" | "hour" | "day" | "month" = "hour",
+  period: "5minute" | "hour" | "day" | "month" = "hour",
  initValue: number,
  maxDiff: number,
  metered: boolean
@@ -98,11 +104,12 @@ const generateCurvedStatistics = (
  let half = false;
  const now = new Date();
  while (end > currentDate && currentDate < now) {
+    const nextDate = getNextDate(currentDate, period);
    const add = i * (Math.random() * maxDiff);
    sum += add;
    statistics.push({
      start: currentDate.getTime(),
-      end: currentDate.getTime(),
+      end: nextDate.getTime(),
      mean: null,
      min: null,
      max: null,
@@ -111,7 +118,7 @@ const generateCurvedStatistics = (
      state: initValue + sum,
      sum: metered ? sum : null,
    });
-    currentDate = addHours(currentDate, 1);
+    currentDate = nextDate;
    if (!half && i > hours / 2) {
      half = true;
    }
@@ -289,7 +296,7 @@ const statisticsFunctions: Record<
      end,
      period,
      productionFinalVal,
-      2
+      0.2
    );
    return [...morning, ...production, ...evening, ...rest];
  },
@@ -14,6 +14,7 @@
    "format:prettier": "prettier . --cache --write",
    "lint:types": "tsc",
    "lint:lit": "lit-analyzer \"{.,*}/src/**/*.ts\"",
+    "lint:licenses": "node --no-deprecation script/check-licenses",
    "lint": "yarn run lint:eslint && yarn run lint:prettier && yarn run lint:types && yarn run lint:lit",
    "format": "yarn run format:eslint && yarn run format:prettier",
    "postinstall": "husky",
@@ -28,26 +29,26 @@
  "dependencies": {
    "@babel/runtime": "7.29.2",
    "@braintree/sanitize-url": "7.1.2",
-    "@codemirror/autocomplete": "6.20.1",
+    "@codemirror/autocomplete": "6.20.2",
    "@codemirror/commands": "6.10.3",
    "@codemirror/lang-jinja": "6.0.1",
    "@codemirror/lang-yaml": "6.1.3",
    "@codemirror/language": "6.12.3",
-    "@codemirror/lint": "6.9.5",
+    "@codemirror/lint": "6.9.6",
    "@codemirror/search": "6.7.0",
    "@codemirror/state": "6.6.0",
-    "@codemirror/view": "6.41.1",
+    "@codemirror/view": "6.42.1",
    "@date-fns/tz": "1.4.1",
    "@egjs/hammerjs": "2.0.17",
-    "@formatjs/intl-datetimeformat": "7.4.1",
-    "@formatjs/intl-displaynames": "7.3.4",
-    "@formatjs/intl-durationformat": "0.10.7",
-    "@formatjs/intl-getcanonicallocales": "3.2.5",
-    "@formatjs/intl-listformat": "8.3.4",
-    "@formatjs/intl-locale": "5.3.4",
-    "@formatjs/intl-numberformat": "9.3.4",
-    "@formatjs/intl-pluralrules": "6.3.4",
-    "@formatjs/intl-relativetimeformat": "12.3.4",
+    "@formatjs/intl-datetimeformat": "7.4.2",
+    "@formatjs/intl-displaynames": "7.3.5",
+    "@formatjs/intl-durationformat": "0.10.8",
+    "@formatjs/intl-getcanonicallocales": "3.2.6",
+    "@formatjs/intl-listformat": "8.3.5",
+    "@formatjs/intl-locale": "5.3.5",
+    "@formatjs/intl-numberformat": "9.3.5",
+    "@formatjs/intl-pluralrules": "6.3.5",
+    "@formatjs/intl-relativetimeformat": "12.3.5",
    "@fullcalendar/core": "6.1.20",
    "@fullcalendar/daygrid": "6.1.20",
    "@fullcalendar/interaction": "6.1.20",
@@ -80,7 +81,7 @@
    "@vibrant/color": "4.0.4",
    "@webcomponents/scoped-custom-element-registry": "0.0.10",
    "@webcomponents/webcomponentsjs": "2.8.0",
-    "barcode-detector": "3.1.2",
+    "barcode-detector": "3.1.3",
    "cally": "0.9.2",
    "color-name": "2.1.0",
    "comlink": "4.4.2",
@@ -99,7 +100,7 @@
    "hls.js": "1.6.16",
    "home-assistant-js-websocket": "9.6.0",
    "idb-keyval": "6.2.2",
-    "intl-messageformat": "11.2.3",
+    "intl-messageformat": "11.2.4",
    "js-yaml": "4.1.1",
    "leaflet": "1.9.4",
    "leaflet-draw": "patch:leaflet-draw@npm%3A1.0.4#./.yarn/patches/leaflet-draw-npm-1.0.4-0ca0ebcf65.patch",
@@ -121,28 +122,28 @@
    "superstruct": "2.0.2",
    "tinykeys": "3.0.0",
    "weekstart": "2.0.0",
-    "workbox-cacheable-response": "7.4.0",
-    "workbox-core": "7.4.0",
-    "workbox-expiration": "7.4.0",
-    "workbox-precaching": "7.4.0",
-    "workbox-routing": "7.4.0",
-    "workbox-strategies": "7.4.0",
+    "workbox-cacheable-response": "7.4.1",
+    "workbox-core": "7.4.1",
+    "workbox-expiration": "7.4.1",
+    "workbox-precaching": "7.4.1",
+    "workbox-routing": "7.4.1",
+    "workbox-strategies": "7.4.1",
    "xss": "1.0.15"
  },
  "devDependencies": {
    "@babel/core": "7.29.0",
    "@babel/helper-define-polyfill-provider": "0.6.8",
    "@babel/plugin-transform-runtime": "7.29.0",
-    "@babel/preset-env": "7.29.3",
+    "@babel/preset-env": "7.29.5",
    "@bundle-stats/plugin-webpack-filter": "4.22.1",
    "@eslint/js": "10.0.1",
    "@html-eslint/eslint-plugin": "0.60.0",
-    "@lokalise/node-api": "15.7.1",
+    "@lokalise/node-api": "16.0.0",
    "@octokit/auth-oauth-device": "8.0.3",
    "@octokit/plugin-retry": "8.1.0",
    "@octokit/rest": "22.0.1",
-    "@rsdoctor/rspack-plugin": "1.5.9",
-    "@rspack/core": "2.0.1",
+    "@rsdoctor/rspack-plugin": "1.5.11",
+    "@rspack/core": "2.0.2",
    "@rspack/dev-server": "2.0.1",
    "@types/babel__plugin-transform-runtime": "7.9.5",
    "@types/chromecast-caf-receiver": "6.0.26",
@@ -175,7 +176,8 @@
    "eslint-plugin-unused-imports": "4.4.1",
    "eslint-plugin-wc": "3.1.0",
    "fancy-log": "2.0.0",
-    "fs-extra": "11.3.4",
+    "fs-extra": "11.3.5",
+    "generate-license-file": "4.1.1",
    "glob": "13.0.6",
    "globals": "17.6.0",
    "gulp": "5.0.1",
@@ -186,7 +188,8 @@
    "husky": "9.1.7",
    "jsdom": "29.1.1",
    "jszip": "3.10.1",
-    "lint-staged": "16.4.0",
+    "license-checker-rseidelsohn": "4.4.2",
+    "lint-staged": "17.0.4",
    "lit-analyzer": "2.0.3",
    "lodash.merge": "4.6.2",
    "lodash.template": "4.18.1",
@@ -195,17 +198,17 @@
    "prettier": "3.8.3",
    "rspack-manifest-plugin": "5.2.1",
    "serve": "14.2.6",
-    "sinon": "21.1.2",
-    "tar": "7.5.13",
-    "terser-webpack-plugin": "5.5.0",
+    "sinon": "22.0.0",
+    "tar": "7.5.15",
+    "terser-webpack-plugin": "5.6.0",
    "ts-lit-plugin": "2.0.2",
    "typescript": "6.0.3",
-    "typescript-eslint": "8.59.1",
+    "typescript-eslint": "8.59.2",
    "vite-tsconfig-paths": "6.1.1",
    "vitest": "4.1.5",
    "webpack-stats-plugin": "1.1.3",
    "webpackbar": "7.0.0",
-    "workbox-build": "patch:workbox-build@npm%3A7.4.0#~/.yarn/patches/workbox-build-npm-7.4.0-c84561662c.patch"
+    "workbox-build": "patch:workbox-build@npm%3A7.4.1#~/.yarn/patches/workbox-build-npm-7.4.1-c84561662c.patch"
  },
  "resolutions": {
    "lit": "3.3.2",
@@ -0,0 +1,91 @@
+#!/usr/bin/env node
+// Checks that all production dependencies use approved open-source licenses.
+//
+// To allow a new license type, add its SPDX identifier to ALLOWED_LICENSES.
+// To allow a specific package that cannot be relicensed (e.g. a dual-license
+// package where the reported identifier is non-standard), add it to
+// ALLOWED_PACKAGES with a comment explaining why.
+
+import { createRequire } from "module";
+import { fileURLToPath } from "url";
+import path from "path";
+
+const require = createRequire(import.meta.url);
+const checker = require("license-checker-rseidelsohn");
+const root = path.resolve(fileURLToPath(import.meta.url), "../../");
+
+// Permissive licenses that are compatible with distribution in a compiled wheel.
+// Copyleft licenses (GPL, LGPL, AGPL, EUPL, etc.) must NOT be added here.
+const ALLOWED_LICENSES = new Set([
+  "MIT",
+  "MIT*",
+  "ISC",
+  "BSD-2-Clause",
+  "BSD-3-Clause",
+  "BSD*",
+  "Apache-2.0",
+  "0BSD",
+  "CC0-1.0",
+  "(MIT OR CC0-1.0)",
+  "(MIT AND Zlib)",
+  "Python-2.0", // argparse - Python Software Foundation License (permissive)
+  "Public Domain",
+  "W3C-20150513", // wicg-inert - W3C Software and Document License (permissive)
+  "Unlicense",
+  "CC-BY-4.0",
+]);
+
+// Packages whose license identifier is ambiguous or non-standard but have been
+// manually verified as permissive. Add only when strictly necessary.
+const ALLOWED_PACKAGES = {
+  // No entries currently needed.
+};
+
+checker.init(
+  {
+    start: root,
+    production: true,
+    excludePrivatePackages: true,
+  },
+  (err, packages) => {
+    if (err) {
+      console.error("license-checker failed:", err);
+      process.exit(1);
+    }
+
+    const violations = [];
+
+    for (const [nameAtVersion, info] of Object.entries(packages)) {
+      if (nameAtVersion in ALLOWED_PACKAGES) {
+        continue;
+      }
+
+      const license = info.licenses;
+
+      if (!ALLOWED_LICENSES.has(license)) {
+        violations.push({ package: nameAtVersion, license });
+      }
+    }
+
+    if (violations.length > 0) {
+      console.error(
+        "The following packages have licenses that are not on the allowlist:"
+      );
+      for (const { package: pkg, license } of violations) {
+        console.error(`  ${pkg}: ${license}`);
+      }
+      console.error(`
+If the license is permissive and appropriate for distribution, add it
+to ALLOWED_LICENSES in script/check-licenses. If it is a specific
+package with an ambiguous identifier, add it to ALLOWED_PACKAGES.
+
+Do NOT add copyleft licenses (GPL, LGPL, AGPL, etc.) to the allowlist.`);
+      process.exit(1);
+    }
+
+    const count = Object.keys(packages).length;
+    console.log(
+      `License check passed: all ${count} production dependencies use approved licenses.`
+    );
+  }
+);
@@ -0,0 +1,54 @@
+/**
+ * Walks up the composed tree (jumping shadow roots → their hosts), returning
+ * the ancestor chain top-down. Used to compare two nodes that may live in
+ * different shadow trees — `Node.compareDocumentPosition` only works within a
+ * single root and returns `DOCUMENT_POSITION_DISCONNECTED` otherwise.
+ */
+const composedAncestorPath = (node: Node): Node[] => {
+  const path: Node[] = [];
+  let cur: Node | null = node;
+  while (cur) {
+    path.push(cur);
+    const parent = cur.parentNode;
+    if (parent instanceof ShadowRoot) {
+      cur = parent.host;
+    } else if (parent) {
+      cur = parent;
+    } else {
+      const root = cur.getRootNode();
+      cur = root instanceof ShadowRoot ? root.host : null;
+    }
+  }
+  return path.reverse();
+};
+
+/**
+ * Document-order comparator that works across shadow boundaries. Suitable as
+ * the `Array.prototype.sort` callback for collections of nodes that may live
+ * in different shadow trees.
+ */
+export const compareNodeOrder = (a: Node, b: Node): number => {
+  if (a === b) {
+    return 0;
+  }
+  const pa = composedAncestorPath(a);
+  const pb = composedAncestorPath(b);
+  let i = 0;
+  while (i < pa.length && i < pb.length && pa[i] === pb[i]) {
+    i++;
+  }
+  if (i === 0) {
+    return 0;
+  }
+  if (i === pa.length) {
+    return -1;
+  }
+  if (i === pb.length) {
+    return 1;
+  }
+  // pa[i] and pb[i] are siblings under the LCA, guaranteed same root.
+  // eslint-disable-next-line no-bitwise
+  return pa[i].compareDocumentPosition(pb[i]) & Node.DOCUMENT_POSITION_FOLLOWING
+    ? -1
+    : 1;
+};
@@ -1,3 +1,17 @@
+import {
+  mdiBattery,
+  mdiBattery10,
+  mdiBattery20,
+  mdiBattery30,
+  mdiBattery40,
+  mdiBattery50,
+  mdiBattery60,
+  mdiBattery70,
+  mdiBattery80,
+  mdiBattery90,
+  mdiBatteryAlertVariantOutline,
+  mdiBatteryUnknown,
+} from "@mdi/js";
 import type { HassEntity } from "home-assistant-js-websocket";

 const BATTERY_ICONS = {
@@ -12,6 +26,18 @@ const BATTERY_ICONS = {
  90: "mdi:battery-90",
  100: "mdi:battery",
 };
+const BATTERY_ICON_PATHS = {
+  10: mdiBattery10,
+  20: mdiBattery20,
+  30: mdiBattery30,
+  40: mdiBattery40,
+  50: mdiBattery50,
+  60: mdiBattery60,
+  70: mdiBattery70,
+  80: mdiBattery80,
+  90: mdiBattery90,
+  100: mdiBattery,
+};
 const BATTERY_CHARGING_ICONS = {
  10: "mdi:battery-charging-10",
  20: "mdi:battery-charging-20",
@@ -57,3 +83,15 @@ export const batteryLevelIcon = (
  }
  return BATTERY_ICONS[batteryRound];
 };
+
+export const batteryLevelIconPath = (batteryLevel: number | string): string => {
+  const batteryValue = Number(batteryLevel);
+  if (isNaN(batteryValue)) {
+    return mdiBatteryUnknown;
+  }
+  if (batteryValue <= 5) {
+    return mdiBatteryAlertVariantOutline;
+  }
+  const batteryRound = Math.round(batteryValue / 10) * 10;
+  return BATTERY_ICON_PATHS[batteryRound];
+};
@@ -137,7 +137,10 @@ export const computeEntityPickerDisplay = (
    hass.floors
  );

-  const isRTL = computeRTL(hass);
+  const isRTL = computeRTL(
+    hass.language,
+    hass.translationMetadata.translations
+  );

  const primary = entityName || deviceName || stateObj.entity_id;
  const secondary =
@@ -117,9 +117,6 @@ export const generateEntityFilter = (
      }
    }
    if (entityCategories) {
-      if (!entity) {
-        return false;
-      }
      const category = entity?.entity_category || "none";
      if (!entityCategories.has(category)) {
        return false;
@@ -1,16 +1,20 @@
 import type { LitElement } from "lit";
-import type { HomeAssistant } from "../../types";
+import type { HomeAssistant, Translation } from "../../types";

-export function computeRTL(hass: HomeAssistant) {
-  const lang = hass.language || "en";
-  if (hass.translationMetadata.translations[lang]) {
-    return hass.translationMetadata.translations[lang].isRTL || false;
+export function computeRTL(
+  language = "en",
+  translations: Record<string, Translation>
+) {
+  if (translations[language]) {
+    return translations[language].isRTL || false;
  }
  return false;
 }

 export function computeRTLDirection(hass: HomeAssistant) {
-  return emitRTLDirection(computeRTL(hass));
+  return emitRTLDirection(
+    computeRTL(hass.language, hass.translationMetadata.translations)
+  );
 }

 export function emitRTLDirection(rtl: boolean) {
@@ -121,6 +121,7 @@ export class HaAutomationRowEventChip extends LitElement {
      align-items: center;
      --mdc-icon-size: 16px;
      line-height: 1;
+      box-shadow: var(--ha-box-shadow-s);
    }

    button {
@@ -124,6 +124,7 @@ export class HaAutomationRow extends LitElement {
  static styles = css`
    :host {
      display: block;
+      position: relative;
    }
    .row {
      display: flex;
@@ -194,7 +195,6 @@ export class HaAutomationRow extends LitElement {
    }
    ::slotted([slot="event"]) {
      position: absolute;
-      top: 13px;
      inset-inline-end: 0;
    }
    .icons {
@@ -0,0 +1,40 @@
+import type { TooltipPositionCallback } from "echarts/types/dist/shared";
+
+export const TOOLTIP_GAP_PX = 12;
+export const TOOLTIP_TOP_OFFSET_PX = 10;
+
+/**
+ * Pins the tooltip near the top of the chart and offsets it horizontally
+ * from the cursor so it never covers the data point being inspected.
+ * For axis-trigger time-series tooltips where the cursor's Y is uncorrelated
+ * with the displayed content.
+ */
+export const sideTooltipPosition: TooltipPositionCallback = (
+  point,
+  _params,
+  dom,
+  _rect,
+  size
+) => {
+  const [cursorX] = point;
+  const [viewW, viewH] = size.viewSize;
+  const [tipW, tipH] = size.contentSize;
+
+  const rtl =
+    dom instanceof HTMLElement && getComputedStyle(dom).direction === "rtl";
+
+  const rightOfCursor = cursorX + TOOLTIP_GAP_PX;
+  const leftOfCursor = cursorX - TOOLTIP_GAP_PX - tipW;
+
+  let x = rtl ? leftOfCursor : rightOfCursor;
+  const overflowsRight = x + tipW > viewW;
+  const overflowsLeft = x < 0;
+  if (overflowsRight || overflowsLeft) {
+    x = rtl ? rightOfCursor : leftOfCursor;
+  }
+  x = Math.max(0, Math.min(x, viewW - tipW));
+
+  const y = Math.max(0, Math.min(TOOLTIP_TOP_OFFSET_PX, viewH - tipH));
+
+  return [x, y];
+};
@@ -1110,7 +1110,7 @@ export class HaChartBase extends LitElement {
  private _updateSankeyRoam() {
    const option = this.chart?.getOption();
    const sankeySeries = (option?.series as any[])?.filter(
-      (s: any) => s.type === "sankey"
+      (s: any) => s != null && s.type === "sankey"
    );
    if (sankeySeries?.length) {
      this.chart?.setOption({
@@ -11,6 +11,7 @@ import { computeRTL } from "../../common/util/compute_rtl";
 import type { LineChartEntity, LineChartState } from "../../data/history";
 import type { HomeAssistant } from "../../types";
 import { MIN_TIME_BETWEEN_UPDATES } from "./ha-chart-base";
+import { sideTooltipPosition } from "./chart-tooltip-position";
 import type { ECOption } from "../../resources/echarts/echarts";
 import { formatDateTimeWithSeconds } from "../../common/datetime/format_date_time";
 import {
@@ -293,7 +294,10 @@ export class StateHistoryChartLine extends LitElement {
      (changedProps.has("hass") &&
        this._hasEntityStatesChanged(changedProps.get("hass")))
    ) {
-      const rtl = computeRTL(this.hass);
+      const rtl = computeRTL(
+        this.hass.language,
+        this.hass.translationMetadata.translations
+      );
      let minYAxis: number | ((values: { min: number }) => number) | undefined =
        this.minYAxis;
      let maxYAxis: number | ((values: { max: number }) => number) | undefined =
@@ -410,8 +414,7 @@ export class StateHistoryChartLine extends LitElement {
        tooltip: {
          trigger: "axis",
          renderMode: "html",
-          position: "bottom",
-          align: "center",
+          position: sideTooltipPosition,
          confine: true,
          formatter: this._renderTooltip,
        },
@@ -14,6 +14,7 @@ import { computeRTL } from "../../common/util/compute_rtl";
 import type { TimelineEntity } from "../../data/history";
 import type { HomeAssistant } from "../../types";
 import { MIN_TIME_BETWEEN_UPDATES } from "./ha-chart-base";
+import { sideTooltipPosition } from "./chart-tooltip-position";
 import { computeTimelineColor } from "./timeline-color";
 import type { ECOption } from "../../resources/echarts/echarts";
 import echarts from "../../resources/echarts/echarts";
@@ -144,7 +145,10 @@ export class StateHistoryChartTimeline extends LitElement {
        "ui.components.history_charts.duration"
      )}: ${millisecondsToDuration(durationInMs)}`;

-      const markerLocalized = !computeRTL(this.hass)
+      const markerLocalized = !computeRTL(
+        this.hass.language,
+        this.hass.translationMetadata.translations
+      )
        ? marker
        : `<span style="direction: rtl;display:inline-block;margin-right:4px;margin-inline-end:4px;border-radius:10px;width:10px;height:10px;background-color:${color};"></span>`;

@@ -167,11 +171,12 @@ export class StateHistoryChartTimeline extends LitElement {

  public willUpdate(changedProps: PropertyValues) {
    if (
-      changedProps.has("startTime") ||
-      changedProps.has("endTime") ||
-      changedProps.has("data") ||
-      this._chartTime <
-        new Date(this.endTime.getTime() - MIN_TIME_BETWEEN_UPDATES)
+      this.isConnected &&
+      (changedProps.has("startTime") ||
+        changedProps.has("endTime") ||
+        changedProps.has("data") ||
+        this._chartTime <
+          new Date(this.endTime.getTime() - MIN_TIME_BETWEEN_UPDATES))
    ) {
      // If the line is more than 5 minutes old, re-gen it
      // so the X axis grows even if there is no new data
@@ -198,7 +203,10 @@ export class StateHistoryChartTimeline extends LitElement {
      ? Math.max(this.paddingYAxis, this._yWidth)
      : 0;
    const labelMargin = 5;
-    const rtl = computeRTL(this.hass);
+    const rtl = computeRTL(
+      this.hass.language,
+      this.hass.translationMetadata.translations
+    );
    this._chartOptions = {
      xAxis: {
        type: "time",
@@ -256,8 +264,7 @@ export class StateHistoryChartTimeline extends LitElement {
      },
      tooltip: {
        renderMode: "html",
-        position: "bottom",
-        align: "center",
+        position: sideTooltipPosition,
        confine: true,
        formatter: this._renderTooltip,
      },
@@ -13,7 +13,9 @@ import { isComponentLoaded } from "../../common/config/is_component_loaded";
 import type { HASSDomEvent } from "../../common/dom/fire_event";
 import { fireEvent } from "../../common/dom/fire_event";

+import { formatDate } from "../../common/datetime/format_date";
 import { formatDateTimeWithSeconds } from "../../common/datetime/format_date_time";
+import { formatTimeWithSeconds } from "../../common/datetime/format_time";
 import {
  formatNumber,
  getNumberFormatOptions,
@@ -37,6 +39,7 @@ import type { HomeAssistant } from "../../types";
 import { getPeriodicAxisLabelConfig } from "./axis-label";
 import type { CustomLegendOption } from "./ha-chart-base";
 import "./ha-chart-base";
+import { sideTooltipPosition } from "./chart-tooltip-position";
 import { fillDataGapsAndRoundCaps } from "./round-caps";

 export const supportedStatTypeMap: Record<StatisticType, StatisticType> = {
@@ -241,6 +244,8 @@ export class StatisticsChart extends LitElement {

  private _renderTooltip = (params: any) => {
    const rendered: Record<string, boolean> = {};
+    const chartIsBar = this.chartType.startsWith("bar");
+    const period = this.period;
    const unit = this.unit
      ? `${blankBeforeUnit(this.unit, this.hass.locale)}${this.unit}`
      : "";
@@ -252,8 +257,67 @@ export class StatisticsChart extends LitElement {
        const statisticId = this._statisticIds[param.seriesIndex];
        const stateObj = this.hass.states[statisticId];
        const entry = this.hass.entities[statisticId];
-        // max series can have 3 values, as the second value is the max-min to form a band
-        const rawValue = String(param.value[2] ?? param.value[1]);
+        let rawValue: string;
+        let rawTime: string;
+        if (chartIsBar) {
+          // For bar charts value is always second value.
+          rawValue = String(param.value[1]);
+          // Time value is third value (un-shifted date) if given, otherwise first value
+          let startTime: Date;
+          let endTime: Date | undefined;
+          if (param.value[2]) {
+            startTime = new Date(param.value[2]);
+            if (param.value[3]) {
+              endTime = new Date(param.value[3]);
+            }
+          } else {
+            startTime = new Date(param.value[0]);
+          }
+          if (
+            period === "year" ||
+            period === "month" ||
+            period === "week" ||
+            period === "day"
+          ) {
+            // For year/month/day periods, show only the date
+            rawTime =
+              formatDate(startTime, this.hass.locale, this.hass.config) +
+              (endTime && period !== "day"
+                ? ` – ${formatDate(
+                    endTime,
+                    this.hass.locale,
+                    this.hass.config
+                  )}`
+                : "") +
+              "<br>";
+          } else {
+            // For other time periods, include time in render, and optionally show range
+            // if we have an end time.
+            rawTime =
+              formatDateTimeWithSeconds(
+                startTime,
+                this.hass.locale,
+                this.hass.config
+              ) +
+              (endTime
+                ? ` – ${formatTimeWithSeconds(
+                    endTime,
+                    this.hass.locale,
+                    this.hass.config
+                  )}`
+                : "") +
+              "<br>";
+          }
+        } else {
+          // For lines max series can have 3 values, as the second value is the max-min to form a band
+          rawValue = String(param.value[2] ?? param.value[1]);
+          // Time value is always first value
+          rawTime = `${formatDateTimeWithSeconds(
+            new Date(param.value[0]),
+            this.hass.locale,
+            this.hass.config
+          )} <br>`;
+        }

        const options = getNumberFormatOptions(stateObj, entry) ?? {
          maximumFractionDigits: 2,
@@ -265,14 +329,7 @@ export class StatisticsChart extends LitElement {
          options
        )}${unit}`;

-        const time =
-          index === 0
-            ? formatDateTimeWithSeconds(
-                new Date(param.value[0]),
-                this.hass.locale,
-                this.hass.config
-              ) + "<br>"
-            : "";
+        const time = index === 0 ? rawTime : "";
        return `${time}${param.marker} ${param.seriesName}: ${value}`;
      })
      .filter(Boolean)
@@ -368,7 +425,12 @@ export class StatisticsChart extends LitElement {
        nameTextStyle: {
          align: "left",
        },
-        position: computeRTL(this.hass) ? "right" : "left",
+        position: computeRTL(
+          this.hass.language,
+          this.hass.translationMetadata.translations
+        )
+          ? "right"
+          : "left",
        scale:
          this.chartType.startsWith("line") ||
          this.logarithmicScale ||
@@ -398,8 +460,7 @@ export class StatisticsChart extends LitElement {
      tooltip: {
        trigger: "axis",
        renderMode: "html",
-        position: "bottom",
-        align: "center",
+        position: sideTooltipPosition,
        confine: true,
        formatter: this._renderTooltip,
      },
@@ -506,33 +567,53 @@ export class StatisticsChart extends LitElement {
      const statDataSets: (LineSeriesOption | BarSeriesOption)[] = [];
      const statLegendData: typeof legendData = [];

+      // Place bars at centre of their specified time range if this is a bar chart
+      // and the period is 5minute or hour.
+      const centerBars =
+        chartType === "bar" &&
+        (this.period === "5minute" || this.period === "hour");
+
      const pushData = (
-        start: Date,
-        end: Date,
+        start: Date, // Data point start time
+        end: Date, // Data point end time
+        limit: Date, // Limit for end time (e.g. now)
        dataValues: (number | null)[][]
      ) => {
        if (!dataValues.length) return;
-        if (start > end) {
+        // Limit for time range is lesser of overall limit and data point end
+        limit = end.getTime() < limit.getTime() ? end : limit;
+        if (start.getTime() > limit.getTime()) {
          // Drop data points that are after the requested endTime. This could happen if
          // endTime is "now" and client time is not in sync with server time.
          return;
        }
        statDataSets.forEach((d, i) => {
-          if (
-            chartType === "line" &&
-            prevEndTime &&
-            prevValues &&
-            prevEndTime.getTime() !== start.getTime()
-          ) {
-            // if the end of the previous data doesn't match the start of the current data,
-            // we have to draw a gap so add a value at the end time, and then an empty value.
-            d.data!.push([prevEndTime, ...prevValues[i]!]);
-            d.data!.push([prevEndTime, null]);
+          if (chartType === "line") {
+            if (
+              prevEndTime &&
+              prevValues &&
+              prevEndTime.getTime() !== start.getTime()
+            ) {
+              // if the end of the previous data doesn't match the start of the current data,
+              // we have to draw a gap so add a value at the end time, and then an empty value.
+              d.data!.push([prevEndTime, ...prevValues[i]!]);
+              d.data!.push([prevEndTime, null]);
+            }
+            d.data!.push([start, ...dataValues[i]!]);
+          } else {
+            let time = start;
+            if (centerBars) {
+              // If centering bars, set the time to the midpoint between start and end instead
+              // of the start time.
+              time = new Date((start.getTime() + end.getTime()) / 2);
+            }
+            // Data value should always be a scalar for bar charts. Pass in
+            // real start time as extra value to allow formatting tooltip.
+            d.data!.push([time, dataValues[i][0]!, start, end]);
          }
-          d.data!.push([start, ...dataValues[i]!]);
        });
        prevValues = dataValues;
-        prevEndTime = end;
+        prevEndTime = limit;
      };

      let color = colors[statistic_id];
@@ -692,11 +773,7 @@ export class StatisticsChart extends LitElement {
          dataValues.push(val);
        });
        if (!this._hiddenStats.has(statistic_id)) {
-          pushData(
-            startDate,
-            endDate.getTime() < endTime.getTime() ? endDate : endTime,
-            dataValues
-          );
+          pushData(startDate, endDate, endTime, dataValues);
        }
      });

@@ -127,7 +127,6 @@ export class DialogDataTableSettings extends LitElement {

    return html`
      <ha-dialog
-        .hass=${this.hass}
        .open=${this._open}
        header-title=${localize("ui.components.data-table.settings.header")}
        @closed=${this._dialogClosed}
@@ -22,6 +22,14 @@ const isOn = (stateObj?: HassEntity) =>
  !STATES_OFF.includes(stateObj.state) &&
  !isUnavailableState(stateObj.state);

+/**
+ * @element ha-entity-toggle
+ *
+ * @cssprop --ha-entity-toggle-switch-width - Width of the switch track. Defaults to `38px`.
+ * @cssprop --ha-entity-toggle-switch-size - Height of the switch track. Defaults to `20px`.
+ * @cssprop --ha-entity-toggle-switch-thumb-size - Size of the switch thumb. Defaults to `14px`.
+ */
+
@customElement("ha-entity-toggle")
 export class HaEntityToggle extends LitElement {
  // hass is not a property so that we only re-render on stateObj changes
@@ -165,9 +173,9 @@ export class HaEntityToggle extends LitElement {
      white-space: nowrap;
    }
    ha-switch {
-      --ha-switch-width: 38px;
-      --ha-switch-size: 20px;
-      --ha-switch-thumb-size: 14px;
+      --ha-switch-width: var(--ha-entity-toggle-switch-width, 38px);
+      --ha-switch-size: var(--ha-entity-toggle-switch-size, 20px);
+      --ha-switch-thumb-size: var(--ha-entity-toggle-switch-thumb-size, 14px);
    }
    ha-icon-button {
      --ha-icon-button-size: 40px;
@@ -130,7 +130,6 @@ export class HaStateLabelBadge extends LitElement {
          ? html`<ha-state-icon
              .icon=${this.icon}
              .stateObj=${entityState}
-              .hass=${this.hass}
            ></ha-state-icon>`
          : ""}
        ${value && !image && !showIcon
@@ -142,6 +142,7 @@ export class HaStatisticPicker extends LitElement {
  private async _getStatisticIds() {
    this.statisticIds = await getStatisticIds(this.hass, this.statisticTypes);
    this._picker?.requestUpdate();
+    this._valueRenderer = this._makeValueRenderer();
  }

  private _getItems = () =>
@@ -210,7 +211,10 @@ export class HaStatisticPicker extends LitElement {
        });
      }

-      const isRTL = computeRTL(hass);
+      const isRTL = computeRTL(
+        hass.language,
+        hass.translationMetadata.translations
+      );

      const output: StatisticComboBoxItem[] = [];

@@ -314,7 +318,7 @@ export class HaStatisticPicker extends LitElement {
    }
  );

-  private _valueRenderer: PickerValueRenderer = (value) => {
+  private _renderValue(value: string) {
    const statisticId = value;

    const item = this._computeItem(statisticId);
@@ -338,7 +342,13 @@ export class HaStatisticPicker extends LitElement {
        ? html`<span slot="supporting-text">${item.secondary}</span>`
        : nothing}
    `;
-  };
+  }
+
+  private _makeValueRenderer(): PickerValueRenderer {
+    return (value) => this._renderValue(value);
+  }
+
+  private _valueRenderer: PickerValueRenderer = this._makeValueRenderer();

  private _computeItem(statisticId: string): StatisticComboBoxItem {
    const stateObj = this.hass.states[statisticId];
@@ -353,7 +363,10 @@ export class HaStatisticPicker extends LitElement {
        this.hass.floors
      );

-      const isRTL = computeRTL(this.hass);
+      const isRTL = computeRTL(
+        this.hass.language,
+        this.hass.translationMetadata.translations
+      );

      const primary = entityName || deviceName || statisticId;
      const secondary = [areaName, entityName ? deviceName : undefined]
@@ -98,7 +98,6 @@ export class StateBadge extends LitElement {
    const domain = stateObj ? computeStateDomain(stateObj) : undefined;

    return html`<ha-state-icon
-      .hass=${this.hass}
      style=${styleMap(this._iconStyle)}
      data-domain=${ifDefined(domain)}
      data-state=${ifDefined(stateObj?.state)}
@@ -4,7 +4,6 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { listenMediaQuery } from "../common/dom/media_query";
 import { internationalizationContext } from "../data/context";
-import type { HomeAssistant } from "../types";
 import "./ha-bottom-sheet";
 import "./ha-dialog-header";
 import "./ha-icon-button";
@@ -82,8 +81,6 @@ export const ADAPTIVE_DIALOG_MEDIA_QUERY =
 */
@customElement("ha-adaptive-dialog")
 export class HaAdaptiveDialog extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
  @property({ attribute: "aria-labelledby" })
  public ariaLabelledBy?: string;

@@ -202,7 +199,6 @@ export class HaAdaptiveDialog extends LitElement {
          .ariaLabelledBy=${this._defaultAriaLabelledBy}
          .ariaDescribedBy=${this.ariaDescribedBy}
          .flexContent=${this.flexContent}
-          .hass=${this.hass}
          .open=${this.open}
          .preventScrimClose=${this.preventScrimClose}
        >
@@ -221,7 +217,6 @@ export class HaAdaptiveDialog extends LitElement {

    return html`
      <ha-dialog
-        .hass=${this.hass}
        .open=${this.open}
        .type=${this.type}
        .width=${this.width}
@@ -5,10 +5,10 @@ import { fireEvent } from "../common/dom/fire_event";
 import type { LocalizeFunc } from "../common/translations/localize";
 import type { Analytics, AnalyticsPreferences } from "../data/analytics";
 import { haStyle } from "../resources/styles";
-import "./ha-md-list-item";
 import "./ha-switch";
-import "./ha-tooltip";
 import type { HaSwitch } from "./ha-switch";
+import "./ha-tooltip";
+import "./item/ha-row-item";

 const ADDITIONAL_PREFERENCES = ["usage", "statistics"] as const;

@@ -33,7 +33,7 @@ export class HaAnalytics extends LitElement {
    const baseEnabled = !loading && this.analytics!.preferences.base;

    return html`
-      <ha-md-list-item>
+      <ha-row-item>
        <span slot="headline"
          >${this.localize(
            `ui.panel.${this.translationKeyPanel}.analytics.preferences.base.title`
@@ -52,10 +52,10 @@ export class HaAnalytics extends LitElement {
          .disabled=${loading}
          name="base"
        ></ha-switch>
-      </ha-md-list-item>
+      </ha-row-item>
      ${ADDITIONAL_PREFERENCES.map(
        (preference) => html`
-          <ha-md-list-item>
+          <ha-row-item>
            <span slot="headline"
              >${this.localize(
                `ui.panel.${this.translationKeyPanel}.analytics.preferences.${preference}.title`
@@ -81,10 +81,10 @@ export class HaAnalytics extends LitElement {
                    `ui.panel.${this.translationKeyPanel}.analytics.need_base_enabled`
                  )}
                </ha-tooltip>`}
-          </ha-md-list-item>
+          </ha-row-item>
        `
      )}
-      <ha-md-list-item>
+      <ha-row-item>
        <span slot="headline"
          >${this.localize(
            `ui.panel.${this.translationKeyPanel}.analytics.preferences.diagnostics.title`
@@ -103,7 +103,7 @@ export class HaAnalytics extends LitElement {
          .disabled=${loading}
          name="diagnostics"
        ></ha-switch>
-      </ha-md-list-item>
+      </ha-row-item>
    `;
  }

@@ -139,10 +139,8 @@ export class HaAnalytics extends LitElement {
          color: var(--error-color);
        }

-        ha-md-list-item {
-          --md-list-item-leading-space: 0;
-          --md-list-item-trailing-space: 0;
-          --md-item-overflow: visible;
+        ha-row-item {
+          --ha-row-item-padding-inline: 0;
        }
      `,
    ];
@@ -184,7 +184,10 @@ export class HaAreaControlsPicker extends LitElement {
          const allEntityIds = Object.values(controlEntities).flat();
          const uniqueEntityIds = Array.from(new Set(allEntityIds));

-          const isRTL = computeRTL(this.hass);
+          const isRTL = computeRTL(
+            this.hass.language,
+            this.hass.translationMetadata.translations
+          );

          uniqueEntityIds.forEach((entityId) => {
            if (isSelected(entityId)) {
@@ -261,7 +264,6 @@ export class HaAreaControlsPicker extends LitElement {
      ${item.type === "entity" && item.stateObj
        ? html`<ha-state-icon
            slot="start"
-            .hass=${this.hass}
            .stateObj=${item.stateObj}
          ></ha-state-icon>`
        : item.domain
@@ -1,13 +1,15 @@
 import "@home-assistant/webawesome/dist/components/drawer/drawer";
 import type WaDrawer from "@home-assistant/webawesome/dist/components/drawer/drawer";
+import { consume, type ContextType } from "@lit/context";
 import { css, html, LitElement, type PropertyValues } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import type { HASSDomEvent } from "../common/dom/fire_event";
 import { fireEvent } from "../common/dom/fire_event";
 import { SwipeGestureRecognizer } from "../common/util/swipe-gesture-recognizer";
+import { configContext } from "../data/context";
 import { ScrollableFadeMixin } from "../mixins/scrollable-fade-mixin";
 import { haStyleScrollbar } from "../resources/styles";
-import type { HomeAssistant } from "../types";
+import { isIosApp } from "../util/is_ios";

 export const BOTTOM_SHEET_ANIMATION_DURATION_MS = 300;

@@ -47,8 +49,6 @@ const SWIPE_LOCKED_CLASSES = new Set(["volume-slider-container", "forecast"]);
 */
@customElement("ha-bottom-sheet")
 export class HaBottomSheet extends ScrollableFadeMixin(LitElement) {
-  @property({ attribute: false }) public hass?: HomeAssistant;
-
  @property({ attribute: "aria-labelledby" })
  public ariaLabelledBy?: string;

@@ -67,6 +67,10 @@ export class HaBottomSheet extends ScrollableFadeMixin(LitElement) {

  @state() private _sliderInteractionActive = false;

+  @state()
+  @consume({ context: configContext, subscribe: true })
+  private _hassConfig?: ContextType<typeof configContext>;
+
  @query("#drawer") private _drawer!: HTMLElement;

  @query("#body") private _bodyElement!: HTMLDivElement;
@@ -89,22 +93,24 @@ export class HaBottomSheet extends ScrollableFadeMixin(LitElement) {
    await this.updateComplete;

    requestAnimationFrame(() => {
-      // disabled till iOS app fix the "focus_element" implementation
-      // if (this.hass && isIosApp(this.hass.auth.external)) {
-      //   const element = this.renderRoot.querySelector("[autofocus]");
-      //   if (element !== null) {
-      //     if (!element.id) {
-      //       element.id = "ha-bottom-sheet-autofocus";
-      //     }
-      //     this.hass.auth.external?.fireMessage({
-      //       type: "focus_element",
-      //       payload: {
-      //         element_id: element.id,
-      //       },
-      //     });
-      //   }
-      //   return;
-      // }
+      if (
+        this._hassConfig?.auth.external &&
+        isIosApp(this._hassConfig.auth.external)
+      ) {
+        const element = this.renderRoot.querySelector("[autofocus]");
+        if (element !== null) {
+          if (!element.id) {
+            element.id = "ha-bottom-sheet-autofocus";
+          }
+          this._hassConfig.auth.external.fireMessage({
+            type: "focus_element",
+            payload: {
+              element_id: element.id,
+            },
+          });
+        }
+        return;
+      }
      (
        this.renderRoot.querySelector("[autofocus]") as HTMLElement | null
      )?.focus();
@@ -27,6 +27,7 @@ import type { CSSResultGroup, PropertyValues } from "lit";
 import { css, html, ReactiveElement, render } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
+import type { ContextType } from "@lit/context";
 import { consume } from "@lit/context";
 import { fireEvent } from "../common/dom/fire_event";
 import { stopPropagation } from "../common/dom/stop_propagation";
@@ -43,7 +44,14 @@ import type {
 import type { HomeAssistant } from "../types";
 import { showToast } from "../util/toast";
 import { documentationUrl } from "../util/documentation-url";
-import { labelsContext } from "../data/context";
+import {
+  internationalizationContext,
+  registriesContext,
+  statesContext,
+  labelsContext,
+  configContext,
+  formattersContext,
+} from "../data/context";
 import type { LabelRegistryEntry } from "../data/label/label_registry";
 import "./ha-code-editor-completion-items";
 import type { CompletionItem } from "./ha-code-editor-completion-items";
@@ -78,8 +86,6 @@ export class HaCodeEditor extends ReactiveElement {

  @property() public mode = "yaml";

-  public hass?: HomeAssistant;
-
  // eslint-disable-next-line lit/no-native-attributes
  @property({ type: Boolean }) public autofocus = false;

@@ -123,9 +129,29 @@ export class HaCodeEditor extends ReactiveElement {

  @state() private _canCopy = false;

-  @consume({ context: labelsContext, subscribe: true })
  @state()
-  private _labels?: LabelRegistryEntry[];
+  @consume({ context: configContext, subscribe: true })
+  private _config?: ContextType<typeof configContext>;
+
+  @state()
+  @consume({ context: internationalizationContext, subscribe: true })
+  private _i18n?: ContextType<typeof internationalizationContext>;
+
+  @state()
+  @consume({ context: labelsContext, subscribe: true })
+  private _labels?: ContextType<typeof labelsContext>;
+
+  @state()
+  @consume({ context: registriesContext, subscribe: true })
+  private _registries?: ContextType<typeof registriesContext>;
+
+  @state()
+  @consume({ context: formattersContext, subscribe: true })
+  private _formatters?: ContextType<typeof formattersContext>;
+
+  @state()
+  @consume({ context: statesContext, subscribe: true })
+  private _states?: ContextType<typeof statesContext>;

  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
  private _loadedCodeMirror?: typeof import("../resources/codemirror");
@@ -189,9 +215,9 @@ export class HaCodeEditor extends ReactiveElement {
      const line = doc.lineAt(pos);
      const message = `${
        err.reason ||
-        this.hass?.localize("ui.components.yaml-editor.error") ||
+        this._i18n?.localize("ui.components.yaml-editor.error") ||
        "YAML syntax error"
-      }${err.mark ? ` (${this.hass?.localize("ui.components.yaml-editor.error_location", { line: err.mark.line + 1, column: err.mark.column + 1 })})` : ""}`;
+      }${err.mark ? ` (${this._i18n?.localize("ui.components.yaml-editor.error_location", { line: err.mark.line + 1, column: err.mark.column + 1 })})` : ""}`;
      diagnostics = [{ from: pos, to: line.to, severity: "error", message }];
    }
    this.codemirror.dispatch(
@@ -396,8 +422,8 @@ export class HaCodeEditor extends ReactiveElement {
          this._loadedCodeMirror!.haJinjaHoverSource(
            view,
            pos,
-            this.hass ? documentationUrl(this.hass, "") : undefined,
-            this.hass ? this._hassArgHoverContext() : undefined
+            this._config ? documentationUrl(this._config, "") : undefined,
+            this._hassArgHoverContext()
          ),
        { hoverTime: 300 }
      ),
@@ -408,7 +434,7 @@ export class HaCodeEditor extends ReactiveElement {
      const completionSources: CompletionSource[] = [
        this._loadedCodeMirror.haJinjaCompletionSource,
      ];
-      if (this.autocompleteEntities && this.hass) {
+      if (this.autocompleteEntities) {
        completionSources.push(this._entityCompletions.bind(this));
      }
      if (this.autocompleteIcons) {
@@ -447,12 +473,12 @@ export class HaCodeEditor extends ReactiveElement {
  private _fullscreenLabel(): string {
    if (this._isFullscreen) {
      return (
-        this.hass?.localize("ui.components.yaml-editor.exit_fullscreen") ||
+        this._i18n?.localize("ui.components.yaml-editor.exit_fullscreen") ||
        "Exit fullscreen"
      );
    }
    return (
-      this.hass?.localize("ui.components.yaml-editor.enter_fullscreen") ||
+      this._i18n?.localize("ui.components.yaml-editor.enter_fullscreen") ||
      "Enter fullscreen"
    );
  }
@@ -507,7 +533,7 @@ export class HaCodeEditor extends ReactiveElement {
            {
              id: "test",
              label:
-                this.hass?.localize(
+                this._i18n?.localize(
                  `ui.components.yaml-editor.test_${this.testing ? "off" : "on"}`
                ) || "Test",
              path: this.testing ? mdiBugOutline : mdiBug,
@@ -518,14 +544,14 @@ export class HaCodeEditor extends ReactiveElement {
      {
        id: "undo",
        disabled: !this._canUndo,
-        label: this.hass?.localize("ui.common.undo") || "Undo",
+        label: this._i18n?.localize("ui.common.undo") || "Undo",
        path: mdiUndo,
        action: (e: Event) => this._handleUndoClick(e),
      },
      {
        id: "redo",
        disabled: !this._canRedo,
-        label: this.hass?.localize("ui.common.redo") || "Redo",
+        label: this._i18n?.localize("ui.common.redo") || "Redo",
        path: mdiRedo,
        action: (e: Event) => this._handleRedoClick(e),
      },
@@ -533,7 +559,7 @@ export class HaCodeEditor extends ReactiveElement {
        id: "copy",
        disabled: !this._canCopy,
        label:
-          this.hass?.localize("ui.components.yaml-editor.copy_to_clipboard") ||
+          this._i18n?.localize("ui.components.yaml-editor.copy_to_clipboard") ||
          "Copy to Clipboard",
        path: mdiContentCopy,
        action: (e: Event) => this._handleClipboardClick(e),
@@ -541,7 +567,7 @@ export class HaCodeEditor extends ReactiveElement {
      {
        id: "find-replace",
        label:
-          this.hass?.localize("ui.components.yaml-editor.find_and_replace") ||
+          this._i18n?.localize("ui.components.yaml-editor.find_and_replace") ||
          "Find and replace",
        path: mdiFindReplace,
        action: (e: Event) => this._handleFindReplaceClick(e),
@@ -583,7 +609,7 @@ export class HaCodeEditor extends ReactiveElement {
      await copyToClipboard(this.value);
      showToast(this, {
        message:
-          this.hass?.localize("ui.common.copied_clipboard") ||
+          this._i18n?.localize("ui.common.copied_clipboard") ||
          "Copied to clipboard",
      });
    }
@@ -651,12 +677,11 @@ export class HaCodeEditor extends ReactiveElement {
  };

  /**
-   * Builds a HassArgHoverContext from the current hass object so that
+   * Builds a HassArgHoverContext from the context objects so that
   * haJinjaHoverSource can resolve entity / device / area friendly names
   * without importing the full HomeAssistant type into the resource file.
   */
  private _hassArgHoverContext(): HassArgHoverContext {
-    const hass = this.hass!;
    const labelMap: Record<
      string,
      { name: string; description?: string | null }
@@ -668,27 +693,33 @@ export class HaCodeEditor extends ReactiveElement {
      };
    }
    return {
-      states: hass.states as HassArgHoverContext["states"],
-      devices: hass.devices as HassArgHoverContext["devices"],
-      areas: hass.areas as HassArgHoverContext["areas"],
-      floors: hass.floors as HassArgHoverContext["floors"],
-      entities: hass.entities as HassArgHoverContext["entities"],
+      states: this._states as HassArgHoverContext["states"],
+      devices: this._registries?.devices as HassArgHoverContext["devices"],
+      areas: this._registries?.areas as HassArgHoverContext["areas"],
+      floors: this._registries?.floors as HassArgHoverContext["floors"],
+      entities: this._registries?.entities as HassArgHoverContext["entities"],
      labels: labelMap,
      formatEntityState: (entityId) =>
-        hass.formatEntityState(hass.states[entityId]),
+        this._formatters!.formatEntityState(this._states![entityId]),
      formatEntityName: (entityId) => {
-        const stateObj = hass.states[entityId];
+        const stateObj = this._states?.[entityId];
        return (
          (stateObj?.attributes.friendly_name as string | undefined) ??
-          hass.entities[entityId]?.name ??
+          this._registries?.entities?.[entityId]?.name ??
          undefined
        );
      },
      formatAttributeName: (entityId, attribute) =>
-        hass.formatEntityAttributeName(hass.states[entityId], attribute),
+        this._formatters!.formatEntityAttributeName(
+          this._states![entityId],
+          attribute
+        ),
      formatAttributeValue: (entityId, attribute) =>
-        hass.formatEntityAttributeValue(hass.states[entityId], attribute),
-      localize: (key) => hass.localize(key as never),
+        this._formatters!.formatEntityAttributeValue(
+          this._states![entityId],
+          attribute
+        ),
+      localize: (key) => this._i18n!.localize(key as never),
    };
  }

@@ -698,49 +729,51 @@ export class HaCodeEditor extends ReactiveElement {
        ? completion.apply
        : completion.label;
    const context = getEntityContext(
-      this.hass!.states[key],
-      this.hass!.entities,
-      this.hass!.devices,
-      this.hass!.areas,
-      this.hass!.floors
+      this._states![key],
+      this._registries!.entities,
+      this._registries!.devices,
+      this._registries!.areas,
+      this._registries!.floors
    );

    const completionInfo = document.createElement("div");
    completionInfo.classList.add("completion-info");

-    const formattedState = this.hass!.formatEntityState(this.hass!.states[key]);
+    const formattedState = this._formatters!.formatEntityState(
+      this._states![key]
+    );

    const completionItems: CompletionItem[] = [
      {
-        label: this.hass!.localize(
+        label: this._i18n!.localize(
          "ui.components.entity.entity-state-picker.state"
        ),
        value: formattedState,
        subValue:
          // If the state exactly matches the formatted state, don't show the raw state
-          this.hass!.states[key].state === formattedState
+          this._states![key].state === formattedState
            ? undefined
-            : this.hass!.states[key].state,
+            : this._states![key].state,
      },
    ];

    if (context.device && context.device.name) {
      completionItems.push({
-        label: this.hass!.localize("ui.components.device-picker.device"),
+        label: this._i18n!.localize("ui.components.device-picker.device"),
        value: context.device.name,
      });
    }

    if (context.area && context.area.name) {
      completionItems.push({
-        label: this.hass!.localize("ui.components.area-picker.area"),
+        label: this._i18n!.localize("ui.components.area-picker.area"),
        value: context.area.name,
      });
    }

    if (context.floor && context.floor.name) {
      completionItems.push({
-        label: this.hass!.localize("ui.components.floor-picker.floor"),
+        label: this._i18n!.localize("ui.components.floor-picker.floor"),
        value: context.floor.name,
      });
    }
@@ -761,15 +794,15 @@ export class HaCodeEditor extends ReactiveElement {
    entityId: string,
    attribute: string
  ): CompletionInfo | null => {
-    if (!this.hass) return null;
-    const stateObj = this.hass.states[entityId];
+    if (!this._states || !this._formatters) return null;
+    const stateObj = this._states[entityId];
    if (!stateObj) return null;

-    const translatedName = this.hass.formatEntityAttributeName(
+    const translatedName = this._formatters.formatEntityAttributeName(
      stateObj,
      attribute
    );
-    const formattedValue = this.hass.formatEntityAttributeValue(
+    const formattedValue = this._formatters.formatEntityAttributeValue(
      stateObj,
      attribute
    );
@@ -809,9 +842,9 @@ export class HaCodeEditor extends ReactiveElement {
    completion: Completion
  ): CompletionInfo | Promise<CompletionInfo> | null => {
    if (
-      this.hass &&
+      this._states &&
      typeof completion.apply === "string" &&
-      completion.apply in this.hass.states
+      completion.apply in this._states
    ) {
      return this._renderInfo(completion);
    }
@@ -1020,7 +1053,7 @@ export class HaCodeEditor extends ReactiveElement {
  private _statesDotNotationCompletions(
    context: CompletionContext
  ): CompletionResult | null | undefined {
-    if (!this.hass) return undefined;
+    if (!this._states) return undefined;

    const { state: editorState, pos } = context;
    const tree = this._loadedCodeMirror!.syntaxTree(editorState);
@@ -1129,9 +1162,7 @@ export class HaCodeEditor extends ReactiveElement {
      case 0: {
        // states.   → offer all unique domains
        const domains = [
-          ...new Set(
-            Object.keys(this.hass.states).map((id) => id.split(".")[0])
-          ),
+          ...new Set(Object.keys(this._states).map((id) => id.split(".")[0])),
        ].sort();
        return {
          from: completionFrom,
@@ -1142,7 +1173,7 @@ export class HaCodeEditor extends ReactiveElement {
      case 1: {
        // states.<domain>.   → offer entity object_ids for that domain
        const [domain] = segments;
-        const entities = Object.keys(this.hass.states)
+        const entities = Object.keys(this._states)
          .filter((id) => id.startsWith(`${domain}.`))
          .map((id) => id.split(".").slice(1).join("."));
        if (!entities.length) return { from: completionFrom, options: [] };
@@ -1172,7 +1203,7 @@ export class HaCodeEditor extends ReactiveElement {
        }
        // Offer attribute names from the entity's state object
        const entityId = `${domain}.${entity}`;
-        const entityState = this.hass.states[entityId];
+        const entityState = this._states[entityId];
        if (!entityState) return { from: completionFrom, options: [] };
        const attrNames = Object.keys(entityState.attributes).sort();
        return {
@@ -1342,8 +1373,8 @@ export class HaCodeEditor extends ReactiveElement {
  ): CompletionResult {
    const from = stringNode.from + 1;
    const empty: CompletionResult = { from, options: [] };
-    if (!entityId || !this.hass) return empty;
-    const entityState = this.hass.states[entityId];
+    if (!entityId || !this._states) return empty;
+    const entityState = this._states[entityId];
    if (!entityState) return empty;
    const attrs = Object.keys(entityState.attributes).sort();
    if (!attrs.length) return empty;
@@ -1363,7 +1394,7 @@ export class HaCodeEditor extends ReactiveElement {
    from: number;
    to: number;
  }): CompletionResult | null {
-    const states = this._getStates(this.hass!.states);
+    const states = this._getStates(this._states!);
    if (!states?.length) return null;
    // from is stringNode.from + 1 to skip the opening quote character.
    const from = stringNode.from + 1;
@@ -1397,8 +1428,8 @@ export class HaCodeEditor extends ReactiveElement {
    from: number;
    to: number;
  }): CompletionResult | null {
-    if (!this.hass?.devices) return null;
-    const devices = this._getDevices(this.hass.devices);
+    if (!this._registries?.devices) return null;
+    const devices = this._getDevices(this._registries.devices);
    if (!devices.length) return null;
    return {
      from: stringNode.from + 1,
@@ -1426,8 +1457,8 @@ export class HaCodeEditor extends ReactiveElement {
    from: number;
    to: number;
  }): CompletionResult | null {
-    if (!this.hass?.areas) return null;
-    const areas = this._getAreas(this.hass.areas);
+    if (!this._registries?.areas) return null;
+    const areas = this._getAreas(this._registries.areas);
    if (!areas.length) return null;
    return {
      from: stringNode.from + 1,
@@ -1455,8 +1486,8 @@ export class HaCodeEditor extends ReactiveElement {
    from: number;
    to: number;
  }): CompletionResult | null {
-    if (!this.hass?.floors) return null;
-    const floors = this._getFloors(this.hass.floors);
+    if (!this._registries?.floors) return null;
+    const floors = this._getFloors(this._registries.floors);
    if (!floors.length) return null;
    return {
      from: stringNode.from + 1,
@@ -1556,7 +1587,7 @@ export class HaCodeEditor extends ReactiveElement {

        // If cursor is after the entity field, show all entities
        if (context.pos >= afterField) {
-          const states = this._getStates(this.hass!.states);
+          const states = this._getStates(this._states!);

          if (!states || !states.length) {
            return null;
@@ -1611,7 +1642,7 @@ export class HaCodeEditor extends ReactiveElement {
            const afterListMarker = currentLine.from + listItemMatch[0].length;

            if (context.pos >= afterListMarker) {
-              const states = this._getStates(this.hass!.states);
+              const states = this._getStates(this._states!);

              if (!states || !states.length) {
                return null;
@@ -1671,7 +1702,7 @@ export class HaCodeEditor extends ReactiveElement {
      return null;
    }

-    const states = this._getStates(this.hass!.states);
+    const states = this._getStates(this._states!);

    if (!states || !states.length) {
      return null;
@@ -15,9 +15,10 @@ import { ifDefined } from "lit/directives/if-defined";
 import type { HASSDomEvent } from "../common/dom/fire_event";
 import { fireEvent } from "../common/dom/fire_event";
 import { withViewTransition } from "../common/util/view-transition";
-import { internationalizationContext } from "../data/context";
+import { configContext, internationalizationContext } from "../data/context";
 import { ScrollableFadeMixin } from "../mixins/scrollable-fade-mixin";
 import { haStyleScrollbar } from "../resources/styles";
+import { isIosApp } from "../util/is_ios";
 import "./ha-dialog-header";
 import "./ha-icon-button";

@@ -127,10 +128,9 @@ export class HaDialog extends ScrollableFadeMixin(LitElement) {
  @consume({ context: internationalizationContext, subscribe: true })
  private _i18n?: ContextType<typeof internationalizationContext>;

-  // disabled till iOS app fix the "focus_element" implementation
-  // @state()
-  // @consume({ context: configContext, subscribe: true })
-  // private _hassConfig?: ContextType<typeof configContext>;
+  @state()
+  @consume({ context: configContext, subscribe: true })
+  private _hassConfig?: ContextType<typeof configContext>;

  @state()
  private _bodyScrolled = false;
@@ -221,22 +221,24 @@ export class HaDialog extends ScrollableFadeMixin(LitElement) {
    await this.updateComplete;

    requestAnimationFrame(() => {
-      // disabled till iOS app fix the "focus_element" implementation
-      // if (this._hassConfig?.auth.external && isIosApp(this._hassConfig.auth.external)) {
-      //   const element = this.querySelector("[autofocus]");
-      //   if (element !== null) {
-      //     if (!element.id) {
-      //       element.id = "ha-dialog-autofocus";
-      //     }
-      //     this._hassConfig.auth.external.fireMessage({
-      //       type: "focus_element",
-      //       payload: {
-      //         element_id: element.id,
-      //       },
-      //     });
-      //   }
-      //   return;
-      // }
+      if (
+        this._hassConfig?.auth.external &&
+        isIosApp(this._hassConfig.auth.external)
+      ) {
+        const element = this.querySelector("[autofocus]");
+        if (element !== null) {
+          if (!element.id) {
+            element.id = "ha-dialog-autofocus";
+          }
+          this._hassConfig.auth.external.fireMessage({
+            type: "focus_element",
+            payload: {
+              element_id: element.id,
+            },
+          });
+        }
+        return;
+      }
      (this.querySelector("[autofocus]") as HTMLElement | null)?.focus();
    });
  };
@@ -1,34 +1,109 @@
-import { DrawerBase } from "@material/mwc-drawer/mwc-drawer-base";
-import { styles } from "@material/mwc-drawer/mwc-drawer.css";
-import type { PropertyValues } from "lit";
-import { css } from "lit";
-import { customElement, property } from "lit/decorators";
+import "@home-assistant/webawesome/dist/components/drawer/drawer";
+import type { PropertyValues, TemplateResult } from "lit";
+import { LitElement, css, html } from "lit";
+import { customElement, property, query } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import type { HASSDomEvent } from "../common/dom/fire_event";
+import { SwipeGestureRecognizer } from "../common/util/swipe-gesture-recognizer";

 declare global {
  interface HASSDomEvents {
+    "hass-drawer-closed": undefined;
    "hass-layout-transition": { active: boolean; reason?: string };
  }
  interface HTMLElementEventMap {
+    "hass-drawer-closed": HASSDomEvent<HASSDomEvents["hass-drawer-closed"]>;
    "hass-layout-transition": HASSDomEvent<
      HASSDomEvents["hass-layout-transition"]
    >;
  }
 }

-const blockingElements = (document as any).$blockingElements;
-
@customElement("ha-drawer")
-export class HaDrawer extends DrawerBase {
-  @property() public direction: "ltr" | "rtl" = "ltr";
+export class HaDrawer extends LitElement {
+  private static readonly _SWIPE_AXIS_TOLERANCE = 32;

-  private _mc?: HammerManager;
+  @property({ reflect: true }) public direction: "ltr" | "rtl" = "ltr";

-  private _rtlStyle?: HTMLElement;
+  @property() public type = "";
+
+  @property({ type: Boolean, reflect: true }) public open = false;
+
+  @query("wa-drawer") private _modalDrawer?: HTMLElement;
+
+  @query(".sidebar-shell") private _sidebarShell?: HTMLElement;

  private _sidebarTransitionActive = false;

+  private _transitionTarget?: HTMLElement;
+
+  private _gestureRecognizer = new SwipeGestureRecognizer({
+    velocitySwipeThreshold: 0.35,
+  });
+
+  private _touchStartY = 0;
+
+  private _touchDeltaY = 0;
+
+  private get _modal() {
+    return this.type === "modal";
+  }
+
+  protected render(): TemplateResult {
+    return this._modal
+      ? html`
+          <slot name="appContent"></slot>
+          <wa-drawer
+            placement="start"
+            .open=${this.open}
+            light-dismiss
+            without-header
+            @touchstart=${this._handleTouchStart}
+            @wa-after-hide=${this._handleAfterHide}
+          >
+            <slot></slot>
+          </wa-drawer>
+        `
+      : html`
+          <div class="layout">
+            <div class="sidebar-shell">
+              <slot></slot>
+            </div>
+            <div class="app-content">
+              <slot name="appContent"></slot>
+            </div>
+          </div>
+        `;
+  }
+
+  protected updated(_: PropertyValues<this>) {
+    this._syncTransitionListeners();
+
+    if (!this.open) {
+      this._resetSwipeTracking();
+    }
+  }
+
+  protected firstUpdated() {
+    this._syncTransitionListeners();
+  }
+
+  public disconnectedCallback() {
+    super.disconnectedCallback();
+    this._removeTransitionListeners();
+    this._unregisterSwipeHandlers();
+  }
+
+  private _handleAfterHide(ev: Event) {
+    ev.stopPropagation();
+    this.open = false;
+    fireEvent(this, "hass-drawer-closed");
+  }
+
+  private _closeModalDrawer() {
+    this.open = false;
+  }
+
  private _handleDrawerTransitionStart = (ev: TransitionEvent) => {
    if (ev.propertyName !== "width" || this._sidebarTransitionActive) {
      return;
@@ -51,150 +126,191 @@ export class HaDrawer extends DrawerBase {
    });
  };

-  protected createAdapter() {
-    return {
-      ...super.createAdapter(),
-      trapFocus: () => {
-        blockingElements.push(this);
-        this.appContent.inert = true;
-        document.body.style.overflow = "hidden";
-      },
-      releaseFocus: () => {
-        blockingElements.remove(this);
-        this.appContent.inert = false;
-        document.body.style.overflow = "";
-      },
-    };
+  private _handleTouchStart = (ev: TouchEvent) => {
+    if (!this._modal || !this.open) {
+      return;
+    }
+
+    const drawer = this._modalDrawer;
+    const dialog = drawer?.shadowRoot?.querySelector(
+      "dialog"
+    ) as HTMLDialogElement | null;
+
+    if (!dialog) {
+      return;
+    }
+
+    const path = ev.composedPath();
+
+    if (!path.includes(dialog)) {
+      return;
+    }
+
+    ev.stopPropagation();
+    this._startSwipeTracking(ev.touches[0].clientX, ev.touches[0].clientY);
+  };
+
+  private _startSwipeTracking(clientX: number, clientY: number) {
+    document.addEventListener("touchmove", this._handleTouchMove, {
+      passive: true,
+    });
+    document.addEventListener("touchend", this._handleTouchEnd);
+    document.addEventListener("touchcancel", this._handleTouchEnd);
+
+    this._touchStartY = clientY;
+    this._touchDeltaY = 0;
+    this._gestureRecognizer.start(clientX);
  }

-  protected updated(changedProps: PropertyValues<this>) {
-    super.updated(changedProps);
-    if (changedProps.has("direction")) {
-      this.mdcRoot.dir = this.direction;
-      if (this.direction === "rtl") {
-        this._rtlStyle = document.createElement("style");
-        this._rtlStyle.innerHTML = `
-          .mdc-drawer--animate {
-            transform: translateX(100%);
-          }
-          .mdc-drawer--opening {
-            transform: translateX(0);
-          }
-          .mdc-drawer--closing {
-            transform: translateX(100%);
-          }
-        `;
+  private _handleTouchMove = (ev: TouchEvent) => {
+    const currentX = ev.touches[0].clientX;
+    const currentY = ev.touches[0].clientY;
+    this._touchDeltaY = Math.abs(currentY - this._touchStartY);
+    this._gestureRecognizer.move(currentX);
+  };

-        this.shadowRoot!.appendChild(this._rtlStyle);
-      } else if (this._rtlStyle) {
-        this.shadowRoot!.removeChild(this._rtlStyle);
+  private _handleTouchEnd = () => {
+    this._unregisterSwipeHandlers();
+
+    const result = this._gestureRecognizer.end();
+    const isHorizontalGesture =
+      Math.abs(result.delta) >
+      this._touchDeltaY + HaDrawer._SWIPE_AXIS_TOLERANCE;
+
+    if (!isHorizontalGesture) {
+      this._resetSwipeTracking();
+      return;
+    }
+
+    const drawerDialog = this._modalDrawer?.shadowRoot?.querySelector(
+      '[part="dialog"]'
+    ) as HTMLElement | null;
+    const drawerWidth = drawerDialog?.offsetWidth || 0;
+
+    if (result.isSwipe) {
+      const closeByVelocity =
+        this.direction === "rtl"
+          ? result.isDownwardSwipe
+          : !result.isDownwardSwipe;
+
+      if (closeByVelocity) {
+        this._closeModalDrawer();
      }
+      return;
    }

-    if (changedProps.has("open") && this.open && this.type === "modal") {
-      this._setupSwipe();
-    } else if (this._mc) {
-      this._mc.destroy();
-      this._mc = undefined;
+    const closeByDistance =
+      drawerWidth > 0 &&
+      (this.direction === "rtl"
+        ? result.delta > 0 && Math.abs(result.delta) > drawerWidth * 0.5
+        : result.delta < 0 && Math.abs(result.delta) > drawerWidth * 0.5);
+
+    if (closeByDistance) {
+      this._closeModalDrawer();
    }
+  };
+
+  private _unregisterSwipeHandlers() {
+    document.removeEventListener("touchmove", this._handleTouchMove);
+    document.removeEventListener("touchend", this._handleTouchEnd);
+    document.removeEventListener("touchcancel", this._handleTouchEnd);
  }

-  protected firstUpdated() {
-    super.firstUpdated();
-    this.mdcRoot?.addEventListener(
+  private _resetSwipeTracking() {
+    this._unregisterSwipeHandlers();
+    this._gestureRecognizer.reset();
+    this._touchStartY = 0;
+    this._touchDeltaY = 0;
+  }
+
+  private _syncTransitionListeners() {
+    if (this._transitionTarget === this._sidebarShell) {
+      return;
+    }
+
+    this._removeTransitionListeners();
+
+    if (!this._sidebarShell) {
+      return;
+    }
+
+    this._transitionTarget = this._sidebarShell;
+    this._transitionTarget.addEventListener(
      "transitionstart",
      this._handleDrawerTransitionStart
    );
-    this.mdcRoot?.addEventListener(
+    this._transitionTarget.addEventListener(
      "transitionend",
      this._handleDrawerTransitionEnd
    );
-    this.mdcRoot?.addEventListener(
+    this._transitionTarget.addEventListener(
      "transitioncancel",
      this._handleDrawerTransitionEnd
    );
  }

-  public disconnectedCallback() {
-    super.disconnectedCallback();
-    this.mdcRoot?.removeEventListener(
+  private _removeTransitionListeners() {
+    if (!this._transitionTarget) {
+      return;
+    }
+
+    this._transitionTarget.removeEventListener(
      "transitionstart",
      this._handleDrawerTransitionStart
    );
-    this.mdcRoot?.removeEventListener(
+    this._transitionTarget.removeEventListener(
      "transitionend",
      this._handleDrawerTransitionEnd
    );
-    this.mdcRoot?.removeEventListener(
+    this._transitionTarget.removeEventListener(
      "transitioncancel",
      this._handleDrawerTransitionEnd
    );
+    this._transitionTarget = undefined;
  }

-  private async _setupSwipe() {
-    const hammer = await import("../resources/hammer");
-    this._mc = new hammer.Manager(document, {
-      touchAction: "pan-y",
-    });
-    this._mc.add(
-      new hammer.Swipe({
-        direction:
-          this.direction === "rtl"
-            ? hammer.DIRECTION_RIGHT
-            : hammer.DIRECTION_LEFT,
-      })
-    );
-    this._mc.on("swipeleft swiperight", () => {
-      fireEvent(this, "hass-toggle-menu", { open: false });
-    });
-  }
+  static styles = css`
+    :host {
+      display: block;
+      height: 100%;
+    }

-  static override styles = [
-    styles,
-    css`
-      .mdc-drawer {
-        position: fixed;
-        top: 0;
-        border-color: var(--divider-color, rgba(0, 0, 0, 0.12));
-        inset-inline-start: 0 !important;
-        inset-inline-end: initial !important;
-        transition-property: transform, width;
-        transition-duration:
-          var(--mdc-drawer-transition-duration, 0.2s),
-          var(--ha-animation-duration-normal);
-        transition-timing-function:
-          var(
-            --mdc-drawer-transition-timing-function,
-            cubic-bezier(0.4, 0, 0.2, 1)
-          ),
-          ease;
-      }
-      .mdc-drawer.mdc-drawer--modal.mdc-drawer--open {
-        z-index: 200;
-      }
-      .mdc-drawer-app-content {
-        overflow: unset;
-        flex: none;
-        padding-left: var(--mdc-drawer-width);
-        padding-inline-start: var(--mdc-drawer-width);
-        padding-inline-end: initial;
-        direction: var(--direction);
-        width: 100%;
-        box-sizing: border-box;
-        transition:
-          padding-left var(--ha-animation-duration-normal) ease,
-          padding-inline-start var(--ha-animation-duration-normal) ease;
-      }
-      @media (prefers-reduced-motion: reduce) {
-        /* Use 1ms instead of "none" so the transitionend event still fires.
-           The MDC drawer foundation relies on it to complete the close cycle. */
-        .mdc-drawer,
-        .mdc-drawer-app-content {
-          transition: 1ms;
-        }
-      }
-    `,
-  ];
+    .layout {
+      height: 100%;
+    }
+
+    .sidebar-shell {
+      position: fixed;
+      width: var(--ha-sidebar-width);
+      height: 100%;
+      border-inline-end: 1px solid var(--divider-color, rgba(0, 0, 0, 0.12));
+      box-sizing: border-box;
+      transition: width var(--ha-animation-duration-normal) ease;
+    }
+
+    .app-content {
+      overflow: unset;
+      min-width: 0;
+      padding-inline-start: var(--ha-sidebar-width);
+      width: 100%;
+      height: 100%;
+      box-sizing: border-box;
+      transition:
+        padding-inline-start var(--ha-animation-duration-normal) ease,
+        width var(--ha-animation-duration-normal) ease;
+    }
+
+    wa-drawer {
+      --size: var(--ha-sidebar-width, 256px);
+      --show-duration: var(--ha-animation-duration-normal);
+      --hide-duration: var(--ha-animation-duration-normal);
+    }
+
+    wa-drawer::part(body) {
+      margin: 0;
+      padding: 0;
+    }
+  `;
 }

 declare global {
@@ -39,7 +39,12 @@ export class HaEntitiesDisplayEditor extends LitElement {
    const items: DisplayItem[] = entities.map((entity) => ({
      value: entity.entity_id,
      label: computeStateName(entity),
-      icon: entityIcon(this.hass, entity),
+      icon: entityIcon(
+        this.hass.entities,
+        this.hass.config,
+        this.hass.connection,
+        entity
+      ),
    }));

    const value: DisplayValue = {
@@ -59,6 +59,7 @@ export class HaExpansionPanel extends LitElement {
              <slot class="secondary" name="secondary">${this.secondary}</slot>
            </div>
          </slot>
+          <slot name="event"></slot>
          ${!this.leftChevron ? chevronIcon : nothing}
          <slot name="icons"></slot>
        </div>
@@ -122,11 +122,7 @@ export class HaFilterEntities extends LitElement {
          .selected=${this.value?.includes(entity.entity_id) ?? false}
          graphic="icon"
        >
-          <ha-state-icon
-            slot="graphic"
-            .hass=${this.hass}
-            .stateObj=${entity}
-          ></ha-state-icon>
+          <ha-state-icon slot="graphic" .stateObj=${entity}></ha-state-icon>
          ${computeStateName(entity)}
        </ha-check-list-item>`;

@@ -137,7 +137,10 @@ export class HaFilterFloorAreas extends LitElement {
        .selected=${this.value?.areas?.includes(area.area_id) || false}
        .type=${"areas"}
        class=${classMap({
-          rtl: computeRTL(this.hass),
+          rtl: computeRTL(
+            this.hass.language,
+            this.hass.translationMetadata.translations
+          ),
          floor: hasFloor,
        })}
      >
@@ -1,5 +1,6 @@
 import "@home-assistant/webawesome/dist/components/popover/popover";
 import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
+import { consume, type ContextType } from "@lit/context";
 import { mdiPlaylistPlus } from "@mdi/js";
 import {
  css,
@@ -13,8 +14,10 @@ import { customElement, property, query, state } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
 import { tinykeys } from "tinykeys";
 import { fireEvent } from "../common/dom/fire_event";
+import { configContext } from "../data/context";
 import { PickerMixin } from "../mixins/picker-mixin";
 import type { FuseWeightedKey } from "../resources/fuseMultiTerm";
+import { isIosApp } from "../util/is_ios";
 import "./ha-bottom-sheet";
 import "./ha-button";
 import "./ha-combo-box-item";
@@ -110,10 +113,9 @@ export class HaGenericPicker extends PickerMixin(LitElement) {

  @query("ha-picker-combo-box") private _comboBox?: HaPickerComboBox;

-  // disabled till iOS app fix the "focus_element" implementation
-  // @state()
-  // @consume({ context: authContext, subscribe: true })
-  // private auth?: ContextType<typeof authContext>;
+  @state()
+  @consume({ context: configContext, subscribe: true })
+  private _hassConfig?: ContextType<typeof configContext>;

  @state() private _opened = false;

@@ -319,16 +321,18 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
        this._comboBox?.setFieldValue(this._initialFieldValue);
        this._initialFieldValue = undefined;
      }
-      // disabled till iOS app fix the "focus_element" implementation
-      // if (this.auth?.external && isIosApp(this.auth.external)) {
-      //   this.auth.external.fireMessage({
-      //     type: "focus_element",
-      //     payload: {
-      //       element_id: "combo-box",
-      //     },
-      //   });
-      //   return;
-      // }
+      if (
+        this._hassConfig?.auth.external &&
+        isIosApp(this._hassConfig.auth.external)
+      ) {
+        this._hassConfig.auth.external.fireMessage({
+          type: "focus_element",
+          payload: {
+            element_id: "combo-box",
+          },
+        });
+        return;
+      }

      this._comboBox?.focus();
    });
@@ -166,7 +166,6 @@ export class HaRelatedItems extends LitElement {
                    graphic="icon"
                  >
                    <ha-state-icon
-                      .hass=${this.hass}
                      .stateObj=${entity}
                      slot="graphic"
                    ></ha-state-icon>
@@ -322,7 +321,6 @@ export class HaRelatedItems extends LitElement {
                    graphic="icon"
                  >
                    <ha-state-icon
-                      .hass=${this.hass}
                      .stateObj=${group}
                      slot="graphic"
                    ></ha-state-icon>
@@ -347,7 +345,6 @@ export class HaRelatedItems extends LitElement {
                    graphic="icon"
                  >
                    <ha-state-icon
-                      .hass=${this.hass}
                      .stateObj=${scene}
                      slot="graphic"
                    ></ha-state-icon>
@@ -400,7 +397,6 @@ export class HaRelatedItems extends LitElement {
                    graphic="icon"
                  >
                    <ha-state-icon
-                      .hass=${this.hass}
                      .stateObj=${automation}
                      slot="graphic"
                    ></ha-state-icon>
@@ -452,7 +448,6 @@ export class HaRelatedItems extends LitElement {
                    graphic="icon"
                  >
                    <ha-state-icon
-                      .hass=${this.hass}
                      .stateObj=${script}
                      slot="graphic"
                    ></ha-state-icon>
@@ -63,7 +63,12 @@ export class HaSelectBox extends LitElement {
    const selected = option.value === this.value;

    const isDark = this.hass?.themes.darkMode || false;
-    const isRTL = this.hass ? computeRTL(this.hass) : false;
+    const isRTL = this.hass
+      ? computeRTL(
+          this.hass.language,
+          this.hass.translationMetadata.translations
+        )
+      : false;

    const imageSrc =
      typeof option.image === "object"
@@ -36,7 +36,15 @@ export class HaIconSelector extends LitElement {
    const placeholder =
      this.selector.icon?.placeholder ||
      stateObj?.attributes.icon ||
-      (stateObj && until(entityIcon(this.hass, stateObj)));
+      (stateObj &&
+        until(
+          entityIcon(
+            this.hass.entities,
+            this.hass.config,
+            this.hass.connection,
+            stateObj
+          )
+        ));

    return html`
      <ha-icon-picker
@@ -51,11 +59,7 @@ export class HaIconSelector extends LitElement {
      >
        ${!placeholder && stateObj
          ? html`
-              <ha-state-icon
-                slot="start"
-                .hass=${this.hass}
-                .stateObj=${stateObj}
-              ></ha-state-icon>
+              <ha-state-icon slot="start" .stateObj=${stateObj}></ha-state-icon>
            `
          : nothing}
      </ha-icon-picker>
@@ -188,7 +188,6 @@ export class HaObjectSelector extends LitElement {
    }

    return html`<ha-yaml-editor
-        .hass=${this.hass}
        .readonly=${this.disabled}
        .label=${this.label}
        .required=${this.required}
@@ -101,7 +101,6 @@ export class HaTemplateSelector extends LitElement {
        : nothing}
      <ha-code-editor
        mode="jinja2"
-        .hass=${this.hass}
        .value=${this.value}
        .readOnly=${this.disabled}
        .placeholder=${this.placeholder || "{{ ... }}"}
@@ -86,9 +86,6 @@ export class HaServiceControl extends LitElement {

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

-  @property({ attribute: "show-advanced", type: Boolean })
-  public showAdvanced = false;
-
  @property({ attribute: "show-service-id", type: Boolean })
  public showServiceId = false;

@@ -545,7 +542,6 @@ export class HaServiceControl extends LitElement {
        : ""}
    ${shouldRenderServiceDataYaml
      ? html`<ha-yaml-editor
-          .hass=${this.hass}
          .label=${this.hass.localize(
            "ui.components.service-control.action_data"
          )}
@@ -667,10 +663,7 @@ export class HaServiceControl extends LitElement {
        ? this.hass.services[domain][serviceName].description_placeholders
        : undefined;

-    return dataField.selector &&
-      (!dataField.advanced ||
-        this.showAdvanced ||
-        (this._value?.data && this._value.data[dataField.key] !== undefined))
+    return dataField.selector
      ? html`<ha-settings-row .narrow=${this.narrow}>
          ${!showOptional
            ? hasOptional
@@ -523,7 +523,10 @@ class HaSidebar extends SubscribeMixin(ScrollableFadeMixin(LitElement)) {
  }

  private _renderUserItem(selectedPanel: string) {
-    const isRTL = computeRTL(this.hass);
+    const isRTL = computeRTL(
+      this.hass.language,
+      this.hass.translationMetadata.translations
+    );
    const isSelected = selectedPanel === "profile";

    return html`
@@ -561,9 +564,9 @@ class HaSidebar extends SubscribeMixin(ScrollableFadeMixin(LitElement)) {
        id="sidebar-external-config"
      >
        <ha-svg-icon slot="start" .path=${mdiCellphoneCog}></ha-svg-icon>
-        <span class="item-text" slot="headline"
-          >${this.hass.localize("ui.sidebar.external_app_configuration")}</span
-        >
+        <span class="item-text" slot="headline">
+          ${this.hass.localize("ui.sidebar.external_app_configuration")}
+        </span>
      </ha-list-item-button>
      ${!this.alwaysExpand
        ? this._renderToolTip(
@@ -740,6 +743,7 @@ class HaSidebar extends SubscribeMixin(ScrollableFadeMixin(LitElement)) {
          border-radius: var(--ha-border-radius-sm);
          --ha-row-item-min-height: var(--ha-space-10);
          --ha-row-item-padding-block: 0;
+          --ha-row-item-padding-inline: var(--ha-space-3);
          width: var(--ha-space-12);
          position: relative;
          transition: width var(--ha-animation-duration-normal) ease;
@@ -840,21 +844,12 @@ class HaSidebar extends SubscribeMixin(ScrollableFadeMixin(LitElement)) {
        }

        ha-user-badge {
-          width: var(--ha-space-10);
-          height: var(--ha-space-10);
+          width: 40px;
+          height: 40px;
        }

        ha-list-item-button.user {
-          --ha-row-item-padding-inline: var(--ha-space-2) var(--ha-space-3);
-        }
-
-        ha-list-item-button.user.rtl {
-          --ha-row-item-padding-inline: var(--ha-space-4) var(--ha-space-3);
-        }
-
-        ha-user-badge {
-          flex-shrink: 0;
-          margin-right: calc(var(--ha-space-2) * -1);
+          --ha-row-item-padding-inline: var(--ha-space-1) 0;
        }

        .spacer {
@@ -1,31 +1,46 @@
+import { consume, type ContextType } from "@lit/context";
 import type { HassEntity } from "home-assistant-js-websocket";
 import { html, LitElement, nothing } from "lit";
-import { customElement, property } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import { until } from "lit/directives/until";
 import { computeStateDomain } from "../common/entity/compute_state_domain";
+import {
+  configContext,
+  connectionContext,
+  entitiesContext,
+} from "../data/context";
 import {
  DEFAULT_DOMAIN_ICON,
  entityIcon,
  FALLBACK_DOMAIN_ICONS,
 } from "../data/icons";
-import type { HomeAssistant } from "../types";
 import "./ha-icon";
 import "./ha-svg-icon";

@customElement("ha-state-icon")
 export class HaStateIcon extends LitElement {
-  @property({ attribute: false }) public hass?: HomeAssistant;
-
  @property({ attribute: false }) public stateObj?: HassEntity;

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

  @property() public icon?: string;

+  @state()
+  @consume({ context: configContext, subscribe: true })
+  protected _config?: ContextType<typeof configContext>;
+
+  @state()
+  @consume({ context: connectionContext, subscribe: true })
+  protected _connection?: ContextType<typeof connectionContext>;
+
+  @state()
+  @consume({ context: entitiesContext, subscribe: true })
+  protected _entities?: ContextType<typeof entitiesContext>;
+
  protected render() {
    const overrideIcon =
      this.icon ||
-      (this.stateObj && this.hass?.entities[this.stateObj.entity_id]?.icon) ||
+      (this.stateObj && this._entities?.[this.stateObj.entity_id]?.icon) ||
      this.stateObj?.attributes.icon;
    if (overrideIcon) {
      return html`<ha-icon .icon=${overrideIcon}></ha-icon>`;
@@ -33,17 +48,21 @@ export class HaStateIcon extends LitElement {
    if (!this.stateObj) {
      return nothing;
    }
-    if (!this.hass) {
+    if (!this._config || !this._connection || !this._entities) {
      return this._renderFallback();
    }
-    const icon = entityIcon(this.hass, this.stateObj, this.stateValue).then(
-      (icn) => {
-        if (icn) {
-          return html`<ha-icon .icon=${icn}></ha-icon>`;
-        }
-        return this._renderFallback();
+    const icon = entityIcon(
+      this._entities,
+      this._config.config,
+      this._connection.connection,
+      this.stateObj,
+      this.stateValue
+    ).then((icn) => {
+      if (icn) {
+        return html`<ha-icon .icon=${icn}></ha-icon>`;
      }
-    );
+      return this._renderFallback();
+    });
    return html`${until(icon)}`;
  }

@@ -228,6 +228,10 @@ export class HaSwitch extends Switch {
          outline: var(--wa-focus-ring);
          outline-offset: var(--wa-focus-ring-offset);
        }
+
+        :host(:empty) slot.label {
+          display: none;
+        }
      `,
    ];
  }
@@ -1136,7 +1136,10 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
    let rtl = false;
    let showEntityId = false;
    if (type === "area" || type === "floor") {
-      rtl = computeRTL(this.hass);
+      rtl = computeRTL(
+        this.hass.language,
+        this.hass.translationMetadata.translations
+      );
      hasFloor =
        type === "area" && !!(item as FloorComboBoxItem).area?.floor_id;
    }
@@ -3,14 +3,16 @@ import { DEFAULT_SCHEMA, dump, load } from "js-yaml";
 import type { CSSResultGroup, PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
+import type { ContextType } from "@lit/context";
+import { consume } from "@lit/context";
 import { fireEvent } from "../common/dom/fire_event";
 import { copyToClipboard } from "../common/util/copy-clipboard";
 import { haStyle } from "../resources/styles";
-import type { HomeAssistant } from "../types";
 import { showToast } from "../util/toast";
 import "./ha-button";
 import "./ha-code-editor";
 import type { HaCodeEditor } from "./ha-code-editor";
+import { internationalizationContext } from "../data/context";

 const isEmpty = (obj: Record<string, unknown>): boolean => {
  if (typeof obj !== "object" || obj === null) {
@@ -26,8 +28,6 @@ const isEmpty = (obj: Record<string, unknown>): boolean => {

@customElement("ha-yaml-editor")
 export class HaYamlEditor extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
  @property() public value?: any;

  @property({ attribute: false }) public yamlSchema: Schema = DEFAULT_SCHEMA;
@@ -59,6 +59,10 @@ export class HaYamlEditor extends LitElement {

  @state() private _yaml = "";

+  @state()
+  @consume({ context: internationalizationContext, subscribe: true })
+  private _i18n?: ContextType<typeof internationalizationContext>;
+
  @query("ha-code-editor") _codeEditor?: HaCodeEditor;

  public setValue(value): void {
@@ -112,7 +116,6 @@ export class HaYamlEditor extends LitElement {
        ? html`<p>${this.label}${this.required ? " *" : ""}</p>`
        : nothing}
      <ha-code-editor
-        .hass=${this.hass}
        .value=${this._yaml}
        .readOnly=${this.readOnly}
        .disableFullscreen=${this.disableFullscreen}
@@ -132,7 +135,7 @@ export class HaYamlEditor extends LitElement {
              ${this.copyClipboard
                ? html`
                    <ha-button appearance="plain" @click=${this._copyYaml}>
-                      ${this.hass.localize(
+                      ${this._i18n!.localize(
                        "ui.components.yaml-editor.copy_to_clipboard"
                      )}
                    </ha-button>
@@ -163,7 +166,7 @@ export class HaYamlEditor extends LitElement {
        // Invalid YAML
        isValid = false;
        yamlError = err;
-        errorMsg = `${this.hass.localize("ui.components.yaml-editor.error", { reason: err.reason })}${err.mark ? ` (${this.hass.localize("ui.components.yaml-editor.error_location", { line: err.mark.line + 1, column: err.mark.column + 1 })})` : ""}`;
+        errorMsg = `${this._i18n!.localize("ui.components.yaml-editor.error", { reason: err.reason })}${err.mark ? ` (${this._i18n!.localize("ui.components.yaml-editor.error_location", { line: err.mark.line + 1, column: err.mark.column + 1 })})` : ""}`;
      }
    } else {
      parsed = {};
@@ -201,7 +204,7 @@ export class HaYamlEditor extends LitElement {
    if (this.yaml) {
      await copyToClipboard(this.yaml);
      showToast(this, {
-        message: this.hass.localize("ui.common.copied_clipboard"),
+        message: this._i18n!.localize("ui.common.copied_clipboard"),
      });
    }
  }
@@ -1,6 +1,8 @@
 import type { CSSResultGroup } from "lit";
 import { css } from "lit";
 import { customElement, property } from "lit/decorators";
+import { fireEvent } from "../../common/dom/fire_event";
+import "../list/types";
 import { HaRowItem } from "./ha-row-item";

 /**
@@ -39,6 +41,12 @@ export class HaListItemBase extends HaRowItem {
    if (!this.hasAttribute("role")) {
      this.setAttribute("role", this.defaultRole);
    }
+    fireEvent(this, "ha-list-item-register", { item: this });
+  }
+
+  public disconnectedCallback(): void {
+    super.disconnectedCallback();
+    fireEvent(this, "ha-list-item-unregister", { item: this });
  }

  /**
@@ -1,7 +1,7 @@
 import { HasSlotController } from "@home-assistant/webawesome/dist/internal/slot";
 import type { CSSResultGroup, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";

 /**
 * @element ha-row-item
@@ -46,13 +46,34 @@ export class HaRowItem extends LitElement {

  protected readonly _slotController = new HasSlotController(
    this,
-    "start",
-    "end",
    "headline",
    "supporting-text",
    "content"
  );

+  @state() private _hasStart = false;
+
+  @state() private _hasEnd = false;
+
+  private _onSlotChange(name: "start" | "end") {
+    return (ev: Event) => {
+      const slot = ev.target as HTMLSlotElement;
+      const hasContent = slot
+        .assignedNodes({ flatten: true })
+        .some(
+          (node) =>
+            node.nodeType === Node.ELEMENT_NODE ||
+            (node.nodeType === Node.TEXT_NODE &&
+              (node as Text).textContent?.trim() !== "")
+        );
+      if (name === "start") {
+        this._hasStart = hasContent;
+      } else {
+        this._hasEnd = hasContent;
+      }
+    };
+  }
+
  protected render(): TemplateResult {
    return this._renderBase(this._renderInner());
  }
@@ -62,26 +83,20 @@ export class HaRowItem extends LitElement {
  }

  protected _renderInner(): TemplateResult {
-    const hasStart = this._slotController.test("start");
-    const hasEnd = this._slotController.test("end");
    const hasContent = this._slotController.test("content");

    return html`
-      ${hasStart
-        ? html`<div part="start" class="start">
-            <slot name="start"></slot>
-          </div>`
-        : nothing}
+      <div part="start" class="start" ?hidden=${!this._hasStart}>
+        <slot name="start" @slotchange=${this._onSlotChange("start")}></slot>
+      </div>
      <div part="content" class="content">
        ${hasContent
          ? html`<slot name="content"></slot>`
          : this._renderDefaultContent()}
      </div>
-      ${hasEnd
-        ? html`<div part="end" class="end">
-            <slot name="end"></slot>
-          </div>`
-        : nothing}
+      <div part="end" class="end" ?hidden=${!this._hasEnd}>
+        <slot name="end" @slotchange=${this._onSlotChange("end")}></slot>
+      </div>
    `;
  }

@@ -115,10 +130,6 @@ export class HaRowItem extends LitElement {
      color: var(--primary-text-color);
      font-size: var(--ha-font-size-m);
      line-height: var(--ha-line-height-normal);
-      --ha-row-item-padding-block: var(--ha-space-3);
-      --ha-row-item-padding-inline: var(--ha-space-4);
-      --ha-row-item-gap: var(--ha-space-4);
-      --ha-row-item-min-height: 48px;
    }
    :host([disabled]) {
      color: var(--disabled-text-color);
@@ -129,10 +140,10 @@ export class HaRowItem extends LitElement {
      display: flex;
      flex-direction: row;
      align-items: center;
-      gap: var(--ha-row-item-gap);
-      padding-block: var(--ha-row-item-padding-block);
-      padding-inline: var(--ha-row-item-padding-inline);
-      min-height: var(--ha-row-item-min-height);
+      gap: var(--ha-row-item-gap, var(--ha-space-4));
+      padding-block: var(--ha-row-item-padding-block, var(--ha-space-3));
+      padding-inline: var(--ha-row-item-padding-inline, var(--ha-space-4));
+      min-height: var(--ha-row-item-min-height, 48px);
      box-sizing: border-box;
    }
    .content {
@@ -148,6 +159,10 @@ export class HaRowItem extends LitElement {
      align-items: center;
      flex: 0 0 auto;
    }
+    .start[hidden],
+    .end[hidden] {
+      display: none;
+    }
    .headline {
      overflow: hidden;
      text-overflow: ellipsis;
@@ -1,10 +1,12 @@
-import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
+import type { CSSResultGroup, TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { tinykeys } from "tinykeys";
-import { fireEvent } from "../../common/dom/fire_event";
-import { HaListItemBase } from "../item/ha-list-item-base";
+import { compareNodeOrder } from "../../common/dom/compare-node-order";
+import { fireEvent, type HASSDomEvent } from "../../common/dom/fire_event";
+import type { HaListItemBase } from "../item/ha-list-item-base";
 import "./types";
+import type { HaListItemRegistrationDetail } from "./types";

 /**
 * @element ha-list-base
@@ -12,9 +14,11 @@ import "./types";
 *
 * @summary
 * Base list container with roving-tabindex keyboard navigation (ArrowUp/Down,
- * Home/End, optional Enter/Space activation, optional wrap-focus). Discovers
- * slotted `HaListItemBase` descendants. Subclasses override `hostRole` and/or
- * `render()` to specialize.
+ * Home/End, optional Enter/Space activation, optional wrap-focus). Tracks
+ * `HaListItemBase` descendants via the `ha-list-item-register` /
+ * `ha-list-item-unregister` events they fire on connect/disconnect — works
+ * across any nesting depth and shadow boundaries. Subclasses override
+ * `hostRole` and/or `render()` to specialize.
 *
 * @slot - List items (`<ha-list-item-*>`).
 *
@@ -68,6 +72,14 @@ export class HaListBase extends LitElement {
      Space: this._onActivate,
    });
    this.addEventListener("focusin", this._onFocusIn);
+    this.addEventListener(
+      "ha-list-item-register",
+      this._onItemRegister as EventListener
+    );
+    this.addEventListener(
+      "ha-list-item-unregister",
+      this._onItemUnregister as EventListener
+    );
  }

  public disconnectedCallback() {
@@ -75,11 +87,14 @@ export class HaListBase extends LitElement {
    this._unbindKeys?.();
    this._unbindKeys = undefined;
    this.removeEventListener("focusin", this._onFocusIn);
-  }
-
-  public firstUpdated(changed: PropertyValues) {
-    super.firstUpdated(changed);
-    this.updateListItems();
+    this.removeEventListener(
+      "ha-list-item-register",
+      this._onItemRegister as EventListener
+    );
+    this.removeEventListener(
+      "ha-list-item-unregister",
+      this._onItemUnregister as EventListener
+    );
  }

  public focus(options?: FocusOptions) {
@@ -115,18 +130,14 @@ export class HaListBase extends LitElement {
    this._applyActive(focusItem);
  }

+  /**
+   * Hook called whenever the items array has changed. Subclasses can override
+   * to layer in extra bookkeeping (e.g. selection state sync).
+   */
  public updateListItems() {
-    const next = this._discoverListItems();
-    const changed =
-      next.length !== this.items.length ||
-      next.some((it, i) => it !== this.items[i]);
-    if (!changed) {
-      return;
-    }
-    this.items = next;
    this._recomputeFocusableIndexes();
    if (
-      this._activeItemIndex >= next.length ||
+      this._activeItemIndex >= this.items.length ||
      !this._hasFocusableItem ||
      this._activeItemIndex < 0
    ) {
@@ -135,6 +146,32 @@ export class HaListBase extends LitElement {
    this._applyActive(false);
  }

+  private _onItemRegister = (
+    ev: HASSDomEvent<HaListItemRegistrationDetail>
+  ) => {
+    ev.stopPropagation();
+    const item = ev.detail.item;
+    if (this.items.includes(item)) {
+      return;
+    }
+    const next = [...this.items, item];
+    next.sort(compareNodeOrder);
+    this.items = next;
+    this.updateListItems();
+  };
+
+  private _onItemUnregister = (
+    ev: HASSDomEvent<HaListItemRegistrationDetail>
+  ) => {
+    ev.stopPropagation();
+    const item = ev.detail.item;
+    if (!this.items.includes(item)) {
+      return;
+    }
+    this.items = this.items.filter((it) => it !== item);
+    this.updateListItems();
+  };
+
  private _recomputeFocusableIndexes() {
    let first = -1;
    let last = -1;
@@ -151,27 +188,12 @@ export class HaListBase extends LitElement {
    this._hasFocusableItem = first !== -1;
  }

-  public handleSlotChange = () => {
-    this.updateListItems();
-  };
-
  protected render(): TemplateResult {
    return html`<div part="base" class="base">
-      <slot @slotchange=${this.handleSlotChange}></slot>
+      <slot></slot>
    </div>`;
  }

-  private _discoverListItems(): HaListItemBase[] {
-    const slot =
-      this.renderRoot?.querySelector<HTMLSlotElement>("slot:not([name])");
-    if (!slot) {
-      return [];
-    }
-    return slot
-      .assignedElements({ flatten: true })
-      .filter((el): el is HaListItemBase => el instanceof HaListItemBase);
-  }
-
  private _isFocusable(index: number): boolean {
    const item = this.items[index];
    return !!item && item.interactive && !item.disabled;
@@ -270,14 +292,12 @@ export class HaListBase extends LitElement {
  static styles: CSSResultGroup = css`
    :host {
      display: block;
-      --ha-list-gap: 0;
-      --ha-list-padding: 0;
    }
    .base {
      display: flex;
      flex-direction: column;
-      gap: var(--ha-list-gap);
-      padding: var(--ha-list-padding);
+      gap: var(--ha-list-gap, 0);
+      padding: var(--ha-list-padding, 0);
      margin: 0;
      list-style: none;
    }
@@ -31,7 +31,7 @@ export class HaListNav extends HaListBase {
      aria-label=${ifDefined(this.ariaLabel ?? undefined)}
    >
      <div part="base" class="base" role="list">
-        <slot @slotchange=${this.handleSlotChange}></slot>
+        <slot></slot>
      </div>
    </nav>`;
  }
@@ -121,15 +121,15 @@ export class HaListSelectable extends HaListBase {

  public updateListItems() {
    super.updateListItems();
-    this._syncItemSelectedState();
+    this._syncItemSelectedState(true);
  }

  private _sortedSelectedIndices(): number[] {
    return [...this._selectedIndices!].sort((a, b) => a - b);
  }

-  private _syncItemSelectedState() {
-    if (!this._selectedIndices) {
+  private _syncItemSelectedState(reset = false): void {
+    if (!this._selectedIndices || reset) {
      this._selectedIndices = new Set<number>();
      this.items.forEach((item, i) => {
        const opt = item as HaListItemOption;
@@ -11,9 +11,15 @@ export interface HaListActivatedDetail {
  item: HaListItemBase;
 }

+export interface HaListItemRegistrationDetail {
+  item: HaListItemBase;
+}
+
 declare global {
  interface HASSDomEvents {
    "ha-list-selected": HaListSelectedDetail;
    "ha-list-activated": HaListActivatedDetail;
+    "ha-list-item-register": HaListItemRegistrationDetail;
+    "ha-list-item-unregister": HaListItemRegistrationDetail;
  }
 }
@@ -37,7 +37,6 @@ class HaEntityMarker extends LitElement {
            ></div>`
          : this.showIcon && this.entityId
            ? html`<ha-state-icon
-                .hass=${this.hass}
                .stateObj=${this.hass?.states[this.entityId]}
              ></ha-state-icon>`
            : !this.entityUnit
@@ -76,12 +76,7 @@ class DialogJoinMediaPlayers extends LitElement {

    const entityId = this._entityId;
    return html`
-      <ha-dialog
-        .hass=${this.hass}
-        .open=${this._open}
-        flexcontent
-        @closed=${this._dialogClosed}
-      >
+      <ha-dialog .open=${this._open} flexcontent @closed=${this._dialogClosed}>
        <ha-dialog-header show-border slot="header">
          <ha-icon-button
            .label=${this.hass.localize("ui.common.close")}
@@ -100,7 +100,6 @@ class DialogMediaManage extends LitElement {

    return html`
      <ha-dialog
-        .hass=${this.hass}
        .open=${this._open}
        ?prevent-scrim-close=${this._uploading || this._deleting}
        @closed=${this._dialogClosed}
@@ -77,7 +77,6 @@ class DialogMediaPlayerBrowse extends LitElement {

    return html`
      <ha-dialog
-        .hass=${this.hass}
        .open=${this._open}
        width="large"
        flexcontent
@@ -59,7 +59,10 @@ class HaMediaPlayerToggle extends LitElement {
      icon = mdiSpeakerPause;
    }

-    const isRTL = computeRTL(this.hass);
+    const isRTL = computeRTL(
+      this.hass.language,
+      this.hass.translationMetadata.translations
+    );

    const { primary, secondary } = this._computeDisplayData(
      this.entityId,
@@ -1,15 +1,29 @@
-import { html, LitElement, nothing } from "lit";
+import type { HassEntity } from "home-assistant-js-websocket";
+import type { PropertyValues } from "lit";
+import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import memoizeOne from "memoize-one";
+import { ensureArray } from "../../../common/array/ensure-array";
 import { fireEvent } from "../../../common/dom/fire_event";
+import type { DeviceRegistryEntry } from "../../../data/device/device_registry";
+import { getDeviceIntegrationLookup } from "../../../data/device/device_registry";
+import type { HaEntityPickerEntityFilterFunc } from "../../../data/entity/entity";
+import type { EntitySources } from "../../../data/entity/entity_sources";
+import { fetchEntitySourcesWithCache } from "../../../data/entity/entity_sources";
+import type { TargetSelector } from "../../../data/selector";
+import {
+  filterSelectorDevices,
+  filterSelectorEntities,
+} from "../../../data/selector";
 import type { HassDialog } from "../../../dialogs/make-dialog-manager";
 import type { HomeAssistant } from "../../../types";
-import "../../ha-dialog";
+import type { HaDevicePickerDeviceFilterFunc } from "../../device/ha-device-picker";
+import "../../ha-adaptive-dialog";
 import "../../ha-dialog-header";
 import "../../ha-icon-button";
 import "../../ha-icon-next";
-import "../../ha-md-list";
-import "../../ha-md-list-item";
 import "../../ha-svg-icon";
+import "../../list/ha-list-base";
 import "../ha-target-picker-item-row";
 import type { TargetDetailsDialogParams } from "./show-dialog-target-details";

@@ -21,6 +35,12 @@ class DialogTargetDetails extends LitElement implements HassDialog {

  @state() private _opened = false;

+  @state() private _entitySources?: EntitySources;
+
+  @state() private _entitySourcesLoaded = false;
+
+  private _deviceIntegrationLookup = memoizeOne(getDeviceIntegrationLookup);
+
  public showDialog(params: TargetDetailsDialogParams): void {
    this._params = params;
    this._opened = true;
@@ -34,6 +54,72 @@ class DialogTargetDetails extends LitElement implements HassDialog {
  private _dialogClosed() {
    fireEvent(this, "dialog-closed", { dialog: this.localName });
    this._params = undefined;
+    this._entitySources = undefined;
+    this._entitySourcesLoaded = false;
+  }
+
+  private _hasIntegration(selector: TargetSelector) {
+    return (
+      (selector.target?.entity &&
+        ensureArray(selector.target.entity).some((e) => e.integration)) ||
+      (selector.target?.device &&
+        ensureArray(selector.target.device).some((d) => d.integration))
+    );
+  }
+
+  protected updated(changedProperties: PropertyValues): void {
+    super.updated(changedProperties);
+    if (!changedProperties.has("_params")) {
+      return;
+    }
+    if (
+      this._params?.selector &&
+      this._hasIntegration(this._params.selector) &&
+      !this._entitySourcesLoaded
+    ) {
+      this._loadEntitySources();
+    }
+  }
+
+  private async _loadEntitySources(): Promise<void> {
+    try {
+      this._entitySources = await fetchEntitySourcesWithCache(this.hass);
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.error("Failed to load entity sources for target details", err);
+    } finally {
+      this._entitySourcesLoaded = true;
+    }
+  }
+
+  private _filterEntities = (entity: HassEntity): boolean => {
+    const target = this._selectorTarget();
+    if (!target?.entity) {
+      return true;
+    }
+    return ensureArray(target.entity).some((e) =>
+      filterSelectorEntities(e, entity, this._entitySources)
+    );
+  };
+
+  private _filterDevices = (device: DeviceRegistryEntry): boolean => {
+    const target = this._selectorTarget();
+    if (!target?.device) {
+      return true;
+    }
+    const deviceIntegrations = this._entitySources
+      ? this._deviceIntegrationLookup(
+          this._entitySources,
+          Object.values(this.hass.entities)
+        )
+      : undefined;
+    return ensureArray(target.device).some((d) =>
+      filterSelectorDevices(d, device, deviceIntegrations)
+    );
+  };
+
+  private _selectorTarget() {
+    return this._params?.selector?.target || null;
  }

  protected render() {
@@ -41,33 +127,86 @@ class DialogTargetDetails extends LitElement implements HassDialog {
      return nothing;
    }

+    let deviceFilter: HaDevicePickerDeviceFilterFunc | undefined;
+    let entityFilter: HaEntityPickerEntityFilterFunc | undefined;
+    let includeDomains: string[] | undefined;
+    let includeDeviceClasses: string[] | undefined;
+    let primaryEntitiesOnly: boolean | undefined;
+
+    if (this._params.selector) {
+      deviceFilter = this._filterDevices;
+      entityFilter = this._filterEntities;
+      primaryEntitiesOnly = this._params.selector.target?.primary_entities_only;
+    } else {
+      deviceFilter = this._params.deviceFilter;
+      entityFilter = this._params.entityFilter;
+      includeDomains = this._params.includeDomains;
+      includeDeviceClasses = this._params.includeDeviceClasses;
+      primaryEntitiesOnly = this._params.primaryEntitiesOnly;
+    }
+
+    const waitingForSources =
+      this._params.selector &&
+      this._hasIntegration(this._params.selector) &&
+      !this._entitySourcesLoaded;
+
    return html`
-      <ha-dialog
-        .hass=${this.hass}
+      <ha-adaptive-dialog
        .open=${this._opened}
        header-title=${this.hass.localize(
          "ui.components.target-picker.target_details"
        )}
-        header-subtitle=${`${this.hass.localize(
-          `ui.components.target-picker.type.${this._params.type}`
-        )}:
-            ${this._params.title}`}
        @closed=${this._dialogClosed}
      >
-        <ha-target-picker-item-row
-          .hass=${this.hass}
-          .type=${this._params.type}
-          .itemId=${this._params.itemId}
-          .deviceFilter=${this._params.deviceFilter}
-          .entityFilter=${this._params.entityFilter}
-          .includeDomains=${this._params.includeDomains}
-          .includeDeviceClasses=${this._params.includeDeviceClasses}
-          .primaryEntitiesOnly=${this._params.primaryEntitiesOnly}
-          expand
-        ></ha-target-picker-item-row>
-      </ha-dialog>
+        <div class="type-wrapper">
+          <div class="type-label">
+            ${this.hass.localize(
+              `ui.components.target-picker.type.${this._params.type}`
+            )}
+          </div>
+          <ha-list-base
+            .ariaLabel=${`${this.hass.localize(`ui.components.target-picker.type.${this._params.type}`)}: ${this._params.title}`}
+            wrap-focus
+          >
+            ${waitingForSources
+              ? nothing
+              : html`
+                  <ha-target-picker-item-row
+                    .hass=${this.hass}
+                    .type=${this._params.type}
+                    .itemId=${this._params.itemId}
+                    .deviceFilter=${deviceFilter}
+                    .entityFilter=${entityFilter}
+                    .includeDomains=${includeDomains}
+                    .includeDeviceClasses=${includeDeviceClasses}
+                    .primaryEntitiesOnly=${primaryEntitiesOnly}
+                    expand
+                  ></ha-target-picker-item-row>
+                `}
+          </ha-list-base>
+        </div>
+      </ha-adaptive-dialog>
    `;
  }
+
+  static styles = css`
+    .type-wrapper {
+      display: flex;
+      flex-direction: column;
+      border-radius: var(--ha-border-radius-xl);
+      border: var(--ha-border-width-sm) solid
+        var(--ha-color-border-neutral-normal);
+      overflow: hidden;
+    }
+    .type-label {
+      background-color: var(--ha-color-surface-low);
+      padding: var(--ha-space-1) var(--ha-space-3);
+      font-weight: var(--ha-font-weight-bold);
+      display: flex;
+      align-items: center;
+      height: 20px;
+    }
+  `;
 }

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

-export type NewBackupType = "automatic" | "manual";
-
 export interface TargetDetailsDialogParams {
  title: string;
  type: TargetType;
  itemId: string;
+  selector?: TargetSelector;
  deviceFilter?: HaDevicePickerDeviceFilterFunc;
  entityFilter?: HaEntityPickerEntityFilterFunc;
  includeDomains?: string[];
@@ -5,7 +5,7 @@ import type { TargetType, TargetTypeFloorless } from "../../data/target";
 import type { HomeAssistant } from "../../types";
 import type { HaDevicePickerDeviceFilterFunc } from "../device/ha-device-picker";
 import "../ha-expansion-panel";
-import "../ha-md-list";
+import "../list/ha-list-base";
 import "./ha-target-picker-item-row";

@customElement("ha-target-picker-item-group")
@@ -66,23 +66,25 @@ export class HaTargetPickerItemGroup extends LitElement {
          }
        )}
      </div>
-      ${Object.entries(this.items).map(([type, items]) =>
-        items
-          ? items.map(
-              (item) =>
-                html`<ha-target-picker-item-row
-                  .hass=${this.hass}
-                  .type=${type as TargetTypeFloorless}
-                  .itemId=${item}
-                  .deviceFilter=${this.deviceFilter}
-                  .entityFilter=${this.entityFilter}
-                  .includeDomains=${this.includeDomains}
-                  .includeDeviceClasses=${this.includeDeviceClasses}
-                  .primaryEntitiesOnly=${this.primaryEntitiesOnly}
-                ></ha-target-picker-item-row>`
-            )
-          : nothing
-      )}
+      <ha-list-base>
+        ${Object.entries(this.items).map(([type, items]) =>
+          items
+            ? items.map(
+                (item) =>
+                  html`<ha-target-picker-item-row
+                    .hass=${this.hass}
+                    .type=${type as TargetTypeFloorless}
+                    .itemId=${item}
+                    .deviceFilter=${this.deviceFilter}
+                    .entityFilter=${this.entityFilter}
+                    .includeDomains=${this.includeDomains}
+                    .includeDeviceClasses=${this.includeDeviceClasses}
+                    .primaryEntitiesOnly=${this.primaryEntitiesOnly}
+                  ></ha-target-picker-item-row>`
+              )
+            : nothing
+        )}
+      </ha-list-base>
    </ha-expansion-panel>`;
  }

@@ -96,7 +98,7 @@ export class HaTargetPickerItemGroup extends LitElement {
      --expansion-panel-content-padding: 0;
    }
    ha-expansion-panel::part(summary) {
-      background-color: var(--ha-color-fill-neutral-quiet-resting);
+      background-color: var(--ha-color-surface-low);
      padding: var(--ha-space-1) var(--ha-space-2);
      font-weight: var(--ha-font-weight-bold);
      color: var(--secondary-text-color);
@@ -104,9 +106,6 @@ export class HaTargetPickerItemGroup extends LitElement {
      justify-content: space-between;
      min-height: unset;
    }
-    ha-md-list {
-      padding: 0;
-    }
  `;
 }

@@ -1,14 +1,24 @@
 import { consume } from "@lit/context";
 import {
+  mdiChevronLeft,
+  mdiChevronRight,
  mdiClose,
  mdiDevices,
  mdiHome,
  mdiLabel,
+  mdiMinusBox,
  mdiTextureBox,
 } from "@mdi/js";
 import type { HassEntity } from "home-assistant-js-websocket";
-import { css, html, LitElement, nothing, type PropertyValues } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import {
+  css,
+  html,
+  LitElement,
+  nothing,
+  type PropertyValues,
+  type TemplateResult,
+} from "lit";
+import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
@@ -38,18 +48,17 @@ import {
  type ExtractFromTargetResultReferenced,
  type TargetType,
 } from "../../data/target";
+import { showMoreInfoDialog } from "../../dialogs/more-info/show-ha-more-info-dialog";
 import { buttonLinkStyle } from "../../resources/styles";
 import type { HomeAssistant } from "../../types";
 import { brandsUrl } from "../../util/brands-url";
 import type { HaDevicePickerDeviceFilterFunc } from "../device/ha-device-picker";
 import { floorDefaultIconPath } from "../ha-floor-icon";
 import "../ha-icon-button";
-import "../ha-md-list";
-import type { HaMdList } from "../ha-md-list";
-import "../ha-md-list-item";
-import type { HaMdListItem } from "../ha-md-list-item";
 import "../ha-state-icon";
 import "../ha-svg-icon";
+import "../item/ha-list-item-base";
+import "../item/ha-list-item-button";
 import { showTargetDetailsDialog } from "./dialog/show-dialog-target-details";

@customElement("ha-target-picker-item-row")
@@ -65,6 +74,9 @@ export class HaTargetPickerItemRow extends LitElement {
  @property({ type: Boolean, attribute: "sub-entry", reflect: true })
  public subEntry = false;

+  @property({ attribute: false })
+  public subLevel = 0;
+
  @property({ type: Boolean, attribute: "hide-context" })
  public hideContext = false;

@@ -106,12 +118,6 @@ export class HaTargetPickerItemRow extends LitElement {
  @consume({ context: labelsContext, subscribe: true })
  _labelRegistry!: LabelRegistryEntry[];

-  @query("ha-md-list-item") public item?: HaMdListItem;
-
-  @query("ha-md-list") public list?: HaMdList;
-
-  @query("ha-target-picker-item-row") public itemRow?: HaTargetPickerItemRow;
-
  protected willUpdate(changedProps: PropertyValues<this>) {
    if (!this.subEntry && changedProps.has("itemId")) {
      this._updateItemData();
@@ -137,101 +143,130 @@ export class HaTargetPickerItemRow extends LitElement {

    const replaceable = !this.subEntry && !this.expand;

-    return html`
-      <ha-md-list-item
-        type=${replaceable ? "button" : "text"}
-        class=${classMap({
-          error: notFound,
-          replaceable,
-        })}
-        @click=${replaceable ? this._replaceItem : undefined}
-      >
-        <div class="icon" slot="start">
-          ${this.subEntry
-            ? html`
-                <div class="horizontal-line-wrapper">
-                  <div class="horizontal-line"></div>
-                </div>
-              `
-            : nothing}
-          ${iconPath
-            ? html`<ha-icon .icon=${iconPath}></ha-icon>`
-            : this._iconImg
-              ? html`<img
-                  alt=${this._domainName || ""}
-                  crossorigin="anonymous"
-                  referrerpolicy="no-referrer"
-                  src=${this._iconImg}
-                />`
-              : fallbackIconPath
-                ? html`<ha-svg-icon .path=${fallbackIconPath}></ha-svg-icon>`
-                : this.type === "entity"
-                  ? html`
-                      <ha-state-icon
-                        .hass=${this.hass}
-                        .stateObj=${stateObject ||
-                        ({
-                          entity_id: this.itemId,
-                          attributes: {},
-                        } as HassEntity)}
-                      >
-                      </ha-state-icon>
-                    `
-                  : nothing}
-        </div>
+    const content = html`
+      <div class="icon" slot="start">
+        ${iconPath
+          ? html`<ha-icon .icon=${iconPath}></ha-icon>`
+          : this._iconImg
+            ? html`<img
+                alt=${this._domainName || ""}
+                crossorigin="anonymous"
+                referrerpolicy="no-referrer"
+                src=${this._iconImg}
+              />`
+            : fallbackIconPath
+              ? html`<ha-svg-icon .path=${fallbackIconPath}></ha-svg-icon>`
+              : this.type === "entity"
+                ? html`
+                    <ha-state-icon
+                      .stateObj=${stateObject ||
+                      ({
+                        entity_id: this.itemId,
+                        attributes: {},
+                      } as HassEntity)}
+                    >
+                    </ha-state-icon>
+                  `
+                : nothing}
+      </div>

-        <div slot="headline">${name}</div>
-        ${notFound || (context && !this.hideContext)
-          ? html`<span slot="supporting-text"
-              >${notFound
-                ? this.hass.localize(
-                    `ui.components.target-picker.${this.type}_not_found`
-                  )
-                : context}</span
-            >`
-          : nothing}
-        ${this._domainName && this.subEntry
-          ? html`<span slot="supporting-text" class="domain"
-              >${this._domainName}</span
-            >`
-          : nothing}
-        ${!this.subEntry && entries && showEntities
-          ? html`
-              <div slot="end" class="summary">
-                ${showEntities &&
-                !this.expand &&
-                entries?.referenced_entities.length
-                  ? html`<button class="main link" @click=${this._openDetails}>
+      <div slot="headline">${name}</div>
+      ${notFound || (context && !this.hideContext)
+        ? html`<span slot="supporting-text"
+            >${notFound
+              ? this.hass.localize(
+                  `ui.components.target-picker.${this.type}_not_found`
+                )
+              : context}</span
+          >`
+        : nothing}
+      ${stateObject && this.subEntry
+        ? html`<span slot="supporting-text" class="state"
+            >${this.hass.formatEntityState(stateObject)}</span
+          >`
+        : nothing}
+      ${!this.subEntry && entries && showEntities
+        ? html`
+            <div slot="end" class="summary">
+              ${showEntities &&
+              !this.expand &&
+              entries?.referenced_entities.length
+                ? html`<button class="main link" @click=${this._openDetails}>
+                    ${this.hass.localize(
+                      "ui.components.target-picker.entities_count",
+                      {
+                        count: entries?.referenced_entities.length,
+                      }
+                    )}
+                  </button>`
+                : showEntities
+                  ? html`<span class="main">
                      ${this.hass.localize(
                        "ui.components.target-picker.entities_count",
                        {
                          count: entries?.referenced_entities.length,
                        }
                      )}
-                    </button>`
-                  : showEntities
-                    ? html`<span class="main">
-                        ${this.hass.localize(
-                          "ui.components.target-picker.entities_count",
-                          {
-                            count: entries?.referenced_entities.length,
-                          }
-                        )}
-                      </span>`
-                    : nothing}
-              </div>
-            `
-          : nothing}
-        ${!this.expand && !this.subEntry
+                    </span>`
+                  : nothing}
+            </div>
+          `
+        : nothing}
+      ${!this.expand && !this.subEntry
+        ? html`
+            <ha-icon-button
+              .path=${mdiClose}
+              slot="end"
+              @click=${this._removeItem}
+            ></ha-icon-button>
+          `
+        : this.subEntry && this.type === "entity"
          ? html`
-              <ha-icon-button
-                .path=${mdiClose}
+              <ha-svg-icon
+                .path=${computeRTL(
+                  this.hass.language,
+                  this.hass.translationMetadata.translations
+                )
+                  ? mdiChevronLeft
+                  : mdiChevronRight}
                slot="end"
-                @click=${this._removeItem}
-              ></ha-icon-button>
+              ></ha-svg-icon>
            `
          : nothing}
-      </ha-md-list-item>
+    `;
+
+    let item: TemplateResult;
+
+    if (replaceable || (this.subEntry && this.type === "entity")) {
+      item = html`
+        <ha-list-item-button
+          class=${classMap({
+            error: notFound,
+            replaceable,
+          })}
+          @click=${replaceable
+            ? this._replaceItem
+            : this.subEntry && this.type === "entity"
+              ? this._openMoreInfo
+              : undefined}
+        >
+          ${content}
+        </ha-list-item-button>
+      `;
+    } else {
+      item = html`
+        <ha-list-item-base
+          class=${classMap({
+            error: notFound,
+          })}
+        >
+          ${content}
+        </ha-list-item-base>
+      `;
+    }
+
+    return html`
+      ${item}
      ${this.expand && entries && entries.referenced_entities
        ? this._renderEntries()
        : nothing}
@@ -241,6 +276,10 @@ export class HaTargetPickerItemRow extends LitElement {
  private _renderEntries() {
    const entries = this.parentEntries || this._entries;

+    if (!entries || entries.referenced_entities.length === 0) {
+      return this._renderEmptyEntries();
+    }
+
    let nextType: TargetType =
      this.type === "floor"
        ? "area"
@@ -350,54 +389,64 @@ export class HaTargetPickerItemRow extends LitElement {
              ) || ([] as string[]),
          }));

+    const nextSubLevel = this.subLevel + 1;
+
    return html`
-      <div class="entries-tree">
-        <div class="line-wrapper">
-          <div class="line"></div>
-        </div>
-        <ha-md-list class="entries">
-          ${rows1.map(
-            (itemId, index) => html`
-              <ha-target-picker-item-row
-                sub-entry
-                .hass=${this.hass}
-                .type=${nextType}
-                .itemId=${itemId}
-                .parentEntries=${rows1Entries?.[index]}
-                .hideContext=${this.hideContext || this.type !== "label"}
-                expand
-              ></ha-target-picker-item-row>
-            `
-          )}
-          ${deviceRows.map(
-            (itemId, index) => html`
-              <ha-target-picker-item-row
-                sub-entry
-                .hass=${this.hass}
-                type="device"
-                .itemId=${itemId}
-                .parentEntries=${deviceRowsEntries?.[index]}
-                .hideContext=${this.hideContext || this.type !== "label"}
-                expand
-              ></ha-target-picker-item-row>
-            `
-          )}
-          ${entityRows.map(
-            (itemId) => html`
-              <ha-target-picker-item-row
-                sub-entry
-                .hass=${this.hass}
-                type="entity"
-                .itemId=${itemId}
-                .hideContext=${this.hideContext || this.type !== "label"}
-              ></ha-target-picker-item-row>
-            `
-          )}
-        </ha-md-list>
-      </div>
+      ${rows1.map(
+        (itemId, index) => html`
+          <ha-target-picker-item-row
+            sub-entry
+            .subLevel=${nextSubLevel}
+            style=${`--sub-entry-indent: calc(${nextSubLevel} * var(--ha-space-10));`}
+            .hass=${this.hass}
+            .type=${nextType}
+            .itemId=${itemId}
+            .parentEntries=${rows1Entries?.[index]}
+            .hideContext=${this.hideContext || this.type !== "label"}
+            expand
+          ></ha-target-picker-item-row>
+        `
+      )}
+      ${deviceRows.map(
+        (itemId, index) => html`
+          <ha-target-picker-item-row
+            sub-entry
+            .subLevel=${nextSubLevel}
+            style=${`--sub-entry-indent: calc(${nextSubLevel} * var(--ha-space-10));`}
+            .hass=${this.hass}
+            type="device"
+            .itemId=${itemId}
+            .parentEntries=${deviceRowsEntries?.[index]}
+            .hideContext=${this.hideContext || this.type !== "label"}
+            expand
+          ></ha-target-picker-item-row>
+        `
+      )}
+      ${entityRows.map(
+        (itemId) => html`
+          <ha-target-picker-item-row
+            sub-entry
+            .subLevel=${nextSubLevel}
+            style=${`--sub-entry-indent: calc(${nextSubLevel} * var(--ha-space-10));`}
+            .hass=${this.hass}
+            type="entity"
+            .itemId=${itemId}
+            .hideContext=${this.hideContext || this.type !== "label"}
+          ></ha-target-picker-item-row>
+        `
+      )}
    `;
  }

+  private _renderEmptyEntries() {
+    return html`<ha-list-item-base>
+      <ha-svg-icon .path=${mdiMinusBox} slot="start" class="icon"></ha-svg-icon>
+      <span slot="headline"
+        >${this.hass.localize("ui.components.target-picker.no_targets")}</span
+      >
+    </ha-list-item-base>`;
+  }
+
  private async _updateItemData() {
    if (this.type === "entity") {
      this._entries = undefined;
@@ -566,7 +615,14 @@ export class HaTargetPickerItemRow extends LitElement {
      const areaName = area ? computeAreaName(area) : undefined;
      const context = [areaName, entityName ? deviceName : undefined]
        .filter(Boolean)
-        .join(computeRTL(this.hass) ? " ◂ " : " ▸ ");
+        .join(
+          computeRTL(
+            this.hass.language,
+            this.hass.translationMetadata.translations
+          )
+            ? " ◂ "
+            : " ▸ "
+        );
      return {
        name: entityName || deviceName || item,
        context,
@@ -640,6 +696,12 @@ export class HaTargetPickerItemRow extends LitElement {
    });
  }

+  private _openMoreInfo = () => {
+    showMoreInfoDialog(this, {
+      entityId: this.itemId,
+    });
+  };
+
  static styles = [
    buttonLinkStyle,
    css`
@@ -651,12 +713,6 @@ export class HaTargetPickerItemRow extends LitElement {
        --md-list-item-two-line-container-height: 56px;
      }

-      :host([expand]:not([sub-entry])) ha-md-list-item {
-        border: 2px solid var(--ha-color-border-neutral-loud);
-        background-color: var(--ha-color-fill-neutral-quiet-resting);
-        border-radius: var(--ha-card-border-radius, var(--ha-border-radius-lg));
-      }
-
      .error {
        background: var(--ha-color-fill-warning-quiet-resting);
      }
@@ -680,6 +736,7 @@ export class HaTargetPickerItemRow extends LitElement {
      .icon {
        width: 24px;
        display: flex;
+        color: var(--ha-color-on-neutral-normal);
      }

      img {
@@ -697,53 +754,21 @@ export class HaTargetPickerItemRow extends LitElement {
        line-height: var(--ha-line-height-condensed);
      }
      :host([sub-entry]) .summary {
-        margin-right: var(--ha-space-12);
+        margin-inline-start: var(--ha-space-12);
      }
      .summary .main {
        font-weight: var(--ha-font-weight-medium);
      }
+      :host([expand]) .summary .main {
+        color: var(--ha-color-text-secondary);
+        font-size: var(--ha-font-size-s);
+        font-weight: var(--ha-font-weight-normal);
+      }
      .summary .secondary {
        font-size: var(--ha-font-size-s);
        color: var(--secondary-text-color);
      }

-      .entries-tree {
-        display: flex;
-        position: relative;
-      }
-
-      .entries-tree .line-wrapper {
-        padding: var(--ha-space-5);
-      }
-
-      .entries-tree .line-wrapper .line {
-        border-left: 2px dashed var(--divider-color);
-        height: calc(100% - 28px);
-        position: absolute;
-        top: 0;
-      }
-
-      :host([sub-entry]) .entries-tree .line-wrapper .line {
-        height: calc(100% - 12px);
-        top: -18px;
-      }
-
-      .entries {
-        padding: 0;
-        --md-item-overflow: visible;
-      }
-
-      .horizontal-line-wrapper {
-        position: relative;
-      }
-      .horizontal-line-wrapper .horizontal-line {
-        position: absolute;
-        top: 11px;
-        margin-inline-start: -28px;
-        width: 29px;
-        border-top: 2px dashed var(--divider-color);
-      }
-
      button.link {
        text-decoration: none;
        color: var(--primary-color);
@@ -754,12 +779,19 @@ export class HaTargetPickerItemRow extends LitElement {
        text-decoration: underline;
      }

-      .domain {
+      .state {
        width: fit-content;
-        border-radius: var(--ha-border-radius-md);
-        background-color: var(--ha-color-fill-neutral-quiet-resting);
-        padding: var(--ha-space-1);
-        font-family: var(--ha-font-family-code);
+        font-size: var(--ha-font-size-s);
+        color: var(--ha-color-text-secondary);
+      }
+
+      ha-list-item-button::part(end) {
+        gap: var(--ha-space-2);
+      }
+
+      :host([sub-entry]) ha-list-item-button::part(base),
+      :host([sub-entry]) ha-list-item-base::part(base) {
+        padding-inline-start: var(--sub-entry-indent);
      }
    `,
  ];
@@ -28,8 +28,6 @@ import "../ha-domain-icon";
 import { floorDefaultIconPath } from "../ha-floor-icon";
 import "../ha-icon";
 import "../ha-icon-button";
-import "../ha-md-list";
-import "../ha-md-list-item";
 import "../ha-state-icon";
 import "../ha-tooltip";

@@ -76,7 +74,6 @@ export class HaTargetPickerValueChip extends LitElement {
                ? html`<ha-svg-icon .path=${fallbackIconPath}></ha-svg-icon>`
                : stateObject
                  ? html`<ha-state-icon
-                      .hass=${this.hass}
                      .stateObj=${stateObject}
                    ></ha-state-icon>`
                  : nothing}
@@ -99,7 +99,8 @@ export class HaTileContainer extends LitElement {
      display: flex;
      flex-direction: row;
      align-items: center;
-      padding: 10px;
+      padding: 0 10px;
+      min-height: var(--row-height, 56px);
      flex: 1;
      min-width: 0;
      box-sizing: border-box;
@@ -5,19 +5,15 @@ import { customElement, property } from "lit/decorators";
 import "../ha-code-editor";
 import "../ha-icon-button";
 import type { TraceExtended } from "../../data/trace";
-import type { HomeAssistant } from "../../types";

@customElement("ha-trace-blueprint-config")
 export class HaTraceBlueprintConfig extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
  @property({ attribute: false }) public trace!: TraceExtended;

  protected render(): TemplateResult {
    return html`
      <ha-code-editor
        .value=${dump(this.trace.blueprint_inputs || "").trimRight()}
-        .hass=${this.hass}
        read-only
        dir="ltr"
      ></ha-code-editor>
@@ -5,19 +5,15 @@ import { customElement, property } from "lit/decorators";
 import "../ha-code-editor";
 import "../ha-icon-button";
 import type { TraceExtended } from "../../data/trace";
-import type { HomeAssistant } from "../../types";

@customElement("ha-trace-config")
 export class HaTraceConfig extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
  @property({ attribute: false }) public trace!: TraceExtended;

  protected render(): TemplateResult {
    return html`
      <ha-code-editor
        .value=${dump(this.trace.config).trimRight()}
-        .hass=${this.hass}
        read-only
        dir="ltr"
      ></ha-code-editor>
@@ -3,7 +3,6 @@ import { dump } from "js-yaml";
 import type { CSSResultGroup, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
 import { formatDateTimeWithSeconds } from "../../common/datetime/format_date_time";
 import type { Trigger } from "../../data/automation";
 import { migrateAutomationTrigger } from "../../data/automation";
@@ -23,9 +22,10 @@ import "../../panels/logbook/ha-logbook-renderer";
 import type { HomeAssistant } from "../../types";
 import "../ha-code-editor";
 import "../ha-icon-button";
+import "../ha-tab-group";
+import "../ha-tab-group-tab";
 import "./hat-logbook-note";
 import type { NodeInfo } from "./hat-script-graph";
-import { traceTabStyles } from "./trace-tab-styles";

 const TRACE_PATH_TABS = [
  "step_config",
@@ -66,21 +66,21 @@ export class HaTracePathDetails extends LitElement {
        ${this._renderSelectedTraceInfo()}
      </div>

-      <div class="tabs top">
+      <ha-tab-group @wa-tab-show=${this._handleTabChanged}>
        ${TRACE_PATH_TABS.map(
          (view) => html`
-            <button
-              .view=${view}
-              class=${classMap({ active: this._view === view })}
-              @click=${this._showTab}
+            <ha-tab-group-tab
+              slot="nav"
+              .active=${this._view === view}
+              .panel=${view}
            >
              ${this.hass!.localize(
                `ui.panel.config.automation.trace.tabs.${view}`
              )}
-            </button>
+            </ha-tab-group-tab>
          `
        )}
-      </div>
+      </ha-tab-group>
      ${this._view === "step_config"
        ? this._renderSelectedConfig()
        : this._view === "changed_variables"
@@ -271,7 +271,6 @@ export class HaTracePathDetails extends LitElement {
    return config
      ? html`<ha-code-editor
          .value=${dump(config).trimEnd()}
-          .hass=${this.hass}
          read-only
          dir="ltr"
        ></ha-code-editor>`
@@ -308,7 +307,11 @@ export class HaTracePathDetails extends LitElement {
              ? this.hass!.localize(
                  "ui.panel.config.automation.trace.path.no_variables_changed"
                )
-              : html`<pre>${dump(trace.changed_variables).trimEnd()}</pre>`}
+              : html`<ha-code-editor
+                  read-only
+                  dir="ltr"
+                  .value=${dump(trace.changed_variables).trimEnd()}
+                ></ha-code-editor>`}
          `
        )}
      </div>
@@ -383,13 +386,12 @@ export class HaTracePathDetails extends LitElement {
        </div>`;
  }

-  private _showTab(ev) {
-    this._view = ev.target.view;
+  private _handleTabChanged(ev: CustomEvent) {
+    this._view = ev.detail.name as typeof this._view;
  }

  static get styles(): CSSResultGroup {
    return [
-      traceTabStyles,
      css`
        .padded-box {
          margin: 16px;
@@ -406,6 +408,16 @@ export class HaTracePathDetails extends LitElement {
        .error {
          color: var(--error-color);
        }
+
+        ha-tab-group {
+          background-color: var(--primary-background-color);
+          border-top: 1px solid var(--divider-color);
+          border-bottom: 1px solid var(--divider-color);
+        }
+
+        ha-tab-group-tab::part(base) {
+          padding: 2px 16px;
+        }
      `,
    ];
  }
@@ -18,6 +18,7 @@ import { toggleAttribute } from "../../common/dom/toggle_attribute";
 import { fullEntitiesContext } from "../../data/context";
 import type { EntityRegistryEntry } from "../../data/entity/entity_registry";
 import type { LogbookEntry } from "../../data/logbook";
+import { localizeTriggerDescription } from "../../data/logbook";
 import type {
  ChooseAction,
  IfAction,
@@ -332,7 +333,10 @@ class ActionRenderer {
            : "other",
          alias: triggerStep.changed_variables.trigger?.alias,
          triggeredPath: triggerStep.path === "trigger" ? "manual" : "trigger",
-          trigger: this.trace.trigger,
+          trigger: localizeTriggerDescription(
+            this.hass.localize,
+            this.trace.trigger
+          ),
          time: formatDateTimeWithSeconds(
            new Date(triggerStep.timestamp),
            this.hass.locale,
@@ -1,40 +0,0 @@
-import { css } from "lit";
-
-export const traceTabStyles = css`
-  .tabs {
-    background-color: var(--primary-background-color);
-    border-top: 1px solid var(--divider-color);
-    border-bottom: 1px solid var(--divider-color);
-    display: flex;
-    padding-left: 4px;
-    padding-inline-start: 4px;
-    padding-inline-end: initial;
-  }
-
-  .tabs.top {
-    border-top: none;
-  }
-
-  .tabs > * {
-    padding: 2px 16px;
-    cursor: pointer;
-    position: relative;
-    bottom: -1px;
-    border: none;
-    border-bottom: 2px solid transparent;
-    user-select: none;
-    background: none;
-    color: var(--primary-text-color);
-    outline: none;
-    transition: background 15ms linear;
-  }
-
-  .tabs > *.active {
-    border-bottom-color: var(--primary-color);
-  }
-
-  .tabs > *:focus,
-  .tabs > *:hover {
-    background: var(--secondary-background-color);
-  }
-`;
@@ -1,4 +1,5 @@
 import type {
+  Connection,
  HassEntityAttributeBase,
  HassEntityBase,
  HassServiceTarget,
@@ -584,6 +585,19 @@ export const testCondition = (
    variables,
  });

+export const subscribeCondition = (
+  connection: Connection,
+  onChange: (result: {
+    result?: boolean;
+    error?: string | { code: string; message: string };
+  }) => void,
+  condition: Condition
+) =>
+  connection.subscribeMessage(onChange, {
+    type: "subscribe_condition",
+    condition,
+  });
+
 export interface AutomationClipboard {
  trigger?: Trigger;
  condition?: Condition;
@@ -5,6 +5,7 @@ import type {
  HomeAssistantApi,
  HomeAssistantConfig,
  HomeAssistantConnection,
+  HomeAssistantFormatters,
  HomeAssistantInternationalization,
  HomeAssistantRegistries,
  HomeAssistantUI,
@@ -63,6 +64,14 @@ export const uiContext = createContext<HomeAssistantUI>("hassUi");
 */
 export const configContext = createContext<HomeAssistantConfig>("hassConfig");

+/**
+ * Entity formatting functions: `formatEntityState`, `formatEntityStateToParts`,
+ * `formatEntityAttributeValue`, `formatEntityAttributeValueToParts`,
+ * `formatEntityAttributeName`, and `formatEntityName`.
+ */
+export const formattersContext =
+  createContext<HomeAssistantFormatters>("hassFormatters");
+
 /**
 * Map of all entities in the entity registry, keyed by entity ID.
 */
@@ -3,6 +3,7 @@ import type {
  HomeAssistantApi,
  HomeAssistantConfig,
  HomeAssistantConnection,
+  HomeAssistantFormatters,
  HomeAssistantInternationalization,
  HomeAssistantRegistries,
  HomeAssistantUI,
@@ -156,6 +157,32 @@ const updateConfig = (
  return value;
 };

+const updateFormatters = (
+  hass: HomeAssistant,
+  value?: HomeAssistantFormatters
+): HomeAssistantFormatters => {
+  if (
+    !value ||
+    value.formatEntityState !== hass.formatEntityState ||
+    value.formatEntityStateToParts !== hass.formatEntityStateToParts ||
+    value.formatEntityAttributeValue !== hass.formatEntityAttributeValue ||
+    value.formatEntityAttributeValueToParts !==
+      hass.formatEntityAttributeValueToParts ||
+    value.formatEntityAttributeName !== hass.formatEntityAttributeName ||
+    value.formatEntityName !== hass.formatEntityName
+  ) {
+    return {
+      formatEntityState: hass.formatEntityState,
+      formatEntityStateToParts: hass.formatEntityStateToParts,
+      formatEntityAttributeValue: hass.formatEntityAttributeValue,
+      formatEntityAttributeValueToParts: hass.formatEntityAttributeValueToParts,
+      formatEntityAttributeName: hass.formatEntityAttributeName,
+      formatEntityName: hass.formatEntityName,
+    };
+  }
+  return value;
+};
+
 export const updateHassGroups = {
  registries: updateRegistries,
  internationalization: updateInternationalization,
@@ -163,4 +190,5 @@ export const updateHassGroups = {
  connection: updateConnection,
  ui: updateUi,
  config: updateConfig,
+  formatters: updateFormatters,
 };
@@ -164,6 +164,7 @@ export interface BatterySourceTypeEnergyPreference {
  stat_energy_to: string;
  stat_rate?: string; // always available if power_config is set
  power_config?: PowerConfig;
+  stat_soc?: string;
 }
 export interface GasSourceTypeEnergyPreference {
  type: "gas";
@@ -181,6 +182,8 @@ export interface GasSourceTypeEnergyPreference {
  entity_energy_price: string | null;
  number_energy_price: number | null;
  unit_of_measurement?: string | null;
+
+  name?: string;
 }

 export interface WaterSourceTypeEnergyPreference {
@@ -199,6 +202,8 @@ export interface WaterSourceTypeEnergyPreference {
  entity_energy_price: string | null;
  number_energy_price: number | null;
  unit_of_measurement?: string | null;
+
+  name?: string;
 }

 export type EnergySource =
@@ -96,7 +96,10 @@ export const getEntities = (

    const domainName = domainToName(hass.localize, computeDomain(entityId));

-    const isRTL = computeRTL(hass);
+    const isRTL = computeRTL(
+      hass.language,
+      hass.translationMetadata.translations
+    );

    const primary = entityName || deviceName || entityId;
    const secondary = [areaName, entityName ? deviceName : undefined]
@@ -456,11 +456,13 @@ const getIconFromTranslations = (
 };

 export const entityIcon = async (
-  hass: HomeAssistant,
+  entities: HomeAssistant["entities"],
+  hassConfig: HomeAssistant["config"],
+  hassConnection: Connection,
  stateObj: HassEntity,
  state?: string
 ) => {
-  const entry = hass.entities?.[stateObj.entity_id] as
+  const entry = entities?.[stateObj.entity_id] as
    | EntityRegistryDisplayEntry
    | undefined;
  if (entry?.icon) {
@@ -468,7 +470,14 @@ export const entityIcon = async (
  }
  const domain = computeStateDomain(stateObj);

-  return getEntityIcon(hass, domain, stateObj, state, entry);
+  return getEntityIcon(
+    hassConfig,
+    hassConnection,
+    domain,
+    stateObj,
+    state,
+    entry
+  );
 };

 export const entryIcon = async (
@@ -480,11 +489,19 @@ export const entryIcon = async (
  }
  const stateObj = hass.states[entry.entity_id] as HassEntity | undefined;
  const domain = computeDomain(entry.entity_id);
-  return getEntityIcon(hass, domain, stateObj, undefined, entry);
+  return getEntityIcon(
+    hass.config,
+    hass.connection,
+    domain,
+    stateObj,
+    undefined,
+    entry
+  );
 };

 const getEntityIcon = async (
-  hass: HomeAssistant,
+  hassConfig: HomeAssistant["config"],
+  hassConnection: Connection,
  domain: string,
  stateObj?: HassEntity,
  stateValue?: string,
@@ -498,8 +515,8 @@ const getEntityIcon = async (
  let icon: string | undefined;
  if (translation_key && platform) {
    const platformIcons = await getPlatformIcons(
-      hass.config,
-      hass.connection,
+      hassConfig,
+      hassConnection,
      platform
    );
    if (platformIcons) {
@@ -515,8 +532,8 @@ const getEntityIcon = async (

  if (!icon) {
    const entityComponentIcons = await getComponentIcons(
-      hass.connection,
-      hass.config,
+      hassConnection,
+      hassConfig,
      domain
    );
    if (entityComponentIcons) {
@@ -195,6 +195,49 @@ export const localizeTriggerSource = (
  return source;
 };

+// Mapping from a phrase key to the bare-phrase translation key (without the
+// "triggered by" prefix), used by localizeTriggerDescription below.
+const triggerDescriptionKeys: Record<
+  TriggerPhraseKeys,
+  | "numeric_state_of"
+  | "state_of"
+  | "event"
+  | "time"
+  | "time_pattern"
+  | "homeassistant_stopping"
+  | "homeassistant_starting"
+> = {
+  triggered_by_numeric_state_of: "numeric_state_of",
+  triggered_by_state_of: "state_of",
+  triggered_by_event: "event",
+  triggered_by_time_pattern: "time_pattern",
+  triggered_by_time: "time",
+  triggered_by_homeassistant_stopping: "homeassistant_stopping",
+  triggered_by_homeassistant_starting: "homeassistant_starting",
+};
+
+// Like localizeTriggerSource, but returns just the bare localized trigger
+// description (without the "triggered by" prefix). Used where the surrounding
+// template already supplies its own "triggered by" wording.
+export const localizeTriggerDescription = (
+  localize: LocalizeFunc,
+  source: string
+) => {
+  for (const triggerPhraseKey of Object.keys(
+    triggerPhrases
+  ) as TriggerPhraseKeys[]) {
+    const phrase = triggerPhrases[triggerPhraseKey];
+    if (source.startsWith(phrase)) {
+      const bareKey = triggerDescriptionKeys[triggerPhraseKey];
+      return source.replace(
+        phrase,
+        `${localize(`ui.components.logbook.${bareKey}`)}`
+      );
+    }
+  }
+  return source;
+};
+
 export const localizeStateMessage = (
  hass: HomeAssistant,
  localize: LocalizeFunc,
@@ -154,7 +154,7 @@ export const getRecorderInfo = (conn: Connection) =>
  });

 export const getStatisticIds = (
-  hass: HomeAssistant,
+  hass: Pick<HomeAssistant, "callWS">,
  statistic_type?: "mean" | "sum"
 ) =>
  hass.callWS<StatisticsMetaData[]>({
@@ -227,7 +227,7 @@ export const fetchStatistic = (
    rolling_window: period.rolling_window,
  });

-export const validateStatistics = (hass: HomeAssistant) =>
+export const validateStatistics = (hass: Pick<HomeAssistant, "callWS">) =>
  hass.callWS<StatisticsValidationResults>({
    type: "recorder/validate_statistics",
  });
@@ -245,7 +245,10 @@ export const updateStatisticsMetadata = (
    unit_class,
  });

-export const clearStatistics = (hass: HomeAssistant, statistic_ids: string[]) =>
+export const clearStatistics = (
+  hass: Pick<HomeAssistant, "callWS">,
+  statistic_ids: string[]
+) =>
  hass.callWS<undefined>({
    type: "recorder/clear_statistics",
    statistic_ids,
@@ -369,5 +372,5 @@ export const getDisplayUnit = (
 export const isExternalStatistic = (statisticsId: string): boolean =>
  statisticsId.includes(":");

-export const updateStatisticsIssues = (hass: HomeAssistant) =>
+export const updateStatisticsIssues = (hass: Pick<HomeAssistant, "callWS">) =>
  hass.callWS<undefined>({ type: "recorder/update_statistics_issues" });
@@ -58,7 +58,6 @@ class DialogConfigEntrySystemOptions extends LitElement {

    return html`
      <ha-dialog
-        .hass=${this.hass}
        .open=${this._open}
        header-title=${this.hass.localize(
          "ui.dialogs.config_entry_system_options.title",
@@ -3,10 +3,13 @@ import type { UnsubscribeFunc } from "home-assistant-js-websocket";
 import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import { createRef, ref } from "lit/directives/ref";
 import memoizeOne from "memoize-one";
 import type { HASSDomEvent } from "../../common/dom/fire_event";
 import { fireEvent } from "../../common/dom/fire_event";
+import "../../components/ha-button";
 import "../../components/ha-dialog";
+import "../../components/ha-dialog-footer";
 import "../../components/ha-icon-button";
 import type { DataEntryFlowStep } from "../../data/data_entry_flow";
 import {
@@ -40,14 +43,33 @@ interface FlowUpdateEvent {
  stepPromise?: Promise<DataEntryFlowStep>;
 }

+interface FlowStepFooterStateChangedEvent {
+  loading?: boolean;
+  hasPendingUpdates?: boolean;
+}
+
+interface FormStepElement extends HTMLElement {
+  submit(): Promise<void>;
+}
+
+interface AbortStepElement extends HTMLElement {
+  close(): void;
+}
+
+interface CreateEntryStepElement extends HTMLElement {
+  finish(): Promise<void>;
+}
+
 declare global {
  // for fire event
  interface HASSDomEvents {
    "flow-update": FlowUpdateEvent;
+    "flow-step-footer-state-changed": FlowStepFooterStateChangedEvent;
  }
  // for add event listener
  interface HTMLElementEventMap {
    "flow-update": HASSDomEvent<FlowUpdateEvent>;
+    "flow-step-footer-state-changed": HASSDomEvent<FlowStepFooterStateChangedEvent>;
  }
 }

@@ -73,6 +95,16 @@ class DataEntryFlowDialog extends LitElement {

  @state() private _handler?: string;

+  @state() private _formStepLoading = false;
+
+  @state() private _createEntryHasPendingUpdates = false;
+
+  private _formStepRef = createRef<FormStepElement>();
+
+  private _abortStepRef = createRef<AbortStepElement>();
+
+  private _createEntryStepRef = createRef<CreateEntryStepElement>();
+
  private _unsubDataEntryFlowProgress?: UnsubscribeFunc;

  public async showDialog(params: DataEntryFlowDialogParams): Promise<void> {
@@ -301,7 +333,6 @@ class DataEntryFlowDialog extends LitElement {

    return html`
      <ha-dialog
-        .hass=${this.hass}
        .open=${this._open}
        prevent-scrim-close
        @after-show=${this._focusFormStep}
@@ -366,11 +397,14 @@ class DataEntryFlowDialog extends LitElement {
                  ${this._step.type === "form"
                    ? html`
                        <step-flow-form
+                          ${ref(this._formStepRef)}
                          autofocus
                          narrow
                          .flowConfig=${this._params.flowConfig}
                          .step=${this._step}
                          .hass=${this.hass}
+                          @flow-step-footer-state-changed=${this
+                            ._handleFooterStateChanged}
                        ></step-flow-form>
                      `
                    : this._step.type === "external"
@@ -384,6 +418,7 @@ class DataEntryFlowDialog extends LitElement {
                      : this._step.type === "abort"
                        ? html`
                            <step-flow-abort
+                              ${ref(this._abortStepRef)}
                              .params=${this._params}
                              .step=${this._step}
                              .hass=${this.hass}
@@ -411,11 +446,14 @@ class DataEntryFlowDialog extends LitElement {
                              `
                            : html`
                                <step-flow-create-entry
+                                  ${ref(this._createEntryStepRef)}
                                  .flowConfig=${this._params.flowConfig}
                                  .step=${this._step}
                                  .hass=${this.hass}
                                  .navigateToResult=${this._params
                                    .navigateToResult ?? false}
+                                  @flow-step-footer-state-changed=${this
+                                    ._handleFooterStateChanged}
                                  .devices=${this._devices(
                                    this._params.flowConfig.showDevices,
                                    Object.values(this.hass.devices),
@@ -426,10 +464,95 @@ class DataEntryFlowDialog extends LitElement {
                              `}
                `}
        </div>
+        ${this._renderFooter()}
      </ha-dialog>
    `;
  }

+  private _renderFooter() {
+    if (!this._step || this._loading) {
+      return nothing;
+    }
+
+    switch (this._step.type) {
+      case "form":
+        return html`
+          <ha-dialog-footer slot="footer">
+            <ha-button
+              slot="primaryAction"
+              .loading=${this._formStepLoading}
+              @click=${this._submitFormStep}
+            >
+              ${this._params!.flowConfig.renderShowFormStepSubmitButton(
+                this.hass,
+                this._step
+              )}
+            </ha-button>
+          </ha-dialog-footer>
+        `;
+      case "abort":
+        return this._step.reason === "missing_credentials"
+          ? nothing
+          : html`
+              <ha-dialog-footer slot="footer">
+                <ha-button
+                  slot="secondaryAction"
+                  appearance="plain"
+                  @click=${this._closeAbortStep}
+                >
+                  ${this.hass.localize(
+                    "ui.panel.config.integrations.config_flow.close"
+                  )}
+                </ha-button>
+              </ha-dialog-footer>
+            `;
+      case "external":
+        return html`
+          <ha-dialog-footer slot="footer">
+            <ha-button
+              slot="primaryAction"
+              href=${this._step.url}
+              target="_blank"
+              rel="noreferrer"
+            >
+              ${this.hass.localize(
+                "ui.panel.config.integrations.config_flow.external_step.open_site"
+              )}
+            </ha-button>
+          </ha-dialog-footer>
+        `;
+      case "create_entry": {
+        const devices = this._devices(
+          this._params!.flowConfig.showDevices,
+          Object.values(this.hass.devices),
+          this._step.result?.entry_id,
+          this._params!.carryOverDevices
+        );
+
+        return html`
+          <ha-dialog-footer slot="footer">
+            <ha-button
+              slot="primaryAction"
+              @click=${this._finishCreateEntryStep}
+            >
+              ${this.hass.localize(
+                `ui.panel.config.integrations.config_flow.${
+                  !devices.length ||
+                  this._createEntryHasPendingUpdates ||
+                  devices.some((device) => device.area_id)
+                    ? "finish"
+                    : "finish_skip"
+                }`
+              )}
+            </ha-button>
+          </ha-dialog-footer>
+        `;
+      }
+      default:
+        return nothing;
+    }
+  }
+
  protected firstUpdated(changedProps: PropertyValues<this>) {
    super.firstUpdated(changedProps);
    this.addEventListener("flow-update", (ev) => {
@@ -479,6 +602,8 @@ class DataEntryFlowDialog extends LitElement {
    }

    this._step = undefined;
+    this._formStepLoading = false;
+    this._createEntryHasPendingUpdates = false;
    await this.updateComplete;
    this._step = _step;
    if (
@@ -562,20 +687,36 @@ class DataEntryFlowDialog extends LitElement {
    }

    await this.updateComplete;
-    (
-      this.renderRoot.querySelector(
-        "step-flow-form[autofocus]"
-      ) as HTMLElement | null
-    )?.focus();
+    this._formStepRef.value?.focus();
+  };
+
+  private _handleFooterStateChanged = (
+    ev: HASSDomEvent<FlowStepFooterStateChangedEvent>
+  ) => {
+    if (ev.detail.loading !== undefined) {
+      this._formStepLoading = ev.detail.loading;
+    }
+    if (ev.detail.hasPendingUpdates !== undefined) {
+      this._createEntryHasPendingUpdates = ev.detail.hasPendingUpdates;
+    }
+  };
+
+  private _submitFormStep = () => {
+    this._formStepRef.value?.submit();
+  };
+
+  private _closeAbortStep = () => {
+    this._abortStepRef.value?.close();
+  };
+
+  private _finishCreateEntryStep = () => {
+    this._createEntryStepRef.value?.finish();
  };

  static get styles(): CSSResultGroup {
    return [
      haStyleDialog,
      css`
-        ha-dialog {
-          --dialog-content-padding: 0;
-        }
        .dialog-title {
          overflow: hidden;
          text-overflow: ellipsis;
@@ -18,7 +18,7 @@ import "../../../components/ha-slider";
 import "../../../components/ha-time-input";
 import "../../../components/input/ha-input";
 import { isTiltOnly } from "../../../data/cover";
-import { isUnavailableState } from "../../../data/entity/entity";
+import { isUnavailableState, UNAVAILABLE } from "../../../data/entity/entity";
 import type { ImageEntity } from "../../../data/image";
 import { computeImageUrl } from "../../../data/image";
 import "../../../panels/lovelace/components/hui-timestamp-display";
@@ -266,7 +266,7 @@ class EntityPreviewRow extends LitElement {
              <div class="numberflex">
                <ha-slider
                  labeled
-                  .disabled=${isUnavailableState(stateObj.state)}
+                  .disabled=${stateObj.state === UNAVAILABLE}
                  .step=${Number(stateObj.attributes.step)}
                  .min=${Number(stateObj.attributes.min)}
                  .max=${Number(stateObj.attributes.max)}
@@ -280,7 +280,7 @@ class EntityPreviewRow extends LitElement {
          : html`<div class="numberflex numberstate">
              <ha-input
                auto-validate
-                .disabled=${isUnavailableState(stateObj.state)}
+                .disabled=${stateObj.state === UNAVAILABLE}
                pattern="[0-9]+([\\.][0-9]+)?"
                .step=${Number(stateObj.attributes.step)}
                .min=${Number(stateObj.attributes.min)}
@@ -303,7 +303,7 @@ class EntityPreviewRow extends LitElement {
        <ha-select
          .label=${computeStateName(stateObj)}
          .value=${stateObj.state}
-          .disabled=${isUnavailableState(stateObj.state)}
+          .disabled=${stateObj.state === UNAVAILABLE}
          .options=${stateObj.attributes.options?.map((option) => ({
            value: option,
            label: this.hass!.formatEntityState(stateObj, option),
@@ -8,7 +8,6 @@ import type { HomeAssistant } from "../../types";
 import { showConfigFlowDialog } from "./show-dialog-config-flow";
 import type { DataEntryFlowDialogParams } from "./show-dialog-data-entry-flow";
 import { configFlowContentStyles } from "./styles";
-import "../../components/ha-button";

@customElement("step-flow-abort")
 class StepFlowAbort extends LitElement {
@@ -37,13 +36,6 @@ class StepFlowAbort extends LitElement {
      <div class="content">
        ${this.params.flowConfig.renderAbortDescription(this.hass, this.step)}
      </div>
-      <div class="buttons">
-        <ha-button appearance="plain" @click=${this._flowDone}
-          >${this.hass.localize(
-            "ui.panel.config.integrations.config_flow.close"
-          )}</ha-button
-        >
-      </div>
    `;
  }

@@ -68,6 +60,10 @@ class StepFlowAbort extends LitElement {
    fireEvent(this, "flow-update", { step: undefined });
  }

+  public close(): void {
+    this._flowDone();
+  }
+
  static get styles(): CSSResultGroup {
    return configFlowContentStyles;
  }
@@ -10,7 +10,6 @@ import {
 import { computeDomain } from "../../common/entity/compute_domain";
 import { navigate } from "../../common/navigate";
 import "../../components/ha-area-picker";
-import "../../components/ha-button";
 import "../../components/input/ha-input";
 import type { HaInput } from "../../components/input/ha-input";
 import { assistSatelliteSupportsSetupFlow } from "../../data/assist_satellite";
@@ -31,6 +30,10 @@ import { showVoiceAssistantSetupDialog } from "../voice-assistant-setup/show-voi
 import type { FlowConfig } from "./show-dialog-data-entry-flow";
 import { configFlowContentStyles } from "./styles";

+interface DeviceTarget {
+  device: string;
+}
+
@customElement("step-flow-create-entry")
 class StepFlowCreateEntry extends LitElement {
  @property({ attribute: false }) public flowConfig!: FlowConfig;
@@ -192,20 +195,18 @@ class StepFlowCreateEntry extends LitElement {
                </div>
              `}
      </div>
-      <div class="buttons">
-        <ha-button @click=${this._flowDone}
-          >${localize(
-            `ui.panel.config.integrations.config_flow.${
-              !this.devices.length || Object.keys(this._deviceUpdate).length
-                ? "finish"
-                : "finish_skip"
-            }`
-          )}</ha-button
-        >
-      </div>
    `;
  }

+  protected updated(changedProps: PropertyValues): void {
+    super.updated(changedProps);
+    if (changedProps.has("_deviceUpdate")) {
+      fireEvent(this, "flow-step-footer-state-changed", {
+        hasPendingUpdates: Object.keys(this._deviceUpdate).length > 0,
+      });
+    }
+  }
+
  private async _loadDomains() {
    const entries = await getConfigEntries(this.hass);
    this._domains = Object.fromEntries(
@@ -224,18 +225,20 @@ class StepFlowCreateEntry extends LitElement {
          return updateDeviceRegistryEntry(this.hass, deviceId, {
            name_by_user: update.name,
            area_id: update.area,
-          }).catch((err: any) => {
+          }).catch((err: unknown) => {
+            const message =
+              err instanceof Error ? err.message : "Unknown error";
            showAlertDialog(this, {
              text: this.hass.localize(
                "ui.panel.config.integrations.config_flow.error_saving_device",
-                { error: err.message }
+                { error: message }
              ),
            });
          });
        }
      );
      await Promise.allSettled(deviceUpdates);
-      const entityUpdates: Promise<any>[] = [];
+      const entityUpdates: Promise<unknown>[] = [];
      const entityIds: string[] = [];
      renamedDevices.forEach((deviceId) => {
        const entities = this._deviceEntities(
@@ -281,8 +284,15 @@ class StepFlowCreateEntry extends LitElement {
    }
  }

+  public finish(): Promise<void> {
+    return this._flowDone();
+  }
+
  private async _areaPicked(ev: ValueChangedEvent<string>) {
-    const picker = ev.currentTarget as any;
+    const picker = ev.currentTarget as DeviceTarget | null;
+    if (!picker) {
+      return;
+    }
    const device = picker.device;
    const area = ev.detail.value;

@@ -294,8 +304,11 @@ class StepFlowCreateEntry extends LitElement {
  }

  private _deviceNameChanged(ev: InputEvent): void {
-    const picker = ev.currentTarget as HaInput;
-    const device = (picker as any).device;
+    const picker = ev.currentTarget as (HaInput & DeviceTarget) | null;
+    if (!picker) {
+      return;
+    }
+    const device = picker.device;
    const name = picker.value;

    if (!(device in this._deviceUpdate)) {
@@ -311,22 +324,13 @@ class StepFlowCreateEntry extends LitElement {
      css`
        .devices {
          display: flex;
-          margin: -4px;
-          max-height: 600px;
-          overflow-y: auto;
+          gap: var(--ha-space-2);
          flex-direction: column;
        }
-        @media all and (max-width: 450px), all and (max-height: 500px) {
-          .devices {
-            /* header - margin content - footer */
-            max-height: calc(100vh - 52px - 20px - 52px);
-          }
-        }
        .device {
          border: 1px solid var(--divider-color);
          padding: 6px;
          border-radius: var(--ha-border-radius-sm);
-          margin: 4px;
          display: inline-block;
        }
        .device-info {
@@ -352,11 +356,6 @@ class StepFlowCreateEntry extends LitElement {
        ha-input {
          margin: var(--ha-space-2) 0;
        }
-        .buttons > *:last-child {
-          margin-left: auto;
-          margin-inline-start: auto;
-          margin-inline-end: initial;
-        }
        .error {
          color: var(--error-color);
        }
@@ -1,11 +1,10 @@
 import type { CSSResultGroup, TemplateResult, PropertyValues } from "lit";
-import { css, html, LitElement } from "lit";
+import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import type { DataEntryFlowStepExternal } from "../../data/data_entry_flow";
 import type { HomeAssistant } from "../../types";
 import type { FlowConfig } from "./show-dialog-data-entry-flow";
 import { configFlowContentStyles } from "./styles";
-import "../../components/ha-button";

@customElement("step-flow-external")
 class StepFlowExternal extends LitElement {
@@ -16,18 +15,9 @@ class StepFlowExternal extends LitElement {
  @property({ attribute: false }) public step!: DataEntryFlowStepExternal;

  protected render(): TemplateResult {
-    const localize = this.hass.localize;
-
    return html`
      <div class="content">
        ${this.flowConfig.renderExternalStepDescription(this.hass, this.step)}
-        <div class="open-button">
-          <ha-button href=${this.step.url} target="_blank" rel="noreferrer">
-            ${localize(
-              "ui.panel.config.integrations.config_flow.external_step.open_site"
-            )}
-          </ha-button>
-        </div>
      </div>
    `;
  }
@@ -38,18 +28,7 @@ class StepFlowExternal extends LitElement {
  }

  static get styles(): CSSResultGroup {
-    return [
-      configFlowContentStyles,
-      css`
-        .open-button {
-          text-align: center;
-          padding: 24px 0;
-        }
-        .open-button a {
-          text-decoration: none;
-        }
-      `,
-    ];
+    return [configFlowContentStyles];
  }
 }

@@ -1,11 +1,11 @@
 import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import { createRef, ref } from "lit/directives/ref";
 import memoizeOne from "memoize-one";
 import { dynamicElement } from "../../common/dom/dynamic-element-directive";
 import { fireEvent } from "../../common/dom/fire_event";
 import { isNavigationClick } from "../../common/dom/is-navigation-click";
-import "../../components/ha-button";
 import "../../components/ha-alert";
 import { computeInitialHaFormData } from "../../components/ha-form/compute-initial-ha-form-data";
 import "../../components/ha-form/ha-form";
@@ -19,7 +19,7 @@ import { autocompleteLoginFields } from "../../data/auth";
 import type { DataEntryFlowStepForm } from "../../data/data_entry_flow";
 import { previewModule } from "../../data/preview";
 import { haStyle } from "../../resources/styles";
-import type { HomeAssistant } from "../../types";
+import type { HomeAssistant, ValueChangedEvent } from "../../types";
 import type { FlowConfig } from "./show-dialog-data-entry-flow";
 import { configFlowContentStyles } from "./styles";

@@ -47,6 +47,8 @@ class StepFlowForm extends LitElement {

  private _errors?: Record<string, string>;

+  private _formRef = createRef<HTMLElementTagNameMap["ha-form"]>();
+
  static shadowRootOptions: ShadowRootInit = {
    ...LitElement.shadowRootOptions,
    delegatesFocus: true,
@@ -88,24 +90,27 @@ class StepFlowForm extends LitElement {
        ${this.flowConfig.renderShowFormStepDescription(this.hass, this.step)}
        ${this._errorMsg
          ? html`<ha-alert alert-type="error">${this._errorMsg}</ha-alert>`
-          : ""}
-        <ha-form
-          ?autofocus=${this.autoFocus}
-          .hass=${this.hass}
-          .narrow=${this.narrow}
-          .data=${stepData}
-          .disabled=${this._loading}
-          @value-changed=${this._stepDataChanged}
-          .schema=${autocompleteLoginFields(
-            this.handleReadOnlyFields(step.data_schema)
-          )}
-          .error=${this._errors}
-          .computeLabel=${this._labelCallback}
-          .computeHelper=${this._helperCallback}
-          .computeError=${this._errorCallback}
-          .localizeValue=${this._localizeValueCallback}
-          .context=${{ handler: step.handler }}
-        ></ha-form>
+          : nothing}
+        ${step.data_schema.length
+          ? html`<ha-form
+              ${ref(this._formRef)}
+              ?autofocus=${this.autoFocus}
+              .hass=${this.hass}
+              .narrow=${this.narrow}
+              .data=${stepData}
+              .disabled=${this._loading}
+              @value-changed=${this._stepDataChanged}
+              .schema=${autocompleteLoginFields(
+                this.handleReadOnlyFields(step.data_schema)
+              )}
+              .error=${this._errors}
+              .computeLabel=${this._labelCallback}
+              .computeHelper=${this._helperCallback}
+              .computeError=${this._errorCallback}
+              .localizeValue=${this._localizeValueCallback}
+              .context=${{ handler: step.handler }}
+            ></ha-form>`
+          : nothing}
      </div>
      ${step.preview
        ? html`<div class="preview" @set-flow-errors=${this._setError}>
@@ -125,14 +130,6 @@ class StepFlowForm extends LitElement {
            })}
          </div>`
        : nothing}
-      <div class="buttons">
-        <ha-button @click=${this._submitStep} .loading=${this._loading}>
-          ${this.flowConfig.renderShowFormStepSubmitButton(
-            this.hass,
-            this.step
-          )}
-        </ha-button>
-      </div>
    `;
  }

@@ -145,8 +142,17 @@ class StepFlowForm extends LitElement {
    this.addEventListener("keydown", this._handleKeyDown);
  }

+  protected updated(changedProps: PropertyValues): void {
+    super.updated(changedProps);
+    if (changedProps.has("_loading")) {
+      fireEvent(this, "flow-step-footer-state-changed", {
+        loading: this._loading,
+      });
+    }
+  }
+
  public override focus(_options?: FocusOptions): void {
-    this.renderRoot.querySelector("ha-form")?.focus();
+    this._formRef.value?.focus();
  }

  protected willUpdate(changedProps: PropertyValues): void {
@@ -229,13 +235,15 @@ class StepFlowForm extends LitElement {

    const flowId = this.step.flow_id;

-    const toSendData = {};
+    const toSendData: Record<string, unknown> = {};
    Object.keys(stepData).forEach((key) => {
      const value = stepData[key];
      const isEmpty = [undefined, ""].includes(value);
      const field = this.step.data_schema?.find((f) => f.name === key);
      const selector = (field as HaFormSelector)?.selector ?? {};
-      const read_only = (Object.values(selector)[0] as any)?.read_only;
+      const read_only = (
+        Object.values(selector)[0] as { read_only?: boolean } | null | undefined
+      )?.read_only;
      if (!isEmpty && !read_only) {
        toSendData[key] = value;
      }
@@ -277,7 +285,13 @@ class StepFlowForm extends LitElement {
    }
  }

-  private _stepDataChanged(ev: CustomEvent): void {
+  public submit(): Promise<void> {
+    return this._submitStep();
+  }
+
+  private _stepDataChanged(
+    ev: ValueChangedEvent<Record<string, unknown>>
+  ): void {
    this._stepData = ev.detail.value;
  }

@@ -321,13 +335,9 @@ class StepFlowForm extends LitElement {

        ha-alert,
        ha-form {
-          margin-top: 24px;
+          margin-top: var(--ha-space-6);
          display: block;
        }
-
-        .buttons {
-          padding: 16px;
-        }
      `,
    ];
  }
@@ -1,5 +1,5 @@
 import type { TemplateResult } from "lit";
-import { css, html, LitElement } from "lit";
+import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
 import "../../components/ha-spinner";
 import type { DataEntryFlowStep } from "../../data/data_entry_flow";
@@ -28,7 +28,7 @@ class StepFlowLoading extends LitElement {
    return html`
      <div class="content">
        <ha-spinner size="large"></ha-spinner>
-        ${description ? html`<div>${description}</div>` : ""}
+        ${description ? html`<div>${description}</div>` : nothing}
      </div>
    `;
  }
@@ -40,7 +40,7 @@ class StepFlowLoading extends LitElement {
      text-align: center;
    }
    ha-spinner {
-      margin-bottom: 16px;
+      margin-bottom: var(--ha-space-4);
    }
  `;
 }
@@ -78,7 +78,7 @@ class StepFlowMenu extends LitElement {
    );

    return html`
-      ${description ? html`<div class="content">${description}</div>` : ""}
+      ${description ? html`<div class="content">${description}</div>` : nothing}
      <div class="options">
        ${options.map(
          (option) => html`
@@ -119,17 +119,17 @@ class StepFlowMenu extends LitElement {
    configFlowContentStyles,
    css`
      .options {
-        margin-top: 20px;
-        margin-bottom: 16px;
+        margin-top: var(--ha-space-5);
+        margin-bottom: var(--ha-space-4);
      }
      .content {
-        padding-bottom: 16px;
+        padding-bottom: var(--ha-space-4);
      }
      .content + .options {
-        margin-top: 8px;
+        margin-top: var(--ha-space-2);
      }
      ha-list-item {
-        --mdc-list-side-padding: 24px;
+        --mdc-list-side-padding: var(--ha-space-6);
      }
    `,
  ];
@@ -53,7 +53,7 @@ class StepFlowProgress extends LitElement {
          text-align: center;
        }
        ha-spinner {
-          margin-bottom: 16px;
+          margin-bottom: var(--ha-space-4);
        }
      `,
    ];
@@ -2,12 +2,9 @@ import { css } from "lit";

 export const configFlowContentStyles = css`
  h2 {
-    margin: 24px 38px 0 0;
+    margin: var(--ha-space-6) var(--ha-space-10) 0 0;
    margin-inline-start: 0px;
-    margin-inline-end: 38px;
-    padding: 0 24px;
-    padding-inline-start: 24px;
-    padding-inline-end: 24px;
+    margin-inline-end: var(--ha-space-10);
    -moz-osx-font-smoothing: var(--ha-moz-osx-font-smoothing);
    -webkit-font-smoothing: var(--ha-font-smoothing);
    font-family: var(
@@ -28,19 +25,8 @@ export const configFlowContentStyles = css`

  .content,
  .preview {
-    margin-top: 20px;
-    padding: 0 24px;
+    margin-top: var(--ha-space-5);
  }
-
-  .buttons {
-    position: relative;
-    padding: 16px;
-    margin: 8px 0 0;
-    color: var(--primary-color);
-    display: flex;
-    justify-content: flex-end;
-  }
-
  ha-markdown {
    overflow-wrap: break-word;
  }
@@ -2,11 +2,11 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import "../../components/ha-bottom-sheet";
-import "../../components/ha-icon";
-import "../../components/ha-md-list";
-import "../../components/ha-md-list-item";
-import "../../components/ha-svg-icon";
 import "../../components/ha-dialog";
+import "../../components/ha-icon";
+import "../../components/ha-svg-icon";
+import "../../components/item/ha-list-item-button";
+import "../../components/list/ha-list-base";
 import type { HomeAssistant } from "../../types";
 import type { HassDialog } from "../make-dialog-manager";
 import type { ListItemsDialogParams } from "./show-list-items-dialog";
@@ -51,41 +51,30 @@ export class ListItemsDialog

    const content = html`
      <div class="container">
-        <ha-md-list>
+        <ha-list-base>
          ${this._params.items.map(
            (item) => html`
-              <ha-md-list-item
-                type="button"
-                @click=${this._itemClicked}
-                .item=${item}
-              >
+              <ha-list-item-button @click=${this._itemClicked} .item=${item}>
                ${item.iconPath
                  ? html`
                      <ha-svg-icon
                        .path=${item.iconPath}
                        slot="start"
-                        class="item-icon"
                      ></ha-svg-icon>
                    `
                  : item.icon
-                    ? html`
-                        <ha-icon
-                          icon=${item.icon}
-                          slot="start"
-                          class="item-icon"
-                        ></ha-icon>
-                      `
+                    ? html` <ha-icon icon=${item.icon} slot="start"></ha-icon> `
                    : nothing}
-                <span class="headline">${item.label}</span>
+                <span slot="headline">${item.label}</span>
                ${item.description
                  ? html`
-                      <span class="supporting-text">${item.description}</span>
+                      <span slot="supporting-text">${item.description}</span>
                    `
                  : nothing}
-              </ha-md-list-item>
+              </ha-list-item-button>
            `
          )}
-        </ha-md-list>
+        </ha-list-base>
      </div>
    `;

@@ -103,7 +92,6 @@ export class ListItemsDialog

    return html`
      <ha-dialog
-        .hass=${this.hass}
        .open=${this._open}
        header-title=${this._params.title ?? " "}
        @closed=${this._dialogClosed}
@@ -114,12 +102,16 @@ export class ListItemsDialog
  }

  static styles = css`
-    ha-dialog {
+    ha-dialog,
+    ha-bottom-sheet {
      /* Place above other dialogs */
      --dialog-z-index: 104;
      --dialog-content-padding: 0;
-      --md-list-item-leading-space: 24px;
-      --md-list-item-trailing-space: 24px;
+      --ha-row-item-padding-inline: var(--ha-space-6);
+    }
+
+    ha-bottom-sheet {
+      --ha-bottom-sheet-content-padding: var(--ha-space-4) 0 0;
    }
  `;
 }
@@ -112,7 +112,6 @@ export class DialogEnterCode
    if (isText) {
      return html`
        <ha-dialog
-          .hass=${this.hass}
          .open=${this._open}
          header-title=${this._dialogParams.title ??
          this.hass.localize("ui.dialogs.enter_code.title")}
@@ -150,7 +149,6 @@ export class DialogEnterCode

    return html`
      <ha-dialog
-        .hass=${this.hass}
        .open=${this._open}
        header-title=${this._dialogParams.title ?? "Enter code"}
        width="small"
@@ -140,7 +140,6 @@ export class DialogForm

    return html`
      <ha-dialog
-        .hass=${this.hass}
        .open=${this._open}
        header-title=${this._params.title}
        prevent-scrim-close
@@ -96,7 +96,6 @@ export class HaImagecropperDialog

    return html`
      <ha-dialog
-        .hass=${this.hass}
        .open=${this._open}
        header-title=${this.hass.localize(
          "ui.dialogs.image_cropper.crop_image"
@@ -148,7 +148,6 @@ class DialogLightColorFavorite extends LitElement {

    return html`
      <ha-dialog
-        .hass=${this.hass}
        .open=${this._open}
        .headerTitle=${this._dialogParams?.title}
        @closed=${this._dialogClosed}
@@ -65,7 +65,6 @@ class MoreInfoSirenAdvancedControls extends LitElement {
    return html`
      <ha-dialog
        .open=${this._open}
-        .hass=${this.hass}
        header-title=${this.hass.localize(
          "ui.components.siren.advanced_controls"
        )}
@@ -46,8 +46,7 @@ class MoreInfoAlarmControlPanel extends LitElement {
          ? html`
              <div class="status">
                <div class="icon">
-                  <ha-state-icon .hass=${this.hass} .stateObj=${this.stateObj}>
-                  </ha-state-icon>
+                  <ha-state-icon .stateObj=${this.stateObj}> </ha-state-icon>
                </div>
              </div>
            `
@@ -3,7 +3,7 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
 import "../../../components/ha-date-input";
 import "../../../components/ha-time-input";
-import { isUnavailableState, UNKNOWN } from "../../../data/entity/entity";
+import { UNAVAILABLE, UNKNOWN } from "../../../data/entity/entity";
 import {
  setInputDateTimeValue,
  stateToIsoDateString,
@@ -27,7 +27,7 @@ class MoreInfoInputDatetime extends LitElement {
            <ha-date-input
              .locale=${this.hass.locale}
              .value=${stateToIsoDateString(this.stateObj)}
-              .disabled=${isUnavailableState(this.stateObj.state)}
+              .disabled=${this.stateObj.state === UNAVAILABLE}
              @value-changed=${this._dateChanged}
            >
            </ha-date-input>
@@ -42,7 +42,7 @@ class MoreInfoInputDatetime extends LitElement {
                  ? this.stateObj.state.split(" ")[1]
                  : this.stateObj.state}
              .locale=${this.hass.locale}
-              .disabled=${isUnavailableState(this.stateObj.state)}
+              .disabled=${this.stateObj.state === UNAVAILABLE}
              @value-changed=${this._timeChanged}
              @click=${this._stopEventPropagation}
            ></ha-time-input>
--- a/Show More
+++ b/Show More