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

Fix grid + map editor (#8284)

Browse Source
This commit is contained in:
Bram Kragten 2021-01-29 18:37:58 +01:00
parent 362b419814
commit 1ed03842c0
2 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/panels/lovelace/editor/config-elements/hui-grid-card-editor.ts
View File

@ -29,6 +29,14 @@ export class HuiGridCardEditor extends HuiStackCardEditor {
this._config = config; this._config = config;
} }
get _columns(): number {
return this._config!.columns || 3;
}
get _square(): boolean {
return this._config!.square ?? true;
}
protected render(): TemplateResult { protected render(): TemplateResult {
if (!this.hass || !this._config) { if (!this.hass || !this._config) {
return html``; return html``;
@ -44,7 +52,7 @@ export class HuiGridCardEditor extends HuiStackCardEditor {
"ui.panel.lovelace.editor.card.config.optional" "ui.panel.lovelace.editor.card.config.optional"
)})" )})"
type="number" type="number"
.value=${(this._config as GridCardConfig).columns} .value=${this._columns}
.configValue=${"columns"} .configValue=${"columns"}
@value-changed=${this._handleColumnsChanged} @value-changed=${this._handleColumnsChanged}
></paper-input> ></paper-input>
@ -55,7 +63,7 @@ export class HuiGridCardEditor extends HuiStackCardEditor {
.dir=${computeRTLDirection(this.hass)} .dir=${computeRTLDirection(this.hass)}
> >
<ha-switch <ha-switch
.checked=${(this._config as GridCardConfig).square} .checked=${this._square}
.configValue=${"square"} .configValue=${"square"}
@change=${this._handleSquareChanged} @change=${this._handleSquareChanged}
></ha-switch> ></ha-switch>
@ -70,24 +78,30 @@ export class HuiGridCardEditor extends HuiStackCardEditor {
if (!this._config) { if (!this._config) {
return; return;
} }
const value = Number(ev.target.value);
if (this._columns === value) {
return;
}
if (!ev.target.value) {
this._config = { ...this._config };
delete this._config.columns;
} else {
this._config = { this._config = {
...this._config, ...this._config,
columns: Number(ev.target.value), columns: value,
}; };
}
fireEvent(this, "config-changed", { config: this._config }); fireEvent(this, "config-changed", { config: this._config });
} }
private _handleSquareChanged(ev): void { private _handleSquareChanged(ev): void {
if (!this._config) { if (!this._config || this._square === ev.target.checked) {
return; return;
} }
this._config = { fireEvent(this, "config-changed", {
...this._config, config: { ...this._config, square: ev.target.checked },
square: ev.target.checked, });
};
fireEvent(this, "config-changed", { config: this._config });
} }
} }

19
src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
View File

@ -73,7 +73,7 @@ export class HuiMapCardEditor extends LitElement implements LovelaceCardEditor {
} }
get _default_zoom(): number { get _default_zoom(): number {
return this._config!.default_zoom || NaN; return this._config!.default_zoom || 0;
} }
get _geo_location_sources(): string[] { get _geo_location_sources(): string[] {
@ -199,22 +199,25 @@ export class HuiMapCardEditor extends LitElement implements LovelaceCardEditor {
return; return;
} }
const target = ev.target! as EditorTarget; const target = ev.target! as EditorTarget;
let value = ev.detail.value; if (!target.configValue) {
if (target.configValue && this[`_${target.configValue}`] === value) {
return; return;
} }
if (target.type === "number") {
let value = target.checked ?? ev.detail.value;
if (value && target.type === "number") {
value = Number(value); value = Number(value);
} }
if (value === "" || (target.type === "number" && isNaN(value))) { if (this[`_${target.configValue}`] === value) {
return;
}
if (value === "") {
this._config = { ...this._config }; this._config = { ...this._config };
delete this._config[target.configValue!]; delete this._config[target.configValue!];
} else if (target.configValue) { } else if (target.configValue) {
this._config = { this._config = {
...this._config, ...this._config,
[target.configValue]: [target.configValue]: value,
target.checked !== undefined ? target.checked : value,
}; };
} }
fireEvent(this, "config-changed", { config: this._config }); fireEvent(this, "config-changed", { config: this._config });