Skip to content

Use mwc-tabs in conditional card editor #7716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bramkragten merged 2 commits into from
Nov 19, 2020
Merged

Use mwc-tabs in conditional card editor #7716

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c87221
Use mwc-tabs in Conditional card editor
thomasloven Nov 17, 2020
0c94368
Add event type
thomasloven Nov 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 18 additions & 19 deletions src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import "@polymer/paper-tabs";
import "@polymer/paper-tabs/paper-tab";
import "@material/mwc-tab-bar/mwc-tab-bar";
import "@material/mwc-tab/mwc-tab";
import type { MDCTabBarActivatedEvent } from "@material/tab-bar";
import {
css,
CSSResultArray,
Expand Down Expand Up @@ -70,21 +71,21 @@ export class HuiConditionalCardEditor extends LitElement
}

return html`
<paper-tabs
.selected=${this._cardTab ? "1" : "0"}
@iron-select=${this._selectTab}
<mwc-tab-bar
.activeIndex=${this._cardTab ? 1 : 0}
@MDCTabBar:activated=${this._selectTab}
>
<paper-tab
>${this.hass!.localize(
<mwc-tab
.label=${this.hass!.localize(
"ui.panel.lovelace.editor.card.conditional.conditions"
)}</paper-tab
>
<paper-tab
>${this.hass!.localize(
)}
></mwc-tab>
<mwc-tab
.label=${this.hass!.localize(
"ui.panel.lovelace.editor.card.conditional.card"
)}</paper-tab
>
</paper-tabs>
)}
></mwc-tab>
</mwc-tab-bar>
${this._cardTab
? html`
<div class="card">
Expand Down Expand Up @@ -192,8 +193,8 @@ export class HuiConditionalCardEditor extends LitElement
`;
}

private _selectTab(ev: Event): void {
this._cardTab = parseInt((ev.target! as any).selected!, 10) === 1;
private _selectTab(ev: MDCTabBarActivatedEvent): void {
this._cardTab = ev.detail.index === 1;
}

private _toggleMode(): void {
Expand Down Expand Up @@ -301,9 +302,7 @@ export class HuiConditionalCardEditor extends LitElement
return [
configElementStyle,
css`
paper-tabs {
--paper-tabs-selection-bar-color: var(--primary-color);
--paper-tab-ink: var(--primary-color);
mwc-tab-bar {
border-bottom: 1px solid var(--divider-color);
}
.conditions {
Expand Down