From 196540afc74b4e7b6ae3a5a27fe3037facd88472 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 4 Mar 2020 22:04:04 +0100
Subject: [PATCH] Allow card editors to use card picker again (#5067)

---
 src/panels/lovelace/editor/card-editor/hui-card-editor.ts     | 4 +++-
 .../lovelace/editor/card-editor/hui-dialog-edit-card.ts       | 1 +
 .../lovelace/editor/config-elements/hui-stack-card-editor.ts  | 3 +++
 src/panels/lovelace/types.ts                                  | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/panels/lovelace/editor/card-editor/hui-card-editor.ts b/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
index 9bd7d38cc5..8738df3943 100644
--- a/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
@@ -12,7 +12,7 @@ import { safeDump, safeLoad } from "js-yaml";
 
 import "@material/mwc-button";
 import { HomeAssistant } from "../../../../types";
-import { LovelaceCardConfig } from "../../../../data/lovelace";
+import { LovelaceCardConfig, LovelaceConfig } from "../../../../data/lovelace";
 import { LovelaceCardEditor } from "../../types";
 import { computeRTL } from "../../../../common/util/compute_rtl";
 
@@ -45,6 +45,7 @@ export interface UIConfigChangedEvent extends Event {
 @customElement("hui-card-editor")
 export class HuiCardEditor extends LitElement {
   @property() public hass!: HomeAssistant;
+  @property() public lovelace?: LovelaceConfig;
 
   @property() private _yaml?: string;
   @property() private _config?: LovelaceCardConfig;
@@ -239,6 +240,7 @@ export class HuiCardEditor extends LitElement {
 
       // Perform final setup
       this._configElement!.hass = this.hass;
+      this._configElement!.lovelace = this.lovelace;
       this._configElement!.addEventListener("config-changed", (ev) =>
         this._handleUIConfigChanged(ev as UIConfigChangedEvent)
       );
diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts
index 779d746b0a..28b560b42d 100755
--- a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts
@@ -109,6 +109,7 @@ export class HuiDialogEditCard extends LitElement {
                   <div class="element-editor">
                     <hui-card-editor
                       .hass=${this.hass}
+                      .lovelace="${this._params.lovelaceConfig}"
                       .value="${this._cardConfig}"
                       @config-changed="${this._handleConfigChanged}"
                     ></hui-card-editor>
diff --git a/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts
index 640868f6b0..729bfdf906 100644
--- a/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts
@@ -14,6 +14,7 @@ import { HomeAssistant } from "../../../../types";
 import { LovelaceCardEditor } from "../../types";
 import { StackCardConfig } from "../../cards/types";
 import { fireEvent } from "../../../../common/dom/fire_event";
+import { LovelaceConfig } from "../../../../data/lovelace";
 
 const cardConfigStruct = struct({
   type: "string",
@@ -25,6 +26,7 @@ const cardConfigStruct = struct({
 export class HuiStackCardEditor extends LitElement
   implements LovelaceCardEditor {
   @property() public hass?: HomeAssistant;
+  @property() public lovelace?: LovelaceConfig;
   @property() private _config?: StackCardConfig;
   @property() private _selectedCard: number = 0;
 
@@ -102,6 +104,7 @@ export class HuiStackCardEditor extends LitElement
               : html`
                   <hui-card-picker
                     .hass=${this.hass}
+                    .lovelace=${this.lovelace}
                     @config-changed="${this._handleCardPicked}"
                   ></hui-card-picker>
                 `
diff --git a/src/panels/lovelace/types.ts b/src/panels/lovelace/types.ts
index ef99341213..2a923180fb 100644
--- a/src/panels/lovelace/types.ts
+++ b/src/panels/lovelace/types.ts
@@ -54,5 +54,6 @@ export interface LovelaceHeaderFooter extends HTMLElement {
 
 export interface LovelaceCardEditor extends HTMLElement {
   hass?: HomeAssistant;
+  lovelace?: LovelaceConfig;
   setConfig(config: LovelaceCardConfig): void;
 }