From dc61a621492e59716894f04cba8476fcd917f747 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Sun, 31 Mar 2019 19:38:11 -0700
Subject: [PATCH] Edit card fixes (#3043)

---
 .../editor/card-editor/hui-card-preview.ts    | 21 +++++++++++++++----
 .../editor/card-editor/hui-edit-card.ts       | 16 +++++++-------
 src/resources/styles.ts                       |  3 ++-
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/panels/lovelace/editor/card-editor/hui-card-preview.ts b/src/panels/lovelace/editor/card-editor/hui-card-preview.ts
index 949785ab35..26b28c8556 100644
--- a/src/panels/lovelace/editor/card-editor/hui-card-preview.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-card-preview.ts
@@ -37,6 +37,14 @@ export class HuiCardPreview extends HTMLElement {
 
   set config(configValue: LovelaceCardConfig) {
     if (!configValue) {
+      this._cleanup();
+      return;
+    }
+
+    if (!configValue.type) {
+      this._createCard(
+        createErrorCardConfig("No card type found", configValue)
+      );
       return;
     }
 
@@ -59,10 +67,7 @@ export class HuiCardPreview extends HTMLElement {
   }
 
   private _createCard(configValue: LovelaceCardConfig): void {
-    if (this._element) {
-      this.removeChild(this._element);
-    }
-
+    this._cleanup();
     this._element = createCardElement(configValue);
 
     if (this._hass) {
@@ -71,6 +76,14 @@ export class HuiCardPreview extends HTMLElement {
 
     this.appendChild(this._element!);
   }
+
+  private _cleanup() {
+    if (!this._element) {
+      return;
+    }
+    this.removeChild(this._element);
+    this._element = undefined;
+  }
 }
 
 declare global {
diff --git a/src/panels/lovelace/editor/card-editor/hui-edit-card.ts b/src/panels/lovelace/editor/card-editor/hui-edit-card.ts
index 93ce59eaf2..ad741cea7c 100644
--- a/src/panels/lovelace/editor/card-editor/hui-edit-card.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-edit-card.ts
@@ -247,8 +247,8 @@ export class HuiEditCard extends LitElement {
   }
 
   private _handleYamlChanged(ev: CustomEvent): void {
-    this._cardConfig = yaml.safeLoad(ev.detail.value);
     try {
+      this._cardConfig = yaml.safeLoad(ev.detail.value);
       this._updatePreview(this._cardConfig!);
       this._configState = "OK";
     } catch (err) {
@@ -392,20 +392,20 @@ export class HuiEditCard extends LitElement {
 
         @media all and (max-width: 450px), all and (max-height: 500px) {
           /* overrule the ha-style-dialog max-height on small screens */
-          paper-dialog {
+          ha-paper-dialog {
             max-height: 100%;
             height: 100%;
           }
         }
 
         @media all and (min-width: 660px) {
-          paper-dialog {
-            width: 650px;
+          ha-paper-dialog {
+            width: 845px;
           }
         }
 
-        paper-dialog {
-          max-width: 650px;
+        ha-paper-dialog {
+          max-width: 845px;
         }
 
         .center {
@@ -420,7 +420,8 @@ export class HuiEditCard extends LitElement {
         }
         .content hui-card-preview {
           margin-top: 16px;
-          margin: 0 10px;
+          margin: 0 auto;
+          max-width: 390px;
         }
         .content .element-editor {
           margin: 0 10px;
@@ -442,6 +443,7 @@ export class HuiEditCard extends LitElement {
             min-width: 0;
           }
           .content hui-card-preview {
+            padding-top: 0;
             margin: 0 10px;
             max-width: 490px;
           }
diff --git a/src/resources/styles.ts b/src/resources/styles.ts
index 7a834dd380..9488c05418 100644
--- a/src/resources/styles.ts
+++ b/src/resources/styles.ts
@@ -72,7 +72,8 @@ export const haStyleDialog = css`
   }
 
   @media all and (max-width: 450px), all and (max-height: 500px) {
-    paper-dialog {
+    paper-dialog,
+    ha-paper-dialog {
       margin: 0;
       width: 100% !important;
       max-height: calc(100% - 64px);