Remove

Use unknown
Show warning
2026-08-18 20:50:04 +00:00 · 2025-10-23 11:16:09 +01:00 · 2025-10-23 11:11:32 +01:00 · 2025-10-23 11:11:32 +01:00 · 2025-10-23 11:11:32 +01:00 · 2025-10-23 11:11:31 +01:00
266 changed files with 4390 additions and 8721 deletions
@@ -89,7 +89,7 @@ jobs:
        env:
          IS_TEST: "true"
      - name: Upload bundle stats
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: frontend-bundle-stats
          path: build/stats/*.json
@@ -113,7 +113,7 @@ jobs:
        env:
          IS_TEST: "true"
      - name: Upload bundle stats
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: supervisor-bundle-stats
          path: build/stats/*.json
@@ -36,14 +36,14 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
        with:
          languages: ${{ matrix.language }}

      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
      # If this step fails, then you should remove it and run the build manually (see below)
      - name: Autobuild
-        uses: github/codeql-action/autobuild@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/autobuild@16140ae1a102900babc80a33c44059580f687047 # v4.30.9

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

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
@@ -57,14 +57,14 @@ jobs:
        run: tar -czvf translations.tar.gz translations

      - name: Upload build artifacts
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: wheels
          path: dist/home_assistant_frontend*.whl
          if-no-files-found: error

      - name: Upload translations
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: translations
          path: translations.tar.gz
@@ -5,7 +5,6 @@
 build/
 dist/
 /hass_frontend/
-/logs/dist/
 /translations/

 # yarn
@@ -1 +1 @@
-22.21.1
+22.21.0
@@ -18,16 +18,16 @@ module.exports.sourceMapURL = () => {
 module.exports.ignorePackages = () => [];

 // Files from NPM packages that we should replace with empty file
-module.exports.emptyPackages = ({ isHassioBuild, isLandingPageBuild }) =>
+module.exports.emptyPackages = ({ isHassioBuild }) =>
  [
    require.resolve("@vaadin/vaadin-material-styles/typography.js"),
    require.resolve("@vaadin/vaadin-material-styles/font-icons.js"),
    // Icons in supervisor conflict with icons in HA so we don't load.
-    (isHassioBuild || isLandingPageBuild) &&
+    isHassioBuild &&
      require.resolve(
        path.resolve(paths.root_dir, "src/components/ha-icon.ts")
      ),
-    (isHassioBuild || isLandingPageBuild) &&
+    isHassioBuild &&
      require.resolve(
        path.resolve(paths.root_dir, "src/components/ha-icon-picker.ts")
      ),
@@ -327,20 +327,6 @@ module.exports.config = {
    };
  },

-  logs({ isProdBuild, latestBuild, isStatsBuild }) {
-    return {
-      name: "logs" + nameSuffix(latestBuild),
-      entry: {
-        entrypoint: path.resolve(paths.logs_dir, "src/entrypoint.ts"),
-      },
-      outputPath: outputPath(paths.logs_output_root, latestBuild),
-      publicPath: publicPath(latestBuild),
-      isProdBuild,
-      latestBuild,
-      isStatsBuild,
-    };
-  },
-
  landingPage({ isProdBuild, latestBuild }) {
    return {
      name: "landing-page" + nameSuffix(latestBuild),
@@ -351,7 +337,6 @@ module.exports.config = {
      publicPath: publicPath(latestBuild),
      isProdBuild,
      latestBuild,
-      isLandingPageBuild: true,
    };
  },
 };
@@ -39,13 +39,6 @@ gulp.task(
  )
 );

-gulp.task(
-  "clean-logs",
-  gulp.parallel("clean-translations", async () =>
-    deleteSync([paths.logs_output_root, paths.build_dir])
-  )
-);
-
 gulp.task(
  "clean-landing-page",
  gulp.parallel("clean-translations", async () =>
@@ -245,24 +245,6 @@ gulp.task(
  )
 );

-const LOGS_PAGE_ENTRIES = { "index.html": ["entrypoint"] };
-
-gulp.task(
-  "gen-pages-logs-dev",
-  genPagesDevTask(LOGS_PAGE_ENTRIES, paths.logs_dir, paths.logs_output_root)
-);
-
-gulp.task(
-  "gen-pages-logs-prod",
-  genPagesProdTask(
-    LOGS_PAGE_ENTRIES,
-    paths.logs_dir,
-    paths.logs_output_root,
-    paths.logs_output_latest,
-    paths.logs_output_es5
-  )
-);
-
 const LANDING_PAGE_PAGE_ENTRIES = { "index.html": ["entrypoint"] };

 gulp.task(
@@ -202,16 +202,6 @@ gulp.task("copy-static-gallery", async () => {
  copyMdiIcons(paths.gallery_output_static);
 });

-gulp.task("copy-static-logs", async () => {
-  // Copy app static files
-  fs.copySync(polyPath("public/static"), paths.logs_output_static);
-
-  copyFonts(paths.logs_output_static);
-  copyTranslations(paths.logs_output_static);
-  copyLocaleData(paths.logs_output_static);
-  copyMdiIcons(paths.logs_output_static);
-});
-
 gulp.task("copy-static-landing-page", async () => {
  // Copy landing-page static files
  fs.copySync(
@@ -7,7 +7,6 @@ import "./download-translations.js";
 import "./entry-html.js";
 import "./fetch-nightly-translations.js";
 import "./gallery.js";
-import "./logs.js";
 import "./gather-static.js";
 import "./gen-icons-json.js";
 import "./hassio.js";
@@ -1,39 +0,0 @@
-import gulp from "gulp";
-import "./clean.js";
-import "./entry-html.js";
-import "./gather-static.js";
-import "./gen-icons-json.js";
-import "./translations.js";
-import "./rspack.js";
-
-gulp.task(
-  "develop-logs",
-  gulp.series(
-    async function setEnv() {
-      process.env.NODE_ENV = "development";
-    },
-    "clean-logs",
-    gulp.parallel(
-      "gen-icons-json",
-      "gen-pages-logs-dev",
-      "build-translations",
-      "build-locale-data"
-    ),
-    "copy-static-logs",
-    "rspack-dev-server-logs"
-  )
-);
-
-gulp.task(
-  "build-logs",
-  gulp.series(
-    async function setEnv() {
-      process.env.NODE_ENV = "production";
-    },
-    "clean-logs",
-    gulp.parallel("gen-icons-json", "build-translations", "build-locale-data"),
-    "copy-static-logs",
-    "rspack-prod-logs",
-    "gen-pages-logs-prod"
-  )
-);
@@ -15,7 +15,6 @@ import {
  createGalleryConfig,
  createHassioConfig,
  createLandingPageConfig,
-  createLogsConfig,
 } from "../rspack.cjs";

 const bothBuilds = (createConfigFunc, params) => [
@@ -205,25 +204,6 @@ gulp.task("rspack-prod-gallery", () =>
  )
 );

-gulp.task("rspack-dev-server-logs", () =>
-  runDevServer({
-    compiler: rspack(
-      createLogsConfig({ isProdBuild: false, latestBuild: true })
-    ),
-    contentBase: paths.logs_output_root,
-    port: 5647,
-  })
-);
-
-gulp.task("rspack-prod-logs", () =>
-  prodBuild(
-    bothBuilds(createLogsConfig, {
-      isProdBuild: true,
-      isStatsBuild: env.isStatsBuild(),
-    })
-  )
-);
-
 gulp.task("rspack-watch-landing-page", () => {
  // This command will run forever because we don't close compiler
  rspack(
@@ -59,11 +59,5 @@ module.exports = {
  hassio_output_es5: path.resolve(__dirname, "../hassio/build/frontend_es5"),
  hassio_publicPath: "/api/hassio/app",

-  logs_dir: path.resolve(__dirname, "../logs"),
-  logs_output_root: path.resolve(__dirname, "../logs/dist"),
-  logs_output_static: path.resolve(__dirname, "../logs/dist/static"),
-  logs_output_latest: path.resolve(__dirname, "../logs/dist/frontend_latest"),
-  logs_output_es5: path.resolve(__dirname, "../logs/dist/frontend_es5"),
-
  translations_src: path.resolve(__dirname, "../src/translations"),
 };
@@ -41,7 +41,6 @@ const createRspackConfig = ({
  isStatsBuild,
  isTestBuild,
  isHassioBuild,
-  isLandingPageBuild,
  dontHash,
 }) => {
  if (!dontHash) {
@@ -169,9 +168,7 @@ const createRspackConfig = ({
        },
      }),
      new rspack.NormalModuleReplacementPlugin(
-        new RegExp(
-          bundle.emptyPackages({ isHassioBuild, isLandingPageBuild }).join("|")
-        ),
+        new RegExp(bundle.emptyPackages({ isHassioBuild }).join("|")),
        path.resolve(paths.root_dir, "src/util/empty.js")
      ),
      !isProdBuild && new LogStartCompilePlugin(),
@@ -302,11 +299,6 @@ const createHassioConfig = ({
 const createGalleryConfig = ({ isProdBuild, latestBuild }) =>
  createRspackConfig(bundle.config.gallery({ isProdBuild, latestBuild }));

-const createLogsConfig = ({ isProdBuild, latestBuild, isStatsBuild }) =>
-  createRspackConfig(
-    bundle.config.logs({ isProdBuild, latestBuild, isStatsBuild })
-  );
-
 const createLandingPageConfig = ({ isProdBuild, latestBuild }) =>
  createRspackConfig(bundle.config.landingPage({ isProdBuild, latestBuild }));

@@ -316,7 +308,6 @@ module.exports = {
  createCastConfig,
  createHassioConfig,
  createGalleryConfig,
-  createLogsConfig,
  createRspackConfig,
  createLandingPageConfig,
 };
@@ -16,9 +16,9 @@ import {
 } from "../../../../src/common/auth/token_storage";
 import { atLeastVersion } from "../../../../src/common/config/version";
 import { toggleAttribute } from "../../../../src/common/dom/toggle_attribute";
-import "../../../../src/components/ha-button";
 import "../../../../src/components/ha-icon";
 import "../../../../src/components/ha-list";
+import "../../../../src/components/ha-button";
 import "../../../../src/components/ha-list-item";
 import "../../../../src/components/ha-svg-icon";
 import {
@@ -28,6 +28,7 @@ import {
 import { isStrategyDashboard } from "../../../../src/data/lovelace/config/types";
 import type { LovelaceViewConfig } from "../../../../src/data/lovelace/config/view";
 import "../../../../src/layouts/hass-loading-screen";
+import { generateDefaultViewConfig } from "../../../../src/panels/lovelace/common/generate-lovelace-config";
 import "./hc-layout";

@customElement("hc-cast")
@@ -95,9 +96,7 @@ class HcCast extends LitElement {
                <ha-list @action=${this._handlePickView} activatable>
                  ${(
                    this.lovelaceViews ?? [
-                      {
-                        title: "Home",
-                      },
+                      generateDefaultViewConfig({}, {}, {}, {}, () => ""),
                    ]
                  ).map(
                    (view, idx) => html`
@@ -5,14 +5,14 @@ subtitle: Dialogs provide important prompts in a user flow.

 # Material Design 3

-Our dialogs are based on the latest version of Material Design. Please note that we have made some well-considered adjustments to these guidelines. Specs and guidelines can be found on its [website](https://m3.material.io/components/dialogs/overview).
+Our dialogs are based on the latest version of Material Design. Please note that we have made some well-considered adjustments to these guideliness. Specs and guidelines can be found on its [website](https://m3.material.io/components/dialogs/overview).

 # Guidelines

 ## Design

- Dialogs have a max width of 560px. Alert and confirmation dialogs have a fixed width of 320px. If you need more width, consider a dedicated page instead.
- The close X-icon is on the top left, on all screen sizes. Except for alert and confirmation dialogs, they only have buttons and no X-icon. This is different compared to the Material guidelines.
+- Dialogs have a max width of 560px. Alert and confirmation dialogs got a fixed width of 320px. If you need more width, consider a dedicated page instead.
+- The close X-icon is on the top left, on all screen sizes. Except for alert and confirmation dialogs, they only have buttons and no X-icon. This is different compared to the Material guideliness.
 - Dialogs can't be closed with ESC or clicked outside of the dialog when there is a form that the user needs to fill out. Instead it will animate "no" by a little shake.
 - Extra icon buttons are on the top right, for example help, settings and expand dialog. More than 2 icon buttons, they will be in an overflow menu.
 - The submit button is grouped with a cancel button at the bottom right, on all screen sizes. Fullscreen mobile dialogs have them sticky at the bottom.
@@ -26,7 +26,7 @@ Our dialogs are based on the latest version of Material Design. Please note that

 - A best practice is to always use a title, even if it is optional by Material guidelines.
 - People mainly read the title and a button. Put the most important information in those two.
- Try to avoid user generated content in the title, this could make the title unreadably long.
+- Try to avoid user generated content in the title, this could make the title unreadable long.
 - If users become unsure, they read the description. Make sure this explains what will happen.
 - Strive for minimalism.

@@ -39,7 +39,6 @@ const SENSOR_DEVICE_CLASSES = [
  "pm1",
  "pm10",
  "pm25",
-  "pm4",
  "power_factor",
  "power",
  "precipitation",
@@ -1,25 +1,22 @@
 import "@material/mwc-linear-progress";
-import { mdiOpenInNew } from "@mdi/js";
-import { css, html, nothing, type PropertyValues } from "lit";
+import { type PropertyValues, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { extractSearchParam } from "../../src/common/url/search-params";
 import "../../src/components/ha-alert";
-import "../../src/components/ha-button";
 import "../../src/components/ha-fade-in";
 import "../../src/components/ha-spinner";
-import "../../src/components/ha-svg-icon";
-import { makeDialogManager } from "../../src/dialogs/make-dialog-manager";
-import "../../src/onboarding/onboarding-welcome-links";
-import { onBoardingStyles } from "../../src/onboarding/styles";
 import { haStyle } from "../../src/resources/styles";
-import "./components/landing-page-logs";
+import "../../src/onboarding/onboarding-welcome-links";
 import "./components/landing-page-network";
+import "./components/landing-page-logs";
+import { extractSearchParam } from "../../src/common/url/search-params";
+import { onBoardingStyles } from "../../src/onboarding/styles";
+import { makeDialogManager } from "../../src/dialogs/make-dialog-manager";
+import { LandingPageBaseElement } from "./landing-page-base-element";
 import {
  getSupervisorNetworkInfo,
  pingSupervisor,
  type NetworkInfo,
 } from "./data/supervisor";
-import { LandingPageBaseElement } from "./landing-page-base-element";

 export const ASSUME_CORE_START_SECONDS = 60;
 const SCHEDULE_CORE_CHECK_SECONDS = 1;
@@ -97,21 +94,16 @@ class HaLandingPage extends LandingPageBaseElement {
        <ha-language-picker
          .value=${this.language}
          .label=${""}
-          button-style
          native-name
          @value-changed=${this._languageChanged}
          inline-arrow
        ></ha-language-picker>
-        <ha-button
-          appearance="plain"
-          variant="neutral"
+        <a
          href="https://www.home-assistant.io/getting-started/onboarding/"
          target="_blank"
          rel="noreferrer noopener"
+          >${this.localize("ui.panel.page-onboarding.help")}</a
        >
-          ${this.localize("ui.panel.page-onboarding.help")}
-          <ha-svg-icon slot="end" .path=${mdiOpenInNew}></ha-svg-icon>
-        </ha-button>
      </div>
    `;
  }
@@ -226,8 +218,26 @@ class HaLandingPage extends LandingPageBaseElement {
      ha-alert p {
        text-align: unset;
      }
-      .footer ha-svg-icon {
-        --mdc-icon-size: var(--ha-space-5);
+      ha-language-picker {
+        display: block;
+        width: 200px;
+        border-radius: var(--ha-border-radius-sm);
+        overflow: hidden;
+        --ha-select-height: 40px;
+        --mdc-select-fill-color: none;
+        --mdc-select-label-ink-color: var(--primary-text-color, #212121);
+        --mdc-select-ink-color: var(--primary-text-color, #212121);
+        --mdc-select-idle-line-color: transparent;
+        --mdc-select-hover-line-color: transparent;
+        --mdc-select-dropdown-icon-color: var(--primary-text-color, #212121);
+        --mdc-shape-small: 0;
+      }
+      a {
+        text-decoration: none;
+        color: var(--primary-text-color);
+        margin-right: 16px;
+        margin-inline-end: 16px;
+        margin-inline-start: initial;
      }
      ha-fade-in {
        min-height: calc(100vh - 64px - 88px);
@@ -1,9 +0,0 @@
-dist/
-src/
-node_modules/
-*.md
-.git/
-.gitignore
-docker-compose.yaml
-backend/ha-logs-proxy
-backend/README.md
@@ -1,47 +0,0 @@
-ARG BUILD_FROM
-FROM $BUILD_FROM AS base
-
-# Install dependencies
-RUN apk add --no-cache \
-    bash \
-    jq \
-    curl \
-    go
-
-# Install Home Assistant CLI
-ARG BUILD_ARCH
-ARG CLI_VERSION
-RUN curl -Lso /usr/bin/ha \
-    "https://github.com/home-assistant/cli/releases/download/${CLI_VERSION}/ha_${BUILD_ARCH}" \
-    && chmod a+x /usr/bin/ha
-
-# Build Go backend
-WORKDIR /app
-COPY backend/go.mod backend/go.sum* ./
-RUN go mod download || true
-
-COPY backend/*.go ./
-RUN CGO_ENABLED=0 go build -o ha-logs-proxy .
-
-# Final stage
-FROM $BUILD_FROM
-
-# Install runtime dependencies
-RUN apk add --no-cache \
-    bash \
-    jq \
-    curl
-
-# Copy HA CLI from base
-COPY --from=base /usr/bin/ha /usr/bin/ha
-
-# Copy Go backend
-COPY --from=base /app/ha-logs-proxy /usr/bin/ha-logs-proxy
-
-WORKDIR /root
-
-# Expose port for backend (5642 = LOGB)
-EXPOSE 5642
-
-# Default command
-CMD ["/usr/bin/ha-logs-proxy"]
@@ -1,113 +0,0 @@
-# Home Assistant CLI Docker Container
-
-A simple multi-architecture Docker container with the Home Assistant CLI installed.
-
-## Development Usage
-
-The CLI container is integrated into the `script/develop-logs` workflow. Both flags are required:
-
-```bash
-# Start dev server with CLI container (requires remote_api add-on)
-script/develop-logs -c http://192.168.1.2 -t your_token_here
-```
-
-When started with credentials, the container runs a Go backend that proxies HA CLI logs commands. The backend API is available at `http://localhost:5642`.
-
-**Frontend Features:**
- Dropdown menu to select log provider (core, supervisor, host, audio, dns, multicast)
- Follow mode with WebSocket streaming (`ha core logs --follow`)
- Manual refresh to fetch latest logs
- Download logs as text file
- Line wrapping toggle
- Auto-scroll to bottom when following
- Error display with retry
-
-**API Endpoints:**
-
-```bash
-# List all endpoints
-curl http://localhost:5642/api/logs
-
-# Get static logs
-curl http://localhost:5642/api/logs/core
-curl http://localhost:5642/api/logs/supervisor
-
-# Health check
-curl http://localhost:5642/health
-
-# WebSocket streaming (requires websocat or browser)
-websocat ws://localhost:5642/api/logs/core/follow
-```
-
-You can also execute HA CLI commands directly:
-
-```bash
-docker exec -it ha-cli-dev ha info
-docker exec -it ha-cli-dev ha supervisor info
-```
-
-Stop everything with Ctrl+C (both the dev server and backend will stop automatically).
-
-### Getting API Token
-
-1. Install the [remote_api add-on](https://github.com/home-assistant/addons/tree/master/remote_api) in Home Assistant
-2. Check the add-on logs for the generated token
-3. Use the token with the `-t` flag
-
-## Build
-
-### Local Build (Single Architecture)
-
-```bash
-docker build \
-  --build-arg BUILD_FROM=alpine:3.22 \
-  --build-arg BUILD_ARCH=amd64 \
-  --build-arg CLI_VERSION=4.42.0 \
-  -t ha-cli:local \
-  .
-```
-
-### Multi-Architecture Build
-
-The `build.yaml` configuration is designed for use with Home Assistant's build system. For local multi-arch builds, use Docker Buildx:
-
-```bash
-docker buildx build \
-  --platform linux/amd64,linux/arm64,linux/arm/v7 \
-  --build-arg BUILD_FROM=alpine:3.22 \
-  --build-arg CLI_VERSION=4.42.0 \
-  -t ha-cli:latest \
-  .
-```
-
-## Usage
-
-### Run CLI Commands
-
-```bash
-docker run --rm ha-cli:local ha help
-docker run --rm ha-cli:local ha supervisor info
-```
-
-### Interactive Shell
-
-```bash
-docker run -it --rm ha-cli:local
-# Then run: ha <command>
-```
-
-### With Docker Compose
-
-```bash
-docker compose run --rm ha-cli ha help
-```
-
-## Update CLI Version
-
-Edit the `CLI_VERSION` in `build.yaml` or pass it as a build argument:
-
-```bash
-docker build --build-arg CLI_VERSION=4.43.0 ...
-```
-
-Check for latest versions at: https://github.com/home-assistant/cli/releases
@@ -1 +0,0 @@
-ha-logs-proxy
@@ -1,108 +0,0 @@
-# HA Logs Proxy Backend
-
-A Go backend that proxies Home Assistant CLI logs commands through a secure HTTP API.
-
-## Features
-
- Only allows `logs` commands (security-restricted)
- GET endpoints for static logs
- WebSocket endpoints for streaming logs (follow mode)
- CORS enabled for frontend integration
- Simple JSON API
-
-## API Endpoints
-
-### GET /api/logs
-
-List all available endpoints.
-
-### GET /api/logs/core
-
-Get Home Assistant core logs.
-
-### GET /api/logs/supervisor
-
-Get Supervisor logs.
-
-### GET /api/logs/host
-
-Get host system logs.
-
-### GET /api/logs/audio
-
-Get audio logs.
-
-### GET /api/logs/dns
-
-Get DNS logs.
-
-### GET /api/logs/multicast
-
-Get multicast logs.
-
-### GET /health
-
-Health check endpoint.
-
-**Response format (all log endpoints):**
-
-```json
-{
-  "output": "log content here...",
-  "error": "error message if any"
-}
-```
-
-### WS /api/logs/*/follow
-
-WebSocket endpoints for streaming logs in real-time.
-
-Available endpoints:
- `WS /api/logs/core/follow` - Stream core logs
- `WS /api/logs/supervisor/follow` - Stream supervisor logs
- `WS /api/logs/host/follow` - Stream host logs
- `WS /api/logs/audio/follow` - Stream audio logs
- `WS /api/logs/dns/follow` - Stream DNS logs
- `WS /api/logs/multicast/follow` - Stream multicast logs
-
-Each WebSocket message contains a single log line as plain text. The connection streams output from `ha {component} logs --follow` command.
-
-## Running Locally
-
-```bash
-cd backend
-go run main.go
-```
-
-The server starts on port 5642 (LOGB) by default. Override with `PORT` environment variable:
-
-```bash
-PORT=3000 go run main.go
-```
-
-## Building
-
-```bash
-go build -o ha-logs-proxy
-./ha-logs-proxy
-```
-
-## Testing
-
-```bash
-# List endpoints
-curl http://localhost:5642/api/logs
-
-# Get core logs
-curl http://localhost:5642/api/logs/core
-
-# Get supervisor logs
-curl http://localhost:5642/api/logs/supervisor
-
-# Health check
-curl http://localhost:5642/health
-```
-
-## Docker Integration
-
-The backend is designed to run in the same container as the HA CLI, sharing access to the `ha` command.
@@ -1,5 +0,0 @@
-module github.com/home-assistant/frontend/logs/backend
-
-go 1.24
-
-require github.com/gorilla/websocket v1.5.3
@@ -1,2 +0,0 @@
-github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
-github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -1,372 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"encoding/json"
-	"log"
-	"net/http"
-	"os"
-	"os/exec"
-
-	"github.com/gorilla/websocket"
-)
-
-type LogsResponse struct {
-	Output string `json:"output"`
-	Error  string `json:"error,omitempty"`
-}
-
-var upgrader = websocket.Upgrader{
-	ReadBufferSize:  1024,
-	WriteBufferSize: 1024,
-	CheckOrigin: func(r *http.Request) bool {
-		return true // Allow all origins (CORS)
-	},
-}
-
-func executeHACommand(args []string) (string, error) {
-	cmd := exec.Command("ha", args...)
-	output, err := cmd.CombinedOutput()
-	return string(output), err
-}
-
-func streamHACommandToWS(conn *websocket.Conn, args []string) error {
-	cmd := exec.Command("ha", args...)
-
-	// Get stdout pipe
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		return err
-	}
-
-	// Start command
-	if err := cmd.Start(); err != nil {
-		return err
-	}
-
-	// Read and send output line by line
-	scanner := bufio.NewScanner(stdout)
-	for scanner.Scan() {
-		line := scanner.Text()
-		if err := conn.WriteMessage(websocket.TextMessage, []byte(line)); err != nil {
-			cmd.Process.Kill()
-			return err
-		}
-	}
-
-	// Wait for command to finish
-	if err := cmd.Wait(); err != nil {
-		return err
-	}
-
-	return scanner.Err()
-}
-
-func handleCoreLogs(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodGet {
-		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
-		return
-	}
-
-	// Execute ha core logs command
-	output, err := executeHACommand([]string{"core", "logs"})
-
-	response := LogsResponse{
-		Output: output,
-	}
-
-	if err != nil {
-		response.Error = err.Error()
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	w.Header().Set("Access-Control-Allow-Origin", "*")
-	w.Header().Set("Access-Control-Allow-Methods", "GET")
-
-	if err := json.NewEncoder(w).Encode(response); err != nil {
-		log.Printf("Error encoding response: %v", err)
-	}
-}
-
-func handleSupervisorLogs(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodGet {
-		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
-		return
-	}
-
-	output, err := executeHACommand([]string{"supervisor", "logs"})
-
-	response := LogsResponse{
-		Output: output,
-	}
-
-	if err != nil {
-		response.Error = err.Error()
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	w.Header().Set("Access-Control-Allow-Origin", "*")
-	w.Header().Set("Access-Control-Allow-Methods", "GET")
-
-	json.NewEncoder(w).Encode(response)
-}
-
-func handleHostLogs(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodGet {
-		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
-		return
-	}
-
-	output, err := executeHACommand([]string{"host", "logs"})
-
-	response := LogsResponse{
-		Output: output,
-	}
-
-	if err != nil {
-		response.Error = err.Error()
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	w.Header().Set("Access-Control-Allow-Origin", "*")
-	w.Header().Set("Access-Control-Allow-Methods", "GET")
-
-	json.NewEncoder(w).Encode(response)
-}
-
-func handleAudioLogs(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodGet {
-		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
-		return
-	}
-
-	output, err := executeHACommand([]string{"audio", "logs"})
-
-	response := LogsResponse{
-		Output: output,
-	}
-
-	if err != nil {
-		response.Error = err.Error()
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	w.Header().Set("Access-Control-Allow-Origin", "*")
-	w.Header().Set("Access-Control-Allow-Methods", "GET")
-
-	json.NewEncoder(w).Encode(response)
-}
-
-func handleDNSLogs(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodGet {
-		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
-		return
-	}
-
-	output, err := executeHACommand([]string{"dns", "logs"})
-
-	response := LogsResponse{
-		Output: output,
-	}
-
-	if err != nil {
-		response.Error = err.Error()
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	w.Header().Set("Access-Control-Allow-Origin", "*")
-	w.Header().Set("Access-Control-Allow-Methods", "GET")
-
-	json.NewEncoder(w).Encode(response)
-}
-
-func handleMulticastLogs(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodGet {
-		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
-		return
-	}
-
-	output, err := executeHACommand([]string{"multicast", "logs"})
-
-	response := LogsResponse{
-		Output: output,
-	}
-
-	if err != nil {
-		response.Error = err.Error()
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	w.Header().Set("Access-Control-Allow-Origin", "*")
-	w.Header().Set("Access-Control-Allow-Methods", "GET")
-
-	json.NewEncoder(w).Encode(response)
-}
-
-func handleCoreLogsFollow(w http.ResponseWriter, r *http.Request) {
-	conn, err := upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		log.Printf("WebSocket upgrade failed: %v", err)
-		return
-	}
-	defer conn.Close()
-
-	log.Println("Client connected to core logs follow")
-
-	if err := streamHACommandToWS(conn, []string{"core", "logs", "--follow"}); err != nil {
-		log.Printf("Error streaming core logs: %v", err)
-	}
-
-	log.Println("Client disconnected from core logs follow")
-}
-
-func handleSupervisorLogsFollow(w http.ResponseWriter, r *http.Request) {
-	conn, err := upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		log.Printf("WebSocket upgrade failed: %v", err)
-		return
-	}
-	defer conn.Close()
-
-	log.Println("Client connected to supervisor logs follow")
-
-	if err := streamHACommandToWS(conn, []string{"supervisor", "logs", "--follow"}); err != nil {
-		log.Printf("Error streaming supervisor logs: %v", err)
-	}
-
-	log.Println("Client disconnected from supervisor logs follow")
-}
-
-func handleHostLogsFollow(w http.ResponseWriter, r *http.Request) {
-	conn, err := upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		log.Printf("WebSocket upgrade failed: %v", err)
-		return
-	}
-	defer conn.Close()
-
-	log.Println("Client connected to host logs follow")
-
-	if err := streamHACommandToWS(conn, []string{"host", "logs", "--follow"}); err != nil {
-		log.Printf("Error streaming host logs: %v", err)
-	}
-
-	log.Println("Client disconnected from host logs follow")
-}
-
-func handleAudioLogsFollow(w http.ResponseWriter, r *http.Request) {
-	conn, err := upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		log.Printf("WebSocket upgrade failed: %v", err)
-		return
-	}
-	defer conn.Close()
-
-	log.Println("Client connected to audio logs follow")
-
-	if err := streamHACommandToWS(conn, []string{"audio", "logs", "--follow"}); err != nil {
-		log.Printf("Error streaming audio logs: %v", err)
-	}
-
-	log.Println("Client disconnected from audio logs follow")
-}
-
-func handleDNSLogsFollow(w http.ResponseWriter, r *http.Request) {
-	conn, err := upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		log.Printf("WebSocket upgrade failed: %v", err)
-		return
-	}
-	defer conn.Close()
-
-	log.Println("Client connected to dns logs follow")
-
-	if err := streamHACommandToWS(conn, []string{"dns", "logs", "--follow"}); err != nil {
-		log.Printf("Error streaming dns logs: %v", err)
-	}
-
-	log.Println("Client disconnected from dns logs follow")
-}
-
-func handleMulticastLogsFollow(w http.ResponseWriter, r *http.Request) {
-	conn, err := upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		log.Printf("WebSocket upgrade failed: %v", err)
-		return
-	}
-	defer conn.Close()
-
-	log.Println("Client connected to multicast logs follow")
-
-	if err := streamHACommandToWS(conn, []string{"multicast", "logs", "--follow"}); err != nil {
-		log.Printf("Error streaming multicast logs: %v", err)
-	}
-
-	log.Println("Client disconnected from multicast logs follow")
-}
-
-func listEndpoints(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodGet {
-		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
-		return
-	}
-
-	endpoints := map[string]string{
-		"core":       "/api/logs/core",
-		"supervisor": "/api/logs/supervisor",
-		"host":       "/api/logs/host",
-		"audio":      "/api/logs/audio",
-		"dns":        "/api/logs/dns",
-		"multicast":  "/api/logs/multicast",
-		"health":     "/health",
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	w.Header().Set("Access-Control-Allow-Origin", "*")
-	json.NewEncoder(w).Encode(endpoints)
-}
-
-func main() {
-	port := os.Getenv("PORT")
-	if port == "" {
-		port = "5642"
-	}
-
-	// Register handlers
-	http.HandleFunc("/api/logs", listEndpoints)
-	http.HandleFunc("/api/logs/core", handleCoreLogs)
-	http.HandleFunc("/api/logs/supervisor", handleSupervisorLogs)
-	http.HandleFunc("/api/logs/host", handleHostLogs)
-	http.HandleFunc("/api/logs/audio", handleAudioLogs)
-	http.HandleFunc("/api/logs/dns", handleDNSLogs)
-	http.HandleFunc("/api/logs/multicast", handleMulticastLogs)
-
-	// WebSocket follow endpoints
-	http.HandleFunc("/api/logs/core/follow", handleCoreLogsFollow)
-	http.HandleFunc("/api/logs/supervisor/follow", handleSupervisorLogsFollow)
-	http.HandleFunc("/api/logs/host/follow", handleHostLogsFollow)
-	http.HandleFunc("/api/logs/audio/follow", handleAudioLogsFollow)
-	http.HandleFunc("/api/logs/dns/follow", handleDNSLogsFollow)
-	http.HandleFunc("/api/logs/multicast/follow", handleMulticastLogsFollow)
-
-	http.HandleFunc("/health", func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte("OK"))
-	})
-
-	log.Printf("Starting HA Logs Proxy on port %s", port)
-	log.Printf("Available endpoints:")
-	log.Printf("  GET /api/logs - List all endpoints")
-	log.Printf("  GET /api/logs/core - Core logs")
-	log.Printf("  GET /api/logs/supervisor - Supervisor logs")
-	log.Printf("  GET /api/logs/host - Host logs")
-	log.Printf("  GET /api/logs/audio - Audio logs")
-	log.Printf("  GET /api/logs/dns - DNS logs")
-	log.Printf("  GET /api/logs/multicast - Multicast logs")
-	log.Printf("  WS  /api/logs/*/follow - Stream logs (WebSocket)")
-	log.Printf("  GET /health - Health check")
-
-	if err := http.ListenAndServe(":"+port, nil); err != nil {
-		log.Fatalf("Server failed to start: %v", err)
-	}
-}
@@ -1,19 +0,0 @@
---
-image: ghcr.io/home-assistant/{arch}-hassio-cli
-build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-base:3.22
-  armhf: ghcr.io/home-assistant/armhf-base:3.22
-  armv7: ghcr.io/home-assistant/armv7-base:3.22
-  amd64: ghcr.io/home-assistant/amd64-base:3.22
-  i386: ghcr.io/home-assistant/i386-base:3.22
-args:
-  CLI_VERSION: 4.42.0
-cosign:
-  enabled: true
-  repository_name: home-assistant/cli
-  repository_owner: home-assistant
-labels:
-  org.opencontainers.image.title: Home Assistant CLI
-  org.opencontainers.image.description: Home Assistant CLI for container environments
-  org.opencontainers.image.source: https://github.com/home-assistant/cli
-  org.opencontainers.image.licenses: Apache-2.0
@@ -1,16 +0,0 @@
---
-services:
-  ha-cli:
-    build:
-      context: .
-      args:
-        BUILD_FROM: alpine:3.22
-        BUILD_ARCH: amd64
-        CLI_VERSION: 4.42.0
-    image: ha-cli:local
-    ports:
-      - "5642:5642"
-    environment:
-      - PORT=5642
-    stdin_open: true
-    tty: true
@@ -1,34 +0,0 @@
-import { darkSemanticColorStyles } from "../../src/resources/theme/color/semantic.globals";
-import { darkColorStyles } from "../../src/resources/theme/color/color.globals";
-
-const mql = matchMedia("(prefers-color-scheme: dark)");
-
-function applyTheme(dark: boolean) {
-  const el = document.documentElement;
-  if (dark) {
-    el.setAttribute("dark", "");
-  } else {
-    el.removeAttribute("dark");
-  }
-}
-
-// Add dark theme styles wrapped in media query
-// This runs after append-ha-style has loaded the base theme
-const styleElement = document.createElement("style");
-styleElement.id = "auto-theme-dark";
-styleElement.textContent = `
-  @media (prefers-color-scheme: dark) {
-    ${darkSemanticColorStyles.cssText}
-    ${darkColorStyles.cssText}
-  }
-`;
-// Append to head to ensure it comes after base styles
-document.head.appendChild(styleElement);
-
-// Apply theme on initial load
-applyTheme(mql.matches);
-
-// Listen for theme changes
-mql.addEventListener("change", (e) => {
-  applyTheme(e.matches);
-});
@@ -1,8 +0,0 @@
-import "./logs-app";
-
-// Load base styles first, then apply theme
-import("../../src/resources/append-ha-style").then(() => {
-  import("./auto-theme");
-});
-
-document.body.appendChild(document.createElement("logs-app"));
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1, shrink-to-fit=no"
-    />
-    <meta name="theme-color" content="#03a9f4" />
-    <meta name="color-scheme" content="dark light" />
-    <title>Home Assistant Logs</title>
-    <% for (const entry of latestEntryJS) { %>
-      <script type="module" src="<%= entry %>"></script>
-    <% } %>
-    <style>
-      html {
-        background-color: var(--primary-background-color, #fafafa);
-        color: var(--primary-text-color, #212121);
-      }
-      @media (prefers-color-scheme: dark) {
-        html {
-          background-color: var(--primary-background-color, #111111);
-          color: var(--primary-text-color, #e1e1e1);
-        }
-      }
-      body {
-        font-family: Roboto, Noto, sans-serif;
-        -moz-osx-font-smoothing: grayscale;
-        -webkit-font-smoothing: antialiased;
-        font-weight: 400;
-        margin: 0;
-        padding: 0;
-      }
-    </style>
-  </head>
-  <body></body>
-</html>
@@ -1,24 +0,0 @@
-import { LitElement, css, html } from "lit";
-import { customElement } from "lit/decorators";
-import "./logs-viewer";
-
-@customElement("logs-app")
-class LogsApp extends LitElement {
-  render() {
-    return html`<logs-viewer></logs-viewer>`;
-  }
-
-  static styles = css`
-    :host {
-      display: block;
-      min-height: 100vh;
-      background-color: var(--primary-background-color);
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "logs-app": LogsApp;
-  }
-}
@@ -1,538 +0,0 @@
-import {
-  mdiArrowCollapseDown,
-  mdiChevronDown,
-  mdiCircle,
-  mdiDownload,
-  mdiRefresh,
-  mdiWrap,
-  mdiWrapDisabled,
-} from "@mdi/js";
-import type { CSSResultGroup } from "lit";
-import { LitElement, css, html, nothing } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
-// eslint-disable-next-line import/extensions
-import { IntersectionController } from "@lit-labs/observers/intersection-controller.js";
-import "../../src/components/ha-ansi-to-html";
-import type { HaAnsiToHtml } from "../../src/components/ha-ansi-to-html";
-import "../../src/components/ha-button";
-import "../../src/components/ha-button-menu";
-import "../../src/components/ha-card";
-import "../../src/components/ha-icon-button";
-import "../../src/components/ha-list-item";
-import "../../src/components/ha-spinner";
-import "../../src/components/ha-svg-icon";
-
-// Data types
-interface LogProvider {
-  key: string;
-  name: string;
-}
-
-@customElement("logs-viewer")
-export class LogsViewer extends LitElement {
-  @property({ type: Boolean }) public narrow = false;
-
-  @state() private _selectedLogProvider?: string;
-
-  @state() private _logProviders: LogProvider[] = [];
-
-  @state() private _loading = false;
-
-  @state() private _wrapLines = true;
-
-  @state() private _error?: string;
-
-  @state() private _newLogsIndicator?: boolean;
-
-  @query(".error-log") private _logElement?: HTMLElement;
-
-  @query("#scroll-top-marker") private _scrollTopMarkerElement?: HTMLElement;
-
-  @query("#scroll-bottom-marker")
-  private _scrollBottomMarkerElement?: HTMLElement;
-
-  @query("ha-ansi-to-html") private _ansiToHtmlElement?: HaAnsiToHtml;
-
-  @state() private _scrolledToBottomController =
-    new IntersectionController<boolean>(this, {
-      callback(this: IntersectionController<boolean>, entries) {
-        return entries[0].isIntersecting;
-      },
-    });
-
-  @state() private _scrolledToTopController =
-    new IntersectionController<boolean>(this, {});
-
-  private _ws: WebSocket | null = null;
-
-  private _apiUrl = `http://${window.location.hostname}:5642`;
-
-  private async _fetchLogs(): Promise<void> {
-    if (!this._selectedLogProvider) {
-      return;
-    }
-
-    this._loading = true;
-    this._error = undefined;
-
-    // Stop any existing websocket
-    this._stopFollowing();
-
-    // Clear existing logs
-    this._ansiToHtmlElement?.clear();
-
-    try {
-      // First, fetch the latest logs
-      const response = await fetch(
-        `${this._apiUrl}/api/logs/${this._selectedLogProvider}`
-      );
-      if (!response.ok) {
-        throw new Error(`HTTP error! status: ${response.status}`);
-      }
-
-      const data = await response.json();
-      if (data.error) {
-        throw new Error(data.error);
-      }
-
-      const logText = data.output || "";
-
-      // Parse and display initial logs
-      if (logText.trim()) {
-        this._ansiToHtmlElement?.parseTextToColoredPre(logText);
-
-        // Add divider line
-        this._ansiToHtmlElement?.parseLineToColoredPre(
-          "--- Live logs start here ---"
-        );
-      }
-
-      this._loading = false;
-
-      // Scroll to bottom after loading
-      this._scrollToBottom();
-
-      // Start streaming
-      this._startFollowing();
-    } catch (err) {
-      this._error = `Error loading logs: ${err}`;
-      this._loading = false;
-      // eslint-disable-next-line
-      console.error("Error fetching logs:", err);
-    }
-  }
-
-  private async _fetchLogProviders(): Promise<void> {
-    try {
-      const response = await fetch(`${this._apiUrl}/api/logs`);
-      if (!response.ok) {
-        throw new Error(`HTTP error! status: ${response.status}`);
-      }
-      const providers = await response.json();
-
-      // Define the order (matching backend registration order)
-      const order = ["core", "supervisor", "host", "audio", "dns", "multicast"];
-
-      // Convert object to array of providers, filter out health endpoint, and sort
-      this._logProviders = Object.entries(providers)
-        .filter(([key]) => key !== "health")
-        .map(([key]) => ({
-          key,
-          name: key.charAt(0).toUpperCase() + key.slice(1),
-        }))
-        .sort((a, b) => order.indexOf(a.key) - order.indexOf(b.key));
-
-      // Set default provider once loaded
-      if (this._logProviders.length > 0 && !this._selectedLogProvider) {
-        this._selectedLogProvider = this._logProviders[0].key;
-        await this._fetchLogs();
-      }
-    } catch (err) {
-      this._error = `Failed to load log providers: ${err}`;
-      // eslint-disable-next-line
-      console.error("Error fetching log providers:", err);
-    }
-  }
-
-  connectedCallback() {
-    super.connectedCallback();
-    this._fetchLogProviders();
-  }
-
-  disconnectedCallback() {
-    super.disconnectedCallback();
-    this._stopFollowing();
-  }
-
-  protected firstUpdated() {
-    this._scrolledToBottomController.observe(this._scrollBottomMarkerElement!);
-    this._scrolledToTopController.observe(this._scrollTopMarkerElement!);
-  }
-
-  protected updated() {
-    if (this._newLogsIndicator && this._scrolledToBottomController.value) {
-      this._newLogsIndicator = false;
-    }
-  }
-
-  private _selectProvider(ev: Event) {
-    const target = ev.currentTarget as any;
-    this._selectedLogProvider = target.provider;
-    this._fetchLogs();
-  }
-
-  private _refresh() {
-    this._fetchLogs();
-  }
-
-  private _toggleLineWrap() {
-    this._wrapLines = !this._wrapLines;
-  }
-
-  private _scrollToBottom(): void {
-    if (this._logElement) {
-      this._newLogsIndicator = false;
-      this._logElement.scrollTo(0, this._logElement.scrollHeight);
-    }
-  }
-
-  private _startFollowing() {
-    if (!this._selectedLogProvider) {
-      return;
-    }
-
-    this._stopFollowing();
-    this._error = undefined;
-
-    const wsProtocol = window.location.protocol === "https:" ? "wss:" : "ws:";
-    const wsUrl = `${wsProtocol}//${window.location.hostname}:5642/api/logs/${this._selectedLogProvider}/follow`;
-
-    try {
-      this._ws = new WebSocket(wsUrl);
-
-      this._ws.onopen = () => {
-        // eslint-disable-next-line
-        console.log("WebSocket connected");
-      };
-
-      this._ws.onmessage = (event) => {
-        const scrolledToBottom = this._scrolledToBottomController.value;
-
-        // Add the new line to the display
-        this._ansiToHtmlElement?.parseLineToColoredPre(event.data);
-
-        // Auto-scroll if user is at bottom
-        if (scrolledToBottom && this._logElement) {
-          this._scrollToBottom();
-        } else {
-          this._newLogsIndicator = true;
-        }
-      };
-
-      this._ws.onerror = (error) => {
-        // eslint-disable-next-line
-        console.error("WebSocket error:", error);
-        this._error = "WebSocket connection error";
-      };
-
-      this._ws.onclose = () => {
-        // eslint-disable-next-line
-        console.log("WebSocket disconnected");
-      };
-    } catch (err) {
-      this._error = `Failed to start following logs: ${err}`;
-      // eslint-disable-next-line
-      console.error("Error starting WebSocket:", err);
-    }
-  }
-
-  private _stopFollowing() {
-    if (this._ws) {
-      this._ws.close();
-      this._ws = null;
-    }
-  }
-
-  private _downloadLogs() {
-    if (!this._selectedLogProvider || !this._ansiToHtmlElement) {
-      return;
-    }
-
-    // Get the text content from the logs
-    const logText =
-      this._ansiToHtmlElement.shadowRoot?.querySelector("pre")?.textContent ||
-      "";
-
-    if (!logText.trim()) {
-      return;
-    }
-
-    // Create blob from log text
-    const blob = new Blob([logText], { type: "text/plain" });
-    const url = URL.createObjectURL(blob);
-
-    // Create download link and trigger it
-    const a = document.createElement("a");
-    a.href = url;
-    a.download = `${this._selectedLogProvider}-logs-${Date.now()}.txt`;
-    document.body.appendChild(a);
-    a.click();
-
-    // Cleanup
-    document.body.removeChild(a);
-    URL.revokeObjectURL(url);
-  }
-
-  render() {
-    const currentProvider = this._logProviders.find(
-      (p) => p.key === this._selectedLogProvider
-    );
-
-    return html`
-      <div class="container">
-        <div class="toolbar">
-          <ha-button-menu>
-            <ha-button slot="trigger" appearance="filled">
-              <ha-svg-icon slot="end" .path=${mdiChevronDown}></ha-svg-icon>
-              ${currentProvider?.name || "Select Provider"}
-            </ha-button>
-            ${this._logProviders.map(
-              (provider) => html`
-                <ha-list-item
-                  ?selected=${provider.key === this._selectedLogProvider}
-                  .provider=${provider.key}
-                  @click=${this._selectProvider}
-                >
-                  ${provider.name}
-                </ha-list-item>
-              `
-            )}
-          </ha-button-menu>
-        </div>
-
-        <div class="content">
-          <div class="error-log-intro">
-            <ha-card outlined>
-              <div class="header">
-                <h1 class="card-header">${currentProvider?.name || "Logs"}</h1>
-                <div class="action-buttons">
-                  <ha-icon-button
-                    .path=${mdiDownload}
-                    @click=${this._downloadLogs}
-                    .label=${"Download logs"}
-                    .disabled=${!this._ansiToHtmlElement}
-                  ></ha-icon-button>
-                  <ha-icon-button
-                    .path=${this._wrapLines ? mdiWrapDisabled : mdiWrap}
-                    @click=${this._toggleLineWrap}
-                    .label=${this._wrapLines ? "Full width" : "Wrap lines"}
-                  ></ha-icon-button>
-                  <ha-icon-button
-                    .path=${mdiRefresh}
-                    @click=${this._refresh}
-                    .label=${"Refresh"}
-                    .disabled=${!this._selectedLogProvider}
-                  ></ha-icon-button>
-                </div>
-              </div>
-              <div class="card-content error-log">
-                <div id="scroll-top-marker"></div>
-                ${this._loading
-                  ? html`<div>Loading logs...</div>`
-                  : this._error
-                    ? html`<div class="error">${this._error}</div>`
-                    : nothing}
-                <ha-ansi-to-html
-                  ?wrap-disabled=${!this._wrapLines}
-                ></ha-ansi-to-html>
-                <div id="scroll-bottom-marker"></div>
-              </div>
-              <ha-button
-                class="new-logs-indicator ${classMap({
-                  visible:
-                    (this._newLogsIndicator &&
-                      !this._scrolledToBottomController.value) ||
-                    false,
-                })}"
-                size="small"
-                appearance="filled"
-                @click=${this._scrollToBottom}
-              >
-                <ha-svg-icon
-                  .path=${mdiArrowCollapseDown}
-                  slot="start"
-                ></ha-svg-icon>
-                Scroll down
-                <ha-svg-icon
-                  .path=${mdiArrowCollapseDown}
-                  slot="end"
-                ></ha-svg-icon>
-              </ha-button>
-              ${this._ws && !this._error
-                ? html`<div class="live-indicator">
-                    <ha-svg-icon .path=${mdiCircle}></ha-svg-icon>
-                    Live
-                  </div>`
-                : nothing}
-            </ha-card>
-          </div>
-        </div>
-      </div>
-    `;
-  }
-
-  static styles: CSSResultGroup = css`
-    :host {
-      display: block;
-      direction: var(--direction);
-    }
-
-    .container {
-      max-width: 1200px;
-      margin: 0 auto;
-    }
-
-    .toolbar {
-      padding: var(--ha-space-2) var(--ha-space-4);
-      display: flex;
-      justify-content: flex-end;
-      gap: var(--ha-space-2);
-    }
-
-    .content {
-      direction: ltr;
-    }
-
-    .error-log-intro {
-      text-align: center;
-      margin: 0 var(--ha-space-4);
-    }
-
-    ha-card {
-      padding-top: var(--ha-space-2);
-      position: relative;
-    }
-
-    .header {
-      display: flex;
-      justify-content: space-between;
-      padding: 0 var(--ha-space-4);
-    }
-
-    .action-buttons {
-      display: flex;
-      align-items: center;
-      height: 100%;
-    }
-
-    .card-header {
-      color: var(--ha-card-header-color, var(--primary-text-color));
-      font-family: var(--ha-card-header-font-family, inherit);
-      font-size: var(--ha-card-header-font-size, var(--ha-font-size-2xl));
-      letter-spacing: -0.012em;
-      line-height: var(--ha-line-height-expanded);
-      display: block;
-      margin-block-start: 0px;
-      font-weight: var(--ha-font-weight-normal);
-      white-space: nowrap;
-      max-width: calc(100% - 150px);
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-
-    .error-log {
-      position: relative;
-      font-family: var(--ha-font-family-code);
-      clear: both;
-      text-align: start;
-      padding-top: var(--ha-space-4);
-      padding-bottom: var(--ha-space-4);
-      overflow-y: scroll;
-      min-height: var(--error-log-card-height, calc(100vh - 244px));
-      max-height: var(--error-log-card-height, calc(100vh - 244px));
-      border-top: 1px solid var(--divider-color);
-      direction: ltr;
-    }
-
-    .error-log > div {
-      padding: 0 var(--ha-space-4);
-      overflow: auto;
-    }
-
-    .error {
-      color: var(--error-color);
-      padding: var(--ha-space-4);
-    }
-
-    .new-logs-indicator {
-      overflow: hidden;
-      position: absolute;
-      bottom: var(--ha-space-1);
-      left: var(--ha-space-1);
-      height: 0;
-      transition: height 0.4s ease-out;
-    }
-
-    .new-logs-indicator.visible {
-      height: 32px;
-    }
-
-    @keyframes breathe {
-      from {
-        opacity: 0.8;
-      }
-      to {
-        opacity: 0;
-      }
-    }
-
-    .live-indicator {
-      position: absolute;
-      bottom: 0;
-      inset-inline-end: var(--ha-space-4);
-      border-top-right-radius: var(--ha-space-2);
-      border-top-left-radius: var(--ha-space-2);
-      background-color: var(--primary-color);
-      color: var(--text-primary-color);
-      padding: var(--ha-space-1) var(--ha-space-2);
-      opacity: 0.8;
-    }
-
-    .live-indicator ha-svg-icon {
-      animation: breathe 1s cubic-bezier(0.5, 0, 1, 1) infinite alternate;
-      height: 14px;
-      width: 14px;
-    }
-
-    @media all and (max-width: 870px) {
-      .error-log {
-        min-height: var(--error-log-card-height, calc(100vh - 190px));
-        max-height: var(--error-log-card-height, calc(100vh - 190px));
-      }
-
-      ha-button-menu {
-        max-width: 50%;
-      }
-
-      ha-button {
-        max-width: 100%;
-      }
-
-      ha-button::part(label) {
-        overflow: hidden;
-        white-space: nowrap;
-      }
-    }
-
-    ha-list-item[selected] {
-      color: var(--primary-color);
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "logs-viewer": LogsViewer;
-  }
-}
@@ -28,8 +28,8 @@
  "dependencies": {
    "@babel/runtime": "7.28.4",
    "@braintree/sanitize-url": "7.1.1",
-    "@codemirror/autocomplete": "6.19.1",
-    "@codemirror/commands": "6.10.0",
+    "@codemirror/autocomplete": "6.19.0",
+    "@codemirror/commands": "6.9.0",
    "@codemirror/language": "6.11.3",
    "@codemirror/legacy-modes": "6.5.2",
    "@codemirror/search": "6.5.11",
@@ -52,8 +52,8 @@
    "@fullcalendar/list": "6.1.19",
    "@fullcalendar/luxon3": "6.1.19",
    "@fullcalendar/timegrid": "6.1.19",
-    "@home-assistant/webawesome": "3.0.0-beta.6.ha.7",
-    "@lezer/highlight": "1.2.3",
+    "@home-assistant/webawesome": "3.0.0-beta.6.ha.5",
+    "@lezer/highlight": "1.2.2",
    "@lit-labs/motion": "1.0.9",
    "@lit-labs/observers": "2.0.6",
    "@lit-labs/virtualizer": "2.1.1",
@@ -81,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": "2.4.1",
+    "@material/web": "2.4.0",
    "@mdi/js": "7.4.47",
    "@mdi/svg": "7.4.47",
    "@replit/codemirror-indentation-markers": "6.5.3",
@@ -89,8 +89,8 @@
    "@thomasloven/round-slider": "0.6.0",
    "@tsparticles/engine": "3.9.1",
    "@tsparticles/preset-links": "3.2.0",
-    "@vaadin/combo-box": "24.9.4",
-    "@vaadin/vaadin-themable-mixin": "24.9.4",
+    "@vaadin/combo-box": "24.9.2",
+    "@vaadin/vaadin-themable-mixin": "24.9.2",
    "@vibrant/color": "4.0.0",
    "@vue/web-component-wrapper": "1.3.0",
    "@webcomponents/scoped-custom-element-registry": "0.0.10",
@@ -111,7 +111,7 @@
    "fuse.js": "7.1.0",
    "google-timezones-json": "1.2.0",
    "gulp-zopfli-green": "6.0.2",
-    "hls.js": "1.6.14",
+    "hls.js": "1.6.13",
    "home-assistant-js-websocket": "9.5.0",
    "idb-keyval": "6.2.2",
    "intl-messageformat": "10.7.18",
@@ -148,17 +148,17 @@
    "xss": "1.0.15"
  },
  "devDependencies": {
-    "@babel/core": "7.28.5",
+    "@babel/core": "7.28.4",
    "@babel/helper-define-polyfill-provider": "0.6.5",
-    "@babel/plugin-transform-runtime": "7.28.5",
-    "@babel/preset-env": "7.28.5",
-    "@bundle-stats/plugin-webpack-filter": "4.21.6",
+    "@babel/plugin-transform-runtime": "7.28.3",
+    "@babel/preset-env": "7.28.3",
+    "@bundle-stats/plugin-webpack-filter": "4.21.5",
    "@lokalise/node-api": "15.3.1",
-    "@octokit/auth-oauth-device": "8.0.3",
-    "@octokit/plugin-retry": "8.0.3",
-    "@octokit/rest": "22.0.1",
-    "@rsdoctor/rspack-plugin": "1.3.7",
-    "@rspack/core": "1.6.0",
+    "@octokit/auth-oauth-device": "8.0.2",
+    "@octokit/plugin-retry": "8.0.2",
+    "@octokit/rest": "22.0.0",
+    "@rsdoctor/rspack-plugin": "1.3.3",
+    "@rspack/core": "1.5.8",
    "@rspack/dev-server": "1.1.4",
    "@types/babel__plugin-transform-runtime": "7.9.5",
    "@types/chromecast-caf-receiver": "6.0.22",
@@ -173,17 +173,17 @@
    "@types/lodash.merge": "4.6.9",
    "@types/luxon": "3.7.1",
    "@types/mocha": "10.0.10",
-    "@types/qrcode": "1.5.6",
-    "@types/sortablejs": "1.15.9",
+    "@types/qrcode": "1.5.5",
+    "@types/sortablejs": "1.15.8",
    "@types/tar": "6.1.13",
    "@types/ua-parser-js": "0.7.39",
    "@types/webspeechapi": "0.0.29",
-    "@vitest/coverage-v8": "4.0.6",
+    "@vitest/coverage-v8": "3.2.4",
    "babel-loader": "10.0.0",
    "babel-plugin-template-html-minifier": "4.1.0",
    "browserslist-useragent-regexp": "4.1.3",
    "del": "8.0.1",
-    "eslint": "9.39.1",
+    "eslint": "9.38.0",
    "eslint-config-airbnb-base": "15.0.0",
    "eslint-config-prettier": "10.1.8",
    "eslint-import-resolver-webpack": "0.13.10",
@@ -201,9 +201,9 @@
    "gulp-rename": "2.1.0",
    "html-minifier-terser": "7.2.0",
    "husky": "9.1.7",
-    "jsdom": "27.1.0",
+    "jsdom": "27.0.1",
    "jszip": "3.10.1",
-    "lint-staged": "16.2.6",
+    "lint-staged": "16.2.4",
    "lit-analyzer": "2.0.3",
    "lodash.merge": "4.6.2",
    "lodash.template": "4.5.0",
@@ -213,13 +213,13 @@
    "rspack-manifest-plugin": "5.1.0",
    "serve": "14.2.5",
    "sinon": "21.0.0",
-    "tar": "7.5.2",
+    "tar": "7.5.1",
    "terser-webpack-plugin": "5.3.14",
    "ts-lit-plugin": "2.0.2",
    "typescript": "5.9.3",
-    "typescript-eslint": "8.46.3",
+    "typescript-eslint": "8.46.1",
    "vite-tsconfig-paths": "5.1.4",
-    "vitest": "4.0.6",
+    "vitest": "3.2.4",
    "webpack-stats-plugin": "1.1.3",
    "webpackbar": "7.0.0",
    "workbox-build": "patch:workbox-build@npm%3A7.1.1#~/.yarn/patches/workbox-build-npm-7.1.1-a854f3faae.patch"
@@ -231,12 +231,9 @@
    "clean-css": "5.3.3",
    "@lit/reactive-element": "2.1.1",
    "@fullcalendar/daygrid": "6.1.19",
-    "globals": "16.5.0",
+    "globals": "16.4.0",
    "tslib": "2.8.1",
    "@material/mwc-list@^0.27.0": "patch:@material/mwc-list@npm%3A0.27.0#~/.yarn/patches/@material-mwc-list-npm-0.27.0-5344fc9de4.patch"
  },
-  "packageManager": "[email protected]",
-  "volta": {
-    "node": "22.21.1"
-  }
+  "packageManager": "[email protected]"
 }
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name         = "home-assistant-frontend"
-version      = "20251029.0"
+version      = "20250924.0"
 license      = "Apache-2.0"
 license-files = ["LICENSE*"]
 description  = "The Home Assistant frontend"
@@ -1,96 +0,0 @@
-#!/bin/sh
-# Run the logs frontend development server
-
-# Stop on errors
-set -e
-
-cd "$(dirname "$0")/.."
-
-# Parse command line arguments
-SUPERVISOR_ENDPOINT=""
-SUPERVISOR_API_TOKEN=""
-
-while getopts "c:t:h" opt; do
-  case $opt in
-    c)
-      SUPERVISOR_ENDPOINT="$OPTARG"
-      ;;
-    t)
-      SUPERVISOR_API_TOKEN="$OPTARG"
-      ;;
-    h)
-      echo "Usage: $0 -c SUPERVISOR_ENDPOINT -t SUPERVISOR_API_TOKEN"
-      echo ""
-      echo "Options:"
-      echo "  -c  SUPERVISOR_ENDPOINT (e.g., http://192.168.1.2) [required]"
-      echo "  -t  SUPERVISOR_API_TOKEN (from remote_api add-on) [required]"
-      echo "  -h  Show this help message"
-      echo ""
-      echo "Example:"
-      echo "  $0 -c http://192.168.1.2 -t your_token_here"
-      exit 0
-      ;;
-    \?)
-      echo "Invalid option: -$OPTARG" >&2
-      echo "Use -h for help"
-      exit 1
-      ;;
-  esac
-done
-
-# Validate that both -c and -t are provided
-if [ -z "$SUPERVISOR_ENDPOINT" ] || [ -z "$SUPERVISOR_API_TOKEN" ]; then
-  echo "Error: Both -c and -t are required" >&2
-  echo "Use -h for help"
-  exit 1
-fi
-
-# Cleanup function
-cleanup() {
-  echo ""
-  echo "Shutting down..."
-  echo "Stopping HA CLI container..."
-  docker stop ha-cli-dev 2>/dev/null || true
-  exit 0
-}
-
-# Set up trap to cleanup on exit
-trap cleanup INT TERM EXIT
-
-# Run HA CLI container
-echo "Starting HA CLI container..."
-
-# Build the container if needed
-if ! docker images | grep -q "ha-cli:local"; then
-  echo "Building HA CLI container..."
-  (cd logs && docker compose build)
-fi
-
-# Clean up any existing container
-docker stop ha-cli-dev 2>/dev/null || true
-
-# Run the container in background (not detached, so it shares stdout)
-docker run \
-  --name ha-cli-dev \
-  --rm \
-  -p 5642:5642 \
-  -e SUPERVISOR_ENDPOINT="$SUPERVISOR_ENDPOINT" \
-  -e SUPERVISOR_API_TOKEN="$SUPERVISOR_API_TOKEN" \
-  -e PORT=5642 \
-  ha-cli:local &
-
-# Store the docker process ID
-DOCKER_PID=$!
-
-# Wait a moment for container to start
-sleep 2
-echo ""
-echo "HA Logs Backend API: http://localhost:5642"
-echo "  GET  /api/logs - List endpoints"
-echo "  GET  /api/logs/core - Core logs"
-echo "  GET  /api/logs/supervisor - Supervisor logs"
-echo "  GET  /health - Health check"
-echo ""
-
-# Run gulp (this will block until Ctrl+C)
-./node_modules/.bin/gulp develop-logs
@@ -1,5 +1,4 @@
 /* eslint-disable lit/prefer-static-styles */
-import { mdiOpenInNew } from "@mdi/js";
 import type { PropertyValues } from "lit";
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
@@ -7,8 +6,6 @@ import punycode from "punycode";
 import { applyThemesOnElement } from "../common/dom/apply_themes_on_element";
 import { extractSearchParamsObject } from "../common/url/search-params";
 import "../components/ha-alert";
-import "../components/ha-button";
-import "../components/ha-svg-icon";
 import type { AuthProvider, AuthUrlSearchParams } from "../data/auth";
 import { fetchAuthProviders } from "../data/auth";
 import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
@@ -136,8 +133,25 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
          justify-content: space-between;
          align-items: center;
        }
-        .footer ha-svg-icon {
-          --mdc-icon-size: var(--ha-space-5);
+        ha-language-picker {
+          width: 200px;
+          border-radius: var(--ha-border-radius-sm);
+          overflow: hidden;
+          --ha-select-height: 40px;
+          --mdc-select-fill-color: none;
+          --mdc-select-label-ink-color: var(--primary-text-color, #212121);
+          --mdc-select-ink-color: var(--primary-text-color, #212121);
+          --mdc-select-idle-line-color: transparent;
+          --mdc-select-hover-line-color: transparent;
+          --mdc-select-dropdown-icon-color: var(--primary-text-color, #212121);
+          --mdc-shape-small: 0;
+        }
+        .footer a {
+          text-decoration: none;
+          color: var(--primary-text-color);
+          margin-right: 16px;
+          margin-inline-end: 16px;
+          margin-inline-start: initial;
        }
        h1 {
          font-size: var(--ha-font-size-3xl);
@@ -191,21 +205,16 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
        <ha-language-picker
          .value=${this.language}
          .label=${""}
-          button-style
          native-name
          @value-changed=${this._languageChanged}
          inline-arrow
        ></ha-language-picker>
-        <ha-button
-          appearance="plain"
-          variant="neutral"
+        <a
          href="https://www.home-assistant.io/docs/authentication/"
          target="_blank"
          rel="noreferrer noopener"
+          >${this.localize("ui.panel.page-authorize.help")}</a
        >
-          ${this.localize("ui.panel.page-authorize.help")}
-          <ha-svg-icon slot="end" .path=${mdiOpenInNew}></ha-svg-icon>
-        </ha-button>
      </div>
    `;
  }
@@ -9,9 +9,9 @@ type EntityCategory = "none" | "config" | "diagnostic";
 export interface EntityFilter {
  domain?: string | string[];
  device_class?: string | string[];
-  device?: string | null | (string | null)[];
-  area?: string | null | (string | null)[];
-  floor?: string | null | (string | null)[];
+  device?: string | string[];
+  area?: string | string[];
+  floor?: string | string[];
  label?: string | string[];
  entity_category?: EntityCategory | EntityCategory[];
  hidden_platform?: string | string[];
@@ -19,18 +19,6 @@ export interface EntityFilter {

 export type EntityFilterFunc = (entityId: string) => boolean;

-const normalizeFilterArray = <T>(
-  value: T | null | T[] | (T | null)[] | undefined
-): Set<T | null> | undefined => {
-  if (value === undefined) {
-    return undefined;
-  }
-  if (value === null) {
-    return new Set([null]);
-  }
-  return new Set(ensureArray(value));
-};
-
 export const generateEntityFilter = (
  hass: HomeAssistant,
  filter: EntityFilter
@@ -41,9 +29,11 @@ export const generateEntityFilter = (
  const deviceClasses = filter.device_class
    ? new Set(ensureArray(filter.device_class))
    : undefined;
-  const floors = normalizeFilterArray(filter.floor);
-  const areas = normalizeFilterArray(filter.area);
-  const devices = normalizeFilterArray(filter.device);
+  const floors = filter.floor ? new Set(ensureArray(filter.floor)) : undefined;
+  const areas = filter.area ? new Set(ensureArray(filter.area)) : undefined;
+  const devices = filter.device
+    ? new Set(ensureArray(filter.device))
+    : undefined;
  const entityCategories = filter.entity_category
    ? new Set(ensureArray(filter.entity_category))
    : undefined;
@@ -83,20 +73,23 @@ export const generateEntityFilter = (
    }

    if (floors) {
-      const floorId = floor?.floor_id ?? null;
-      if (!floors.has(floorId)) {
+      if (!floor || !floors.has(floor.floor_id)) {
        return false;
      }
    }
    if (areas) {
-      const areaId = area?.area_id ?? null;
-      if (!areas.has(areaId)) {
+      if (!area) {
+        return false;
+      }
+      if (!areas.has(area.area_id)) {
        return false;
      }
    }
    if (devices) {
-      const deviceId = device?.id ?? null;
-      if (!devices.has(deviceId)) {
+      if (!device) {
+        return false;
+      }
+      if (!devices.has(device.id)) {
        return false;
      }
    }
@@ -214,7 +214,6 @@ const FIXED_DOMAIN_ATTRIBUTE_STATES = {
      "pm1",
      "pm10",
      "pm25",
-      "pm4",
      "power_factor",
      "power",
      "pressure",
@@ -1,116 +0,0 @@
-export interface SwipeGestureResult {
-  velocity: number;
-  delta: number;
-  isSwipe: boolean;
-  isDownwardSwipe: boolean;
-}
-
-export interface SwipeGestureConfig {
-  velocitySwipeThreshold?: number;
-  movementTimeThreshold?: number;
-}
-
-const VELOCITY_SWIPE_THRESHOLD = 0.5; // px/ms
-const MOVEMENT_TIME_THRESHOLD = 100; // ms
-
-/**
- * Recognizes swipe gestures and calculates velocity for touch interactions.
- * Tracks touch movement and provides velocity-based and position-based gesture detection.
- */
-export class SwipeGestureRecognizer {
-  private _startY = 0;
-
-  private _delta = 0;
-
-  private _startTime = 0;
-
-  private _lastY = 0;
-
-  private _lastTime = 0;
-
-  private _velocityThreshold: number;
-
-  private _movementTimeThreshold: number;
-
-  constructor(config: SwipeGestureConfig = {}) {
-    this._velocityThreshold =
-      config.velocitySwipeThreshold ?? VELOCITY_SWIPE_THRESHOLD; // px/ms
-    this._movementTimeThreshold =
-      config.movementTimeThreshold ?? MOVEMENT_TIME_THRESHOLD; // ms
-  }
-
-  /**
-   * Initialize gesture tracking with starting touch position
-   */
-  public start(clientY: number): void {
-    const now = Date.now();
-    this._startY = clientY;
-    this._startTime = now;
-    this._lastY = clientY;
-    this._lastTime = now;
-    this._delta = 0;
-  }
-
-  /**
-   * Update gesture state during movement
-   * Returns the current delta (negative when dragging down)
-   */
-  public move(clientY: number): number {
-    const now = Date.now();
-    this._delta = this._startY - clientY;
-    this._lastY = clientY;
-    this._lastTime = now;
-    return this._delta;
-  }
-
-  /**
-   * Calculate final gesture result when touch ends
-   */
-  public end(): SwipeGestureResult {
-    const velocity = this.getVelocity();
-    const hasSignificantVelocity = Math.abs(velocity) > this._velocityThreshold;
-
-    return {
-      velocity,
-      delta: this._delta,
-      isSwipe: hasSignificantVelocity,
-      isDownwardSwipe: velocity > 0,
-    };
-  }
-
-  /**
-   * Get current drag delta (negative when dragging down)
-   */
-  public getDelta(): number {
-    return this._delta;
-  }
-
-  /**
-   * Calculate velocity based on recent movement
-   * Returns 0 if no recent movement detected
-   * Positive velocity means downward swipe
-   */
-  public getVelocity(): number {
-    const now = Date.now();
-    const timeSinceLastMove = now - this._lastTime;
-
-    // Only consider velocity if the last movement was recent
-    if (timeSinceLastMove >= this._movementTimeThreshold) {
-      return 0;
-    }
-
-    const timeDelta = this._lastTime - this._startTime;
-    return timeDelta > 0 ? (this._lastY - this._startY) / timeDelta : 0;
-  }
-
-  /**
-   * Reset all tracking state
-   */
-  public reset(): void {
-    this._startY = 0;
-    this._delta = 0;
-    this._startTime = 0;
-    this._lastY = 0;
-    this._lastTime = 0;
-  }
-}
@@ -88,21 +88,9 @@ export class HaChartBase extends LitElement {

  private _lastTapTime?: number;

-  private _shouldResizeChart = false;
-
-  private _resizeAnimationDuration?: number;
-
  // @ts-ignore
  private _resizeController = new ResizeController(this, {
-    callback: () => {
-      if (this.chart) {
-        if (!this.chart.getZr().animation.isFinished()) {
-          this._shouldResizeChart = true;
-        } else {
-          this.chart.resize();
-        }
-      }
-    },
+    callback: () => this.chart?.resize(),
  });

  private _loading = false;
@@ -207,16 +195,6 @@ export class HaChartBase extends LitElement {
    }
    if (changedProps.has("options")) {
      chartOptions = { ...chartOptions, ...this._createOptions() };
-      if (
-        this._compareCustomLegendOptions(
-          changedProps.get("options"),
-          this.options
-        )
-      ) {
-        // custom legend changes may require a resize to layout properly
-        this._shouldResizeChart = true;
-        this._resizeAnimationDuration = 250;
-      }
    } else if (this._isTouchDevice && changedProps.has("_isZoomed")) {
      chartOptions.dataZoom = this._getDataZoomConfig();
    }
@@ -308,7 +286,7 @@ export class HaChartBase extends LitElement {
          itemStyle = {
            color: dataset?.color as string,
            ...(dataset?.itemStyle as { borderColor?: string }),
-            ...itemStyle,
+            itemStyle,
          };
          const color = itemStyle?.color as string;
          const borderColor = itemStyle?.borderColor as string;
@@ -388,7 +366,6 @@ export class HaChartBase extends LitElement {
      if (!this.options?.dataZoom) {
        this.chart.getZr().on("dblclick", this._handleClickZoom);
      }
-      this.chart.on("finished", this._handleChartRenderFinished);
      if (this._isTouchDevice) {
        this.chart.getZr().on("click", (e: ECElementEvent) => {
          if (!e.zrByTouch) {
@@ -520,7 +497,6 @@ export class HaChartBase extends LitElement {
        );
      }
    });
-    this.requestUpdate("_hiddenDatasets");
  }

  private _getDataZoomConfig(): DataZoomComponentOption | undefined {
@@ -654,13 +630,6 @@ export class HaChartBase extends LitElement {
          textBorderWidth: 2,
        },
      },
-      pie: {
-        label: {
-          color: style.getPropertyValue("--primary-text-color"),
-          textBorderColor: style.getPropertyValue("--primary-background-color"),
-          textBorderWidth: 2,
-        },
-      },
      sankey: {
        label: {
          color: style.getPropertyValue("--primary-text-color"),
@@ -976,36 +945,6 @@ export class HaChartBase extends LitElement {
    });
  }

-  private _handleChartRenderFinished = () => {
-    if (this._shouldResizeChart) {
-      this.chart?.resize({
-        animation:
-          this._reducedMotion ||
-          typeof this._resizeAnimationDuration !== "number"
-            ? undefined
-            : { duration: this._resizeAnimationDuration },
-      });
-      this._shouldResizeChart = false;
-      this._resizeAnimationDuration = undefined;
-    }
-  };
-
-  private _compareCustomLegendOptions(
-    oldOptions: ECOption | undefined,
-    newOptions: ECOption | undefined
-  ): boolean {
-    const oldLegends = ensureArray(
-      oldOptions?.legend || []
-    ) as LegendComponentOption[];
-    const newLegends = ensureArray(
-      newOptions?.legend || []
-    ) as LegendComponentOption[];
-    return (
-      oldLegends.some((l) => l.show && l.type === "custom") !==
-      newLegends.some((l) => l.show && l.type === "custom")
-    );
-  }
-
  static styles = css`
    :host {
      display: block;
@@ -87,8 +87,6 @@ export class StateHistoryChartLine extends LitElement {

  private _previousYAxisLabelValue = 0;

-  private _yAxisMaximumFractionDigits = 0;
-
  protected render() {
    return html`
      <ha-chart-base
@@ -759,12 +757,8 @@ export class StateHistoryChartLine extends LitElement {
        Math.log10(Math.abs(value - this._previousYAxisLabelValue || 1))
      )
    );
-    this._yAxisMaximumFractionDigits = Math.max(
-      this._yAxisMaximumFractionDigits,
-      maximumFractionDigits
-    );
    const label = formatNumber(value, this.hass.locale, {
-      maximumFractionDigits: this._yAxisMaximumFractionDigits,
+      maximumFractionDigits,
    });
    const width = measureTextWidth(label, 12) + 5;
    if (width > this._yWidth) {
@@ -1 +0,0 @@
-export const ANY_STATE_VALUE = "__ANY_STATE_IGNORE_ATTRIBUTES__";
@@ -147,7 +147,6 @@ class HaEntitiesPicker extends LitElement {
          .createDomains=${this.createDomains}
          .required=${this.required && !currentEntities.length}
          @value-changed=${this._addEntity}
-          .addButton=${currentEntities.length > 0}
        ></ha-entity-picker>
      </div>
    `;
@@ -312,7 +312,7 @@ export class HaEntityNamePicker extends LitElement {
  private _toValue = memoizeOne(
    (items: EntityNameItem[]): typeof this.value => {
      if (items.length === 0) {
-        return undefined;
+        return "";
      }
      if (items.length === 1) {
        const item = items[0];
@@ -113,9 +113,6 @@ export class HaEntityPicker extends LitElement {
  @property({ attribute: "hide-clear-icon", type: Boolean })
  public hideClearIcon = false;

-  @property({ attribute: "add-button", type: Boolean })
-  public addButton = false;
-
  @query("ha-generic-picker") private _picker?: HaGenericPicker;

  protected firstUpdated(changedProperties: PropertyValues): void {
@@ -284,7 +281,7 @@ export class HaEntityPicker extends LitElement {
        .searchLabel=${this.searchLabel}
        .notFoundLabel=${notFoundLabel}
        .placeholder=${placeholder}
-        .value=${this.addButton ? undefined : this.value}
+        .value=${this.value}
        .rowRenderer=${this._rowRenderer}
        .getItems=${this._getItems}
        .getAdditionalItems=${this._getAdditionalItems}
@@ -292,9 +289,6 @@ export class HaEntityPicker extends LitElement {
        .searchFn=${this._searchFn}
        .valueRenderer=${this._valueRenderer}
        @value-changed=${this._valueChanged}
-        .addButtonLabel=${this.addButton
-          ? this.hass.localize("ui.components.entity.entity-picker.add")
-          : undefined}
      >
      </ha-generic-picker>
    `;
@@ -1,39 +1,23 @@
-import "@material/mwc-menu/mwc-menu-surface";
-import { mdiDragHorizontalVariant, mdiPlus } from "@mdi/js";
-import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
-import type { IFuseOptions } from "fuse.js";
-import Fuse from "fuse.js";
+import { mdiDragHorizontalVariant } from "@mdi/js";
 import type { HassEntity } from "home-assistant-js-websocket";
-import { css, html, LitElement, nothing } from "lit";
+import type { PropertyValues } from "lit";
+import { LitElement, 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 { ensureArray } from "../../common/array/ensure-array";
 import { fireEvent } from "../../common/dom/fire_event";
-import { stopPropagation } from "../../common/dom/stop_propagation";
 import { computeDomain } from "../../common/entity/compute_domain";
 import {
  STATE_DISPLAY_SPECIAL_CONTENT,
  STATE_DISPLAY_SPECIAL_CONTENT_DOMAINS,
 } from "../../state-display/state-display";
 import type { HomeAssistant, ValueChangedEvent } from "../../types";
-import "../chips/ha-assist-chip";
-import "../chips/ha-chip-set";
-import "../chips/ha-input-chip";
 import "../ha-combo-box";
-import type { HaComboBox } from "../ha-combo-box";
 import "../ha-sortable";
-
-interface StateContentOption {
-  primary: string;
-  value: string;
-}
-
-const rowRenderer: ComboBoxLitRenderer<StateContentOption> = (item) => html`
-  <ha-combo-box-item type="button">
-    <span slot="headline">${item.primary}</span>
-  </ha-combo-box-item>
-`;
+import "../chips/ha-input-chip";
+import "../chips/ha-chip-set";
+import type { HaComboBox } from "../ha-combo-box";

 const HIDDEN_ATTRIBUTES = [
  "access_token",
@@ -90,7 +74,7 @@ const HIDDEN_ATTRIBUTES = [
 ];

@customElement("ha-entity-state-content-picker")
-export class HaStateContentPicker extends LitElement {
+class HaEntityStatePicker extends LitElement {
  @property({ attribute: false }) public hass!: HomeAssistant;

  @property({ attribute: false }) public entityId?: string;
@@ -111,28 +95,26 @@ export class HaStateContentPicker extends LitElement {

  @property() public helper?: string;

-  @query(".container", true) private _container?: HTMLDivElement;
+  @state() private _opened = false;

  @query("ha-combo-box", true) private _comboBox!: HaComboBox;

-  @state() private _opened = false;
+  protected shouldUpdate(changedProps: PropertyValues) {
+    return !(!changedProps.has("_opened") && this._opened);
+  }

-  private _editIndex?: number;
-
-  private _options = memoizeOne(
+  private options = memoizeOne(
    (entityId?: string, stateObj?: HassEntity, allowName?: boolean) => {
      const domain = entityId ? computeDomain(entityId) : undefined;
      return [
        {
-          primary: this.hass.localize(
-            "ui.components.state-content-picker.state"
-          ),
+          label: this.hass.localize("ui.components.state-content-picker.state"),
          value: "state",
        },
        ...(allowName
          ? [
              {
-                primary: this.hass.localize(
+                label: this.hass.localize(
                  "ui.components.state-content-picker.name"
                ),
                value: "name",
@@ -140,13 +122,13 @@ export class HaStateContentPicker extends LitElement {
            ]
          : []),
        {
-          primary: this.hass.localize(
+          label: this.hass.localize(
            "ui.components.state-content-picker.last_changed"
          ),
          value: "last_changed",
        },
        {
-          primary: this.hass.localize(
+          label: this.hass.localize(
            "ui.components.state-content-picker.last_updated"
          ),
          value: "last_updated",
@@ -155,7 +137,7 @@ export class HaStateContentPicker extends LitElement {
          ? STATE_DISPLAY_SPECIAL_CONTENT.filter((content) =>
              STATE_DISPLAY_SPECIAL_CONTENT_DOMAINS[domain]?.includes(content)
            ).map((content) => ({
-              primary: this.hass.localize(
+              label: this.hass.localize(
                `ui.components.state-content-picker.${content}`
              ),
              value: content,
@@ -164,201 +146,108 @@ export class HaStateContentPicker extends LitElement {
        ...Object.keys(stateObj?.attributes ?? {})
          .filter((a) => !HIDDEN_ATTRIBUTES.includes(a))
          .map((attribute) => ({
-            primary: this.hass.formatEntityAttributeName(stateObj!, attribute),
            value: attribute,
+            label: this.hass.formatEntityAttributeName(stateObj!, attribute),
          })),
-      ] satisfies StateContentOption[];
+      ];
    }
  );

+  private _filter = "";
+
  protected render() {
+    if (!this.hass) {
+      return nothing;
+    }
+
    const value = this._value;

    const stateObj = this.entityId
      ? this.hass.states[this.entityId]
      : undefined;

-    const options = this._options(this.entityId, stateObj, this.allowName);
+    const options = this.options(this.entityId, stateObj, this.allowName);
+    const optionItems = options.filter(
+      (option) => !this._value.includes(option.value)
+    );

    return html`
-      ${this.label ? html`<label>${this.label}</label>` : nothing}
-      <div class="container ${this.disabled ? "disabled" : ""}">
-        <ha-sortable
-          no-style
-          @item-moved=${this._moveItem}
-          .disabled=${this.disabled}
-          handle-selector="button.primary.action"
-          filter=".add"
-        >
-          <ha-chip-set>
-            ${repeat(
-              this._value,
-              (item) => item,
-              (item: string, idx) => {
-                const label = options.find((o) => o.value === item)?.primary;
-                const isValid = !!label;
-                return html`
-                  <ha-input-chip
-                    data-idx=${idx}
-                    @remove=${this._removeItem}
-                    @click=${this._editItem}
-                    .label=${label || item}
-                    .selected=${!this.disabled}
-                    .disabled=${this.disabled}
-                    class=${!isValid ? "invalid" : ""}
-                  >
-                    <ha-svg-icon
-                      slot="icon"
-                      .path=${mdiDragHorizontalVariant}
-                    ></ha-svg-icon>
-                  </ha-input-chip>
-                `;
-              }
-            )}
-            ${this.disabled
-              ? nothing
-              : html`
-                  <ha-assist-chip
-                    @click=${this._addItem}
-                    .disabled=${this.disabled}
-                    label=${this.hass.localize(
-                      "ui.components.entity.entity-state-content-picker.add"
-                    )}
-                    class="add"
-                  >
-                    <ha-svg-icon slot="icon" .path=${mdiPlus}></ha-svg-icon>
-                  </ha-assist-chip>
-                `}
-          </ha-chip-set>
-        </ha-sortable>
+      ${value?.length
+        ? html`
+            <ha-sortable
+              no-style
+              @item-moved=${this._moveItem}
+              .disabled=${this.disabled}
+              handle-selector="button.primary.action"
+            >
+              <ha-chip-set>
+                ${repeat(
+                  this._value,
+                  (item) => item,
+                  (item, idx) => {
+                    const label =
+                      options.find((option) => option.value === item)?.label ||
+                      item;
+                    return html`
+                      <ha-input-chip
+                        .idx=${idx}
+                        @remove=${this._removeItem}
+                        .label=${label}
+                        selected
+                      >
+                        <ha-svg-icon
+                          slot="icon"
+                          .path=${mdiDragHorizontalVariant}
+                        ></ha-svg-icon>
+                        ${label}
+                      </ha-input-chip>
+                    `;
+                  }
+                )}
+              </ha-chip-set>
+            </ha-sortable>
+          `
+        : nothing}

-        <mwc-menu-surface
-          .open=${this._opened}
-          @closed=${this._onClosed}
-          @opened=${this._onOpened}
-          @input=${stopPropagation}
-          .anchor=${this._container}
-        >
-          <ha-combo-box
-            .hass=${this.hass}
-            .value=${""}
-            .autofocus=${this.autofocus}
-            .disabled=${this.disabled || !this.entityId}
-            .required=${this.required && !value.length}
-            .helper=${this.helper}
-            .items=${options}
-            allow-custom-value
-            item-id-path="value"
-            item-value-path="value"
-            item-label-path="primary"
-            .renderer=${rowRenderer}
-            @opened-changed=${this._openedChanged}
-            @value-changed=${this._comboBoxValueChanged}
-            @filter-changed=${this._filterChanged}
-          >
-          </ha-combo-box>
-        </mwc-menu-surface>
-      </div>
+      <ha-combo-box
+        item-value-path="value"
+        item-label-path="label"
+        .hass=${this.hass}
+        .label=${this.label}
+        .helper=${this.helper}
+        .disabled=${this.disabled}
+        .required=${this.required && !value.length}
+        .value=${""}
+        .items=${optionItems}
+        allow-custom-value
+        @filter-changed=${this._filterChanged}
+        @value-changed=${this._comboBoxValueChanged}
+        @opened-changed=${this._openedChanged}
+      ></ha-combo-box>
    `;
  }

-  private _onClosed(ev) {
-    ev.stopPropagation();
-    this._opened = false;
-    this._editIndex = undefined;
-  }
-
-  private async _onOpened(ev) {
-    if (!this._opened) {
-      return;
-    }
-    ev.stopPropagation();
-    this._opened = true;
-    await this._comboBox?.focus();
-    await this._comboBox?.open();
-  }
-
-  private async _addItem(ev) {
-    ev.stopPropagation();
-    this._opened = true;
-  }
-
-  private async _editItem(ev) {
-    ev.stopPropagation();
-    const idx = parseInt(ev.currentTarget.dataset.idx, 10);
-    this._editIndex = idx;
-    this._opened = true;
-  }
-
  private get _value() {
    return !this.value ? [] : ensureArray(this.value);
  }

-  private _toValue = memoizeOne((value: string[]): typeof this.value => {
-    if (value.length === 0) {
-      return undefined;
-    }
-    if (value.length === 1) {
-      return value[0];
-    }
-    return value;
-  });
-
  private _openedChanged(ev: ValueChangedEvent<boolean>) {
-    const open = ev.detail.value;
-    if (open) {
-      const options = this._comboBox.items || [];
-
-      const initialValue =
-        this._editIndex != null ? this._value[this._editIndex] : "";
-      const filteredItems = this._filterSelectedOptions(options, initialValue);
-
-      this._comboBox.filteredItems = filteredItems;
-      this._comboBox.setInputValue(initialValue);
-    } else {
-      this._opened = false;
-    }
+    this._opened = ev.detail.value;
+    this._comboBox.filteredItems = this._comboBox.items;
  }

-  private _filterSelectedOptions = (
-    options: StateContentOption[],
-    current?: string
-  ) => {
-    const value = this._value;
+  private _filterChanged(ev?: CustomEvent): void {
+    this._filter = ev?.detail.value || "";

-    return options.filter(
-      (option) => !value.includes(option.value) || option.value === current
-    );
-  };
+    const filteredItems = this._comboBox.items?.filter((item) => {
+      const label = item.label || item.value;
+      return label.toLowerCase().includes(this._filter?.toLowerCase());
+    });

-  private _filterChanged(ev: ValueChangedEvent<string>) {
-    const input = ev.detail.value;
-    const filter = input?.toLowerCase() || "";
-    const options = this._comboBox.items || [];
-
-    const currentValue =
-      this._editIndex != null ? this._value[this._editIndex] : "";
-
-    this._comboBox.filteredItems = this._filterSelectedOptions(
-      options,
-      currentValue
-    );
-
-    if (!filter) {
-      return;
+    if (this._filter) {
+      filteredItems?.unshift({ label: this._filter, value: this._filter });
    }

-    const fuseOptions: IFuseOptions<StateContentOption> = {
-      keys: ["primary", "secondary", "value"],
-      isCaseSensitive: false,
-      minMatchCharLength: Math.min(filter.length, 2),
-      threshold: 0.2,
-      ignoreDiacritics: true,
-    };
-
-    const fuse = new Fuse(this._comboBox.filteredItems, fuseOptions);
-    const filteredItems = fuse.search(filter).map((result) => result.item);
-
    this._comboBox.filteredItems = filteredItems;
  }

@@ -371,40 +260,43 @@ export class HaStateContentPicker extends LitElement {
    newValue.splice(newIndex, 0, element);
    this._setValue(newValue);
    await this.updateComplete;
-    this._filterChanged({ detail: { value: "" } } as ValueChangedEvent<string>);
+    this._filterChanged();
  }

  private async _removeItem(ev) {
    ev.stopPropagation();
-    const value = [...this._value];
-    const idx = parseInt(ev.target.dataset.idx, 10);
-    value.splice(idx, 1);
+    const value: string[] = [...this._value];
+    value.splice(ev.target.idx, 1);
    this._setValue(value);
    await this.updateComplete;
-    this._filterChanged({ detail: { value: "" } } as ValueChangedEvent<string>);
+    this._filterChanged();
  }

-  private _comboBoxValueChanged(ev: ValueChangedEvent<string>): void {
+  private _comboBoxValueChanged(ev: CustomEvent): void {
    ev.stopPropagation();
-    const value = ev.detail.value;
+    const newValue = ev.detail.value;

-    if (this.disabled || value === "") {
+    if (this.disabled || newValue === "") {
      return;
    }

-    const newValue = [...this._value];
+    const currentValue = this._value;

-    if (this._editIndex != null) {
-      newValue[this._editIndex] = value;
-    } else {
-      newValue.push(value);
+    if (currentValue.includes(newValue)) {
+      return;
    }

-    this._setValue(newValue);
+    setTimeout(() => {
+      this._filterChanged();
+      this._comboBox.setInputValue("");
+    }, 0);
+
+    this._setValue([...currentValue, newValue]);
  }

  private _setValue(value: string[]) {
-    const newValue = this._toValue(value);
+    const newValue =
+      value.length === 0 ? undefined : value.length === 1 ? value[0] : value;
    this.value = newValue;
    fireEvent(this, "value-changed", {
      value: newValue,
@@ -414,64 +306,10 @@ export class HaStateContentPicker extends LitElement {
  static styles = css`
    :host {
      position: relative;
-      width: 100%;
-    }
-
-    .container {
-      position: relative;
-      background-color: var(--mdc-text-field-fill-color, whitesmoke);
-      border-radius: var(--ha-border-radius-sm);
-      border-end-end-radius: var(--ha-border-radius-square);
-      border-end-start-radius: var(--ha-border-radius-square);
-    }
-    .container:after {
-      display: block;
-      content: "";
-      position: absolute;
-      pointer-events: none;
-      bottom: 0;
-      left: 0;
-      right: 0;
-      height: 1px;
-      width: 100%;
-      background-color: var(
-        --mdc-text-field-idle-line-color,
-        rgba(0, 0, 0, 0.42)
-      );
-      transform:
-        height 180ms ease-in-out,
-        background-color 180ms ease-in-out;
-    }
-    .container.disabled:after {
-      background-color: var(
-        --mdc-text-field-disabled-line-color,
-        rgba(0, 0, 0, 0.42)
-      );
-    }
-    .container:focus-within:after {
-      height: 2px;
-      background-color: var(--mdc-theme-primary);
-    }
-
-    label {
-      display: block;
-      margin: 0 0 var(--ha-space-2);
-    }
-
-    .add {
-      order: 1;
-    }
-
-    mwc-menu-surface {
-      --mdc-menu-min-width: 100%;
    }

    ha-chip-set {
-      padding: var(--ha-space-2) var(--ha-space-2);
-    }
-
-    .invalid {
-      text-decoration: line-through;
+      padding: 8px 0;
    }

    .sortable-fallback {
@@ -491,6 +329,6 @@ export class HaStateContentPicker extends LitElement {

 declare global {
  interface HTMLElementTagNameMap {
-    "ha-entity-state-content-picker": HaStateContentPicker;
+    "ha-entity-state-content-picker": HaEntityStatePicker;
  }
 }
@@ -4,7 +4,6 @@ import { customElement, property } from "lit/decorators";
 import { keyed } from "lit/directives/keyed";
 import { repeat } from "lit/directives/repeat";
 import { fireEvent } from "../../common/dom/fire_event";
-import { ANY_STATE_VALUE } from "./const";
 import { ensureArray } from "../../common/array/ensure-array";
 import type { HomeAssistant } from "../../types";
 import "./ha-entity-state-picker";
@@ -58,7 +57,6 @@ export class HaEntityStatesPicker extends LitElement {

    const value = this.value || [];
    const hide = [...(this.hideStates || []), ...value];
-    const hideValue = value.includes(ANY_STATE_VALUE);

    return html`
      ${repeat(
@@ -86,7 +84,7 @@ export class HaEntityStatesPicker extends LitElement {
        `
      )}
      <div>
-        ${(this.disabled && value.length) || hideValue
+        ${this.disabled && value.length
          ? nothing
          : keyed(
              value.length,
@@ -46,7 +46,7 @@ export class HaAnalytics extends LitElement {
        </span>
        <ha-switch
          @change=${this._handleRowClick}
-          .checked=${!!baseEnabled}
+          .checked=${baseEnabled}
          .preference=${"base"}
          .disabled=${loading}
          name="base"
@@ -70,7 +70,7 @@ export class HaAnalytics extends LitElement {
              <ha-switch
                .id="switch-${preference}"
                @change=${this._handleRowClick}
-                .checked=${!!this.analytics?.preferences[preference]}
+                .checked=${this.analytics?.preferences[preference]}
                .preference=${preference}
                name=${preference}
              >
@@ -102,7 +102,7 @@ export class HaAnalytics extends LitElement {
        </span>
        <ha-switch
          @change=${this._handleRowClick}
-          .checked=${!!this.analytics?.preferences.diagnostics}
+          .checked=${this.analytics?.preferences.diagnostics}
          .preference=${"diagnostics"}
          .disabled=${loading}
          name="diagnostics"
@@ -87,8 +87,6 @@ export class HaAreaPicker extends LitElement {

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

-  @property({ attribute: "add-button-label" }) public addButtonLabel?: string;
-
  @query("ha-generic-picker") private _picker?: HaGenericPicker;

  public async open() {
@@ -377,7 +375,6 @@ export class HaAreaPicker extends LitElement {
        .getItems=${this._getItems}
        .getAdditionalItems=${this._getAdditionalItems}
        .valueRenderer=${valueRenderer}
-        .addButtonLabel=${this.addButtonLabel}
        @value-changed=${this._valueChanged}
      >
      </ha-generic-picker>
@@ -118,7 +118,7 @@ export class HaAutomationRow extends LitElement {
    }
    .row {
      display: flex;
-      padding: var(--ha-space-0) var(--ha-space-2);
+      padding: 0 8px;
      min-height: 48px;
      align-items: center;
      cursor: pointer;
@@ -134,12 +134,12 @@ export class HaAutomationRow extends LitElement {
    .expand-button {
      transition: transform 150ms cubic-bezier(0.4, 0, 0.2, 1);
      color: var(--ha-color-on-neutral-quiet);
-      margin-left: calc(var(--ha-space-2) * -1);
+      margin-left: -8px;
    }
    :host([building-block]) .leading-icon-wrapper {
      background-color: var(--ha-color-fill-neutral-loud-resting);
      border-radius: var(--ha-border-radius-md);
-      padding: var(--ha-space-1);
+      padding: 4px;
      display: flex;
      justify-content: center;
      align-items: center;
@@ -149,7 +149,7 @@ export class HaAutomationRow extends LitElement {
      color: var(--ha-color-on-neutral-quiet);
    }
    :host([building-block]) ::slotted([slot="leading-icon"]) {
-      --mdc-icon-size: var(--ha-space-5);
+      --mdc-icon-size: 20px;
      color: var(--white-color);
      transform: rotate(-45deg);
    }
@@ -170,7 +170,7 @@ export class HaAutomationRow extends LitElement {
    ::slotted([slot="header"]) {
      flex: 1;
      overflow-wrap: anywhere;
-      margin: var(--ha-space-0) var(--ha-space-3);
+      margin: 0 12px;
    }
    :host([sort-selected]) .row {
      outline: solid;
@@ -1,8 +1,6 @@
 import "@home-assistant/webawesome/dist/components/drawer/drawer";
 import { css, html, LitElement, type PropertyValues } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
-import { SwipeGestureRecognizer } from "../common/util/swipe-gesture-recognizer";
-import { haStyleScrollbar } from "../resources/styles";
+import { customElement, property, state } from "lit/decorators";

 export const BOTTOM_SHEET_ANIMATION_DURATION_MS = 300;

@@ -15,12 +13,6 @@ export class HaBottomSheet extends LitElement {

  @state() private _drawerOpen = false;

-  @query("#drawer") private _drawer!: HTMLElement;
-
-  private _gestureRecognizer = new SwipeGestureRecognizer();
-
-  private _isDragging = false;
-
  private _handleAfterHide() {
    this.open = false;
    const ev = new Event("closed", {
@@ -40,186 +32,54 @@ export class HaBottomSheet extends LitElement {
  render() {
    return html`
      <wa-drawer
-        id="drawer"
        placement="bottom"
        .open=${this._drawerOpen}
        @wa-after-hide=${this._handleAfterHide}
        without-header
-        @touchstart=${this._handleTouchStart}
      >
-        <slot name="header"></slot>
-        <div id="body" class="body ha-scrollbar">
-          <slot></slot>
-        </div>
+        <slot></slot>
      </wa-drawer>
    `;
  }

-  private _handleTouchStart = (ev: TouchEvent) => {
-    // Check if any element inside drawer in the composed path has scrollTop > 0
-    for (const path of ev.composedPath()) {
-      const el = path as HTMLElement;
-      if (el === this._drawer) {
-        break;
-      }
-      if (el.scrollTop > 0) {
-        return;
-      }
+  static styles = css`
+    wa-drawer {
+      --wa-color-surface-raised: transparent;
+      --spacing: 0;
+      --size: var(--ha-bottom-sheet-height, auto);
+      --show-duration: ${BOTTOM_SHEET_ANIMATION_DURATION_MS}ms;
+      --hide-duration: ${BOTTOM_SHEET_ANIMATION_DURATION_MS}ms;
+    }
+    wa-drawer::part(dialog) {
+      max-height: var(--ha-bottom-sheet-max-height, 90vh);
+      align-items: center;
+    }
+    wa-drawer::part(body) {
+      max-width: var(--ha-bottom-sheet-max-width);
+      width: 100%;
+      border-top-left-radius: var(
+        --ha-bottom-sheet-border-radius,
+        var(--ha-dialog-border-radius, var(--ha-border-radius-2xl))
+      );
+      border-top-right-radius: var(
+        --ha-bottom-sheet-border-radius,
+        var(--ha-dialog-border-radius, var(--ha-border-radius-2xl))
+      );
+      background-color: var(
+        --ha-bottom-sheet-surface-background,
+        var(--ha-dialog-surface-background, var(--mdc-theme-surface, #fff)),
+      );
+      padding: var(
+        --ha-bottom-sheet-padding,
+        0 var(--safe-area-inset-right) var(--safe-area-inset-bottom)
+          var(--safe-area-inset-left)
+      );
    }

-    this._startResizing(ev.touches[0].clientY);
-  };
-
-  private _startResizing(clientY: number) {
-    // register event listeners for drag handling
-    document.addEventListener("touchmove", this._handleTouchMove, {
-      passive: false,
-    });
-    document.addEventListener("touchend", this._handleTouchEnd);
-    document.addEventListener("touchcancel", this._handleTouchEnd);
-
-    this._gestureRecognizer.start(clientY);
-  }
-
-  private _handleTouchMove = (ev: TouchEvent) => {
-    const currentY = ev.touches[0].clientY;
-    const delta = this._gestureRecognizer.move(currentY);
-
-    if (delta < 0) {
-      ev.preventDefault();
-      this._isDragging = true;
-      requestAnimationFrame(() => {
-        if (this._isDragging) {
-          this.style.setProperty(
-            "--dialog-transform",
-            `translateY(${delta * -1}px)`
-          );
-        }
-      });
+    :host([flexcontent]) wa-drawer::part(body) {
+      display: flex;
    }
-  };
-
-  private _animateSnapBack() {
-    // Add transition for smooth animation
-    this.style.setProperty(
-      "--dialog-transition",
-      `transform ${BOTTOM_SHEET_ANIMATION_DURATION_MS}ms ease-out`
-    );
-
-    // Reset transform to snap back
-    this.style.removeProperty("--dialog-transform");
-
-    // Remove transition after animation completes
-    setTimeout(() => {
-      this.style.removeProperty("--dialog-transition");
-    }, BOTTOM_SHEET_ANIMATION_DURATION_MS);
-  }
-
-  private _handleTouchEnd = () => {
-    this._unregisterResizeHandlers();
-
-    this._isDragging = false;
-
-    const result = this._gestureRecognizer.end();
-
-    // If velocity exceeds threshold, use velocity direction to determine action
-    if (result.isSwipe) {
-      if (result.isDownwardSwipe) {
-        // Downward swipe - close the bottom sheet
-        this._drawerOpen = false;
-      } else {
-        // Upward swipe - keep open and animate back
-        this._animateSnapBack();
-      }
-      return;
-    }
-
-    // If velocity is below threshold, use position-based logic
-    // Get the drawer height to calculate 50% threshold
-    const drawerBody = this._drawer.shadowRoot?.querySelector(
-      '[part="body"]'
-    ) as HTMLElement;
-    const drawerHeight = drawerBody?.offsetHeight || 0;
-
-    // delta is negative when dragging down
-    // Close if dragged down past 50% of the drawer height
-    if (
-      drawerHeight > 0 &&
-      result.delta < 0 &&
-      Math.abs(result.delta) > drawerHeight * 0.5
-    ) {
-      this._drawerOpen = false;
-    } else {
-      this._animateSnapBack();
-    }
-  };
-
-  private _unregisterResizeHandlers = () => {
-    document.removeEventListener("touchmove", this._handleTouchMove);
-    document.removeEventListener("touchend", this._handleTouchEnd);
-    document.removeEventListener("touchcancel", this._handleTouchEnd);
-  };
-
-  disconnectedCallback() {
-    super.disconnectedCallback();
-    this._unregisterResizeHandlers();
-    this._isDragging = false;
-  }
-
-  static styles = [
-    haStyleScrollbar,
-    css`
-      wa-drawer {
-        --wa-color-surface-raised: transparent;
-        --spacing: 0;
-        --size: var(--ha-bottom-sheet-height, auto);
-        --show-duration: ${BOTTOM_SHEET_ANIMATION_DURATION_MS}ms;
-        --hide-duration: ${BOTTOM_SHEET_ANIMATION_DURATION_MS}ms;
-      }
-      wa-drawer::part(dialog) {
-        max-height: var(--ha-bottom-sheet-max-height, 90vh);
-        align-items: center;
-        transform: var(--dialog-transform);
-        transition: var(--dialog-transition);
-      }
-      wa-drawer::part(body) {
-        max-width: var(--ha-bottom-sheet-max-width);
-        width: 100%;
-        border-top-left-radius: var(
-          --ha-bottom-sheet-border-radius,
-          var(--ha-dialog-border-radius, var(--ha-border-radius-2xl))
-        );
-        border-top-right-radius: var(
-          --ha-bottom-sheet-border-radius,
-          var(--ha-dialog-border-radius, var(--ha-border-radius-2xl))
-        );
-        background-color: var(
-          --ha-bottom-sheet-surface-background,
-          var(--ha-dialog-surface-background, var(--mdc-theme-surface, #fff)),
-        );
-        padding: var(
-          --ha-bottom-sheet-padding,
-          0 var(--safe-area-inset-right) var(--safe-area-inset-bottom)
-            var(--safe-area-inset-left)
-        );
-      }
-      :host([flexcontent]) wa-drawer::part(body) {
-        display: flex;
-        flex-direction: column;
-      }
-      :host([flexcontent]) .body {
-        flex: 1;
-        max-width: 100%;
-        display: flex;
-        flex-direction: column;
-        padding: var(
-          --ha-bottom-sheet-padding,
-          0 var(--safe-area-inset-right) var(--safe-area-inset-bottom)
-            var(--safe-area-inset-left)
-        );
-      }
-    `,
-  ];
+  `;
 }

 declare global {
@@ -31,9 +31,6 @@ export class HaButtonToggleGroup extends LitElement {
  @property({ type: Boolean, reflect: true, attribute: "no-wrap" })
  public nowrap = false;

-  @property({ type: Boolean, reflect: true, attribute: "full-width" })
-  public fullWidth = false;
-
  @property() public variant:
    | "brand"
    | "neutral"
@@ -41,13 +38,6 @@ export class HaButtonToggleGroup extends LitElement {
    | "warning"
    | "danger" = "brand";

-  @property({ attribute: "active-variant" }) public activeVariant?:
-    | "brand"
-    | "neutral"
-    | "success"
-    | "warning"
-    | "danger";
-
  protected render(): TemplateResult {
    return html`
      <wa-button-group childSelector="ha-button">
@@ -56,9 +46,7 @@ export class HaButtonToggleGroup extends LitElement {
            html`<ha-button
              iconTag="ha-svg-icon"
              class="icon"
-              .variant=${this.active !== button.value || !this.activeVariant
-                ? this.variant
-                : this.activeVariant}
+              .variant=${this.variant}
              .size=${this.size}
              .value=${button.value}
              @click=${this._handleClick}
@@ -90,19 +78,6 @@ export class HaButtonToggleGroup extends LitElement {
    :host([no-wrap]) wa-button-group::part(base) {
      flex-wrap: nowrap;
    }
-
-    wa-button-group {
-      padding: var(--ha-button-toggle-group-padding);
-    }
-
-    :host([full-width]) wa-button-group,
-    :host([full-width]) wa-button-group::part(base) {
-      width: 100%;
-    }
-
-    :host([full-width]) ha-button {
-      flex: 1;
-    }
  `;
 }

@@ -59,7 +59,6 @@ export class HaButton extends Button {
          line-height: 1;

          transition: background-color 0.15s ease-in-out;
-          text-wrap: wrap;
        }

        :host([size="small"]) .button {
@@ -44,26 +44,26 @@ export class HaCard extends LitElement {
      font-size: var(--ha-card-header-font-size, var(--ha-font-size-2xl));
      letter-spacing: -0.012em;
      line-height: var(--ha-line-height-expanded);
-      padding: var(--ha-space-3) var(--ha-space-4) var(--ha-space-4);
+      padding: 12px 16px 16px;
      display: block;
-      margin-block-start: var(--ha-space-0);
-      margin-block-end: var(--ha-space-0);
+      margin-block-start: 0px;
+      margin-block-end: 0px;
      font-weight: var(--ha-font-weight-normal);
    }

    :host ::slotted(.card-content:not(:first-child)),
    slot:not(:first-child)::slotted(.card-content) {
-      padding-top: var(--ha-space-0);
-      margin-top: calc(var(--ha-space-2) * -1);
+      padding-top: 0px;
+      margin-top: -8px;
    }

    :host ::slotted(.card-content) {
-      padding: var(--ha-space-4);
+      padding: 16px;
    }

    :host ::slotted(.card-actions) {
      border-top: 1px solid var(--divider-color, #e8e8e8);
-      padding: var(--ha-space-2);
+      padding: 8px;
    }
  `;

@@ -6,9 +6,6 @@ export class HaDialogHeader extends LitElement {
  @property({ type: String, attribute: "subtitle-position" })
  public subtitlePosition: "above" | "below" = "below";

-  @property({ type: Boolean, reflect: true, attribute: "show-border" })
-  public showBorder = false;
-
  protected render() {
    const titleSlot = html`<div class="header-title">
      <slot name="title"></slot>
@@ -248,7 +248,7 @@ export class HaFilterDevices extends LitElement {
        }
        search-input-outlined {
          display: block;
-          padding: var(--ha-space-1) var(--ha-space-2) 0;
+          padding: 0 8px;
        }
      `,
    ];
@@ -199,7 +199,7 @@ export class HaFilterDomains extends LitElement {
        }
        search-input-outlined {
          display: block;
-          padding: var(--ha-space-1) var(--ha-space-2) 0;
+          padding: 0 8px;
        }
      `,
    ];
@@ -264,7 +264,7 @@ export class HaFilterEntities extends LitElement {
        }
        search-input-outlined {
          display: block;
-          padding: var(--ha-space-1) var(--ha-space-2) 0;
+          padding: 0 8px;
        }
      `,
    ];
@@ -217,7 +217,7 @@ export class HaFilterIntegrations extends LitElement {
        }
        search-input-outlined {
          display: block;
-          padding: var(--ha-space-1) var(--ha-space-2) 0;
+          padding: 0 8px;
        }
      `,
    ];
@@ -256,7 +256,7 @@ export class HaFilterLabels extends SubscribeMixin(LitElement) {
        }
        search-input-outlined {
          display: block;
-          padding: var(--ha-space-1) var(--ha-space-2) 0;
+          padding: 0 8px;
        }
      `,
    ];
@@ -148,7 +148,7 @@ export class HaForm extends LitElement implements HaFormElement {
                  .value=${getValue(this.data, item)}
                  .label=${this._computeLabel(item, this.data)}
                  .disabled=${item.disabled || this.disabled || false}
-                  .placeholder=${item.required ? undefined : item.default}
+                  .placeholder=${item.required ? "" : item.default}
                  .helper=${this._computeHelper(item)}
                  .localizeValue=${this.localizeValue}
                  .required=${item.required || false}
@@ -1,15 +1,12 @@
-import "@home-assistant/webawesome/dist/components/popover/popover";
-import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
-import { mdiPlaylistPlus } from "@mdi/js";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
+import type { ComboBoxLightOpenedChangedEvent } from "@vaadin/combo-box/vaadin-combo-box-light";
 import { css, html, LitElement, nothing, type CSSResultGroup } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
-import { tinykeys } from "tinykeys";
 import { fireEvent } from "../common/dom/fire_event";
 import type { HomeAssistant } from "../types";
-import "./ha-bottom-sheet";
-import "./ha-button";
 import "./ha-combo-box-item";
+import "./ha-icon-button";
 import "./ha-input-helper-text";
 import "./ha-picker-combo-box";
 import type {
@@ -18,12 +15,12 @@ import type {
  PickerComboBoxSearchFn,
 } from "./ha-picker-combo-box";
 import "./ha-picker-field";
-import type { PickerValueRenderer } from "./ha-picker-field";
+import type { HaPickerField, PickerValueRenderer } from "./ha-picker-field";
 import "./ha-svg-icon";

@customElement("ha-generic-picker")
 export class HaGenericPicker extends LitElement {
-  @property({ attribute: false }) public hass?: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  // eslint-disable-next-line lit/no-native-attributes
  @property({ type: Boolean }) public autofocus = false;
@@ -56,7 +53,7 @@ export class HaGenericPicker extends LitElement {
  public getAdditionalItems?: (searchString?: string) => PickerComboBoxItem[];

  @property({ attribute: false })
-  public rowRenderer?: RenderItemFunction<PickerComboBoxItem>;
+  public rowRenderer?: ComboBoxLitRenderer<PickerComboBoxItem>;

  @property({ attribute: false })
  public valueRenderer?: PickerValueRenderer;
@@ -67,142 +64,59 @@ export class HaGenericPicker extends LitElement {
  @property({ attribute: "not-found-label", type: String })
  public notFoundLabel?: string;

-  @property({ attribute: "popover-placement" })
-  public popoverPlacement:
-    | "bottom"
-    | "top"
-    | "left"
-    | "right"
-    | "top-start"
-    | "top-end"
-    | "right-start"
-    | "right-end"
-    | "bottom-start"
-    | "bottom-end"
-    | "left-start"
-    | "left-end" = "bottom-start";
-
-  /** If set picker shows an add button instead of textbox when value isn't set */
-  @property({ attribute: "add-button-label" }) public addButtonLabel?: string;
-
-  @query(".container") private _containerElement?: HTMLDivElement;
+  @query("ha-picker-field") private _field?: HaPickerField;

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

  @state() private _opened = false;

-  @state() private _pickerWrapperOpen = false;
-
-  @state() private _popoverWidth = 0;
-
-  @state() private _openedNarrow = false;
-
-  private _narrow = false;
-
-  // helper to set new value after closing picker, to avoid flicker
-  private _newValue?: string;
-
-  private _unsubscribeTinyKeys?: () => void;
-
  protected render() {
    return html`
      ${this.label
        ? html`<label ?disabled=${this.disabled}>${this.label}</label>`
        : nothing}
      <div class="container">
-        <div id="picker">
-          <slot name="field">
-            ${this.addButtonLabel && !this.value
-              ? html`<ha-button
-                  size="small"
-                  appearance="filled"
-                  @click=${this.open}
-                  .disabled=${this.disabled}
-                >
-                  <ha-svg-icon
-                    .path=${mdiPlaylistPlus}
-                    slot="start"
-                  ></ha-svg-icon>
-                  ${this.addButtonLabel}
-                </ha-button>`
-              : html`<ha-picker-field
-                  type="button"
-                  class=${this._opened ? "opened" : ""}
-                  compact
-                  aria-label=${ifDefined(this.label)}
-                  @click=${this.open}
-                  @clear=${this._clear}
-                  .placeholder=${this.placeholder}
-                  .value=${this.value}
-                  .required=${this.required}
-                  .disabled=${this.disabled}
-                  .hideClearIcon=${this.hideClearIcon}
-                  .valueRenderer=${this.valueRenderer}
-                >
-                </ha-picker-field>`}
-          </slot>
-        </div>
-        ${!this._openedNarrow && (this._pickerWrapperOpen || this._opened)
+        ${!this._opened
          ? html`
-              <wa-popover
-                .open=${this._pickerWrapperOpen}
-                style="--body-width: ${this._popoverWidth}px;"
-                without-arrow
-                distance="-4"
-                .placement=${this.popoverPlacement}
-                for="picker"
-                auto-size="vertical"
-                auto-size-padding="16"
-                @wa-after-show=${this._dialogOpened}
-                @wa-after-hide=${this._hidePicker}
-                trap-focus
-                role="dialog"
-                aria-modal="true"
-                aria-label=${this.label || "Select option"}
+              <ha-picker-field
+                id="picker"
+                type="button"
+                compact
+                aria-label=${ifDefined(this.label)}
+                @click=${this.open}
+                @clear=${this._clear}
+                .placeholder=${this.placeholder}
+                .value=${this.value}
+                .required=${this.required}
+                .disabled=${this.disabled}
+                .hideClearIcon=${this.hideClearIcon}
+                .valueRenderer=${this.valueRenderer}
              >
-                ${this._renderComboBox()}
-              </wa-popover>
+              </ha-picker-field>
            `
-          : this._pickerWrapperOpen || this._opened
-            ? html`<ha-bottom-sheet
-                flexcontent
-                .open=${this._pickerWrapperOpen}
-                @wa-after-show=${this._dialogOpened}
-                @closed=${this._hidePicker}
-                role="dialog"
-                aria-modal="true"
-                aria-label=${this.label || "Select option"}
-              >
-                ${this._renderComboBox(true)}
-              </ha-bottom-sheet>`
-            : nothing}
+          : html`
+              <ha-picker-combo-box
+                .hass=${this.hass}
+                .autofocus=${this.autofocus}
+                .allowCustomValue=${this.allowCustomValue}
+                .label=${this.searchLabel ??
+                this.hass.localize("ui.common.search")}
+                .value=${this.value}
+                hide-clear-icon
+                @opened-changed=${this._openedChanged}
+                @value-changed=${this._valueChanged}
+                .rowRenderer=${this.rowRenderer}
+                .notFoundLabel=${this.notFoundLabel}
+                .getItems=${this.getItems}
+                .getAdditionalItems=${this.getAdditionalItems}
+                .searchFn=${this.searchFn}
+              ></ha-picker-combo-box>
+            `}
      </div>
      ${this._renderHelper()}
    `;
  }

-  private _renderComboBox(dialogMode = false) {
-    if (!this._opened) {
-      return nothing;
-    }
-    return html`
-      <ha-picker-combo-box
-        .hass=${this.hass}
-        .allowCustomValue=${this.allowCustomValue}
-        .label=${this.searchLabel ??
-        (this.hass?.localize("ui.common.search") || "Search")}
-        .value=${this.value}
-        @value-changed=${this._valueChanged}
-        .rowRenderer=${this.rowRenderer}
-        .notFoundLabel=${this.notFoundLabel}
-        .getItems=${this.getItems}
-        .getAdditionalItems=${this.getAdditionalItems}
-        .searchFn=${this.searchFn}
-        .mode=${dialogMode ? "dialog" : "popover"}
-      ></ha-picker-combo-box>
-    `;
-  }
-
  private _renderHelper() {
    return this.helper
      ? html`<ha-input-helper-text .disabled=${this.disabled}
@@ -211,33 +125,13 @@ export class HaGenericPicker extends LitElement {
      : nothing;
  }

-  private _dialogOpened = () => {
-    this._opened = true;
-    requestAnimationFrame(() => {
-      this._comboBox?.focus();
-    });
-  };
-
-  private _hidePicker(ev) {
-    ev.stopPropagation();
-    if (this._newValue) {
-      fireEvent(this, "value-changed", { value: this._newValue });
-      this._newValue = undefined;
-    }
-
-    this._opened = false;
-    this._pickerWrapperOpen = false;
-    this._unsubscribeTinyKeys?.();
-  }
-
  private _valueChanged(ev: CustomEvent) {
    ev.stopPropagation();
    const value = ev.detail.value;
    if (!value) {
      return;
    }
-    this._pickerWrapperOpen = false;
-    this._newValue = value;
+    fireEvent(this, "value-changed", { value });
  }

  private _clear(e) {
@@ -250,44 +144,24 @@ export class HaGenericPicker extends LitElement {
    fireEvent(this, "value-changed", { value });
  }

-  public async open(ev?: Event) {
-    ev?.stopPropagation();
+  public async open() {
    if (this.disabled) {
      return;
    }
-    this._openedNarrow = this._narrow;
-    this._popoverWidth = this._containerElement?.offsetWidth || 250;
-    this._pickerWrapperOpen = true;
-    this._unsubscribeTinyKeys = tinykeys(this, {
-      Escape: this._handleEscClose,
-    });
+    this._opened = true;
+    await this.updateComplete;
+    this._comboBox?.focus();
+    this._comboBox?.open();
  }

-  connectedCallback() {
-    super.connectedCallback();
-    this._handleResize();
-    window.addEventListener("resize", this._handleResize);
-  }
-
-  public disconnectedCallback() {
-    super.disconnectedCallback();
-    window.removeEventListener("resize", this._handleResize);
-    this._unsubscribeTinyKeys?.();
-  }
-
-  private _handleResize = () => {
-    this._narrow =
-      window.matchMedia("(max-width: 870px)").matches ||
-      window.matchMedia("(max-height: 500px)").matches;
-
-    if (!this._openedNarrow && this._pickerWrapperOpen) {
-      this._popoverWidth = this._containerElement?.offsetWidth || 250;
+  private async _openedChanged(ev: ComboBoxLightOpenedChangedEvent) {
+    const opened = ev.detail.value;
+    if (this._opened && !opened) {
+      this._opened = false;
+      await this.updateComplete;
+      this._field?.focus();
    }
-  };
-
-  private _handleEscClose = (ev: KeyboardEvent) => {
-    ev.stopPropagation();
-  };
+  }

  static get styles(): CSSResultGroup {
    return [
@@ -307,44 +181,6 @@ export class HaGenericPicker extends LitElement {
          display: block;
          margin: var(--ha-space-2) 0 0;
        }
-
-        wa-popover {
-          --wa-space-l: var(--ha-space-0);
-        }
-
-        wa-popover::part(body) {
-          width: max(var(--body-width), 250px);
-          max-width: max(var(--body-width), 250px);
-          max-height: 500px;
-          height: 70vh;
-          overflow: hidden;
-        }
-
-        @media (max-height: 1000px) {
-          wa-popover::part(body) {
-            max-height: 400px;
-          }
-        }
-
-        @media (max-height: 1000px) {
-          wa-popover::part(body) {
-            max-height: 400px;
-          }
-        }
-
-        ha-bottom-sheet {
-          --ha-bottom-sheet-height: 90vh;
-          --ha-bottom-sheet-height: calc(100dvh - var(--ha-space-12));
-          --ha-bottom-sheet-max-height: var(--ha-bottom-sheet-height);
-          --ha-bottom-sheet-max-width: 600px;
-          --ha-bottom-sheet-padding: var(--ha-space-0);
-          --ha-bottom-sheet-surface-background: var(--card-background-color);
-          --ha-bottom-sheet-border-radius: var(--ha-border-radius-2xl);
-        }
-
-        ha-picker-field.opened {
-          --mdc-text-field-idle-line-color: var(--primary-color);
-        }
      `,
    ];
  }
@@ -2,13 +2,7 @@ import { mdiLabel, mdiPlus } from "@mdi/js";
 import type { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
 import type { TemplateResult } from "lit";
 import { LitElement, html } from "lit";
-import {
-  customElement,
-  property,
-  query,
-  queryAssignedElements,
-  state,
-} from "lit/decorators";
+import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
 import type { LabelRegistryEntry } from "../data/label_registry";
@@ -90,9 +84,6 @@ export class HaLabelPicker extends SubscribeMixin(LitElement) {

  @state() private _labels?: LabelRegistryEntry[];

-  @queryAssignedElements({ flatten: true })
-  private _slotNodes?: NodeListOf<HTMLElement>;
-
  @query("ha-generic-picker") private _picker?: HaGenericPicker;

  public async open() {
@@ -220,14 +211,12 @@ export class HaLabelPicker extends SubscribeMixin(LitElement) {

    return html`
      <ha-generic-picker
-        .disabled=${this.disabled}
        .hass=${this.hass}
        .autofocus=${this.autofocus}
        .label=${this.label}
        .notFoundLabel=${this.hass.localize(
          "ui.components.label-picker.no_match"
        )}
-        .addButtonLabel=${this.hass.localize("ui.components.label-picker.add")}
        .placeholder=${placeholder}
        .value=${this.value}
        .getItems=${this._getItems}
@@ -235,7 +224,6 @@ export class HaLabelPicker extends SubscribeMixin(LitElement) {
        .valueRenderer=${valueRenderer}
        @value-changed=${this._valueChanged}
      >
-        <slot .slot=${this._slotNodes?.length ? "field" : undefined}></slot>
      </ha-generic-picker>
    `;
  }
@@ -1,4 +1,3 @@
-import { mdiPlaylistPlus } from "@mdi/js";
 import type { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
 import type { TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
@@ -124,6 +123,36 @@ export class HaLabelsPicker extends SubscribeMixin(LitElement) {
    );
    return html`
      ${this.label ? html`<label>${this.label}</label>` : nothing}
+      ${labels?.length
+        ? html`<ha-chip-set>
+            ${repeat(
+              labels,
+              (label) => label?.label_id,
+              (label) => {
+                const color = label?.color
+                  ? computeCssColor(label.color)
+                  : undefined;
+                return html`
+                  <ha-input-chip
+                    .item=${label}
+                    @remove=${this._removeItem}
+                    @click=${this._openDetail}
+                    .label=${label?.name}
+                    selected
+                    style=${color ? `--color: ${color}` : ""}
+                  >
+                    ${label?.icon
+                      ? html`<ha-icon
+                          slot="icon"
+                          .icon=${label.icon}
+                        ></ha-icon>`
+                      : nothing}
+                  </ha-input-chip>
+                `;
+              }
+            )}
+          </ha-chip-set>`
+        : nothing}
      <ha-label-picker
        .hass=${this.hass}
        .helper=${this.helper}
@@ -133,47 +162,6 @@ export class HaLabelsPicker extends SubscribeMixin(LitElement) {
        .excludeLabels=${this.value}
        @value-changed=${this._labelChanged}
      >
-        <ha-chip-set>
-          ${labels?.length
-            ? repeat(
-                labels,
-                (label) => label?.label_id,
-                (label) => {
-                  const color = label?.color
-                    ? computeCssColor(label.color)
-                    : undefined;
-                  return html`
-                    <ha-input-chip
-                      .item=${label}
-                      @remove=${this._removeItem}
-                      @click=${this._openDetail}
-                      .disabled=${this.disabled}
-                      .label=${label?.name}
-                      selected
-                      style=${color ? `--color: ${color}` : ""}
-                    >
-                      ${label?.icon
-                        ? html`<ha-icon
-                            slot="icon"
-                            .icon=${label.icon}
-                          ></ha-icon>`
-                        : nothing}
-                    </ha-input-chip>
-                  `;
-                }
-              )
-            : nothing}
-          <ha-button
-            id="picker"
-            size="small"
-            appearance="filled"
-            @click=${this._openPicker}
-            .disabled=${this.disabled}
-          >
-            <ha-svg-icon .path=${mdiPlaylistPlus} slot="start"></ha-svg-icon>
-            ${this.hass.localize("ui.components.label-picker.add")}
-          </ha-button>
-        </ha-chip-set>
      </ha-label-picker>
    `;
  }
@@ -215,25 +203,9 @@ export class HaLabelsPicker extends SubscribeMixin(LitElement) {
    }, 0);
  }

-  private _openPicker(ev: Event) {
-    ev.stopPropagation();
-    this.labelPicker.open();
-  }
-
  static styles = css`
    ha-chip-set {
      margin-bottom: 8px;
-      background-color: var(--mdc-text-field-fill-color);
-      border-bottom: 1px solid var(--ha-color-border-neutral-normal);
-      border-top-right-radius: var(--ha-border-radius-sm);
-      border-top-left-radius: var(--ha-border-radius-sm);
-      padding: var(--ha-space-3);
-    }
-    .placeholder {
-      color: var(--mdc-text-field-label-ink-color);
-      display: flex;
-      align-items: center;
-      height: var(--ha-space-8);
    }
    ha-input-chip {
      --md-input-chip-selected-container-color: var(--color, var(--grey-color));
@@ -1,59 +1,56 @@
-import { mdiMenuDown } from "@mdi/js";
 import type { PropertyValues } from "lit";
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
+import { stopPropagation } from "../common/dom/stop_propagation";
 import { formatLanguageCode } from "../common/language/format_language";
 import { caseInsensitiveStringCompare } from "../common/string/compare";
 import type { FrontendLocaleData } from "../data/translation";
 import { translationMetadata } from "../resources/translations-metadata";
-import type { HomeAssistant, ValueChangedEvent } from "../types";
-import "./ha-button";
-import "./ha-generic-picker";
-import type { HaGenericPicker } from "./ha-generic-picker";
-import type { PickerComboBoxItem } from "./ha-picker-combo-box";
+import type { HomeAssistant } from "../types";
+import "./ha-list-item";
+import "./ha-select";
+import type { HaSelect } from "./ha-select";

 export const getLanguageOptions = (
  languages: string[],
  nativeName: boolean,
  noSort: boolean,
  locale?: FrontendLocaleData
-): PickerComboBoxItem[] => {
-  let options: PickerComboBoxItem[] = [];
+) => {
+  let options: { label: string; value: string }[] = [];

  if (nativeName) {
    const translations = translationMetadata.translations;
    options = languages.map((lang) => {
-      let primary = translations[lang]?.nativeName;
-      if (!primary) {
+      let label = translations[lang]?.nativeName;
+      if (!label) {
        try {
          // this will not work if Intl.DisplayNames is polyfilled, it will return in the language of the user
-          primary = new Intl.DisplayNames(lang, {
+          label = new Intl.DisplayNames(lang, {
            type: "language",
            fallback: "code",
          }).of(lang)!;
        } catch (_err) {
-          primary = lang;
+          label = lang;
        }
      }
      return {
-        id: lang,
-        primary,
-        search_labels: [primary],
+        value: lang,
+        label,
      };
    });
  } else if (locale) {
    options = languages.map((lang) => ({
-      id: lang,
-      primary: formatLanguageCode(lang, locale),
-      search_labels: [formatLanguageCode(lang, locale)],
+      value: lang,
+      label: formatLanguageCode(lang, locale),
    }));
  }

  if (!noSort && locale) {
    options.sort((a, b) =>
-      caseInsensitiveStringCompare(a.primary, b.primary, locale.language)
+      caseInsensitiveStringCompare(a.label, b.label, locale.language)
    );
  }
  return options;
@@ -76,9 +73,6 @@ export class HaLanguagePicker extends LitElement {
  @property({ attribute: "native-name", type: Boolean })
  public nativeName = false;

-  @property({ type: Boolean, attribute: "button-style" })
-  public buttonStyle = false;
-
  @property({ attribute: "no-sort", type: Boolean }) public noSort = false;

  @property({ attribute: "inline-arrow", type: Boolean })
@@ -86,90 +80,115 @@ export class HaLanguagePicker extends LitElement {

  @state() _defaultLanguages: string[] = [];

-  @query("ha-generic-picker", true) public genericPicker!: HaGenericPicker;
+  @query("ha-select") private _select!: HaSelect;

  protected firstUpdated(changedProps: PropertyValues) {
    super.firstUpdated(changedProps);
    this._computeDefaultLanguageOptions();
  }

+  protected updated(changedProperties: PropertyValues) {
+    super.updated(changedProperties);
+
+    const localeChanged =
+      changedProperties.has("hass") &&
+      this.hass &&
+      changedProperties.get("hass") &&
+      changedProperties.get("hass").locale.language !==
+        this.hass.locale.language;
+    if (
+      changedProperties.has("languages") ||
+      changedProperties.has("value") ||
+      localeChanged
+    ) {
+      this._select.layoutOptions();
+      if (!this.disabled && this._select.value !== this.value) {
+        fireEvent(this, "value-changed", { value: this._select.value });
+      }
+      if (!this.value) {
+        return;
+      }
+      const languageOptions = this._getLanguagesOptions(
+        this.languages ?? this._defaultLanguages,
+        this.nativeName,
+        this.noSort,
+        this.hass?.locale
+      );
+      const selectedItemIndex = languageOptions.findIndex(
+        (option) => option.value === this.value
+      );
+      if (selectedItemIndex === -1) {
+        this.value = undefined;
+      }
+      if (localeChanged) {
+        this._select.select(selectedItemIndex);
+      }
+    }
+  }
+
  private _getLanguagesOptions = memoizeOne(getLanguageOptions);

  private _computeDefaultLanguageOptions() {
    this._defaultLanguages = Object.keys(translationMetadata.translations);
  }

-  private _getItems = () =>
-    this._getLanguagesOptions(
+  protected render() {
+    const languageOptions = this._getLanguagesOptions(
      this.languages ?? this._defaultLanguages,
      this.nativeName,
      this.noSort,
      this.hass?.locale
    );

-  private _getLanguageName = (lang?: string) =>
-    this._getItems().find((language) => language.id === lang)?.primary;
-
-  private _valueRenderer = (value) =>
-    html`<span slot="headline"
-      >${this._getLanguageName(value) ?? value}</span
-    > `;
-
-  protected render() {
    const value =
      this.value ??
-      (this.required && !this.disabled ? this._getItems()[0].id : this.value);
+      (this.required && !this.disabled
+        ? languageOptions[0]?.value
+        : this.value);

    return html`
-      <ha-generic-picker
-        .hass=${this.hass}
-        .autofocus=${this.autofocus}
-        popover-placement="bottom-end"
-        .notFoundLabel=${this.hass?.localize(
-          "ui.components.language-picker.no_match"
-        )}
-        .placeholder=${this.label ??
+      <ha-select
+        .label=${this.label ??
        (this.hass?.localize("ui.components.language-picker.language") ||
          "Language")}
-        .value=${value}
-        .valueRenderer=${this._valueRenderer}
+        .value=${value || ""}
+        .required=${this.required}
        .disabled=${this.disabled}
-        .getItems=${this._getItems}
-        @value-changed=${this._changed}
-        hide-clear-icon
+        @selected=${this._changed}
+        @closed=${stopPropagation}
+        fixedMenuPosition
+        naturalMenuWidth
+        .inlineArrow=${this.inlineArrow}
      >
-        ${this.buttonStyle
-          ? html`<ha-button
-              slot="field"
-              .disabled=${this.disabled}
-              @click=${this._openPicker}
-              appearance="plain"
-              variant="neutral"
-            >
-              ${this._getLanguageName(value)}
-              <ha-svg-icon slot="end" .path=${mdiMenuDown}></ha-svg-icon>
-            </ha-button>`
-          : nothing}
-      </ha-generic-picker>
+        ${languageOptions.length === 0
+          ? html`<ha-list-item value=""
+              >${this.hass?.localize(
+                "ui.components.language-picker.no_languages"
+              ) || "No languages"}</ha-list-item
+            >`
+          : languageOptions.map(
+              (option) => html`
+                <ha-list-item .value=${option.value}
+                  >${option.label}</ha-list-item
+                >
+              `
+            )}
+      </ha-select>
    `;
  }

-  private _openPicker(ev: Event) {
-    ev.stopPropagation();
-    this.genericPicker.open();
-  }
-
  static styles = css`
-    ha-generic-picker {
+    ha-select {
      width: 100%;
-      min-width: 200px;
-      display: block;
    }
  `;

-  private _changed(ev: ValueChangedEvent<string>): void {
-    ev.stopPropagation();
-    this.value = ev.detail.value;
+  private _changed(ev): void {
+    const target = ev.target as HaSelect;
+    if (this.disabled || target.value === "" || target.value === this.value) {
+      return;
+    }
+    this.value = target.value;
    fireEvent(this, "value-changed", { value: this.value });
  }
 }
@@ -50,7 +50,7 @@ export class HaMarkdown extends LitElement {
    }
    ha-alert {
      display: block;
-      margin: var(--ha-space-1) 0;
+      margin: 4px 0;
    }
    a {
      color: var(--primary-color);
@@ -75,7 +75,7 @@ export class HaMarkdown extends LitElement {
      padding: 0;
    }
    pre {
-      padding: var(--ha-space-4);
+      padding: 16px;
      overflow: auto;
      line-height: var(--ha-line-height-condensed);
      font-family: var(--ha-font-family-code);
@@ -95,7 +95,7 @@ export class HaMarkdown extends LitElement {
    hr {
      border-color: var(--divider-color);
      border-bottom: none;
-      margin: var(--ha-space-4) 0;
+      margin: 16px 0;
    }
  ` as CSSResultGroup;
 }
@@ -1,28 +1,19 @@
-import type { LitVirtualizer } from "@lit-labs/virtualizer";
-import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
 import { mdiMagnify } from "@mdi/js";
+import type { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import Fuse from "fuse.js";
-import { css, html, LitElement, nothing } from "lit";
-import {
-  customElement,
-  eventOptions,
-  property,
-  query,
-  state,
-} from "lit/decorators";
+import type { PropertyValues, TemplateResult } from "lit";
+import { html, LitElement, nothing } from "lit";
+import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
-import { tinykeys } from "tinykeys";
 import { fireEvent } from "../common/dom/fire_event";
 import { caseInsensitiveStringCompare } from "../common/string/compare";
 import type { LocalizeFunc } from "../common/translations/localize";
 import { HaFuse } from "../resources/fuse";
-import { haStyleScrollbar } from "../resources/styles";
-import { loadVirtualizer } from "../resources/virtualizer";
-import type { HomeAssistant } from "../types";
+import type { HomeAssistant, ValueChangedEvent } from "../types";
+import "./ha-combo-box";
+import type { HaComboBox } from "./ha-combo-box";
 import "./ha-combo-box-item";
 import "./ha-icon";
-import "./ha-textfield";
-import type { HaTextField } from "./ha-textfield";

 export interface PickerComboBoxItem {
  id: string;
@@ -42,13 +33,10 @@ export interface PickerComboBoxItemWithLabel extends PickerComboBoxItem {

 const NO_MATCHING_ITEMS_FOUND_ID = "___no_matching_items_found___";

-const DEFAULT_ROW_RENDERER: RenderItemFunction<PickerComboBoxItem> = (
+const DEFAULT_ROW_RENDERER: ComboBoxLitRenderer<PickerComboBoxItem> = (
  item
 ) => html`
-  <ha-combo-box-item
-    .type=${item.id === NO_MATCHING_ITEMS_FOUND_ID ? "text" : "button"}
-    compact
-  >
+  <ha-combo-box-item type="button" compact>
    ${item.icon
      ? html`<ha-icon slot="start" .icon=${item.icon}></ha-icon>`
      : item.icon_path
@@ -69,7 +57,7 @@ export type PickerComboBoxSearchFn<T extends PickerComboBoxItem> = (

@customElement("ha-picker-combo-box")
 export class HaPickerComboBox extends LitElement {
-  @property({ attribute: false }) public hass?: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  // eslint-disable-next-line lit/no-native-attributes
  @property({ type: Boolean }) public autofocus = false;
@@ -85,7 +73,7 @@ export class HaPickerComboBox extends LitElement {

  @property() public value?: string;

-  @state() private _listScrolled = false;
+  @property() public helper?: string;

  @property({ attribute: false, type: Array })
  public getItems?: () => PickerComboBoxItem[];
@@ -94,7 +82,10 @@ export class HaPickerComboBox extends LitElement {
  public getAdditionalItems?: (searchString?: string) => PickerComboBoxItem[];

  @property({ attribute: false })
-  public rowRenderer?: RenderItemFunction<PickerComboBoxItem>;
+  public rowRenderer?: ComboBoxLitRenderer<PickerComboBoxItem>;
+
+  @property({ attribute: "hide-clear-icon", type: Boolean })
+  public hideClearIcon = false;

  @property({ attribute: "not-found-label", type: String })
  public notFoundLabel?: string;
@@ -102,77 +93,33 @@ export class HaPickerComboBox extends LitElement {
  @property({ attribute: false })
  public searchFn?: PickerComboBoxSearchFn<PickerComboBoxItem>;

-  @property({ reflect: true }) public mode: "popover" | "dialog" = "popover";
+  @state() private _opened = false;

-  @query("lit-virtualizer") private _virtualizerElement?: LitVirtualizer;
+  @query("ha-combo-box", true) public comboBox!: HaComboBox;

-  @query("ha-textfield") private _searchFieldElement?: HaTextField;
-
-  @state() private _items: PickerComboBoxItemWithLabel[] = [];
-
-  private _allItems: PickerComboBoxItemWithLabel[] = [];
-
-  private _selectedItemIndex = -1;
-
-  static shadowRootOptions = {
-    ...LitElement.shadowRootOptions,
-    delegatesFocus: true,
-  };
-
-  private _removeKeyboardShortcuts?: () => void;
-
-  protected firstUpdated() {
-    this._registerKeyboardShortcuts();
+  public async open() {
+    await this.updateComplete;
+    await this.comboBox?.open();
  }

-  public willUpdate() {
-    if (!this.hasUpdated) {
-      loadVirtualizer();
-      this._allItems = this._getItems();
-      this._items = this._allItems;
-    }
+  public async focus() {
+    await this.updateComplete;
+    await this.comboBox?.focus();
  }

-  disconnectedCallback() {
-    super.disconnectedCallback();
-    this._removeKeyboardShortcuts?.();
-  }
+  private _initialItems = false;

-  protected render() {
-    return html`<ha-textfield
-        .label=${this.label ??
-        this.hass?.localize("ui.common.search") ??
-        "Search"}
-        @input=${this._filterChanged}
-      ></ha-textfield>
-      <lit-virtualizer
-        @scroll=${this._onScrollList}
-        tabindex="0"
-        scroller
-        .items=${this._items}
-        .renderItem=${this._renderItem}
-        style="min-height: 36px;"
-        class=${this._listScrolled ? "scrolled" : ""}
-        @focus=${this._focusList}
-      >
-      </lit-virtualizer> `;
-  }
+  private _items: PickerComboBoxItemWithLabel[] = [];

  private _defaultNotFoundItem = memoizeOne(
    (
      label: this["notFoundLabel"],
-      localize?: LocalizeFunc
+      localize: LocalizeFunc
    ): PickerComboBoxItemWithLabel => ({
      id: NO_MATCHING_ITEMS_FOUND_ID,
-      primary:
-        label ||
-        (localize && localize("ui.components.combo-box.no_match")) ||
-        "No matching items found",
+      primary: label || localize("ui.components.combo-box.no_match"),
      icon_path: mdiMagnify,
-      a11y_label:
-        label ||
-        (localize && localize("ui.components.combo-box.no_match")) ||
-        "No matching items found",
+      a11y_label: label || localize("ui.components.combo-box.no_match"),
    })
  );

@@ -197,13 +144,13 @@ export class HaPickerComboBox extends LitElement {
        caseInsensitiveStringCompare(
          entityA.sorting_label!,
          entityB.sorting_label!,
-          this.hass?.locale.language ?? navigator.language
+          this.hass.locale.language
        )
      );

    if (!sortedItems.length) {
      sortedItems.push(
-        this._defaultNotFoundItem(this.notFoundLabel, this.hass?.localize)
+        this._defaultNotFoundItem(this.notFoundLabel, this.hass.localize)
      );
    }

@@ -212,73 +159,99 @@ export class HaPickerComboBox extends LitElement {
    return sortedItems;
  };

-  private _renderItem = (item: PickerComboBoxItem, index: number) => {
-    const renderer = this.rowRenderer || DEFAULT_ROW_RENDERER;
-    return html`<div
-      id=${`list-item-${index}`}
-      class="combo-box-row ${this._value === item.id ? "current-value" : ""}"
-      .value=${item.id}
-      .index=${index}
-      @click=${this._valueSelected}
-    >
-      ${item.id === NO_MATCHING_ITEMS_FOUND_ID
-        ? DEFAULT_ROW_RENDERER(item, index)
-        : renderer(item, index)}
-    </div>`;
-  };
+  protected shouldUpdate(changedProps: PropertyValues) {
+    if (
+      changedProps.has("value") ||
+      changedProps.has("label") ||
+      changedProps.has("disabled")
+    ) {
+      return true;
+    }
+    return !(!changedProps.has("_opened") && this._opened);
+  }

-  @eventOptions({ passive: true })
-  private _onScrollList(ev) {
-    const top = ev.target.scrollTop ?? 0;
-    this._listScrolled = top > 0;
+  public willUpdate(changedProps: PropertyValues) {
+    if (changedProps.has("_opened") && this._opened) {
+      this._items = this._getItems();
+      if (this._initialItems) {
+        this.comboBox.filteredItems = this._items;
+      }
+      this._initialItems = true;
+    }
+  }
+
+  protected render(): TemplateResult {
+    return html`
+      <ha-combo-box
+        item-id-path="id"
+        item-value-path="id"
+        item-label-path="a11y_label"
+        clear-initial-value
+        .hass=${this.hass}
+        .value=${this._value}
+        .label=${this.label}
+        .helper=${this.helper}
+        .allowCustomValue=${this.allowCustomValue}
+        .filteredItems=${this._items}
+        .renderer=${this.rowRenderer || DEFAULT_ROW_RENDERER}
+        .required=${this.required}
+        .disabled=${this.disabled}
+        .hideClearIcon=${this.hideClearIcon}
+        @opened-changed=${this._openedChanged}
+        @value-changed=${this._valueChanged}
+        @filter-changed=${this._filterChanged}
+      >
+      </ha-combo-box>
+    `;
  }

  private get _value() {
    return this.value || "";
  }

-  private _valueSelected = (ev: Event) => {
+  private _openedChanged(ev: ValueChangedEvent<boolean>) {
    ev.stopPropagation();
-    const value = (ev.currentTarget as any).value as string;
-    const newValue = value?.trim();
+    if (ev.detail.value !== this._opened) {
+      this._opened = ev.detail.value;
+      fireEvent(this, "opened-changed", { value: this._opened });
+    }
+  }
+
+  private _valueChanged(ev: ValueChangedEvent<string | undefined>) {
+    ev.stopPropagation();
+    // Clear the input field to prevent showing the old value next time
+    this.comboBox.setTextFieldValue("");
+    const newValue = ev.detail.value?.trim();

    if (newValue === NO_MATCHING_ITEMS_FOUND_ID) {
      return;
    }

-    fireEvent(this, "value-changed", { value: newValue });
-  };
+    if (newValue !== this._value) {
+      this._setValue(newValue);
+    }
+  }

  private _fuseIndex = memoizeOne((states: PickerComboBoxItem[]) =>
    Fuse.createIndex(["search_labels"], states)
  );

-  private _filterChanged = (ev: Event) => {
-    const textfield = ev.target as HaTextField;
-    const searchString = textfield.value.trim();
+  private _filterChanged(ev: CustomEvent): void {
+    if (!this._opened) return;

-    if (!searchString) {
-      this._items = this._allItems;
-      return;
-    }
+    const target = ev.target as HaComboBox;
+    const searchString = ev.detail.value.trim() as string;

-    const index = this._fuseIndex(this._allItems);
-    const fuse = new HaFuse(
-      this._allItems,
-      {
-        shouldSort: false,
-        minMatchCharLength: Math.min(searchString.length, 2),
-      },
-      index
-    );
+    const index = this._fuseIndex(this._items);
+    const fuse = new HaFuse(this._items, { shouldSort: false }, index);

    const results = fuse.multiTermsSearch(searchString);
-    let filteredItems = this._allItems as PickerComboBoxItem[];
+    let filteredItems = this._items as PickerComboBoxItem[];
    if (results) {
      const items = results.map((result) => result.item);
      if (items.length === 0) {
        items.push(
-          this._defaultNotFoundItem(this.notFoundLabel, this.hass?.localize)
+          this._defaultNotFoundItem(this.notFoundLabel, this.hass.localize)
        );
      }
      const additionalItems = this._getAdditionalItems(searchString);
@@ -287,279 +260,17 @@ export class HaPickerComboBox extends LitElement {
    }

    if (this.searchFn) {
-      filteredItems = this.searchFn(
-        searchString,
-        filteredItems,
-        this._allItems
-      );
+      filteredItems = this.searchFn(searchString, filteredItems, this._items);
    }

-    this._items = filteredItems as PickerComboBoxItemWithLabel[];
-    this._selectedItemIndex = -1;
-    if (this._virtualizerElement) {
-      this._virtualizerElement.scrollTo(0, 0);
-    }
-  };
-
-  private _registerKeyboardShortcuts() {
-    this._removeKeyboardShortcuts = tinykeys(this, {
-      ArrowUp: this._selectPreviousItem,
-      ArrowDown: this._selectNextItem,
-      Home: this._selectFirstItem,
-      End: this._selectLastItem,
-      Enter: this._pickSelectedItem,
-    });
+    target.filteredItems = filteredItems;
  }

-  private _focusList() {
-    if (this._selectedItemIndex === -1) {
-      this._selectNextItem();
-    }
+  private _setValue(value: string | undefined) {
+    setTimeout(() => {
+      fireEvent(this, "value-changed", { value });
+    }, 0);
  }
-
-  private _selectNextItem = (ev?: KeyboardEvent) => {
-    ev?.stopPropagation();
-    ev?.preventDefault();
-    if (!this._virtualizerElement) {
-      return;
-    }
-
-    this._searchFieldElement?.focus();
-
-    const items = this._virtualizerElement.items as PickerComboBoxItem[];
-
-    const maxItems = items.length - 1;
-
-    if (maxItems === -1) {
-      this._resetSelectedItem();
-      return;
-    }
-
-    const nextIndex =
-      maxItems === this._selectedItemIndex
-        ? this._selectedItemIndex
-        : this._selectedItemIndex + 1;
-
-    if (!items[nextIndex]) {
-      return;
-    }
-
-    if (items[nextIndex].id === NO_MATCHING_ITEMS_FOUND_ID) {
-      // Skip titles, padding and empty search
-      if (nextIndex === maxItems) {
-        return;
-      }
-      this._selectedItemIndex = nextIndex + 1;
-    } else {
-      this._selectedItemIndex = nextIndex;
-    }
-
-    this._scrollToSelectedItem();
-  };
-
-  private _selectPreviousItem = (ev: KeyboardEvent) => {
-    ev.stopPropagation();
-    ev.preventDefault();
-    if (!this._virtualizerElement) {
-      return;
-    }
-
-    if (this._selectedItemIndex > 0) {
-      const nextIndex = this._selectedItemIndex - 1;
-
-      const items = this._virtualizerElement.items as PickerComboBoxItem[];
-
-      if (!items[nextIndex]) {
-        return;
-      }
-
-      if (items[nextIndex]?.id === NO_MATCHING_ITEMS_FOUND_ID) {
-        // Skip titles, padding and empty search
-        if (nextIndex === 0) {
-          return;
-        }
-        this._selectedItemIndex = nextIndex - 1;
-      } else {
-        this._selectedItemIndex = nextIndex;
-      }
-
-      this._scrollToSelectedItem();
-    }
-  };
-
-  private _selectFirstItem = (ev: KeyboardEvent) => {
-    ev.stopPropagation();
-    if (!this._virtualizerElement || !this._virtualizerElement.items.length) {
-      return;
-    }
-
-    const nextIndex = 0;
-
-    if (
-      (this._virtualizerElement.items[nextIndex] as PickerComboBoxItem)?.id ===
-      NO_MATCHING_ITEMS_FOUND_ID
-    ) {
-      return;
-    }
-
-    if (typeof this._virtualizerElement.items[nextIndex] === "string") {
-      this._selectedItemIndex = nextIndex + 1;
-    } else {
-      this._selectedItemIndex = nextIndex;
-    }
-
-    this._scrollToSelectedItem();
-  };
-
-  private _selectLastItem = (ev: KeyboardEvent) => {
-    ev.stopPropagation();
-    if (!this._virtualizerElement || !this._virtualizerElement.items.length) {
-      return;
-    }
-
-    const nextIndex = this._virtualizerElement.items.length - 1;
-
-    if (
-      (this._virtualizerElement.items[nextIndex] as PickerComboBoxItem)?.id ===
-      NO_MATCHING_ITEMS_FOUND_ID
-    ) {
-      return;
-    }
-
-    if (typeof this._virtualizerElement.items[nextIndex] === "string") {
-      this._selectedItemIndex = nextIndex - 1;
-    } else {
-      this._selectedItemIndex = nextIndex;
-    }
-
-    this._scrollToSelectedItem();
-  };
-
-  private _scrollToSelectedItem = () => {
-    this._virtualizerElement
-      ?.querySelector(".selected")
-      ?.classList.remove("selected");
-
-    this._virtualizerElement?.scrollToIndex(this._selectedItemIndex, "end");
-
-    requestAnimationFrame(() => {
-      this._virtualizerElement
-        ?.querySelector(`#list-item-${this._selectedItemIndex}`)
-        ?.classList.add("selected");
-    });
-  };
-
-  private _pickSelectedItem = (ev: KeyboardEvent) => {
-    ev.stopPropagation();
-    const firstItem = this._virtualizerElement?.items[0] as PickerComboBoxItem;
-
-    if (
-      this._virtualizerElement?.items.length === 1 &&
-      firstItem.id !== NO_MATCHING_ITEMS_FOUND_ID
-    ) {
-      fireEvent(this, "value-changed", {
-        value: firstItem.id,
-      });
-    }
-
-    if (this._selectedItemIndex === -1) {
-      return;
-    }
-
-    // if filter button is focused
-    ev.preventDefault();
-
-    const item = this._virtualizerElement?.items[
-      this._selectedItemIndex
-    ] as PickerComboBoxItem;
-    if (item && item.id !== NO_MATCHING_ITEMS_FOUND_ID) {
-      fireEvent(this, "value-changed", { value: item.id });
-    }
-  };
-
-  private _resetSelectedItem() {
-    this._virtualizerElement
-      ?.querySelector(".selected")
-      ?.classList.remove("selected");
-    this._selectedItemIndex = -1;
-  }
-
-  static styles = [
-    haStyleScrollbar,
-    css`
-      :host {
-        display: flex;
-        flex-direction: column;
-        padding-top: var(--ha-space-3);
-        flex: 1;
-      }
-
-      ha-textfield {
-        padding: 0 var(--ha-space-3);
-        margin-bottom: var(--ha-space-3);
-      }
-
-      :host([mode="dialog"]) ha-textfield {
-        padding: 0 var(--ha-space-4);
-      }
-
-      ha-combo-box-item {
-        width: 100%;
-      }
-
-      ha-combo-box-item.selected {
-        background-color: var(--ha-color-fill-neutral-quiet-hover);
-      }
-
-      @media (prefers-color-scheme: dark) {
-        ha-combo-box-item.selected {
-          background-color: var(--ha-color-fill-neutral-normal-hover);
-        }
-      }
-
-      lit-virtualizer {
-        flex: 1;
-      }
-
-      lit-virtualizer:focus-visible {
-        outline: none;
-      }
-
-      lit-virtualizer.scrolled {
-        border-top: 1px solid var(--ha-color-border-neutral-quiet);
-      }
-
-      .bottom-padding {
-        height: max(var(--safe-area-inset-bottom, 0px), var(--ha-space-8));
-        width: 100%;
-      }
-
-      .empty {
-        text-align: center;
-      }
-
-      .combo-box-row {
-        display: flex;
-        width: 100%;
-        align-items: center;
-        box-sizing: border-box;
-        min-height: 36px;
-      }
-      .combo-box-row.current-value {
-        background-color: var(--ha-color-fill-primary-quiet-resting);
-      }
-
-      .combo-box-row.selected {
-        background-color: var(--ha-color-fill-neutral-quiet-hover);
-      }
-
-      @media (prefers-color-scheme: dark) {
-        .combo-box-row.selected {
-          background-color: var(--ha-color-fill-neutral-normal-hover);
-        }
-      }
-    `,
-  ];
 }

 declare global {
@@ -137,7 +137,7 @@ export class HaSelect extends SelectBase {
        height: var(--ha-select-height, 56px);
      }
      .mdc-select--filled .mdc-floating-label {
-        inset-inline-start: var(--ha-space-4);
+        inset-inline-start: 12px;
        inset-inline-end: initial;
        direction: var(--direction);
      }
@@ -147,7 +147,7 @@ export class HaSelect extends SelectBase {
        direction: var(--direction);
      }
      .mdc-select .mdc-select__anchor {
-        padding-inline-start: var(--ha-space-4);
+        padding-inline-start: 12px;
        padding-inline-end: 0px;
        direction: var(--direction);
      }
@@ -158,10 +158,7 @@ export class HaSelect extends SelectBase {
        padding-inline-end: var(--select-selected-text-padding-end, 0px);
      }
      :host([clearable]) .mdc-select__selected-text-container {
-        padding-inline-end: var(
-          --select-selected-text-padding-end,
-          var(--ha-space-4)
-        );
+        padding-inline-end: var(--select-selected-text-padding-end, 12px);
      }
      ha-icon-button {
        position: absolute;
@@ -0,0 +1,122 @@
+import { css, html, LitElement } from "lit";
+import { customElement, property, state } from "lit/decorators";
+import { fireEvent } from "../../common/dom/fire_event";
+import type { BackgroundSelector } from "../../data/selector";
+import type { HomeAssistant } from "../../types";
+import "../ha-picture-upload";
+import "../ha-alert";
+import type { HaPictureUpload } from "../ha-picture-upload";
+import { URL_PREFIX } from "../../data/image_upload";
+
+@customElement("ha-selector-background")
+export class HaBackgroundSelector extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property() public value?: any;
+
+  @property({ attribute: false }) public selector!: BackgroundSelector;
+
+  @property({ type: Boolean }) public disabled = false;
+
+  @property({ type: Boolean }) public required = true;
+
+  @state() private yamlBackground = false;
+
+  protected updated(changedProps) {
+    super.updated(changedProps);
+
+    if (changedProps.has("value")) {
+      this.yamlBackground = !!this.value && !this.value.startsWith(URL_PREFIX);
+    }
+  }
+
+  protected render() {
+    return html`
+      <div>
+        ${this.yamlBackground
+          ? html`
+              <div class="value">
+                <img
+                  src=${this.value}
+                  alt=${this.hass.localize(
+                    "ui.components.picture-upload.current_image_alt"
+                  )}
+                />
+              </div>
+              <ha-alert alert-type="info">
+                ${this.hass.localize(
+                  `ui.components.selectors.background.yaml_info`
+                )}
+                <ha-button slot="action" @click=${this._clearValue}>
+                  ${this.hass.localize(
+                    `ui.components.picture-upload.clear_picture`
+                  )}
+                </ha-button>
+              </ha-alert>
+            `
+          : html`
+              <ha-picture-upload
+                .hass=${this.hass}
+                .value=${this.value?.startsWith(URL_PREFIX) ? this.value : null}
+                .original=${!!this.selector.background?.original}
+                .cropOptions=${this.selector.background?.crop}
+                select-media
+                @change=${this._pictureChanged}
+              ></ha-picture-upload>
+            `}
+      </div>
+    `;
+  }
+
+  private _pictureChanged(ev) {
+    const value = (ev.target as HaPictureUpload).value;
+
+    fireEvent(this, "value-changed", { value: value ?? undefined });
+  }
+
+  private _clearValue() {
+    fireEvent(this, "value-changed", { value: undefined });
+  }
+
+  static styles = css`
+    :host {
+      display: block;
+      position: relative;
+    }
+    ha-picture-upload {
+      background-color: var(--primary-background-color);
+      border-radius: var(--file-upload-image-border-radius);
+    }
+    div {
+      display: flex;
+      flex-direction: column;
+    }
+    ha-button {
+      white-space: nowrap;
+      --mdc-theme-primary: var(--primary-color);
+    }
+    .value {
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+    img {
+      max-width: 100%;
+      max-height: 200px;
+      margin-bottom: 4px;
+      border-radius: var(--file-upload-image-border-radius);
+      transition: opacity 0.3s;
+      opacity: var(--picture-opacity, 1);
+    }
+    img:hover {
+      opacity: 1;
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-selector-background": HaBackgroundSelector;
+  }
+}
@@ -52,10 +52,9 @@ export class HaObjectSelector extends LitElement {
    const translationKey = this.selector.object?.translation_key;

    if (this.localizeValue && translationKey) {
-      const label =
-        this.localizeValue(`${translationKey}.fields.${schema.name}.name`) ||
-        // Fallback for backward compatibility
-        this.localizeValue(`${translationKey}.fields.${schema.name}`);
+      const label = this.localizeValue(
+        `${translationKey}.fields.${schema.name}`
+      );
      if (label) {
        return label;
      }
@@ -63,20 +62,6 @@ export class HaObjectSelector extends LitElement {
    return this.selector.object?.fields?.[schema.name]?.label || schema.name;
  };

-  private _computeHelper = (schema: HaFormSchema): string => {
-    const translationKey = this.selector.object?.translation_key;
-
-    if (this.localizeValue && translationKey) {
-      const helper = this.localizeValue(
-        `${translationKey}.fields.${schema.name}.description`
-      );
-      if (helper) {
-        return helper;
-      }
-    }
-    return this.selector.object?.fields?.[schema.name]?.description || "";
-  };
-
  private _renderItem(item: any, index: number) {
    const labelField =
      this.selector.object!.label_field ||
@@ -229,7 +214,6 @@ export class HaObjectSelector extends LitElement {
      schema: this._schema(this.selector),
      data: {},
      computeLabel: this._computeLabel,
-      computeHelper: this._computeHelper,
      submitText: this.hass.localize("ui.common.add"),
    });

@@ -36,7 +36,7 @@ export class HaSelectorUiStateContent extends SubscribeMixin(LitElement) {
        .helper=${this.helper}
        .disabled=${this.disabled}
        .required=${this.required}
-        .allowName=${this.selector.ui_state_content?.allow_name || false}
+        .allowName=${this.selector.ui_state_content?.allow_name}
      ></ha-entity-state-content-picker>
    `;
  }
@@ -34,6 +34,7 @@ const LOAD_ELEMENTS = {
  file: () => import("./ha-selector-file"),
  floor: () => import("./ha-selector-floor"),
  label: () => import("./ha-selector-label"),
+  background: () => import("./ha-selector-background"),
  language: () => import("./ha-selector-language"),
  navigation: () => import("./ha-selector-navigation"),
  number: () => import("./ha-selector-number"),
@@ -53,7 +53,7 @@ class HaServicePicker extends LitElement {
    item,
    { index }
  ) => html`
-    <ha-combo-box-item type="button" .borderTop=${index !== 0}>
+    <ha-combo-box-item type="button" border-top .borderTop=${index !== 0}>
      <ha-service-icon
        slot="start"
        .hass=${this.hass}
@@ -76,42 +76,34 @@ class HaServicePicker extends LitElement {
    </ha-combo-box-item>
  `;

-  private _valueRenderer = memoizeOne(
-    (
-      localize: LocalizeFunc,
-      services: HomeAssistant["services"]
-    ): PickerValueRenderer =>
-      (value) => {
-        const serviceId = value;
-        const [domain, service] = serviceId.split(".");
+  private _valueRenderer: PickerValueRenderer = (value) => {
+    const serviceId = value;
+    const [domain, service] = serviceId.split(".");

-        if (!services[domain]?.[service]) {
-          return html`
-            <ha-svg-icon slot="start" .path=${mdiRoomService}></ha-svg-icon>
-            <span slot="headline">${value}</span>
-          `;
-        }
+    if (!this.hass.services[domain]?.[service]) {
+      return html`
+        <ha-svg-icon slot="start" .path=${mdiRoomService}></ha-svg-icon>
+        <span slot="headline">${value}</span>
+      `;
+    }

-        const serviceName =
-          localize(`component.${domain}.services.${service}.name`) ||
-          services[domain][service].name ||
-          service;
+    const serviceName =
+      this.hass.localize(`component.${domain}.services.${service}.name`) ||
+      this.hass.services[domain][service].name ||
+      service;

-        return html`
-          <ha-service-icon
-            slot="start"
-            .hass=${this.hass}
-            .service=${serviceId}
-          ></ha-service-icon>
-          <span slot="headline">${serviceName}</span>
-          ${this.showServiceId
-            ? html`<span slot="supporting-text" class="code"
-                >${serviceId}</span
-              >`
-            : nothing}
-        `;
-      }
-  );
+    return html`
+      <ha-service-icon
+        slot="start"
+        .hass=${this.hass}
+        .service=${serviceId}
+      ></ha-service-icon>
+      <span slot="headline">${serviceName}</span>
+      ${this.showServiceId
+        ? html`<span slot="supporting-text" class="code">${serviceId}</span>`
+        : nothing}
+    `;
+  };

  protected render(): TemplateResult {
    const placeholder =
@@ -131,10 +123,7 @@ class HaServicePicker extends LitElement {
        .value=${this.value}
        .getItems=${this._getItems}
        .rowRenderer=${this._rowRenderer}
-        .valueRenderer=${this._valueRenderer(
-          this.hass.localize,
-          this.hass.services
-        )}
+        .valueRenderer=${this._valueRenderer}
        @value-changed=${this._valueChanged}
      >
      </ha-generic-picker>
@@ -173,9 +162,7 @@ class HaServicePicker extends LitElement {
            const description =
              this.hass.localize(
                `component.${domain}.services.${service}.description`
-              ) ||
-              services[domain][service].description ||
-              "";
+              ) || services[domain][service].description;

            items.push({
              id: serviceId,
@@ -29,7 +29,6 @@ import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
 import { toggleAttribute } from "../common/dom/toggle_attribute";
 import { stringCompare } from "../common/string/compare";
-import { computeRTL } from "../common/util/compute_rtl";
 import { throttle } from "../common/util/throttle";
 import { subscribeFrontendUserData } from "../data/frontend";
 import type { ActionHandlerDetail } from "../data/lovelace/action_handler";
@@ -537,17 +536,11 @@ class HaSidebar extends SubscribeMixin(LitElement) {
  }

  private _renderUserItem(selectedPanel: string) {
-    const isRTL = computeRTL(this.hass);
-
    return html`
      <ha-md-list-item
        href="/profile"
        type="link"
-        class=${classMap({
-          user: true,
-          selected: selectedPanel === "profile",
-          rtl: isRTL,
-        })}
+        class="user ${selectedPanel === "profile" ? " selected" : ""}"
        @mouseenter=${this._itemMouseEnter}
        @mouseleave=${this._itemMouseLeave}
      >
@@ -673,7 +666,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
    tooltip.style.display = "block";
    tooltip.style.position = "fixed";
    tooltip.style.top = `${top}px`;
-    tooltip.style.left = `calc(${item.offsetLeft + item.clientWidth + 8}px + var(--safe-area-inset-left, var(--ha-space-0)))`;
+    tooltip.style.left = `calc(${item.offsetLeft + item.clientWidth + 8}px + var(--safe-area-inset-left, 0px))`;
  }

  private _hideTooltip() {
@@ -712,17 +705,13 @@ class HaSidebar extends SubscribeMixin(LitElement) {
          background-color: var(--sidebar-background-color);
          width: 100%;
          box-sizing: border-box;
-          padding-bottom: calc(
-            14px + var(--safe-area-inset-bottom, var(--ha-space-0))
-          );
+          padding-bottom: calc(14px + var(--safe-area-inset-bottom, 0px));
        }
        .menu {
-          height: calc(
-            var(--header-height) + var(--safe-area-inset-top, var(--ha-space-0))
-          );
+          height: calc(var(--header-height) + var(--safe-area-inset-top, 0px));
          box-sizing: border-box;
          display: flex;
-          padding: 0 var(--ha-space-1);
+          padding: 0 4px;
          border-bottom: 1px solid transparent;
          white-space: nowrap;
          font-weight: var(--ha-font-weight-normal);
@@ -737,17 +726,13 @@ class HaSidebar extends SubscribeMixin(LitElement) {
          );
          font-size: var(--ha-font-size-xl);
          align-items: center;
-          padding-left: calc(
-            var(--ha-space-1) + var(--safe-area-inset-left, var(--ha-space-0))
-          );
-          padding-inline-start: calc(
-            var(--ha-space-1) + var(--safe-area-inset-left, var(--ha-space-0))
-          );
+          padding-left: calc(4px + var(--safe-area-inset-left, 0px));
+          padding-inline-start: calc(4px + var(--safe-area-inset-left, 0px));
          padding-inline-end: initial;
-          padding-top: var(--safe-area-inset-top, var(--ha-space-0));
+          padding-top: var(--safe-area-inset-top, 0px);
        }
        :host([expanded]) .menu {
-          width: calc(256px + var(--safe-area-inset-left, var(--ha-space-0)));
+          width: calc(256px + var(--safe-area-inset-left, 0px));
        }
        :host([narrow][expanded]) .menu {
          width: 100%;
@@ -763,8 +748,8 @@ class HaSidebar extends SubscribeMixin(LitElement) {
          display: none;
        }
        :host([narrow]) .title {
-          margin: var(--ha-space-0);
-          padding: var(--ha-space-0) var(--ha-space-4);
+          margin: 0;
+          padding: 0 16px;
        }
        :host([expanded]) .title {
          display: initial;
@@ -776,16 +761,13 @@ class HaSidebar extends SubscribeMixin(LitElement) {
        ha-fade-in,
        ha-md-list {
          height: calc(
-            100% - var(--header-height) - var(
-                --safe-area-inset-top,
-                var(--ha-space-0)
-              ) -
+            100% - var(--header-height) - var(--safe-area-inset-top, 0px) -
              132px
          );
        }

        ha-fade-in {
-          padding: var(--ha-space-1) var(--ha-space-0);
+          padding: 4px 0;
          box-sizing: border-box;
          display: flex;
          justify-content: center;
@@ -795,29 +777,29 @@ class HaSidebar extends SubscribeMixin(LitElement) {
        ha-md-list {
          overflow-x: hidden;
          background: none;
-          margin-left: var(--safe-area-inset-left, var(--ha-space-0));
+          margin-left: var(--safe-area-inset-left, 0px);
        }

        ha-md-list-item {
          flex-shrink: 0;
          box-sizing: border-box;
-          margin: var(--ha-space-1);
+          margin: 4px;
          border-radius: var(--ha-border-radius-sm);
-          --md-list-item-one-line-container-height: var(--ha-space-10);
+          --md-list-item-one-line-container-height: 40px;
          --md-list-item-top-space: 0;
          --md-list-item-bottom-space: 0;
-          width: var(--ha-space-12);
+          width: 48px;
          position: relative;
          --md-list-item-label-text-color: var(--sidebar-text-color);
-          --md-list-item-leading-space: var(--ha-space-3);
-          --md-list-item-trailing-space: var(--ha-space-3);
-          --md-list-item-leading-icon-size: var(--ha-space-6);
+          --md-list-item-leading-space: 12px;
+          --md-list-item-trailing-space: 12px;
+          --md-list-item-leading-icon-size: 24px;
        }
        :host([expanded]) ha-md-list-item {
          width: 248px;
        }
        :host([narrow][expanded]) ha-md-list-item {
-          width: calc(240px - var(--safe-area-inset-left, var(--ha-space-0)));
+          width: calc(240px - var(--safe-area-inset-left, 0px));
        }

        ha-md-list-item.selected {
@@ -841,7 +823,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {

        ha-icon[slot="start"],
        ha-svg-icon[slot="start"] {
-          width: var(--ha-space-6);
+          width: 24px;
          flex-shrink: 0;
          color: var(--sidebar-icon-color);
        }
@@ -874,7 +856,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
          display: flex;
          justify-content: center;
          align-items: center;
-          min-width: var(--ha-space-2);
+          min-width: 8px;
          border-radius: var(--ha-border-radius-xl);
          font-weight: var(--ha-font-weight-normal);
          line-height: normal;
@@ -885,26 +867,22 @@ class HaSidebar extends SubscribeMixin(LitElement) {

        ha-svg-icon + .badge {
          position: absolute;
-          top: var(--ha-space-1);
+          top: 4px;
          left: 26px;
          border-radius: var(--ha-border-radius-md);
          font-size: 0.65em;
          line-height: var(--ha-line-height-expanded);
-          padding: var(--ha-space-0) var(--ha-space-1);
+          padding: 0 4px;
        }

        ha-md-list-item.user {
-          --md-list-item-leading-icon-size: var(--ha-space-10);
-          --md-list-item-leading-space: var(--ha-space-1);
-        }
-
-        ha-md-list-item.user.rtl {
-          --md-list-item-leading-space: var(--ha-space-3);
+          --md-list-item-leading-icon-size: 40px;
+          --md-list-item-leading-space: 4px;
        }

        ha-user-badge {
          flex-shrink: 0;
-          margin-right: calc(var(--ha-space-2) * -1);
+          margin-right: -8px;
        }

        .spacer {
@@ -916,7 +894,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
          color: var(--sidebar-text-color);
          font-size: var(--ha-font-size-m);
          font-weight: var(--ha-font-weight-medium);
-          padding: var(--ha-space-4);
+          padding: 16px;
          white-space: nowrap;
        }

@@ -928,7 +906,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
          white-space: nowrap;
          color: var(--sidebar-background-color);
          background-color: var(--sidebar-text-color);
-          padding: var(--ha-space-1);
+          padding: 4px;
          font-weight: var(--ha-font-weight-medium);
        }

@@ -87,208 +87,166 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {

  protected render() {
    if (this.addOnTop) {
-      return html` ${this._renderPicker()} ${this._renderItems()} `;
+      return html` ${this._renderChips()} ${this._renderItems()} `;
    }
-    return html` ${this._renderItems()} ${this._renderPicker()} `;
+    return html` ${this._renderItems()} ${this._renderChips()} `;
  }

  private _renderValueChips() {
-    const entityIds = this.value?.entity_id
-      ? ensureArray(this.value.entity_id)
-      : [];
-    const deviceIds = this.value?.device_id
-      ? ensureArray(this.value.device_id)
-      : [];
-    const areaIds = this.value?.area_id ? ensureArray(this.value.area_id) : [];
-    const floorIds = this.value?.floor_id
-      ? ensureArray(this.value.floor_id)
-      : [];
-    const labelIds = this.value?.label_id
-      ? ensureArray(this.value.label_id)
-      : [];
-
-    if (
-      !entityIds.length &&
-      !deviceIds.length &&
-      !areaIds.length &&
-      !floorIds.length &&
-      !labelIds.length
-    ) {
-      return nothing;
-    }
-
-    return html`
-      <div class="mdc-chip-set items">
-        ${floorIds.length
-          ? floorIds.map(
-              (floor_id) => html`
-                <ha-target-picker-value-chip
-                  .hass=${this.hass}
-                  type="floor"
-                  .itemId=${floor_id}
-                  @remove-target-item=${this._handleRemove}
-                  @expand-target-item=${this._handleExpand}
-                ></ha-target-picker-value-chip>
-              `
-            )
-          : nothing}
-        ${areaIds.length
-          ? areaIds.map(
-              (area_id) => html`
-                <ha-target-picker-value-chip
-                  .hass=${this.hass}
-                  type="area"
-                  .itemId=${area_id}
-                  @remove-target-item=${this._handleRemove}
-                  @expand-target-item=${this._handleExpand}
-                ></ha-target-picker-value-chip>
-              `
-            )
-          : nothing}
-        ${deviceIds.length
-          ? deviceIds.map(
-              (device_id) => html`
-                <ha-target-picker-value-chip
-                  .hass=${this.hass}
-                  type="device"
-                  .itemId=${device_id}
-                  @remove-target-item=${this._handleRemove}
-                  @expand-target-item=${this._handleExpand}
-                ></ha-target-picker-value-chip>
-              `
-            )
-          : nothing}
-        ${entityIds.length
-          ? entityIds.map(
-              (entity_id) => html`
-                <ha-target-picker-value-chip
-                  .hass=${this.hass}
-                  type="entity"
-                  .itemId=${entity_id}
-                  @remove-target-item=${this._handleRemove}
-                  @expand-target-item=${this._handleExpand}
-                ></ha-target-picker-value-chip>
-              `
-            )
-          : nothing}
-        ${labelIds.length
-          ? labelIds.map(
-              (label_id) => html`
-                <ha-target-picker-value-chip
-                  .hass=${this.hass}
-                  type="label"
-                  .itemId=${label_id}
-                  @remove-target-item=${this._handleRemove}
-                  @expand-target-item=${this._handleExpand}
-                ></ha-target-picker-value-chip>
-              `
-            )
-          : nothing}
-      </div>
-    `;
+    return html`<div class="mdc-chip-set items">
+      ${this.value?.floor_id
+        ? ensureArray(this.value.floor_id).map(
+            (floor_id) => html`
+              <ha-target-picker-value-chip
+                .hass=${this.hass}
+                type="floor"
+                .itemId=${floor_id}
+                @remove-target-item=${this._handleRemove}
+                @expand-target-item=${this._handleExpand}
+              ></ha-target-picker-value-chip>
+            `
+          )
+        : nothing}
+      ${this.value?.area_id
+        ? ensureArray(this.value.area_id).map(
+            (area_id) => html`
+              <ha-target-picker-value-chip
+                .hass=${this.hass}
+                type="area"
+                .itemId=${area_id}
+                @remove-target-item=${this._handleRemove}
+                @expand-target-item=${this._handleExpand}
+              ></ha-target-picker-value-chip>
+            `
+          )
+        : nothing}
+      ${this.value?.device_id
+        ? ensureArray(this.value.device_id).map(
+            (device_id) => html`
+              <ha-target-picker-value-chip
+                .hass=${this.hass}
+                type="device"
+                .itemId=${device_id}
+                @remove-target-item=${this._handleRemove}
+                @expand-target-item=${this._handleExpand}
+              ></ha-target-picker-value-chip>
+            `
+          )
+        : nothing}
+      ${this.value?.entity_id
+        ? ensureArray(this.value.entity_id).map(
+            (entity_id) => html`
+              <ha-target-picker-value-chip
+                .hass=${this.hass}
+                type="entity"
+                .itemId=${entity_id}
+                @remove-target-item=${this._handleRemove}
+                @expand-target-item=${this._handleExpand}
+              ></ha-target-picker-value-chip>
+            `
+          )
+        : nothing}
+      ${this.value?.label_id
+        ? ensureArray(this.value.label_id).map(
+            (label_id) => html`
+              <ha-target-picker-value-chip
+                .hass=${this.hass}
+                type="label"
+                .itemId=${label_id}
+                @remove-target-item=${this._handleRemove}
+                @expand-target-item=${this._handleExpand}
+              ></ha-target-picker-value-chip>
+            `
+          )
+        : nothing}
+    </div>`;
  }

  private _renderValueGroups() {
-    const entityIds = this.value?.entity_id
-      ? ensureArray(this.value.entity_id)
-      : [];
-    const deviceIds = this.value?.device_id
-      ? ensureArray(this.value.device_id)
-      : [];
-    const areaIds = this.value?.area_id ? ensureArray(this.value.area_id) : [];
-    const floorIds = this.value?.floor_id
-      ? ensureArray(this.value.floor_id)
-      : [];
-    const labelIds = this.value?.label_id
-      ? ensureArray(this.value?.label_id)
-      : [];
+    return html`<div class="item-groups">
+      ${this.value?.entity_id
+        ? html`
+            <ha-target-picker-item-group
+              @remove-target-item=${this._handleRemove}
+              type="entity"
+              .hass=${this.hass}
+              .items=${{ entity: ensureArray(this.value?.entity_id) }}
+              .deviceFilter=${this.deviceFilter}
+              .entityFilter=${this.entityFilter}
+              .includeDomains=${this.includeDomains}
+              .includeDeviceClasses=${this.includeDeviceClasses}
+            >
+            </ha-target-picker-item-group>
+          `
+        : nothing}
+      ${this.value?.device_id
+        ? html`
+            <ha-target-picker-item-group
+              @remove-target-item=${this._handleRemove}
+              type="device"
+              .hass=${this.hass}
+              .items=${{ device: ensureArray(this.value?.device_id) }}
+              .deviceFilter=${this.deviceFilter}
+              .entityFilter=${this.entityFilter}
+              .includeDomains=${this.includeDomains}
+              .includeDeviceClasses=${this.includeDeviceClasses}
+            >
+            </ha-target-picker-item-group>
+          `
+        : nothing}
+      ${this.value?.floor_id || this.value?.area_id
+        ? html`
+            <ha-target-picker-item-group
+              @remove-target-item=${this._handleRemove}
+              type="area"
+              .hass=${this.hass}
+              .items=${{
+                floor: ensureArray(this.value?.floor_id),
+                area: ensureArray(this.value?.area_id),
+              }}
+              .deviceFilter=${this.deviceFilter}
+              .entityFilter=${this.entityFilter}
+              .includeDomains=${this.includeDomains}
+              .includeDeviceClasses=${this.includeDeviceClasses}
+            >
+            </ha-target-picker-item-group>
+          `
+        : nothing}
+      ${this.value?.label_id
+        ? html`
+            <ha-target-picker-item-group
+              @remove-target-item=${this._handleRemove}
+              type="label"
+              .hass=${this.hass}
+              .items=${{ label: ensureArray(this.value?.label_id) }}
+              .deviceFilter=${this.deviceFilter}
+              .entityFilter=${this.entityFilter}
+              .includeDomains=${this.includeDomains}
+              .includeDeviceClasses=${this.includeDeviceClasses}
+            >
+            </ha-target-picker-item-group>
+          `
+        : nothing}
+    </div>`;
+  }

+  private _renderItems() {
    if (
-      !entityIds.length &&
-      !deviceIds.length &&
-      !areaIds.length &&
-      !floorIds.length &&
-      !labelIds.length
+      !this.value?.floor_id &&
+      !this.value?.area_id &&
+      !this.value?.device_id &&
+      !this.value?.entity_id &&
+      !this.value?.label_id
    ) {
      return nothing;
    }

-    return html`
-      <div class="item-groups">
-        ${entityIds.length
-          ? html`
-              <ha-target-picker-item-group
-                @remove-target-item=${this._handleRemove}
-                type="entity"
-                .hass=${this.hass}
-                .items=${{ entity: entityIds }}
-                .deviceFilter=${this.deviceFilter}
-                .entityFilter=${this.entityFilter}
-                .includeDomains=${this.includeDomains}
-                .includeDeviceClasses=${this.includeDeviceClasses}
-              >
-              </ha-target-picker-item-group>
-            `
-          : nothing}
-        ${deviceIds.length
-          ? html`
-              <ha-target-picker-item-group
-                @remove-target-item=${this._handleRemove}
-                type="device"
-                .hass=${this.hass}
-                .items=${{ device: deviceIds }}
-                .deviceFilter=${this.deviceFilter}
-                .entityFilter=${this.entityFilter}
-                .includeDomains=${this.includeDomains}
-                .includeDeviceClasses=${this.includeDeviceClasses}
-              >
-              </ha-target-picker-item-group>
-            `
-          : nothing}
-        ${floorIds.length || areaIds.length
-          ? html`
-              <ha-target-picker-item-group
-                @remove-target-item=${this._handleRemove}
-                type="area"
-                .hass=${this.hass}
-                .items=${{
-                  floor: floorIds,
-                  area: areaIds,
-                }}
-                .deviceFilter=${this.deviceFilter}
-                .entityFilter=${this.entityFilter}
-                .includeDomains=${this.includeDomains}
-                .includeDeviceClasses=${this.includeDeviceClasses}
-              >
-              </ha-target-picker-item-group>
-            `
-          : nothing}
-        ${labelIds.length
-          ? html`
-              <ha-target-picker-item-group
-                @remove-target-item=${this._handleRemove}
-                type="label"
-                .hass=${this.hass}
-                .items=${{ label: labelIds }}
-                .deviceFilter=${this.deviceFilter}
-                .entityFilter=${this.entityFilter}
-                .includeDomains=${this.includeDomains}
-                .includeDeviceClasses=${this.includeDeviceClasses}
-              >
-              </ha-target-picker-item-group>
-            `
-          : nothing}
-      </div>
-    `;
-  }
-
-  private _renderItems() {
    return html`
      ${this.compact ? this._renderValueChips() : this._renderValueGroups()}
    `;
  }

-  private _renderPicker() {
+  private _renderChips() {
    return html`
      <div class="add-target-wrapper">
        <ha-button
@@ -389,8 +347,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
    this._pickerFilter = filter;
  };

-  private _hidePicker(ev) {
-    ev.stopPropagation();
+  private _hidePicker() {
    this._open = false;
    this._pickerWrapperOpen = false;

@@ -9,7 +9,7 @@ export class HaTooltip extends Tooltip {
  @property({ attribute: "show-delay", type: Number }) showDelay = 150;

  /** The amount of time to wait before hiding the tooltip when the user mouses out.. */
-  @property({ attribute: "hide-delay", type: Number }) hideDelay = 150;
+  @property({ attribute: "hide-delay", type: Number }) hideDelay = 400;

  static get styles(): CSSResultGroup {
    return [
@@ -2,13 +2,26 @@ import { TopAppBarFixedBase } from "@material/mwc-top-app-bar-fixed/mwc-top-app-
 import { styles } from "@material/mwc-top-app-bar/mwc-top-app-bar.css";
 import { css } from "lit";
 import { customElement, property } from "lit/decorators";
+import { ViewTransitionMixin } from "../mixins/view-transition-mixin";
+import { haStyleViewTransitions } from "../resources/styles";

@customElement("ha-top-app-bar-fixed")
-export class HaTopAppBarFixed extends TopAppBarFixedBase {
+export class HaTopAppBarFixed extends ViewTransitionMixin(TopAppBarFixedBase) {
  @property({ type: Boolean, reflect: true }) public narrow = false;

+  @property({ type: Boolean, reflect: true, attribute: "content-loading" })
+  public contentLoading = true;
+
+  protected override onLoadTransition(): void {
+    // Use reflected property since we can't add class to base component's rendered elements
+    this.startViewTransition(() => {
+      this.contentLoading = false;
+    });
+  }
+
  static override styles = [
    styles,
+    haStyleViewTransitions,
    css`
      header {
        padding-top: var(--safe-area-inset-top);
@@ -23,6 +36,10 @@ export class HaTopAppBarFixed extends TopAppBarFixedBase {
        );
        padding-bottom: var(--safe-area-inset-bottom);
        padding-right: var(--safe-area-inset-right);
+        view-transition-name: layout-fade-in;
+      }
+      :host([content-loading]) .mdc-top-app-bar--fixed-adjust {
+        opacity: 0;
      }
      :host([narrow]) .mdc-top-app-bar--fixed-adjust {
        padding-left: var(--safe-area-inset-left);
@@ -10,14 +10,15 @@ import { html, css, nothing } from "lit";
 import { property, query, customElement } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { styles } from "@material/mwc-top-app-bar/mwc-top-app-bar.css";
-import { haStyleScrollbar } from "../resources/styles";
+import { ViewTransitionMixin } from "../mixins/view-transition-mixin";
+import { haStyleScrollbar, haStyleViewTransitions } from "../resources/styles";

 export const passiveEventOptionsIfSupported = supportsPassiveEventListener
  ? { passive: true }
  : undefined;

@customElement("ha-two-pane-top-app-bar-fixed")
-export class TopAppBarBaseBase extends BaseElement {
+export class TopAppBarBaseBase extends ViewTransitionMixin(BaseElement) {
  protected override mdcFoundation!: MDCFixedTopAppBarFoundation;

  protected override mdcFoundationClass = MDCFixedTopAppBarFoundation;
@@ -144,7 +145,12 @@ export class TopAppBarBaseBase extends BaseElement {
          : nothing}
        <div class="main">
          ${this.pane ? html`<div class="shadow-container"></div>` : nothing}
-          <div class="content">
+          <div
+            class=${classMap({
+              content: true,
+              loading: !this._loaded,
+            })}
+          >
            <slot></slot>
          </div>
        </div>
@@ -245,6 +251,7 @@ export class TopAppBarBaseBase extends BaseElement {
  static override styles = [
    styles,
    haStyleScrollbar,
+    haStyleViewTransitions,
    css`
      header {
        padding-top: var(--safe-area-inset-top);
@@ -341,6 +348,10 @@ export class TopAppBarBaseBase extends BaseElement {
      .mdc-top-app-bar--pane .content {
        height: 100%;
        overflow: auto;
+        view-transition-name: layout-fade-in;
+      }
+      .content.loading {
+        opacity: 0;
      }
      .mdc-top-app-bar__title {
        font-size: var(--ha-font-size-xl);
@@ -1,18 +1,12 @@
+import { css, html, LitElement, nothing } from "lit";
+import { customElement, property, state } from "lit/decorators";
 import "@home-assistant/webawesome/dist/components/dialog/dialog";
 import { mdiClose } from "@mdi/js";
-import { css, html, LitElement, nothing } from "lit";
-import {
-  customElement,
-  eventOptions,
-  property,
-  query,
-  state,
-} from "lit/decorators";
-import { fireEvent } from "../common/dom/fire_event";
-import { haStyleScrollbar } from "../resources/styles";
-import type { HomeAssistant } from "../types";
 import "./ha-dialog-header";
 import "./ha-icon-button";
+import type { HomeAssistant } from "../types";
+import { fireEvent } from "../common/dom/fire_event";
+import { haStyleScrollbar } from "../resources/styles";

 export type DialogWidth = "small" | "medium" | "large" | "full";

@@ -96,11 +90,6 @@ export class HaWaDialog extends LitElement {
  @state()
  private _open = false;

-  @query(".body") public bodyContainer!: HTMLDivElement;
-
-  @state()
-  private _bodyScrolled = false;
-
  protected updated(
    changedProperties: Map<string | number | symbol, unknown>
  ): void {
@@ -118,14 +107,10 @@ export class HaWaDialog extends LitElement {
        .lightDismiss=${!this.preventScrimClose}
        without-header
        @wa-show=${this._handleShow}
-        @wa-after-show=${this._handleAfterShow}
        @wa-after-hide=${this._handleAfterHide}
      >
        <slot name="header">
-          <ha-dialog-header
-            .subtitlePosition=${this.headerSubtitlePosition}
-            .showBorder=${this._bodyScrolled}
-          >
+          <ha-dialog-header .subtitlePosition=${this.headerSubtitlePosition}>
            <slot name="headerNavigationIcon" slot="navigationIcon">
              <ha-icon-button
                data-dialog="close"
@@ -144,7 +129,7 @@ export class HaWaDialog extends LitElement {
            <slot name="headerActionItems" slot="actionItems"></slot>
          </ha-dialog-header>
        </slot>
-        <div class="body ha-scrollbar" @scroll=${this._handleBodyScroll}>
+        <div class="body ha-scrollbar">
          <slot></slot>
        </div>
        <slot name="footer" slot="footer"></slot>
@@ -161,10 +146,6 @@ export class HaWaDialog extends LitElement {
    (this.querySelector("[autofocus]") as HTMLElement | null)?.focus();
  };

-  private _handleAfterShow = () => {
-    fireEvent(this, "after-show");
-  };
-
  private _handleAfterHide = () => {
    this._open = false;
    fireEvent(this, "closed");
@@ -175,11 +156,6 @@ export class HaWaDialog extends LitElement {
    this._open = false;
  }

-  @eventOptions({ passive: true })
-  private _handleBodyScroll(ev: Event) {
-    this._bodyScrolled = (ev.target as HTMLDivElement).scrollTop > 0;
-  }
-
  static styles = [
    haStyleScrollbar,
    css`
@@ -196,7 +172,7 @@ export class HaWaDialog extends LitElement {
            )
          )
        );
-        --width: min(var(--ha-dialog-width-md, 580px), var(--full-width));
+        --width: var(--ha-dialog-width-md, min(580px, var(--full-width)));
        --spacing: var(--dialog-content-padding, var(--ha-space-6));
        --show-duration: var(--ha-dialog-show-duration, 200ms);
        --hide-duration: var(--ha-dialog-hide-duration, 200ms);
@@ -217,11 +193,11 @@ export class HaWaDialog extends LitElement {
      }

      :host([width="small"]) wa-dialog {
-        --width: min(var(--ha-dialog-width-sm, 320px), var(--full-width));
+        --width: var(--ha-dialog-width-sm, min(320px, var(--full-width)));
      }

      :host([width="large"]) wa-dialog {
-        --width: min(var(--ha-dialog-width-lg, 720px), var(--full-width));
+        --width: var(--ha-dialog-width-lg, min(720px, var(--full-width)));
      }

      :host([width="full"]) wa-dialog {
@@ -235,7 +211,6 @@ export class HaWaDialog extends LitElement {
          --ha-dialog-max-height,
          calc(100% - var(--ha-space-20))
        );
-        min-height: var(--ha-dialog-min-height);
        position: var(--dialog-surface-position, relative);
        margin-top: var(--dialog-surface-margin-top, auto);
        display: flex;
@@ -309,7 +284,6 @@ export class HaWaDialog extends LitElement {
      }
      :host([flexcontent]) .body {
        max-width: 100%;
-        flex: 1;
        display: flex;
        flex-direction: column;
      }
@@ -338,7 +312,6 @@ declare global {

  interface HASSDomEvents {
    opened: undefined;
-    "after-show": undefined;
    closed: undefined;
  }
 }
@@ -15,7 +15,6 @@ import { classMap } from "lit/directives/class-map";
 import { styleMap } from "lit/directives/style-map";
 import { until } from "lit/directives/until";
 import { fireEvent } from "../../common/dom/fire_event";
-import { slugify } from "../../common/string/slugify";
 import { debounce } from "../../common/util/debounce";
 import { isUnavailableState } from "../../data/entity";
 import type {
@@ -694,12 +693,10 @@ export class HaMediaPlayerBrowse extends LitElement {
                `
              : ""}
          </div>
-          <ha-tooltip .for="grid-${slugify(child.title)}" distance="-4">
+          <ha-tooltip .for="grid-${child.title}" distance="-4">
            ${child.title}
          </ha-tooltip>
-          <div .id="grid-${slugify(child.title)}" class="title">
-            ${child.title}
-          </div>
+          <div .id="grid-${child.title}" class="title">${child.title}</div>
        </ha-card>
      </div>
    `;
@@ -1,15 +1,17 @@
-import { html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { mdiClose } from "@mdi/js";
+import { css, html, LitElement, nothing } from "lit";
+import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent } from "../../../common/dom/fire_event";
 import type { HassDialog } from "../../../dialogs/make-dialog-manager";
 import type { HomeAssistant } from "../../../types";
 import "../../ha-dialog-header";
 import "../../ha-icon-button";
 import "../../ha-icon-next";
+import "../../ha-md-dialog";
+import type { HaMdDialog } from "../../ha-md-dialog";
 import "../../ha-md-list";
 import "../../ha-md-list-item";
 import "../../ha-svg-icon";
-import "../../ha-wa-dialog";
 import "../ha-target-picker-item-row";
 import type { TargetDetailsDialogParams } from "./show-dialog-target-details";

@@ -19,15 +21,14 @@ class DialogTargetDetails extends LitElement implements HassDialog {

  @state() private _params?: TargetDetailsDialogParams;

-  @state() private _opened = false;
+  @query("ha-md-dialog") private _dialog?: HaMdDialog;

  public showDialog(params: TargetDetailsDialogParams): void {
    this._params = params;
-    this._opened = true;
  }

  public closeDialog() {
-    this._opened = false;
+    this._dialog?.close();
    return true;
  }

@@ -42,31 +43,58 @@ class DialogTargetDetails extends LitElement implements HassDialog {
    }

    return html`
-      <ha-wa-dialog
-        .hass=${this.hass}
-        .open=${this._opened}
-        header-title=${this.hass.localize(
-          "ui.components.target-picker.target_details"
-        )}
-        header-subtitle=${`${this.hass.localize(
-          `ui.components.target-picker.type.${this._params.type}`
-        )}:
-            ${this._params.title}`}
-        @closed=${this._dialogClosed}
-      >
-        <ha-target-picker-item-row
-          .hass=${this.hass}
-          .type=${this._params.type}
-          .itemId=${this._params.itemId}
-          .deviceFilter=${this._params.deviceFilter}
-          .entityFilter=${this._params.entityFilter}
-          .includeDomains=${this._params.includeDomains}
-          .includeDeviceClasses=${this._params.includeDeviceClasses}
-          expand
-        ></ha-target-picker-item-row>
-      </ha-wa-dialog>
+      <ha-md-dialog open @closed=${this._dialogClosed}>
+        <ha-dialog-header slot="headline">
+          <ha-icon-button
+            slot="navigationIcon"
+            @click=${this.closeDialog}
+            .label=${this.hass.localize("ui.common.close")}
+            .path=${mdiClose}
+          ></ha-icon-button>
+          <span slot="title"
+            >${this.hass.localize(
+              "ui.components.target-picker.target_details"
+            )}</span
+          >
+          <span slot="subtitle"
+            >${this.hass.localize(
+              `ui.components.target-picker.type.${this._params.type}`
+            )}:
+            ${this._params.title}</span
+          >
+        </ha-dialog-header>
+        <div slot="content">
+          <ha-target-picker-item-row
+            .hass=${this.hass}
+            .type=${this._params.type}
+            .itemId=${this._params.itemId}
+            .deviceFilter=${this._params.deviceFilter}
+            .entityFilter=${this._params.entityFilter}
+            .includeDomains=${this._params.includeDomains}
+            .includeDeviceClasses=${this._params.includeDeviceClasses}
+            expand
+          ></ha-target-picker-item-row>
+        </div>
+      </ha-md-dialog>
    `;
  }
+
+  static styles = css`
+    ha-md-dialog {
+      min-width: 400px;
+      max-height: 90%;
+      --dialog-content-padding: var(--ha-space-2) var(--ha-space-6)
+        max(var(--safe-area-inset-bottom, var(--ha-space-0)), var(--ha-space-8));
+    }
+
+    @media all and (max-width: 600px), all and (max-height: 500px) {
+      ha-md-dialog {
+        --md-dialog-container-shape: var(--ha-space-0);
+        min-width: 100%;
+        min-height: 100%;
+      }
+    }
+  `;
 }

 declare global {
@@ -6,7 +6,6 @@ import {
  mdiLabel,
  mdiTextureBox,
 } from "@mdi/js";
-import type { HassEntity } from "home-assistant-js-websocket";
 import { css, html, LitElement, nothing, type PropertyValues } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -20,12 +19,9 @@ import { computeDomain } from "../../common/entity/compute_domain";
 import { computeEntityName } from "../../common/entity/compute_entity_name";
 import { getEntityContext } from "../../common/entity/context/get_entity_context";
 import { computeRTL } from "../../common/util/compute_rtl";
-import type { AreaRegistryEntry } from "../../data/area_registry";
 import { getConfigEntry } from "../../data/config_entries";
 import { labelsContext } from "../../data/context";
-import type { DeviceRegistryEntry } from "../../data/device_registry";
 import type { HaEntityPickerEntityFilterFunc } from "../../data/entity";
-import type { FloorRegistryEntry } from "../../data/floor_registry";
 import { domainToName } from "../../data/integration";
 import type { LabelRegistryEntry } from "../../data/label_registry";
 import {
@@ -115,10 +111,10 @@ export class HaTargetPickerItemRow extends LitElement {
  }

  protected render() {
-    const { name, context, iconPath, fallbackIconPath, stateObject, notFound } =
+    const { name, context, iconPath, fallbackIconPath, stateObject } =
      this._itemData(this.type, this.itemId);

-    const showEntities = this.type !== "entity" && !notFound;
+    const showEntities = this.type !== "entity";

    const entries = this.parentEntries || this._entries;

@@ -132,7 +128,7 @@ export class HaTargetPickerItemRow extends LitElement {
    }

    return html`
-      <ha-md-list-item type="text" class=${notFound ? "error" : ""}>
+      <ha-md-list-item type="text">
        <div class="icon" slot="start">
          ${this.subEntry
            ? html`
@@ -152,15 +148,11 @@ export class HaTargetPickerItemRow extends LitElement {
                />`
              : fallbackIconPath
                ? html`<ha-svg-icon .path=${fallbackIconPath}></ha-svg-icon>`
-                : this.type === "entity"
+                : stateObject
                  ? html`
                      <ha-state-icon
                        .hass=${this.hass}
-                        .stateObj=${stateObject ||
-                        ({
-                          entity_id: this.itemId,
-                          attributes: {},
-                        } as HassEntity)}
+                        .stateObj=${stateObject}
                      >
                      </ha-state-icon>
                    `
@@ -168,20 +160,13 @@ export class HaTargetPickerItemRow extends LitElement {
        </div>

        <div slot="headline">${name}</div>
-        ${notFound || (context && !this.hideContext)
-          ? html`<span slot="supporting-text"
-              >${notFound
-                ? this.hass.localize(
-                    `ui.components.target-picker.${this.type}_not_found`
-                  )
-                : context}</span
-            >`
-          : nothing}
-        ${this._domainName && this.subEntry
-          ? html`<span slot="supporting-text" class="domain"
-              >${this._domainName}</span
-            >`
-          : nothing}
+        ${context && !this.hideContext
+          ? html`<span slot="supporting-text">${context}</span>`
+          : this._domainName && this.subEntry
+            ? html`<span slot="supporting-text" class="domain"
+                >${this._domainName}</span
+              >`
+            : nothing}
        ${!this.subEntry && entries && showEntities
          ? html`
              <div slot="end" class="summary">
@@ -246,11 +231,9 @@ export class HaTargetPickerItemRow extends LitElement {
    const rows1 =
      (nextType === "area"
        ? entries?.referenced_areas
-        : nextType === "device" && this.type !== "label"
+        : nextType === "device"
          ? entries?.referenced_devices
-          : this.type !== "label"
-            ? entries?.referenced_entities
-            : []) || [];
+          : entries?.referenced_entities) || [];

    const devicesInAreas = [] as string[];

@@ -301,13 +284,9 @@ export class HaTargetPickerItemRow extends LitElement {

    const entityRows =
      this.type === "label" && entries
-        ? entries.referenced_entities.filter((entity_id) => {
-            const entity = this.hass.entities[entity_id];
-            return (
-              entity.labels.includes(this.itemId) &&
-              !entries.referenced_devices.includes(entity.device_id || "")
-            );
-          })
+        ? entries.referenced_entities.filter((entity_id) =>
+            this.hass.entities[entity_id].labels.includes(this.itemId)
+          )
        : nextType === "device" && entries
          ? entries.referenced_entities.filter(
              (entity_id) =>
@@ -433,6 +412,7 @@ export class HaTargetPickerItemRow extends LitElement {
            const device = this.hass.devices[device_id];
            if (
              !hiddenAreaIds.includes(device.area_id || "") &&
+              (this.type !== "label" || device.labels.includes(this.itemId)) &&
              deviceMeetsFilter(
                device,
                this.hass.entities,
@@ -488,28 +468,26 @@ export class HaTargetPickerItemRow extends LitElement {

  private _itemData = memoizeOne((type: TargetType, item: string) => {
    if (type === "floor") {
-      const floor: FloorRegistryEntry | undefined = this.hass.floors?.[item];
+      const floor = this.hass.floors?.[item];
      return {
        name: floor?.name || item,
        iconPath: floor?.icon,
        fallbackIconPath: floor ? floorDefaultIconPath(floor) : mdiHome,
-        notFound: !floor,
      };
    }
    if (type === "area") {
-      const area: AreaRegistryEntry | undefined = this.hass.areas?.[item];
+      const area = this.hass.areas?.[item];
      return {
        name: area?.name || item,
-        context: area?.floor_id && this.hass.floors?.[area.floor_id]?.name,
+        context: area.floor_id && this.hass.floors?.[area.floor_id]?.name,
        iconPath: area?.icon,
        fallbackIconPath: mdiTextureBox,
-        notFound: !area,
      };
    }
    if (type === "device") {
-      const device: DeviceRegistryEntry | undefined = this.hass.devices?.[item];
+      const device = this.hass.devices?.[item];

-      if (device?.primary_config_entry) {
+      if (device.primary_config_entry) {
        this._getDeviceDomain(device.primary_config_entry);
      }

@@ -517,25 +495,24 @@ export class HaTargetPickerItemRow extends LitElement {
        name: device ? computeDeviceNameDisplay(device, this.hass) : item,
        context: device?.area_id && this.hass.areas?.[device.area_id]?.name,
        fallbackIconPath: mdiDevices,
-        notFound: !device,
      };
    }
    if (type === "entity") {
      this._setDomainName(computeDomain(item));

-      const stateObject: HassEntity | undefined = this.hass.states[item];
-      const entityName = stateObject
-        ? computeEntityName(stateObject, this.hass.entities, this.hass.devices)
-        : item;
-      const { area, device } = stateObject
-        ? getEntityContext(
-            stateObject,
-            this.hass.entities,
-            this.hass.devices,
-            this.hass.areas,
-            this.hass.floors
-          )
-        : { area: undefined, device: undefined };
+      const stateObject = this.hass.states[item];
+      const entityName = computeEntityName(
+        stateObject,
+        this.hass.entities,
+        this.hass.devices
+      );
+      const { area, device } = getEntityContext(
+        stateObject,
+        this.hass.entities,
+        this.hass.devices,
+        this.hass.areas,
+        this.hass.floors
+      );
      const deviceName = device ? computeDeviceName(device) : undefined;
      const areaName = area ? computeAreaName(area) : undefined;
      const context = [areaName, entityName ? deviceName : undefined]
@@ -545,19 +522,15 @@ export class HaTargetPickerItemRow extends LitElement {
        name: entityName || deviceName || item,
        context,
        stateObject,
-        notFound: !stateObject && item !== "all",
      };
    }

    // type label
-    const label: LabelRegistryEntry | undefined = this._labelRegistry.find(
-      (lab) => lab.label_id === item
-    );
+    const label = this._labelRegistry.find((lab) => lab.label_id === item);
    return {
      name: label?.name || item,
      iconPath: label?.icon,
      fallbackIconPath: mdiLabel,
-      notFound: !label,
    };
  });

@@ -618,27 +591,17 @@ export class HaTargetPickerItemRow extends LitElement {
        border-radius: var(--ha-card-border-radius, var(--ha-border-radius-lg));
      }

-      .error {
-        background: var(--ha-color-fill-warning-quiet-resting);
-      }
-
-      .error [slot="supporting-text"] {
-        color: var(--ha-color-on-warning-normal);
-      }
-
      state-badge {
        color: var(--ha-color-on-neutral-quiet);
      }

      .icon {
-        width: 24px;
        display: flex;
      }

      img {
        width: 24px;
        height: 24px;
-        z-index: 1;
      }
      ha-icon-button {
        --mdc-icon-button-size: 32px;
@@ -706,14 +669,6 @@ export class HaTargetPickerItemRow extends LitElement {
      button.link:focus {
        text-decoration: underline;
      }
-
-      .domain {
-        width: fit-content;
-        border-radius: var(--ha-border-radius-md);
-        background-color: var(--ha-color-fill-neutral-quiet-resting);
-        padding: var(--ha-space-1);
-        font-family: var(--ha-font-family-code);
-      }
    `,
  ];
 }
@@ -705,7 +705,7 @@ export class HaTargetPickerSelector extends LitElement {
          ) as EntityComboBoxItem[];
        }

-        if (!filterType && entities.length) {
+        if (!filterType) {
          // show group title
          items.push(
            this.hass.localize("ui.components.target-picker.type.entities")
@@ -733,7 +733,7 @@ export class HaTargetPickerSelector extends LitElement {
          devices = this._filterGroup("device", devices);
        }

-        if (!filterType && devices.length) {
+        if (!filterType) {
          // show group title
          items.push(
            this.hass.localize("ui.components.target-picker.type.devices")
@@ -769,7 +769,7 @@ export class HaTargetPickerSelector extends LitElement {
          ) as FloorComboBoxItem[];
        }

-        if (!filterType && areasAndFloors.length) {
+        if (!filterType) {
          // show group title
          items.push(
            this.hass.localize("ui.components.target-picker.type.areas")
@@ -811,7 +811,7 @@ export class HaTargetPickerSelector extends LitElement {
          labels = this._filterGroup("label", labels);
        }

-        if (!filterType && labels.length) {
+        if (!filterType) {
          // show group title
          items.push(
            this.hass.localize("ui.components.target-picker.type.labels")
@@ -16,10 +16,13 @@ import memoizeOne from "memoize-one";
 import { computeCssColor } from "../../common/color/compute-color";
 import { hex2rgb } from "../../common/color/convert-color";
 import { fireEvent } from "../../common/dom/fire_event";
-import { computeDeviceNameDisplay } from "../../common/entity/compute_device_name";
+import {
+  computeDeviceName,
+  computeDeviceNameDisplay,
+} from "../../common/entity/compute_device_name";
 import { computeDomain } from "../../common/entity/compute_domain";
-import { computeStateName } from "../../common/entity/compute_state_name";
-import { slugify } from "../../common/string/slugify";
+import { computeEntityName } from "../../common/entity/compute_entity_name";
+import { getEntityContext } from "../../common/entity/context/get_entity_context";
 import { getConfigEntry } from "../../data/config_entries";
 import { labelsContext } from "../../data/context";
 import { domainToName } from "../../data/integration";
@@ -99,7 +102,7 @@ export class HaTargetPickerValueChip extends LitElement {
        ${this.type === "entity"
          ? nothing
          : html`<span role="gridcell">
-              <ha-tooltip .for="expand-${slugify(this.itemId)}"
+              <ha-tooltip .for="expand-${this.itemId}"
                >${this.hass.localize(
                  `ui.components.target-picker.expand_${this.type}_id`
                )}
@@ -111,13 +114,13 @@ export class HaTargetPickerValueChip extends LitElement {
                )}
                .path=${mdiUnfoldMoreVertical}
                hide-title
-                .id="expand-${slugify(this.itemId)}"
+                .id="expand-${this.itemId}"
                .type=${this.type}
                @click=${this._handleExpand}
              ></ha-icon-button>
            </span>`}
        <span role="gridcell">
-          <ha-tooltip .for="remove-${slugify(this.itemId)}">
+          <ha-tooltip .for="remove-${this.itemId}">
            ${this.hass.localize(
              `ui.components.target-picker.remove_${this.type}_id`
            )}
@@ -127,7 +130,7 @@ export class HaTargetPickerValueChip extends LitElement {
            .label=${this.hass.localize("ui.components.target-picker.remove")}
            .path=${mdiClose}
            hide-title
-            .id="remove-${slugify(this.itemId)}"
+            .id="remove-${this.itemId}"
            .type=${this.type}
            @click=${this._removeItem}
          ></ha-icon-button>
@@ -168,10 +171,23 @@ export class HaTargetPickerValueChip extends LitElement {
    if (type === "entity") {
      this._setDomainName(computeDomain(itemId));

-      const stateObj = this.hass.states[itemId];
+      const stateObject = this.hass.states[itemId];
+      const entityName = computeEntityName(
+        stateObject,
+        this.hass.entities,
+        this.hass.devices
+      );
+      const { device } = getEntityContext(
+        stateObject,
+        this.hass.entities,
+        this.hass.devices,
+        this.hass.areas,
+        this.hass.floors
+      );
+      const deviceName = device ? computeDeviceName(device) : undefined;
      return {
-        name: computeStateName(stateObj) || itemId,
-        stateObject: stateObj,
+        name: entityName || deviceName || itemId,
+        stateObject,
      };
    }

@@ -6,6 +6,8 @@ import {
  mdiCallSplit,
  mdiCodeBraces,
  mdiDevices,
+  mdiDotsHorizontal,
+  mdiExcavator,
  mdiFormatListNumbered,
  mdiGestureDoubleTap,
  mdiHandBackRight,
@@ -14,10 +16,10 @@ import {
  mdiRoomService,
  mdiShuffleDisabled,
  mdiTimerOutline,
+  mdiTools,
  mdiTrafficLight,
 } from "@mdi/js";
-import type { AutomationElementGroupCollection } from "./automation";
-import type { Action } from "./script";
+import type { AutomationElementGroup } from "./automation";

 export const ACTION_ICONS = {
  condition: mdiAbTesting,
@@ -46,73 +48,37 @@ export const YAML_ONLY_ACTION_TYPES = new Set<keyof typeof ACTION_ICONS>([
  "variables",
 ]);

-export const ACTION_COLLECTIONS: AutomationElementGroupCollection[] = [
-  {
-    groups: {
-      device_id: {},
-      serviceGroups: {},
+export const ACTION_GROUPS: AutomationElementGroup = {
+  device_id: {},
+  helpers: {
+    icon: mdiTools,
+    members: {},
+  },
+  building_blocks: {
+    icon: mdiExcavator,
+    members: {
+      condition: {},
+      delay: {},
+      wait_template: {},
+      wait_for_trigger: {},
+      repeat_count: {},
+      repeat_while: {},
+      repeat_until: {},
+      repeat_for_each: {},
+      choose: {},
+      if: {},
+      stop: {},
+      sequence: {},
+      parallel: {},
+      variables: {},
    },
  },
-  {
-    titleKey: "ui.panel.config.automation.editor.actions.groups.helpers.label",
-    groups: {
-      helpers: {},
-    },
-  },
-  {
-    titleKey: "ui.panel.config.automation.editor.actions.groups.other.label",
-    groups: {
+  other: {
+    icon: mdiDotsHorizontal,
+    members: {
      event: {},
      service: {},
      set_conversation_response: {},
-      other: {},
-    },
-  },
-] as const;
-
-export const ACTION_BUILDING_BLOCKS_GROUP = {
-  condition: {},
-  delay: {},
-  wait_template: {},
-  wait_for_trigger: {},
-  repeat_count: {},
-  repeat_while: {},
-  repeat_until: {},
-  repeat_for_each: {},
-  choose: {},
-  if: {},
-  stop: {},
-  sequence: {},
-  parallel: {},
-  variables: {},
-};
-
-// These will be replaced with the correct action
-export const VIRTUAL_ACTIONS: Partial<
-  Record<keyof typeof ACTION_BUILDING_BLOCKS_GROUP, Action>
-> = {
-  repeat_count: {
-    repeat: {
-      count: 2,
-      sequence: [],
-    },
-  },
-  repeat_while: {
-    repeat: {
-      while: [],
-      sequence: [],
-    },
-  },
-  repeat_until: {
-    repeat: {
-      until: [],
-      sequence: [],
-    },
-  },
-  repeat_for_each: {
-    repeat: {
-      for_each: {},
-      sequence: [],
    },
  },
 } as const;
@@ -4,7 +4,6 @@ import type {
 } from "home-assistant-js-websocket";
 import { ensureArray } from "../common/array/ensure-array";
 import { navigate } from "../common/navigate";
-import type { LocalizeKeys } from "../common/translations/localize";
 import { createSearchParam } from "../common/url/search-params";
 import type { Context, HomeAssistant } from "../types";
 import type { BlueprintInput } from "./blueprint";
@@ -294,11 +293,6 @@ export interface ShorthandNotCondition extends ShorthandBaseCondition {
  not: Condition[];
 }

-export interface AutomationElementGroupCollection {
-  titleKey?: LocalizeKeys;
-  groups: AutomationElementGroup;
-}
-
 export type AutomationElementGroup = Record<
  string,
  { icon?: string; members?: AutomationElementGroup }
@@ -3,6 +3,8 @@ import {
  mdiClockOutline,
  mdiCodeBraces,
  mdiDevices,
+  mdiDotsHorizontal,
+  mdiExcavator,
  mdiGateOr,
  mdiIdentifier,
  mdiMapClock,
@@ -13,7 +15,7 @@ import {
  mdiStateMachine,
  mdiWeatherSunny,
 } from "@mdi/js";
-import type { AutomationElementGroupCollection } from "./automation";
+import type { AutomationElementGroup } from "./automation";

 export const CONDITION_ICONS = {
  device: mdiDevices,
@@ -29,31 +31,25 @@ export const CONDITION_ICONS = {
  zone: mdiMapMarkerRadius,
 };

-export const CONDITION_COLLECTIONS: AutomationElementGroupCollection[] = [
-  {
-    groups: {
-      device: {},
-      entity: { icon: mdiShape, members: { state: {}, numeric_state: {} } },
-      time_location: {
-        icon: mdiMapClock,
-        members: { sun: {}, time: {}, zone: {} },
-      },
-    },
+export const CONDITION_GROUPS: AutomationElementGroup = {
+  device: {},
+  entity: { icon: mdiShape, members: { state: {}, numeric_state: {} } },
+  time_location: {
+    icon: mdiMapClock,
+    members: { sun: {}, time: {}, zone: {} },
  },
-  {
-    titleKey: "ui.panel.config.automation.editor.conditions.groups.other.label",
-    groups: {
+  building_blocks: {
+    icon: mdiExcavator,
+    members: { and: {}, or: {}, not: {} },
+  },
+  other: {
+    icon: mdiDotsHorizontal,
+    members: {
      template: {},
      trigger: {},
    },
  },
-] as const;
-
-export const CONDITION_BUILDING_BLOCKS_GROUP = {
-  and: {},
-  or: {},
-  not: {},
-};
+} as const;

 export const CONDITION_BUILDING_BLOCKS = ["and", "or", "not"];

@@ -1,5 +1,3 @@
-import { isComponentLoaded } from "../common/config/is_component_loaded";
-import { atLeastVersion } from "../common/config/version";
 import type { HomeAssistant } from "../types";

 export interface LogProvider {
@@ -10,8 +8,4 @@ export interface LogProvider {
 export const fetchErrorLog = (hass: HomeAssistant) =>
  hass.callApi<string>("GET", "error_log");

-export const getErrorLogDownloadUrl = (hass: HomeAssistant) =>
-  isComponentLoaded(hass, "hassio") &&
-  atLeastVersion(hass.config.version, 2025, 10)
-    ? "/api/hassio/core/logs/latest"
-    : "/api/error_log";
+export const getErrorLogDownloadUrl = "/api/error_log";
@@ -76,7 +76,7 @@ export const floorCompare =
      const floorA = entries?.[a];
      const floorB = entries?.[b];
      if (floorA && floorB && floorA.level !== floorB.level) {
-        return (floorB.level ?? -9999) - (floorA.level ?? -9999);
+        return (floorA.level ?? 9999) - (floorB.level ?? 9999);
      }
      const nameA = floorA?.name ?? a;
      const nameB = floorB?.name ?? b;
@@ -435,9 +435,9 @@ export const convertStatisticsToHistory = (
  Object.entries(orderedStatistics).forEach(([key, value]) => {
    const entityHistoryStates: EntityHistoryState[] = value.map((e) => ({
      s: e.mean != null ? e.mean.toString() : e.state!.toString(),
-      lc: e.end / 1000,
+      lc: e.start / 1000,
      a: {},
-      lu: e.end / 1000,
+      lu: e.start / 1000,
    }));
    statsHistoryStates[key] = entityHistoryStates;
  });
@@ -12,7 +12,6 @@ import {
  mdiChatSleep,
  mdiClipboardList,
  mdiClock,
-  mdiCodeBraces,
  mdiCog,
  mdiCommentAlert,
  mdiCounter,
@@ -114,7 +113,6 @@ export const FALLBACK_DOMAIN_ICONS = {
  text: mdiFormTextbox,
  time: mdiClock,
  timer: mdiTimerOutline,
-  template: mdiCodeBraces,
  todo: mdiClipboardList,
  tts: mdiSpeakerMessage,
  vacuum: mdiRobotVacuum,
@@ -264,7 +264,6 @@ export const getLabels = (
  const items = outputLabels.map<PickerComboBoxItem>((label) => ({
    id: label.label_id,
    primary: label.name,
-    secondary: label.description ?? "",
    icon: label.icon || undefined,
    icon_path: label.icon ? undefined : mdiLabel,
    sorting_label: label.name,
@@ -1,4 +1,3 @@
-import type { MediaSelectorValue } from "../../selector";
 import type { LovelaceBadgeConfig } from "./badge";
 import type { LovelaceCardConfig } from "./card";
 import type { LovelaceSectionRawConfig } from "./section";
@@ -9,7 +8,7 @@ export interface ShowViewConfig {
 }

 export interface LovelaceViewBackgroundConfig {
-  image?: string | MediaSelectorValue;
+  image?: string;
  opacity?: number;
  size?: "auto" | "cover" | "contain";
  alignment?:
@@ -5,6 +5,7 @@ import type {
 import { ensureArray } from "../common/array/ensure-array";
 import { computeStateDomain } from "../common/entity/compute_state_domain";
 import { supportsFeature } from "../common/entity/supports-feature";
+import type { CropOptions } from "../dialogs/image-cropper-dialog/show-image-cropper-dialog";
 import { isHelperDomain } from "../panels/config/helpers/const";
 import type { UiAction } from "../panels/lovelace/components/hui-action-editor";
 import type { HomeAssistant } from "../types";
@@ -46,6 +47,8 @@ export type Selector =
  | FileSelector
  | IconSelector
  | LabelSelector
+  | ImageSelector
+  | BackgroundSelector
  | LanguageSelector
  | LocationSelector
  | MediaSelector
@@ -270,6 +273,14 @@ export interface IconSelector {
  } | null;
 }

+export interface ImageSelector {
+  image: { original?: boolean; crop?: CropOptions } | null;
+}
+
+export interface BackgroundSelector {
+  background: { original?: boolean; crop?: CropOptions } | null;
+}
+
 export interface LabelSelector {
  label: {
    multiple?: boolean;
@@ -341,7 +352,6 @@ export interface NumberSelector {
 interface ObjectSelectorField {
  selector: Selector;
  label?: string;
-  description?: string;
  required?: boolean;
 }

@@ -4,6 +4,7 @@ import {
  mdiClockOutline,
  mdiCodeBraces,
  mdiDevices,
+  mdiDotsHorizontal,
  mdiFormatListBulleted,
  mdiGestureDoubleTap,
  mdiMapClock,
@@ -22,7 +23,7 @@ import {

 import { mdiHomeAssistant } from "../resources/home-assistant-logo-svg";
 import type {
-  AutomationElementGroupCollection,
+  AutomationElementGroup,
  Trigger,
  TriggerList,
 } from "./automation";
@@ -48,26 +49,16 @@ export const TRIGGER_ICONS = {
  list: mdiFormatListBulleted,
 };

-export const TRIGGER_COLLECTIONS: AutomationElementGroupCollection[] = [
-  {
-    groups: {
-      device: {},
-      entity: { icon: mdiShape, members: { state: {}, numeric_state: {} } },
-      time_location: {
-        icon: mdiMapClock,
-        members: {
-          calendar: {},
-          sun: {},
-          time: {},
-          time_pattern: {},
-          zone: {},
-        },
-      },
-    },
+export const TRIGGER_GROUPS: AutomationElementGroup = {
+  device: {},
+  entity: { icon: mdiShape, members: { state: {}, numeric_state: {} } },
+  time_location: {
+    icon: mdiMapClock,
+    members: { calendar: {}, sun: {}, time: {}, time_pattern: {}, zone: {} },
  },
-  {
-    titleKey: "ui.panel.config.automation.editor.triggers.groups.other.label",
-    groups: {
+  other: {
+    icon: mdiDotsHorizontal,
+    members: {
      event: {},
      geo_location: {},
      homeassistant: {},
@@ -79,7 +70,7 @@ export const TRIGGER_COLLECTIONS: AutomationElementGroupCollection[] = [
      persistent_notification: {},
    },
  },
-] as const;
+} as const;

 export const isTriggerList = (trigger: Trigger): trigger is TriggerList =>
  "triggers" in trigger;
@@ -484,7 +484,7 @@ class DataEntryFlowDialog extends LitElement {
        this._unsubDataEntryFlowProgress = undefined;
      }
      if (_step.next_flow[0] === "config_flow") {
-        showConfigFlowDialog(this, {
+        showConfigFlowDialog(this._params!.dialogParentElement!, {
          continueFlowId: _step.next_flow[1],
          carryOverDevices: this._devices(
            this._params!.flowConfig.showDevices,
@@ -496,23 +496,32 @@ class DataEntryFlowDialog extends LitElement {
        });
      } else if (_step.next_flow[0] === "options_flow") {
        if (_step.type === "create_entry") {
-          showOptionsFlowDialog(this, _step.result!, {
-            continueFlowId: _step.next_flow[1],
-            navigateToResult: this._params!.navigateToResult,
-            dialogClosedCallback: this._params!.dialogClosedCallback,
-          });
+          showOptionsFlowDialog(
+            this._params!.dialogParentElement!,
+            _step.result!,
+            {
+              continueFlowId: _step.next_flow[1],
+              navigateToResult: this._params!.navigateToResult,
+              dialogClosedCallback: this._params!.dialogClosedCallback,
+            }
+          );
        }
      } else if (_step.next_flow[0] === "config_subentries_flow") {
        if (_step.type === "create_entry") {
-          showSubConfigFlowDialog(this, _step.result!, _step.next_flow[0], {
-            continueFlowId: _step.next_flow[1],
-            navigateToResult: this._params!.navigateToResult,
-            dialogClosedCallback: this._params!.dialogClosedCallback,
-          });
+          showSubConfigFlowDialog(
+            this._params!.dialogParentElement!,
+            _step.result!,
+            _step.next_flow[0],
+            {
+              continueFlowId: _step.next_flow[1],
+              navigateToResult: this._params!.navigateToResult,
+              dialogClosedCallback: this._params!.dialogClosedCallback,
+            }
+          );
        }
      } else {
        this.closeDialog();
-        showAlertDialog(this, {
+        showAlertDialog(this._params!.dialogParentElement!, {
          text: this.hass.localize(
            "ui.panel.config.integrations.config_flow.error",
            { error: `Unsupported next flow type: ${_step.next_flow[0]}` }
@@ -1,152 +0,0 @@
-import { LitElement, css, html, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import "../../components/ha-alert";
-import "../../components/ha-icon";
-import "../../components/ha-list-item";
-import "../../components/ha-spinner";
-import type {
-  ExternalEntityAddToActions,
-  ExternalEntityAddToAction,
-} from "../../external_app/external_messaging";
-import { showToast } from "../../util/toast";
-
-import type { HomeAssistant } from "../../types";
-
-@customElement("ha-more-info-add-to")
-export class HaMoreInfoAddTo extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public entityId!: string;
-
-  @state() private _externalActions?: ExternalEntityAddToActions = {
-    actions: [],
-  };
-
-  @state() private _loading = true;
-
-  private async _loadExternalActions() {
-    if (this.hass.auth.external?.config.hasEntityAddTo) {
-      this._externalActions =
-        await this.hass.auth.external?.sendMessage<"entity/add_to/get_actions">(
-          {
-            type: "entity/add_to/get_actions",
-            payload: { entity_id: this.entityId },
-          }
-        );
-    }
-  }
-
-  private async _actionSelected(ev: CustomEvent) {
-    const action = (ev.currentTarget as any)
-      .action as ExternalEntityAddToAction;
-    if (!action.enabled) {
-      return;
-    }
-
-    try {
-      await this.hass.auth.external!.fireMessage({
-        type: "entity/add_to",
-        payload: {
-          entity_id: this.entityId,
-          app_payload: action.app_payload,
-        },
-      });
-    } catch (err: any) {
-      showToast(this, {
-        message: this.hass.localize(
-          "ui.dialogs.more_info_control.add_to.action_failed",
-          {
-            error: err.message || err,
-          }
-        ),
-      });
-    }
-  }
-
-  protected async firstUpdated() {
-    await this._loadExternalActions();
-    this._loading = false;
-  }
-
-  protected render() {
-    if (this._loading) {
-      return html`
-        <div class="loading">
-          <ha-spinner></ha-spinner>
-        </div>
-      `;
-    }
-
-    if (!this._externalActions?.actions.length) {
-      return html`
-        <ha-alert alert-type="info">
-          ${this.hass.localize(
-            "ui.dialogs.more_info_control.add_to.no_actions"
-          )}
-        </ha-alert>
-      `;
-    }
-
-    return html`
-      <div class="actions-list">
-        ${this._externalActions.actions.map(
-          (action) => html`
-            <ha-list-item
-              graphic="icon"
-              .disabled=${!action.enabled}
-              .action=${action}
-              .twoline=${!!action.details}
-              @click=${this._actionSelected}
-            >
-              <span>${action.name}</span>
-              ${action.details
-                ? html`<span slot="secondary">${action.details}</span>`
-                : nothing}
-              <ha-icon slot="graphic" .icon=${action.mdi_icon}></ha-icon>
-            </ha-list-item>
-          `
-        )}
-      </div>
-    `;
-  }
-
-  static styles = css`
-    :host {
-      display: block;
-      padding: var(--ha-space-2) var(--ha-space-6) var(--ha-space-6)
-        var(--ha-space-6);
-    }
-
-    .loading {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      padding: var(--ha-space-8);
-    }
-
-    .actions-list {
-      display: flex;
-      flex-direction: column;
-    }
-
-    ha-list-item {
-      cursor: pointer;
-    }
-
-    ha-list-item[disabled] {
-      cursor: not-allowed;
-      opacity: 0.5;
-    }
-
-    ha-icon {
-      display: flex;
-      align-items: center;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-more-info-add-to": HaMoreInfoAddTo;
-  }
-}
@@ -8,7 +8,6 @@ import {
  mdiPencil,
  mdiPencilOff,
  mdiPencilOutline,
-  mdiPlusBoxMultipleOutline,
  mdiTransitConnectionVariant,
 } from "@mdi/js";
 import type { HassEntity } from "home-assistant-js-websocket";
@@ -61,7 +60,6 @@ import {
  computeShowLogBookComponent,
 } from "./const";
 import "./controls/more-info-default";
-import "./ha-more-info-add-to";
 import "./ha-more-info-history-and-logbook";
 import "./ha-more-info-info";
 import "./ha-more-info-settings";
@@ -75,7 +73,7 @@ export interface MoreInfoDialogParams {
  data?: Record<string, any>;
 }

-type View = "info" | "history" | "settings" | "related" | "add_to";
+type View = "info" | "history" | "settings" | "related";

 interface ChildView {
  viewTag: string;
@@ -196,10 +194,6 @@ export class MoreInfoDialog extends LitElement {
    );
  }

-  private _shouldShowAddEntityTo(): boolean {
-    return !!this.hass.auth.external?.config.hasEntityAddTo;
-  }
-
  private _getDeviceId(): string | null {
    const entity = this.hass.entities[this._entityId!] as
      | EntityRegistryEntry
@@ -301,11 +295,6 @@ export class MoreInfoDialog extends LitElement {
    this._setView("related");
  }

-  private _goToAddEntityTo(ev) {
-    if (!shouldHandleRequestSelectedEvent(ev)) return;
-    this._setView("add_to");
-  }
-
  private _breadcrumbClick(ev: Event) {
    ev.stopPropagation();
    this._setView("related");
@@ -532,22 +521,6 @@ export class MoreInfoDialog extends LitElement {
                            .path=${mdiInformationOutline}
                          ></ha-svg-icon>
                        </ha-list-item>
-                        ${this._shouldShowAddEntityTo()
-                          ? html`
-                              <ha-list-item
-                                graphic="icon"
-                                @request-selected=${this._goToAddEntityTo}
-                              >
-                                ${this.hass.localize(
-                                  "ui.dialogs.more_info_control.add_entity_to"
-                                )}
-                                <ha-svg-icon
-                                  slot="graphic"
-                                  .path=${mdiPlusBoxMultipleOutline}
-                                ></ha-svg-icon>
-                              </ha-list-item>
-                            `
-                          : nothing}
                      </ha-button-menu>
                    `
                  : nothing}
@@ -640,14 +613,7 @@ export class MoreInfoDialog extends LitElement {
                                  : "entity"}
                              ></ha-related-items>
                            `
-                          : this._currView === "add_to"
-                            ? html`
-                                <ha-more-info-add-to
-                                  .hass=${this.hass}
-                                  .entityId=${entityId}
-                                ></ha-more-info-add-to>
-                              `
-                            : nothing
+                          : nothing
              )}
            </div>
          `
@@ -712,8 +678,8 @@ export class MoreInfoDialog extends LitElement {
          /* Set the top top of the dialog to a fixed position, so it doesnt jump when the content changes size */
          --vertical-align-dialog: flex-start;
          --dialog-surface-margin-top: max(
-            var(--ha-space-10),
-            var(--safe-area-inset-top, var(--ha-space-0))
+            40px,
+            var(--safe-area-inset-top, 0px)
          );
          --dialog-content-padding: 0;
        }
@@ -732,15 +698,14 @@ export class MoreInfoDialog extends LitElement {
        }

        ha-more-info-history-and-logbook {
-          padding: var(--ha-space-2) var(--ha-space-6) var(--ha-space-6)
-            var(--ha-space-6);
+          padding: 8px 24px 24px 24px;
          display: block;
        }

        @media all and (max-width: 450px), all and (max-height: 500px) {
          /* When in fullscreen dialog should be attached to top */
          ha-dialog {
-            --dialog-surface-margin-top: var(--ha-space-0);
+            --dialog-surface-margin-top: 0px;
          }
        }

@@ -765,8 +730,7 @@ export class MoreInfoDialog extends LitElement {
          display: flex;
          flex-direction: column;
          align-items: flex-start;
-          margin: var(--ha-space-0) var(--ha-space-0)
-            calc(var(--ha-space-2) * -1) var(--ha-space-0);
+          margin: 0 0 -10px 0;
        }

        .title p {
@@ -788,9 +752,9 @@ export class MoreInfoDialog extends LitElement {
          font-size: var(--ha-font-size-m);
          line-height: 16px;
          --mdc-icon-size: 16px;
-          padding: var(--ha-space-1);
-          margin: calc(var(--ha-space-1) * -1);
-          margin-top: calc(var(--ha-space-2) * -1);
+          padding: 4px;
+          margin: -4px;
+          margin-top: -10px;
          background: none;
          border: none;
          outline: none;
@@ -152,18 +152,10 @@ export class MoreInfoHistory extends LitElement {
    }
  }

-  private _setUpdateTimer() {
+  private _setRedrawTimer() {
+    // redraw the graph every minute to update the time axis
    clearInterval(this._interval);
-    this._interval = window.setInterval(() => {
-      // If using statistics, refresh the data
-      if (this._statistics) {
-        this._fetchStatistics();
-      }
-      // If using history, redraw the graph to update the time axis
-      if (this._stateHistory) {
-        this._redrawGraph();
-      }
-    }, 1000 * 60);
+    this._interval = window.setInterval(() => this._redrawGraph(), 1000 * 60);
  }

  private async _getStatisticsMetaData(statisticIds: string[] | undefined) {
@@ -178,30 +170,6 @@ export class MoreInfoHistory extends LitElement {
    return statisticsMetaData;
  }

-  private async _fetchStatistics(): Promise<boolean> {
-    // Fire off the metadata and fetch at the same time
-    // to avoid waiting in sequence so the UI responds
-    // faster.
-    const _metadata = this._getStatisticsMetaData([this.entityId]);
-    const _statistics = fetchStatistics(
-      this.hass!,
-      subHours(new Date(), 24),
-      undefined,
-      [this.entityId],
-      "5minute",
-      undefined,
-      statTypes
-    );
-    const [metadata, statistics] = await Promise.all([_metadata, _statistics]);
-    if (metadata && Object.keys(metadata).length) {
-      this._metadata = metadata;
-      this._statistics = statistics;
-      this._statNames = { [this.entityId]: "" };
-      return true;
-    }
-    return false;
-  }
-
  private async _getStateHistory(): Promise<void> {
    if (
      isComponentLoaded(this.hass, "recorder") &&
@@ -212,10 +180,27 @@ export class MoreInfoHistory extends LitElement {
      // has not opted into statistics so there is no need to check as it
      // requires another round-trip to the server.
      if (stateObj && stateObj.attributes.state_class) {
-        const hasStatistics = await this._fetchStatistics();
-        if (hasStatistics) {
-          // Using statistics, set up refresh timer
-          this._setUpdateTimer();
+        // Fire off the metadata and fetch at the same time
+        // to avoid waiting in sequence so the UI responds
+        // faster.
+        const _metadata = this._getStatisticsMetaData([this.entityId]);
+        const _statistics = fetchStatistics(
+          this.hass!,
+          subHours(new Date(), 24),
+          undefined,
+          [this.entityId],
+          "5minute",
+          undefined,
+          statTypes
+        );
+        const [metadata, statistics] = await Promise.all([
+          _metadata,
+          _statistics,
+        ]);
+        if (metadata && Object.keys(metadata).length) {
+          this._metadata = metadata;
+          this._statistics = statistics;
+          this._statNames = { [this.entityId]: "" };
          return;
        }
      }
@@ -253,7 +238,7 @@ export class MoreInfoHistory extends LitElement {
      this._error = err;
      return undefined;
    });
-    this._setUpdateTimer();
+    this._setRedrawTimer();
  }

  static styles = [
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aidan Timson	83512e62f5	Remove	2025-10-23 11:16:09 +01:00
Aidan Timson	aa010bc6f0	Use unknown	2025-10-23 11:11:32 +01:00
Aidan Timson	19d6743f8c	Show warning	2025-10-23 11:11:32 +01:00
Aidan Timson	e7f816b982	Cleanup	2025-10-23 11:11:32 +01:00
Aidan Timson	944ab1b3ce	Less any	2025-10-23 11:11:31 +01:00
Aidan Timson	918e0f8383	Docs	2025-10-23 11:11:31 +01:00
Aidan Timson	146c2654b3	Docs	2025-10-23 11:11:31 +01:00
Aidan Timson	8af8d6cd3f	Typescript error	2025-10-23 11:11:31 +01:00
Aidan Timson	cf93fb7091	Remove	2025-10-23 11:11:31 +01:00
Aidan Timson	3ce7b42dc3	Check for parent	2025-10-23 11:11:31 +01:00
Aidan Timson	91f5a8beca	Remove duplicate implementation	2025-10-23 11:11:31 +01:00
Aidan Timson	50fc5645ae	Cleanup	2025-10-23 11:11:31 +01:00
Aidan Timson	bacc478e4a	Override method	2025-10-23 11:11:31 +01:00
Aidan Timson	e7bb2cc10c	Remove duplicate implementations	2025-10-23 11:11:31 +01:00
Aidan Timson	7b37e9e030	Format	2025-10-23 11:11:31 +01:00
Aidan Timson	5da2abd720	Comments	2025-10-23 11:11:31 +01:00
Aidan Timson	61b34507ed	Add guard	2025-10-23 11:11:31 +01:00
Aidan Timson	49f916428d	Fix leak	2025-10-23 11:11:31 +01:00
Aidan Timson	71b568076c	Simplify	2025-10-23 11:11:31 +01:00
Aidan Timson	4af4d86c53	Remove duplicate transitions (non view transitions)	2025-10-23 11:11:31 +01:00
Aidan Timson	13f6d2af1f	Remove unused code	2025-10-23 11:11:31 +01:00
Aidan Timson	9f1fd06def	Cleanup	2025-10-23 11:11:31 +01:00
Aidan Timson	d2f354ed71	Move duplicated logic into mixin	2025-10-23 11:11:31 +01:00
Aidan Timson	d612e29b31	Flip logic	2025-10-23 11:11:31 +01:00
Aidan Timson	6656fe7122	Setup other layouts	2025-10-23 11:11:31 +01:00
Aidan Timson	ab4f7cef2b	Fix	2025-10-23 11:11:31 +01:00
Aidan Timson	ae929d57b6	Fix	2025-10-23 11:11:31 +01:00
Aidan Timson	6f8516aa4a	Cleanup	2025-10-23 11:11:31 +01:00
Aidan Timson	74aa390229	Fix	2025-10-23 11:11:31 +01:00
Aidan Timson	944ed9f000	Rename	2025-10-23 11:11:31 +01:00
Aidan Timson	d4a02dddf0	Cleanup	2025-10-23 11:11:31 +01:00
Aidan Timson	59b56822b8	Cleanup	2025-10-23 11:11:31 +01:00
Aidan Timson	0d0eb737c6	Rename, zero for reduced motion	2025-10-23 11:11:31 +01:00
Aidan Timson	5338192c97	Show on loaded	2025-10-23 11:11:31 +01:00
Aidan Timson	04e9d1bec3	Rename	2025-10-23 11:11:31 +01:00
Aidan Timson	1bfbd1ec09	Fade out launch screen	2025-10-23 11:11:31 +01:00
Aidan Timson	afebe1d588	Allow transition name to be provided by caller	2025-10-23 11:11:31 +01:00
Aidan Timson	d0c527943d	Use generic transition names	2025-10-23 11:11:31 +01:00
Aidan Timson	8f50e2c025	Switch to mixin	2025-10-23 11:11:31 +01:00
Aidan Timson	a9219a8779	Cleanup	2025-10-23 11:11:31 +01:00
Aidan Timson	2a135c50ce	Order	2025-10-23 11:11:30 +01:00
Aidan Timson	36b11dbbcd	Revert	2025-10-23 11:11:30 +01:00
Aidan Timson	37ea0a11fa	Remove sidebar code	2025-10-23 11:11:30 +01:00
Aidan Timson	e9ab1c27d2	POC: view transitions	2025-10-23 11:11:30 +01:00
Aidan Timson	1ec0ff46c9	Respect reduced motion	2025-10-23 11:11:30 +01:00
Aidan Timson	2b0fd53349	Add to hui views	2025-10-23 11:11:30 +01:00
Aidan Timson	8c7643c524	Add animations	2025-10-23 11:11:30 +01:00
Aidan Timson	ff32bae8ea	Cleanup	2025-10-23 11:11:30 +01:00
Aidan Timson	72cc53d960	Use index based delay	2025-10-23 11:11:30 +01:00
Aidan Timson	2b6ce8c34e	Faster	2025-10-23 11:11:30 +01:00
Aidan Timson	f61ebe36b9	Fade in menu button	2025-10-23 11:11:30 +01:00
Aidan Timson	2c8e3762c6	Move	2025-10-23 11:11:30 +01:00
Aidan Timson	89b86d0d69	Cap stagger at 8 items	2025-10-23 11:11:30 +01:00
Aidan Timson	c60d038828	Animate sidebar	2025-10-23 11:11:30 +01:00
Aidan Timson	f9e2d4ef95	Set base themable animation durations	2025-10-23 11:11:30 +01:00
Aidan Timson	2609133f54	Create fade in slide down shared animation	2025-10-23 11:11:30 +01:00
@@ -1 +1 @@
 .21.1
 .21.0
				`@@ -1 +0,0 @@`
				`export const ANY_STATE_VALUE = "__ANY_STATE_IGNORE_ATTRIBUTES__";`