From 0010bf5a8f2099fb8b4d563fc9114c977e8de9b5 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 23 Feb 2022 15:24:00 +0100 Subject: [PATCH] Input conversion in dev tools (#11795) --- README.md | 2 +- src/dialogs/generic/dialog-box.ts | 2 +- .../event/developer-tools-event.js | 17 +++-- .../event/event-subscribe-card.ts | 18 +++--- .../state/developer-tools-state.js | 63 ++++++++++++++----- .../editor/card-editor/hui-card-preview.ts | 1 - .../hui-conditional-card-editor.ts | 2 +- src/panels/mailbox/ha-panel-mailbox.js | 1 - .../ha-long-lived-access-token-dialog.ts | 10 ++- 9 files changed, 80 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 62b0343f95..685dddba09 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This is the repository for the official [Home Assistant](https://home-assistant.io) frontend. -[![Screenshot of the frontend](https://raw.githubusercontent.com/home-assistant/home-assistant-polymer/master/docs/screenshot.png)](https://demo.home-assistant.io/) +[![Screenshot of the frontend](https://raw.githubusercontent.com/home-assistant/frontend/master/docs/screenshot.png)](https://demo.home-assistant.io/) - [View demo of Home Assistant](https://demo.home-assistant.io/) - [More information about Home Assistant](https://home-assistant.io) diff --git a/src/dialogs/generic/dialog-box.ts b/src/dialogs/generic/dialog-box.ts index df13ffaf4b..d57508e3cc 100644 --- a/src/dialogs/generic/dialog-box.ts +++ b/src/dialogs/generic/dialog-box.ts @@ -75,7 +75,7 @@ class DialogBox extends LitElement { ? html`

- + value="[[eventType]]" + on-change="eventTypeChanged" + >

[[localize( 'ui.panel.developer-tools.tabs.events.data' )]]

@@ -150,6 +155,10 @@ class HaPanelDevEvent extends EventsMixin(LocalizeMixin(PolymerElement)) { this.eventType = ev.detail.eventType; } + eventTypeChanged(ev) { + this.eventType = ev.target.value; + } + _computeParsedEventData(eventData) { try { return eventData.trim() ? load(eventData) : {}; diff --git a/src/panels/developer-tools/event/event-subscribe-card.ts b/src/panels/developer-tools/event/event-subscribe-card.ts index cfa8a67be6..6e8d889f6a 100644 --- a/src/panels/developer-tools/event/event-subscribe-card.ts +++ b/src/panels/developer-tools/event/event-subscribe-card.ts @@ -1,11 +1,10 @@ import "@material/mwc-button"; -import "@polymer/paper-input/paper-input"; import { HassEvent } from "home-assistant-js-websocket"; import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators"; import { formatTime } from "../../../common/datetime/format_time"; import "../../../components/ha-card"; -import { PolymerChangedEvent } from "../../../polymer-types"; +import "../../../components/ha-textfield"; import { HomeAssistant } from "../../../types"; @customElement("event-subscribe-card") @@ -39,7 +38,7 @@ class EventSubscribeCard extends LitElement { )} >
- + @input=${this._valueChanged} + > ): void { - this._eventType = ev.detail.value; + private _valueChanged(ev): void { + this._eventType = ev.target.value; } private async _handleSubmit(): Promise { @@ -116,9 +115,8 @@ class EventSubscribeCard extends LitElement { display: block; padding: 0 0 16px 16px; } - paper-input { - display: inline-block; - width: 200px; + ha-textfield { + width: 300px; } mwc-button { vertical-align: middle; diff --git a/src/panels/developer-tools/state/developer-tools-state.js b/src/panels/developer-tools/state/developer-tools-state.js index e90e0365ce..8196bbe7eb 100644 --- a/src/panels/developer-tools/state/developer-tools-state.js +++ b/src/panels/developer-tools/state/developer-tools-state.js @@ -5,7 +5,6 @@ import { mdiInformationOutline, mdiRefresh, } from "@mdi/js"; -import "@polymer/paper-input/paper-input"; import { html } from "@polymer/polymer/lib/utils/html-tag"; /* eslint-plugin-disable lit */ import { PolymerElement } from "@polymer/polymer/polymer-element"; @@ -42,6 +41,14 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) { padding: 16px; } + ha-textfield { + display: block; + } + + .state-input { + margin-top: 16px; + } + ha-expansion-panel { margin: 0 8px 16px; } @@ -74,6 +81,14 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) { ); } + .filters th { + padding: 0; + } + + .filters ha-textfield { + --mdc-text-field-fill-color: transparent; + } + th.attributes { position: relative; } @@ -164,16 +179,17 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) { on-change="entityIdChanged" allow-custom-entity > - + >

[[localize('ui.panel.developer-tools.tabs.states.state_attributes')]]

@@ -234,27 +250,30 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) { > - + - + value="[[_entityFilter]]" + on-input="_entityFilterChanged" + > - + value="[[_stateFilter]]" + on-input="_stateFilterChanged" + > - + value="[[_attributeFilter]]" + on-input="_attributeFilterChanged" + > @@ -416,6 +435,22 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) { this._expanded = true; } + stateChanged(ev) { + this._state = ev.target.value; + } + + _entityFilterChanged(ev) { + this._entityFilter = ev.target.value; + } + + _stateFilterChanged(ev) { + this._stateFilter = ev.target.value; + } + + _attributeFilterChanged(ev) { + this._attributeFilter = ev.target.value; + } + _getHistoryURL(entityId, inputDate) { const date = new Date(inputDate); const hourBefore = addHours(date, -1).toISOString(); diff --git a/src/panels/lovelace/editor/card-editor/hui-card-preview.ts b/src/panels/lovelace/editor/card-editor/hui-card-preview.ts index b489d4a898..8bcfb57cf3 100644 --- a/src/panels/lovelace/editor/card-editor/hui-card-preview.ts +++ b/src/panels/lovelace/editor/card-editor/hui-card-preview.ts @@ -1,4 +1,3 @@ -import "@polymer/paper-input/paper-textarea"; import { PropertyValues, ReactiveElement } from "lit"; import { property } from "lit/decorators"; import { computeRTL } from "../../../../common/util/compute_rtl"; diff --git a/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts index d30336a1e8..a62cf2bb7b 100644 --- a/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts @@ -333,7 +333,7 @@ export class HuiConditionalCardEditor .condition .state mwc-select { margin-right: 16px; } - .condition .state paper-input { + .condition .state ha-textfield { flex-grow: 1; } diff --git a/src/panels/mailbox/ha-panel-mailbox.js b/src/panels/mailbox/ha-panel-mailbox.js index 0cdc7f7799..7cb4af0b20 100644 --- a/src/panels/mailbox/ha-panel-mailbox.js +++ b/src/panels/mailbox/ha-panel-mailbox.js @@ -1,7 +1,6 @@ import "@material/mwc-button"; import "@polymer/app-layout/app-header/app-header"; import "@polymer/app-layout/app-toolbar/app-toolbar"; -import "@polymer/paper-input/paper-textarea"; import "@polymer/paper-item/paper-item"; import "@polymer/paper-item/paper-item-body"; import "@polymer/paper-tabs/paper-tab"; diff --git a/src/panels/profile/ha-long-lived-access-token-dialog.ts b/src/panels/profile/ha-long-lived-access-token-dialog.ts index edc28e64c6..5786a783a4 100644 --- a/src/panels/profile/ha-long-lived-access-token-dialog.ts +++ b/src/panels/profile/ha-long-lived-access-token-dialog.ts @@ -1,5 +1,4 @@ import "@material/mwc-button"; -import "@polymer/paper-input/paper-input"; import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../common/dom/fire_event"; @@ -7,6 +6,7 @@ import { createCloseHeading } from "../../components/ha-dialog"; import { haStyleDialog } from "../../resources/styles"; import type { HomeAssistant } from "../../types"; import { LongLivedAccessTokenDialogParams } from "./show-long-lived-access-token-dialog"; +import "../../components/ha-textfield"; const QR_LOGO_URL = "/static/icons/favicon-192x192.png"; @@ -41,14 +41,15 @@ export class HaLongLivedAccessTokenDialog extends LitElement { @closed=${this.closeDialog} >
- + readOnly + >
${this._qrCode ? this._qrCode @@ -94,6 +95,9 @@ export class HaLongLivedAccessTokenDialog extends LitElement { #qr { text-align: center; } + ha-textfield { + display: block; + } `, ]; }