Skip to content

Allow selecting multiple states in state condition #27453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 19, 2025
Merged

Allow selecting multiple states in state condition #27453

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acc96d8
Allow selecting multiple states in state condition
Skaronator Oct 11, 2025
f2460b3
Make use of the ensureArray function
Skaronator Oct 13, 2025
79524a5
Merge branch 'dev' into condition-multi-select
Skaronator Oct 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions src/panels/config/automation/condition/types/ha-automation-condition-state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ import {
optional,
string,
union,
array,
} from "superstruct";
import { createDurationData } from "../../../../../common/datetime/create_duration_data";
import { ensureArray } from "../../../../../common/array/ensure-array";
import { fireEvent } from "../../../../../common/dom/fire_event";
import "../../../../../components/ha-form/ha-form";
import type { SchemaUnion } from "../../../../../components/ha-form/types";
Expand All @@ -25,7 +27,7 @@ const stateConditionStruct = object({
condition: literal("state"),
entity_id: optional(string()),
attribute: optional(string()),
state: optional(string()),
state: optional(union([string(), array(string())])),
for: optional(union([number(), string(), forDictStruct])),
enabled: optional(boolean()),
});
Expand Down Expand Up @@ -69,7 +71,7 @@ const SCHEMA = [
name: "state",
required: true,
selector: {
state: {},
state: { multiple: true },
},
context: {
filter_entity: "entity_id",
Expand All @@ -88,7 +90,7 @@ export class HaStateCondition extends LitElement implements ConditionElement {
@property({ type: Boolean }) public disabled = false;

public static get defaultConfig(): StateCondition {
return { condition: "state", entity_id: "", state: "" };
return { condition: "state", entity_id: "", state: [] };
}

public shouldUpdate(changedProperties: PropertyValues) {
Expand All @@ -105,7 +107,11 @@ export class HaStateCondition extends LitElement implements ConditionElement {

protected render() {
const trgFor = createDurationData(this.condition.for);
const data = { ...this.condition, for: trgFor };
const data = {
...this.condition,
state: ensureArray(this.condition.state) || [],
for: trgFor,
};

return html`
<ha-form
Expand All @@ -129,10 +135,9 @@ export class HaStateCondition extends LitElement implements ConditionElement {
: {}
);

// We should not cleanup state in the above, as it is required.
// Set it to empty string if it is undefined.
if (!newCondition.state) {
newCondition.state = "";
// Ensure `state` stays an array for multi-select. If absent, set to []
if (newCondition.state === undefined || newCondition.state === "") {
newCondition.state = [];
}

fireEvent(this, "value-changed", { value: newCondition });
Expand Down
Loading