Add arrow to areas under floors (#20344)

This commit is contained in:
Bram Kragten 2024-04-03 10:24:10 +02:00 committed by GitHub
parent 95caf8c7df
commit 30d18050d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 8 deletions

View File

@ -1,7 +1,7 @@
import { mdiTextureBox } from "@mdi/js";
import { mdiSubdirectoryArrowRight, mdiTextureBox } from "@mdi/js";
import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
import { LitElement, PropertyValues, TemplateResult, html } from "lit";
import { LitElement, PropertyValues, TemplateResult, html, nothing } from "lit";
import { customElement, property, query, state } from "lit/decorators";
import memoizeOne from "memoize-one";
import { fireEvent } from "../common/dom/fire_event";
@ -49,9 +49,16 @@ const rowRenderer: ComboBoxLitRenderer<FloorAreaEntry> = (item) =>
html`<ha-list-item
graphic="icon"
style=${item.type === "area" && item.hasFloor
? "--mdc-list-side-padding-left: 48px;"
? "padding-left: 42px; padding-inline-start: 42px; --mdc-list-item-graphic-margin: 32px;"
: ""}
>
${item.type === "area" && item.hasFloor
? html`<ha-svg-icon
style="margin-inline-end: 8px; opacity: .6;"
slot="graphic"
.path=${mdiSubdirectoryArrowRight}
></ha-svg-icon>`
: nothing}
${item.type === "floor"
? html`<ha-floor-icon slot="graphic" .floor=${item}></ha-floor-icon>`
: item.icon

View File

@ -1,7 +1,11 @@
import "@material/mwc-menu/mwc-menu-surface";
import { mdiFilterVariantRemove, mdiTextureBox } from "@mdi/js";
import {
mdiFilterVariantRemove,
mdiSubdirectoryArrowRight,
mdiTextureBox,
} from "@mdi/js";
import { UnsubscribeFunc } from "home-assistant-js-websocket";
import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
import { CSSResultGroup, LitElement, css, html, nothing } from "lit";
import { customElement, property, state } from "lit/decorators";
import { repeat } from "lit/directives/repeat";
import memoizeOne from "memoize-one";
@ -11,7 +15,7 @@ import {
getFloorAreaLookup,
subscribeFloorRegistry,
} from "../data/floor_registry";
import { findRelated, RelatedResult } from "../data/search";
import { RelatedResult, findRelated } from "../data/search";
import { SubscribeMixin } from "../mixins/subscribe-mixin";
import { haStyleScrollbar } from "../resources/styles";
import type { HomeAssistant } from "../types";
@ -112,6 +116,13 @@ export class HaFilterFloorAreas extends SubscribeMixin(LitElement) {
class=${area.floor_id ? "floor" : ""}
@request-selected=${this._handleItemClick}
>
${area.floor_id
? html`<ha-svg-icon
class="subdir"
slot="graphic"
.path=${mdiSubdirectoryArrowRight}
></ha-svg-icon>`
: nothing}
${area.icon
? html`<ha-icon slot="graphic" .icon=${area.icon}></ha-icon>`
: html`<ha-svg-icon
@ -294,9 +305,15 @@ export class HaFilterFloorAreas extends SubscribeMixin(LitElement) {
--mdc-list-item-graphic-margin: 16px;
}
.floor {
padding-left: 32px;
padding-inline-start: 32px;
padding-left: 38px;
padding-inline-start: 38px;
--mdc-list-item-graphic-margin: 32px;
}
.subdir {
margin-inline-end: 8px;
opacity: .6;
}
.
`,
];
}