Skip to content

Commit 1668965

Browse files
Merge pull request #41 from PiotrMachowski/dev
Fix card editor
2 parents 1eb827a + 62ba4f0 commit 1668965

2 files changed

Lines changed: 32 additions & 12 deletions

File tree

src/editor.ts

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ export class LocalConditionalCardEditor extends LitElement implements LovelaceCa
6969
return html`
7070
<div class="card-config">
7171
<div class="toolbar">
72-
<sl-tab-group @sl-tab-show=${this._selectTab}>
73-
<sl-tab slot="nav" panel="conditions" .active=${!this._cardTab}>
72+
<ha-tab-group @wa-tab-show=${this._selectTab}>
73+
<ha-tab-group-tab slot="nav" panel="conditions" .active=${!this._cardTab}>
7474
${this.hass?.localize("ui.panel.lovelace.editor.card.conditional.conditions")}
75-
</sl-tab>
76-
<sl-tab slot="nav" panel="card" .active=${this._cardTab}>
75+
</ha-tab-group-tab>
76+
<ha-tab-group-tab slot="nav" panel="card" .active=${this._cardTab}>
7777
${this.hass?.localize("ui.panel.lovelace.editor.card.conditional.card")}
78-
</sl-tab>
79-
</sl-tab-group>
78+
</ha-tab-group-tab>
79+
</ha-tab-group>
8080
</div>
8181
<div id="editor">${this._cardTab ? this._renderCardChooser() : this._renderCardConfig()}</div>
8282
</div>
@@ -132,7 +132,7 @@ export class LocalConditionalCardEditor extends LitElement implements LovelaceCa
132132
${this._config?.card?.type !== undefined
133133
? html`
134134
<div class="card-options">
135-
<mwc-button
135+
<ha-button
136136
@click=${this._toggleMode}
137137
.disabled=${!this._guiModeAvailable}
138138
class="gui-mode-button">
@@ -141,10 +141,10 @@ export class LocalConditionalCardEditor extends LitElement implements LovelaceCa
141141
? "ui.panel.lovelace.editor.edit_card.show_code_editor"
142142
: "ui.panel.lovelace.editor.edit_card.show_visual_editor",
143143
)}
144-
</mwc-button>
145-
<mwc-button @click=${this._handleReplaceCard}
144+
</ha-button>
145+
<ha-button @click=${this._handleReplaceCard}
146146
>${this.hass?.localize("ui.panel.lovelace.editor.card.conditional.change_type")}
147-
</mwc-button>
147+
</ha-button>
148148
</div>
149149
<hui-card-element-editor
150150
.hass=${this.hass}
@@ -254,11 +254,11 @@ export class LocalConditionalCardEditor extends LitElement implements LovelaceCa
254254
}
255255

256256
static styles: CSSResultGroup = css`
257-
sl-tab {
257+
ha-tab {
258258
flex: 1;
259259
}
260260
261-
sl-tab::part(base) {
261+
ha-tab::part(base) {
262262
width: 100%;
263263
justify-content: center;
264264
}
@@ -295,6 +295,7 @@ export class LocalConditionalCardEditor extends LitElement implements LovelaceCa
295295
display: flex;
296296
justify-content: flex-end;
297297
width: 100%;
298+
margin-bottom: 15px;
298299
}
299300
300301
.gui-mode-button {

src/local-conditional-card.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,25 @@ export class LocalConditionalCard extends LitElement {
108108
document.removeEventListener(EVENT_LOVELACE_DOM, this._handleLovelaceDomEvent);
109109
}
110110

111+
async firstUpdated() {
112+
await this._preloadCardEditors();
113+
}
114+
115+
async _preloadCardEditors() {
116+
const helpers = await (window as any).loadCardHelpers?.();
117+
if (!helpers) return;
118+
119+
const verticalStackCard = await helpers.createCardElement({
120+
type: "vertical-stack",
121+
cards: [],
122+
});
123+
124+
await customElements.whenDefined("hui-vertical-stack-card");
125+
if (verticalStackCard?.constructor?.getConfigElement) {
126+
await verticalStackCard.constructor.getConfigElement();
127+
}
128+
}
129+
111130
private _handleLovelaceDomEvent(e: Event): void {
112131
const lovelaceEvent = e as LovelaceDomEvent;
113132
if (

0 commit comments

Comments
 (0)