Prevent wrap of menu items

.eslintrc.json

@@ -115,7 +115,6 @@
       }
     ],
     "unused-imports/no-unused-imports": "error",
-    "lit/attribute-names": "warn",
     "lit/attribute-value-entities": "off",
     "lit/no-template-map": "off",
     "lit/no-native-attributes": "warn",

.github/workflows/cast_deployment.yaml

@@ -21,7 +21,7 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.2
         with:
           ref: dev
 
@@ -57,7 +57,7 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.2
         with:
           ref: master
 

.github/workflows/ci.yaml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.2
       - name: Setup Node
         uses: actions/setup-node@v4.0.2
         with:
@@ -58,7 +58,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.2
       - name: Setup Node
         uses: actions/setup-node@v4.0.2
         with:
@@ -76,7 +76,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.2
       - name: Setup Node
         uses: actions/setup-node@v4.0.2
         with:
@@ -89,7 +89,7 @@ jobs:
         env:
           IS_TEST: "true"
       - name: Upload bundle stats
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: frontend-bundle-stats
           path: build/stats/*.json
@@ -100,7 +100,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.2
       - name: Setup Node
         uses: actions/setup-node@v4.0.2
         with:
@@ -113,7 +113,7 @@ jobs:
         env:
           IS_TEST: "true"
       - name: Upload bundle stats
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: supervisor-bundle-stats
           path: build/stats/*.json

.github/workflows/codeql-analysis.yml

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

.github/workflows/demo_deployment.yaml

@@ -22,7 +22,7 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.2
         with:
           ref: dev
 
@@ -58,7 +58,7 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.2
         with:
           ref: master
 

.github/workflows/design_deployment.yaml

@@ -16,7 +16,7 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.2
 
       - name: Setup Node
         uses: actions/setup-node@v4.0.2

.github/workflows/design_preview.yaml

@@ -21,7 +21,7 @@ jobs:
     if: github.repository == 'home-assistant/frontend' && contains(github.event.pull_request.labels.*.name, 'needs design preview')
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.2
 
       - name: Setup Node
         uses: actions/setup-node@v4.0.2

.github/workflows/nightly.yaml

@@ -20,7 +20,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.2
 
       - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: actions/setup-python@v5
@@ -57,14 +57,14 @@ jobs:
         run: tar -czvf translations.tar.gz translations
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: wheels
           path: dist/home_assistant_frontend*.whl
           if-no-files-found: error
 
       - name: Upload translations
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: translations
           path: translations.tar.gz

.github/workflows/release.yaml

@@ -23,7 +23,7 @@ jobs:
       contents: write # Required to upload release assets
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.2
 
       - name: Verify version
         uses: home-assistant/actions/helpers/verify-version@master
@@ -55,7 +55,7 @@ jobs:
           script/release
 
       - name: Upload release assets
-        uses: softprops/action-gh-release@v2.0.5
+        uses: softprops/action-gh-release@v2.0.4
         with:
           files: |
             dist/*.whl

.github/workflows/translations.yaml

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

.yarnrc.yml

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

build-scripts/babel-plugins/custom-polyfill-plugin.js

@@ -1,23 +1,7 @@
 import defineProvider from "@babel/helper-define-polyfill-provider";
-import { join } from "node:path";
-import paths from "../paths.cjs";
-
-const POLYFILL_DIR = join(paths.polymer_dir, "src/resources/polyfills");
 
 // List of polyfill keys with supported browser targets for the functionality
 const PolyfillSupport = {
-  // Note states and shadowRoot properties should be supported.
-  "element-internals": {
-    android: 90,
-    chrome: 90,
-    edge: 90,
-    firefox: 126,
-    ios: 17.4,
-    opera: 76,
-    opera_mobile: 64,
-    safari: 17.4,
-    samsung: 15.0,
-  },
   fetch: {
     android: 42,
     chrome: 42,
@@ -40,36 +24,16 @@ const PolyfillSupport = {
     safari: 10.0,
     samsung: 5.0,
   },
-  "resize-observer": {
-    android: 64,
-    chrome: 64,
-    edge: 79,
-    firefox: 69,
-    ios: 13.4,
-    opera: 51,
-    opera_mobile: 47,
-    safari: 13.1,
-    samsung: 9.0,
-  },
 };
 
 // Map of global variables and/or instance and static properties to the
 // corresponding polyfill key and actual module to import
 const polyfillMap = {
   global: {
-    fetch: { key: "fetch", module: "unfetch/polyfill" },
     Proxy: { key: "proxy", module: "proxy-polyfill" },
-    ResizeObserver: {
+    fetch: { key: "fetch", module: "unfetch/polyfill" },
-      key: "resize-observer",
-      module: join(POLYFILL_DIR, "resize-observer.ts"),
-    },
-  },
-  instance: {
-    attachInternals: {
-      key: "element-internals",
-      module: "element-internals-polyfill",
-    },
   },
+  instance: {},
   static: {},
 };
 
@@ -85,9 +49,7 @@ export default defineProvider(
         if (polyfill && shouldInjectPolyfill(polyfill.desc.key)) {
           debug(polyfill.desc.key);
           utils.injectGlobalImport(polyfill.desc.module);
-          return true;
         }
-        return false;
       },
     };
   }

build-scripts/bundle.cjs

@@ -3,8 +3,6 @@ const env = require("./env.cjs");
 const paths = require("./paths.cjs");
 const { dependencies } = require("../package.json");
 
-const BABEL_PLUGINS = path.join(__dirname, "babel-plugins");
-
 // GitHub base URL to use for production source maps
 // Nightly builds use the commit SHA, otherwise assumes there is a tag that matches the version
 module.exports.sourceMapURL = () => {
@@ -102,12 +100,22 @@ module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({
   ],
   plugins: [
     [
-      path.join(BABEL_PLUGINS, "inline-constants-plugin.cjs"),
+      path.resolve(
+        paths.polymer_dir,
+        "build-scripts/babel-plugins/inline-constants-plugin.cjs"
+      ),
       {
         modules: ["@mdi/js"],
         ignoreModuleNotFound: true,
       },
     ],
+    [
+      path.resolve(
+        paths.polymer_dir,
+        "build-scripts/babel-plugins/custom-polyfill-plugin.js"
+      ),
+      { method: "usage-global" },
+    ],
     // Minify template literals for production
     isProdBuild && [
       "template-html-minifier",
@@ -145,26 +153,6 @@ module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({
   ],
   sourceMaps: !isTestBuild,
   overrides: [
-    {
-      // Add plugin to inject various polyfills, excluding the polyfills
-      // themselves to prevent self-injection.
-      plugins: [
-        [
-          path.join(BABEL_PLUGINS, "custom-polyfill-plugin.js"),
-          { method: "usage-global" },
-        ],
-      ],
-      exclude: [
-        path.join(paths.polymer_dir, "src/resources/polyfills"),
-        ...[
-          "@lit-labs/virtualizer/polyfills",
-          "@webcomponents/scoped-custom-element-registry",
-          "element-internals-polyfill",
-          "proxy-polyfill",
-          "unfetch",
-        ].map((p) => new RegExp(`/node_modules/${p}/`)),
-      ],
-    },
     {
       // Use unambiguous for dependencies so that require() is correctly injected into CommonJS files
       // Exclusions are needed in some cases where ES modules have no static imports or exports, such as polyfills

build-scripts/gulp/fetch-nightly-translations.js

@@ -9,7 +9,7 @@ import gulp from "gulp";
 import jszip from "jszip";
 import path from "path";
 import process from "process";
-import { extract } from "tar";
+import tar from "tar";
 
 const MAX_AGE = 24; // hours
 const OWNER = "home-assistant";
@@ -156,7 +156,7 @@ gulp.task("fetch-nightly-translations", async function () {
   console.log("Unpacking downloaded translations...");
   const zip = await jszip.loadAsync(downloadResponse.data);
   await deleteCurrent;
-  const extractStream = zip.file(/.*/)[0].nodeStream().pipe(extract());
+  const extractStream = zip.file(/.*/)[0].nodeStream().pipe(tar.extract());
   await new Promise((resolve, reject) => {
     extractStream.on("close", resolve).on("error", reject);
   });

build-scripts/gulp/translations.js

@@ -1,111 +1,92 @@
-/* eslint-disable max-classes-per-file */
+import { createHash } from "crypto";
-
+import { deleteSync } from "del";
-import { deleteAsync } from "del";
+import { mkdirSync, readdirSync, readFileSync, renameSync } from "fs";
-import { glob } from "glob";
+import { writeFile } from "node:fs/promises";
 import gulp from "gulp";
+import flatmap from "gulp-flatmap";
+import transform from "gulp-json-transform";
+import merge from "gulp-merge-json";
 import rename from "gulp-rename";
-import merge from "lodash.merge";
+import path from "path";
-import { createHash } from "node:crypto";
+import vinylBuffer from "vinyl-buffer";
-import { mkdir, readFile } from "node:fs/promises";
+import source from "vinyl-source-stream";
-import { basename, join } from "node:path";
-import { PassThrough, Transform } from "node:stream";
-import { finished } from "node:stream/promises";
 import env from "../env.cjs";
 import paths from "../paths.cjs";
+import { mapFiles } from "../util.cjs";
 import "./fetch-nightly-translations.js";
 
 const inFrontendDir = "translations/frontend";
 const inBackendDir = "translations/backend";
 const workDir = "build/translations";
