From 1ed03842c05c8044361e07f496f78825105b1072 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Fri, 29 Jan 2021 18:37:58 +0100
Subject: [PATCH] Fix grid + map editor (#8284)

---
 .../config-elements/hui-grid-card-editor.ts   | 40 +++++++++++++------
 .../config-elements/hui-map-card-editor.ts    | 19 +++++----
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/src/panels/lovelace/editor/config-elements/hui-grid-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-grid-card-editor.ts
index 0e4a62867b..681ebd0dc9 100644
--- a/src/panels/lovelace/editor/config-elements/hui-grid-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-grid-card-editor.ts
@@ -29,6 +29,14 @@ export class HuiGridCardEditor extends HuiStackCardEditor {
     this._config = config;
   }
 
+  get _columns(): number {
+    return this._config!.columns || 3;
+  }
+
+  get _square(): boolean {
+    return this._config!.square ?? true;
+  }
+
   protected render(): TemplateResult {
     if (!this.hass || !this._config) {
       return html``;
@@ -44,7 +52,7 @@ export class HuiGridCardEditor extends HuiStackCardEditor {
               "ui.panel.lovelace.editor.card.config.optional"
             )})"
             type="number"
-            .value=${(this._config as GridCardConfig).columns}
+            .value=${this._columns}
             .configValue=${"columns"}
             @value-changed=${this._handleColumnsChanged}
           ></paper-input>
@@ -55,7 +63,7 @@ export class HuiGridCardEditor extends HuiStackCardEditor {
             .dir=${computeRTLDirection(this.hass)}
           >
             <ha-switch
-              .checked=${(this._config as GridCardConfig).square}
+              .checked=${this._square}
               .configValue=${"square"}
               @change=${this._handleSquareChanged}
             ></ha-switch>
@@ -70,24 +78,30 @@ export class HuiGridCardEditor extends HuiStackCardEditor {
     if (!this._config) {
       return;
     }
-
-    this._config = {
-      ...this._config,
-      columns: Number(ev.target.value),
-    };
+    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,
+        columns: value,
+      };
+    }
     fireEvent(this, "config-changed", { config: this._config });
   }
 
   private _handleSquareChanged(ev): void {
-    if (!this._config) {
+    if (!this._config || this._square === ev.target.checked) {
       return;
     }
 
-    this._config = {
-      ...this._config,
-      square: ev.target.checked,
-    };
-    fireEvent(this, "config-changed", { config: this._config });
+    fireEvent(this, "config-changed", {
+      config: { ...this._config, square: ev.target.checked },
+    });
   }
 }
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
index 39dde0b377..e32c9f56bc 100644
--- a/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
@@ -73,7 +73,7 @@ export class HuiMapCardEditor extends LitElement implements LovelaceCardEditor {
   }
 
   get _default_zoom(): number {
-    return this._config!.default_zoom || NaN;
+    return this._config!.default_zoom || 0;
   }
 
   get _geo_location_sources(): string[] {
@@ -199,22 +199,25 @@ export class HuiMapCardEditor extends LitElement implements LovelaceCardEditor {
       return;
     }
     const target = ev.target! as EditorTarget;
-    let value = ev.detail.value;
-
-    if (target.configValue && this[`_${target.configValue}`] === value) {
+    if (!target.configValue) {
       return;
     }
-    if (target.type === "number") {
+
+    let value = target.checked ?? ev.detail.value;
+
+    if (value && target.type === "number") {
       value = Number(value);
     }
-    if (value === "" || (target.type === "number" && isNaN(value))) {
+    if (this[`_${target.configValue}`] === value) {
+      return;
+    }
+    if (value === "") {
       this._config = { ...this._config };
       delete this._config[target.configValue!];
     } else if (target.configValue) {
       this._config = {
         ...this._config,
-        [target.configValue]:
-          target.checked !== undefined ? target.checked : value,
+        [target.configValue]: value,
       };
     }
     fireEvent(this, "config-changed", { config: this._config });