Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/common/const.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export const FIXED_DOMAIN_ICONS = {
light: "hass:lightbulb",
mailbox: "hass:mailbox",
notify: "hass:comment-alert",
number: "hass:ray-vertex",
persistent_notification: "hass:bell",
person: "hass:account",
plant: "hass:flower",
Expand Down Expand Up @@ -77,6 +78,7 @@ export const DOMAINS_WITH_CARD = [
"input_text",
"lock",
"media_player",
"number",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means you would need to add a specific state card for this domain, like the input_number also has:
https://github.com/home-assistant/frontend/blob/dev/src/state-summary/state-card-input_number.js#L26

"scene",
"script",
"timer",
Expand Down Expand Up @@ -114,6 +116,7 @@ export const DOMAINS_HIDE_MORE_INFO = [
"input_number",
"input_select",
"input_text",
"number",
"scene",
];

Expand Down
1 change: 1 addition & 0 deletions src/data/entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export const ENTITY_COMPONENT_DOMAINS = [
"lock",
"mailbox",
"media_player",
"number",
"person",
"plant",
"remember_the_milk",
Expand Down
2 changes: 2 additions & 0 deletions src/panels/lovelace/create-element/create-row-element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ const LAZY_LOAD_TYPES = {
import("../entity-rows/hui-input-select-entity-row"),
"input-text-entity": () => import("../entity-rows/hui-input-text-entity-row"),
"lock-entity": () => import("../entity-rows/hui-lock-entity-row"),
"number-entity": () => import("../entity-rows/hui-number-entity-row"),
"timer-entity": () => import("../entity-rows/hui-timer-entity-row"),
conditional: () => import("../special-rows/hui-conditional-row"),
"weather-entity": () => import("../entity-rows/hui-weather-entity-row"),
Expand Down Expand Up @@ -63,6 +64,7 @@ const DOMAIN_TO_ELEMENT_TYPE = {
light: "toggle",
lock: "lock",
media_player: "media-player",
number: "number",
remote: "toggle",
scene: "scene",
script: "script",
Expand Down
176 changes: 176 additions & 0 deletions src/panels/lovelace/entity-rows/hui-number-entity-row.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
import "@polymer/paper-input/paper-input";
import {
css,
CSSResult,
customElement,
html,
LitElement,
property,
internalProperty,
PropertyValues,
TemplateResult,
} from "lit-element";
import { computeRTLDirection } from "../../../common/util/compute_rtl";
import "../../../components/ha-slider";
import { UNAVAILABLE_STATES } from "../../../data/entity";
import { setValue } from "../../../data/input_text";
import { HomeAssistant } from "../../../types";
import { hasConfigOrEntityChanged } from "../common/has-changed";
import "../components/hui-generic-entity-row";
import { EntityConfig, LovelaceRow } from "./types";
import { createEntityNotFoundWarning } from "../components/hui-warning";

@customElement("hui-number-entity-row")
class HuiNumberEntityRow extends LitElement implements LovelaceRow {
@property({ attribute: false }) public hass?: HomeAssistant;

@internalProperty() private _config?: EntityConfig;

private _loaded?: boolean;

private _updated?: boolean;

public setConfig(config: EntityConfig): void {
if (!config) {
throw new Error("Invalid configuration");
}
this._config = config;
}

public connectedCallback(): void {
super.connectedCallback();
if (this._updated && !this._loaded) {
this._initialLoad();
}
}

protected firstUpdated(): void {
this._updated = true;
if (this.isConnected && !this._loaded) {
this._initialLoad();
}
}

protected shouldUpdate(changedProps: PropertyValues): boolean {
return hasConfigOrEntityChanged(this, changedProps);
}

protected render(): TemplateResult {
if (!this._config || !this.hass) {
return html``;
}

const stateObj = this.hass.states[this._config.entity];

if (!stateObj) {
return html`
<hui-warning>
${createEntityNotFoundWarning(this.hass, this._config.entity)}
</hui-warning>
`;
}

return html`
<hui-generic-entity-row .hass=${this.hass} .config=${this._config}>
${stateObj.attributes.mode === "slider"
? html`
<div class="flex">
<ha-slider
.disabled=${UNAVAILABLE_STATES.includes(stateObj.state)}
.dir=${computeRTLDirection(this.hass)}
.step="${Number(stateObj.attributes.step)}"
.min="${Number(stateObj.attributes.min)}"
.max="${Number(stateObj.attributes.max)}"
.value="${Number(stateObj.state)}"
pin
@change="${this._selectedValueChanged}"
ignore-bar-touch
id="input"
></ha-slider>
<span class="state">
${Number(stateObj.state)}
${stateObj.attributes.unit_of_measurement}
</span>
</div>
`
: html`
<div class="flex state">
<paper-input
no-label-float
auto-validate
.disabled=${UNAVAILABLE_STATES.includes(stateObj.state)}
pattern="[0-9]+([\\.][0-9]+)?"
.step="${Number(stateObj.attributes.step)}"
.min="${Number(stateObj.attributes.min)}"
.max="${Number(stateObj.attributes.max)}"
.value="${Number(stateObj.state)}"
type="number"
@change="${this._selectedValueChanged}"
id="input"
></paper-input>
${stateObj.attributes.unit_of_measurement}
</div>
`}
</hui-generic-entity-row>
`;
}

static get styles(): CSSResult {
return css`
.flex {
display: flex;
align-items: center;
justify-content: flex-end;
flex-grow: 2;
}
.state {
min-width: 45px;
text-align: end;
}
paper-input {
text-align: end;
}
ha-slider {
width: 100%;
max-width: 200px;
}
:host {
cursor: pointer;
}
`;
}

private async _initialLoad(): Promise<void> {
this._loaded = true;
await this.updateComplete;
const element = this.shadowRoot!.querySelector(".state") as HTMLElement;

if (!element || !this.parentElement) {
return;
}

element.hidden = this.parentElement.clientWidth <= 350;
}

private get _inputElement(): { value: string } {
// linter recommended the following syntax
return (this.shadowRoot!.getElementById("input") as unknown) as {
value: string;
};
}

private _selectedValueChanged(): void {
const element = this._inputElement;
const stateObj = this.hass!.states[this._config!.entity];

if (element.value !== stateObj.state) {
setValue(this.hass!, stateObj.entity_id, element.value!);
}
}
}

declare global {
interface HTMLElementTagNameMap {
"hui-number-entity-row": HuiNumberEntityRow;
}
}
1 change: 1 addition & 0 deletions src/state-summary/state-card-content.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import "./state-card-input_select";
import "./state-card-input_text";
import "./state-card-lock";
import "./state-card-media_player";
import "./state-card-number";
import "./state-card-scene";
import "./state-card-script";
import "./state-card-timer";
Expand Down
Loading