Merge branch 'rc'

pyproject.toml

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

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

@@ -328,6 +328,7 @@ export class HaChartBase extends LitElement {
       backgroundColor: "transparent",
       textStyle: {
         color: style.getPropertyValue("--primary-text-color"),
+        fontFamily: "Roboto, Noto, sans-serif",
       },
       title: {
         textStyle: {

src/components/chart/state-history-chart-line.ts

@@ -222,14 +222,14 @@ export class StateHistoryChartLine extends LitElement {
           minYAxis = ({ min }) => Math.min(min, this.minYAxis!);
         }
       } else if (this.logarithmicScale) {
-        minYAxis = ({ min }) => (min > 0 ? min * 0.95 : min * 1.05);
+        minYAxis = ({ min }) => Math.floor(min > 0 ? min * 0.95 : min * 1.05);
       }
       if (typeof maxYAxis === "number") {
         if (this.fitYData) {
           maxYAxis = ({ max }) => Math.max(max, this.maxYAxis!);
         }
       } else if (this.logarithmicScale) {
-        maxYAxis = ({ max }) => (max > 0 ? max * 1.05 : max * 0.95);
+        maxYAxis = ({ max }) => Math.ceil(max > 0 ? max * 1.05 : max * 0.95);
       }
       this._chartOptions = {
         xAxis: {

src/components/chart/statistics-chart.ts

@@ -237,14 +237,14 @@ export class StatisticsChart extends LitElement {
         minYAxis = ({ min }) => Math.min(min, this.minYAxis!);
       }
     } else if (this.logarithmicScale) {
-      minYAxis = ({ min }) => (min > 0 ? min * 0.95 : min * 1.05);
+      minYAxis = ({ min }) => Math.floor(min > 0 ? min * 0.95 : min * 1.05);
     }
     if (typeof maxYAxis === "number") {
       if (this.fitYData) {
         maxYAxis = ({ max }) => Math.max(max, this.maxYAxis!);
       }
     } else if (this.logarithmicScale) {
-      maxYAxis = ({ max }) => (max > 0 ? max * 1.05 : max * 0.95);
+      maxYAxis = ({ max }) => Math.ceil(max > 0 ? max * 1.05 : max * 0.95);
     }
     const endTime = this.endTime ?? new Date();
     let startTime = this.startTime;
@@ -290,7 +290,6 @@ export class StatisticsChart extends LitElement {
           align: "left",
         },
         position: computeRTL(this.hass) ? "right" : "left",
-        // @ts-ignore
         scale: true,
         min: this._clampYAxis(minYAxis),
         max: this._clampYAxis(maxYAxis),

src/components/ha-network.ts

@@ -64,9 +64,13 @@ export class HaNetwork extends LitElement {
           >
           </ha-checkbox>
         </span>
-        <span slot="heading" data-for="auto_configure"> Auto Configure </span>
+        <span slot="heading" data-for="auto_configure">
+          ${this.hass.localize(
+            "ui.panel.config.network.adapter.auto_configure"
+          )}
+        </span>
         <span slot="description" data-for="auto_configure">
-          Detected:
+          ${this.hass.localize("ui.panel.config.network.adapter.detected")}:
           ${format_auto_detected_interfaces(this.networkConfig.adapters)}
         </span>
       </ha-settings-row>
@@ -85,18 +89,21 @@ export class HaNetwork extends LitElement {
                   </ha-checkbox>
                 </span>
                 <span slot="heading">
-                  Adapter: ${adapter.name}
+                  ${this.hass.localize(
+                    "ui.panel.config.network.adapter.adapter"
+                  )}:
+                  ${adapter.name}
                   ${adapter.default
                     ? html`<ha-svg-icon .path=${mdiStar}></ha-svg-icon>
-                        (Default)`
+                        (${this.hass.localize("ui.common.default")})`
-                    : ""}
+                    : nothing}
                 </span>
                 <span slot="description">
                   ${format_addresses([...adapter.ipv4, ...adapter.ipv6])}
                 </span>
               </ha-settings-row>`
           )
-        : ""}
+        : nothing}
     `;
   }
 

src/panels/config/areas/dialog-area-registry-detail.ts

@@ -329,6 +329,9 @@ class DialogAreaDetail extends LitElement {
     return [
       haStyleDialog,
       css`
+        ha-textfield {
+          display: block;
+        }
         ha-aliases-editor,
         ha-entity-picker,
         ha-floor-picker,

src/panels/lovelace/cards/energy/common/energy-chart-options.ts

@@ -72,7 +72,10 @@ export function getCommonOptions(
     yAxis: {
       type: "value",
       name: unit,
-      nameGap: 5,
+      nameGap: 2,
+      nameTextStyle: {
+        align: "left",
+      },
       axisLabel: {
         formatter: (value: number) => formatNumber(Math.abs(value), locale),
       },
@@ -81,10 +84,10 @@ export function getCommonOptions(
       },
     },
     grid: {
-      top: 35,
+      top: 15,
-      bottom: 10,
+      bottom: 0,
-      left: 10,
+      left: 1,
-      right: 10,
+      right: 1,
       containLabel: true,
     },
     tooltip: {
@@ -222,7 +225,7 @@ export function fillDataGapsAndRoundCaps(datasets: BarSeriesOption[]) {
       if (x === undefined) {
         continue;
       }
-      if (x !== bucket) {
+      if (Number(x) !== bucket) {
         datasets[i].data?.splice(index, 0, {
           value: [bucket, 0],
           itemStyle: {

src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts

@@ -193,9 +193,10 @@ export class HuiEnergyDevicesDetailGraphCard
           icon: "circle",
         },
         grid: {
+          top: 45,
           bottom: 0,
-          left: 5,
+          left: 1,
-          right: 5,
+          right: 1,
           containLabel: true,
         },
       };
@@ -446,9 +447,9 @@ export class HuiEnergyDevicesDetailGraphCard
         stack: compare ? "devicesCompare" : "devices",
       });
     });
-    return sorted_devices.map(
+    return sorted_devices
-      (device) => data.find((d) => (d.id as string).includes(device))!
+      .map((device) => data.find((d) => (d.id as string).includes(device))!)
-    );
+      .filter(Boolean);
   }
 
   static styles = css`

src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts

@@ -27,6 +27,7 @@ import { hasConfigChanged } from "../../common/has-changed";
 import type { ECOption } from "../../../../resources/echarts";
 import "../../../../components/ha-card";
 import { fireEvent } from "../../../../common/dom/fire_event";
+import { measureTextWidth } from "../../../../util/text";
 
 @customElement("hui-energy-devices-graph-card")
 export class HuiEnergyDevicesGraphCard
@@ -109,8 +110,11 @@ export class HuiEnergyDevicesGraphCard
     return `${title}${params.marker} ${params.seriesName}: ${value}`;
   }
 
-  private _createOptions = memoizeOne(
+  private _createOptions = memoizeOne((data: BarSeriesOption[]): ECOption => {
-    (data: BarSeriesOption[]): ECOption => ({
+    const isMobile = window.matchMedia(
+      "all and (max-width: 450px), all and (max-height: 500px)"
+    ).matches;
+    return {
       xAxis: {
         type: "value",
         name: "kWh",
@@ -124,6 +128,17 @@ export class HuiEnergyDevicesGraphCard
         axisLabel: {
           formatter: this._getDeviceName.bind(this),
           overflow: "truncate",
+          fontSize: 12,
+          margin: 5,
+          width: Math.min(
+            isMobile ? 100 : 200,
+            Math.max(
+              ...(data[0]?.data?.map(
+                (d: any) =>
+                  measureTextWidth(this._getDeviceName(d.value[1]), 12) + 5
+              ) || [])
+            )
+          ),
         },
       },
       grid: {
@@ -137,8 +152,8 @@ export class HuiEnergyDevicesGraphCard
         show: true,
         formatter: this._renderTooltip.bind(this),
       },
-    })
+    };
-  );
+  });
 
   private _getDeviceName(statisticId: string): string {
     return (

src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts

@@ -367,6 +367,7 @@ export class HuiEnergySolarGraphCard
             data.push({
               id: "forecast-" + source.stat_energy_from,
               type: "line",
+              stack: "forecast",
               name: this.hass.localize(
                 "ui.panel.lovelace.cards.energy.energy_solar_graph.forecast",
                 {

src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts

@@ -300,6 +300,8 @@ export class HuiEnergyUsageGraphCard
         type: "bar",
         stack: "usage",
         data: [],
+        // @ts-expect-error
+        order: 0,
       });
     }
 
@@ -315,6 +317,8 @@ export class HuiEnergyUsageGraphCard
       )
     );
 
+    // @ts-expect-error
+    datasets.sort((a, b) => a.order - b.order);
     fillDataGapsAndRoundCaps(datasets);
     this._chartData = datasets;
   }
@@ -482,7 +486,7 @@ export class HuiEnergyUsageGraphCard
       this._compareStart!
     );
 
-    Object.entries(combinedData).forEach(([type, sources]) => {
+    Object.entries(combinedData).forEach(([type, sources], idx) => {
       Object.entries(sources).forEach(([statId, source]) => {
         const points: BarSeriesOption["data"] = [];
         // Process chart data.
@@ -513,6 +517,13 @@ export class HuiEnergyUsageGraphCard
                   statId,
                   statisticsMetaData[statId]
                 ),
+          // @ts-expect-error
+          order:
+            type === "used_solar"
+              ? 1
+              : type === "to_battery"
+                ? Object.keys(combinedData).length
+                : idx + 2,
           barMaxWidth: 50,
           itemStyle: {
             borderColor: getEnergyColor(

src/translations/en.json

@@ -6122,7 +6122,12 @@
           },
           "network_adapter": "Network adapter",
           "network_adapter_info": "Configure which network adapters integrations will use. Currently this setting only affects multicast traffic. A restart is required for these settings to apply.",
-          "ip_information": "IP Information"
+          "ip_information": "IP Information",
+          "adapter": {
+            "auto_configure": "Auto configure",
+            "detected": "Detected",
+            "adapter": "Adapter"
+          }
         },
         "storage": {
           "caption": "Storage",

src/util/text.ts

@@ -10,7 +10,7 @@ let textMeasureCanvas: HTMLCanvasElement | undefined;
 export function measureTextWidth(
   text: string,
   fontSize: number,
-  fontFamily = "sans-serif"
+  fontFamily = "Roboto, Noto, sans-serif"
 ): number {
   if (!textMeasureCanvas) {
     textMeasureCanvas = document.createElement("canvas");