Compare commits

...

27 Commits

Author SHA1 Message Date
Paul Bottein
0336ce4606 20250926.0 (#27213) 2025-09-26 15:39:29 +02:00
Paul Bottein
9ba36ab7e2 Bumped version to 20250926.0 2025-09-26 15:38:51 +02:00
Paul Bottein
fe7a08a1b0 Don't display negative durations in media player more info (#27212)
Don't display negative value in media player more info
2025-09-26 15:38:21 +02:00
Paul Bottein
87a8f9cedc Fix slider ticks support for number selector (#27211) 2025-09-26 15:38:21 +02:00
Paul Bottein
01df7e20ca Fix try tts dialog max width (#27208) 2025-09-26 15:38:20 +02:00
Jan-Philipp Benecke
d181219522 Refactor media player slider to use slot for position and duration display (#27205)
* Refactor media player slider to use slot for position and duration display

* Fix variable naming
2025-09-26 15:38:19 +02:00
karwosts
6ae24b8135 Add validation issues to energy diagnostic (#27203) 2025-09-26 15:38:18 +02:00
karwosts
8e009f24f9 Add dropdown mode to water heater operation feature (#27201) 2025-09-26 15:38:17 +02:00
Simon Lamon
53031f44ac Fix typos in media player more info (#27198) 2025-09-26 15:38:16 +02:00
Jan-Philipp Benecke
af5a988457 Round seconds in media player more info before formatting (#27196) 2025-09-26 15:38:15 +02:00
Paul Bottein
bab0391a19 20250925.1 (#27191) 2025-09-25 17:57:22 +02:00
Paul Bottein
444123c47e Bumped version to 20250925.1 2025-09-25 17:56:13 +02:00
Paul Bottein
f123d34046 Revert "Update dependency @types/chromecast-caf-receiver to v6.0.24" (#27188) 2025-09-25 17:53:59 +02:00
Paul Bottein
1b40f99f68 Fix storage bar not displayed (#27183) 2025-09-25 17:50:52 +02:00
Paul Bottein
b314b3ed2b Fix analytics switches (#27181) 2025-09-25 17:50:51 +02:00
Paul Bottein
59b8932969 Add icon option to common controls section strategy (#27180) 2025-09-25 17:50:50 +02:00
Wendelin
107af753ec Reduce default tab padding in tab-group (#27173) 2025-09-25 17:50:49 +02:00
Paul Bottein
1f0acb3046 Disabled config badge (#27172)
* Add disabled option for badge

* Add disabled to struct
2025-09-25 17:50:48 +02:00
Paul Bottein
431e533929 20250925.0 (#27170) 2025-09-25 10:48:30 +02:00
Paul Bottein
02c845cbc6 Bumped version to 20250925.0 2025-09-25 10:47:41 +02:00
Paul Bottein
628111ed20 Bumped version to 20250924.1 2025-09-25 10:46:44 +02:00
Paul Bottein
e825a9c02f Smooth animation of the sidebar resizing handle (#27166) 2025-09-25 10:46:36 +02:00
Paul Bottein
7a35bddf36 Fix safe padding for bottom sheet and add scroll lock (#27165) 2025-09-25 10:46:35 +02:00
Norbert Rittel
ad69270af8 Use "Add (person)" instead of "New person" / "Create" (#27161)
* Update dialog-person-detail.ts

* Update en.json
2025-09-25 10:46:34 +02:00
Paulus Schoutsen
404edf9483 Avoid invalid entities in common controls (#27158) 2025-09-25 10:46:33 +02:00
Paul Bottein
a166b4e9b6 Do not show error message when action has no response in dev tools (#27156) 2025-09-25 10:46:32 +02:00
Paul Bottein
7a285f11db 20250924.0 (#27155) 2025-09-24 17:15:37 +02:00
27 changed files with 229 additions and 108 deletions

View File

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

View File

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

View File

@@ -161,7 +161,7 @@
"@rspack/core": "1.5.5", "@rspack/core": "1.5.5",
"@rspack/dev-server": "1.1.4", "@rspack/dev-server": "1.1.4",
"@types/babel__plugin-transform-runtime": "7.9.5", "@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/chromecast-caf-sender": "1.0.11",
"@types/color-name": "2.0.0", "@types/color-name": "2.0.0",
"@types/culori": "4.0.1", "@types/culori": "4.0.1",

View File

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

View File

@@ -1,5 +1,5 @@
import type { CSSResultGroup, TemplateResult } from "lit"; import type { CSSResultGroup, TemplateResult } from "lit";
import { css, html, LitElement } from "lit"; import { css, html, LitElement, nothing } from "lit";
import { customElement, property } from "lit/decorators"; import { customElement, property } from "lit/decorators";
import { fireEvent } from "../common/dom/fire_event"; import { fireEvent } from "../common/dom/fire_event";
import type { LocalizeFunc } from "../common/translations/localize"; import type { LocalizeFunc } from "../common/translations/localize";
@@ -73,14 +73,18 @@ export class HaAnalytics extends LitElement {
.checked=${this.analytics?.preferences[preference]} .checked=${this.analytics?.preferences[preference]}
.preference=${preference} .preference=${preference}
name=${preference} name=${preference}
?disabled=${baseEnabled}
> >
</ha-switch> </ha-switch>
<ha-tooltip .for="switch-${preference}" placement="right"> ${baseEnabled
${this.localize( ? nothing
`ui.panel.${this.translationKeyPanel}.analytics.need_base_enabled` : html`<ha-tooltip
)} .for="switch-${preference}"
</ha-tooltip> placement="right"
>
${this.localize(
`ui.panel.${this.translationKeyPanel}.analytics.need_base_enabled`
)}
</ha-tooltip>`}
</span> </span>
</ha-settings-row> </ha-settings-row>
` `

View File

@@ -54,9 +54,9 @@ export class HaBottomSheet extends LitElement {
border-top-left-radius: var(--ha-border-radius-lg); border-top-left-radius: var(--ha-border-radius-lg);
border-top-right-radius: var(--ha-border-radius-lg); border-top-right-radius: var(--ha-border-radius-lg);
max-height: 90vh; max-height: 90vh;
margin-bottom: var(--safe-area-inset-bottom); padding-bottom: var(--safe-area-inset-bottom);
margin-left: var(--safe-area-inset-left); padding-left: var(--safe-area-inset-left);
margin-right: var(--safe-area-inset-right); padding-right: var(--safe-area-inset-right);
} }
`; `;
} }

View File

@@ -39,22 +39,24 @@ class HaSegmentedBar extends LitElement {
<slot name="extra"></slot> <slot name="extra"></slot>
</div> </div>
<div class="bar"> <div class="bar">
${this.segments.map((segment) => { ${this.segments.map(
const bar = html`<div (segment, index) => html`
style=${styleMap({ ${this.hideTooltip || !segment.label
width: `${(segment.value / totalValue) * 100}%`, ? nothing
backgroundColor: segment.color, : html`
})} <ha-tooltip for="segment-${index}" placement="top">
></div>`; ${segment.label}
return this.hideTooltip && !segment.label </ha-tooltip>
? bar `}
: html` <div
<ha-tooltip> id="segment-${index}"
<span slot="content">${segment.label}</span> style=${styleMap({
${bar} width: `${(segment.value / totalValue) * 100}%`,
</ha-tooltip> backgroundColor: segment.color,
`; })}
})} ></div>
`
)}
</div> </div>
${this.hideLegend ${this.hideLegend
? nothing ? nothing

View File

@@ -82,12 +82,12 @@ export class HaNumberSelector extends LitElement {
labeled labeled
.min=${this.selector.number!.min} .min=${this.selector.number!.min}
.max=${this.selector.number!.max} .max=${this.selector.number!.max}
.value=${this.value ?? ""} .value=${this.value}
.step=${sliderStep} .step=${sliderStep}
.disabled=${this.disabled} .disabled=${this.disabled}
.required=${this.required} .required=${this.required}
@change=${this._handleSliderChange} @change=${this._handleSliderChange}
.ticks=${this.selector.number?.slider_ticks} .withMarkers=${this.selector.number?.slider_ticks || false}
> >
</ha-slider> </ha-slider>
` `

View File

@@ -18,6 +18,8 @@ export class HaTabGroupTab extends Tab {
opacity: 0.8; opacity: 0.8;
color: inherit; color: inherit;
--wa-space-l: 16px;
} }
:host([active]:not([disabled])) { :host([active]:not([disabled])) {

View File

@@ -4,6 +4,7 @@ export interface LovelaceBadgeConfig {
type: string; type: string;
[key: string]: any; [key: string]: any;
visibility?: Condition[]; visibility?: Condition[];
disabled?: boolean;
} }
export const ensureBadgeConfig = ( export const ensureBadgeConfig = (

View File

@@ -4,7 +4,7 @@ import type { Action } from "./script";
export const callExecuteScript = ( export const callExecuteScript = (
hass: HomeAssistant, hass: HomeAssistant,
sequence: Action | Action[] sequence: Action | Action[]
): Promise<{ context: Context; response: Record<string, any> }> => ): Promise<{ context: Context; response: Record<string, any> | null }> =>
hass.callWS({ hass.callWS({
type: "execute_script", type: "execute_script",
sequence, sequence,

View File

@@ -48,10 +48,10 @@ class MoreInfoMediaPlayer extends LitElement {
@property({ attribute: false }) public stateObj?: MediaPlayerEntity; @property({ attribute: false }) public stateObj?: MediaPlayerEntity;
private _formateDuration(duration: number) { private _formatDuration(duration: number) {
const hours = Math.floor(duration / 3600); const hours = Math.floor(duration / 3600);
const minutes = Math.floor((duration % 3600) / 60); const minutes = Math.floor((duration % 3600) / 60);
const seconds = duration % 60; const seconds = Math.floor(duration % 60);
return formatDurationDigital(this.hass.locale, { return formatDurationDigital(this.hass.locale, {
hours, hours,
minutes, minutes,
@@ -260,12 +260,12 @@ class MoreInfoMediaPlayer extends LitElement {
const controls = computeMediaControls(stateObj, true); const controls = computeMediaControls(stateObj, true);
const coverUrl = stateObj.attributes.entity_picture || ""; const coverUrl = stateObj.attributes.entity_picture || "";
const playerObj = new HassMediaPlayerEntity(this.hass, this.stateObj); const playerObj = new HassMediaPlayerEntity(this.hass, this.stateObj);
const position = Math.floor(playerObj.currentProgress) || 0;
const duration = stateObj.attributes.media_duration || 0; const position = Math.max(Math.floor(playerObj.currentProgress || 0), 0);
const remaining = duration - position; const duration = Math.max(stateObj.attributes.media_duration || 0, 0);
const durationFormated = const remaining = Math.max(duration - position, 0);
remaining > 0 ? this._formateDuration(remaining) : 0; const remainingFormatted = this._formatDuration(remaining);
const postionFormated = this._formateDuration(position); const positionFormatted = this._formatDuration(position);
const primaryTitle = playerObj.primaryTitle; const primaryTitle = playerObj.primaryTitle;
const secondaryTitle = playerObj.secondaryTitle; const secondaryTitle = playerObj.secondaryTitle;
const turnOn = controls?.find((c) => c.action === "turn_on"); const turnOn = controls?.find((c) => c.action === "turn_on");
@@ -323,11 +323,10 @@ class MoreInfoMediaPlayer extends LitElement {
@change=${this._handleMediaSeekChanged} @change=${this._handleMediaSeekChanged}
?disabled=${!stateActive(stateObj) || ?disabled=${!stateActive(stateObj) ||
!supportsFeature(stateObj, MediaPlayerEntityFeature.SEEK)} !supportsFeature(stateObj, MediaPlayerEntityFeature.SEEK)}
></ha-slider> >
<div class="position-info-row"> <span slot="reference">${positionFormatted}</span>
<span class="position-time">${postionFormated}</span> <span slot="reference">${remainingFormatted}</span>
<span class="duration-time">${durationFormated}</span> </ha-slider>
</div>
</div> </div>
` `
: nothing} : nothing}
@@ -548,13 +547,8 @@ class MoreInfoMediaPlayer extends LitElement {
flex-direction: column; flex-direction: column;
} }
.position-info-row { .position-bar ha-slider::part(references) {
display: flex;
flex-direction: row;
justify-content: space-between;
color: var(--secondary-text-color); color: var(--secondary-text-color);
padding: 0 8px;
font-size: var(--ha-font-size-s);
} }
.media-info-row { .media-info-row {

View File

@@ -8,6 +8,7 @@ import { createCloseHeading } from "../../components/ha-dialog";
import "../../components/ha-textarea"; import "../../components/ha-textarea";
import type { HaTextArea } from "../../components/ha-textarea"; import type { HaTextArea } from "../../components/ha-textarea";
import { convertTextToSpeech } from "../../data/tts"; import { convertTextToSpeech } from "../../data/tts";
import { haStyleDialog } from "../../resources/styles";
import type { HomeAssistant } from "../../types"; import type { HomeAssistant } from "../../types";
import { showAlertDialog } from "../generic/show-dialog-box"; import { showAlertDialog } from "../generic/show-dialog-box";
import type { TTSTryDialogParams } from "./show-dialog-tts-try"; import type { TTSTryDialogParams } from "./show-dialog-tts-try";
@@ -149,21 +150,24 @@ export class TTSTryDialog extends LitElement {
}); });
} }
static styles = css` static styles = [
ha-dialog { haStyleDialog,
--mdc-dialog-max-width: 500px; css`
} ha-dialog {
ha-textarea, --mdc-dialog-max-width: 500px;
ha-select { }
width: 100%; ha-textarea,
} ha-select {
ha-select { width: 100%;
margin-top: 8px; }
} ha-select {
.loading { margin-top: 8px;
height: 36px; }
} .loading {
`; height: 36px;
}
`,
];
} }
declare global { declare global {

View File

@@ -171,7 +171,7 @@ export default class HaAutomationSidebar extends LitElement {
@mousedown=${this._handleMouseDown} @mousedown=${this._handleMouseDown}
@touchstart=${this._handleMouseDown} @touchstart=${this._handleMouseDown}
> >
${this._resizing ? html`<div class="indicator"></div>` : nothing} <div class="indicator ${this._resizing ? "" : "hidden"}"></div>
</div> </div>
${this._renderContent()} ${this._renderContent()}
`; `;
@@ -333,6 +333,15 @@ export default class HaAutomationSidebar extends LitElement {
height: 100%; height: 100%;
width: 4px; width: 4px;
border-radius: var(--ha-border-radius-pill); border-radius: var(--ha-border-radius-pill);
transform: scale3d(1, 1, 1);
opacity: 1;
transition:
transform 180ms ease-in-out,
opacity 180ms ease-in-out;
}
.handle .indicator.hidden {
transform: scale3d(0, 1, 1);
opacity: 0;
} }
`; `;
} }

View File

@@ -213,6 +213,7 @@ class HaConfigEnergy extends LitElement {
this.hass.states[key], this.hass.states[key],
]) ])
), ),
issues: this._validationResult,
}; };
const json = JSON.stringify(data, null, 2); const json = JSON.stringify(data, null, 2);
const blob = new Blob([json], { type: "application/json" }); const blob = new Blob([json], { type: "application/json" });

View File

@@ -260,7 +260,7 @@ class DialogPersonDetail extends LitElement implements HassDialog {
> >
${this._params.entry ${this._params.entry
? this.hass!.localize("ui.common.save") ? this.hass!.localize("ui.common.save")
: this.hass!.localize("ui.panel.config.person.detail.create")} : this.hass!.localize("ui.common.add")}
</ha-button> </ha-button>
</ha-dialog> </ha-dialog>
`; `;

View File

@@ -51,7 +51,7 @@ class HaPanelDevAction extends LitElement {
@state() private _response?: { @state() private _response?: {
domain: string; domain: string;
service: string; service: string;
result: Record<string, any>; result: Record<string, any> | null;
media?: Promise<TemplateResult | typeof nothing>; media?: Promise<TemplateResult | typeof nothing>;
}; };
@@ -205,7 +205,7 @@ class HaPanelDevAction extends LitElement {
</ha-progress-button> </ha-progress-button>
</div> </div>
</div> </div>
${this._response ${this._response?.result
? html`<div class="content response"> ? html`<div class="content response">
<ha-card <ha-card
.header=${this.hass.localize( .header=${this.hass.localize(
@@ -491,7 +491,7 @@ class HaPanelDevAction extends LitElement {
service, service,
result, result,
media: media:
"media_source_id" in result result && "media_source_id" in result
? resolveMediaSource(this.hass, result.media_source_id).then( ? resolveMediaSource(this.hass, result.media_source_id).then(
(resolved) => (resolved) =>
resolved.mime_type.startsWith("image/") resolved.mime_type.startsWith("image/")

View File

@@ -161,7 +161,7 @@ export class HuiBadge extends ReactiveElement {
); );
} }
private _updateVisibility(forceVisible?: boolean) { private _updateVisibility(ignoreConditions?: boolean) {
if (!this._element || !this.hass) { if (!this._element || !this.hass) {
return; return;
} }
@@ -171,9 +171,18 @@ export class HuiBadge extends ReactiveElement {
return; return;
} }
if (this.preview) {
this._setElementVisibility(true);
return;
}
if (this.config?.disabled) {
this._setElementVisibility(false);
return;
}
const visible = const visible =
forceVisible || ignoreConditions ||
this.preview ||
!this.config?.visibility || !this.config?.visibility ||
checkConditionsMet(this.config.visibility, this.hass); checkConditionsMet(this.config.visibility, this.hass);
this._setElementVisibility(visible); this._setElementVisibility(visible);

View File

@@ -1,30 +1,32 @@
import { mdiWaterBoiler } from "@mdi/js";
import type { PropertyValues, TemplateResult } from "lit"; import type { PropertyValues, TemplateResult } from "lit";
import { html, LitElement } from "lit"; import { html, LitElement } from "lit";
import { customElement, property, state } from "lit/decorators"; import { customElement, property, query, state } from "lit/decorators";
import { styleMap } from "lit/directives/style-map"; import { styleMap } from "lit/directives/style-map";
import { stopPropagation } from "../../../common/dom/stop_propagation";
import { computeDomain } from "../../../common/entity/compute_domain"; import { computeDomain } from "../../../common/entity/compute_domain";
import { stateColorCss } from "../../../common/entity/state_color"; import { stateColorCss } from "../../../common/entity/state_color";
import "../../../components/ha-control-button";
import "../../../components/ha-control-button-group";
import "../../../components/ha-control-select"; import "../../../components/ha-control-select";
import type { ControlSelectOption } from "../../../components/ha-control-select"; import type { ControlSelectOption } from "../../../components/ha-control-select";
import "../../../components/ha-control-slider"; import "../../../components/ha-control-select-menu";
import { UNAVAILABLE } from "../../../data/entity"; import type { HaControlSelectMenu } from "../../../components/ha-control-select-menu";
import "../../../components/ha-list-item";
import type { import type {
OperationMode, OperationMode,
WaterHeaterEntity, WaterHeaterEntity,
} from "../../../data/water_heater"; } from "../../../data/water_heater";
import { import {
compareWaterHeaterOperationMode,
computeOperationModeIcon, computeOperationModeIcon,
compareWaterHeaterOperationMode,
} from "../../../data/water_heater"; } from "../../../data/water_heater";
import { UNAVAILABLE } from "../../../data/entity";
import type { HomeAssistant } from "../../../types"; import type { HomeAssistant } from "../../../types";
import type { LovelaceCardFeature, LovelaceCardFeatureEditor } from "../types"; import type { LovelaceCardFeature, LovelaceCardFeatureEditor } from "../types";
import { cardFeatureStyles } from "./common/card-feature-styles"; import { cardFeatureStyles } from "./common/card-feature-styles";
import { filterModes } from "./common/filter-modes"; import { filterModes } from "./common/filter-modes";
import type { import type {
LovelaceCardFeatureContext,
WaterHeaterOperationModesCardFeatureConfig, WaterHeaterOperationModesCardFeatureConfig,
LovelaceCardFeatureContext,
} from "./types"; } from "./types";
export const supportsWaterHeaterOperationModesCardFeature = ( export const supportsWaterHeaterOperationModesCardFeature = (
@@ -52,6 +54,9 @@ class HuiWaterHeaterOperationModeCardFeature
@state() _currentOperationMode?: OperationMode; @state() _currentOperationMode?: OperationMode;
@query("ha-control-select-menu", true)
private _haSelect?: HaControlSelectMenu;
private get _stateObj() { private get _stateObj() {
if (!this.hass || !this.context || !this.context.entity_id) { if (!this.hass || !this.context || !this.context.entity_id) {
return undefined; return undefined;
@@ -97,8 +102,23 @@ class HuiWaterHeaterOperationModeCardFeature
} }
} }
protected updated(changedProps: PropertyValues) {
super.updated(changedProps);
if (this._haSelect && changedProps.has("hass")) {
const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
if (
this.hass &&
this.hass.formatEntityAttributeValue !==
oldHass?.formatEntityAttributeValue
) {
this._haSelect.layoutOptions();
}
}
}
private async _valueChanged(ev: CustomEvent) { private async _valueChanged(ev: CustomEvent) {
const mode = (ev.detail as any).value as OperationMode; const mode =
(ev.detail as any).value ?? ((ev.target as any).value as OperationMode);
if (mode === this._stateObj!.state) return; if (mode === this._stateObj!.state) return;
@@ -143,9 +163,48 @@ class HuiWaterHeaterOperationModeCardFeature
).map<ControlSelectOption>((mode) => ({ ).map<ControlSelectOption>((mode) => ({
value: mode, value: mode,
label: this.hass!.formatEntityState(this._stateObj!, mode), label: this.hass!.formatEntityState(this._stateObj!, mode),
path: computeOperationModeIcon(mode as OperationMode), icon: html`
<ha-svg-icon
slot="graphic"
.path=${computeOperationModeIcon(mode as OperationMode)}
></ha-svg-icon>
`,
})); }));
if (this._config.style === "dropdown") {
return html`
<ha-control-select-menu
show-arrow
hide-label
.label=${this.hass.localize("ui.card.water_heater.mode")}
.value=${this._currentOperationMode}
.disabled=${this._stateObj.state === UNAVAILABLE}
fixedMenuPosition
naturalMenuWidth
@selected=${this._valueChanged}
@closed=${stopPropagation}
>
${this._currentOperationMode
? html`
<ha-svg-icon
slot="icon"
.path=${computeOperationModeIcon(this._currentOperationMode)}
></ha-svg-icon>
`
: html`
<ha-svg-icon slot="icon" .path=${mdiWaterBoiler}></ha-svg-icon>
`}
${options.map(
(option) => html`
<ha-list-item .value=${option.value} graphic="icon">
${option.icon}${option.label}
</ha-list-item>
`
)}
</ha-control-select-menu>
`;
}
return html` return html`
<ha-control-select <ha-control-select
.options=${options} .options=${options}

View File

@@ -140,6 +140,7 @@ export interface ToggleCardFeatureConfig {
export interface WaterHeaterOperationModesCardFeatureConfig { export interface WaterHeaterOperationModesCardFeatureConfig {
type: "water-heater-operation-modes"; type: "water-heater-operation-modes";
style?: "dropdown" | "icons";
operation_modes?: OperationMode[]; operation_modes?: OperationMode[];
} }

View File

@@ -16,6 +16,7 @@ import type {
} from "../../card-features/types"; } from "../../card-features/types";
import type { LovelaceCardFeatureEditor } from "../../types"; import type { LovelaceCardFeatureEditor } from "../../types";
import { compareWaterHeaterOperationMode } from "../../../../data/water_heater"; import { compareWaterHeaterOperationMode } from "../../../../data/water_heater";
import type { LocalizeFunc } from "../../../../common/translations/localize";
type WaterHeaterOperationModesCardFeatureData = type WaterHeaterOperationModesCardFeatureData =
WaterHeaterOperationModesCardFeatureConfig & { WaterHeaterOperationModesCardFeatureConfig & {
@@ -39,11 +40,27 @@ export class HuiWaterHeaterOperationModesCardFeatureEditor
private _schema = memoizeOne( private _schema = memoizeOne(
( (
localize: LocalizeFunc,
formatEntityState: FormatEntityStateFunc, formatEntityState: FormatEntityStateFunc,
stateObj: HassEntity | undefined, stateObj: HassEntity | undefined,
customizeModes: boolean customizeModes: boolean
) => ) =>
[ [
{
name: "style",
selector: {
select: {
multiple: false,
mode: "list",
options: ["dropdown", "icons"].map((mode) => ({
value: mode,
label: localize(
`ui.panel.lovelace.editor.features.types.water-heater-operation-modes.style_list.${mode}`
),
})),
},
},
},
{ {
name: "customize_modes", name: "customize_modes",
selector: { selector: {
@@ -85,11 +102,13 @@ export class HuiWaterHeaterOperationModesCardFeatureEditor
: undefined; : undefined;
const data: WaterHeaterOperationModesCardFeatureData = { const data: WaterHeaterOperationModesCardFeatureData = {
style: "icons",
...this._config, ...this._config,
customize_modes: this._config.operation_modes !== undefined, customize_modes: this._config.operation_modes !== undefined,
}; };
const schema = this._schema( const schema = this._schema(
this.hass.localize,
this.hass.formatEntityState, this.hass.formatEntityState,
stateObj, stateObj,
data.customize_modes data.customize_modes
@@ -131,6 +150,7 @@ export class HuiWaterHeaterOperationModesCardFeatureEditor
) => { ) => {
switch (schema.name) { switch (schema.name) {
case "operation_modes": case "operation_modes":
case "style":
case "customize_modes": case "customize_modes":
return this.hass!.localize( return this.hass!.localize(
`ui.panel.lovelace.editor.features.types.water-heater-operation-modes.${schema.name}` `ui.panel.lovelace.editor.features.types.water-heater-operation-modes.${schema.name}`

View File

@@ -1,6 +1,7 @@
import { object, string, any } from "superstruct"; import { object, string, any, optional, boolean } from "superstruct";
export const baseLovelaceBadgeConfig = object({ export const baseLovelaceBadgeConfig = object({
type: string(), type: string(),
visibility: any(), visibility: any(),
disabled: optional(boolean()),
}); });

View File

@@ -1,4 +1,4 @@
import { object, string, any } from "superstruct"; import { object, string, any, optional, boolean } from "superstruct";
export const baseLovelaceCardConfig = object({ export const baseLovelaceCardConfig = object({
type: string(), type: string(),
@@ -6,4 +6,5 @@ export const baseLovelaceCardConfig = object({
layout_options: any(), layout_options: any(),
grid_options: any(), grid_options: any(),
visibility: any(), visibility: any(),
disabled: optional(boolean()),
}); });

View File

@@ -4,13 +4,14 @@ import { isComponentLoaded } from "../../../../common/config/is_component_loaded
import type { LovelaceSectionConfig } from "../../../../data/lovelace/config/section"; import type { LovelaceSectionConfig } from "../../../../data/lovelace/config/section";
import { getCommonControlUsagePrediction } from "../../../../data/usage_prediction"; import { getCommonControlUsagePrediction } from "../../../../data/usage_prediction";
import type { HomeAssistant } from "../../../../types"; import type { HomeAssistant } from "../../../../types";
import type { TileCardConfig } from "../../cards/types"; import type { HeadingCardConfig, TileCardConfig } from "../../cards/types";
const DEFAULT_LIMIT = 8; const DEFAULT_LIMIT = 8;
export interface CommonControlSectionStrategyConfig { export interface CommonControlSectionStrategyConfig {
type: "common-controls"; type: "common-controls";
title?: string; title?: string;
icon?: string;
limit?: number; limit?: number;
exclude_entities?: string[]; exclude_entities?: string[];
hide_empty?: boolean; hide_empty?: boolean;
@@ -31,7 +32,8 @@ export class CommonControlsSectionStrategy extends ReactiveElement {
section.cards?.push({ section.cards?.push({
type: "heading", type: "heading",
heading: config.title, heading: config.title,
}); icon: config.icon,
} satisfies HeadingCardConfig);
} }
if (!isComponentLoaded(hass, "usage_prediction")) { if (!isComponentLoaded(hass, "usage_prediction")) {
@@ -46,7 +48,9 @@ export class CommonControlsSectionStrategy extends ReactiveElement {
} }
const predictedCommonControl = await getCommonControlUsagePrediction(hass); const predictedCommonControl = await getCommonControlUsagePrediction(hass);
let predictedEntities = predictedCommonControl.entities; let predictedEntities = predictedCommonControl.entities.filter(
(entity) => entity in hass.states
);
if (config.exclude_entities) { if (config.exclude_entities) {
predictedEntities = predictedEntities.filter( predictedEntities = predictedEntities.filter(

View File

@@ -1,3 +1,4 @@
import scrollLockStyles from "@home-assistant/webawesome/dist/styles/utilities/scroll-lock.css.js";
import { css } from "lit"; import { css } from "lit";
import { extractDerivedVars } from "../../common/style/derived-css-vars"; import { extractDerivedVars } from "../../common/style/derived-css-vars";
@@ -18,6 +19,8 @@ export const waMainStyles = css`
--wa-border-width-l: var(--ha-border-radius-l); --wa-border-width-l: var(--ha-border-radius-l);
--wa-space-xl: 32px; --wa-space-xl: 32px;
} }
${scrollLockStyles}
`; `;
export const waMainDerivedVariables = extractDerivedVars(waMainStyles); export const waMainDerivedVariables = extractDerivedVars(waMainStyles);

View File

@@ -5365,7 +5365,7 @@
"person_not_found_title": "Person not found", "person_not_found_title": "Person not found",
"person_not_found": "We couldn't find the person you were trying to edit.", "person_not_found": "We couldn't find the person you were trying to edit.",
"detail": { "detail": {
"new_person": "New person", "new_person": "Add person",
"name": "Name", "name": "Name",
"name_error_msg": "Name is required", "name_error_msg": "Name is required",
"linked_user": "Linked user", "linked_user": "Linked user",
@@ -5376,7 +5376,6 @@
"device_tracker_picked": "Track device", "device_tracker_picked": "Track device",
"device_tracker_pick": "Pick device to track", "device_tracker_pick": "Pick device to track",
"delete": "Delete", "delete": "Delete",
"create": "Create",
"update": "Update", "update": "Update",
"confirm_delete_user_title": "Delete user account", "confirm_delete_user_title": "Delete user account",
"confirm_delete_user_text": "The user account for ''{name}'' will be permanently deleted. You can still track the user, but the person will no longer be able to log in.", "confirm_delete_user_text": "The user account for ''{name}'' will be permanently deleted. You can still track the user, but the person will no longer be able to log in.",
@@ -8218,7 +8217,12 @@
"water-heater-operation-modes": { "water-heater-operation-modes": {
"label": "Water heater operation modes", "label": "Water heater operation modes",
"operation_modes": "Operation modes", "operation_modes": "Operation modes",
"customize_modes": "Customize operation modes" "customize_modes": "Customize operation modes",
"style": "[%key:ui::panel::lovelace::editor::features::types::climate-preset-modes::style%]",
"style_list": {
"dropdown": "[%key:ui::panel::lovelace::editor::features::types::climate-preset-modes::style_list::dropdown%]",
"icons": "[%key:ui::panel::lovelace::editor::features::types::climate-preset-modes::style_list::icons%]"
}
}, },
"lawn-mower-commands": { "lawn-mower-commands": {
"label": "Lawn mower commands", "label": "Lawn mower commands",

View File

@@ -4491,10 +4491,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/chromecast-caf-receiver@npm:6.0.24": "@types/chromecast-caf-receiver@npm:6.0.22":
version: 6.0.24 version: 6.0.22
resolution: "@types/chromecast-caf-receiver@npm:6.0.24" resolution: "@types/chromecast-caf-receiver@npm:6.0.22"
checksum: 10/1f2b95e8a15dbb36d5328895229d4a5cb255b33e62d46335bd6ed75e16aa9ea6a7d765a64ae120d19b3134fb3e51e9547d2544c7277f7bffe0bf0b3999f026da checksum: 10/6c51cb52527776ddfa187a261b88184c98bdd61c129dd8719cba213894d565cf69073734d6473696ffd60a768f6fb5a3fe9932693f43174fbc5e7af201db8a90
languageName: node languageName: node
linkType: hard linkType: hard
@@ -9442,7 +9442,7 @@ __metadata:
"@tsparticles/engine": "npm:3.9.1" "@tsparticles/engine": "npm:3.9.1"
"@tsparticles/preset-links": "npm:3.2.0" "@tsparticles/preset-links": "npm:3.2.0"
"@types/babel__plugin-transform-runtime": "npm:7.9.5" "@types/babel__plugin-transform-runtime": "npm:7.9.5"
"@types/chromecast-caf-receiver": "npm:6.0.24" "@types/chromecast-caf-receiver": "npm:6.0.22"
"@types/chromecast-caf-sender": "npm:1.0.11" "@types/chromecast-caf-sender": "npm:1.0.11"
"@types/color-name": "npm:2.0.0" "@types/color-name": "npm:2.0.0"
"@types/culori": "npm:4.0.1" "@types/culori": "npm:4.0.1"