Merge branch 'dev' into picture-card-image

Author: DTekNOdev

gallery/src/pages/more-info/lawn-mower.markdown

@@ -0,0 +1,3 @@
+---
+title: Lawn mower
+---

gallery/src/pages/more-info/lawn-mower.ts

@@ -0,0 +1,98 @@
+import type { PropertyValues, TemplateResult } from "lit";
+import { html, LitElement } from "lit";
+import { customElement, property, query } from "lit/decorators";
+import "../../../../src/components/ha-card";
+import "../../../../src/dialogs/more-info/more-info-content";
+import type { MockHomeAssistant } from "../../../../src/fake_data/provide_hass";
+import { provideHass } from "../../../../src/fake_data/provide_hass";
+import "../../components/demo-more-infos";
+import { LawnMowerEntityFeature } from "../../../../src/data/lawn_mower";
+
+const ALL_FEATURES =
+  LawnMowerEntityFeature.START_MOWING +
+  LawnMowerEntityFeature.PAUSE +
+  LawnMowerEntityFeature.DOCK;
+
+const ENTITIES = [
+  {
+    entity_id: "lawn_mower.full_featured",
+    state: "docked",
+    attributes: {
+      friendly_name: "Full featured mower",
+      supported_features: ALL_FEATURES,
+    },
+  },
+  {
+    entity_id: "lawn_mower.mowing",
+    state: "mowing",
+    attributes: {
+      friendly_name: "Mowing",
+      supported_features: ALL_FEATURES,
+    },
+  },
+  {
+    entity_id: "lawn_mower.returning",
+    state: "returning",
+    attributes: {
+      friendly_name: "Returning",
+      supported_features:
+        LawnMowerEntityFeature.START_MOWING +
+        LawnMowerEntityFeature.PAUSE +
+        LawnMowerEntityFeature.DOCK,
+    },
+  },
+  {
+    entity_id: "lawn_mower.paused",
+    state: "paused",
+    attributes: {
+      friendly_name: "Paused",
+      supported_features: ALL_FEATURES,
+    },
+  },
+  {
+    entity_id: "lawn_mower.error",
+    state: "error",
+    attributes: {
+      friendly_name: "Error",
+      supported_features:
+        LawnMowerEntityFeature.START_MOWING + LawnMowerEntityFeature.DOCK,
+    },
+  },
+  {
+    entity_id: "lawn_mower.basic",
+    state: "docked",
+    attributes: {
+      friendly_name: "Basic mower",
+      supported_features: LawnMowerEntityFeature.START_MOWING,
+    },
+  },
+];
+
+@customElement("demo-more-info-lawn-mower")
+class DemoMoreInfoLawnMower extends LitElement {
+  @property({ attribute: false }) public hass!: MockHomeAssistant;
+
+  @query("demo-more-infos") private _demoRoot!: HTMLElement;
+
+  protected render(): TemplateResult {
+    return html`
+      <demo-more-infos
+        .hass=${this.hass}
+        .entities=${ENTITIES.map((ent) => ent.entity_id)}
+      ></demo-more-infos>
+    `;
+  }
+
+  protected firstUpdated(changedProperties: PropertyValues) {
+    super.firstUpdated(changedProperties);
+    const hass = provideHass(this._demoRoot);
+    hass.updateTranslations(null, "en");
+    hass.addEntities(ENTITIES);
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "demo-more-info-lawn-mower": DemoMoreInfoLawnMower;
+  }
+}

gallery/src/pages/more-info/vacuum.ts

@@ -8,18 +8,101 @@ import { provideHass } from "../../../../src/fake_data/provide_hass";
 import "../../components/demo-more-infos";
 import { VacuumEntityFeature } from "../../../../src/data/vacuum";
 
