jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-24 09:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename switch-toggle feature to toggle and improve (#24333)

Browse Source 
* Rename `switch-toggle` feature to `toggle` and improve

* Format
This commit is contained in:
Jan-Philipp Benecke 2025-02-20 14:51:49 +01:00 committed by GitHub
parent cae36b393b
commit 8175e45921
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/panels/lovelace/card-features/hui-switch-toggle-card-feature.ts → src/panels/lovelace/card-features/hui-toggle-card-feature.ts
View File

@ -12,32 +12,29 @@ import { UNAVAILABLE } from "../../../data/entity";
import type { HomeAssistant } from "../../../types";
import type { LovelaceCardFeature } from "../types";
import { cardFeatureStyles } from "./common/card-feature-styles";
import type { SwitchToggleCardFeatureConfig } from "./types";
import type { ToggleCardFeatureConfig } from "./types";
import { showToast } from "../../../util/toast";
export const supportsSwitchToggleCardFeature = (stateObj: HassEntity) => {
export const supportsToggleCardFeature = (stateObj: HassEntity) => {
const domain = computeDomain(stateObj.entity_id);
return domain === "switch";
return ["switch", "input_boolean"].includes(domain);
};
@customElement("hui-switch-toggle-card-feature")
class HuiSwitchToggleCardFeature
extends LitElement
implements LovelaceCardFeature
{
@customElement("hui-toggle-card-feature")
class HuiToggleCardFeature extends LitElement implements LovelaceCardFeature {
@property({ attribute: false }) public hass?: HomeAssistant;
@property({ attribute: false }) public stateObj?: HassEntity;
@state() private _config?: SwitchToggleCardFeatureConfig;
@state() private _config?: ToggleCardFeatureConfig;
static getStubConfig(): SwitchToggleCardFeatureConfig {
static getStubConfig(): ToggleCardFeatureConfig {
return {
type: "switch-toggle",
type: "toggle",
};
}
public setConfig(config: SwitchToggleCardFeatureConfig): void {
public setConfig(config: ToggleCardFeatureConfig): void {
if (!config) {
throw new Error("Invalid configuration");
}
@ -49,7 +46,7 @@ class HuiSwitchToggleCardFeature
!this._config ||
!this.hass ||
!this.stateObj ||
!supportsSwitchToggleCardFeature(this.stateObj)
!supportsToggleCardFeature(this.stateObj)
) {
return null;
}
@ -81,17 +78,22 @@ class HuiSwitchToggleCardFeature
private async _valueChanged(ev: CustomEvent) {
const newState = (ev.detail as any).value;
if (newState === this.stateObj!.state) return;
if (
newState === this.stateObj!.state &&
!this.stateObj!.attributes.assumed_state
)
return;
const service = newState === "on" ? "turn_on" : "turn_off";
const domain = computeDomain(this.stateObj!.entity_id);
try {
await this.hass!.callService("switch", service, {
await this.hass!.callService(domain, service, {
entity_id: this.stateObj!.entity_id,
});
} catch (_err) {
showToast(this, {
message: this.hass!.localize("ui.notification_toast.action_failed", {
service: "switch." + service,
service: domain + "." + service,
}),
duration: 5000,
dismissable: true,
@ -104,6 +106,6 @@ class HuiSwitchToggleCardFeature
declare global {
interface HTMLElementTagNameMap {
"hui-switch-toggle-card-feature": HuiSwitchToggleCardFeature;
"hui-toggle-card-feature": HuiToggleCardFeature;
}
}

10
src/panels/lovelace/card-features/types.ts
View File

@ -88,10 +88,6 @@ export interface SelectOptionsCardFeatureConfig {
options?: string[];
}
export interface SwitchToggleCardFeatureConfig {
type: "switch-toggle";
}
export interface NumericInputCardFeatureConfig {
type: "numeric-input";
style?: "buttons" | "slider";
@ -105,6 +101,10 @@ export interface TargetTemperatureCardFeatureConfig {
type: "target-temperature";
}
export interface ToggleCardFeatureConfig {
type: "toggle";
}
export interface WaterHeaterOperationModesCardFeatureConfig {
type: "water-heater-operation-modes";
operation_modes?: OperationMode[];
@ -172,9 +172,9 @@ export type LovelaceCardFeatureConfig =
| MediaPlayerVolumeSliderCardFeatureConfig
| NumericInputCardFeatureConfig
| SelectOptionsCardFeatureConfig
| SwitchToggleCardFeatureConfig
| TargetHumidityCardFeatureConfig
| TargetTemperatureCardFeatureConfig
| ToggleCardFeatureConfig
| UpdateActionsCardFeatureConfig
| VacuumCommandsCardFeatureConfig
| WaterHeaterOperationModesCardFeatureConfig;

4
src/panels/lovelace/create-element/create-card-feature-element.ts
View File

@ -20,9 +20,9 @@ import "../card-features/hui-lock-open-door-card-feature";
import "../card-features/hui-media-player-volume-slider-card-feature";
import "../card-features/hui-numeric-input-card-feature";
import "../card-features/hui-select-options-card-feature";
import "../card-features/hui-switch-toggle-card-feature";
import "../card-features/hui-target-temperature-card-feature";
import "../card-features/hui-target-humidity-card-feature";
import "../card-features/hui-toggle-card-feature";
import "../card-features/hui-update-actions-card-feature";
import "../card-features/hui-vacuum-commands-card-feature";
import "../card-features/hui-water-heater-operation-modes-card-feature";
@ -56,9 +56,9 @@ const TYPES = new Set<LovelaceCardFeatureConfig["type"]>([
"media-player-volume-slider",
"numeric-input",
"select-options",
"switch-toggle",
"target-humidity",
"target-temperature",
"toggle",
"update-actions",
"vacuum-commands",
"water-heater-operation-modes",

6
src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts
View File

@ -40,9 +40,9 @@ import { supportsLockOpenDoorCardFeature } from "../../card-features/hui-lock-op
import { supportsMediaPlayerVolumeSliderCardFeature } from "../../card-features/hui-media-player-volume-slider-card-feature";
import { supportsNumericInputCardFeature } from "../../card-features/hui-numeric-input-card-feature";
import { supportsSelectOptionsCardFeature } from "../../card-features/hui-select-options-card-feature";
import { supportsSwitchToggleCardFeature } from "../../card-features/hui-switch-toggle-card-feature";
import { supportsTargetHumidityCardFeature } from "../../card-features/hui-target-humidity-card-feature";
import { supportsTargetTemperatureCardFeature } from "../../card-features/hui-target-temperature-card-feature";
import { supportsToggleCardFeature } from "../../card-features/hui-toggle-card-feature";
import { supportsUpdateActionsCardFeature } from "../../card-features/hui-update-actions-card-feature";
import { supportsVacuumCommandsCardFeature } from "../../card-features/hui-vacuum-commands-card-feature";
import { supportsWaterHeaterOperationModesCardFeature } from "../../card-features/hui-water-heater-operation-modes-card-feature";
@ -75,9 +75,9 @@ const UI_FEATURE_TYPES = [
"media-player-volume-slider",
"numeric-input",
"select-options",
"switch-toggle",
"target-humidity",
"target-temperature",
"toggle",
"update-actions",
"vacuum-commands",
"water-heater-operation-modes",
@ -131,10 +131,10 @@ const SUPPORTS_FEATURE_TYPES: Record<
"select-options": supportsSelectOptionsCardFeature,
"target-humidity": supportsTargetHumidityCardFeature,
"target-temperature": supportsTargetTemperatureCardFeature,
toggle: supportsToggleCardFeature,
"update-actions": supportsUpdateActionsCardFeature,
"vacuum-commands": supportsVacuumCommandsCardFeature,
"water-heater-operation-modes": supportsWaterHeaterOperationModesCardFeature,
"switch-toggle": supportsSwitchToggleCardFeature,
};
const customCardFeatures = getCustomCardFeatures();

4
src/translations/en.json
View File

@ -7348,8 +7348,8 @@
"options": "Options",
"customize_options": "Customize options"
},
"switch-toggle": {
"label": "Switch toggle"
"toggle": {
"label": "Toggle"
},
"numeric-input": {
"label": "Numeric input",