From f9232280781900f19daf9db6226e25544a7fe0d3 Mon Sep 17 00:00:00 2001
From: Zack Barett <zackbarett@hey.com>
Date: Thu, 17 Feb 2022 03:41:45 -0600
Subject: [PATCH] Fix mwc-select in lovelace editors (#11708)

---
 src/panels/lovelace/components/hui-theme-select-editor.ts   | 2 +-
 .../editor/config-elements/hui-calendar-card-editor.ts      | 2 ++
 .../editor/config-elements/hui-conditional-card-editor.ts   | 2 ++
 .../editor/config-elements/hui-generic-entity-row-editor.ts | 6 +++++-
 src/panels/lovelace/editor/hui-element-editor.ts            | 1 +
 .../editor/view-editor/hui-view-visibility-editor.ts        | 1 -
 6 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/panels/lovelace/components/hui-theme-select-editor.ts b/src/panels/lovelace/components/hui-theme-select-editor.ts
index 60a3746e8c..47e05ae1bf 100644
--- a/src/panels/lovelace/components/hui-theme-select-editor.ts
+++ b/src/panels/lovelace/components/hui-theme-select-editor.ts
@@ -28,7 +28,7 @@ export class HuiThemeSelectEditor extends LitElement {
         @selected=${this._changed}
         @closed=${stopPropagation}
         fixedMenuPosition
-        naturalMenuWidt
+        naturalMenuWidth
       >
         <mwc-list-item value="remove"
           >${this.hass!.localize(
diff --git a/src/panels/lovelace/editor/config-elements/hui-calendar-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-calendar-card-editor.ts
index fe59a5b16d..2142f325f4 100644
--- a/src/panels/lovelace/editor/config-elements/hui-calendar-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-calendar-card-editor.ts
@@ -91,6 +91,8 @@ export class HuiCalendarCardEditor
             .configValue=${"initial_view"}
             @selected=${this._viewChanged}
             @closed=${stopPropagation}
+            naturalMenuWidth
+            fixedMenuPosition
           >
             ${views.map(
               (view) => html`
diff --git a/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
index c3fd28a9a1..c2a0e65806 100644
--- a/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
@@ -160,6 +160,8 @@ export class HuiConditionalCardEditor
                         .configValue=${"invert"}
                         @selected=${this._changeCondition}
                         @closed=${stopPropagation}
+                        naturalMenuWidth
+                        fixedMenuPosition
                       >
                         <mwc-list-item value="false">
                           ${this.hass!.localize(
diff --git a/src/panels/lovelace/editor/config-elements/hui-generic-entity-row-editor.ts b/src/panels/lovelace/editor/config-elements/hui-generic-entity-row-editor.ts
index bc1b534701..40ec4f2253 100644
--- a/src/panels/lovelace/editor/config-elements/hui-generic-entity-row-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-generic-entity-row-editor.ts
@@ -5,6 +5,7 @@ import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { assert } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
+import { stopPropagation } from "../../../../common/dom/stop_propagation";
 import { computeDomain } from "../../../../common/entity/compute_domain";
 import { domainIcon } from "../../../../common/entity/domain_icon";
 import "../../../../components/ha-formfield";
@@ -103,9 +104,12 @@ export class HuiGenericEntityRowEditor
         </div>
         <mwc-select
           label="Secondary Info"
-          .selected=${this._config.secondary_info || "none"}
           .configValue=${"secondary_info"}
           @selected=${this._valueChanged}
+          @closed=${stopPropagation}
+          .value=${this._config.secondary_info || "none"}
+          naturalMenuWidth
+          fixedMenuPosition
         >
           <mwc-list-item value=""
             >${this.hass!.localize(
diff --git a/src/panels/lovelace/editor/hui-element-editor.ts b/src/panels/lovelace/editor/hui-element-editor.ts
index a1bcb849a2..e06cb7d83b 100644
--- a/src/panels/lovelace/editor/hui-element-editor.ts
+++ b/src/panels/lovelace/editor/hui-element-editor.ts
@@ -335,6 +335,7 @@ export abstract class HuiElementEditor<T> extends LitElement {
           );
         }
       } else {
+        this._guiSupported = false;
         this.GUImode = false;
       }
     } catch (err: any) {
diff --git a/src/panels/lovelace/editor/view-editor/hui-view-visibility-editor.ts b/src/panels/lovelace/editor/view-editor/hui-view-visibility-editor.ts
index d4bb565835..727325d07c 100644
--- a/src/panels/lovelace/editor/view-editor/hui-view-visibility-editor.ts
+++ b/src/panels/lovelace/editor/view-editor/hui-view-visibility-editor.ts
@@ -1,5 +1,4 @@
 import "@material/mwc-list/mwc-list-item";
-import "@material/mwc-select/mwc-select";
 import {
   css,
   CSSResultGroup,