Skip to content

Fix mwc-select in lovelace editors #11708

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
Feb 17, 2022
Merged

Fix mwc-select in lovelace editors #11708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58e1cab
Fix mwc-select in lovelace editors
zsarnett Feb 16, 2022
dcdfd55
review
zsarnett Feb 16, 2022
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
2 changes: 1 addition & 1 deletion src/panels/lovelace/components/hui-theme-select-editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 2 additions & 0 deletions src/panels/lovelace/editor/config-elements/hui-calendar-card-editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ export class HuiCalendarCardEditor
.configValue=${"initial_view"}
@selected=${this._viewChanged}
@closed=${stopPropagation}
naturalMenuWidth
fixedMenuPosition
>
${views.map(
(view) => html`
Expand Down
2 changes: 2 additions & 0 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
Expand Up @@ -160,6 +160,8 @@ export class HuiConditionalCardEditor
.configValue=${"invert"}
@selected=${this._changeCondition}
@closed=${stopPropagation}
naturalMenuWidth
fixedMenuPosition
>
<mwc-list-item value="false">
${this.hass!.localize(
Expand Down
6 changes: 5 additions & 1 deletion src/panels/lovelace/editor/config-elements/hui-generic-entity-row-editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -103,9 +104,12 @@ export class HuiGenericEntityRowEditor
</div>
<mwc-select
label="Secondary Info"
.selected=${this._config.secondary_info || "none"}
Copy link
Copy Markdown
Member

@bramkragten bramkragten Feb 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be value

.configValue=${"secondary_info"}
@selected=${this._valueChanged}
@closed=${stopPropagation}
.value=${this._config.secondary_info || "none"}
naturalMenuWidth
fixedMenuPosition
>
<mwc-list-item value=""
>${this.hass!.localize(
Expand Down
1 change: 1 addition & 0 deletions src/panels/lovelace/editor/hui-element-editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ export abstract class HuiElementEditor<T> extends LitElement {
);
}
} else {
this._guiSupported = false;
Copy link
Copy Markdown
Contributor Author

@zsarnett zsarnett Feb 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also a fix for header and footer editors. these were allowing switch back and forth between code editor and nothing when using buttons

this.GUImode = false;
}
} catch (err: any) {
Expand Down
1 change: 0 additions & 1 deletion src/panels/lovelace/editor/view-editor/hui-view-visibility-editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import "@material/mwc-list/mwc-list-item";
import "@material/mwc-select/mwc-select";
import {
css,
CSSResultGroup,
Expand Down