+const ALL_FEATURES =
+  VacuumEntityFeature.STATE +
+  VacuumEntityFeature.START +
+  VacuumEntityFeature.PAUSE +
+  VacuumEntityFeature.STOP +
+  VacuumEntityFeature.RETURN_HOME +
+  VacuumEntityFeature.FAN_SPEED +
+  VacuumEntityFeature.BATTERY +
+  VacuumEntityFeature.STATUS +
+  VacuumEntityFeature.LOCATE +
+  VacuumEntityFeature.CLEAN_SPOT +
+  VacuumEntityFeature.CLEAN_AREA;
+
 const ENTITIES = [
   {
-    entity_id: "vacuum.first_floor_vacuum",
+    entity_id: "vacuum.full_featured",
+    state: "docked",
+    attributes: {
+      friendly_name: "Full featured vacuum",
+      supported_features: ALL_FEATURES,
+      battery_level: 85,
+      battery_icon: "mdi:battery-80",
+      fan_speed: "balanced",
+      fan_speed_list: ["silent", "standard", "balanced", "turbo", "max"],
+      status: "Charged",
+    },
+  },
+  {
+    entity_id: "vacuum.cleaning_vacuum",
+    state: "cleaning",
+    attributes: {
+      friendly_name: "Cleaning vacuum",
+      supported_features: ALL_FEATURES,
+      battery_level: 62,
+      battery_icon: "mdi:battery-60",
+      fan_speed: "turbo",
+      fan_speed_list: ["silent", "standard", "balanced", "turbo", "max"],
+      status: "Cleaning bedroom",
+    },
+  },
+  {
+    entity_id: "vacuum.returning_vacuum",
+    state: "returning",
+    attributes: {
+      friendly_name: "Returning vacuum",
+      supported_features:
+        VacuumEntityFeature.STATE +
+        VacuumEntityFeature.START +
+        VacuumEntityFeature.PAUSE +
+        VacuumEntityFeature.STOP +
+        VacuumEntityFeature.RETURN_HOME +
+        VacuumEntityFeature.BATTERY,
+      battery_level: 23,
+      battery_icon: "mdi:battery-20",
+      status: "Returning to dock",
+    },
+  },
+  {
+    entity_id: "vacuum.error_vacuum",
+    state: "error",
+    attributes: {
+      friendly_name: "Error vacuum",
+      supported_features:
+        VacuumEntityFeature.STATE +
+        VacuumEntityFeature.START +
+        VacuumEntityFeature.STOP +
+        VacuumEntityFeature.RETURN_HOME +
+        VacuumEntityFeature.LOCATE,
+      status: "Stuck on obstacle",
+    },
+  },
+  {
+    entity_id: "vacuum.basic_vacuum",
     state: "docked",
     attributes: {
-      friendly_name: "First floor vacuum",
+      friendly_name: "Basic vacuum",
       supported_features:
         VacuumEntityFeature.START +
         VacuumEntityFeature.STOP +
         VacuumEntityFeature.RETURN_HOME,
     },
   },
+  {
+    entity_id: "vacuum.paused_vacuum",
+    state: "paused",
+    attributes: {
+      friendly_name: "Paused vacuum",
+      supported_features: ALL_FEATURES,
+      battery_level: 45,
+      battery_icon: "mdi:battery-40",
+      fan_speed: "standard",
+      fan_speed_list: ["silent", "standard", "balanced", "turbo", "max"],
+      status: "Paused",
+    },
+  },
 ];
 
 @customElement("demo-more-info-vacuum")

package.json

@@ -97,7 +97,7 @@
     "fuse.js": "7.3.0",
     "google-timezones-json": "1.2.0",
     "gulp-zopfli-green": "7.0.0",
-    "hls.js": "1.6.15",
+    "hls.js": "1.6.16",
     "home-assistant-js-websocket": "9.6.0",
     "idb-keyval": "6.2.2",
     "intl-messageformat": "11.2.0",
@@ -204,7 +204,7 @@
     "terser-webpack-plugin": "5.4.0",
     "ts-lit-plugin": "2.0.2",
     "typescript": "6.0.2",
-    "typescript-eslint": "8.58.1",
+    "typescript-eslint": "8.58.2",
     "vite-tsconfig-paths": "6.1.1",
     "vitest": "4.1.4",
     "webpack-stats-plugin": "1.1.3",

src/common/entity/state_active.ts

