This commit is contained in:
Yosi Levy 2023-01-30 21:51:37 +02:00 committed by GitHub
parent c1ed00a3f1
commit 549d893407
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 8 deletions

View File

@ -1,4 +1,3 @@
import "@material/mwc-list/mwc-list-item";
import { HassEntity } from "home-assistant-js-websocket"; import { HassEntity } from "home-assistant-js-websocket";
import { html, LitElement, PropertyValues, TemplateResult } from "lit"; import { html, LitElement, PropertyValues, TemplateResult } from "lit";
import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit"; import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
@ -10,6 +9,7 @@ import { computeStateName } from "../../common/entity/compute_state_name";
import { caseInsensitiveStringCompare } from "../../common/string/compare"; import { caseInsensitiveStringCompare } from "../../common/string/compare";
import { PolymerChangedEvent } from "../../polymer-types"; import { PolymerChangedEvent } from "../../polymer-types";
import { HomeAssistant } from "../../types"; import { HomeAssistant } from "../../types";
import "../ha-list-item";
import "../ha-combo-box"; import "../ha-combo-box";
import type { HaComboBox } from "../ha-combo-box"; import type { HaComboBox } from "../ha-combo-box";
import "../ha-icon-button"; import "../ha-icon-button";
@ -24,13 +24,13 @@ export type HaEntityPickerEntityFilterFunc = (entity: HassEntity) => boolean;
// eslint-disable-next-line lit/prefer-static-styles // eslint-disable-next-line lit/prefer-static-styles
const rowRenderer: ComboBoxLitRenderer<HassEntityWithCachedName> = (item) => const rowRenderer: ComboBoxLitRenderer<HassEntityWithCachedName> = (item) =>
html`<mwc-list-item graphic="avatar" .twoline=${!!item.entity_id}> html`<ha-list-item graphic="avatar" .twoline=${!!item.entity_id}>
${item.state ${item.state
? html`<state-badge slot="graphic" .stateObj=${item}></state-badge>` ? html`<state-badge slot="graphic" .stateObj=${item}></state-badge>`
: ""} : ""}
<span>${item.friendly_name}</span> <span>${item.friendly_name}</span>
<span slot="secondary">${item.entity_id}</span> <span slot="secondary">${item.entity_id}</span>
</mwc-list-item>`; </ha-list-item>`;
@customElement("ha-entity-picker") @customElement("ha-entity-picker")
export class HaEntityPicker extends LitElement { export class HaEntityPicker extends LitElement {

View File

@ -13,6 +13,15 @@ export class HaCheckListItem extends CheckListItemBase {
:host { :host {
--mdc-theme-secondary: var(--primary-color); --mdc-theme-secondary: var(--primary-color);
} }
:host([graphic="avatar"]) .mdc-deprecated-list-item__graphic,
:host([graphic="medium"]) .mdc-deprecated-list-item__graphic,
:host([graphic="large"]) .mdc-deprecated-list-item__graphic,
:host([graphic="control"]) .mdc-deprecated-list-item__graphic {
margin-inline-end: var(--mdc-list-item-graphic-margin, 16px);
margin-inline-start: 0px;
direction: var(--direction);
}
`, `,
]; ];
} }

View File

@ -1,4 +1,3 @@
import "@material/mwc-list/mwc-list-item";
import { mdiClose, mdiMenuDown, mdiMenuUp } from "@mdi/js"; import { mdiClose, mdiMenuDown, mdiMenuUp } from "@mdi/js";
import { ComboBoxLitRenderer, comboBoxRenderer } from "@vaadin/combo-box/lit"; import { ComboBoxLitRenderer, comboBoxRenderer } from "@vaadin/combo-box/lit";
import "@vaadin/combo-box/theme/material/vaadin-combo-box-light"; import "@vaadin/combo-box/theme/material/vaadin-combo-box-light";
@ -15,6 +14,7 @@ import { customElement, property, query } from "lit/decorators";
import { ifDefined } from "lit/directives/if-defined"; import { ifDefined } from "lit/directives/if-defined";
import { fireEvent } from "../common/dom/fire_event"; import { fireEvent } from "../common/dom/fire_event";
import { HomeAssistant } from "../types"; import { HomeAssistant } from "../types";
import "./ha-list-item";
import "./ha-icon-button"; import "./ha-icon-button";
import "./ha-textfield"; import "./ha-textfield";
import type { HaTextField } from "./ha-textfield"; import type { HaTextField } from "./ha-textfield";
@ -23,7 +23,7 @@ registerStyles(
"vaadin-combo-box-item", "vaadin-combo-box-item",
css` css`
:host { :host {
padding: 0; padding: 0 !important;
} }
:host([focused]:not([disabled])) { :host([focused]:not([disabled])) {
background-color: rgba(var(--rgb-primary-text-color, 0, 0, 0), 0.12); background-color: rgba(var(--rgb-primary-text-color, 0, 0, 0), 0.12);
@ -211,9 +211,9 @@ export class HaComboBox extends LitElement {
private _defaultRowRenderer: ComboBoxLitRenderer< private _defaultRowRenderer: ComboBoxLitRenderer<
string | Record<string, any> string | Record<string, any>
> = (item) => > = (item) =>
html`<mwc-list-item> html`<ha-list-item>
${this.itemLabelPath ? item[this.itemLabelPath] : item} ${this.itemLabelPath ? item[this.itemLabelPath] : item}
</mwc-list-item>`; </ha-list-item>`;
private _clearValue(ev: Event) { private _clearValue(ev: Event) {
ev.stopPropagation(); ev.stopPropagation();

View File

@ -822,6 +822,9 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
} }
ha-button-menu { ha-button-menu {
margin-left: 8px; margin-left: 8px;
margin-inline-start: 8px;
margin-inline-end: initial;
direction: var(--direction);
} }
.container { .container {
display: grid; display: grid;
@ -850,6 +853,9 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
display: block; display: block;
color: var(--secondary-text-color); color: var(--secondary-text-color);
margin-left: 8px; margin-left: 8px;
margin-inline-start: 8px;
margin-inline-end: initial;
direction: var(--direction);
--mdc-ripple-color: transparant; --mdc-ripple-color: transparant;
} }
.search { .search {
@ -874,13 +880,22 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
position: relative; position: relative;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 2px 2px 2px 8px; padding-top: 2px;
padding-bottom: 2px;
padding-right: 2px;
padding-left: 8px;
padding-inline-start: 8px;
padding-inline-end: 2px;
font-size: 14px; font-size: 14px;
width: max-content; width: max-content;
cursor: initial; cursor: initial;
direction: var(--direction);
} }
.active-filters mwc-button { .active-filters mwc-button {
margin-left: 8px; margin-left: 8px;
margin-inline-start: 8px;
margin-inline-end: initial;
direction: var(--direction);
} }
.active-filters::before { .active-filters::before {
background-color: var(--primary-color); background-color: var(--primary-color);