From f2745747ba0752eb4328b6243f59516dc7a30c47 Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Mon, 18 Dec 2023 13:05:56 +0100 Subject: [PATCH] Replace more polymer paper inputs and remove paper-input style attributes (#18929) --- .../zha/zha-add-devices-page.ts | 20 ++++----- .../zha/zha-add-group-page.ts | 18 ++++---- .../zha/zha-cluster-attributes.ts | 43 ++++++++++--------- .../zha/zha-cluster-commands.ts | 21 ++++----- .../integration-panels/zha/zha-device-card.ts | 9 ++-- .../state/developer-tools-state.ts | 3 -- .../statistics/developer-tools-statistics.ts | 3 -- src/resources/codemirror.ts | 11 ++--- 8 files changed, 59 insertions(+), 69 deletions(-) diff --git a/src/panels/config/integrations/integration-panels/zha/zha-add-devices-page.ts b/src/panels/config/integrations/integration-panels/zha/zha-add-devices-page.ts index 0201e8e4fc..baae1a21cf 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-add-devices-page.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-add-devices-page.ts @@ -1,5 +1,4 @@ import "@material/mwc-button"; -import "@polymer/paper-input/paper-textarea"; import { css, CSSResultGroup, @@ -20,6 +19,7 @@ import { haStyle } from "../../../../../resources/styles"; import { HomeAssistant, Route } from "../../../../../types"; import { zhaTabs } from "./zha-config-dashboard"; import "./zha-device-pairing-status-card"; +import "../../../../../components/ha-textarea"; @customElement("zha-add-devices-page") class ZHAAddDevicesPage extends LitElement { @@ -146,13 +146,13 @@ class ZHAAddDevicesPage extends LitElement { `} ${this._showLogs - ? html` - ` + ` : ""} `; @@ -165,13 +165,6 @@ class ZHAAddDevicesPage extends LitElement { private _handleMessage(message: any): void { if (message.type === LOG_OUTPUT) { this._formattedEvents += message.log_entry.message + "\n"; - if (this.shadowRoot) { - const paperTextArea = this.shadowRoot.querySelector("paper-textarea"); - if (paperTextArea) { - const textArea = (paperTextArea.inputElement as any).textarea; - textArea.scrollTop = textArea.scrollHeight; - } - } } if (message.type && DEVICE_MESSAGE_TYPES.includes(message.type)) { this._discoveredDevices[message.device_info.ieee] = message.device_info; @@ -266,6 +259,9 @@ class ZHAAddDevicesPage extends LitElement { color: grey; padding-left: 16px; } + ha-textarea { + width: 100%; + } `, ]; } diff --git a/src/panels/config/integrations/integration-panels/zha/zha-add-group-page.ts b/src/panels/config/integrations/integration-panels/zha/zha-add-group-page.ts index 5cd32c78da..4581ac7a91 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-add-group-page.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-add-group-page.ts @@ -1,6 +1,4 @@ import "@material/mwc-button"; -import "@polymer/paper-input/paper-input"; -import type { PaperInputElement } from "@polymer/paper-input/paper-input"; import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit"; import { customElement, property, state, query } from "lit/decorators"; import type { HASSDomEvent } from "../../../../../common/dom/fire_event"; @@ -14,8 +12,9 @@ import { ZHAGroup, } from "../../../../../data/zha"; import "../../../../../layouts/hass-subpage"; -import type { ValueChangedEvent, HomeAssistant } from "../../../../../types"; +import type { HomeAssistant } from "../../../../../types"; import "../../../ha-config-section"; +import "../../../../../components/ha-textfield"; import "./zha-device-endpoint-data-table"; import type { ZHADeviceEndpointDataTable } from "./zha-device-endpoint-data-table"; @@ -66,14 +65,14 @@ export class ZHAAddGroupPage extends LitElement { "ui.panel.config.zha.groups.create_group_details" )}

- + >
${this.hass.localize("ui.panel.config.zha.groups.add_members")} @@ -139,9 +138,8 @@ export class ZHAAddGroupPage extends LitElement { navigate(`/config/zha/group/${group.group_id}`, { replace: true }); } - private _handleNameChange(ev: ValueChangedEvent) { - const target = ev.currentTarget as PaperInputElement; - this._groupName = target.value || ""; + private _handleNameChange(event) { + this._groupName = event.target.value || ""; } static get styles(): CSSResultGroup { diff --git a/src/panels/config/integrations/integration-panels/zha/zha-cluster-attributes.ts b/src/panels/config/integrations/integration-panels/zha/zha-cluster-attributes.ts index b5b4087940..b0575c42f9 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-cluster-attributes.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-cluster-attributes.ts @@ -1,5 +1,4 @@ import "@material/mwc-list/mwc-list-item"; -import "@polymer/paper-input/paper-input"; import { css, CSSResultGroup, @@ -15,6 +14,7 @@ import "../../../../../components/buttons/ha-call-service-button"; import "../../../../../components/buttons/ha-progress-button"; import "../../../../../components/ha-card"; import "../../../../../components/ha-select"; +import "../../../../../components/ha-textfield"; import { forwardHaptic } from "../../../../../data/haptics"; import { Attribute, @@ -27,11 +27,7 @@ import { import { haStyle } from "../../../../../resources/styles"; import { HomeAssistant } from "../../../../../types"; import { formatAsPaddedHex } from "./functions"; -import { - ChangeEvent, - ItemSelectedEvent, - SetAttributeServiceData, -} from "./types"; +import { ItemSelectedEvent, SetAttributeServiceData } from "./types"; @customElement("zha-cluster-attributes") export class ZHAClusterAttributes extends LitElement { @@ -101,24 +97,28 @@ export class ZHAClusterAttributes extends LitElement { private _renderAttributeInteractions(): TemplateResult { return html`
- + @change=${this._onAttributeValueChanged} + .placeholder=${this.hass!.localize( + "ui.panel.config.zha.common.value" + )} + >
- + @change=${this._onManufacturerCodeOverrideChanged} + .placeholder=${this.hass!.localize( + "ui.panel.config.zha.common.value" + )} + >
- + >
- + >