@@ -37,7 +37,7 @@ export function stateActive(stateObj: HassEntity, state?: string): boolean {
     case "person":
       return compareState !== "not_home";
     case "lawn_mower":
-      return ["mowing", "error"].includes(compareState);
+      return !["docked", "paused"].includes(compareState);
     case "lock":
       return compareState !== "locked";
     case "media_player":

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

@@ -79,6 +79,7 @@ export const computeInitialHaFormData = (
         "attribute" in selector ||
         "file" in selector ||
         "icon" in selector ||
+        "serial" in selector ||
         "template" in selector ||
         "text" in selector ||
         "theme" in selector ||

src/components/ha-gauge.ts

@@ -48,6 +48,16 @@ export class HaGauge extends LitElement {
 
   private _sortedLevels?: LevelDefinition[];
 
+  private _rescaleOnConnect = false;
+
+  public connectedCallback(): void {
+    super.connectedCallback();
+    if (this._rescaleOnConnect) {
+      this._rescaleSvg();
+      this._rescaleOnConnect = false;
+    }
+  }
+
   protected firstUpdated(changedProperties: PropertyValues) {
     super.firstUpdated(changedProperties);
     afterNextRender(() => {
@@ -212,6 +222,13 @@ export class HaGauge extends LitElement {
     // Set the viewbox of the SVG containing the value to perfectly
     // fit the text
     // That way it will auto-scale correctly
+
+    if (!this.isConnected) {
+      // Retry this later if we're disconnected, otherwise we get a 0 bbox and missing label
+      this._rescaleOnConnect = true;
+      return;
+    }
+
     const svgRoot = this.shadowRoot!.querySelector(".text")!;
     const box = svgRoot.querySelector("text")!.getBBox()!;
     svgRoot.setAttribute(

src/components/ha-icon.ts

@@ -39,6 +39,8 @@ const CUSTOM_ICONS: Record<string, () => Promise<string>> = {
     import("../resources/music-assistant-logo-svg").then(
       (mod) => mod.mdiMusicAssistant
     ),
+  esphome: () =>
+    import("../resources/esphome-logo-svg").then((mod) => mod.mdiEsphomeLogo),
 };
 
 @customElement("ha-icon")

src/components/ha-navigation-picker.ts

@@ -7,7 +7,10 @@ import { caseInsensitiveStringCompare } from "../common/string/compare";
 import { getConfigEntries, type ConfigEntry } from "../data/config_entries";
 import { fetchConfig } from "../data/lovelace/config/types";
 import { SYSTEM_PANELS } from "../data/panel";
-import { computeNavigationPathInfo } from "../data/compute-navigation-path-info";
+import {
+  CONFIG_SUB_ROUTES,
+  computeNavigationPathInfo,
+} from "../data/compute-navigation-path-info";
 import { findRelated, type RelatedResult } from "../data/search";
 import { PANEL_DASHBOARDS } from "../panels/config/lovelace/dashboards/ha-config-lovelace-dashboards";
 import { computeAreaPath } from "../panels/lovelace/strategies/areas/helpers/areas-strategy-helper";
@@ -335,6 +338,19 @@ export class HaNavigationPicker extends LitElement {
       });
     }
 
+    for (const [subPath, route] of Object.entries(CONFIG_SUB_ROUTES)) {
+      const path = `/config/${subPath}`;
+      const label = this.hass!.localize(route.translationKey) || subPath;
+      otherRoutes.push({
+        id: path,
+        primary: label,
+        secondary: path,
+        icon_path: route.iconPath,
+        sorting_label: createSortingLabel(label, path),
+        group: "other_routes",
+      });
+    }
+
     this._navigationGroups = {
       related,
       dashboards,

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

@@ -14,6 +14,8 @@ export class HaThemeSelector extends LitElement {
 
   @property() public label?: string;
 
+  @property() public helper?: string;
+
   @property({ type: Boolean, reflect: true }) public disabled = false;
 
   @property({ type: Boolean }) public required = true;
@@ -24,6 +26,7 @@ export class HaThemeSelector extends LitElement {
         .hass=${this.hass}
         .value=${this.value}
         .label=${this.label}
+        .helper=${this.helper}
         .includeDefault=${this.selector.theme?.include_default}
         .disabled=${this.disabled}
         .required=${this.required}