Skip to content

Make "button row" name optional to be consistent with "button card" and "buttons row" #8189

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
spacegaier merged 2 commits into from
Jan 21, 2021
Merged

Make "button row" name optional to be consistent with "button card" and "buttons row" #8189

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
520afbd
Make name optional to be consistent with "button card" and "buttons row"
spacegaier Jan 17, 2021
ade156b
Enforce either name or entity + take icon from entity
spacegaier Jan 17, 2021
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: 17 additions & 4 deletions src/panels/lovelace/special-rows/hui-button-row.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import {
} from "lit-element";
import { DOMAINS_TOGGLE } from "../../../common/const";
import { computeDomain } from "../../../common/entity/compute_domain";
import { computeStateName } from "../../../common/entity/compute_state_name";
import { stateIcon } from "../../../common/entity/state_icon";
import "../../../components/ha-icon";
import { ActionHandlerEvent } from "../../../data/lovelace";
import { HomeAssistant } from "../../../types";
Expand All @@ -29,8 +31,8 @@ export class HuiButtonRow extends LitElement implements LovelaceRow {
throw new Error("Invalid configuration");
}

if (!config.name) {
throw new Error("No name specified");
if (!config.name && !config.entity) {
throw new Error("No name and no entity specified");
}

this._config = {
Expand All @@ -50,10 +52,21 @@ export class HuiButtonRow extends LitElement implements LovelaceRow {
return html``;
}

const stateObj =
this._config.entity && this.hass
? this.hass.states[this._config.entity]
: undefined;

return html`
<ha-icon .icon=${this._config.icon || "hass:remote"}></ha-icon>
<ha-icon
.icon=${this._config.icon ||
(stateObj ? stateIcon(stateObj) : "hass:remote")}
>
</ha-icon>
<div class="flex">
<div>${this._config.name}</div>
<div>
${this._config.name || (stateObj ? computeStateName(stateObj) : "")}
</div>
<mwc-button
@action=${this._handleAction}
.actionHandler=${actionHandler({
Expand Down