-const outDir = join(workDir, "output");
+const fullDir = workDir + "/full";
-const EN_SRC = join(paths.translations_src, "en.json");
+const coreDir = workDir + "/core";
-
+const outDir = workDir + "/output";
 let mergeBackend = false;
 
 gulp.task(
   "translations-enable-merge-backend",
-  gulp.parallel(async () => {
+  gulp.parallel((done) => {
     mergeBackend = true;
+    done();
   }, "allow-setup-fetch-nightly-translations")
 );
 
-// Transform stream to apply a function on Vinyl JSON files (buffer mode only).
+// Panel translations which should be split from the core translations.
-// The provided function can either return a new object, or an array of
+const TRANSLATION_FRAGMENTS = Object.keys(
-// [object, subdirectory] pairs for fragmentizing the JSON.
+  JSON.parse(
-class CustomJSON extends Transform {
+    readFileSync(
-  constructor(func, reviver = null) {
+      path.resolve(paths.polymer_dir, "src/translations/en.json"),
-    super({ objectMode: true });
+      "utf-8"
-    this._func = func;
+    )
-    this._reviver = reviver;
+  ).ui.panel
-  }
+);
 
-  async _transform(file, _, callback) {
+function recursiveFlatten(prefix, data) {
-    try {
+  let output = {};
-      let obj = JSON.parse(file.contents.toString(), this._reviver);
+  Object.keys(data).forEach((key) => {
-      if (this._func) obj = this._func(obj, file.path);
+    if (typeof data[key] === "object") {
-      for (const [outObj, dir] of Array.isArray(obj) ? obj : [[obj, ""]]) {
+      output = {
-        const outFile = file.clone({ contents: false });
+        ...output,
-        outFile.contents = Buffer.from(JSON.stringify(outObj));
+        ...recursiveFlatten(prefix + key + ".", data[key]),
-        outFile.dirname += `/${dir}`;
+      };
-        this.push(outFile);
-      }
-      callback(null);
-    } catch (err) {
-      callback(err);
-    }
-  }
-}
-
-// Transform stream to merge Vinyl JSON files (buffer mode only).
-class MergeJSON extends Transform {
-  _objects = [];
-
-  constructor(stem, startObj = {}, reviver = null) {
-    super({ objectMode: true, allowHalfOpen: false });
-    this._stem = stem;
-    this._startObj = structuredClone(startObj);
-    this._reviver = reviver;
-  }
-
-  async _transform(file, _, callback) {
-    try {
-      this._objects.push(JSON.parse(file.contents.toString(), this._reviver));
-      if (!this._outFile) this._outFile = file.clone({ contents: false });
-      callback(null);
-    } catch (err) {
-      callback(err);
-    }
-  }
-
-  async _flush(callback) {
-    try {
-      const mergedObj = merge(this._startObj, ...this._objects);
-      this._outFile.contents = Buffer.from(JSON.stringify(mergedObj));
-      this._outFile.stem = this._stem;
-      callback(null, this._outFile);
-    } catch (err) {
-      callback(err);
-    }
-  }
-}
-
-// Utility to flatten object keys to single level using separator
-const flatten = (data, prefix = "", sep = ".") => {
-  const output = {};
-  for (const [key, value] of Object.entries(data)) {
-    if (typeof value === "object") {
-      Object.assign(output, flatten(value, prefix + key + sep, sep));
     } else {
-      output[prefix + key] = value;
+      output[prefix + key] = data[key];
     }
-  }
+  });
   return output;
-};
+}
 
-// Filter functions that can be passed directly to JSON.parse()
+function flatten(data) {
-const emptyReviver = (_key, value) => value || undefined;
+  return recursiveFlatten("", data);
-const testReviver = (_key, value) =>
+}
-  value && typeof value === "string" ? "TRANSLATED" : value;
+
+function emptyFilter(data) {
+  const newData = {};
+  Object.keys(data).forEach((key) => {
+    if (data[key]) {
+      if (typeof data[key] === "object") {
+        newData[key] = emptyFilter(data[key]);
+      } else {
+        newData[key] = data[key];
+      }
+    }
+  });
+  return newData;
+}
+
+function recursiveEmpty(data) {
+  const newData = {};
+  Object.keys(data).forEach((key) => {
+    if (data[key]) {
+      if (typeof data[key] === "object") {
+        newData[key] = recursiveEmpty(data[key]);
+      } else {
+        newData[key] = "TRANSLATED";
+      }
+    }
+  });
+  return newData;
+}
 
 /**
  * Replace Lokalise key placeholders with their actual values.
@@ -114,44 +95,60 @@ const testReviver = (_key, value) =>
  * be included in src/translations/en.json, but still be usable while
  * developing locally.
  *
- * @link https://docs.lokalise.com/en/articles/1400528-key-referencing
+ * @link https://docs.lokalise.co/article/KO5SZWLLsy-key-referencing
  */
-const KEY_REFERENCE = /\[%key:([^%]+)%\]/;
+const re_key_reference = /\[%key:([^%]+)%\]/;
-const lokaliseTransform = (data, path, original = data) => {
+function lokaliseTransform(data, original, file) {
   const output = {};
-  for (const [key, value] of Object.entries(data)) {
+  Object.entries(data).forEach(([key, value]) => {
-    if (typeof value === "object") {
+    if (value instanceof Object) {
-      output[key] = lokaliseTransform(value, path, original);
+      output[key] = lokaliseTransform(value, original, file);
     } else {
-      output[key] = value.replace(KEY_REFERENCE, (_match, lokalise_key) => {
+      output[key] = value.replace(re_key_reference, (_match, lokalise_key) => {
         const replace = lokalise_key.split("::").reduce((tr, k) => {
           if (!tr) {
-            throw Error(`Invalid key placeholder ${lokalise_key} in ${path}`);
+            throw Error(
+              `Invalid key placeholder ${lokalise_key} in ${file.path}`
+            );
           }
           return tr[k];
         }, original);
         if (typeof replace !== "string") {
-          throw Error(`Invalid key placeholder ${lokalise_key} in ${path}`);
+          throw Error(
+            `Invalid key placeholder ${lokalise_key} in ${file.path}`
+          );
         }
         return replace;
       });
     }
-  }
+  });
   return output;
-};
+}
 
-gulp.task("clean-translations", () => deleteAsync([workDir]));
+gulp.task("clean-translations", async () => deleteSync([workDir]));
 
-const makeWorkDir = () => mkdir(workDir, { recursive: true });
+gulp.task("ensure-translations-build-dir", async () => {
+  mkdirSync(workDir, { recursive: true });
+});
 
-const createTestTranslation = () =>
+gulp.task("create-test-metadata", () =>
+  env.isProdBuild()
+    ? Promise.resolve()
+    : writeFile(
+        workDir + "/testMetadata.json",
+        JSON.stringify({ test: { nativeName: "Test" } })
+      )
+);
+
+gulp.task("create-test-translation", () =>
   env.isProdBuild()
     ? Promise.resolve()
     : gulp
-        .src(EN_SRC)
+        .src(path.join(paths.translations_src, "en.json"))
-        .pipe(new CustomJSON(null, testReviver))
+        .pipe(transform((data, _file) => recursiveEmpty(data)))
         .pipe(rename("test.json"))
-        .pipe(gulp.dest(workDir));
+        .pipe(gulp.dest(workDir))
+);
 
 /**
  * This task will build a master translation file, to be used as the base for
@@ -162,164 +159,279 @@ const createTestTranslation = () =>
  * project is buildable immediately after merging new translation keys, since
  * the Lokalise update to translations/en.json will not happen immediately.
  */
-const createMasterTranslation = () =>
+gulp.task("build-master-translation", () => {
-  gulp
+  const src = [path.join(paths.translations_src, "en.json")];
-    .src([EN_SRC, ...(mergeBackend ? [`${inBackendDir}/en.json`] : [])])
-    .pipe(new CustomJSON(lokaliseTransform))
-    .pipe(new MergeJSON("en"))
-    .pipe(gulp.dest(workDir));
 
-const FRAGMENTS = ["base"];
+  if (mergeBackend) {
-
+    src.push(path.join(inBackendDir, "en.json"));
-const toggleSupervisorFragment = async () => {
-  FRAGMENTS[0] = "supervisor";
-};
-
-const panelFragment = (fragment) =>
-  fragment !== "base" && fragment !== "supervisor";
-
-const HASHES = new Map();
-
-const createTranslations = async () => {
-  // Parse and store the master to avoid repeating this for each locale, then
-  // add the panel fragments when processing the app.
-  const enMaster = JSON.parse(await readFile(`${workDir}/en.json`, "utf-8"));
-  if (FRAGMENTS[0] === "base") {
-    FRAGMENTS.push(...Object.keys(enMaster.ui.panel));
   }
 
-  // The downstream pipeline is setup first.  It hashes the merged data for
+  return gulp
-  // each locale, then fragmentizes and flattens the data for final output.
+    .src(src)
-  const translationFiles = await glob([
+    .pipe(transform((data, file) => lokaliseTransform(data, data, file)))
-    `${inFrontendDir}/!(en).json`,
-    ...(env.isProdBuild() ? [] : [`${workDir}/test.json`]),
-  ]);
-  const hashStream = new Transform({
-    objectMode: true,
-    transform: async (file, _, callback) => {
-      const hash = env.isProdBuild()
-        ? createHash("md5").update(file.contents).digest("hex")
-        : "dev";
-      HASHES.set(file.stem, hash);
-      file.stem += `-${hash}`;
-      callback(null, file);
-    },
-  }).setMaxListeners(translationFiles.length + 1);
-  const fragmentsStream = hashStream
     .pipe(
-      new CustomJSON((data) =>
+      merge({
-        FRAGMENTS.map((fragment) => {
+        fileName: "en.json",
-          switch (fragment) {
-            case "base":
-              // Remove the panels and supervisor to create the base translations
-              return [
-                flatten({
-                  ...data,
-                  ui: { ...data.ui, panel: undefined },
-                  supervisor: undefined,
-                }),
-                "",
-              ];
-            case "supervisor":
-              // Supervisor key is at the top level
-              return [flatten(data.supervisor), ""];
-            default:
-              // Create a fragment with only the given panel
-              return [
-                flatten(data.ui.panel[fragment], `ui.panel.${fragment}.`),
-                fragment,
-              ];
-          }
-        })
-      )
-    )
-    .pipe(gulp.dest(outDir));
-
-  // Send the English master downstream first, then for each other locale
-  // generate merged JSON data to continue piping. It begins with the master
-  // translation as a failsafe for untranslated strings, and merges all parent
-  // tags into one file for each specific subtag
-  //
-  // TODO: This is a naive interpretation of BCP47 that should be improved.
-  //       Will be OK for now as long as we don't have anything more complicated
-  // than a base translation + region.
-  gulp
-    .src(`${workDir}/en.json`)
-    .pipe(new PassThrough({ objectMode: true }))
-    .pipe(hashStream, { end: false });
-  const mergesFinished = [];
-  for (const translationFile of translationFiles) {
-    const locale = basename(translationFile, ".json");
-    const subtags = locale.split("-");
-    const mergeFiles = [];
-    for (let i = 1; i <= subtags.length; i++) {
-      const lang = subtags.slice(0, i).join("-");
-      if (lang === "test") {
-        mergeFiles.push(`${workDir}/test.json`);
-      } else if (lang !== "en") {
-        mergeFiles.push(`${inFrontendDir}/${lang}.json`);
-        if (mergeBackend) {
-          mergeFiles.push(`${inBackendDir}/${lang}.json`);
-        }
-      }
-    }
-    const mergeStream = gulp
-      .src(mergeFiles, { allowEmpty: true })
-      .pipe(new MergeJSON(locale, enMaster, emptyReviver));
-    mergesFinished.push(finished(mergeStream));
-    mergeStream.pipe(hashStream, { end: false });
-  }
-
-  // Wait for all merges to finish, then it's safe to end writing to the
-  // downstream pipeline and wait for all fragments to finish writing.
-  await Promise.all(mergesFinished);
-  hashStream.end();
-  await finished(fragmentsStream);
-};
-
-const writeTranslationMetaData = () =>
-  gulp
-    .src([`${paths.translations_src}/translationMetadata.json`])
-    .pipe(
-      new CustomJSON((meta) => {
-        // Add the test translation in development.
-        if (!env.isProdBuild()) {
-          meta.test = { nativeName: "Test" };
-        }
-        // Filter out locales without a native name, and add the hashes.
-        for (const locale of Object.keys(meta)) {
-          if (!meta[locale].nativeName) {
-            meta[locale] = undefined;
-            console.warn(
-              `Skipping locale ${locale} because native name is not translated.`
-            );
-          } else {
-            meta[locale].hash = HASHES.get(locale);
-          }
-        }
-        return {
-          fragments: FRAGMENTS.filter(panelFragment),
-          translations: meta,
-        };
       })
     )
-    .pipe(gulp.dest(workDir));
+    .pipe(gulp.dest(fullDir));
+});
+
+gulp.task("build-merged-translations", () =>
+  gulp
+    .src([
+      inFrontendDir + "/*.json",
+      "!" + inFrontendDir + "/en.json",
+      ...(env.isProdBuild() ? [] : [workDir + "/test.json"]),
+    ])
+    .pipe(transform((data, file) => lokaliseTransform(data, data, file)))
+    .pipe(
+      flatmap((stream, file) => {
+        // For each language generate a merged json file. It begins with the master
+        // translation as a failsafe for untranslated strings, and merges all parent
+        // tags into one file for each specific subtag
+        //
+        // TODO: This is a naive interpretation of BCP47 that should be improved.
+        //       Will be OK for now as long as we don't have anything more complicated
+        //       than a base translation + region.
+        const tr = path.basename(file.history[0], ".json");
+        const subtags = tr.split("-");
+        const src = [fullDir + "/en.json"];
+        for (let i = 1; i <= subtags.length; i++) {
+          const lang = subtags.slice(0, i).join("-");
+          if (lang === "test") {
+            src.push(workDir + "/test.json");
+          } else if (lang !== "en") {
+            src.push(inFrontendDir + "/" + lang + ".json");
+            if (mergeBackend) {
+              src.push(inBackendDir + "/" + lang + ".json");
+            }
+          }
+        }
+        return gulp
+          .src(src, { allowEmpty: true })
+          .pipe(transform((data) => emptyFilter(data)))
+          .pipe(
+            merge({
+              fileName: tr + ".json",
+            })
+          )
+          .pipe(gulp.dest(fullDir));
+      })
+    )
+);
+
+let taskName;
+
+const splitTasks = [];
+TRANSLATION_FRAGMENTS.forEach((fragment) => {
+  taskName = "build-translation-fragment-" + fragment;
+  gulp.task(taskName, () =>
+    // Return only the translations for this fragment.
+    gulp
+      .src(fullDir + "/*.json")
+      .pipe(
+        transform((data) => ({
+          ui: {
+            panel: {
+              [fragment]: data.ui.panel[fragment],
+            },
+          },
+        }))
+      )
+      .pipe(gulp.dest(workDir + "/" + fragment))
+  );
+  splitTasks.push(taskName);
+});
+
+taskName = "build-translation-core";
+gulp.task(taskName, () =>
+  // Remove the fragment translations from the core translation.
+  gulp
+    .src(fullDir + "/*.json")
+    .pipe(
+      transform((data, _file) => {
+        TRANSLATION_FRAGMENTS.forEach((fragment) => {
+          delete data.ui.panel[fragment];
+        });
+        delete data.supervisor;
+        return data;
+      })
+    )
+    .pipe(gulp.dest(coreDir))
+);
+
+splitTasks.push(taskName);
+
+gulp.task("build-flattened-translations", () =>
+  // Flatten the split versions of our translations, and move them into outDir
+  gulp
+    .src(
+      TRANSLATION_FRAGMENTS.map(
+        (fragment) => workDir + "/" + fragment + "/*.json"
+      ).concat(coreDir + "/*.json"),
+      { base: workDir }
+    )
+    .pipe(
+      transform((data) =>
+        // Polymer.AppLocalizeBehavior requires flattened json
+        flatten(data)
+      )
+    )
+    .pipe(
+      rename((filePath) => {
+        if (filePath.dirname === "core") {
+          filePath.dirname = "";
+        }
+        // In dev we create the file with the fake hash in the filename
+        if (!env.isProdBuild()) {
+          filePath.basename += "-dev";
+        }
+      })
+    )
+    .pipe(gulp.dest(outDir))
+);
+
+const fingerprints = {};
+
+gulp.task("build-translation-fingerprints", () => {
+  // Fingerprint full file of each language
+  const files = readdirSync(fullDir);
+
+  for (let i = 0; i < files.length; i++) {
+    fingerprints[files[i].split(".")[0]] = {
+      // In dev we create fake hashes
+      hash: env.isProdBuild()
+        ? createHash("md5")
+            .update(readFileSync(path.join(fullDir, files[i]), "utf-8"))
+            .digest("hex")
+        : "dev",
+    };
+  }
+
+  // In dev we create the file with the fake hash in the filename
+  if (env.isProdBuild()) {
+    mapFiles(outDir, ".json", (filename) => {
+      const parsed = path.parse(filename);
+
+      // nl.json -> nl-<hash>.json
+      if (!(parsed.name in fingerprints)) {
+        throw new Error(`Unable to find hash for ${filename}`);
+      }
+
+      renameSync(
+        filename,
+        `${parsed.dir}/${parsed.name}-${fingerprints[parsed.name].hash}${
+          parsed.ext
+        }`
+      );
+    });
+  }
+
+  const stream = source("translationFingerprints.json");
+  stream.write(JSON.stringify(fingerprints));
+  process.nextTick(() => stream.end());
+  return stream.pipe(vinylBuffer()).pipe(gulp.dest(workDir));
+});
+
+gulp.task("build-translation-fragment-supervisor", () =>
+  gulp
+    .src(fullDir + "/*.json")
+    .pipe(transform((data) => data.supervisor))
+    .pipe(
+      rename((filePath) => {
+        // In dev we create the file with the fake hash in the filename
+        if (!env.isProdBuild()) {
+          filePath.basename += "-dev";
+        }
+      })
+    )
+    .pipe(gulp.dest(workDir + "/supervisor"))
+);
+
+gulp.task("build-translation-flatten-supervisor", () =>
+  gulp
+    .src(workDir + "/supervisor/*.json")
+    .pipe(
+      transform((data) =>
+        // Polymer.AppLocalizeBehavior requires flattened json
+        flatten(data)
+      )
+    )
+    .pipe(gulp.dest(outDir))
+);
+
+gulp.task("build-translation-write-metadata", () =>
+  gulp
+    .src([
+      path.join(paths.translations_src, "translationMetadata.json"),
+      ...(env.isProdBuild() ? [] : [workDir + "/testMetadata.json"]),
+      workDir + "/translationFingerprints.json",
+    ])
+    .pipe(merge({}))
+    .pipe(
+      transform((data) => {
+        const newData = {};
+        Object.entries(data).forEach(([key, value]) => {
+          // Filter out translations without native name.
+          if (value.nativeName) {
+            newData[key] = value;
+          } else {
+            console.warn(
+              `Skipping language ${key}. Native name was not translated.`
+            );
+          }
+        });
+        return newData;
+      })
+    )
+    .pipe(
+      transform((data) => ({
+        fragments: TRANSLATION_FRAGMENTS,
+        translations: data,
+      }))
+    )
+    .pipe(rename("translationMetadata.json"))
+    .pipe(gulp.dest(workDir))
+);
+
+gulp.task(
+  "create-translations",
+  gulp.series(
+    gulp.parallel("create-test-metadata", "create-test-translation"),
+    "build-master-translation",
+    "build-merged-translations",
+    gulp.parallel(...splitTasks),
+    "build-flattened-translations"
+  )
+);
 
 gulp.task(
   "build-translations",
   gulp.series(
     gulp.parallel(
       "fetch-nightly-translations",
-      gulp.series("clean-translations", makeWorkDir)
+      gulp.series("clean-translations", "ensure-translations-build-dir")
     ),
-    createTestTranslation,
+    "create-translations",
-    createMasterTranslation,
+    "build-translation-fingerprints",
-    createTranslations,
+    "build-translation-write-metadata"
-    writeTranslationMetaData
   )
 );
 
 gulp.task(
   "build-supervisor-translations",
-  gulp.series(toggleSupervisorFragment, "build-translations")
+  gulp.series(
+    gulp.parallel(
+      "fetch-nightly-translations",
+      gulp.series("clean-translations", "ensure-translations-build-dir")
+    ),
+    gulp.parallel("create-test-metadata", "create-test-translation"),
+    "build-master-translation",
+    "build-merged-translations",
+    "build-translation-fragment-supervisor",
+    "build-translation-flatten-supervisor",
+    "build-translation-fingerprints",
+    "build-translation-write-metadata"
+  )
 );

build-scripts/gulp/webpack.js

@@ -99,7 +99,7 @@ gulp.task("webpack-watch-app", () => {
   ).watch({ poll: isWsl }, doneHandler());
   gulp.watch(
     path.join(paths.translations_src, "en.json"),
-    gulp.series("build-translations", "copy-translations-app")
+    gulp.series("create-translations", "copy-translations-app")
   );
 });
 

build-scripts/util.cjs

@@ -0,0 +1,16 @@
+const path = require("path");
+const fs = require("fs");
+
+// Helper function to map recursively over files in a folder and it's subfolders
+module.exports.mapFiles = function mapFiles(startPath, filter, mapFunc) {
+  const files = fs.readdirSync(startPath);
+  for (let i = 0; i < files.length; i++) {
+    const filename = path.join(startPath, files[i]);
+    const stat = fs.lstatSync(filename);
+    if (stat.isDirectory()) {
+      mapFiles(filename, filter, mapFunc);
+    } else if (filename.indexOf(filter) >= 0) {
+      mapFunc(filename);
+    }
+  }
+};

build-scripts/webpack.cjs

@@ -10,7 +10,6 @@ const WebpackBar = require("webpackbar");
 const {
   TransformAsyncModulesPlugin,
 } = require("transform-async-modules-webpack-plugin");
-const { dependencies } = require("../package.json");
 const paths = require("./paths.cjs");
 const bundle = require("./bundle.cjs");
 
@@ -157,15 +156,11 @@ const createWebpackConfig = ({
           transform: (stats) => JSON.stringify(filterStats(stats)),
         }),
       !latestBuild &&
-        new TransformAsyncModulesPlugin({
+        new TransformAsyncModulesPlugin({ browserslistEnv: "legacy" }),
-          browserslistEnv: "legacy",
-          runtime: { version: dependencies["@babel/runtime"] },
-        }),
     ].filter(Boolean),
     resolve: {
       extensions: [".ts", ".js", ".json"],
       alias: {
-        "lit/static-html$": "lit/static-html.js",
         "lit/decorators$": "lit/decorators.js",
         "lit/directive$": "lit/directive.js",
         "lit/directives/until$": "lit/directives/until.js",

demo/src/ha-demo.ts

@@ -10,7 +10,6 @@ import {
 import { HomeAssistantAppEl } from "../../src/layouts/home-assistant";
 import { HomeAssistant } from "../../src/types";
 import { selectedDemoConfig } from "./configs/demo-configs";
-import { mockAreaRegistry } from "./stubs/area_registry";
 import { mockAuth } from "./stubs/auth";
 import { mockConfigEntries } from "./stubs/config_entries";
 import { mockEnergy } from "./stubs/energy";
@@ -24,10 +23,10 @@ import { mockLovelace } from "./stubs/lovelace";
 import { mockMediaPlayer } from "./stubs/media_player";
 import { mockPersistentNotification } from "./stubs/persistent_notification";
 import { mockRecorder } from "./stubs/recorder";
+import { mockTodo } from "./stubs/todo";
 import { mockSensor } from "./stubs/sensor";
 import { mockSystemLog } from "./stubs/system_log";
 import { mockTemplate } from "./stubs/template";
-import { mockTodo } from "./stubs/todo";
 import { mockTranslations } from "./stubs/translations";
 
 @customElement("ha-demo")
@@ -63,7 +62,6 @@ export class HaDemo extends HomeAssistantAppEl {
     mockEnergy(hass);
     mockPersistentNotification(hass);
     mockConfigEntries(hass);
-    mockAreaRegistry(hass);
     mockEntityRegistry(hass, [
       {
         config_entry_id: "co2signal",

demo/src/stubs/energy.ts

@@ -1,4 +1,4 @@
-import { format, startOfToday, startOfTomorrow } from "date-fns";
+import { format, startOfToday, startOfTomorrow } from "date-fns/esm";
 import {
   EnergyInfo,
   EnergyPreferences,

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

@@ -64,12 +64,6 @@ const ACTIONS = [
       entity_id: "input_boolean.toggle_4",
     },
   },
-  {
-    sequence: [
-      { scene: "scene.kitchen_morning" },
-      { service: "light.turn_off", target: { entity_id: "light.kitchen" } },
-    ],
-  },
   {
     parallel: [
       { scene: "scene.kitchen_morning" },
@@ -142,7 +136,7 @@ export class DemoAutomationDescribeAction extends LitElement {
         <div class="action">
           <span>
             ${this._action
-              ? describeAction(this.hass, [], [], [], this._action)
+              ? describeAction(this.hass, [], this._action)
               : "<invalid YAML>"}
           </span>
           <ha-yaml-editor
@@ -155,7 +149,7 @@ export class DemoAutomationDescribeAction extends LitElement {
         ${ACTIONS.map(
           (conf) => html`
             <div class="action">
-              <span>${describeAction(this.hass, [], [], [], conf as any)}</span>
+              <span>${describeAction(this.hass, [], conf as any)}</span>
               <pre>${dump(conf)}</pre>
             </div>
           `

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

@@ -20,7 +20,6 @@ import { HaWaitForTriggerAction } from "../../../../src/panels/config/automation
 import { HaWaitAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-wait_template";
 import { Action } from "../../../../src/data/script";
 import { HaConditionAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-condition";
-import { HaSequenceAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-sequence";
 import { HaParallelAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-parallel";
 import { HaIfAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-if";
 import { HaStopAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-stop";
@@ -40,7 +39,6 @@ const SCHEMAS: { name: string; actions: Action[] }[] = [
   { name: "If-Then", actions: [HaIfAction.defaultConfig] },
   { name: "Choose", actions: [HaChooseAction.defaultConfig] },
   { name: "Variables", actions: [{ variables: { hello: "1" } }] },
-  { name: "Sequence", actions: [HaSequenceAction.defaultConfig] },
   { name: "Parallel", actions: [HaParallelAction.defaultConfig] },
   { name: "Stop", actions: [HaStopAction.defaultConfig] },
 ];

gallery/src/pages/components/ha-control-select.ts

@@ -187,7 +187,7 @@ export class DemoHaControlSelect extends LitElement {
         --mdc-icon-size: 24px;
         --control-select-color: var(--state-fan-active-color);
         --control-select-thickness: 130px;
-        --control-select-border-radius: 36px;
+        --control-select-border-radius: 48px;
       }
       .vertical-selects {
         height: 300px;

gallery/src/pages/components/ha-control-slider.ts

@@ -151,7 +151,7 @@ export class DemoHaBarSlider extends LitElement {
         --control-slider-background: #ffcf4c;
         --control-slider-background-opacity: 0.2;
         --control-slider-thickness: 130px;
-        --control-slider-border-radius: 36px;
+        --control-slider-border-radius: 48px;
       }
       .vertical-sliders {
         height: 300px;

gallery/src/pages/components/ha-control-switch.ts

@@ -118,7 +118,7 @@ export class DemoHaControlSwitch extends LitElement {
         --control-switch-on-color: var(--green-color);
         --control-switch-off-color: var(--red-color);
         --control-switch-thickness: 130px;
-        --control-switch-border-radius: 36px;
+        --control-switch-border-radius: 48px;
         --control-switch-padding: 6px;
         --mdc-icon-size: 24px;
       }

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

@@ -161,14 +161,12 @@ const LABELS: LabelRegistryEntry[] = [
     name: "Energy",
     icon: null,
     color: "yellow",
-    description: null,
   },
   {
     label_id: "entertainment",
     name: "Entertainment",
     icon: "mdi:popcorn",
     color: "blue",
-    description: null,
   },
 ];
 

gallery/src/pages/lovelace/tile-card.ts

@@ -2,7 +2,6 @@ import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { customElement, query } from "lit/decorators";
 import { CoverEntityFeature } from "../../../../src/data/cover";
 import { LightColorMode } from "../../../../src/data/light";
-import { LockEntityFeature } from "../../../../src/data/lock";
 import { VacuumEntityFeature } from "../../../../src/data/vacuum";
 import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
@@ -21,11 +20,6 @@ const ENTITIES = [
   getEntity("light", "unavailable", "unavailable", {
     friendly_name: "Unavailable entity",
   }),
-  getEntity("lock", "front_door", "locked", {
-    friendly_name: "Front Door Lock",
-    device_class: "lock",
-    supported_features: LockEntityFeature.OPEN,
-  }),
   getEntity("climate", "thermostat", "heat", {
     current_temperature: 73,
     min_temp: 45,
@@ -144,24 +138,6 @@ const CONFIGS = [
     - type: "color-temp"
     `,
   },
-  {
-    heading: "Lock commands feature",
-    config: `
-- type: tile
-  entity: lock.front_door
-  features:
-    - type: "lock-commands"
-    `,
-  },
-  {
-    heading: "Lock open door feature",
-    config: `
-- type: tile
-  entity: lock.front_door
-  features:
-    - type: "lock-open-door"
-    `,
-  },
   {
     heading: "Vacuum commands feature",
     config: `

gallery/src/pages/misc/entity-state.ts

@@ -368,7 +368,6 @@ export class DemoEntityState extends LitElement {
               hass.localize,
               entry.stateObj,
               hass.locale,
-              [], // numericDeviceClasses
               hass.config,
               hass.entities
             )}`,

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

@@ -36,8 +36,6 @@ const createConfigEntry = (
   pref_disable_new_entities: false,
   pref_disable_polling: false,
   reason: null,
-  error_reason_translation_key: null,
-  error_reason_translation_placeholders: null,
   ...override,
 });
 

gulpfile.js

@@ -1,7 +1,4 @@
 import { globIterate } from "glob";
-import { availableParallelism } from "node:os";
-
-process.env.UV_THREADPOOL_SIZE = availableParallelism();
 
 const gulpImports = [];
 

hassio/src/dashboard/hassio-dashboard.ts

@@ -1,19 +1,19 @@
-import { mdiRefresh, mdiStorePlus } from "@mdi/js";
+import { mdiStorePlus, mdiUpdate } from "@mdi/js";
-import { CSSResultGroup, LitElement, TemplateResult, css, html } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { atLeastVersion } from "../../../src/common/config/version";
-import { fireEvent } from "../../../src/common/dom/fire_event";
 import "../../../src/components/ha-fab";
-import { reloadHassioAddons } from "../../../src/data/hassio/addon";
-import { extractApiErrorMessage } from "../../../src/data/hassio/common";
 import { Supervisor } from "../../../src/data/supervisor/supervisor";
-import { showAlertDialog } from "../../../src/dialogs/generic/show-dialog-box";
-import "../../../src/layouts/hass-subpage";
 import "../../../src/layouts/hass-tabs-subpage";
 import { haStyle } from "../../../src/resources/styles";
 import { HomeAssistant, Route } from "../../../src/types";
 import { supervisorTabs } from "../hassio-tabs";
 import "./hassio-addons";
+import "../../../src/layouts/hass-subpage";
+import { reloadHassioAddons } from "../../../src/data/hassio/addon";
+import { extractApiErrorMessage } from "../../../src/data/hassio/common";
+import { showAlertDialog } from "../../../src/dialogs/generic/show-dialog-box";
+import { fireEvent } from "../../../src/common/dom/fire_event";
 
 @customElement("hassio-dashboard")
 class HassioDashboard extends LitElement {
@@ -43,7 +43,7 @@ class HassioDashboard extends LitElement {
         <ha-icon-button
           slot="toolbar-icon"
           @click=${this._handleCheckUpdates}
-          .path=${mdiRefresh}
+          .path=${mdiUpdate}
           .label=${this.supervisor.localize("store.check_updates")}
         ></ha-icon-button>
         <hassio-addons

package.json

@@ -25,30 +25,30 @@
   "license": "Apache-2.0",
   "type": "module",
   "dependencies": {
-    "@babel/runtime": "7.24.5",
+    "@babel/runtime": "7.24.1",
-    "@braintree/sanitize-url": "7.0.2",
+    "@braintree/sanitize-url": "7.0.1",
-    "@codemirror/autocomplete": "6.16.0",
+    "@codemirror/autocomplete": "6.15.0",
-    "@codemirror/commands": "6.5.0",
+    "@codemirror/commands": "6.3.3",
     "@codemirror/language": "6.10.1",
-    "@codemirror/legacy-modes": "6.4.0",
+    "@codemirror/legacy-modes": "6.3.3",
     "@codemirror/search": "6.5.6",
     "@codemirror/state": "6.4.1",
-    "@codemirror/view": "6.26.3",
+    "@codemirror/view": "6.26.1",
     "@egjs/hammerjs": "2.0.17",
-    "@formatjs/intl-datetimeformat": "6.12.5",
+    "@formatjs/intl-datetimeformat": "6.12.3",
-    "@formatjs/intl-displaynames": "6.6.8",
+    "@formatjs/intl-displaynames": "6.6.6",
     "@formatjs/intl-getcanonicallocales": "2.3.0",
-    "@formatjs/intl-listformat": "7.5.7",
+    "@formatjs/intl-listformat": "7.5.5",
-    "@formatjs/intl-locale": "4.0.0",
+    "@formatjs/intl-locale": "3.4.5",
-    "@formatjs/intl-numberformat": "8.10.3",
+    "@formatjs/intl-numberformat": "8.10.1",
-    "@formatjs/intl-pluralrules": "5.2.14",
+    "@formatjs/intl-pluralrules": "5.2.12",
-    "@formatjs/intl-relativetimeformat": "11.2.14",
+    "@formatjs/intl-relativetimeformat": "11.2.12",
-    "@fullcalendar/core": "6.1.13",
+    "@fullcalendar/core": "6.1.11",
-    "@fullcalendar/daygrid": "6.1.13",
+    "@fullcalendar/daygrid": "6.1.11",
-    "@fullcalendar/interaction": "6.1.13",
+    "@fullcalendar/interaction": "6.1.11",
-    "@fullcalendar/list": "6.1.13",
+    "@fullcalendar/list": "6.1.11",
-    "@fullcalendar/luxon3": "6.1.13",
+    "@fullcalendar/luxon3": "6.1.11",
-    "@fullcalendar/timegrid": "6.1.13",
+    "@fullcalendar/timegrid": "6.1.11",
     "@lezer/highlight": "1.2.0",
     "@lit-labs/context": "0.4.1",
     "@lit-labs/motion": "1.0.7",
@@ -70,6 +70,7 @@
     "@material/mwc-list": "0.27.0",
     "@material/mwc-menu": "0.27.0",
     "@material/mwc-radio": "0.27.0",
+    "@material/mwc-ripple": "0.27.0",
     "@material/mwc-select": "0.27.0",
     "@material/mwc-snackbar": "0.27.0",
     "@material/mwc-switch": "0.27.0",
@@ -80,7 +81,7 @@
     "@material/mwc-top-app-bar": "0.27.0",
     "@material/mwc-top-app-bar-fixed": "0.27.0",
     "@material/top-app-bar": "=14.0.0-canary.53b3cad2f.0",
-    "@material/web": "1.4.1",
+    "@material/web": "=1.3.0",
     "@mdi/js": "7.4.47",
     "@mdi/svg": "7.4.47",
     "@polymer/paper-item": "3.0.1",
@@ -88,8 +89,8 @@
     "@polymer/paper-tabs": "3.1.0",
     "@polymer/polymer": "3.5.1",
     "@thomasloven/round-slider": "0.6.0",
-    "@vaadin/combo-box": "24.3.13",
+    "@vaadin/combo-box": "24.3.10",
-    "@vaadin/vaadin-themable-mixin": "24.3.13",
+    "@vaadin/vaadin-themable-mixin": "24.3.10",
     "@vibrant/color": "3.2.1-alpha.1",
     "@vibrant/core": "3.2.1-alpha.1",
     "@vibrant/quantizer-mmcq": "3.2.1-alpha.1",
@@ -97,28 +98,28 @@
     "@webcomponents/scoped-custom-element-registry": "0.0.9",
     "@webcomponents/webcomponentsjs": "2.8.0",
     "app-datepicker": "5.1.1",
-    "chart.js": "4.4.3",
+    "chart.js": "4.4.2",
     "color-name": "2.0.0",
     "comlink": "4.4.1",
-    "core-js": "3.37.1",
+    "core-js": "3.36.1",
-    "cropperjs": "1.6.2",
+    "cropperjs": "1.6.1",
-    "date-fns": "3.6.0",
+    "date-fns": "2.30.0",
-    "date-fns-tz": "3.1.3",
+    "date-fns-tz": "2.0.1",
     "deep-clone-simple": "1.1.1",
     "deep-freeze": "0.0.1",
-    "element-internals-polyfill": "1.3.11",
+    "element-internals-polyfill": "1.3.10",
     "fuse.js": "7.0.0",
     "google-timezones-json": "1.2.0",
     "hls.js": "patch:hls.js@npm%3A1.5.7#~/.yarn/patches/hls.js-npm-1.5.7-f5bbd3d060.patch",
-    "home-assistant-js-websocket": "9.3.0",
+    "home-assistant-js-websocket": "9.2.1",
     "idb-keyval": "6.2.1",
-    "intl-messageformat": "10.5.14",
+    "intl-messageformat": "10.5.11",
     "js-yaml": "4.1.0",
     "leaflet": "1.9.4",
     "leaflet-draw": "1.0.4",
     "lit": "2.8.0",
     "luxon": "3.4.4",
-    "marked": "12.0.2",
+    "marked": "12.0.1",
     "memoize-one": "6.0.0",
     "node-vibrant": "3.2.1-alpha.1",
     "proxy-polyfill": "0.3.2",
@@ -140,58 +141,57 @@
     "vue": "2.7.16",
     "vue2-daterange-picker": "0.6.8",
     "weekstart": "2.0.0",
-    "workbox-cacheable-response": "7.1.0",
+    "workbox-cacheable-response": "7.0.0",
-    "workbox-core": "7.1.0",
+    "workbox-core": "7.0.0",
-    "workbox-expiration": "7.1.0",
+    "workbox-expiration": "7.0.0",
-    "workbox-precaching": "7.1.0",
+    "workbox-precaching": "7.0.0",
-    "workbox-routing": "7.1.0",
+    "workbox-routing": "7.0.0",
-    "workbox-strategies": "7.1.0",
+    "workbox-strategies": "7.0.0",
     "xss": "1.0.15"
   },
   "devDependencies": {
-    "@babel/core": "7.24.5",
+    "@babel/core": "7.24.3",
-    "@babel/helper-define-polyfill-provider": "0.6.2",
+    "@babel/helper-define-polyfill-provider": "0.6.1",
     "@babel/plugin-proposal-decorators": "7.24.1",
     "@babel/plugin-transform-runtime": "7.24.3",
-    "@babel/preset-env": "7.24.5",
+    "@babel/preset-env": "7.24.3",
     "@babel/preset-typescript": "7.24.1",
     "@bundle-stats/plugin-webpack-filter": "4.12.2",
     "@koa/cors": "5.0.0",
-    "@lokalise/node-api": "12.5.0",
+    "@lokalise/node-api": "12.3.0",
-    "@octokit/auth-oauth-device": "7.1.1",
+    "@octokit/auth-oauth-device": "7.0.1",
-    "@octokit/plugin-retry": "7.1.1",
+    "@octokit/plugin-retry": "7.0.3",
-    "@octokit/rest": "20.1.1",
+    "@octokit/rest": "20.0.2",
     "@open-wc/dev-server-hmr": "0.1.4",
     "@rollup/plugin-babel": "6.0.4",
-    "@rollup/plugin-commonjs": "25.0.8",
+    "@rollup/plugin-commonjs": "25.0.7",
     "@rollup/plugin-json": "6.1.0",
     "@rollup/plugin-node-resolve": "15.2.3",
     "@rollup/plugin-replace": "5.0.5",
     "@types/babel__plugin-transform-runtime": "7.9.5",
-    "@types/chromecast-caf-receiver": "6.0.14",
+    "@types/chromecast-caf-receiver": "6.0.13",
-    "@types/chromecast-caf-sender": "1.0.10",
+    "@types/chromecast-caf-sender": "1.0.9",
-    "@types/color-name": "1.1.4",
+    "@types/color-name": "1.1.3",
     "@types/glob": "8.1.0",
     "@types/html-minifier-terser": "7.0.2",
     "@types/js-yaml": "4.0.9",
-    "@types/leaflet": "1.9.12",
+    "@types/leaflet": "1.9.8",
     "@types/leaflet-draw": "1.0.11",
-    "@types/lodash.merge": "4.6.9",
     "@types/luxon": "3.4.2",
     "@types/mocha": "10.0.6",
     "@types/qrcode": "1.5.5",
     "@types/serve-handler": "6.1.4",
     "@types/sortablejs": "1.15.8",
-    "@types/tar": "6.1.13",
+    "@types/tar": "6.1.11",
     "@types/ua-parser-js": "0.7.39",
     "@types/webspeechapi": "0.0.29",
-    "@typescript-eslint/eslint-plugin": "7.10.0",
+    "@typescript-eslint/eslint-plugin": "7.4.0",
-    "@typescript-eslint/parser": "7.10.0",
+    "@typescript-eslint/parser": "7.4.0",
     "@web/dev-server": "0.1.38",
     "@web/dev-server-rollup": "0.4.1",
     "babel-loader": "9.1.3",
     "babel-plugin-template-html-minifier": "4.1.0",
-    "chai": "5.1.1",
+    "chai": "5.1.0",
     "del": "7.1.0",
     "eslint": "8.57.0",
     "eslint-config-airbnb-base": "15.0.0",
@@ -200,28 +200,29 @@
     "eslint-import-resolver-webpack": "0.13.8",
     "eslint-plugin-disable": "2.0.3",
     "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-lit": "1.13.0",
+    "eslint-plugin-lit": "1.11.0",
     "eslint-plugin-lit-a11y": "4.1.2",
-    "eslint-plugin-unused-imports": "3.2.0",
+    "eslint-plugin-unused-imports": "3.1.0",
-    "eslint-plugin-wc": "2.1.0",
+    "eslint-plugin-wc": "2.0.4",
     "fancy-log": "2.0.0",
     "fs-extra": "11.2.0",
-    "glob": "10.4.1",
+    "glob": "10.3.10",
-    "gulp": "5.0.0",
+    "gulp": "4.0.2",
+    "gulp-flatmap": "1.0.2",
     "gulp-json-transform": "0.5.0",
+    "gulp-merge-json": "2.2.1",
     "gulp-rename": "2.0.0",
     "gulp-zopfli-green": "6.0.1",
     "html-minifier-terser": "7.2.0",
     "husky": "9.0.11",
     "instant-mocha": "1.5.2",
     "jszip": "3.10.1",
-    "lint-staged": "15.2.4",
+    "lint-staged": "15.2.2",
     "lit-analyzer": "2.0.3",
-    "lodash.merge": "4.6.2",
     "lodash.template": "4.5.0",
-    "magic-string": "0.30.10",
+    "magic-string": "0.30.8",
     "map-stream": "0.0.7",
-    "mocha": "10.4.0",
+    "mocha": "10.3.0",
     "object-hash": "3.0.0",
     "open": "10.1.0",
     "pinst": "3.0.0",
@@ -231,21 +232,23 @@
     "rollup-plugin-terser": "7.0.2",
     "rollup-plugin-visualizer": "5.12.0",
     "serve-handler": "6.1.5",
-    "sinon": "18.0.0",
+    "sinon": "17.0.1",
     "source-map-url": "0.4.1",
-    "systemjs": "6.15.1",
+    "systemjs": "6.14.3",
-    "tar": "7.1.0",
+    "tar": "6.2.1",
     "terser-webpack-plugin": "5.3.10",
-    "transform-async-modules-webpack-plugin": "1.1.1",
+    "transform-async-modules-webpack-plugin": "1.0.4",
     "ts-lit-plugin": "2.0.2",
-    "typescript": "5.4.5",
+    "typescript": "5.4.3",
+    "vinyl-buffer": "1.0.1",
+    "vinyl-source-stream": "2.0.0",
     "webpack": "5.91.0",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.0.4",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-stats-plugin": "1.1.3",
     "webpackbar": "6.0.1",
-    "workbox-build": "7.1.0"
+    "workbox-build": "7.0.0"
   },
   "_comment": "Polymer 3.2 contained a bug, fixed in https://github.com/Polymer/polymer/pull/5569, add as patch",
   "resolutions": {
@@ -257,5 +260,5 @@
     "sortablejs@1.15.2": "patch:sortablejs@npm%3A1.15.2#~/.yarn/patches/sortablejs-npm-1.15.2-73347ae85a.patch",
     "leaflet-draw@1.0.4": "patch:leaflet-draw@npm%3A1.0.4#./.yarn/patches/leaflet-draw-npm-1.0.4-0ca0ebcf65.patch"
   },
-  "packageManager": "yarn@4.2.2"
+  "packageManager": "yarn@4.1.1"
 }

pyproject.toml

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

renovate.json

@@ -40,11 +40,6 @@
       "matchPackageNames": ["tsparticles-engine"],
       "matchPackagePrefixes": ["tsparticles-preset-"]
     },
-    {
-      "description": "Group date-fns with dependent timezone package",
-      "groupName": "date-fns",
-      "matchPackageNames": ["date-fns", "date-fns-tz"]
-    },
     {
       "description": "Group and temporarily disable WDS packages",
       "groupName": "Web Dev Server",

src/common/datetime/calc_date.ts

@@ -1,4 +1,4 @@
-import { toZonedTime, fromZonedTime } from "date-fns-tz";
+import { utcToZonedTime, zonedTimeToUtc } from "date-fns-tz";
 import { HassConfig } from "home-assistant-js-websocket";
 import { FrontendLocaleData, TimeZone } from "../../data/translation";
 
@@ -8,10 +8,10 @@ const calcZonedDate = (
   fn: (date: Date, options?: any) => Date | number | boolean,
   options?
 ) => {
-  const inputZoned = toZonedTime(date, tz);
+  const inputZoned = utcToZonedTime(date, tz);
   const fnZoned = fn(inputZoned, options);
   if (fnZoned instanceof Date) {
-    return fromZonedTime(fnZoned, tz) as Date;
+    return zonedTimeToUtc(fnZoned, tz) as Date;
   }
   return fnZoned;
 };
@@ -51,6 +51,6 @@ export const calcDateDifferenceProperty = (
     locale,
     config,
     locale.time_zone === TimeZone.server
-      ? toZonedTime(startDate, config.time_zone)
+      ? utcToZonedTime(startDate, config.time_zone)
       : startDate
   );

src/common/dom/media_query.ts

@@ -1,5 +1,3 @@
-export type MediaQueriesListener = () => void;
-
 /**
  * Attach a media query. Listener is called right away and when it matches.
  * @param mediaQuery media query to match.
@@ -9,7 +7,7 @@ export type MediaQueriesListener = () => void;
 export const listenMediaQuery = (
   mediaQuery: string,
   matchesChanged: (matches: boolean) => void
-): MediaQueriesListener => {
+) => {
   const mql = matchMedia(mediaQuery);
   const listener = (e) => matchesChanged(e.matches);
   mql.addListener(listener);

src/common/entity/compute_state_display.ts

@@ -19,11 +19,28 @@ import { blankBeforeUnit } from "../translations/blank_before_unit";
 import { LocalizeFunc } from "../translations/localize";
 import { computeDomain } from "./compute_domain";
 
+export const computeStateDisplaySingleEntity = (
+  localize: LocalizeFunc,
+  stateObj: HassEntity,
+  locale: FrontendLocaleData,
+  config: HassConfig,
+  entity: EntityRegistryDisplayEntry | undefined,
+  state?: string
+): string =>
+  computeStateDisplayFromEntityAttributes(
+    localize,
+    locale,
+    config,
+    entity,
+    stateObj.entity_id,
+    stateObj.attributes,
+    state !== undefined ? state : stateObj.state
+  );
+
 export const computeStateDisplay = (
   localize: LocalizeFunc,
   stateObj: HassEntity,
   locale: FrontendLocaleData,
-  sensorNumericDeviceClasses: string[],
   config: HassConfig,
   entities: HomeAssistant["entities"],
   state?: string
@@ -35,7 +52,6 @@ export const computeStateDisplay = (
   return computeStateDisplayFromEntityAttributes(
     localize,
     locale,
-    sensorNumericDeviceClasses,
     config,
     entity,
     stateObj.entity_id,
@@ -47,7 +63,6 @@ export const computeStateDisplay = (
 export const computeStateDisplayFromEntityAttributes = (
   localize: LocalizeFunc,
   locale: FrontendLocaleData,
-  sensorNumericDeviceClasses: string[],
   config: HassConfig,
   entity: EntityRegistryDisplayEntry | undefined,
   entityId: string,
@@ -58,15 +73,8 @@ export const computeStateDisplayFromEntityAttributes = (
     return localize(`state.default.${state}`);
   }
 
-  const domain = computeDomain(entityId);
-
   // Entities with a `unit_of_measurement` or `state_class` are numeric values and should use `formatNumber`
-  if (
+  if (isNumericFromAttributes(attributes)) {
-    isNumericFromAttributes(
-      attributes,
-      domain === "sensor" ? sensorNumericDeviceClasses : []
-    )
-  ) {
     // state is duration
     if (
       attributes.device_class === "duration" &&
@@ -112,6 +120,8 @@ export const computeStateDisplayFromEntityAttributes = (
     return value;
   }
 
+  const domain = computeDomain(entityId);
+
   if (domain === "datetime") {
     const time = new Date(state);
     return formatDateTime(time, locale, config);
@@ -177,14 +187,11 @@ export const computeStateDisplayFromEntityAttributes = (
   if (
     [
       "button",
-      "conversation",
       "event",
       "image",
       "input_button",
-      "notify",
       "scene",
       "stt",
-      "tag",
       "tts",
       "wake_word",
     ].includes(domain) ||

src/common/entity/get_states.ts

@@ -28,15 +28,7 @@ export const FIXED_DOMAIN_STATES = {
   input_button: [],
   lawn_mower: ["error", "paused", "mowing", "docked"],
   light: ["on", "off"],
-  lock: [
+  lock: ["jammed", "locked", "locking", "unlocked", "unlocking"],
-    "jammed",
-    "locked",
-    "locking",
-    "unlocked",
-    "unlocking",
-    "opening",
-    "open",
-  ],
   media_player: [
     "off",
     "on",

src/common/number/format_number.ts

@@ -14,12 +14,8 @@ export const isNumericState = (stateObj: HassEntity): boolean =>
   isNumericFromAttributes(stateObj.attributes);
 
 export const isNumericFromAttributes = (
-  attributes: HassEntityAttributeBase,
+  attributes: HassEntityAttributeBase
-  numericDeviceClasses?: string[]
+): boolean => !!attributes.unit_of_measurement || !!attributes.state_class;
-): boolean =>
-  !!attributes.unit_of_measurement ||
-  !!attributes.state_class ||
-  (numericDeviceClasses || []).includes(attributes.device_class || "");
 
 export const numberFormatToLocale = (
   localeOptions: FrontendLocaleData

src/common/translations/entity-state.ts

@@ -21,8 +21,7 @@ export const computeFormatFunctions = async (
   localize: LocalizeFunc,
   locale: FrontendLocaleData,
   config: HassConfig,
-  entities: HomeAssistant["entities"],
+  entities: HomeAssistant["entities"]
-  sensorNumericDeviceClasses: string[]
 ): Promise<{
   formatEntityState: FormatEntityStateFunc;
   formatEntityAttributeValue: FormatEntityAttributeValueFunc;
@@ -36,15 +35,7 @@ export const computeFormatFunctions = async (
 
   return {
     formatEntityState: (stateObj, state) =>
-      computeStateDisplay(
+      computeStateDisplay(localize, stateObj, locale, config, entities, state),
-        localize,
-        stateObj,
-        locale,
-        sensorNumericDeviceClasses,
-        config,
-        entities,
-        state
-      ),
     formatEntityAttributeValue: (stateObj, attribute, value) =>
       computeAttributeValueDisplay(
         localize,

src/common/translations/localize.ts

@@ -2,7 +2,6 @@ import IntlMessageFormat from "intl-messageformat";
 import type { HTMLTemplateResult } from "lit";
 import { polyfillLocaleData } from "../../resources/locale-data-polyfill";
 import { Resources, TranslationDict } from "../../types";
-import { fireEvent } from "../dom/fire_event";
 
 // Exclude some patterns from key type checking for now
 // These are intended to be removed as errors are fixed
@@ -82,9 +81,7 @@ export interface FormatsType {
  */
 
 export const computeLocalize = async <Keys extends string = LocalizeKeys>(
-  cache: HTMLElement & {
+  cache: any,
-    _localizationCache?: Record<string, IntlMessageFormat>;
-  },
   language: string,
   resources: Resources,
   formats?: FormatsType
@@ -110,7 +107,7 @@ export const computeLocalize = async <Keys extends string = LocalizeKeys>(
     }
 
     const messageKey = key + translatedValue;
-    let translatedMessage = cache._localizationCache![messageKey] as
+    let translatedMessage = cache._localizationCache[messageKey] as
       | IntlMessageFormat
       | undefined;
 
@@ -124,7 +121,7 @@ export const computeLocalize = async <Keys extends string = LocalizeKeys>(
       } catch (err: any) {
         return "Translation error: " + err.message;
       }
-      cache._localizationCache![messageKey] = translatedMessage;
+      cache._localizationCache[messageKey] = translatedMessage;
     }
 
     let argObject = {};
@@ -140,12 +137,6 @@ export const computeLocalize = async <Keys extends string = LocalizeKeys>(
     try {
       return translatedMessage.format<string>(argObject) as string;
     } catch (err: any) {
-      // eslint-disable-next-line no-console
-      console.error("Translation error", key, language, err);
-      fireEvent(cache, "write_log", {
-        level: "error",
-        message: `Failed to format translation for key '${key}' in language '${language}'. ${err}`,
-      });
       return "Translation " + err;
     }
   };

src/common/util/promise-all-settled-results.ts

@@ -1,9 +0,0 @@
-export const hasRejectedItems = <T = any>(results: PromiseSettledResult<T>[]) =>
-  results.some((result) => result.status === "rejected");
-
-export const rejectedItems = <T = any>(
-  results: PromiseSettledResult<T>[]
-): PromiseRejectedResult[] =>
-  results.filter(
-    (result) => result.status === "rejected"
-  ) as PromiseRejectedResult[];

src/common/util/select-unit.ts

@@ -1,4 +1,4 @@
-import { differenceInDays, differenceInWeeks, startOfWeek } from "date-fns";
+import { differenceInDays, differenceInWeeks, startOfWeek } from "date-fns/esm";
 import { FrontendLocaleData } from "../../data/translation";
 import { firstWeekdayIndex } from "../datetime/first_weekday";
 

src/components/chart/chart-date-adapter.ts

@@ -34,7 +34,7 @@ import {
   endOfMonth,
   endOfQuarter,
   endOfYear,
-} from "date-fns";
+} from "date-fns/esm";
 import {
   formatDate,
   formatDateMonth,

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

@@ -313,38 +313,31 @@ export class HaChartBase extends LitElement {
     `;
   }
 
-  private _loading = false;
-
   private async _setupChart() {
-    if (this._loading) return;
     const ctx: CanvasRenderingContext2D = this.renderRoot
       .querySelector("canvas")!
       .getContext("2d")!;
-    this._loading = true;
-    try {
-      const ChartConstructor = (await import("../../resources/chartjs")).Chart;
 
-      const computedStyles = getComputedStyle(this);
+    const ChartConstructor = (await import("../../resources/chartjs")).Chart;
 
-      ChartConstructor.defaults.borderColor =
+    const computedStyles = getComputedStyle(this);
-        computedStyles.getPropertyValue("--divider-color");
-      ChartConstructor.defaults.color = computedStyles.getPropertyValue(
-        "--secondary-text-color"
-      );
-      ChartConstructor.defaults.font.family =
-        computedStyles.getPropertyValue("--mdc-typography-body1-font-family") ||
-        computedStyles.getPropertyValue("--mdc-typography-font-family") ||
-        "Roboto, Noto, sans-serif";
 
-      this.chart = new ChartConstructor(ctx, {
+    ChartConstructor.defaults.borderColor =
-        type: this.chartType,
+      computedStyles.getPropertyValue("--divider-color");
-        data: this.data,
+    ChartConstructor.defaults.color = computedStyles.getPropertyValue(
-        options: this._createOptions(),
+      "--secondary-text-color"
-        plugins: this._createPlugins(),
+    );
-      });
+    ChartConstructor.defaults.font.family =
-    } finally {
+      computedStyles.getPropertyValue("--mdc-typography-body1-font-family") ||
-      this._loading = false;
+      computedStyles.getPropertyValue("--mdc-typography-font-family") ||
-    }
+      "Roboto, Noto, sans-serif";
+
+    this.chart = new ChartConstructor(ctx, {
+      type: this.chartType,
+      data: this.data,
+      options: this._createOptions(),
+      plugins: this._createPlugins(),
+    });
   }
 
   private _createOptions() {

src/components/chips/ha-assist-chip.ts

@@ -1,3 +1,4 @@
+import "element-internals-polyfill";
 import { MdAssistChip } from "@material/web/chips/assist-chip";
 import { css, html } from "lit";
 import { customElement, property } from "lit/decorators";
@@ -44,8 +45,8 @@ export class HaAssistChip extends MdAssistChip {
         margin-inline-start: var(--_icon-label-space);
       }
       ::before {
-        background: var(--ha-assist-chip-container-color, transparent);
+        background: var(--ha-assist-chip-container-color);
-        opacity: var(--ha-assist-chip-container-opacity, 1);
+        opacity: var(--ha-assist-chip-container-opacity);
       }
       :where(.active)::before {
         background: var(--ha-assist-chip-active-container-color);

src/components/chips/ha-chip-set.ts

@@ -1,3 +1,4 @@
+import "element-internals-polyfill";
 import { MdChipSet } from "@material/web/chips/chip-set";
 import { customElement } from "lit/decorators";
 

src/components/chips/ha-filter-chip.ts

@@ -1,3 +1,4 @@
+import "element-internals-polyfill";
 import { MdFilterChip } from "@material/web/chips/filter-chip";
 import { css, html } from "lit";
 import { customElement, property } from "lit/decorators";

src/components/chips/ha-input-chip.ts

@@ -1,3 +1,4 @@
+import "element-internals-polyfill";
 import { MdInputChip } from "@material/web/chips/input-chip";
 import { css } from "lit";
 import { customElement } from "lit/decorators";
@@ -19,7 +20,6 @@ export class HaInputChip extends MdInputChip {
           0.15
         );
         --ha-input-chip-selected-container-opacity: 1;
-        --md-input-chip-label-text-font: Roboto, sans-serif;
       }
       /** Set the size of mdc icons **/
       ::slotted([slot="icon"]) {

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

@@ -1,13 +1,13 @@
-import { mdiArrowDown, mdiArrowUp, mdiChevronUp } from "@mdi/js";
+import { mdiArrowDown, mdiArrowUp } from "@mdi/js";
 import deepClone from "deep-clone-simple";
 import {
+  css,
   CSSResultGroup,
+  html,
   LitElement,
+  nothing,
   PropertyValues,
   TemplateResult,
-  css,
-  html,
-  nothing,
 } from "lit";
 import {
   customElement,
@@ -22,9 +22,7 @@ import { styleMap } from "lit/directives/style-map";
 import memoizeOne from "memoize-one";
 import { restoreScroll } from "../../common/decorators/restore-scroll";
 import { fireEvent } from "../../common/dom/fire_event";
-import { stringCompare } from "../../common/string/compare";
 import { debounce } from "../../common/util/debounce";
-import { groupBy } from "../../common/util/group-by";
 import { nextRender } from "../../common/util/render-status";
 import { haStyleScrollbar } from "../../resources/styles";
 import { loadVirtualizer } from "../../resources/virtualizer";
@@ -34,6 +32,16 @@ import type { HaCheckbox } from "../ha-checkbox";
 import "../ha-svg-icon";
 import "../search-input";
 import { filterData, sortData } from "./sort-filter";
+import { groupBy } from "../../common/util/group-by";
+
+declare global {
+  // for fire event
+  interface HASSDomEvents {
+    "selection-changed": SelectionChangedEvent;
+    "row-click": RowClickedEvent;
+    "sorting-changed": SortingChangedEvent;
+  }
+}
 
 export interface RowClickedEvent {
   id: string;
@@ -43,10 +51,6 @@ export interface SelectionChangedEvent {
   value: string[];
 }
 
-export interface CollapsedChangedEvent {
-  value: string[];
-}
-
 export interface SortingChangedEvent {
   column: string;
   direction: SortingDirection;
@@ -137,14 +141,10 @@ export class HaDataTable extends LitElement {
 
   @property() public groupColumn?: string;
 
-  @property({ attribute: false }) public groupOrder?: string[];
-
   @property() public sortColumn?: string;
 
   @property() public sortDirection: SortingDirection = null;
 
-  @property({ attribute: false }) public initialCollapsedGroups?: string[];
-
   @state() private _filterable = false;
 
   @state() private _filter = "";
@@ -157,8 +157,6 @@ export class HaDataTable extends LitElement {
 
   @state() private _items: DataTableRowData[] = [];
 
-  @state() private _collapsedGroups: string[] = [];
-
   private _checkableRowsCount?: number;
 
   private _checkedRows: string[] = [];
@@ -214,19 +212,17 @@ export class HaDataTable extends LitElement {
         (column) => column.filterable
       );
 
-      if (!this.sortColumn) {
+      for (const columnId in this.columns) {
-        for (const columnId in this.columns) {
+        if (this.columns[columnId].direction) {
-          if (this.columns[columnId].direction) {
+          this.sortDirection = this.columns[columnId].direction!;
-            this.sortDirection = this.columns[columnId].direction!;
+          this.sortColumn = columnId;
-            this.sortColumn = columnId;
 
-            fireEvent(this, "sorting-changed", {
+          fireEvent(this, "sorting-changed", {
-              column: columnId,
+            column: columnId,
-              direction: this.sortDirection,
+            direction: this.sortDirection,
-            });
+          });
 
-            break;
+          break;
-          }
         }
       }
 
@@ -251,23 +247,13 @@ export class HaDataTable extends LitElement {
       ).length;
     }
 
-    if (!this.hasUpdated && this.initialCollapsedGroups) {
-      this._collapsedGroups = this.initialCollapsedGroups;
-      fireEvent(this, "collapsed-changed", { value: this._collapsedGroups });
-    } else if (properties.has("groupColumn")) {
-      this._collapsedGroups = [];
-      fireEvent(this, "collapsed-changed", { value: this._collapsedGroups });
-    }
-
     if (
       properties.has("data") ||
       properties.has("columns") ||
       properties.has("_filter") ||
       properties.has("sortColumn") ||
       properties.has("sortDirection") ||
-      properties.has("groupColumn") ||
+      properties.has("groupColumn")
-      properties.has("groupOrder") ||
-      properties.has("_collapsedGroups")
     ) {
       this._sortFilterData();
     }
@@ -460,8 +446,6 @@ export class HaDataTable extends LitElement {
           }
           return html`
             <div
-              @mouseover=${this._setTitle}
-              @focus=${this._setTitle}
               role=${column.main ? "rowheader" : "cell"}
               class="mdc-data-table__cell ${classMap({
                 "mdc-data-table__cell--flex": column.type === "flex",
@@ -529,7 +513,11 @@ export class HaDataTable extends LitElement {
     }
 
     if (this.appendRow || this.hasFab || this.groupColumn) {
-      let items = [...data];
+      const items = [...data];
+
+      if (this.appendRow) {
+        items.push({ append: true, content: this.appendRow });
+      }
 
       if (this.groupColumn) {
         const grouped = groupBy(items, (item) => item[this.groupColumn!]);
@@ -541,66 +529,39 @@ export class HaDataTable extends LitElement {
         const sorted: {
           [key: string]: DataTableRowData[];
         } = Object.keys(grouped)
-          .sort((a, b) => {
+          .sort()
-            const orderA = this.groupOrder?.indexOf(a) ?? -1;
-            const orderB = this.groupOrder?.indexOf(b) ?? -1;
-            if (orderA !== orderB) {
-              if (orderA === -1) {
-                return 1;
-              }
-              if (orderB === -1) {
-                return -1;
-              }
-              return orderA - orderB;
-            }
-            return stringCompare(
-              ["", "-", "—"].includes(a) ? "zzz" : a,
-              ["", "-", "—"].includes(b) ? "zzz" : b,
-              this.hass.locale.language
-            );
-          })
           .reduce((obj, key) => {
             obj[key] = grouped[key];
             return obj;
           }, {});
         const groupedItems: DataTableRowData[] = [];
         Object.entries(sorted).forEach(([groupName, rows]) => {
-          groupedItems.push({
+          if (
-            append: true,
+            groupName !== UNDEFINED_GROUP_KEY ||
-            content: html`<div
+            Object.keys(sorted).length > 1
-              class="mdc-data-table__cell group-header"
+          ) {
-              role="cell"
+            groupedItems.push({
-              .group=${groupName}
+              append: true,
-              @click=${this._collapseGroup}
+              content: html`<div
-            >
+                class="mdc-data-table__cell group-header"
-              <ha-icon-button
+                role="cell"
-                .path=${mdiChevronUp}
-                class=${this._collapsedGroups.includes(groupName)
-                  ? "collapsed"
-                  : ""}
               >
-              </ha-icon-button>
+                ${groupName === UNDEFINED_GROUP_KEY ? "" : groupName || ""}
-              ${groupName === UNDEFINED_GROUP_KEY
+              </div>`,
-                ? this.hass.localize("ui.components.data-table.ungrouped")
+            });
-                : groupName || ""}
-            </div>`,
-          });
-          if (!this._collapsedGroups.includes(groupName)) {
-            groupedItems.push(...rows);
           }
-        });
-        items = groupedItems;
-      }
 
-      if (this.appendRow) {
+          groupedItems.push(...rows);
-        items.push({ append: true, content: this.appendRow });
+        });
+
+        this._items = groupedItems;
+      } else {
+        this._items = items;
       }
 
       if (this.hasFab) {
-        items.push({ empty: true });
+        this._items = [...this._items, { empty: true }];
       }
-
-      this._items = items;
     } else {
       this._items = data;
     }
@@ -681,13 +642,6 @@ export class HaDataTable extends LitElement {
     fireEvent(this, "row-click", { id: rowId }, { bubbles: false });
   };
 
-  private _setTitle(ev: Event) {
-    const target = ev.currentTarget as HTMLElement;
-    if (target.scrollWidth > target.offsetWidth) {
-      target.setAttribute("title", target.innerText);
-    }
-  }
-
   private _checkedRowsChanged() {
     // force scroller to update, change it's items
     if (this._items.length) {
@@ -718,18 +672,6 @@ export class HaDataTable extends LitElement {
     this._savedScrollPos = (e.target as HTMLDivElement).scrollTop;
   }
 
-  private _collapseGroup = (ev: Event) => {
-    const groupName = (ev.currentTarget as any).group;
-    if (this._collapsedGroups.includes(groupName)) {
-      this._collapsedGroups = this._collapsedGroups.filter(
-        (grp) => grp !== groupName
-      );
-    } else {
-      this._collapsedGroups = [...this._collapsedGroups, groupName];
-    }
-    fireEvent(this, "collapsed-changed", { value: this._collapsedGroups });
-  };
-
   static get styles(): CSSResultGroup {
     return [
       haStyleScrollbar,
@@ -982,22 +924,8 @@ export class HaDataTable extends LitElement {
 
         .group-header {
           padding-top: 12px;
-          padding-left: 12px;
-          padding-inline-start: 12px;
-          padding-inline-end: initial;
           width: 100%;
           font-weight: 500;
-          display: flex;
-          align-items: center;
-          cursor: pointer;
-        }
-
-        .group-header ha-icon-button {
-          transition: transform 0.2s ease;
-        }
-
-        .group-header ha-icon-button.collapsed {
-          transform: rotate(180deg);
         }
 
         :host {
@@ -1096,12 +1024,4 @@ declare global {
   interface HTMLElementTagNameMap {
     "ha-data-table": HaDataTable;
   }
-
-  // for fire event
-  interface HASSDomEvents {
-    "selection-changed": SelectionChangedEvent;
-    "row-click": RowClickedEvent;
-    "sorting-changed": SortingChangedEvent;
-    "collapsed-changed": CollapsedChangedEvent;
-  }
 }

src/components/date-range-picker.ts

@@ -11,10 +11,10 @@ import {
 } from "../common/datetime/localize_date";
 import { mainWindow } from "../common/dom/get_main_window";
 
+// Set the current date to the left picker instead of the right picker because the right is hidden
 const CustomDateRangePicker = Vue.extend({
   mixins: [DateRangePicker],
   methods: {
-    // Set the current date to the left picker instead of the right picker because the right is hidden
     selectMonthDate() {
       const dt: Date = this.end || new Date();
       // @ts-ignore
@@ -23,33 +23,6 @@ const CustomDateRangePicker = Vue.extend({
         month: dt.getMonth() + 1,
       });
     },
-    // Fix the start/end date calculation when selecting a date range. The
-    // original code keeps track of the first clicked date (in_selection) but it
-    // never sets it to either the start or end date variables, so if the
-    // in_selection date is between the start and end date that were set by the
-    // hover the selection will enter a broken state that's counter-intuitive
-    // when hovering between weeks and leads to a random date when selecting a
-    // range across months. This bug doesn't seem to be present on v0.6.7 of the
-    // lib
-    hoverDate(value: Date) {
-      if (this.readonly) return;
-
-      if (this.in_selection) {
-        const pickA = this.in_selection as Date;
-        const pickB = value;
-
-        this.start = this.normalizeDatetime(
-          Math.min(pickA.valueOf(), pickB.valueOf()),
-          this.start
-        );
-        this.end = this.normalizeDatetime(
-          Math.max(pickA.valueOf(), pickB.valueOf()),
-          this.end
-        );
-      }
-
-      this.$emit("hover-date", value);
-    },
   },
 });
 

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

@@ -76,8 +76,6 @@ class HaEntitiesPickerLight extends LitElement {
   @property({ attribute: false })
   public entityFilter?: HaEntityPickerEntityFilterFunc;
 
-  @property({ type: Array }) public createDomains?: string[];
-
   protected render() {
     if (!this.hass) {
       return nothing;
@@ -105,7 +103,6 @@ class HaEntitiesPickerLight extends LitElement {
               .value=${entityId}
               .label=${this.pickedEntityLabel}
               .disabled=${this.disabled}
-              .createDomains=${this.createDomains}
               @value-changed=${this._entityChanged}
             ></ha-entity-picker>
           </div>
@@ -125,7 +122,6 @@ class HaEntitiesPickerLight extends LitElement {
           .label=${this.pickEntityLabel}
           .helper=${this.helper}
           .disabled=${this.disabled}
-          .createDomains=${this.createDomains}
           .required=${this.required && !currentEntities.length}
           @value-changed=${this._addEntity}
         ></ha-entity-picker>

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

@@ -18,12 +18,6 @@ import "../ha-icon-button";
 import "../ha-svg-icon";
 import "./state-badge";
 import { caseInsensitiveStringCompare } from "../../common/string/compare";
-import { showHelperDetailDialog } from "../../panels/config/helpers/show-dialog-helper-detail";
-import { domainToName } from "../../data/integration";
-import {
-  isHelperDomain,
-  HelperDomain,
-} from "../../panels/config/helpers/const";
 
 interface HassEntityWithCachedName extends HassEntity, ScorableTextItem {
   friendly_name: string;
@@ -31,8 +25,6 @@ interface HassEntityWithCachedName extends HassEntity, ScorableTextItem {
 
 export type HaEntityPickerEntityFilterFunc = (entity: HassEntity) => boolean;
 
-const CREATE_ID = "___create-new-entity___";
-
 @customElement("ha-entity-picker")
 export class HaEntityPicker extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -52,8 +44,6 @@ export class HaEntityPicker extends LitElement {
 
   @property() public helper?: string;
 
-  @property({ type: Array }) public createDomains?: string[];
-
   /**
    * Show entities from specific domains.
    * @type {Array}
@@ -140,11 +130,7 @@ export class HaEntityPicker extends LitElement {
           ></state-badge>`
         : ""}
       <span>${item.friendly_name}</span>
-      <span slot="secondary"
+      <span slot="secondary">${item.entity_id}</span>
-        >${item.entity_id.startsWith(CREATE_ID)
-          ? this.hass.localize("ui.components.entity.entity-picker.new_entity")
-          : item.entity_id}</span
-      >
     </ha-list-item>`;
 
   private _getStates = memoizeOne(
@@ -157,8 +143,7 @@ export class HaEntityPicker extends LitElement {
       includeDeviceClasses: this["includeDeviceClasses"],
       includeUnitOfMeasurement: this["includeUnitOfMeasurement"],
       includeEntities: this["includeEntities"],
-      excludeEntities: this["excludeEntities"],
+      excludeEntities: this["excludeEntities"]
-      createDomains: this["createDomains"]
     ): HassEntityWithCachedName[] => {
       let states: HassEntityWithCachedName[] = [];
 
@@ -167,34 +152,6 @@ export class HaEntityPicker extends LitElement {
       }
       let entityIds = Object.keys(hass.states);
 
-      const createItems = createDomains?.length
-        ? createDomains.map((domain) => {
-            const newFriendlyName = hass.localize(
-              "ui.components.entity.entity-picker.create_helper",
-              {
-                domain: isHelperDomain(domain)
-                  ? hass.localize(
-                      `ui.panel.config.helpers.types.${domain as HelperDomain}`
-                    )
-                  : domainToName(hass.localize, domain),
-              }
-            );
-
-            return {
-              entity_id: CREATE_ID + domain,
-              state: "on",
-              last_changed: "",
-              last_updated: "",
-              context: { id: "", user_id: null, parent_id: null },
-              friendly_name: newFriendlyName,
-              attributes: {
-                icon: "mdi:plus",
-              },
-              strings: [domain, newFriendlyName],
-            };
-          })
-        : [];
-
       if (!entityIds.length) {
         return [
           {
@@ -214,7 +171,6 @@ export class HaEntityPicker extends LitElement {
             },
             strings: [],
           },
-          ...createItems,
         ];
       }
 
@@ -325,14 +281,9 @@ export class HaEntityPicker extends LitElement {
             },
             strings: [],
           },
-          ...createItems,
         ];
       }
 
-      if (createItems?.length) {
-        states.push(...createItems);
-      }
-
       return states;
     }
   );
@@ -359,18 +310,13 @@ export class HaEntityPicker extends LitElement {
         this.includeDeviceClasses,
         this.includeUnitOfMeasurement,
         this.includeEntities,
-        this.excludeEntities,
+        this.excludeEntities
-        this.createDomains
       );
       if (this._initedStates) {
         this.comboBox.filteredItems = this._states;
       }
       this._initedStates = true;
     }
-
-    if (changedProps.has("createDomains") && this.createDomains?.length) {
-      this.hass.loadFragmentTranslation("config");
-    }
   }
 
   protected render(): TemplateResult {
@@ -405,21 +351,9 @@ export class HaEntityPicker extends LitElement {
     this._opened = ev.detail.value;
   }
 
-  private _valueChanged(ev: ValueChangedEvent<string | undefined>) {
+  private _valueChanged(ev: ValueChangedEvent<string>) {
     ev.stopPropagation();
-    const newValue = ev.detail.value?.trim();
+    const newValue = ev.detail.value;
-
-    if (newValue && newValue.startsWith(CREATE_ID)) {
-      const domain = newValue.substring(CREATE_ID.length);
-      showHelperDetailDialog(this, {
-        domain,
-        dialogClosedCallback: (item) => {
-          if (item.entityId) this._setValue(item.entityId);
-        },
-      });
-      return;
-    }
-
     if (newValue !== this._value) {
       this._setValue(newValue);
     }
@@ -427,13 +361,13 @@ export class HaEntityPicker extends LitElement {
 
   private _filterChanged(ev: CustomEvent): void {
     const target = ev.target as HaComboBox;
-    const filterString = ev.detail.value.trim().toLowerCase();
+    const filterString = ev.detail.value.toLowerCase();
     target.filteredItems = filterString.length
       ? fuzzyFilterSort<HassEntityWithCachedName>(filterString, this._states)
       : this._states;
   }
 
-  private _setValue(value: string | undefined) {
+  private _setValue(value: string) {
     this.value = value;
     setTimeout(() => {
       fireEvent(this, "value-changed", { value });

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

@@ -1,9 +1,8 @@
 import { mdiTextureBox } from "@mdi/js";
 import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
-import { LitElement, PropertyValues, TemplateResult, html, nothing } from "lit";
+import { LitElement, PropertyValues, TemplateResult, html } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
-import { styleMap } from "lit/directives/style-map";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
 import { computeDomain } from "../common/entity/compute_domain";
@@ -12,7 +11,6 @@ import {
   ScorableTextItem,
   fuzzyFilterSort,
 } from "../common/string/filter/sequence-matching";
-import { computeRTL } from "../common/util/compute_rtl";
 import { AreaRegistryEntry } from "../data/area_registry";
 import {
   DeviceEntityDisplayLookup,
@@ -34,7 +32,6 @@ import "./ha-floor-icon";
 import "./ha-icon-button";
 import "./ha-list-item";
 import "./ha-svg-icon";
-import "./ha-tree-indicator";
 
 type ScorableAreaFloorEntry = ScorableTextItem & FloorAreaEntry;
 
@@ -44,11 +41,28 @@ interface FloorAreaEntry {
   icon: string | null;
   strings: string[];
   type: "floor" | "area";
-  level: number | null;
   hasFloor?: boolean;
-  lastArea?: boolean;
+  level: number | null;
 }
 
+const rowRenderer: ComboBoxLitRenderer<FloorAreaEntry> = (item) =>
+  html`<ha-list-item
+    graphic="icon"
+    style=${item.type === "area" && item.hasFloor
+      ? "--mdc-list-side-padding-left: 48px;"
+      : ""}
+  >
+    ${item.type === "floor"
+      ? html`<ha-floor-icon slot="graphic" .floor=${item}></ha-floor-icon>`
+      : item.icon
+        ? html`<ha-icon slot="graphic" .icon=${item.icon}></ha-icon>`
+        : html`<ha-svg-icon
+            slot="graphic"
+            .path=${mdiTextureBox}
+          ></ha-svg-icon>`}
+    ${item.name}
+  </ha-list-item>`;
+
 @customElement("ha-area-floor-picker")
 export class HaAreaFloorPicker extends SubscribeMixin(LitElement) {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -137,44 +151,6 @@ export class HaAreaFloorPicker extends SubscribeMixin(LitElement) {
     await this.comboBox?.focus();
   }
 
-  private _rowRenderer: ComboBoxLitRenderer<FloorAreaEntry> = (item) => {
-    const rtl = computeRTL(this.hass);
-    return html`
-      <ha-list-item
-        graphic="icon"
-        style=${item.type === "area" && item.hasFloor
-          ? rtl
-            ? "--mdc-list-side-padding-right: 48px;"
-            : "--mdc-list-side-padding-left: 48px;"
-          : ""}
-      >
-        ${item.type === "area" && item.hasFloor
-          ? html`<ha-tree-indicator
-              style=${styleMap({
-                width: "48px",
-                position: "absolute",
-                top: "0px",
-                left: rtl ? undefined : "8px",
-                right: rtl ? "8px" : undefined,
-                transform: rtl ? "scaleX(-1)" : "",
-              })}
-              .end=${item.lastArea}
-              slot="graphic"
-            ></ha-tree-indicator>`
-          : nothing}
-        ${item.type === "floor"
-          ? html`<ha-floor-icon slot="graphic" .floor=${item}></ha-floor-icon>`
-          : item.icon
-            ? html`<ha-icon slot="graphic" .icon=${item.icon}></ha-icon>`
-            : html`<ha-svg-icon
-                slot="graphic"
-                .path=${mdiTextureBox}
-              ></ha-svg-icon>`}
-        ${item.name}
-      </ha-list-item>
-    `;
-  };
-
   private _getAreas = memoizeOne(
     (
       floors: FloorRegistryEntry[],
@@ -388,7 +364,7 @@ export class HaAreaFloorPicker extends SubscribeMixin(LitElement) {
           });
         }
         output.push(
-          ...floorAreas.map((area, index, array) => ({
+          ...floorAreas.map((area) => ({
             id: area.area_id,
             type: "area" as const,
             name: area.name,
@@ -396,7 +372,6 @@ export class HaAreaFloorPicker extends SubscribeMixin(LitElement) {
             strings: [area.area_id, ...area.aliases, area.name],
             hasFloor: true,
             level: null,
-            lastArea: index === array.length - 1,
           }))
         );
       });
@@ -470,7 +445,7 @@ export class HaAreaFloorPicker extends SubscribeMixin(LitElement) {
         .placeholder=${this.placeholder
           ? this.hass.areas[this.placeholder]?.name
           : undefined}
-        .renderer=${this._rowRenderer}
+        .renderer=${rowRenderer}
         @filter-changed=${this._filterChanged}
         @opened-changed=${this._openedChanged}
         @value-changed=${this._areaChanged}

src/components/ha-area-picker.ts

@@ -428,8 +428,6 @@ export class HaAreaPicker extends LitElement {
 
     (ev.target as any).value = this._value;
 
-    this.hass.loadFragmentTranslation("config");
-
     showAreaRegistryDetailDialog(this, {
       suggestedName: newValue === ADD_NEW_SUGGESTION_ID ? this._suggestion : "",
       createEntry: async (values) => {

src/components/ha-card.ts

@@ -14,8 +14,6 @@ export class HaCard extends LitElement {
           --ha-card-background,
           var(--card-background-color, white)
         );
-        -webkit-backdrop-filter: var(--ha-card-backdrop-filter, none);
-        backdrop-filter: var(--ha-card-backdrop-filter, none);
         box-shadow: var(--ha-card-box-shadow, none);
         box-sizing: border-box;
         border-radius: var(--ha-card-border-radius, 12px);

src/components/ha-circular-progress.ts

@@ -1,5 +1,6 @@
+import "element-internals-polyfill";
 import { MdCircularProgress } from "@material/web/progress/circular-progress";
-import { PropertyValues, css } from "lit";
+import { CSSResult, PropertyValues, css } from "lit";
 import { customElement, property } from "lit/decorators";
 
 @customElement("ha-circular-progress")
@@ -31,15 +32,17 @@ export class HaCircularProgress extends MdCircularProgress {
     }
   }
 
-  static override styles = [
+  static get styles(): CSSResult[] {
-    ...super.styles,
+    return [
-    css`
+      ...super.styles,
-      :host {
+      css`
-        --md-sys-color-primary: var(--primary-color);
+        :host {
-        --md-circular-progress-size: 48px;
+          --md-sys-color-primary: var(--primary-color);
-      }
+          --md-circular-progress-size: 48px;
-    `,
+        }
-  ];
+      `,
+    ];
+  }
 }
 
 declare global {

src/components/ha-control-button.ts

@@ -1,7 +1,14 @@
+import { Ripple } from "@material/mwc-ripple";
+import { RippleHandlers } from "@material/mwc-ripple/ripple-handlers";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property } from "lit/decorators";
+import {
+  customElement,
+  eventOptions,
+  property,
+  queryAsync,
+  state,
+} from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
-import "./ha-ripple";
 
 @customElement("ha-control-button")
 export class HaControlButton extends LitElement {
@@ -9,6 +16,10 @@ export class HaControlButton extends LitElement {
 
   @property() public label?: string;
 
+  @queryAsync("mwc-ripple") private _ripple!: Promise<Ripple | null>;
+
+  @state() private _shouldRenderRipple = false;
+
   protected render(): TemplateResult {
     return html`
       <button
@@ -17,13 +28,54 @@ export class HaControlButton extends LitElement {
         aria-label=${ifDefined(this.label)}
         title=${ifDefined(this.label)}
         .disabled=${Boolean(this.disabled)}
+        @focus=${this.handleRippleFocus}
+        @blur=${this.handleRippleBlur}
+        @mousedown=${this.handleRippleActivate}
+        @mouseup=${this.handleRippleDeactivate}
+        @mouseenter=${this.handleRippleMouseEnter}
+        @mouseleave=${this.handleRippleMouseLeave}
+        @touchstart=${this.handleRippleActivate}
+        @touchend=${this.handleRippleDeactivate}
+        @touchcancel=${this.handleRippleDeactivate}
       >
         <slot></slot>
-        <ha-ripple .disabled=${this.disabled}></ha-ripple>
+        ${this._shouldRenderRipple && !this.disabled
+          ? html`<mwc-ripple></mwc-ripple>`
+          : ""}
       </button>
     `;
   }
 
+  private _rippleHandlers: RippleHandlers = new RippleHandlers(() => {
+    this._shouldRenderRipple = true;
+    return this._ripple;
+  });
+
+  @eventOptions({ passive: true })
+  private handleRippleActivate(evt?: Event) {
+    this._rippleHandlers.startPress(evt);
+  }
+
+  private handleRippleDeactivate() {
+    this._rippleHandlers.endPress();
+  }
+
+  private handleRippleMouseEnter() {
+    this._rippleHandlers.startHover();
+  }
+
+  private handleRippleMouseLeave() {
+    this._rippleHandlers.endHover();
+  }
+
+  private handleRippleFocus() {
+    this._rippleHandlers.startFocus();
+  }
+
+  private handleRippleBlur() {
+    this._rippleHandlers.endFocus();
+  }
+
   static get styles(): CSSResultGroup {
     return css`
       :host {
@@ -34,7 +86,6 @@ export class HaControlButton extends LitElement {
         --control-button-border-radius: 10px;
         --control-button-padding: 8px;
         --mdc-icon-size: 20px;
-        --ha-ripple-color: var(--secondary-text-color);
         color: var(--primary-text-color);
         width: 40px;
         height: 40px;
@@ -62,14 +113,12 @@ export class HaControlButton extends LitElement {
         outline: none;
         overflow: hidden;
         background: none;
+        --mdc-ripple-color: var(--control-button-background-color);
         /* For safari border-radius overflow */
         z-index: 0;
         font-size: inherit;
         color: inherit;
       }
-      .button:focus-visible {
-        --control-button-background-opacity: 0.4;
-      }
       .button::before {
         content: "";
         position: absolute;

src/components/ha-control-select-menu.ts

@@ -1,14 +1,22 @@
+import { Ripple } from "@material/mwc-ripple";
+import { RippleHandlers } from "@material/mwc-ripple/ripple-handlers";
 import { SelectBase } from "@material/mwc-select/mwc-select-base";
 import { mdiMenuDown } from "@mdi/js";
 import { css, html, nothing } from "lit";
-import { customElement, property, query } from "lit/decorators";
+import {
+  customElement,
+  eventOptions,
+  property,
+  query,
+  queryAsync,
+  state,
+} from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { ifDefined } from "lit/directives/if-defined";
 import { debounce } from "../common/util/debounce";
 import { nextRender } from "../common/util/render-status";
 import "./ha-icon";
 import type { HaIcon } from "./ha-icon";
-import "./ha-ripple";
 import "./ha-svg-icon";
 import type { HaSvgIcon } from "./ha-svg-icon";
 
@@ -24,6 +32,10 @@ export class HaControlSelectMenu extends SelectBase {
   @property({ type: Boolean, attribute: "hide-label" })
   public hideLabel = false;
 
+  @queryAsync("mwc-ripple") private _ripple!: Promise<Ripple | null>;
+
+  @state() private _shouldRenderRipple = false;
+
   public override render() {
     const classes = {
       "select-disabled": this.disabled,
@@ -57,10 +69,17 @@ export class HaControlSelectMenu extends SelectBase {
           aria-labelledby=${ifDefined(labelledby)}
           aria-label=${ifDefined(labelAttribute)}
           aria-required=${this.required}
+          @click=${this.onClick}
           @focus=${this.onFocus}
           @blur=${this.onBlur}
-          @click=${this.onClick}
           @keydown=${this.onKeydown}
+          @mousedown=${this.handleRippleActivate}
+          @mouseup=${this.handleRippleDeactivate}
+          @mouseenter=${this.handleRippleMouseEnter}
+          @mouseleave=${this.handleRippleMouseLeave}
+          @touchstart=${this.handleRippleActivate}
+          @touchend=${this.handleRippleDeactivate}
+          @touchcancel=${this.handleRippleDeactivate}
         >
           ${this.renderIcon()}
           <div class="content">
@@ -72,7 +91,9 @@ export class HaControlSelectMenu extends SelectBase {
               : nothing}
           </div>
           ${this.renderArrow()}
-          <ha-ripple .disabled=${this.disabled}></ha-ripple>
+          ${this._shouldRenderRipple && !this.disabled
+            ? html` <mwc-ripple></mwc-ripple> `
+            : nothing}
         </div>
         ${this.renderMenu()}
       </div>
@@ -83,7 +104,7 @@ export class HaControlSelectMenu extends SelectBase {
     if (!this.showArrow) return nothing;
 
     return html`
-      <div class="icon arrow">
+      <div class="icon">
         <ha-svg-icon .path=${mdiMenuDown}></ha-svg-icon>
       </div>
     `;
@@ -114,6 +135,46 @@ export class HaControlSelectMenu extends SelectBase {
     `;
   }
 
+  protected onFocus() {
+    this.handleRippleFocus();
+    super.onFocus();
+  }
+
+  protected onBlur() {
+    this.handleRippleBlur();
+    super.onBlur();
+  }
+
+  private _rippleHandlers: RippleHandlers = new RippleHandlers(() => {
+    this._shouldRenderRipple = true;
+    return this._ripple;
+  });
+
+  @eventOptions({ passive: true })
+  private handleRippleActivate(evt?: Event) {
+    this._rippleHandlers.startPress(evt);
+  }
+
+  private handleRippleDeactivate() {
+    this._rippleHandlers.endPress();
+  }
+
+  private handleRippleMouseEnter() {
+    this._rippleHandlers.startHover();
+  }
+
+  private handleRippleMouseLeave() {
+    this._rippleHandlers.endHover();
+  }
+
+  private handleRippleFocus() {
+    this._rippleHandlers.startFocus();
+  }
+
+  private handleRippleBlur() {
+    this._rippleHandlers.endFocus();
+  }
+
   connectedCallback() {
     super.connectedCallback();
     window.addEventListener("translations-updated", this._translationsUpdated);
@@ -143,7 +204,6 @@ export class HaControlSelectMenu extends SelectBase {
         --control-select-menu-height: 48px;
         --control-select-menu-padding: 6px 10px;
         --mdc-icon-size: 20px;
-        --ha-ripple-color: var(--secondary-text-color);
         font-size: 14px;
         line-height: 1.4;
         width: auto;
@@ -164,6 +224,7 @@ export class HaControlSelectMenu extends SelectBase {
         outline: none;
         overflow: hidden;
         background: none;
+        --mdc-ripple-color: var(--control-select-menu-background-color);
         /* For safari border-radius overflow */
         z-index: 0;
         transition: color 180ms ease-in-out;
@@ -179,8 +240,7 @@ export class HaControlSelectMenu extends SelectBase {
         flex-direction: column;
         align-items: flex-start;
         justify-content: center;
-        width: 0;
+        flex: 1;
-        flex-grow: 1;
         overflow: hidden;
       }
 
@@ -193,13 +253,6 @@ export class HaControlSelectMenu extends SelectBase {
         margin: auto;
       }
 
-      .arrow {
-        margin-left: -10px;
-        margin-inline-end: initial;
-        margin-inline-start: -10px;
-        direction: var(--direction);
-      }
-
       .label {
         font-size: 0.85em;
         letter-spacing: 0.4px;
@@ -211,10 +264,6 @@ export class HaControlSelectMenu extends SelectBase {
         letter-spacing: inherit;
       }
 
-      .select-anchor:focus-visible {
-        --control-select-menu-background-opacity: 0.4;
-      }
-
       .select-anchor::before {
         content: "";
         position: absolute;

src/components/ha-control-slider.ts

@@ -67,9 +67,6 @@ export class HaControlSlider extends LitElement {
   @property({ attribute: "tooltip-mode" })
   public tooltipMode: TooltipMode = "interaction";
 
-  @property({ attribute: "touch-action" })
-  public touchAction?: string;
-
   @property({ type: Number })
   public value?: number;
 
@@ -155,7 +152,7 @@ export class HaControlSlider extends LitElement {
   setupListeners() {
     if (this.slider && !this._mc) {
       this._mc = new Manager(this.slider, {
-        touchAction: this.touchAction ?? (this.vertical ? "pan-x" : "pan-y"),
+        touchAction: this.vertical ? "pan-x" : "pan-y",
       });
       this._mc.add(
         new Pan({

src/components/ha-control-switch.ts

@@ -33,9 +33,6 @@ export class HaControlSwitch extends LitElement {
   // SVG icon path (if you need a non SVG icon instead, use the provided off icon slot to pass an <ha-icon slot="icon-off"> in)
   @property({ type: String }) pathOff?: string;
 
-  @property({ attribute: "touch-action" })
-  public touchAction?: string;
-
   private _mc?: HammerManager;
 
   protected firstUpdated(changedProperties: PropertyValues): void {
@@ -76,7 +73,7 @@ export class HaControlSwitch extends LitElement {
   setupListeners() {
     if (this.switch && !this._mc) {
       this._mc = new Manager(this.switch, {
-        touchAction: this.touchAction ?? (this.vertical ? "pan-x" : "pan-y"),
+        touchAction: this.vertical ? "pan-x" : "pan-y",
       });
       this._mc.add(
         new Swipe({

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

@@ -19,7 +19,6 @@ import { HomeAssistant } from "../types";
 import "./ha-list-item";
 import "./ha-select";
 import type { HaSelect } from "./ha-select";
-import { getExtendedEntityRegistryEntry } from "../data/entity_registry";
 
 const NONE = "__NONE_OPTION__";
 
@@ -108,23 +107,13 @@ export class HaConversationAgentPicker extends LitElement {
   }
 
   private async _maybeFetchConfigEntry() {
-    if (!this.value || !(this.value in this.hass.entities)) {
+    if (!this.value || this.value === "homeassistant") {
       this._configEntry = undefined;
       return;
     }
     try {
-      const regEntry = await getExtendedEntityRegistryEntry(
-        this.hass,
-        this.value
-      );
-
-      if (!regEntry.config_entry_id) {
-        this._configEntry = undefined;
-        return;
-      }
-
       this._configEntry = (
-        await getConfigEntry(this.hass, regEntry.config_entry_id)
+        await getConfigEntry(this.hass, this.value)
       ).config_entry;
     } catch (err) {
       this._configEntry = undefined;

src/components/ha-dialog.ts

@@ -75,14 +75,8 @@ export class HaDialog extends DialogBase {
           var(--divider-color)
         );
         z-index: var(--dialog-z-index, 8);
-        -webkit-backdrop-filter: var(
+        -webkit-backdrop-filter: var(--dialog-backdrop-filter, none);
-          --ha-dialog-scrim-backdrop-filter,
+        backdrop-filter: var(--dialog-backdrop-filter, none);
-          var(--dialog-backdrop-filter, none)
-        );
-        backdrop-filter: var(
-          --ha-dialog-scrim-backdrop-filter,
-          var(--dialog-backdrop-filter, none)
-        );
         --mdc-dialog-box-shadow: var(--dialog-box-shadow, none);
         --mdc-typography-headline6-font-weight: 400;
         --mdc-typography-headline6-font-size: 1.574rem;
@@ -125,12 +119,6 @@ export class HaDialog extends DialogBase {
         margin-top: var(--dialog-surface-margin-top);
         min-height: var(--mdc-dialog-min-height, auto);
         border-radius: var(--ha-dialog-border-radius, 28px);
-        -webkit-backdrop-filter: var(--ha-dialog-surface-backdrop-filter, none);
-        backdrop-filter: var(--ha-dialog-surface-backdrop-filter, none);
-        background: var(
-          --ha-dialog-surface-background,
-          var(--mdc-theme-surface, #fff)
-        );
       }
       :host([flexContent]) .mdc-dialog .mdc-dialog__content {
         display: flex;

src/components/ha-filter-blueprints.ts

@@ -1,13 +1,12 @@
 import { SelectedDetail } from "@material/mwc-list";
 import "@material/mwc-menu/mwc-menu-surface";
-import { mdiFilterVariantRemove } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
-import { Blueprints, fetchBlueprints } from "../data/blueprint";
 import { findRelated, RelatedResult } from "../data/search";
-import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant } from "../types";
+import { haStyleScrollbar } from "../resources/styles";
+import { Blueprints, fetchBlueprints } from "../data/blueprint";
 
 @customElement("ha-filter-blueprints")
 export class HaFilterBlueprints extends LitElement {
@@ -36,11 +35,7 @@ export class HaFilterBlueprints extends LitElement {
         <div slot="header" class="header">
           ${this.hass.localize("ui.panel.config.blueprint.caption")}
           ${this.value?.length
-            ? html`<div class="badge">${this.value?.length}</div>
+            ? html`<div class="badge">${this.value?.length}</div>`
-                <ha-icon-button
-                  .path=${mdiFilterVariantRemove}
-                  @click=${this._clearFilter}
-                ></ha-icon-button>`
             : nothing}
         </div>
         ${this._blueprints && this._shouldRender
@@ -133,15 +128,6 @@ export class HaFilterBlueprints extends LitElement {
     });
   }
 
-  private _clearFilter(ev) {
-    ev.preventDefault();
-    this.value = undefined;
-    fireEvent(this, "data-table-filter-changed", {
-      value: undefined,
-      items: undefined,
-    });
-  }
-
   static get styles(): CSSResultGroup {
     return [
       haStyleScrollbar,
@@ -161,10 +147,6 @@ export class HaFilterBlueprints extends LitElement {
           display: flex;
           align-items: center;
         }
-        .header ha-icon-button {
-          margin-inline-start: auto;
-          margin-inline-end: 8px;
-        }
         .badge {
           display: inline-block;
           margin-left: 8px;

src/components/ha-filter-categories.ts

@@ -2,7 +2,6 @@ import { ActionDetail, SelectedDetail } from "@material/mwc-list";
 import {
   mdiDelete,
   mdiDotsVertical,
-  mdiFilterVariantRemove,
   mdiPencil,
   mdiPlus,
   mdiTag,
@@ -69,11 +68,7 @@ export class HaFilterCategories extends SubscribeMixin(LitElement) {
         <div slot="header" class="header">
           ${this.hass.localize("ui.panel.config.category.caption")}
           ${this.value?.length
-            ? html`<div class="badge">${this.value?.length}</div>
+            ? html`<div class="badge">${this.value?.length}</div>`
-                <ha-icon-button
-                  .path=${mdiFilterVariantRemove}
-                  @click=${this._clearFilter}
-                ></ha-icon-button>`
             : nothing}
         </div>
         ${this._shouldRender
@@ -259,15 +254,6 @@ export class HaFilterCategories extends SubscribeMixin(LitElement) {
     });
   }
 
-  private _clearFilter(ev) {
-    ev.preventDefault();
-    this.value = undefined;
-    fireEvent(this, "data-table-filter-changed", {
-      value: undefined,
-      items: undefined,
-    });
-  }
-
   static get styles(): CSSResultGroup {
     return [
       haStyleScrollbar,
@@ -288,10 +274,6 @@ export class HaFilterCategories extends SubscribeMixin(LitElement) {
           display: flex;
           align-items: center;
         }
-        .header ha-icon-button {
-          margin-inline-start: auto;
-          margin-inline-end: 8px;
-        }
         .badge {
           display: inline-block;
           margin-left: 8px;

src/components/ha-filter-devices.ts

@@ -1,4 +1,3 @@
-import { mdiFilterVariantRemove } from "@mdi/js";
 import {
   css,
   CSSResultGroup,
@@ -14,11 +13,10 @@ import { stringCompare } from "../common/string/compare";
 import { computeDeviceName } from "../data/device_registry";
 import { findRelated, RelatedResult } from "../data/search";
 import { haStyleScrollbar } from "../resources/styles";
-import { loadVirtualizer } from "../resources/virtualizer";
 import type { HomeAssistant } from "../types";
-import "./ha-check-list-item";
 import "./ha-expansion-panel";
-import "./search-input-outlined";
+import "./ha-check-list-item";
+import { loadVirtualizer } from "../resources/virtualizer";
 
 @customElement("ha-filter-devices")
 export class HaFilterDevices extends LitElement {
@@ -34,8 +32,6 @@ export class HaFilterDevices extends LitElement {
 
   @state() private _shouldRender = false;
 
-  @state() private _filter?: string;
-
   public willUpdate(properties: PropertyValues) {
     super.willUpdate(properties);
 
@@ -55,33 +51,19 @@ export class HaFilterDevices extends LitElement {
         <div slot="header" class="header">
           ${this.hass.localize("ui.panel.config.devices.caption")}
           ${this.value?.length
-            ? html`<div class="badge">${this.value?.length}</div>
+            ? html`<div class="badge">${this.value?.length}</div>`
-                <ha-icon-button
-                  .path=${mdiFilterVariantRemove}
-                  @click=${this._clearFilter}
-                ></ha-icon-button>`
             : nothing}
         </div>
         ${this._shouldRender
-          ? html`<search-input-outlined
+          ? html`<mwc-list class="ha-scrollbar">
-                .hass=${this.hass}
+              <lit-virtualizer
-                .filter=${this._filter}
+                .items=${this._devices(this.hass.devices, this.value)}
-                @value-changed=${this._handleSearchChange}
+                .keyFunction=${this._keyFunction}
+                .renderItem=${this._renderItem}
+                @click=${this._handleItemClick}
               >
-              </search-input-outlined>
+              </lit-virtualizer>
-              <mwc-list class="ha-scrollbar" multi>
+            </mwc-list>`
-                <lit-virtualizer
-                  .items=${this._devices(
-                    this.hass.devices,
-                    this._filter || "",
-                    this.value
-                  )}
-                  .keyFunction=${this._keyFunction}
-                  .renderItem=${this._renderItem}
-                  @click=${this._handleItemClick}
-                >
-                </lit-virtualizer>
-              </mwc-list>`
           : nothing}
       </ha-expansion-panel>
     `;
@@ -90,14 +72,12 @@ export class HaFilterDevices extends LitElement {
   private _keyFunction = (device) => device?.id;
 
   private _renderItem = (device) =>
-    !device
+    html`<ha-check-list-item
-      ? nothing
+      .value=${device.id}
-      : html`<ha-check-list-item
+      .selected=${this.value?.includes(device.id)}
-          .value=${device.id}
+    >
-          .selected=${this.value?.includes(device.id) ?? false}
+      ${computeDeviceName(device, this.hass)}
-        >
+    </ha-check-list-item>`;
-          ${computeDeviceName(device, this.hass)}
-        </ha-check-list-item>`;
 
   private _handleItemClick(ev) {
     const listItem = ev.target.closest("ha-check-list-item");
@@ -119,7 +99,7 @@ export class HaFilterDevices extends LitElement {
       setTimeout(() => {
         if (!this.expanded) return;
         this.renderRoot.querySelector("mwc-list")!.style.height =
-          `${this.clientHeight - 49 - 32}px`; // 32px is the height of the search input
+          `${this.clientHeight - 49}px`;
       }, 300);
     }
   }
@@ -132,28 +112,16 @@ export class HaFilterDevices extends LitElement {
     this.expanded = ev.detail.expanded;
   }
 
-  private _handleSearchChange(ev: CustomEvent) {
+  private _devices = memoizeOne((devices: HomeAssistant["devices"], _value) => {
-    this._filter = ev.detail.value.toLowerCase();
+    const values = Object.values(devices);
-  }
+    return values.sort((a, b) =>
-
+      stringCompare(
-  private _devices = memoizeOne(
+        a.name_by_user || a.name || "",
-    (devices: HomeAssistant["devices"], filter: string, _value) => {
+        b.name_by_user || b.name || "",
-      const values = Object.values(devices);
+        this.hass.locale.language
-      return values
+      )
-        .filter(
+    );
-          (device) =>
+  });
-            !filter ||
-            computeDeviceName(device, this.hass).toLowerCase().includes(filter)
-        )
-        .sort((a, b) =>
-          stringCompare(
-            computeDeviceName(a, this.hass),
-            computeDeviceName(b, this.hass),
-            this.hass.locale.language
-          )
-        );
-    }
-  );
 
   private async _findRelated() {
     const relatedPromises: Promise<RelatedResult>[] = [];
@@ -190,15 +158,6 @@ export class HaFilterDevices extends LitElement {
     });
   }
 
-  private _clearFilter(ev) {
-    ev.preventDefault();
-    this.value = undefined;
-    fireEvent(this, "data-table-filter-changed", {
-      value: undefined,
-      items: undefined,
-    });
-  }
-
   static get styles(): CSSResultGroup {
     return [
       haStyleScrollbar,
@@ -219,10 +178,6 @@ export class HaFilterDevices extends LitElement {
           display: flex;
           align-items: center;
         }
-        .header ha-icon-button {
-          margin-inline-start: auto;
-          margin-inline-end: 8px;
-        }
         .badge {
           display: inline-block;
           margin-left: 8px;
@@ -242,10 +197,6 @@ export class HaFilterDevices extends LitElement {
         ha-check-list-item {
           width: 100%;
         }
-        search-input-outlined {
-          display: block;
-          padding: 0 8px;
-        }
       `,
     ];
   }

src/components/ha-filter-domains.ts

@@ -1,204 +0,0 @@
-import { mdiFilterVariantRemove } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { repeat } from "lit/directives/repeat";
-import memoizeOne from "memoize-one";
-import { fireEvent } from "../common/dom/fire_event";
-import { stringCompare } from "../common/string/compare";
-import { domainToName } from "../data/integration";
-import { haStyleScrollbar } from "../resources/styles";
-import type { HomeAssistant } from "../types";
-import "./ha-domain-icon";
-import "./search-input-outlined";
-import { computeDomain } from "../common/entity/compute_domain";
-
-@customElement("ha-filter-domains")
-export class HaFilterDomains extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public value?: string[];
-
-  @property({ type: Boolean }) public narrow = false;
-
-  @property({ type: Boolean, reflect: true }) public expanded = false;
-
-  @state() private _shouldRender = false;
-
-  @state() private _filter?: string;
-
-  protected render() {
-    return html`
-      <ha-expansion-panel
-        leftChevron
-        .expanded=${this.expanded}
-        @expanded-will-change=${this._expandedWillChange}
-        @expanded-changed=${this._expandedChanged}
-      >
-        <div slot="header" class="header">
-          ${this.hass.localize(
-            "ui.panel.config.entities.picker.headers.domain"
-          )}
-          ${this.value?.length
-            ? html`<div class="badge">${this.value?.length}</div>
-                <ha-icon-button
-                  .path=${mdiFilterVariantRemove}
-                  @click=${this._clearFilter}
-                ></ha-icon-button>`
-            : nothing}
-        </div>
-        ${this._shouldRender
-          ? html`<search-input-outlined
-                .hass=${this.hass}
-                .filter=${this._filter}
-                @value-changed=${this._handleSearchChange}
-              >
-              </search-input-outlined>
-              <mwc-list
-                class="ha-scrollbar"
-                @click=${this._handleItemClick}
-                multi
-              >
-                ${repeat(
-                  this._domains(this.hass.states, this._filter),
-                  (i) => i,
-                  (domain) =>
-                    html`<ha-check-list-item
-                      .value=${domain}
-                      .selected=${(this.value || []).includes(domain)}
-                      graphic="icon"
-                    >
-                      <ha-domain-icon
-                        slot="graphic"
-                        .hass=${this.hass}
-                        .domain=${domain}
-                        brandFallback
-                      ></ha-domain-icon>
-                      ${domainToName(this.hass.localize, domain)}
-                    </ha-check-list-item>`
-                )}
-              </mwc-list> `
-          : nothing}
-      </ha-expansion-panel>
-    `;
-  }
-
-  private _domains = memoizeOne((states, filter) => {
-    const domains = new Set<string>();
-    Object.keys(states).forEach((entityId) => {
-      domains.add(computeDomain(entityId));
-    });
-
-    return Array.from(domains.values())
-      .filter(
-        (entry) =>
-          !filter ||
-          entry.toLowerCase().includes(filter) ||
-          domainToName(this.hass.localize, entry).toLowerCase().includes(filter)
-      )
-      .sort((a, b) => stringCompare(a, b, this.hass.locale.language));
-  });
-
-  protected updated(changed) {
-    if (changed.has("expanded") && this.expanded) {
-      setTimeout(() => {
-        if (!this.expanded) return;
-        this.renderRoot.querySelector("mwc-list")!.style.height =
-          `${this.clientHeight - 49 - 32}px`; // 32px is the height of the search input
-      }, 300);
-    }
-  }
-
-  private _expandedWillChange(ev) {
-    this._shouldRender = ev.detail.expanded;
-  }
-
-  private _expandedChanged(ev) {
-    this.expanded = ev.detail.expanded;
-  }
-
-  private _handleItemClick(ev) {
-    const listItem = ev.target.closest("ha-check-list-item");
-    const value = listItem?.value;
-    if (!value) {
-      return;
-    }
-    if (this.value?.includes(value)) {
-      this.value = this.value?.filter((val) => val !== value);
-    } else {
-      this.value = [...(this.value || []), value];
-    }
-
-    listItem.selected = this.value.includes(value);
-
-    fireEvent(this, "data-table-filter-changed", {
-      value: this.value,
-      items: undefined,
-    });
-  }
-
-  private _clearFilter(ev) {
-    ev.preventDefault();
-    this.value = undefined;
-    fireEvent(this, "data-table-filter-changed", {
-      value: undefined,
-      items: undefined,
-    });
-  }
-
-  private _handleSearchChange(ev: CustomEvent) {
-    this._filter = ev.detail.value.toLowerCase();
-  }
-
-  static get styles(): CSSResultGroup {
-    return [
-      haStyleScrollbar,
-      css`
-        :host {
-          border-bottom: 1px solid var(--divider-color);
-        }
-        :host([expanded]) {
-          flex: 1;
-          height: 0;
-        }
-        ha-expansion-panel {
-          --ha-card-border-radius: 0;
-          --expansion-panel-content-padding: 0;
-        }
-        .header {
-          display: flex;
-          align-items: center;
-        }
-        .header ha-icon-button {
-          margin-inline-start: initial;
-          margin-inline-end: 8px;
-        }
-        .badge {
-          display: inline-block;
-          margin-left: 8px;
-          margin-inline-start: 8px;
-          margin-inline-end: initial;
-          min-width: 16px;
-          box-sizing: border-box;
-          border-radius: 50%;
-          font-weight: 400;
-          font-size: 11px;
-          background-color: var(--primary-color);
-          line-height: 16px;
-          text-align: center;
-          padding: 0px 2px;
-          color: var(--text-primary-color);
-        }
-        search-input-outlined {
-          display: block;
-          padding: 0 8px;
-        }
-      `,
-    ];
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-filter-domains": HaFilterDomains;
-  }
-}

src/components/ha-filter-entities.ts

@@ -1,4 +1,3 @@
-import { mdiFilterVariantRemove } from "@mdi/js";
 import {
   css,
   CSSResultGroup,
@@ -15,11 +14,10 @@ import { computeStateName } from "../common/entity/compute_state_name";
 import { stringCompare } from "../common/string/compare";
 import { findRelated, RelatedResult } from "../data/search";
 import { haStyleScrollbar } from "../resources/styles";
-import { loadVirtualizer } from "../resources/virtualizer";
 import type { HomeAssistant } from "../types";
-import "./ha-check-list-item";
 import "./ha-state-icon";
-import "./search-input-outlined";
+import "./ha-check-list-item";
+import { loadVirtualizer } from "../resources/virtualizer";
 
 @customElement("ha-filter-entities")
 export class HaFilterEntities extends LitElement {
@@ -35,8 +33,6 @@ export class HaFilterEntities extends LitElement {
 
   @state() private _shouldRender = false;
 
-  @state() private _filter?: string;
-
   public willUpdate(properties: PropertyValues) {
     super.willUpdate(properties);
 
@@ -56,27 +52,16 @@ export class HaFilterEntities extends LitElement {
         <div slot="header" class="header">
           ${this.hass.localize("ui.panel.config.entities.caption")}
           ${this.value?.length
-            ? html`<div class="badge">${this.value?.length}</div>
+            ? html`<div class="badge">${this.value?.length}</div>`
-                <ha-icon-button
-                  .path=${mdiFilterVariantRemove}
-                  @click=${this._clearFilter}
-                ></ha-icon-button>`
             : nothing}
         </div>
         ${this._shouldRender
           ? html`
-              <search-input-outlined
+              <mwc-list class="ha-scrollbar">
-                .hass=${this.hass}
-                .filter=${this._filter}
-                @value-changed=${this._handleSearchChange}
-              >
-              </search-input-outlined>
-              <mwc-list class="ha-scrollbar" multi>
                 <lit-virtualizer
                   .items=${this._entities(
                     this.hass.states,
                     this.type,
-                    this._filter || "",
                     this.value
                   )}
                   .keyFunction=${this._keyFunction}
@@ -96,7 +81,7 @@ export class HaFilterEntities extends LitElement {
       setTimeout(() => {
         if (!this.expanded) return;
         this.renderRoot.querySelector("mwc-list")!.style.height =
-          `${this.clientHeight - 49 - 32}px`; // 32px is the height of the search input
+          `${this.clientHeight - 49}px`;
       }, 300);
     }
   }
@@ -104,20 +89,18 @@ export class HaFilterEntities extends LitElement {
   private _keyFunction = (entity) => entity?.entity_id;
 
   private _renderItem = (entity) =>
-    !entity
+    html`<ha-check-list-item
-      ? nothing
+      .value=${entity.entity_id}
-      : html`<ha-check-list-item
+      .selected=${this.value?.includes(entity.entity_id)}
-          .value=${entity.entity_id}
+      graphic="icon"
-          .selected=${this.value?.includes(entity.entity_id) ?? false}
+    >
-          graphic="icon"
+      <ha-state-icon
-        >
+        slot="graphic"
-          <ha-state-icon
+        .hass=${this.hass}
-            slot="graphic"
+        .stateObj=${entity}
-            .hass=${this.hass}
+      ></ha-state-icon>
-            .stateObj=${entity}
+      ${computeStateName(entity)}
-          ></ha-state-icon>
+    </ha-check-list-item>`;
-          ${computeStateName(entity)}
-        </ha-check-list-item>`;
 
   private _handleItemClick(ev) {
     const listItem = ev.target.closest("ha-check-list-item");
@@ -142,27 +125,12 @@ export class HaFilterEntities extends LitElement {
     this.expanded = ev.detail.expanded;
   }
 
-  private _handleSearchChange(ev: CustomEvent) {
-    this._filter = ev.detail.value.toLowerCase();
-  }
-
   private _entities = memoizeOne(
-    (
+    (states: HomeAssistant["states"], type: this["type"], _value) => {
-      states: HomeAssistant["states"],
-      type: this["type"],
-      filter: string,
-      _value
-    ) => {
       const values = Object.values(states);
       return values
         .filter(
-          (entityState) =>
+          (entityState) => !type || computeStateDomain(entityState) !== type
-            (!type || computeStateDomain(entityState) !== type) &&
-            (!filter ||
-              entityState.entity_id.toLowerCase().includes(filter) ||
-              entityState.attributes.friendly_name
-                ?.toLowerCase()
-                .includes(filter))
         )
         .sort((a, b) =>
           stringCompare(
@@ -209,15 +177,6 @@ export class HaFilterEntities extends LitElement {
     });
   }
 
-  private _clearFilter(ev) {
-    ev.preventDefault();
-    this.value = undefined;
-    fireEvent(this, "data-table-filter-changed", {
-      value: undefined,
-      items: undefined,
-    });
-  }
-
   static get styles(): CSSResultGroup {
     return [
       haStyleScrollbar,
@@ -237,10 +196,6 @@ export class HaFilterEntities extends LitElement {
           display: flex;
           align-items: center;
         }
-        .header ha-icon-button {
-          margin-inline-start: auto;
-          margin-inline-end: 8px;
-        }
         .badge {
           display: inline-block;
           margin-left: 8px;
@@ -261,10 +216,6 @@ export class HaFilterEntities extends LitElement {
           --mdc-list-item-graphic-margin: 16px;
           width: 100%;
         }
-        search-input-outlined {
-          display: block;
-          padding: 0 8px;
-        }
       `,
     ];
   }

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

@@ -1,19 +1,17 @@
 import "@material/mwc-menu/mwc-menu-surface";
-import { mdiFilterVariantRemove, mdiTextureBox } from "@mdi/js";
+import { mdiTextureBox } from "@mdi/js";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
-import { CSSResultGroup, LitElement, css, html, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
 import { repeat } from "lit/directives/repeat";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
-import { computeRTL } from "../common/util/compute_rtl";
 import {
   FloorRegistryEntry,
   getFloorAreaLookup,
   subscribeFloorRegistry,
 } from "../data/floor_registry";
-import { RelatedResult, findRelated } from "../data/search";
+import { findRelated, RelatedResult } from "../data/search";
 import { SubscribeMixin } from "../mixins/subscribe-mixin";
 import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant } from "../types";
@@ -21,7 +19,6 @@ import "./ha-check-list-item";
 import "./ha-floor-icon";
 import "./ha-icon";
 import "./ha-svg-icon";
-import "./ha-tree-indicator";
 
 @customElement("ha-filter-floor-areas")
 export class HaFilterFloorAreas extends SubscribeMixin(LitElement) {
@@ -56,13 +53,9 @@ export class HaFilterFloorAreas extends SubscribeMixin(LitElement) {
           ${this.hass.localize("ui.panel.config.areas.caption")}
           ${this.value?.areas?.length || this.value?.floors?.length
             ? html`<div class="badge">
-                  ${(this.value?.areas?.length || 0) +
+                ${(this.value?.areas?.length || 0) +
-                  (this.value?.floors?.length || 0)}
+                (this.value?.floors?.length || 0)}
-                </div>
+              </div>`
-                <ha-icon-button
-                  .path=${mdiFilterVariantRemove}
-                  @click=${this._clearFilter}
-                ></ha-icon-button>`
             : nothing}
         </div>
         ${this._shouldRender
@@ -89,10 +82,8 @@ export class HaFilterFloorAreas extends SubscribeMixin(LitElement) {
                     </ha-check-list-item>
                     ${repeat(
                       floor.areas,
-                      (area, index) =>
+                      (area) => area.area_id,
-                        `${area.area_id}${index === floor.areas.length - 1 ? "___last" : ""}`,
+                      (area) => this._renderArea(area)
-                      (area, index) =>
-                        this._renderArea(area, index === floor.areas.length - 1)
                     )}
                   `
                 )}
@@ -108,37 +99,23 @@ export class HaFilterFloorAreas extends SubscribeMixin(LitElement) {
     `;
   }
 
-  private _renderArea(area, last: boolean = false) {
+  private _renderArea(area) {
-    const hasFloor = !!area.floor_id;
+    return html`<ha-check-list-item
-    return html`
+      .value=${area.area_id}
-      <ha-check-list-item
+      .selected=${this.value?.areas?.includes(area.area_id) || false}
-        .value=${area.area_id}
+      .type=${"areas"}
-        .selected=${this.value?.areas?.includes(area.area_id) || false}
+      graphic="icon"
-        .type=${"areas"}
+      class=${area.floor_id ? "floor" : ""}
-        graphic="icon"
+      @request-selected=${this._handleItemClick}
-        @request-selected=${this._handleItemClick}
+    >
-        class=${classMap({
+      ${area.icon
-          rtl: computeRTL(this.hass),
+        ? html`<ha-icon slot="graphic" .icon=${area.icon}></ha-icon>`
-          floor: hasFloor,
+        : html`<ha-svg-icon
-        })}
+            slot="graphic"
-      >
+            .path=${mdiTextureBox}
-        ${hasFloor
+          ></ha-svg-icon>`}
-          ? html`
+      ${area.name}
-              <ha-tree-indicator
+    </ha-check-list-item>`;
-                .end=${last}
-                slot="graphic"
-              ></ha-tree-indicator>
-            `
-          : nothing}
-        ${area.icon
-          ? html`<ha-icon slot="graphic" .icon=${area.icon}></ha-icon>`
-          : html`<ha-svg-icon
-              slot="graphic"
-              .path=${mdiTextureBox}
-            ></ha-svg-icon>`}
-        ${area.name}
-      </ha-check-list-item>
-    `;
   }
 
   private _handleItemClick(ev) {
@@ -261,15 +238,6 @@ export class HaFilterFloorAreas extends SubscribeMixin(LitElement) {
     });
   }
 
-  private _clearFilter(ev) {
-    ev.preventDefault();
-    this.value = undefined;
-    fireEvent(this, "data-table-filter-changed", {
-      value: undefined,
-      items: undefined,
-    });
-  }
-
   static get styles(): CSSResultGroup {
     return [
       haStyleScrollbar,
@@ -289,10 +257,6 @@ export class HaFilterFloorAreas extends SubscribeMixin(LitElement) {
           display: flex;
           align-items: center;
         }
-        .header ha-icon-button {
-          margin-inline-start: auto;
-          margin-inline-end: 8px;
-        }
         .badge {
           display: inline-block;
           margin-left: 8px;
@@ -313,26 +277,9 @@ export class HaFilterFloorAreas extends SubscribeMixin(LitElement) {
           --mdc-list-item-graphic-margin: 16px;
         }
         .floor {
-          padding-left: 48px;
+          padding-left: 32px;
-          padding-inline-start: 48px;
+          padding-inline-start: 32px;
-          padding-inline-end: 16px;
         }
-        ha-tree-indicator {
-          width: 56px;
-          position: absolute;
-          top: 0px;
-          left: 0px;
-        }
-        .rtl ha-tree-indicator {
-          right: 0px;
-          left: initial;
-          transform: scaleX(-1);
-        }
-        .subdir {
-          margin-inline-end: 8px;
-          opacity: .6;
-        }
-        .
       `,
     ];
   }

src/components/ha-filter-integrations.ts

@@ -1,4 +1,4 @@
-import { mdiFilterVariantRemove } from "@mdi/js";
+import { SelectedDetail } from "@material/mwc-list";
 import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
@@ -12,7 +12,6 @@ import {
 import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant } from "../types";
 import "./ha-domain-icon";
-import "./search-input-outlined";
 
 @customElement("ha-filter-integrations")
 export class HaFilterIntegrations extends LitElement {
@@ -28,8 +27,6 @@ export class HaFilterIntegrations extends LitElement {
 
   @state() private _shouldRender = false;
 
-  @state() private _filter?: string;
-
   protected render() {
     return html`
       <ha-expansion-panel
@@ -41,27 +38,18 @@ export class HaFilterIntegrations extends LitElement {
         <div slot="header" class="header">
           ${this.hass.localize("ui.panel.config.integrations.caption")}
           ${this.value?.length
-            ? html`<div class="badge">${this.value?.length}</div>
+            ? html`<div class="badge">${this.value?.length}</div>`
-                <ha-icon-button
-                  .path=${mdiFilterVariantRemove}
-                  @click=${this._clearFilter}
-                ></ha-icon-button>`
             : nothing}
         </div>
         ${this._manifests && this._shouldRender
-          ? html`<search-input-outlined
+          ? html`
-                .hass=${this.hass}
-                .filter=${this._filter}
-                @value-changed=${this._handleSearchChange}
-              >
-              </search-input-outlined>
               <mwc-list
-                class="ha-scrollbar"
+                @selected=${this._integrationsSelected}
-                @click=${this._handleItemClick}
                 multi
+                class="ha-scrollbar"
               >
                 ${repeat(
-                  this._integrations(this._manifests, this._filter, this.value),
+                  this._integrations(this._manifests, this.value),
                   (i) => i.domain,
                   (integration) =>
                     html`<ha-check-list-item
@@ -80,7 +68,8 @@ export class HaFilterIntegrations extends LitElement {
                       ${integration.name || integration.domain}
                     </ha-check-list-item>`
                 )}
-              </mwc-list> `
+              </mwc-list>
+            `
           : nothing}
       </ha-expansion-panel>
     `;
@@ -91,7 +80,7 @@ export class HaFilterIntegrations extends LitElement {
       setTimeout(() => {
         if (!this.expanded) return;
         this.renderRoot.querySelector("mwc-list")!.style.height =
-          `${this.clientHeight - 49 - 32}px`; // 32px is the height of the search input
+          `${this.clientHeight - 49}px`;
       }, 300);
     }
   }
@@ -109,17 +98,12 @@ export class HaFilterIntegrations extends LitElement {
   }
 
   private _integrations = memoizeOne(
-    (manifest: IntegrationManifest[], filter: string | undefined, _value) =>
+    (manifest: IntegrationManifest[], _value) =>
       manifest
         .filter(
           (mnfst) =>
-            (!mnfst.integration_type ||
+            !mnfst.integration_type ||
-              !["entity", "system", "hardware"].includes(
+            !["entity", "system", "hardware"].includes(mnfst.integration_type)
-                mnfst.integration_type
-              )) &&
-            (!filter ||
-              mnfst.name.toLowerCase().includes(filter) ||
-              mnfst.domain.toLowerCase().includes(filter))
         )
         .sort((a, b) =>
           stringCompare(
@@ -130,38 +114,34 @@ export class HaFilterIntegrations extends LitElement {
         )
   );
 
-  private _handleItemClick(ev) {
+  private async _integrationsSelected(
-    const listItem = ev.target.closest("ha-check-list-item");
+    ev: CustomEvent<SelectedDetail<Set<number>>>
-    const value = listItem?.value;
+  ) {
-    if (!value) {
+    const integrations = this._integrations(this._manifests!, this.value);
+
+    if (!ev.detail.index.size) {
+      fireEvent(this, "data-table-filter-changed", {
+        value: [],
+        items: undefined,
+      });
+      this.value = [];
       return;
     }
-    if (this.value?.includes(value)) {
+
-      this.value = this.value?.filter((val) => val !== value);
+    const value: string[] = [];
-    } else {
+
-      this.value = [...(this.value || []), value];
+    for (const index of ev.detail.index) {
+      const domain = integrations[index].domain;
+      value.push(domain);
     }
-    listItem.selected = this.value?.includes(value);
+    this.value = value;
 
     fireEvent(this, "data-table-filter-changed", {
-      value: this.value,
+      value,
       items: undefined,
     });
   }
 
-  private _clearFilter(ev) {
-    ev.preventDefault();
-    this.value = undefined;
-    fireEvent(this, "data-table-filter-changed", {
-      value: undefined,
-      items: undefined,
-    });
-  }
-
-  private _handleSearchChange(ev: CustomEvent) {
-    this._filter = ev.detail.value.toLowerCase();
-  }
-
   static get styles(): CSSResultGroup {
     return [
       haStyleScrollbar,
@@ -181,10 +161,6 @@ export class HaFilterIntegrations extends LitElement {
           display: flex;
           align-items: center;
         }
-        .header ha-icon-button {
-          margin-inline-start: auto;
-          margin-inline-end: 8px;
-        }
         .badge {
           display: inline-block;
           margin-left: 8px;
@@ -201,10 +177,6 @@ export class HaFilterIntegrations extends LitElement {
           padding: 0px 2px;
           color: var(--text-primary-color);
         }
-        search-input-outlined {
-          display: block;
-          padding: 0 8px;
-        }
       `,
     ];
   }

src/components/ha-filter-labels.ts

@@ -1,18 +1,19 @@
 import { SelectedDetail } from "@material/mwc-list";
 import "@material/mwc-menu/mwc-menu-surface";
-import { mdiCog, mdiFilterVariantRemove } from "@mdi/js";
+import { mdiPlus } from "@mdi/js";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { CSSResultGroup, LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
 import { computeCssColor } from "../common/color/compute-color";
 import { fireEvent } from "../common/dom/fire_event";
-import { navigate } from "../common/navigate";
 import {
   LabelRegistryEntry,
+  createLabelRegistryEntry,
   subscribeLabelRegistry,
 } from "../data/label_registry";
 import { SubscribeMixin } from "../mixins/subscribe-mixin";
+import { showLabelDetailDialog } from "../panels/config/labels/show-dialog-label-detail";
 import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant } from "../types";
 import "./ha-check-list-item";
@@ -53,11 +54,7 @@ export class HaFilterLabels extends SubscribeMixin(LitElement) {
         <div slot="header" class="header">
           ${this.hass.localize("ui.panel.config.labels.caption")}
           ${this.value?.length
-            ? html`<div class="badge">${this.value?.length}</div>
+            ? html`<div class="badge">${this.value?.length}</div>`
-                <ha-icon-button
-                  .path=${mdiFilterVariantRemove}
-                  @click=${this._clearFilter}
-                ></ha-icon-button>`
             : nothing}
         </div>
         ${this._shouldRender
@@ -98,11 +95,11 @@ export class HaFilterLabels extends SubscribeMixin(LitElement) {
       ${this.expanded
         ? html`<ha-list-item
             graphic="icon"
-            @click=${this._manageLabels}
+            @click=${this._addLabel}
             class="add"
           >
-            <ha-svg-icon slot="graphic" .path=${mdiCog}></ha-svg-icon>
+            <ha-svg-icon slot="graphic" .path=${mdiPlus}></ha-svg-icon>
-            ${this.hass.localize("ui.panel.config.labels.manage_labels")}
+            ${this.hass.localize("ui.panel.config.labels.add_label")}
           </ha-list-item>`
         : nothing}
     `;
@@ -118,8 +115,10 @@ export class HaFilterLabels extends SubscribeMixin(LitElement) {
     }
   }
 
-  private _manageLabels() {
+  private _addLabel() {
-    navigate("/config/labels");
+    showLabelDetailDialog(this, {
+      createEntry: (values) => createLabelRegistryEntry(this.hass, values),
+    });
   }
 
   private _expandedWillChange(ev) {
@@ -154,15 +153,6 @@ export class HaFilterLabels extends SubscribeMixin(LitElement) {
     });
   }
 
-  private _clearFilter(ev) {
-    ev.preventDefault();
-    this.value = undefined;
-    fireEvent(this, "data-table-filter-changed", {
-      value: undefined,
-      items: undefined,
-    });
-  }
-
   static get styles(): CSSResultGroup {
     return [
       haStyleScrollbar,
@@ -183,10 +173,6 @@ export class HaFilterLabels extends SubscribeMixin(LitElement) {
           display: flex;
           align-items: center;
         }
-        .header ha-icon-button {
-          margin-inline-start: auto;
-          margin-inline-end: 8px;
-        }
         .badge {
           display: inline-block;
           margin-left: 8px;

src/components/ha-filter-states.ts

@@ -1,12 +1,11 @@
 import { SelectedDetail } from "@material/mwc-list";
-import { mdiFilterVariantRemove } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant } from "../types";
-import "./ha-check-list-item";
 import "./ha-expansion-panel";
+import "./ha-check-list-item";
 import "./ha-icon";
 
 @customElement("ha-filter-states")
@@ -44,11 +43,7 @@ export class HaFilterStates extends LitElement {
         <div slot="header" class="header">
           ${this.label}
           ${this.value?.length
-            ? html`<div class="badge">${this.value?.length}</div>
+            ? html`<div class="badge">${this.value?.length}</div>`
-                <ha-icon-button
-                  .path=${mdiFilterVariantRemove}
-                  @click=${this._clearFilter}
-                ></ha-icon-button>`
             : nothing}
         </div>
         ${this._shouldRender
@@ -62,8 +57,8 @@ export class HaFilterStates extends LitElement {
                   (item) =>
                     html`<ha-check-list-item
                       .value=${item.value}
-                      .selected=${this.value?.includes(item.value) ?? false}
+                      .selected=${this.value?.includes(item.value)}
-                      .graphic=${hasIcon ? "icon" : null}
+                      .graphic=${hasIcon ? "icon" : undefined}
                     >
                       ${item.icon
                         ? html`<ha-icon
@@ -123,15 +118,6 @@ export class HaFilterStates extends LitElement {
     });
   }
 
-  private _clearFilter(ev) {
-    ev.preventDefault();
-    this.value = undefined;
-    fireEvent(this, "data-table-filter-changed", {
-      value: undefined,
-      items: undefined,
-    });
-  }
-
   static get styles(): CSSResultGroup {
     return [
       haStyleScrollbar,
@@ -151,10 +137,6 @@ export class HaFilterStates extends LitElement {
           display: flex;
           align-items: center;
         }
-        .header ha-icon-button {
-          margin-inline-start: auto;
-          margin-inline-end: 8px;
-        }
         .badge {
           display: inline-block;
           margin-left: 8px;

src/components/ha-floor-picker.ts

@@ -10,10 +10,7 @@ import {
   ScorableTextItem,
   fuzzyFilterSort,
 } from "../common/string/filter/sequence-matching";
-import {
+import { AreaRegistryEntry } from "../data/area_registry";
-  AreaRegistryEntry,
-  updateAreaRegistryEntry,
-} from "../data/area_registry";
 import {
   DeviceEntityDisplayLookup,
   DeviceRegistryEntry,
@@ -440,18 +437,11 @@ export class HaFloorPicker extends SubscribeMixin(LitElement) {
 
     (ev.target as any).value = this._value;
 
-    this.hass.loadFragmentTranslation("config");
-
     showFloorRegistryDetailDialog(this, {
       suggestedName: newValue === ADD_NEW_SUGGESTION_ID ? this._suggestion : "",
-      createEntry: async (values, addedAreas) => {
+      createEntry: async (values) => {
         try {
           const floor = await createFloorRegistryEntry(this.hass, values);
-          addedAreas.forEach((areaId) => {
-            updateAreaRegistryEntry(this.hass, areaId, {
-              floor_id: floor.floor_id,
-            });
-          });
           const floors = [...this._floors!, floor];
           this.comboBox.filteredItems = this._getFloors(
             floors,

src/components/ha-form/compute-initial-ha-form-data.ts

@@ -71,10 +71,6 @@ export const computeInitialHaFormData = (
         if (selector.country?.countries?.length) {
           data[field.name] = selector.country.countries[0];
         }
-      } else if ("language" in selector) {
-        if (selector.language?.languages?.length) {
-          data[field.name] = selector.language.languages[0];
-        }
       } else if ("duration" in selector) {
         data[field.name] = {
           hours: 0,
@@ -97,9 +93,7 @@ export const computeInitialHaFormData = (
       ) {
         data[field.name] = {};
       } else {
-        throw new Error(
+        throw new Error("Selector not supported in initial form data");
-          `Selector ${Object.keys(selector)[0]} not supported in initial form data`
-        );
       }
     }
   });

src/components/ha-formfield.ts

@@ -1,29 +1,13 @@
 import { FormfieldBase } from "@material/mwc-formfield/mwc-formfield-base";
 import { styles } from "@material/mwc-formfield/mwc-formfield.css";
-import { css, html } from "lit";
+import { css } from "lit";
 import { customElement, property } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
 import { fireEvent } from "../common/dom/fire_event";
 
 @customElement("ha-formfield")
 export class HaFormfield extends FormfieldBase {
   @property({ type: Boolean, reflect: true }) public disabled = false;
 
-  protected override render() {
-    const classes = {
-      "mdc-form-field--align-end": this.alignEnd,
-      "mdc-form-field--space-between": this.spaceBetween,
-      "mdc-form-field--nowrap": this.nowrap,
-    };
-
-    return html` <div class="mdc-form-field ${classMap(classes)}">
-      <slot></slot>
-      <label class="mdc-label" @click=${this._labelClick}
-        ><slot name="label">${this.label}</slot></label
-      >
-    </div>`;
-  }
-
   protected _labelClick() {
     const input = this.input as HTMLInputElement | undefined;
     if (!input) return;
@@ -55,9 +39,6 @@ export class HaFormfield extends FormfieldBase {
         margin-inline-end: 10px;
         margin-inline-start: inline;
       }
-      .mdc-form-field {
-        align-items: var(--ha-formfield-align-items, center);
-      }
       .mdc-form-field > label {
         direction: var(--direction);
         margin-inline-start: 0;

src/components/ha-label-picker.ts

@@ -302,7 +302,6 @@ export class HaLabelPicker extends SubscribeMixin(LitElement) {
             name: this.hass.localize("ui.components.label-picker.no_match"),
             icon: null,
             color: null,
-            description: null,
           },
         ];
       }
@@ -316,7 +315,6 @@ export class HaLabelPicker extends SubscribeMixin(LitElement) {
               name: this.hass.localize("ui.components.label-picker.add_new"),
               icon: "mdi:plus",
               color: null,
-              description: null,
             },
           ];
     }
@@ -447,8 +445,6 @@ export class HaLabelPicker extends SubscribeMixin(LitElement) {
 
     (ev.target as any).value = this._value;
 
-    this.hass.loadFragmentTranslation("config");
-
     showLabelDetailDialog(this, {
       entry: undefined,
       suggestedName: newValue === ADD_NEW_SUGGESTION_ID ? this._suggestion : "",

src/components/ha-label.ts

@@ -1,5 +1,6 @@
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
+import "@material/web/ripple/ripple";
 
 @customElement("ha-label")
 class HaLabel extends LitElement {
@@ -10,6 +11,7 @@ class HaLabel extends LitElement {
       <span class="content">
         <slot name="icon"></slot>
         <slot></slot>
+        <md-ripple></md-ripple>
       </span>
     `;
   }
@@ -25,6 +27,7 @@ class HaLabel extends LitElement {
             0.15
           );
           --ha-label-background-opacity: 1;
+
           position: relative;
           box-sizing: border-box;
           display: inline-flex;

src/components/ha-labels-picker.ts

@@ -2,10 +2,8 @@ import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
 import { LitElement, TemplateResult, css, html, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
-import memoizeOne from "memoize-one";
 import { computeCssColor } from "../common/color/compute-color";
 import { fireEvent } from "../common/dom/fire_event";
-import { stringCompare } from "../common/string/compare";
 import {
   LabelRegistryEntry,
   subscribeLabelRegistry,
@@ -19,6 +17,7 @@ import "./chips/ha-input-chip";
 import type { HaDevicePickerDeviceFilterFunc } from "./device/ha-device-picker";
 import "./ha-label-picker";
 import type { HaLabelPicker } from "./ha-label-picker";
+import { stringCompare } from "../common/string/compare";
 
 @customElement("ha-labels-picker")
 export class HaLabelsPicker extends SubscribeMixin(LitElement) {
@@ -103,35 +102,25 @@ export class HaLabelsPicker extends SubscribeMixin(LitElement) {
     ];
   }
 
-  private _sortedLabels = memoizeOne(
-    (
-      value: string[] | undefined,
-      labels: { [id: string]: LabelRegistryEntry } | undefined,
-      language: string
-    ) =>
-      value
-        ?.map((id) => labels?.[id])
-        .sort((a, b) => stringCompare(a?.name || "", b?.name || "", language))
-  );
-
   protected render(): TemplateResult {
-    const labels = this._sortedLabels(
+    const labels = this.value
-      this.value,
+      ?.map((id) => this._labels?.[id])
-      this._labels,
+      .sort((a, b) =>
-      this.hass.locale.language
+        stringCompare(a?.name || "", b?.name || "", this.hass.locale.language)
-    );
+      );
     return html`
       ${labels?.length
         ? html`<ha-chip-set>
             ${repeat(
               labels,
               (label) => label?.label_id,
-              (label) => {
+              (label, idx) => {
                 const color = label?.color
                   ? computeCssColor(label.color)
                   : undefined;
                 return html`
                   <ha-input-chip
+                    .idx=${idx}
                     .item=${label}
                     @remove=${this._removeItem}
                     @click=${this._openDetail}
@@ -172,12 +161,12 @@ export class HaLabelsPicker extends SubscribeMixin(LitElement) {
   }
 
   private _removeItem(ev) {
-    const label = ev.currentTarget.item;
+    this._value.splice(ev.target.idx, 1);
-    this._setValue(this._value.filter((id) => id !== label.label_id));
+    this._setValue([...this._value]);
   }
 
   private _openDetail(ev) {
-    const label = ev.currentTarget.item;
+    const label = ev.target.item;
     showLabelDetailDialog(this, {
       entry: label,
       updateEntry: async (values) => {

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

@@ -1,22 +1,25 @@
-import { MdListItem } from "@material/web/list/list-item";
-import { css } from "lit";
 import { customElement } from "lit/decorators";
+import "element-internals-polyfill";
+import { MdListItem } from "@material/web/list/list-item";
+import { CSSResult, css } from "lit";
 
 @customElement("ha-list-item-new")
 export class HaListItemNew extends MdListItem {
-  static override styles = [
+  static get styles(): CSSResult[] {
-    ...super.styles,
+    return [
-    css`
+      ...MdListItem.styles,
-      :host {
+      css`
-        --ha-icon-display: block;
+        :host {
-        --md-sys-color-primary: var(--primary-text-color);
+          --ha-icon-display: block;
-        --md-sys-color-secondary: var(--secondary-text-color);
+          --md-sys-color-primary: var(--primary-text-color);
-        --md-sys-color-surface: var(--card-background-color);
+          --md-sys-color-secondary: var(--secondary-text-color);
-        --md-sys-color-on-surface: var(--primary-text-color);
+          --md-sys-color-surface: var(--card-background-color);
-        --md-sys-color-on-surface-variant: var(--secondary-text-color);
+          --md-sys-color-on-surface: var(--primary-text-color);
-      }
+          --md-sys-color-on-surface-variant: var(--secondary-text-color);
-    `,
+        }
-  ];
+      `,
+    ];
+  }
 }
 
 declare global {

src/components/ha-list-new.ts

@@ -1,17 +1,20 @@
-import { MdList } from "@material/web/list/list";
-import { css } from "lit";
 import { customElement } from "lit/decorators";
+import "element-internals-polyfill";
+import { MdList } from "@material/web/list/list";
+import { CSSResult, css } from "lit";
 
 @customElement("ha-list-new")
 export class HaListNew extends MdList {
-  static override styles = [
+  static get styles(): CSSResult[] {
-    ...super.styles,
+    return [
-    css`
+      ...MdList.styles,
-      :host {
+      css`
-        --md-sys-color-surface: var(--card-background-color);
+        :host {
-      }
+          --md-sys-color-surface: var(--card-background-color);
-    `,
+        }
-  ];
+      `,
+    ];
+  }
 }
 
 declare global {

src/components/ha-menu-item.ts

@@ -1,11 +1,12 @@
-import { MdMenuItem } from "@material/web/menu/menu-item";
-import { css } from "lit";
 import { customElement } from "lit/decorators";
+import "element-internals-polyfill";
+import { CSSResult, css } from "lit";
+import { MdMenuItem } from "@material/web/menu/menu-item";
 
 @customElement("ha-menu-item")
 export class HaMenuItem extends MdMenuItem {
-  static override styles = [
+  static override styles: CSSResult[] = [
-    ...super.styles,
+    ...MdMenuItem.styles,
     css`
       :host {
         --ha-icon-display: block;
@@ -24,7 +25,6 @@ export class HaMenuItem extends MdMenuItem {
 
         --md-sys-color-on-primary-container: var(--primary-text-color);
         --md-sys-color-on-secondary-container: var(--primary-text-color);
-        --md-menu-item-label-text-font: Roboto, sans-serif;
       }
       :host(.warning) {
         --md-menu-item-label-text-color: var(--error-color);

src/components/ha-menu.ts

@@ -1,11 +1,12 @@
-import { MdMenu } from "@material/web/menu/menu";
-import { css } from "lit";
 import { customElement } from "lit/decorators";
+import "element-internals-polyfill";
+import { CSSResult, css } from "lit";
+import { MdMenu } from "@material/web/menu/menu";
 
 @customElement("ha-menu")
 export class HaMenu extends MdMenu {
-  static override styles = [
+  static override styles: CSSResult[] = [
-    ...super.styles,
+    ...MdMenu.styles,
     css`
       :host {
         --md-sys-color-surface-container: var(--card-background-color);

src/components/ha-outlined-button.ts

@@ -1,6 +1,7 @@
-import { MdOutlinedButton } from "@material/web/button/outlined-button";
 import { css } from "lit";
 import { customElement } from "lit/decorators";
+import "element-internals-polyfill";
+import { MdOutlinedButton } from "@material/web/button/outlined-button";
 
 @customElement("ha-outlined-button")
 export class HaOutlinedButton extends MdOutlinedButton {

src/components/ha-outlined-field.ts

@@ -1,39 +0,0 @@
-import { MdOutlinedField } from "@material/web/field/outlined-field";
-import { css } from "lit";
-import { customElement } from "lit/decorators";
-import { literal } from "lit/static-html";
-
-@customElement("ha-outlined-field")
-export class HaOutlinedField extends MdOutlinedField {
-  protected readonly fieldTag = literal`ha-outlined-field`;
-
-  static override styles = [
-    ...super.styles,
-    css`
-      .container::before {
-        display: block;
-        content: "";
-        position: absolute;
-        inset: 0;
-        background-color: var(--ha-outlined-field-container-color, transparent);
-        opacity: var(--ha-outlined-field-container-opacity, 1);
-        border-start-start-radius: var(--_container-shape-start-start);
-        border-start-end-radius: var(--_container-shape-start-end);
-        border-end-start-radius: var(--_container-shape-end-start);
-        border-end-end-radius: var(--_container-shape-end-end);
-      }
-      .with-start .start {
-        margin-inline-end: var(--ha-outlined-field-start-margin, 4px);
-      }
-      .with-end .end {
-        margin-inline-start: var(--ha-outlined-field-end-margin, 4px);
-      }
-    `,
-  ];
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-outlined-field": HaOutlinedField;
-  }
-}

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

@@ -1,6 +1,7 @@
-import { MdOutlinedIconButton } from "@material/web/iconbutton/outlined-icon-button";
 import { css } from "lit";
 import { customElement } from "lit/decorators";
+import "element-internals-polyfill";
+import { MdOutlinedIconButton } from "@material/web/iconbutton/outlined-icon-button";
 
 @customElement("ha-outlined-icon-button")
 export class HaOutlinedIconButton extends MdOutlinedIconButton {

src/components/ha-outlined-text-field.ts

@@ -1,13 +1,10 @@
 import { MdOutlinedTextField } from "@material/web/textfield/outlined-text-field";
+import "element-internals-polyfill";
 import { css } from "lit";
 import { customElement } from "lit/decorators";
-import { literal } from "lit/static-html";
-import "./ha-outlined-field";
 
 @customElement("ha-outlined-text-field")
 export class HaOutlinedTextField extends MdOutlinedTextField {
-  protected readonly fieldTag = literal`ha-outlined-field`;
-
   static override styles = [
     ...super.styles,
     css`
@@ -28,8 +25,6 @@ export class HaOutlinedTextField extends MdOutlinedTextField {
         --md-outlined-field-container-shape-end-end: 10px;
         --md-outlined-field-container-shape-end-start: 10px;
         --md-outlined-field-focus-outline-width: 1px;
-        --ha-outlined-field-start-margin: -4px;
-        --ha-outlined-field-end-margin: -4px;
         --mdc-icon-size: var(--md-input-chip-icon-size, 18px);
       }
       .input {

src/components/ha-ripple.ts

@@ -1,62 +0,0 @@
-import { AttachableController } from "@material/web/internal/controller/attachable-controller";
-import { MdRipple } from "@material/web/ripple/ripple";
-import { css } from "lit";
-import { customElement } from "lit/decorators";
-
-@customElement("ha-ripple")
-export class HaRipple extends MdRipple {
-  private readonly attachableTouchController = new AttachableController(
-    this,
-    this.onTouchControlChange.bind(this)
-  );
-
-  attach(control: HTMLElement) {
-    super.attach(control);
-    this.attachableTouchController.attach(control);
-  }
-
-  detach() {
-    super.detach();
-    this.attachableTouchController.detach();
-  }
-
-  private _handleTouchEnd = () => {
-    if (!this.disabled) {
-      // @ts-ignore
-      super.endPressAnimation();
-    }
-  };
-
-  private onTouchControlChange(
-    prev: HTMLElement | null,
-    next: HTMLElement | null
-  ) {
-    // Add touchend event to clean ripple on touch devices using action handler
-    prev?.removeEventListener("touchend", this._handleTouchEnd);
-    next?.addEventListener("touchend", this._handleTouchEnd);
-  }
-
-  static override styles = [
-    ...super.styles,
-    css`
-      :host {
-        --md-ripple-hover-opacity: var(--ha-ripple-hover-opacity, 0.08);
-        --md-ripple-pressed-opacity: var(--ha-ripple-pressed-opacity, 0.12);
-        --md-ripple-hover-color: var(
-          --ha-ripple-hover-color,
-          var(--ha-ripple-color, var(--secondary-text-color))
-        );
-        --md-ripple-pressed-color: var(
-          --ha-ripple-pressed-color,
-          var(--ha-ripple-color, var(--secondary-text-color))
-        );
-      }
-    `,
-  ];
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-ripple": HaRipple;
-  }
-}

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

@@ -8,10 +8,7 @@ import {
   fetchEntitySourcesWithCache,
 } from "../../data/entity_sources";
 import type { EntitySelector } from "../../data/selector";
-import {
+import { filterSelectorEntities } from "../../data/selector";
-  filterSelectorEntities,
-  computeCreateDomains,
-} from "../../data/selector";
 import { HomeAssistant } from "../../types";
 import "../entity/ha-entities-picker";
 import "../entity/ha-entity-picker";
@@ -34,8 +31,6 @@ export class HaEntitySelector extends LitElement {
 
   @property({ type: Boolean }) public required = true;
 
-  @state() private _createDomains: string[] | undefined;
-
   private _hasIntegration(selector: EntitySelector) {
     return (
       selector.entity?.filter &&
@@ -69,7 +64,6 @@ export class HaEntitySelector extends LitElement {
         .includeEntities=${this.selector.entity?.include_entities}
         .excludeEntities=${this.selector.entity?.exclude_entities}
         .entityFilter=${this._filterEntities}
-        .createDomains=${this._createDomains}
         .disabled=${this.disabled}
         .required=${this.required}
         allow-custom-entity
@@ -85,7 +79,6 @@ export class HaEntitySelector extends LitElement {
         .includeEntities=${this.selector.entity.include_entities}
         .excludeEntities=${this.selector.entity.exclude_entities}
         .entityFilter=${this._filterEntities}
-        .createDomains=${this._createDomains}
         .disabled=${this.disabled}
         .required=${this.required}
       ></ha-entities-picker>
@@ -103,9 +96,6 @@ export class HaEntitySelector extends LitElement {
         this._entitySources = sources;
       });
     }
-    if (changedProps.has("selector")) {
-      this._createDomains = computeCreateDomains(this.selector);
-    }
   }
 
   private _filterEntities = (entity: HassEntity): boolean => {

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

@@ -30,7 +30,6 @@ export class HaLabelSelector extends LitElement {
     if (this.selector.label.multiple) {
       return html`
         <ha-labels-picker
-          no-add
           .hass=${this.hass}
           .value=${ensureArray(this.value ?? [])}
           .disabled=${this.disabled}
@@ -42,7 +41,6 @@ export class HaLabelSelector extends LitElement {
     }
     return html`
       <ha-label-picker
-        no-add
         .hass=${this.hass}
         .value=${this.value}
         .disabled=${this.disabled}

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

@@ -7,10 +7,8 @@ import type {
   LocationSelectorValue,
 } from "../../data/selector";
 import type { HomeAssistant } from "../../types";
-import type { SchemaUnion } from "../ha-form/types";
 import type { MarkerLocation } from "../map/ha-locations-editor";
 import "../map/ha-locations-editor";
-import "../ha-form/ha-form";
 
 @customElement("ha-selector-location")
 export class HaLocationSelector extends LitElement {
@@ -26,49 +24,6 @@ export class HaLocationSelector extends LitElement {
 
   @property({ type: Boolean, reflect: true }) public disabled = false;
 
-  private _schema = memoizeOne(
-    (radius?: boolean, radius_readonly?: boolean) =>
-      [
-        {
-          name: "",
-          type: "grid",
-          schema: [
-            {
-              name: "latitude",
-              required: true,
-              selector: { number: { step: "any" } },
-            },
-            {
-              name: "longitude",
-              required: true,
-              selector: { number: { step: "any" } },
-            },
-          ],
-        },
-        ...(radius
-          ? [
-              {
-                name: "radius",
-                required: true,
-                default: 1000,
-                disabled: !!radius_readonly,
-                selector: { number: { min: 0, step: 1, mode: "box" } as const },
-              } as const,
-            ]
-          : []),
-      ] as const
-  );
-
-  protected willUpdate() {
-    if (!this.value) {
-      this.value = {
-        latitude: this.hass.config.latitude,
-        longitude: this.hass.config.longitude,
-        radius: this.selector.location?.radius ? 1000 : undefined,
-      };
-    }
-  }
-
   protected render() {
     return html`
       <p>${this.label ? this.label : ""}</p>
@@ -80,17 +35,6 @@ export class HaLocationSelector extends LitElement {
         @location-updated=${this._locationChanged}
         @radius-updated=${this._radiusChanged}
       ></ha-locations-editor>
-      <ha-form
-        .hass=${this.hass}
-        .schema=${this._schema(
-          this.selector.location?.radius,
-          this.selector.location?.radius_readonly
-        )}
-        .data=${this.value}
-        .computeLabel=${this._computeLabel}
-        .disabled=${this.disabled}
-        @value-changed=${this._valueChanged}
-      ></ha-form>
     `;
   }
 
@@ -122,8 +66,7 @@ export class HaLocationSelector extends LitElement {
               ? "mdi:map-marker-radius"
               : "mdi:map-marker",
           location_editable: true,
-          radius_editable:
+          radius_editable: true,
-            !!selector.location?.radius && !selector.location?.radius_readonly,
         },
       ];
     }
@@ -137,39 +80,14 @@ export class HaLocationSelector extends LitElement {
   }
 
   private _radiusChanged(ev: CustomEvent) {
-    const radius = Math.round(ev.detail.radius);
+    const radius = ev.detail.radius;
     fireEvent(this, "value-changed", { value: { ...this.value, radius } });
   }
 
-  private _valueChanged(ev: CustomEvent) {
-    ev.stopPropagation();
-    const value = ev.detail.value;
-    const radius = Math.round(ev.detail.value.radius);
-
-    fireEvent(this, "value-changed", {
-      value: {
-        latitude: value.latitude,
-        longitude: value.longitude,
-        ...(this.selector.location?.radius &&
-        !this.selector.location?.radius_readonly
-          ? {
-              radius,
-            }
-          : {}),
-      },
-    });
-  }
-
-  private _computeLabel = (
-    entry: SchemaUnion<ReturnType<typeof this._schema>>
-  ): string =>
-    this.hass.localize(`ui.components.selectors.location.${entry.name}`);
-
   static styles = css`
     ha-locations-editor {
       display: block;
       height: 400px;
-      margin-bottom: 16px;
     }
     p {
       margin-top: 0;

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

@@ -278,14 +278,6 @@ export class HaSelectSelector extends LitElement {
 
   private _valueChanged(ev) {
     ev.stopPropagation();
-
-    if (ev.detail?.index === -1 && this.value !== undefined) {
-      fireEvent(this, "value-changed", {
-        value: undefined,
-      });
-      return;
-    }
-
     const value = ev.detail?.value || ev.target.value;
     if (this.disabled || value === undefined || value === (this.value ?? "")) {
       return;

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

@@ -22,7 +22,6 @@ import {
   filterSelectorDevices,
   filterSelectorEntities,
   TargetSelector,
-  computeCreateDomains,
 } from "../../data/selector";
 import type { HomeAssistant } from "../../types";
 import "../ha-target-picker";
@@ -43,8 +42,6 @@ export class HaTargetSelector extends LitElement {
 
   @state() private _entitySources?: EntitySources;
 
-  @state() private _createDomains: string[] | undefined;
-
   private _deviceIntegrationLookup = memoizeOne(getDeviceIntegrationLookup);
 
   private _hasIntegration(selector: TargetSelector) {
@@ -71,9 +68,6 @@ export class HaTargetSelector extends LitElement {
         this._entitySources = sources;
       });
     }
-    if (changedProperties.has("selector")) {
-      this._createDomains = computeCreateDomains(this.selector);
-    }
   }
 
   protected render() {
@@ -88,7 +82,6 @@ export class HaTargetSelector extends LitElement {
       .deviceFilter=${this._filterDevices}
       .entityFilter=${this._filterEntities}
       .disabled=${this.disabled}
-      .createDomains=${this._createDomains}
     ></ha-target-picker>`;
   }
 

src/components/ha-service-control.ts

@@ -33,7 +33,6 @@ import {
   expandFloorTarget,
   expandLabelTarget,
   Selector,
-  TargetSelector,
 } from "../data/selector";
 import { HomeAssistant, ValueChangedEvent } from "../types";
 import { documentationUrl } from "../util/documentation-url";
@@ -364,11 +363,6 @@ export class HaServiceControl extends LitElement {
     return false;
   }
 
-  private _targetSelector = memoizeOne(
-    (targetSelector: TargetSelector | null | undefined) =>
-      targetSelector ? { target: { ...targetSelector } } : { target: {} }
-  );
-
   protected render() {
     const serviceData = this._getServiceInfo(
       this._value?.service,
@@ -407,151 +401,157 @@ export class HaServiceControl extends LitElement {
         )) ||
       serviceData?.description;
 
-    return html`${this.hidePicker
+    return html`
-      ? nothing
+      ${this.hidePicker
-      : html`<ha-service-picker
+        ? nothing
-          .hass=${this.hass}
+        : html`<ha-service-picker
-          .value=${this._value?.service}
-          .disabled=${this.disabled}
-          @value-changed=${this._serviceChanged}
-        ></ha-service-picker>`}
-    ${this.hideDescription
-      ? nothing
-      : html`
-          <div class="description">
-            ${description ? html`<p>${description}</p>` : ""}
-            ${this._manifest
-              ? html` <a
-                  href=${this._manifest.is_built_in
-                    ? documentationUrl(
-                        this.hass,
-                        `/integrations/${this._manifest.domain}`
-                      )
-                    : this._manifest.documentation}
-                  title=${this.hass.localize(
-                    "ui.components.service-control.integration_doc"
-                  )}
-                  target="_blank"
-                  rel="noreferrer"
-                >
-                  <ha-icon-button
-                    .path=${mdiHelpCircle}
-                    class="help-icon"
-                  ></ha-icon-button>
-                </a>`
-              : nothing}
-          </div>
-        `}
-    ${serviceData && "target" in serviceData
-      ? html`<ha-settings-row .narrow=${this.narrow}>
-          ${hasOptional
-            ? html`<div slot="prefix" class="checkbox-spacer"></div>`
-            : ""}
-          <span slot="heading"
-            >${this.hass.localize("ui.components.service-control.target")}</span
-          >
-          <span slot="description"
-            >${this.hass.localize(
-              "ui.components.service-control.target_description"
-            )}</span
-          ><ha-selector
             .hass=${this.hass}
-            .selector=${this._targetSelector(
+            .value=${this._value?.service}
-              serviceData.target as TargetSelector
-            )}
             .disabled=${this.disabled}
-            @value-changed=${this._targetChanged}
+            @value-changed=${this._serviceChanged}
-            .value=${this._value?.target}
+          ></ha-service-picker>`}
-          ></ha-selector
+      ${this.hideDescription
-        ></ha-settings-row>`
+        ? nothing
-      : entityId
+        : html`
-        ? html`<ha-entity-picker
+            <div class="description">
+              ${description ? html`<p>${description}</p>` : ""}
+              ${this._manifest
+                ? html` <a
+                    href=${this._manifest.is_built_in
+                      ? documentationUrl(
+                          this.hass,
+                          `/integrations/${this._manifest.domain}`
+                        )
+                      : this._manifest.documentation}
+                    title=${this.hass.localize(
+                      "ui.components.service-control.integration_doc"
+                    )}
+                    target="_blank"
+                    rel="noreferrer"
+                  >
+                    <ha-icon-button
+                      .path=${mdiHelpCircle}
+                      class="help-icon"
+                    ></ha-icon-button>
+                  </a>`
+                : nothing}
+            </div>
+          `}
+      ${serviceData && "target" in serviceData
+        ? html`<ha-settings-row .narrow=${this.narrow}>
+            ${hasOptional
+              ? html`<div slot="prefix" class="checkbox-spacer"></div>`
+              : ""}
+            <span slot="heading"
+              >${this.hass.localize(
+                "ui.components.service-control.target"
+              )}</span
+            >
+            <span slot="description"
+              >${this.hass.localize(
+                "ui.components.service-control.target_description"
+              )}</span
+            ><ha-selector
+              .hass=${this.hass}
+              .selector=${serviceData.target
+                ? { target: serviceData.target }
+                : { target: {} }}
+              .disabled=${this.disabled}
+              @value-changed=${this._targetChanged}
+              .value=${this._value?.target}
+            ></ha-selector
+          ></ha-settings-row>`
+        : entityId
+          ? html`<ha-entity-picker
+              .hass=${this.hass}
+              .disabled=${this.disabled}
+              .value=${this._value?.data?.entity_id}
+              .label=${this.hass.localize(
+                `component.${domain}.services.${serviceName}.fields.entity_id.description`
+              ) || entityId.description}
+              @value-changed=${this._entityPicked}
+              allow-custom-entity
+            ></ha-entity-picker>`
+          : ""}
+      ${shouldRenderServiceDataYaml
+        ? html`<ha-yaml-editor
             .hass=${this.hass}
-            .disabled=${this.disabled}
+            .label=${this.hass.localize("ui.components.service-control.data")}
-            .value=${this._value?.data?.entity_id}
+            .name=${"data"}
-            .label=${this.hass.localize(
+            .readOnly=${this.disabled}
-              `component.${domain}.services.${serviceName}.fields.entity_id.description`
+            .defaultValue=${this._value?.data}
-            ) || entityId.description}
+            @value-changed=${this._dataChanged}
-            @value-changed=${this._entityPicked}
+          ></ha-yaml-editor>`
-            allow-custom-entity
+        : filteredFields?.map((dataField) => {
-          ></ha-entity-picker>`
+            const selector = dataField?.selector ?? { text: undefined };
-        : ""}
+            const type = Object.keys(selector)[0];
-    ${shouldRenderServiceDataYaml
+            const enhancedSelector = [
-      ? html`<ha-yaml-editor
+              "action",
-          .hass=${this.hass}
+              "condition",
-          .label=${this.hass.localize("ui.components.service-control.data")}
+              "trigger",
-          .name=${"data"}
+            ].includes(type)
-          .readOnly=${this.disabled}
+              ? {
-          .defaultValue=${this._value?.data}
+                  [type]: {
-          @value-changed=${this._dataChanged}
+                    ...selector[type],
-        ></ha-yaml-editor>`
+                    path: [dataField.key],
-      : filteredFields?.map((dataField) => {
+                  },
-          const selector = dataField?.selector ?? { text: undefined };
+                }
-          const type = Object.keys(selector)[0];
+              : selector;
-          const enhancedSelector = ["action", "condition", "trigger"].includes(
-            type
-          )
-            ? {
-                [type]: {
-                  ...selector[type],
-                  path: [dataField.key],
-                },
-              }
-            : selector;
 
-          const showOptional = showOptionalToggle(dataField);
+            const showOptional = showOptionalToggle(dataField);
 
-          return dataField.selector &&
+            return dataField.selector &&
-            (!dataField.advanced ||
+              (!dataField.advanced ||
-              this.showAdvanced ||
+                this.showAdvanced ||
-              (this._value?.data &&
+                (this._value?.data &&
-                this._value.data[dataField.key] !== undefined))
+                  this._value.data[dataField.key] !== undefined))
-            ? html`<ha-settings-row .narrow=${this.narrow}>
+              ? html`<ha-settings-row .narrow=${this.narrow}>
-                ${!showOptional
+                  ${!showOptional
-                  ? hasOptional
+                    ? hasOptional
-                    ? html`<div slot="prefix" class="checkbox-spacer"></div>`
+                      ? html`<div slot="prefix" class="checkbox-spacer"></div>`
-                    : ""
+                      : ""
-                  : html`<ha-checkbox
+                    : html`<ha-checkbox
-                      .key=${dataField.key}
+                        .key=${dataField.key}
-                      .checked=${this._checkedKeys.has(dataField.key) ||
+                        .checked=${this._checkedKeys.has(dataField.key) ||
-                      (this._value?.data &&
+                        (this._value?.data &&
-                        this._value.data[dataField.key] !== undefined)}
+                          this._value.data[dataField.key] !== undefined)}
-                      .disabled=${this.disabled}
+                        .disabled=${this.disabled}
-                      @change=${this._checkboxChanged}
+                        @change=${this._checkboxChanged}
-                      slot="prefix"
+                        slot="prefix"
-                    ></ha-checkbox>`}
+                      ></ha-checkbox>`}
-                <span slot="heading"
+                  <span slot="heading"
-                  >${this.hass.localize(
+                    >${this.hass.localize(
-                    `component.${domain}.services.${serviceName}.fields.${dataField.key}.name`
+                      `component.${domain}.services.${serviceName}.fields.${dataField.key}.name`
-                  ) ||
+                    ) ||
-                  dataField.name ||
+                    dataField.name ||
-                  dataField.key}</span
+                    dataField.key}</span
-                >
+                  >
-                <span slot="description"
+                  <span slot="description"
-                  >${this.hass.localize(
+                    >${this.hass.localize(
-                    `component.${domain}.services.${serviceName}.fields.${dataField.key}.description`
+                      `component.${domain}.services.${serviceName}.fields.${dataField.key}.description`
-                  ) || dataField?.description}</span
+                    ) || dataField?.description}</span
-                >
+                  >
-                <ha-selector
+                  <ha-selector
-                  .disabled=${this.disabled ||
+                    .disabled=${this.disabled ||
-                  (showOptional &&
+                    (showOptional &&
-                    !this._checkedKeys.has(dataField.key) &&
+                      !this._checkedKeys.has(dataField.key) &&
-                    (!this._value?.data ||
+                      (!this._value?.data ||
-                      this._value.data[dataField.key] === undefined))}
+                        this._value.data[dataField.key] === undefined))}
-                  .hass=${this.hass}
+                    .hass=${this.hass}
-                  .selector=${enhancedSelector}
+                    .selector=${enhancedSelector}
-                  .key=${dataField.key}
+                    .key=${dataField.key}
-                  @value-changed=${this._serviceDataChanged}
+                    @value-changed=${this._serviceDataChanged}
-                  .value=${this._value?.data
+                    .value=${this._value?.data
-                    ? this._value.data[dataField.key]
+                      ? this._value.data[dataField.key]
-                    : undefined}
+                      : undefined}
-                  .placeholder=${dataField.default}
+                    .placeholder=${dataField.default}
-                  .localizeValue=${this._localizeValueCallback}
+                    .localizeValue=${this._localizeValueCallback}
-                  @item-moved=${this._itemMoved}
+                    @item-moved=${this._itemMoved}
-                ></ha-selector>
+                  ></ha-selector>
-              </ha-settings-row>`
+                </ha-settings-row>`
-            : "";
+              : "";
-        })} `;
+          })}
+    `;
   }
 
   private _localizeValueCallback = (key: string) => {

src/components/ha-settings-row.ts

@@ -8,9 +8,6 @@ export class HaSettingsRow extends LitElement {
   @property({ type: Boolean, attribute: "three-line" })
   public threeLine = false;
 
-  @property({ type: Boolean, attribute: "wrap-heading", reflect: true })
-  public wrapHeading = false;
-
   protected render(): TemplateResult {
     return html`
       <div class="prefix-wrap">
@@ -54,7 +51,7 @@ export class HaSettingsRow extends LitElement {
       .body[three-line] {
         min-height: var(--paper-item-body-three-line-min-height, 88px);
       }
-      :host(:not([wrap-heading])) body > * {
+      .body > * {
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;

src/components/ha-slider.ts

@@ -1,6 +1,7 @@
-import { MdSlider } from "@material/web/slider/slider";
-import { css } from "lit";
 import { customElement } from "lit/decorators";
+import "element-internals-polyfill";
+import { MdSlider } from "@material/web/slider/slider";
+import { CSSResult, css } from "lit";
 import { mainWindow } from "../common/dom/get_main_window";
 
 @customElement("ha-slider")
@@ -10,8 +11,8 @@ export class HaSlider extends MdSlider {
     this.dir = mainWindow.document.dir;
   }
 
-  static override styles = [
+  static override styles: CSSResult[] = [
-    ...super.styles,
+    ...MdSlider.styles,
     css`
       :host {
         --md-sys-color-primary: var(--primary-color);

src/components/ha-sortable.ts

@@ -82,7 +82,7 @@ export class HaSortable extends LitElement {
   public connectedCallback() {
     super.connectedCallback();
     this._shouldBeDestroy = false;
-    if (this.hasUpdated && !this.disabled) {
+    if (this.hasUpdated) {
       this._createSortable();
     }
   }

src/components/ha-sub-menu.ts

@@ -1,16 +1,13 @@
-import { MdSubMenu } from "@material/web/menu/sub-menu";
-import { css } from "lit";
 import { customElement } from "lit/decorators";
+import "element-internals-polyfill";
+import { CSSResult, css } from "lit";
+import { MdSubMenu } from "@material/web/menu/sub-menu";
 
 @customElement("ha-sub-menu")
+// @ts-expect-error
 export class HaSubMenu extends MdSubMenu {
-  async show() {
+  static override styles: CSSResult[] = [
-    super.show();
+    MdSubMenu.styles,
-    this.menu.hasOverflow = false;
-  }
-
-  static override styles = [
-    ...super.styles,
     css`
       :host {
         --ha-icon-display: block;

src/components/ha-tab.ts

@@ -1,7 +1,15 @@
+import type { Ripple } from "@material/mwc-ripple";
+import "@material/mwc-ripple/mwc-ripple";
+import { RippleHandlers } from "@material/mwc-ripple/ripple-handlers";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property } from "lit/decorators";
+import {
+  customElement,
+  eventOptions,
+  property,
+  queryAsync,
+  state,
+} from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
-import "./ha-ripple";
 
 @customElement("ha-tab")
 export class HaTab extends LitElement {
@@ -11,6 +19,10 @@ export class HaTab extends LitElement {
 
   @property() public name?: string;
 
+  @queryAsync("mwc-ripple") private _ripple!: Promise<Ripple | null>;
+
+  @state() private _shouldRenderRipple = false;
+
   protected render(): TemplateResult {
     return html`
       <div
@@ -18,21 +30,60 @@ export class HaTab extends LitElement {
         role="tab"
         aria-selected=${this.active}
         aria-label=${ifDefined(this.name)}
+        @focus=${this.handleRippleFocus}
+        @blur=${this.handleRippleBlur}
+        @mousedown=${this.handleRippleActivate}
+        @mouseup=${this.handleRippleDeactivate}
+        @mouseenter=${this.handleRippleMouseEnter}
+        @mouseleave=${this.handleRippleMouseLeave}
+        @touchstart=${this.handleRippleActivate}
+        @touchend=${this.handleRippleDeactivate}
+        @touchcancel=${this.handleRippleDeactivate}
         @keydown=${this._handleKeyDown}
       >
         ${this.narrow ? html`<slot name="icon"></slot>` : ""}
         <span class="name">${this.name}</span>
-        <ha-ripple></ha-ripple>
+        ${this._shouldRenderRipple ? html`<mwc-ripple></mwc-ripple>` : ""}
       </div>
     `;
   }
 
+  private _rippleHandlers: RippleHandlers = new RippleHandlers(() => {
+    this._shouldRenderRipple = true;
+    return this._ripple;
+  });
+
   private _handleKeyDown(ev: KeyboardEvent): void {
     if (ev.key === "Enter") {
       (ev.target as HTMLElement).click();
     }
   }
 
+  @eventOptions({ passive: true })
+  private handleRippleActivate(evt?: Event) {
+    this._rippleHandlers.startPress(evt);
+  }
+
+  private handleRippleDeactivate() {
+    this._rippleHandlers.endPress();
+  }
+
+  private handleRippleMouseEnter() {
+    this._rippleHandlers.startHover();
+  }
+
+  private handleRippleMouseLeave() {
+    this._rippleHandlers.endHover();
+  }
+
+  private handleRippleFocus() {
+    this._rippleHandlers.startFocus();
+  }
+
+  private handleRippleBlur() {
+    this._rippleHandlers.endFocus();
+  }
+
   static get styles(): CSSResultGroup {
     return css`
       div {
@@ -75,15 +126,6 @@ export class HaTab extends LitElement {
       :host([narrow]) div {
         padding: 0 4px;
       }
-
-      div:focus-visible:before {
-        position: absolute;
-        display: block;
-        content: "";
-        inset: 0;
-        background-color: var(--secondary-text-color);
-        opacity: 0.08;
-      }
     `;
   }
 }

src/components/ha-target-picker.ts

@@ -65,8 +65,6 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
 
   @property() public helper?: string;
 
-  @property({ type: Array }) public createDomains?: string[];
-
   /**
    * Show only targets with entities from specific domains.
    * @type {Array}
@@ -470,7 +468,6 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
                   .includeDeviceClasses=${this.includeDeviceClasses}
                   .includeDomains=${this.includeDomains}
                   .excludeEntities=${ensureArray(this.value?.entity_id)}
-                  .createDomains=${this.createDomains}
                   @value-changed=${this._targetPicked}
                   @click=${this._preventDefault}
                   allow-custom-entity