Merge branch 'rc'

* Update disabled state logic in action and condition editors to account for indent property

* Remove opacity

.yarnrc.yml

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

cast/src/media/entrypoint.ts

@@ -5,17 +5,17 @@ const castContext = framework.CastReceiverContext.getInstance();
 const playerManager = castContext.getPlayerManager();
 
 playerManager.setMessageInterceptor(
-  "LOAD" as framework.messages.MessageType.LOAD,
+  framework.messages.MessageType.LOAD,
   (loadRequestData) => {
     const media = loadRequestData.media;
     // Special handling if it came from Google Assistant
     if (media.entity) {
       media.contentId = media.entity;
-      media.streamType = "LIVE" as framework.messages.StreamType.LIVE;
+      media.streamType = framework.messages.StreamType.LIVE;
       media.contentType = "application/vnd.apple.mpegurl";
       // @ts-ignore
       media.hlsVideoSegmentFormat =
-        "fmp4" as framework.messages.HlsVideoSegmentFormat.FMP4;
+        framework.messages.HlsVideoSegmentFormat.FMP4;
     }
     return loadRequestData;
   }

cast/src/receiver/entrypoint.ts

@@ -40,8 +40,7 @@ const playDummyMedia = (viewTitle?: string) => {
   loadRequestData.media.contentId =
     "https://cast.home-assistant.io/images/google-nest-hub.png";
   loadRequestData.media.contentType = "image/jpeg";
-  loadRequestData.media.streamType =
+  loadRequestData.media.streamType = framework.messages.StreamType.NONE;
-    "NONE" as framework.messages.StreamType.NONE;
   const metadata = new framework.messages.GenericMediaMetadata();
   metadata.title = viewTitle;
   loadRequestData.media.metadata = metadata;
@@ -90,7 +89,7 @@ const showMediaPlayer = () => {
 const options = new framework.CastReceiverOptions();
 options.disableIdleTimeout = true;
 options.customNamespaces = {
-  [CAST_NS]: "json" as framework.system.MessageType.JSON,
+  [CAST_NS]: framework.system.MessageType.JSON,
 };
 
 castContext.addCustomMessageListener(
@@ -98,7 +97,9 @@ castContext.addCustomMessageListener(
   // @ts-ignore
   (ev: ReceivedMessage<HassMessage>) => {
     // We received a show Lovelace command, stop media from playing, hide media player and show Lovelace controller
-    if (playerManager.getPlayerState() !== "IDLE") {
+    if (
+      playerManager.getPlayerState() !== framework.messages.PlayerState.IDLE
+    ) {
       playerManager.stop();
     } else {
       showLovelaceController();
@@ -112,7 +113,7 @@ castContext.addCustomMessageListener(
 const playerManager = castContext.getPlayerManager();
 
 playerManager.setMessageInterceptor(
-  "LOAD" as framework.messages.MessageType.LOAD,
+  framework.messages.MessageType.LOAD,
   (loadRequestData) => {
     if (
       loadRequestData.media.contentId ===
@@ -126,23 +127,24 @@ playerManager.setMessageInterceptor(
     // Special handling if it came from Google Assistant
     if (media.entity) {
       media.contentId = media.entity;
-      media.streamType = "LIVE" as framework.messages.StreamType.LIVE;
+      media.streamType = framework.messages.StreamType.LIVE;
       media.contentType = "application/vnd.apple.mpegurl";
       // @ts-ignore
       media.hlsVideoSegmentFormat =
-        "fmp4" as framework.messages.HlsVideoSegmentFormat.FMP4;
+        framework.messages.HlsVideoSegmentFormat.FMP4;
     }
     return loadRequestData;
   }
 );
 
 playerManager.addEventListener(
-  "MEDIA_STATUS" as framework.events.EventType.MEDIA_STATUS,
+  framework.events.EventType.MEDIA_STATUS,
   (event) => {
     if (
-      event.mediaStatus?.playerState === "IDLE" &&
+      event.mediaStatus?.playerState === framework.messages.PlayerState.IDLE &&
       event.mediaStatus?.idleReason &&
-      event.mediaStatus?.idleReason !== "INTERRUPTED"
+      event.mediaStatus?.idleReason !==
+        framework.messages.IdleReason.INTERRUPTED
     ) {
       // media finished or stopped, return to default Lovelace
       showLovelaceController();

demo/src/html/index.html.template

@@ -68,7 +68,7 @@
       }
       #ha-launch-screen .ha-launch-screen-spacer-top {
         flex: 1;
-        margin-top: calc( 2 * max(var(--safe-area-inset-top, 0px), 48px) + 46px );
+        margin-top: calc( 2 * max(var(--safe-area-inset-bottom, 0px), 48px) + 46px );
         padding-top: 48px;
       }
       #ha-launch-screen .ha-launch-screen-spacer-bottom {

gallery/src/components/demo-more-info.ts

@@ -1,11 +1,10 @@
-import { LitElement, css, html, nothing } from "lit";
+import { LitElement, css, html } from "lit";
 import { customElement, property } from "lit/decorators";
 import "../../../src/components/ha-card";
 import "../../../src/dialogs/more-info/more-info-content";
 import "../../../src/state-summary/state-card-content";
 import "../ha-demo-options";
 import type { HomeAssistant } from "../../../src/types";
-import { computeShowNewMoreInfo } from "../../../src/dialogs/more-info/const";
 
 @customElement("demo-more-info")
 class DemoMoreInfo extends LitElement {
@@ -22,13 +21,11 @@ class DemoMoreInfo extends LitElement {
       <div class="root">
         <div id="card">
           <ha-card>
-            ${!computeShowNewMoreInfo(state)
+            <state-card-content
-              ? html`<state-card-content
+              .stateObj=${state}
-                  .stateObj=${state}
+              .hass=${this.hass}
-                  .hass=${this.hass}
+              in-dialog
-                  in-dialog
+            ></state-card-content>
-                ></state-card-content>`
-              : nothing}
 
             <more-info-content
               .hass=${this.hass}

gallery/src/data/demo_states.js

@@ -1106,7 +1106,7 @@ export default {
       friendly_name: "Philips Hue",
       entity_picture: null,
       description:
-        "Press the button on the bridge to register Philips Hue with Home Assistant.",
+        "Press the button on the bridge to register Philips Hue with Home Assistant.\n\n![Description image](/static/images/config_philips_hue.jpg)",
       submit_caption: "I have pressed the button",
     },
     last_changed: "2018-07-19T10:44:46.515160+00:00",

landing-page/src/html/index.html.template

@@ -19,9 +19,8 @@
         height: auto;
         padding: 32px 0;
       }
-
       .content {
-        max-width: min(560px, calc(100vw - var(--safe-area-inset-right, 0px) - var(--safe-area-inset-left, 0px)));
+        max-width: 560px;
         margin: 0 auto;
         padding: 0 16px;
         box-sizing: content-box;

package.json

@@ -29,13 +29,13 @@
     "@awesome.me/webawesome": "3.0.0-beta.4",
     "@babel/runtime": "7.28.3",
     "@braintree/sanitize-url": "7.1.1",
-    "@codemirror/autocomplete": "6.18.7",
+    "@codemirror/autocomplete": "6.18.6",
     "@codemirror/commands": "6.8.1",
     "@codemirror/language": "6.11.3",
     "@codemirror/legacy-modes": "6.5.1",
     "@codemirror/search": "6.5.11",
     "@codemirror/state": "6.5.2",
-    "@codemirror/view": "6.38.2",
+    "@codemirror/view": "6.38.1",
     "@egjs/hammerjs": "2.0.17",
     "@formatjs/intl-datetimeformat": "6.18.0",
     "@formatjs/intl-displaynames": "6.8.11",
@@ -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.8.6",
+    "@vaadin/combo-box": "24.8.5",
-    "@vaadin/vaadin-themable-mixin": "24.8.6",
+    "@vaadin/vaadin-themable-mixin": "24.8.5",
     "@vibrant/color": "4.0.0",
     "@vue/web-component-wrapper": "1.3.0",
     "@webcomponents/scoped-custom-element-registry": "0.0.10",
@@ -112,7 +112,7 @@
     "fuse.js": "7.1.0",
     "google-timezones-json": "1.2.0",
     "gulp-zopfli-green": "6.0.2",
-    "hls.js": "1.6.11",
+    "hls.js": "1.6.10",
     "home-assistant-js-websocket": "9.5.0",
     "idb-keyval": "6.2.2",
     "intl-messageformat": "10.7.16",
@@ -123,7 +123,7 @@
     "lit": "3.3.1",
     "lit-html": "3.3.1",
     "luxon": "3.7.1",
-    "marked": "16.2.1",
+    "marked": "16.2.0",
     "memoize-one": "6.0.0",
     "node-vibrant": "4.0.3",
     "object-hash": "3.0.0",
@@ -159,18 +159,18 @@
     "@octokit/plugin-retry": "8.0.1",
     "@octokit/rest": "22.0.0",
     "@rsdoctor/rspack-plugin": "1.2.3",
-    "@rspack/core": "1.5.2",
+    "@rspack/core": "1.4.11",
     "@rspack/dev-server": "1.1.4",
     "@types/babel__plugin-transform-runtime": "7.9.5",
-    "@types/chromecast-caf-receiver": "6.0.24",
+    "@types/chromecast-caf-receiver": "6.0.22",
     "@types/chromecast-caf-sender": "1.0.11",
     "@types/color-name": "2.0.0",
-    "@types/culori": "4.0.1",
+    "@types/culori": "4.0.0",
     "@types/html-minifier-terser": "7.0.2",
     "@types/js-yaml": "4.0.9",
     "@types/leaflet": "1.9.20",
-    "@types/leaflet-draw": "1.0.13",
+    "@types/leaflet-draw": "1.0.12",
-    "@types/leaflet.markercluster": "1.5.6",
+    "@types/leaflet.markercluster": "1.5.5",
     "@types/lodash.merge": "4.6.9",
     "@types/luxon": "3.7.1",
     "@types/mocha": "10.0.10",
@@ -204,7 +204,7 @@
     "husky": "9.1.7",
     "jsdom": "26.1.0",
     "jszip": "3.10.1",
-    "lint-staged": "16.1.6",
+    "lint-staged": "16.1.5",
     "lit-analyzer": "2.0.3",
     "lodash.merge": "4.6.2",
     "lodash.template": "4.5.0",
@@ -218,7 +218,7 @@
     "terser-webpack-plugin": "5.3.14",
     "ts-lit-plugin": "2.0.2",
     "typescript": "5.9.2",
-    "typescript-eslint": "8.42.0",
+    "typescript-eslint": "8.40.0",
     "vite-tsconfig-paths": "5.1.4",
     "vitest": "3.2.4",
     "webpack-stats-plugin": "1.1.3",
@@ -235,7 +235,7 @@
     "globals": "16.3.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",
-    "@vaadin/vaadin-themable-mixin": "24.8.6"
+    "@vaadin/vaadin-themable-mixin": "24.8.5"
   },
-  "packageManager": "yarn@4.9.4"
+  "packageManager": "yarn@4.9.3"
 }

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name         = "home-assistant-frontend"
-version      = "20250903.0"
+version      = "20250903.5"
 license      = "Apache-2.0"
 license-files = ["LICENSE*"]
 description  = "The Home Assistant frontend"

src/common/entity/entity_filter.ts

@@ -67,7 +67,10 @@ export const generateEntityFilter = (
     }
 
     if (floors) {
-      if (!floor || !floors.has(floor.floor_id)) {
+      if (!floor) {
+        return false;
+      }
+      if (!floors) {
         return false;
       }
     }

src/components/ha-automation-row.ts

@@ -83,15 +83,6 @@ export class HaAutomationRow extends LitElement {
         !(ev.ctrlKey || ev.metaKey) &&
         !ev.shiftKey &&
         (ev.key === "ArrowUp" || ev.key === "ArrowDown")
-      ) &&
-      !(
-        (ev.ctrlKey || ev.metaKey) &&
-        !ev.shiftKey &&
-        !ev.altKey &&
-        (ev.key === "c" ||
-          ev.key === "x" ||
-          ev.key === "Delete" ||
-          ev.key === "Backspace")
       )
     ) {
       return;
@@ -112,22 +103,6 @@ export class HaAutomationRow extends LitElement {
       return;
     }
 
-    if (ev.ctrlKey || ev.metaKey) {
-      if (ev.key === "c") {
-        fireEvent(this, "copy-row");
-        return;
-      }
-      if (ev.key === "x") {
-        fireEvent(this, "cut-row");
-        return;
-      }
-
-      if (ev.key === "Delete" || ev.key === "Backspace") {
-        fireEvent(this, "delete-row");
-        return;
-      }
-    }
-
     this.click();
   }
 

src/data/bluetooth.ts

@@ -24,14 +24,11 @@ export interface BluetoothConnectionData extends DataTableRowData {
   source: string;
 }
 
-export type HaScannerType = "usb" | "uart" | "remote" | "unknown";
-
 export interface BluetoothScannerDetails {
   source: string;
   connectable: boolean;
   name: string;
   adapter: string;
-  scanner_type?: HaScannerType;
 }
 
 export type BluetoothScannersDetails = Record<string, BluetoothScannerDetails>;
@@ -58,13 +55,6 @@ export interface BluetoothAllocationsData {
   allocated: string[];
 }
 
-export interface BluetoothScannerState {
-  source: string;
-  adapter: string;
-  current_mode: "active" | "passive" | null;
-  requested_mode: "active" | "passive" | null;
-}
-
 export const subscribeBluetoothScannersDetailsUpdates = (
   conn: Connection,
   store: Store<BluetoothScannersDetails>
@@ -180,20 +170,3 @@ export const subscribeBluetoothConnectionAllocations = (
     params
   );
 };
-
-export const subscribeBluetoothScannerState = (
-  conn: Connection,
-  callbackFunction: (scannerState: BluetoothScannerState) => void,
-  configEntryId?: string
-): Promise<() => Promise<void>> => {
-  const params: { type: string; config_entry_id?: string } = {
-    type: "bluetooth/subscribe_scanner_state",
-  };
-  if (configEntryId) {
-    params.config_entry_id = configEntryId;
-  }
-  return conn.subscribeMessage<BluetoothScannerState>(
-    (scannerState) => callbackFunction(scannerState),
-    params
-  );
-};

src/data/data_entry_flow.ts

@@ -97,7 +97,6 @@ export interface DataEntryFlowStepMenu {
   step_id: string;
   /** If array, use value to lookup translations in strings.json */
   menu_options: string[] | Record<string, string>;
-  sort?: boolean;
   description_placeholders?: Record<string, string>;
   translation_domain?: string;
 }

src/data/recorder.ts

@@ -2,7 +2,6 @@ import type { Connection } from "home-assistant-js-websocket";
 import { computeStateName } from "../common/entity/compute_state_name";
 import type { HaDurationData } from "../components/ha-duration-input";
 import type { HomeAssistant } from "../types";
-import { firstWeekday } from "../common/datetime/first_weekday";
 
 export interface RecorderInfo {
   backlog: number | null;
@@ -109,7 +108,7 @@ export interface StatisticsValidationResultMeanTypeChanged {
   };
 }
 
-export const VOLUME_UNITS = ["L", "gal", "ft³", "m³", "CCF", "MCF"] as const;
+export const VOLUME_UNITS = ["L", "gal", "ft³", "m³", "CCF"] as const;
 
 export interface StatisticsUnitConfiguration {
   energy?: "Wh" | "kWh" | "MWh" | "GJ";
@@ -212,14 +211,7 @@ export const fetchStatistic = (
               : period.fixed_period.end,
         }
       : undefined,
-    calendar: period.calendar
+    calendar: period.calendar,
-      ? {
-          ...(period.calendar.period === "week"
-            ? { first_weekday: firstWeekday(hass.locale).substring(0, 3) }
-            : {}),
-          ...period.calendar,
-        }
-      : undefined,
     rolling_window: period.rolling_window,
   });
 

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

@@ -256,13 +256,6 @@ export const showConfigFlowDialog = (
       );
     },
 
-    renderMenuOptionDescription(hass, step, option) {
-      return hass.localize(
-        `component.${step.translation_domain || step.handler}.config.step.${step.step_id}.menu_option_descriptions.${option}`,
-        step.description_placeholders
-      );
-    },
-
     renderLoadingDescription(hass, reason, handler, step) {
       if (reason !== "loading_flow" && reason !== "loading_step") {
         return "";

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

@@ -137,12 +137,6 @@ export interface FlowConfig {
     option: string
   ): string;
 
-  renderMenuOptionDescription(
-    hass: HomeAssistant,
-    step: DataEntryFlowStepMenu,
-    option: string
-  ): string;
-
   renderLoadingDescription(
     hass: HomeAssistant,
     loadingReason: LoadingReason,

src/dialogs/config-flow/show-dialog-options-flow.ts

@@ -225,13 +225,6 @@ export const showOptionsFlowDialog = (
         );
       },
 
-      renderMenuOptionDescription(hass, step, option) {
-        return hass.localize(
-          `component.${step.translation_domain || configEntry.domain}.options.step.${step.step_id}.menu_option_descriptions.${option}`,
-          step.description_placeholders
-        );
-      },
-
       renderLoadingDescription(hass, reason) {
         return (
           hass.localize(`component.${configEntry.domain}.options.loading`) ||

src/dialogs/config-flow/show-dialog-sub-config-flow.ts

@@ -252,13 +252,6 @@ export const showSubConfigFlowDialog = (
       );
     },
 
-    renderMenuOptionDescription(hass, step, option) {
-      return hass.localize(
-        `component.${step.translation_domain || configEntry.domain}.config_subentries.${flowType}.step.${step.step_id}.menu_option_descriptions.${option}`,
-        step.description_placeholders
-      );
-    },
-
     renderLoadingDescription(hass, reason, handler, step) {
       if (reason !== "loading_flow" && reason !== "loading_step") {
         return "";

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

@@ -1,5 +1,5 @@
-import type { PropertyValues, TemplateResult } from "lit";
+import type { TemplateResult } from "lit";
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import "../../components/ha-icon-next";
@@ -8,7 +8,6 @@ import type { DataEntryFlowStepMenu } from "../../data/data_entry_flow";
 import type { HomeAssistant } from "../../types";
 import type { FlowConfig } from "./show-dialog-data-entry-flow";
 import { configFlowContentStyles } from "./styles";
-import { stringCompare } from "../../common/string/compare";
 
 @customElement("step-flow-menu")
 class StepFlowMenu extends LitElement {
@@ -18,18 +17,9 @@ class StepFlowMenu extends LitElement {
 
   @property({ attribute: false }) public step!: DataEntryFlowStepMenu;
 
-  protected shouldUpdate(changedProps: PropertyValues): boolean {
-    return (
-      changedProps.size > 1 ||
-      !changedProps.has("hass") ||
-      this.hass.localize !== changedProps.get("hass")?.localize
-    );
-  }
-
   protected render(): TemplateResult {
     let options: string[];
     let translations: Record<string, string>;
-    let optionDescriptions: Record<string, string> = {};
 
     if (Array.isArray(this.step.menu_options)) {
       options = this.step.menu_options;
@@ -40,36 +30,10 @@ class StepFlowMenu extends LitElement {
           this.step,
           option
         );
-        optionDescriptions[option] =
-          this.flowConfig.renderMenuOptionDescription(
-            this.hass,
-            this.step,
-            option
-          );
       }
     } else {
       options = Object.keys(this.step.menu_options);
       translations = this.step.menu_options;
-      optionDescriptions = Object.fromEntries(
-        options.map((key) => [
-          key,
-          this.flowConfig.renderMenuOptionDescription(
-            this.hass,
-            this.step,
-            key
-          ),
-        ])
-      );
-    }
-
-    if (this.step.sort) {
-      options = options.sort((a, b) =>
-        stringCompare(
-          translations[a]!,
-          translations[b]!,
-          this.hass.locale.language
-        )
-      );
     }
 
     const description = this.flowConfig.renderMenuDescription(
@@ -82,18 +46,8 @@ class StepFlowMenu extends LitElement {
       <div class="options">
         ${options.map(
           (option) => html`
-            <ha-list-item
+            <ha-list-item hasMeta .step=${option} @click=${this._handleStep}>
-              hasMeta
-              .step=${option}
-              @click=${this._handleStep}
-              ?twoline=${optionDescriptions[option]}
-            >
               <span>${translations[option]}</span>
-              ${optionDescriptions[option]
-                ? html`<span slot="secondary">
-                    ${optionDescriptions[option]}
-                  </span>`
-                : nothing}
               <ha-icon-next slot="meta"></ha-icon-next>
             </ha-list-item>
           `
@@ -119,10 +73,11 @@ class StepFlowMenu extends LitElement {
     css`
       .options {
         margin-top: 20px;
-        margin-bottom: 16px;
+        margin-bottom: 8px;
       }
       .content {
         padding-bottom: 16px;
+        border-bottom: 1px solid var(--divider-color);
       }
       .content + .options {
         margin-top: 8px;

src/dialogs/more-info/controls/more-info-weather.ts

@@ -6,9 +6,7 @@ import memoizeOne from "memoize-one";
 import { formatDateWeekdayShort } from "../../../common/datetime/format_date";
 import { formatTime } from "../../../common/datetime/format_time";
 import { formatNumber } from "../../../common/number/format_number";
-import "../../../components/ha-alert";
 import "../../../components/ha-relative-time";
-import "../../../components/ha-spinner";
 import "../../../components/ha-state-icon";
 import "../../../components/ha-svg-icon";
 import "../../../components/ha-tooltip";
@@ -294,101 +292,106 @@ class MoreInfoWeather extends LitElement {
             </div>
           `
         : nothing}
-
+      ${forecast
-      <div class="section">
+        ? html`
-        ${this.hass.localize("ui.card.weather.forecast")}:
+            <div class="section">
-      </div>
+              ${this.hass.localize("ui.card.weather.forecast")}:
-      ${supportedForecasts?.length > 1
+            </div>
-        ? html`<sl-tab-group @sl-tab-show=${this._handleForecastTypeChanged}>
+            ${supportedForecasts.length > 1
-            ${supportedForecasts.map(
+              ? html`<sl-tab-group
-              (forecastType) =>
+                  @sl-tab-show=${this._handleForecastTypeChanged}
-                html`<sl-tab
-                  slot="nav"
-                  .panel=${forecastType}
-                  .active=${this._forecastType === forecastType}
                 >
-                  ${this.hass!.localize(`ui.card.weather.${forecastType}`)}
+                  ${supportedForecasts.map(
-                </sl-tab>`
+                    (forecastType) =>
-            )}
+                      html`<sl-tab
-          </sl-tab-group>`
+                        slot="nav"
-        : nothing}
+                        .panel=${forecastType}
-      <div class="forecast">
+                        .active=${this._forecastType === forecastType}
-        ${forecast?.length
+                      >
-          ? forecast.map((item) =>
+                        ${this.hass!.localize(
-              this._showValue(item.templow) || this._showValue(item.temperature)
+                          `ui.card.weather.${forecastType}`
-                ? html`
+                        )}
-                    <div>
+                      </sl-tab>`
+                  )}
+                </sl-tab-group>`
+              : nothing}
+            <div class="forecast">
+              ${forecast.map((item) =>
+                this._showValue(item.templow) ||
+                this._showValue(item.temperature)
+                  ? html`
                       <div>
-                        ${dayNight
+                        <div>
-                          ? html`
+                          ${dayNight
-                              ${formatDateWeekdayShort(
-                                new Date(item.datetime),
-                                this.hass!.locale,
-                                this.hass!.config
-                              )}
-                              <div class="daynight">
-                                ${item.is_daytime !== false
-                                  ? this.hass!.localize("ui.card.weather.day")
-                                  : this.hass!.localize(
-                                      "ui.card.weather.night"
-                                    )}<br />
-                              </div>
-                            `
-                          : hourly
                             ? html`
-                                ${formatTime(
-                                  new Date(item.datetime),
-                                  this.hass!.locale,
-                                  this.hass!.config
-                                )}
-                              `
-                            : html`
                                 ${formatDateWeekdayShort(
                                   new Date(item.datetime),
                                   this.hass!.locale,
                                   this.hass!.config
                                 )}
-                              `}
+                                <div class="daynight">
-                      </div>
+                                  ${item.is_daytime !== false
-                      ${this._showValue(item.condition)
+                                    ? this.hass!.localize("ui.card.weather.day")
-                        ? html`
+                                    : this.hass!.localize(
-                            <div class="forecast-image-icon">
+                                        "ui.card.weather.night"
-                              ${getWeatherStateIcon(
+                                      )}<br />
-                                item.condition!,
+                                </div>
-                                this,
+                              `
-                                !(
+                            : hourly
-                                  item.is_daytime ||
+                              ? html`
-                                  item.is_daytime === undefined
+                                  ${formatTime(
-                                )
+                                    new Date(item.datetime),
-                              )}
+                                    this.hass!.locale,
-                            </div>
+                                    this.hass!.config
-                          `
+                                  )}
-                        : nothing}
+                                `
-                      <div class="temp">
+                              : html`
-                        ${this._showValue(item.temperature)
+                                  ${formatDateWeekdayShort(
-                          ? html`${formatNumber(
+                                    new Date(item.datetime),
-                              item.temperature,
+                                    this.hass!.locale,
-                              this.hass!.locale
+                                    this.hass!.config
-                            )}°`
+                                  )}
-                          : "—"}
+                                `}
-                      </div>
+                        </div>
-                      <div class="templow">
+                        ${this._showValue(item.condition)
-                        ${this._showValue(item.templow)
+                          ? html`
-                          ? html`${formatNumber(
+                              <div class="forecast-image-icon">
-                              item.templow!,
+                                ${getWeatherStateIcon(
-                              this.hass!.locale
+                                  item.condition!,
-                            )}°`
+                                  this,
-                          : hourly
+                                  !(
-                            ? nothing
+                                    item.is_daytime ||
+                                    item.is_daytime === undefined
+                                  )
+                                )}
+                              </div>
+                            `
+                          : nothing}
+                        <div class="temp">
+                          ${this._showValue(item.temperature)
+                            ? html`${formatNumber(
+                                item.temperature,
+                                this.hass!.locale
+                              )}°`
                             : "—"}
+                        </div>
+                        <div class="templow">
+                          ${this._showValue(item.templow)
+                            ? html`${formatNumber(
+                                item.templow!,
+                                this.hass!.locale
+                              )}°`
+                            : hourly
+                              ? nothing
+                              : "—"}
+                        </div>
                       </div>
-                    </div>
+                    `
-                  `
+                  : nothing
-                : nothing
+              )}
-            )
+            </div>
-          : html`<ha-spinner size="medium"></ha-spinner>`}
+          `
-      </div>
+        : nothing}
-
       ${this.stateObj.attributes.attribution
         ? html`
             <div class="attribution">
@@ -586,10 +589,6 @@ class MoreInfoWeather extends LitElement {
         .forecast-icon {
           --mdc-icon-size: 40px;
         }
-
-        .forecast ha-spinner {
-          height: 120px;
-        }
       `,
     ];
   }

src/html/authorize.html.template

@@ -35,7 +35,6 @@
         align-items: center;
         justify-content: center;
         margin-bottom: 32px;
-        padding-top: var(--safe-area-inset-top);
       }
 
       .header img {

src/html/index.html.template

@@ -44,7 +44,7 @@
       }
       #ha-launch-screen .ha-launch-screen-spacer-top {
         flex: 1;
-        margin-top: calc( 2 * max(var(--safe-area-inset-top, 0px), 48px) + 46px );
+        margin-top: calc( 2 * max(var(--safe-area-inset-bottom, 0px), 48px) + 46px );
         padding-top: 48px;
       }
       #ha-launch-screen .ha-launch-screen-spacer-bottom {

src/html/onboarding.html.template

@@ -19,9 +19,8 @@
         height: auto;
         padding: 32px 0;
       }
-
       .content {
-        max-width: min(560px, calc(100vw - var(--safe-area-inset-right, 0px) - var(--safe-area-inset-left, 0px)));
+        max-width: 560px;
         margin: 0 auto;
         padding: 0 16px;
         box-sizing: content-box;
@@ -33,7 +32,6 @@
         justify-content: flex-start;
         margin-bottom: 32px;
         margin-left: 32px;
-        padding-top: var(--safe-area-inset-top);
       }
 
       .header img {

src/layouts/home-assistant-main.ts

@@ -146,8 +146,6 @@ export class HomeAssistantMain extends LitElement {
       -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
       --mdc-drawer-width: 56px;
       --mdc-top-app-bar-width: calc(100% - var(--mdc-drawer-width));
-      --safe-area-content-inset-left: 0px;
-      --safe-area-content-inset-right: var(--safe-area-inset-right);
     }
     :host([expanded]) {
       --mdc-drawer-width: calc(256px + var(--safe-area-inset-left));
@@ -155,7 +153,6 @@ export class HomeAssistantMain extends LitElement {
     :host([modal]) {
       --mdc-drawer-width: unset;
       --mdc-top-app-bar-width: unset;
-      --safe-area-content-inset-left: var(--safe-area-inset-left);
     }
     partial-panel-resolver,
     ha-sidebar {

src/mixins/keyboard-shortcut-mixin.ts

@@ -1,5 +1,6 @@
 import type { LitElement } from "lit";
 import type { Constructor } from "../types";
+import { canOverrideAlphanumericInput } from "../common/dom/can-override-input";
 
 declare global {
   type SupportedShortcuts = Record<string, () => void>;
@@ -17,6 +18,14 @@ export const KeyboardShortcutMixin = <T extends Constructor<LitElement>>(
         !event.altKey &&
         event.key in supportedShortcuts
       ) {
+        // Only capture the event if the user is not focused on an input
+        if (!canOverrideAlphanumericInput(event.composedPath())) {
+          return;
+        }
+        // Don't capture the event if the user is selecting text
+        if (window.getSelection()?.toString()) {
+          return;
+        }
         event.preventDefault();
         supportedShortcuts[event.key]();
         return;

src/panels/config/automation/action/ha-automation-action-editor.ts

@@ -50,7 +50,9 @@ export default class HaAutomationActionEditor extends LitElement {
         class=${classMap({
           "card-content": true,
           disabled:
-            this.disabled || (this.action.enabled === false && !this.yamlMode),
+            !this.indent &&
+            (this.disabled ||
+              (this.action.enabled === false && !this.yamlMode)),
           yaml: yamlMode,
           indent: this.indent,
           card: !this.inSidebar,
@@ -97,7 +99,7 @@ export default class HaAutomationActionEditor extends LitElement {
     if (!ev.detail.isValid) {
       return;
     }
-    fireEvent(this, "yaml-changed", {
+    fireEvent(this, this.inSidebar ? "yaml-changed" : "value-changed", {
       value: migrateAutomationAction(ev.detail.value),
     });
   }

src/panels/config/automation/action/ha-automation-action-row.ts

@@ -460,9 +460,6 @@ export default class HaAutomationActionRow extends LitElement {
               .sortSelected=${this.sortSelected}
               @click=${this._toggleSidebar}
               @toggle-collapsed=${this._toggleCollapse}
-              @copy-row=${this._copyAction}
-              @cut-row=${this._cutAction}
-              @delete-row=${this._onDelete}
               >${this._renderRow()}</ha-automation-row
             >`
           : html`

src/panels/config/automation/action/types/ha-automation-action-condition.ts

@@ -3,6 +3,7 @@ import { customElement, property, query } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import { stringCompare } from "../../../../../common/string/compare";
+import { stopPropagation } from "../../../../../common/dom/stop_propagation";
 import type { LocalizeFunc } from "../../../../../common/translations/localize";
 import "../../../../../components/ha-list-item";
 import "../../../../../components/ha-select";
@@ -66,6 +67,7 @@ export class HaConditionAction extends LitElement implements ActionElement {
               .value=${this.action.condition}
               naturalMenuWidth
               @selected=${this._typeChanged}
+              @closed=${stopPropagation}
             >
               ${this._processedTypes(this.hass.localize).map(
                 ([opt, label, icon]) => html`

src/panels/config/automation/condition/ha-automation-condition-editor.ts

@@ -53,8 +53,9 @@ export default class HaAutomationConditionEditor extends LitElement {
         class=${classMap({
           "card-content": true,
           disabled:
-            this.disabled ||
+            !this.indent &&
-            (this.condition.enabled === false && !this.yamlMode),
+            (this.disabled ||
+              (this.condition.enabled === false && !this.yamlMode)),
           yaml: yamlMode,
           indent: this.indent,
           card: !this.inSidebar,
@@ -103,7 +104,9 @@ export default class HaAutomationConditionEditor extends LitElement {
     if (!ev.detail.isValid) {
       return;
     }
-    fireEvent(this, "yaml-changed", { value: ev.detail.value });
+    fireEvent(this, this.inSidebar ? "yaml-changed" : "value-changed", {
+      value: ev.detail.value,
+    });
   }
 
   private _onUiChanged(ev: CustomEvent) {

src/panels/config/automation/condition/ha-automation-condition-row.ts

@@ -369,9 +369,6 @@ export default class HaAutomationConditionRow extends LitElement {
               .sortSelected=${this.sortSelected}
               @click=${this._toggleSidebar}
               @toggle-collapsed=${this._toggleCollapse}
-              @copy-row=${this._copyCondition}
-              @cut-row=${this._cutCondition}
-              @delete-row=${this._onDelete}
               >${this._renderRow()}</ha-automation-row
             >`
           : html`
@@ -386,12 +383,12 @@ export default class HaAutomationConditionRow extends LitElement {
             error: this._testingResult === false,
           })}"
         >
-          ${this._testingResult
+          ${this._testingResult === undefined
-            ? this.hass.localize(
+            ? nothing
-                "ui.panel.config.automation.editor.conditions.testing_pass"
-              )
             : this.hass.localize(
-                "ui.panel.config.automation.editor.conditions.testing_error"
+                `ui.panel.config.automation.editor.conditions.testing_${
+                  this._testingResult ? "pass" : "error"
+                }`
               )}
         </div>
       </ha-card>

src/panels/config/automation/ha-automation-editor.ts

@@ -593,6 +593,7 @@ export class HaAutomationEditor extends PreventUnsavedMixin(
       this.hass
     ) {
       const initData = getAutomationEditorInitData();
+      this._dirty = !!initData;
       let baseConfig: Partial<AutomationConfig> = { description: "" };
       if (!initData || !("use_blueprint" in initData)) {
         baseConfig = {

src/panels/config/automation/ha-automation-picker.ts

@@ -292,7 +292,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
           extraTemplate: (automation) =>
             automation.labels.length
               ? html`<ha-data-table-labels
-                  @label-clicked=${narrow ? undefined : this._labelClicked}
+                  @label-clicked=${this._labelClicked}
                   .labels=${automation.labels}
                 ></ha-data-table-labels>`
               : nothing,

src/panels/config/automation/sidebar/ha-automation-sidebar-condition.ts

@@ -296,12 +296,12 @@ export default class HaAutomationSidebarCondition extends LitElement {
             narrow: this.narrow,
           })}"
         >
-          ${this._testingResult
+          ${this._testingResult === undefined
-            ? this.hass.localize(
+            ? nothing
-                "ui.panel.config.automation.editor.conditions.testing_pass"
-              )
             : this.hass.localize(
-                "ui.panel.config.automation.editor.conditions.testing_error"
+                `ui.panel.config.automation.editor.conditions.testing_${
+                  this._testingResult ? "pass" : "error"
+                }`
               )}
         </div>
       </div>

src/panels/config/automation/styles.ts

@@ -44,7 +44,6 @@ export const rowStyles = css`
 
 export const editorStyles = css`
   .disabled {
-    opacity: 0.5;
     pointer-events: none;
   }
 
@@ -252,4 +251,7 @@ export const sidebarEditorStyles = css`
       display: none;
     }
   }
+  ha-md-menu-item {
+    --mdc-icon-size: 24px;
+  }
 `;

src/panels/config/automation/trigger/ha-automation-trigger-editor.ts

@@ -121,7 +121,7 @@ export default class HaAutomationTriggerEditor extends LitElement {
     if (!ev.detail.isValid) {
       return;
     }
-    fireEvent(this, "yaml-changed", {
+    fireEvent(this, this.inSidebar ? "yaml-changed" : "value-changed", {
       value: migrateAutomationTrigger(ev.detail.value),
     });
   }
@@ -141,7 +141,6 @@ export default class HaAutomationTriggerEditor extends LitElement {
       haStyle,
       css`
         .disabled {
-          opacity: 0.5;
           pointer-events: none;
         }
 

src/panels/config/automation/trigger/ha-automation-trigger-row.ts

@@ -358,9 +358,6 @@ export default class HaAutomationTriggerRow extends LitElement {
               .highlight=${this.highlight}
               .sortSelected=${this.sortSelected}
               @click=${this._toggleSidebar}
-              @copy-row=${this._copyTrigger}
-              @cut-row=${this._cutTrigger}
-              @delete-row=${this._onDelete}
               >${this._selected
                 ? "selected"
                 : nothing}${this._renderRow()}</ha-automation-row

src/panels/config/automation/trigger/types/ha-automation-trigger-webhook.ts

@@ -125,7 +125,7 @@ export class HaWebhookTrigger extends LitElement {
             .path=${mdiContentCopy}
           ></ha-icon-button>
         </ha-textfield>
-        <ha-button-menu multi @closed=${stopPropagation}>
+        <ha-button-menu multi @closed=${stopPropagation} fixed>
           <ha-icon-button
             slot="trigger"
             .label=${this.hass!.localize(

src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts

@@ -132,7 +132,7 @@ class DialogDeviceRegistryDetail extends LitElement {
           </div>
         </div>
         <ha-button
-          slot="primaryAction"
+          slot="secondaryAction"
           @click=${this.closeDialog}
           .disabled=${this._submitting}
           appearance="plain"

src/panels/config/energy/components/ha-energy-battery-settings.ts

@@ -226,6 +226,7 @@ export class EnergyBatterySettings extends LitElement {
         .label {
           overflow: hidden;
           text-overflow: ellipsis;
+          white-space: nowrap;
         }
       `,
     ];

src/panels/config/integrations/integration-panels/bluetooth/bluetooth-config-dashboard.ts

@@ -1,5 +1,5 @@
 import type { CSSResultGroup, TemplateResult } from "lit";
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../../../../../components/ha-card";
 import "../../../../../components/ha-code-editor";
@@ -11,22 +11,13 @@ import { showOptionsFlowDialog } from "../../../../../dialogs/config-flow/show-d
 import "../../../../../layouts/hass-subpage";
 import { haStyle } from "../../../../../resources/styles";
 import type { HomeAssistant } from "../../../../../types";
-import {
+import { subscribeBluetoothConnectionAllocations } from "../../../../../data/bluetooth";
-  subscribeBluetoothConnectionAllocations,
-  subscribeBluetoothScannerState,
-  subscribeBluetoothScannersDetails,
-} from "../../../../../data/bluetooth";
-import type {
-  BluetoothAllocationsData,
-  BluetoothScannerState,
-  BluetoothScannersDetails,
-  HaScannerType,
-} from "../../../../../data/bluetooth";
 import {
   getValueInPercentage,
   roundWithOneDecimal,
 } from "../../../../../util/calculate";
 import "../../../../../components/ha-metric";
+import type { BluetoothAllocationsData } from "../../../../../data/bluetooth";
 
 @customElement("bluetooth-config-dashboard")
 export class BluetoothConfigDashboard extends LitElement {
@@ -38,26 +29,16 @@ export class BluetoothConfigDashboard extends LitElement {
 
   @state() private _connectionAllocationsError?: string;
 
-  @state() private _scannerState?: BluetoothScannerState;
-
-  @state() private _scannerDetails?: BluetoothScannersDetails;
-
   private _configEntry = new URLSearchParams(window.location.search).get(
     "config_entry"
   );
 
   private _unsubConnectionAllocations?: (() => Promise<void>) | undefined;
 
-  private _unsubScannerState?: (() => Promise<void>) | undefined;
-
-  private _unsubScannerDetails?: (() => void) | undefined;
-
   public connectedCallback(): void {
     super.connectedCallback();
     if (this.hass) {
       this._subscribeBluetoothConnectionAllocations();
-      this._subscribeBluetoothScannerState();
-      this._subscribeScannerDetails();
     }
   }
 
@@ -80,45 +61,12 @@ export class BluetoothConfigDashboard extends LitElement {
     }
   }
 
-  private async _subscribeBluetoothScannerState(): Promise<void> {
-    if (this._unsubScannerState || !this._configEntry) {
-      return;
-    }
-    this._unsubScannerState = await subscribeBluetoothScannerState(
-      this.hass.connection,
-      (scannerState) => {
-        this._scannerState = scannerState;
-      },
-      this._configEntry
-    );
-  }
-
-  private _subscribeScannerDetails(): void {
-    if (this._unsubScannerDetails) {
-      return;
-    }
-    this._unsubScannerDetails = subscribeBluetoothScannersDetails(
-      this.hass.connection,
-      (details) => {
-        this._scannerDetails = details;
-      }
-    );
-  }
-
   public disconnectedCallback() {
     super.disconnectedCallback();
     if (this._unsubConnectionAllocations) {
       this._unsubConnectionAllocations();
       this._unsubConnectionAllocations = undefined;
     }
-    if (this._unsubScannerState) {
-      this._unsubScannerState();
-      this._unsubScannerState = undefined;
-    }
-    if (this._unsubScannerDetails) {
-      this._unsubScannerDetails();
-      this._unsubScannerDetails = undefined;
-    }
   }
 
   protected render(): TemplateResult {
@@ -130,7 +78,6 @@ export class BluetoothConfigDashboard extends LitElement {
               "ui.panel.config.bluetooth.settings_title"
             )}
           >
-            <div class="card-content">${this._renderScannerState()}</div>
             <div class="card-actions">
               <ha-button @click=${this._openOptionFlow}
                 >${this.hass.localize(
@@ -195,118 +142,6 @@ export class BluetoothConfigDashboard extends LitElement {
   private _getUsedAllocations = (used: number, total: number) =>
     roundWithOneDecimal(getValueInPercentage(used, 0, total));
 
-  private _renderScannerMismatchWarning(
-    scannerState: BluetoothScannerState,
-    scannerType: HaScannerType,
-    formatMode: (mode: string | null) => string
-  ) {
-    const instructions: string[] = [];
-
-    if (scannerType === "remote" || scannerType === "unknown") {
-      instructions.push(
-        this.hass.localize(
-          "ui.panel.config.bluetooth.scanner_mode_mismatch_remote"
-        )
-      );
-    }
-    if (scannerType === "usb" || scannerType === "unknown") {
-      instructions.push(
-        this.hass.localize(
-          "ui.panel.config.bluetooth.scanner_mode_mismatch_usb"
-        )
-      );
-    }
-    if (scannerType === "uart" || scannerType === "unknown") {
-      instructions.push(
-        this.hass.localize(
-          "ui.panel.config.bluetooth.scanner_mode_mismatch_uart"
-        )
-      );
-    }
-
-    return html`<ha-alert alert-type="warning">
-      <div>
-        ${this.hass.localize(
-          "ui.panel.config.bluetooth.scanner_mode_mismatch",
-          {
-            requested: formatMode(scannerState.requested_mode),
-            current: formatMode(scannerState.current_mode),
-          }
-        )}
-      </div>
-      <ul>
-        ${instructions.map((instruction) => html`<li>${instruction}</li>`)}
-      </ul>
-    </ha-alert>`;
-  }
-
-  private _renderScannerState() {
-    if (!this._configEntry || !this._scannerState) {
-      return html`<div>
-        ${this.hass.localize(
-          "ui.panel.config.bluetooth.no_scanner_state_available"
-        )}
-      </div>`;
-    }
-
-    const scannerState = this._scannerState;
-    // Find the scanner details for this source
-    const scannerDetails = this._scannerDetails?.[scannerState.source];
-    const scannerType: HaScannerType =
-      scannerDetails?.scanner_type ?? "unknown";
-
-    const formatMode = (mode: string | null) => {
-      switch (mode) {
-        case null:
-          return this.hass.localize(
-            "ui.panel.config.bluetooth.scanning_mode_none"
-          );
-        case "active":
-          return this.hass.localize(
-            "ui.panel.config.bluetooth.scanning_mode_active"
-          );
-        case "passive":
-          return this.hass.localize(
-            "ui.panel.config.bluetooth.scanning_mode_passive"
-          );
-        default:
-          return mode; // Fallback for unknown modes
-      }
-    };
-
-    return html`
-      <div class="scanner-state">
-        <div class="state-row">
-          <span
-            >${this.hass.localize(
-              "ui.panel.config.bluetooth.current_scanning_mode"
-            )}:</span
-          >
-          <span class="state-value"
-            >${formatMode(scannerState.current_mode)}</span
-          >
-        </div>
-        <div class="state-row">
-          <span
-            >${this.hass.localize(
-              "ui.panel.config.bluetooth.requested_scanning_mode"
-            )}:</span
-          >
-          <span class="state-value"
-            >${formatMode(scannerState.requested_mode)}</span
-          >
-        </div>
-        ${scannerState.current_mode !== scannerState.requested_mode
-          ? this._renderScannerMismatchWarning(
-              scannerState,
-              scannerType,
-              formatMode
-            )
-          : nothing}
-      </div>
-    `;
-  }
-
   private _renderConnectionAllocations() {
     if (this._connectionAllocationsError) {
       return html`<ha-alert alert-type="error"
@@ -385,18 +220,6 @@ export class BluetoothConfigDashboard extends LitElement {
           display: flex;
           justify-content: flex-end;
         }
-        .scanner-state {
-          margin-bottom: 16px;
-        }
-        .state-row {
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          padding: 4px 0;
-        }
-        .state-value {
-          font-weight: 500;
-        }
       `,
     ];
   }

src/panels/config/integrations/integration-panels/bluetooth/bluetooth-network-visualization.ts

@@ -34,16 +34,6 @@ const UPDATE_THROTTLE_TIME = 10000;
 const CORE_SOURCE_ID = "ha";
 const CORE_SOURCE_LABEL = "Home Assistant";
 
-const RSSI_COLOR_THRESHOLDS: [number, string][] = [
-  [-70, "--green-color"], // Excellent: > -70 dBm
-  [-75, "--lime-color"], // Good: -70 to -75 dBm
-  [-80, "--yellow-color"], // Okay: -75 to -80 dBm
-  [-85, "--amber-color"], // Marginal: -80 to -85 dBm
-  [-90, "--orange-color"], // Weak: -85 to -90 dBm
-  [-95, "--deep-orange-color"], // Poor: -90 to -95 dBm
-  [-Infinity, "--red-color"], // Very poor: < -95 dBm
-];
-
 @customElement("bluetooth-network-visualization")
 export class BluetoothNetworkVisualization extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -135,16 +125,6 @@ export class BluetoothNetworkVisualization extends LitElement {
     `;
   }
 
-  private _getRssiColorVar = memoizeOne((rssi: number): string => {
-    for (const [threshold, colorVar] of RSSI_COLOR_THRESHOLDS) {
-      if (rssi > threshold) {
-        return colorVar;
-      }
-    }
-    // Fallback (should never reach here)
-    return "--red-color";
-  });
-
   private _formatNetworkData = memoizeOne(
     (
       data: BluetoothDeviceData[],
@@ -226,7 +206,7 @@ export class BluetoothNetworkVisualization extends LitElement {
             symbol: "none",
             lineStyle: {
               width: this._getLineWidth(node.rssi),
-              color: style.getPropertyValue(this._getRssiColorVar(node.rssi)),
+              color: style.getPropertyValue("--primary-color"),
             },
           });
           return;
@@ -247,7 +227,7 @@ export class BluetoothNetworkVisualization extends LitElement {
           lineStyle: {
             width: this._getLineWidth(node.rssi),
             color: device
-              ? style.getPropertyValue(this._getRssiColorVar(node.rssi))
+              ? style.getPropertyValue("--primary-color")
               : style.getPropertyValue("--disabled-color"),
           },
         });

src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts

@@ -199,10 +199,8 @@ export class HaConfigLovelaceDashboards extends LitElement {
           "ui.panel.config.lovelace.dashboards.picker.headers.require_admin"
         ),
         sortable: true,
-        hidden: narrow,
         type: "icon",
-        minWidth: "120px",
+        hidden: narrow,
-        maxWidth: "120px",
         template: (dashboard) =>
           dashboard.require_admin
             ? html`<ha-svg-icon .path=${mdiCheck}></ha-svg-icon>`
@@ -212,10 +210,8 @@ export class HaConfigLovelaceDashboards extends LitElement {
         title: localize(
           "ui.panel.config.lovelace.dashboards.picker.headers.sidebar"
         ),
-        hidden: narrow,
         type: "icon",
-        minWidth: "120px",
+        hidden: narrow,
-        maxWidth: "120px",
         template: (dashboard) =>
           dashboard.show_in_sidebar
             ? html`<ha-svg-icon .path=${mdiCheck}></ha-svg-icon>`

src/panels/config/repairs/show-dialog-repair-flow.ts

@@ -289,15 +289,6 @@ export const showRepairsFlowDialog = (
         );
       },
 
-      renderMenuOptionDescription(hass, step, option) {
-        return hass.localize(
-          `component.${issue.domain}.issues.${
-            issue.translation_key || issue.issue_id
-          }.fix_flow.step.${step.step_id}.menu_option_descriptions.${option}`,
-          mergePlaceholders(issue, step)
-        );
-      },
-
       renderLoadingDescription(hass, reason) {
         return (
           hass.localize(

src/panels/config/script/ha-script-editor.ts

@@ -1024,6 +1024,7 @@ export class HaScriptEditor extends SubscribeMixin(
       c: () => this._copySelectedRow(),
       x: () => this._cutSelectedRow(),
       Delete: () => this._deleteSelectedRow(),
+      Backspace: () => this._deleteSelectedRow(),
     };
   }
 

src/panels/developer-tools/state/developer-tools-state.ts

@@ -568,10 +568,6 @@ class HaPanelDevState extends LitElement {
           margin: 0 8px 16px;
         }
 
-        ha-expansion-panel p {
-          padding: 0 8px;
-        }
-
         .inputs {
           width: 100%;
           max-width: 800px;
@@ -583,9 +579,8 @@ class HaPanelDevState extends LitElement {
 
         .button-row {
           display: flex;
-          margin: 8px 0;
+          margin-top: 8px;
           align-items: center;
-          gap: 8px;
         }
 
         :host([narrow]) .state-wrapper {

src/panels/lovelace/cards/clock/hui-clock-card-digital.ts

@@ -36,12 +36,11 @@ export class HuiClockCardDigital extends LitElement {
       locale = { ...locale, time_format: this.config.time_format };
     }
 
-    const h12 = useAmPm(locale);
     this._dateTimeFormat = new Intl.DateTimeFormat(this.hass.locale.language, {
-      hour: h12 ? "numeric" : "2-digit",
+      hour: "2-digit",
       minute: "2-digit",
       second: "2-digit",
-      hourCycle: h12 ? "h12" : "h23",
+      hourCycle: useAmPm(locale) ? "h12" : "h23",
       timeZone:
         this.config?.time_zone ||
         resolveTimeZone(locale.time_zone, this.hass.config?.time_zone),

src/panels/lovelace/cards/energy/hui-energy-sankey-card.ts

@@ -225,7 +225,7 @@ class HuiEnergySankeyCard
       if (consumption.total.battery_to_grid > 0) {
         links.push({
           source: "battery",
-          target: "grid",
+          target: "grid_return",
           value: consumption.total.battery_to_grid,
         });
       }

src/panels/lovelace/cards/hui-picture-glance-card.ts

@@ -7,7 +7,6 @@ import { DOMAINS_TOGGLE } from "../../../common/const";
 import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
 import { computeDomain } from "../../../common/entity/compute_domain";
 import { computeStateName } from "../../../common/entity/compute_state_name";
-import { stateActive } from "../../../common/entity/state_active";
 import "../../../components/ha-card";
 import "../../../components/ha-icon-button";
 import "../../../components/ha-state-icon";
@@ -31,6 +30,15 @@ import type {
 } from "./types";
 import type { PersonEntity } from "../../../data/person";
 
+const STATES_OFF = new Set([
+  "closed",
+  "locked",
+  "not_home",
+  "off",
+  "unavailable",
+  "unknown",
+]);
+
 @customElement("hui-picture-glance-card")
 class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
@@ -295,7 +303,7 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
           .disabled=${!hasAction(entityConf.tap_action)}
           .config=${entityConf}
           class=${classMap({
-            "state-on": stateActive(stateObj),
+            "state-on": !STATES_OFF.has(stateObj.state),
           })}
           title=${`${computeStateName(
             stateObj

src/panels/lovelace/strategies/home/home-security-view-strategy.ts

@@ -12,7 +12,6 @@ import {
 } from "../areas/helpers/areas-strategy-helper";
 import { getHomeStructure } from "./helpers/home-structure";
 import { findEntities, HOME_SUMMARIES_FILTERS } from "./helpers/home-summaries";
-import type { LogbookCardConfig } from "../../cards/types";
 
 export interface HomeSecurityViewStrategyConfig {
   type: "home-security";
@@ -132,24 +131,6 @@ export class HomeSecurityViewStrategy extends ReactiveElement {
       }
     }
 
-    sections.push({
-      type: "grid",
-      cards: [
-        {
-          type: "heading",
-          heading: hass.localize("panel.logbook"),
-          tap_action: {
-            action: "navigate",
-            navigation_path: `/logbook?entity_id=${entities.join(",")}`,
-          },
-        },
-        {
-          type: "logbook",
-          target: { entity_id: entities },
-        } satisfies LogbookCardConfig,
-      ],
-    });
-
     return {
       type: "sections",
       max_columns: 2,

src/translations/en.json

@@ -1383,6 +1383,7 @@
         "related": "Related",
         "history": "History",
         "logbook": "Logbook",
+        "device_info": "Device info",
         "device_or_service_info": "[%key:ui::panel::config::devices::device_info%]",
         "device_type": {
           "device": "[%key:ui::panel::config::devices::type::device_heading%]",
@@ -1618,7 +1619,7 @@
             "preload_stream": "Preload camera stream",
             "preload_stream_description": "This keeps the camera stream open in the background so it shows quicker. Warning! This is device intensive.",
             "stream_orientation": "Camera stream orientation",
-            "stream_orientation_description": "The orientation transformation to use for the camera stream.\nWarning: Stream orientation processing occurs on the Home Assistant device and may impact system performance. When possible, configure this setting directly on your camera instead.",
+            "stream_orientation_description": "The orientation transformation to use for the camera stream.",
             "stream_orientation_1": "No orientation transform",
             "stream_orientation_2": "Mirror",
             "stream_orientation_3": "Rotate 180",
@@ -5145,7 +5146,7 @@
             "integration": "Integration",
             "config_entry": "Config entry"
           },
-          "enabled_description": "Disabled devices and services will not be shown and entities belonging to them will be disabled, too.",
+          "enabled_description": "Disabled devices will not be shown and entities belonging to the device will be disabled and not added to Home Assistant.",
           "open_configuration_url": "Visit",
           "set_up_voice_assistant": "Set up voice assistant",
           "download_diagnostics": "Download diagnostics",
@@ -5742,16 +5743,6 @@
           "no_advertisements_found": "No matching Bluetooth advertisements found",
           "no_connection_slot_allocations": "No connection slot allocations information available",
           "no_active_connection_support": "This adapter does not support making active (GATT) connections.",
-          "no_scanner_state_available": "No scanner state available",
-          "current_scanning_mode": "Current scanning mode",
-          "requested_scanning_mode": "Requested scanning mode",
-          "scanning_mode_none": "none",
-          "scanning_mode_active": "active",
-          "scanning_mode_passive": "passive",
-          "scanner_mode_mismatch": "Scanner requested {requested} mode but is operating in {current} mode. The scanner is in a bad state and needs to be power cycled.",
-          "scanner_mode_mismatch_remote": "For proxies: reboot the device",
-          "scanner_mode_mismatch_usb": "For USB adapters: unplug and plug back in",
-          "scanner_mode_mismatch_uart": "For UART/onboard adapters: power down the system completely and power it back up",
           "address": "Address",
           "name": "Name",
           "source": "Source",

test/common/entity/device_tracker_icon.test.ts

@@ -1,124 +0,0 @@
-import type { HassEntity } from "home-assistant-js-websocket";
-import { describe, expect, it } from "vitest";
-import { deviceTrackerIcon } from "../../../src/common/entity/device_tracker_icon";
-
-describe("deviceTrackerIcon", () => {
-  const createMockStateObj = (
-    source_type: string,
-    state = "home"
-  ): HassEntity => ({
-    entity_id: "device_tracker.test",
-    state,
-    attributes: { source_type },
-    context: { id: "test", parent_id: null, user_id: null },
-    last_changed: "2023-01-01T00:00:00Z",
-    last_updated: "2023-01-01T00:00:00Z",
-  });
-
-  describe("router source type", () => {
-    it("should return lan-connect icon when home", () => {
-      const stateObj = createMockStateObj("router", "home");
-      expect(deviceTrackerIcon(stateObj)).toBe("mdi:lan-connect");
-    });
-
-    it("should return lan-disconnect icon when not home", () => {
-      const stateObj = createMockStateObj("router", "not_home");
-      expect(deviceTrackerIcon(stateObj)).toBe("mdi:lan-disconnect");
-    });
-
-    it("should return lan-disconnect icon for any other state", () => {
-      const stateObj = createMockStateObj("router", "office");
-      expect(deviceTrackerIcon(stateObj)).toBe("mdi:lan-disconnect");
-    });
-
-    it("should use explicit state parameter over state object state", () => {
-      const stateObj = createMockStateObj("router", "not_home");
-      expect(deviceTrackerIcon(stateObj, "home")).toBe("mdi:lan-connect");
-    });
-  });
-
-  describe("bluetooth source type", () => {
-    it("should return bluetooth-connect icon when home for bluetooth", () => {
-      const stateObj = createMockStateObj("bluetooth", "home");
-      expect(deviceTrackerIcon(stateObj)).toBe("mdi:bluetooth-connect");
-    });
-
-    it("should return bluetooth icon when not home for bluetooth", () => {
-      const stateObj = createMockStateObj("bluetooth", "not_home");
-      expect(deviceTrackerIcon(stateObj)).toBe("mdi:bluetooth");
-    });
-
-    it("should return bluetooth-connect icon when home for bluetooth_le", () => {
-      const stateObj = createMockStateObj("bluetooth_le", "home");
-      expect(deviceTrackerIcon(stateObj)).toBe("mdi:bluetooth-connect");
-    });
-
-    it("should return bluetooth icon when not home for bluetooth_le", () => {
-      const stateObj = createMockStateObj("bluetooth_le", "not_home");
-      expect(deviceTrackerIcon(stateObj)).toBe("mdi:bluetooth");
-    });
-
-    it("should use explicit state parameter for bluetooth", () => {
-      const stateObj = createMockStateObj("bluetooth", "not_home");
-      expect(deviceTrackerIcon(stateObj, "home")).toBe("mdi:bluetooth-connect");
-    });
-  });
-
-  describe("other source types", () => {
-    it("should return account icon when home for gps", () => {
-      const stateObj = createMockStateObj("gps", "home");
-      expect(deviceTrackerIcon(stateObj)).toBe("mdi:account");
-    });
-
-    it("should return account-arrow-right icon when not home for gps", () => {
-      const stateObj = createMockStateObj("gps", "not_home");
-      expect(deviceTrackerIcon(stateObj)).toBe("mdi:account-arrow-right");
-    });
-
-    it("should return account icon for unknown location with gps", () => {
-      const stateObj = createMockStateObj("gps", "office");
-      expect(deviceTrackerIcon(stateObj)).toBe("mdi:account");
-    });
-
-    it("should handle unknown source type", () => {
-      const stateObj = createMockStateObj("unknown", "home");
-      expect(deviceTrackerIcon(stateObj)).toBe("mdi:account");
-    });
-
-    it("should handle unknown source type when not home", () => {
-      const stateObj = createMockStateObj("unknown", "not_home");
-      expect(deviceTrackerIcon(stateObj)).toBe("mdi:account-arrow-right");
-    });
-  });
-
-  describe("edge cases", () => {
-    it("should handle missing source_type attribute", () => {
-      const stateObj: HassEntity = {
-        entity_id: "device_tracker.test",
-        state: "home",
-        attributes: {},
-        context: { id: "test", parent_id: null, user_id: null },
-        last_changed: "2023-01-01T00:00:00Z",
-        last_updated: "2023-01-01T00:00:00Z",
-      };
-      expect(deviceTrackerIcon(stateObj)).toBe("mdi:account");
-    });
-
-    it("should handle undefined state object attributes", () => {
-      const stateObj: HassEntity = {
-        entity_id: "device_tracker.test",
-        state: "not_home",
-        attributes: {},
-        context: { id: "test", parent_id: null, user_id: null },
-        last_changed: "2023-01-01T00:00:00Z",
-        last_updated: "2023-01-01T00:00:00Z",
-      };
-      expect(deviceTrackerIcon(stateObj)).toBe("mdi:account-arrow-right");
-    });
-
-    it("should handle empty string state", () => {
-      const stateObj = createMockStateObj("router", "");
-      expect(deviceTrackerIcon(stateObj)).toBe("mdi:lan-disconnect");
-    });
-  });
-});

test/common/entity/entity_filter.test.ts

@@ -1,391 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { generateEntityFilter } from "../../../src/common/entity/entity_filter";
-import type { HomeAssistant } from "../../../src/types";
-
-// Mock HomeAssistant with comprehensive data
-const mockHass: HomeAssistant = {
-  states: {
-    "light.living_room": {
-      entity_id: "light.living_room",
-      state: "on",
-      attributes: { device_class: "light" },
-    },
-    "switch.kitchen": {
-      entity_id: "switch.kitchen",
-      state: "off",
-      attributes: { device_class: "switch" },
-    },
-    "sensor.temperature": {
-      entity_id: "sensor.temperature",
-      state: "22.5",
-      attributes: { device_class: "temperature" },
-    },
-    "binary_sensor.motion": {
-      entity_id: "binary_sensor.motion",
-      state: "off",
-      attributes: { device_class: "motion" },
-    },
-    "climate.thermostat": {
-      entity_id: "climate.thermostat",
-      state: "heat",
-      attributes: {},
-    },
-    "media_player.tv": {
-      entity_id: "media_player.tv",
-      state: "off",
-      attributes: {},
-    },
-    "light.bedroom": {
-      entity_id: "light.bedroom",
-      state: "off",
-      attributes: { device_class: "light" },
-    },
-    "switch.basement": {
-      entity_id: "switch.basement",
-      state: "on",
-      attributes: { device_class: "switch" },
-    },
-    "sensor.humidity": {
-      entity_id: "sensor.humidity",
-      state: "45",
-      attributes: { device_class: "humidity", entity_category: "diagnostic" },
-    },
-    "light.no_area": {
-      entity_id: "light.no_area",
-      state: "off",
-      attributes: { device_class: "light" },
-    },
-  } as any,
-  entities: {
-    "light.living_room": {
-      entity_id: "light.living_room",
-      device_id: "device1",
-      area_id: "living_room",
-      labels: [],
-    },
-    "switch.kitchen": {
-      entity_id: "switch.kitchen",
-      device_id: "device2",
-      area_id: "kitchen",
-      labels: [],
-    },
-    "sensor.temperature": {
-      entity_id: "sensor.temperature",
-      device_id: "device3",
-      area_id: "living_room",
-      labels: [],
-    },
-    "binary_sensor.motion": {
-      entity_id: "binary_sensor.motion",
-      device_id: "device4",
-      area_id: "hallway",
-      labels: [],
-    },
-    "climate.thermostat": {
-      entity_id: "climate.thermostat",
-      device_id: "device5",
-      area_id: "living_room",
-      labels: [],
-    },
-    "media_player.tv": {
-      entity_id: "media_player.tv",
-      device_id: "device6",
-      area_id: "living_room",
-      labels: [],
-    },
-    "light.bedroom": {
-      entity_id: "light.bedroom",
-      device_id: "device7",
-      area_id: "bedroom",
-      labels: [],
-    },
-    "switch.basement": {
-      entity_id: "switch.basement",
-      device_id: "device8",
-      area_id: "basement",
-      labels: [],
-    },
-    "sensor.humidity": {
-      entity_id: "sensor.humidity",
-      device_id: "device9",
-      area_id: "living_room",
-      entity_category: "diagnostic",
-      labels: ["climate", "monitoring"],
-    },
-    "light.no_area": {
-      entity_id: "light.no_area",
-      device_id: "device10",
-      labels: [],
-    },
-  } as any,
-  devices: {
-    device1: { id: "device1", area_id: "living_room" },
-    device2: { id: "device2", area_id: "kitchen" },
-    device3: { id: "device3", area_id: "living_room" },
-    device4: { id: "device4", area_id: "hallway" },
-    device5: { id: "device5", area_id: "living_room" },
-    device6: { id: "device6", area_id: "living_room" },
-    device7: { id: "device7", area_id: "bedroom" },
-    device8: { id: "device8", area_id: "basement" },
-    device9: { id: "device9", area_id: "living_room" },
-    device10: { id: "device10" }, // no area_id
-  } as any,
-  areas: {
-    living_room: {
-      area_id: "living_room",
-      name: "Living Room",
-      floor_id: "main_floor",
-    },
-    kitchen: { area_id: "kitchen", name: "Kitchen", floor_id: "main_floor" },
-    bedroom: { area_id: "bedroom", name: "Bedroom", floor_id: "upper_floor" },
-    basement: {
-      area_id: "basement",
-      name: "Basement",
-      floor_id: "basement_floor",
-    },
-    hallway: { area_id: "hallway", name: "Hallway", floor_id: "main_floor" },
-  } as any,
-  floors: {
-    main_floor: { floor_id: "main_floor", name: "Main Floor" },
-    upper_floor: { floor_id: "upper_floor", name: "Upper Floor" },
-    basement_floor: { floor_id: "basement_floor", name: "Basement Floor" },
-  } as any,
-} as HomeAssistant;
-
-describe("generateEntityFilter", () => {
-  describe("domain filtering", () => {
-    it("should filter entities by single domain", () => {
-      const filter = generateEntityFilter(mockHass, { domain: "light" });
-
-      expect(filter("light.living_room")).toBe(true);
-      expect(filter("switch.kitchen")).toBe(false);
-    });
-
-    it("should filter entities by multiple domains", () => {
-      const filter = generateEntityFilter(mockHass, {
-        domain: ["light", "switch"],
-      });
-
-      expect(filter("light.living_room")).toBe(true);
-      expect(filter("switch.kitchen")).toBe(true);
-      // Non-existent entities return false
-      expect(filter("switch.fan")).toBe(false);
-      expect(filter("sensor.temperature")).toBe(false);
-    });
-
-    it("should handle domain as string vs array", () => {
-      const singleFilter = generateEntityFilter(mockHass, { domain: "sensor" });
-      const arrayFilter = generateEntityFilter(mockHass, {
-        domain: ["sensor"],
-      });
-
-      expect(singleFilter("sensor.temperature")).toBe(true);
-      expect(arrayFilter("sensor.temperature")).toBe(true);
-      expect(singleFilter("light.living_room")).toBe(false);
-      expect(arrayFilter("light.living_room")).toBe(false);
-    });
-  });
-
-  describe("device class filtering", () => {
-    it("should filter entities by single device class", () => {
-      const filter = generateEntityFilter(mockHass, {
-        device_class: "temperature",
-      });
-
-      expect(filter("sensor.temperature")).toBe(true);
-      expect(filter("sensor.humidity")).toBe(false);
-    });
-
-    it("should filter entities by multiple device classes", () => {
-      const filter = generateEntityFilter(mockHass, {
-        device_class: ["temperature", "humidity"],
-      });
-
-      expect(filter("sensor.temperature")).toBe(true);
-      expect(filter("sensor.humidity")).toBe(true);
-      expect(filter("light.living_room")).toBe(false);
-    });
-
-    it("should handle entities without device class", () => {
-      const filter = generateEntityFilter(mockHass, { device_class: "test" });
-
-      expect(filter("climate.thermostat")).toBe(false);
-      expect(filter("media_player.tv")).toBe(false);
-    });
-  });
-
-  describe("area filtering", () => {
-    it("should filter entities by single area", () => {
-      const filter = generateEntityFilter(mockHass, { area: "living_room" });
-
-      expect(filter("light.living_room")).toBe(true);
-      expect(filter("sensor.temperature")).toBe(true);
-      expect(filter("switch.kitchen")).toBe(false);
-    });
-
-    it("should filter entities by multiple areas", () => {
-      const filter = generateEntityFilter(mockHass, {
-        area: ["living_room", "kitchen"],
-      });
-
-      expect(filter("light.living_room")).toBe(true);
-      expect(filter("switch.kitchen")).toBe(true);
-      expect(filter("light.bedroom")).toBe(false);
-    });
-  });
-
-  describe("floor filtering", () => {
-    // NOTE: The current implementation has a bug where it checks `if (!floors)` instead of `if (!floors.has(floor.floor_id))`
-    // So floor filtering will never actually filter by floor - it only checks if the entity has a floor at all
-    it("should filter entities by floor (tests current buggy behavior)", () => {
-      const filter = generateEntityFilter(mockHass, { floor: "main_floor" });
-
-      // Due to bug, all entities with floors pass (not just main_floor)
-      expect(filter("light.living_room")).toBe(true); // has floor
-      expect(filter("switch.kitchen")).toBe(true); // has floor
-      expect(filter("binary_sensor.motion")).toBe(true); // has floor
-      expect(filter("light.bedroom")).toBe(false); // wrong floor
-      expect(filter("switch.basement")).toBe(false); // wrong floor
-
-      // Entities without floors should fail
-      expect(filter("light.no_area")).toBe(false); // no area = no floor
-    });
-
-    it("should handle multiple floors (tests current buggy behavior)", () => {
-      const filter = generateEntityFilter(mockHass, {
-        floor: ["main_floor", "upper_floor"],
-      });
-
-      expect(filter("light.living_room")).toBe(true);
-      expect(filter("light.bedroom")).toBe(true);
-      expect(filter("switch.basement")).toBe(false);
-
-      // Entities without floors should fail
-      expect(filter("light.no_area")).toBe(false);
-    });
-  });
-
-  describe("device filtering", () => {
-    it("should filter entities by single device", () => {
-      const filter = generateEntityFilter(mockHass, { device: "device1" });
-
-      expect(filter("light.living_room")).toBe(true);
-      expect(filter("switch.kitchen")).toBe(false);
-    });
-
-    it("should filter entities by multiple devices", () => {
-      const filter = generateEntityFilter(mockHass, {
-        device: ["device1", "device2"],
-      });
-
-      expect(filter("light.living_room")).toBe(true);
-      expect(filter("switch.kitchen")).toBe(true);
-      expect(filter("sensor.temperature")).toBe(false);
-    });
-  });
-
-  describe("entity category filtering", () => {
-    it("should filter entities by entity category", () => {
-      const filter = generateEntityFilter(mockHass, {
-        entity_category: "diagnostic",
-      });
-
-      expect(filter("sensor.humidity")).toBe(true);
-      expect(filter("sensor.temperature")).toBe(false);
-    });
-
-    it("should filter entities with no entity category", () => {
-      const filter = generateEntityFilter(mockHass, {
-        entity_category: "none",
-      });
-
-      expect(filter("light.living_room")).toBe(true);
-      expect(filter("sensor.humidity")).toBe(false);
-    });
-  });
-
-  describe("label filtering", () => {
-    it("should filter entities by single label", () => {
-      const filter = generateEntityFilter(mockHass, { label: "climate" });
-
-      expect(filter("sensor.humidity")).toBe(true);
-      expect(filter("sensor.temperature")).toBe(false);
-    });
-
-    it("should filter entities by multiple labels", () => {
-      const filter = generateEntityFilter(mockHass, {
-        label: ["climate", "monitoring"],
-      });
-
-      expect(filter("sensor.humidity")).toBe(true);
-      expect(filter("light.living_room")).toBe(false);
-    });
-  });
-
-  describe("combined filtering", () => {
-    it("should combine multiple filter criteria with AND logic", () => {
-      const filter = generateEntityFilter(mockHass, {
-        domain: "light",
-        area: "living_room",
-      });
-
-      expect(filter("light.living_room")).toBe(true);
-      expect(filter("light.bedroom")).toBe(false);
-      expect(filter("sensor.temperature")).toBe(false);
-    });
-
-    it("should handle complex combinations", () => {
-      const filter = generateEntityFilter(mockHass, {
-        domain: ["sensor", "light"],
-        area: "living_room",
-        device_class: ["temperature", "light"],
-      });
-
-      expect(filter("sensor.temperature")).toBe(true);
-      expect(filter("light.living_room")).toBe(true);
-      expect(filter("sensor.humidity")).toBe(false); // wrong device class
-      expect(filter("light.bedroom")).toBe(false); // wrong area
-    });
-  });
-
-  describe("empty filter criteria", () => {
-    it("should handle empty filter criteria", () => {
-      const filter = generateEntityFilter(mockHass, {});
-
-      // Empty filter should pass all entities that exist in hass.states
-      expect(filter("light.living_room")).toBe(true);
-      expect(filter("switch.kitchen")).toBe(true);
-      expect(filter("nonexistent.entity")).toBe(false);
-    });
-
-    it("should handle empty domain array", () => {
-      const filter = generateEntityFilter(mockHass, { domain: [] });
-
-      // Empty domain array means no entities should pass domain filter
-      expect(filter("light.living_room")).toBe(false);
-      expect(filter("switch.kitchen")).toBe(false);
-    });
-  });
-
-  describe("edge cases", () => {
-    it("should handle non-existent entities", () => {
-      const filter = generateEntityFilter(mockHass, { domain: "light" });
-
-      expect(filter("light.nonexistent")).toBe(false);
-      expect(filter("invalid_entity_id")).toBe(false);
-    });
-
-    it("should handle entities without device or area assignments", () => {
-      const filter = generateEntityFilter(mockHass, { area: "living_room" });
-
-      expect(filter("light.no_area")).toBe(false);
-    });
-
-    it("should handle entities with device but no area", () => {
-      const filter = generateEntityFilter(mockHass, { area: "living_room" });
-
-      // light.no_area has device10 which has no area_id
-      expect(filter("light.no_area")).toBe(false);
-    });
-  });
-});