From 5937be695f0e002d28654b08dd6c7d3b18028567 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 6 Oct 2020 15:55:55 +0200 Subject: [PATCH] Bump Lit, use cache for query (#7245) --- .../addon-view/config/hassio-addon-config.ts | 2 +- .../dialog-hassio-repositories.ts | 2 +- package.json | 12 +- src/components/buttons/ha-progress-button.ts | 2 +- src/components/data-table/ha-data-table.ts | 12 +- .../entity/ha-entity-attribute-picker.ts | 2 +- src/components/entity/ha-entity-picker.ts | 2 +- src/components/ha-button-menu.ts | 2 +- src/components/ha-form/ha-form-boolean.ts | 2 +- src/components/ha-form/ha-form-float.ts | 2 +- .../ha-form/ha-form-multi_select.ts | 2 +- .../ha-form-positive_time_period_dict.ts | 2 +- src/components/ha-form/ha-form-select.ts | 2 +- src/components/ha-hls-player.ts | 2 +- src/components/ha-yaml-editor.ts | 2 +- .../image-cropper-dialog.ts | 2 +- .../ha-voice-command-dialog.ts | 2 +- src/layouts/hass-tabs-subpage-data-table.ts | 2 +- src/managers/notification-manager.ts | 2 +- .../types/ha-automation-action-event.ts | 2 +- .../types/ha-automation-action-service.ts | 2 +- .../automation/thingtalk/dialog-thingtalk.ts | 2 +- .../config/entities/ha-config-entities.ts | 2 +- .../helpers/forms/ha-input_select-form.ts | 2 +- .../zha/zha-add-group-page.ts | 2 +- .../zha/zha-clusters-data-table.ts | 2 +- .../zha/zha-device-endpoint-data-table.ts | 2 +- .../zha/zha-group-binding.ts | 2 +- .../integration-panels/zha/zha-group-page.ts | 2 +- .../config/logs/dialog-system-log-detail.ts | 2 +- src/panels/config/logs/ha-config-logs.ts | 2 +- .../card-editor/hui-dialog-create-card.ts | 29 ++-- .../card-editor/hui-dialog-delete-card.ts | 2 +- .../card-editor/hui-dialog-edit-card.ts | 2 +- .../card-editor/hui-entity-picker-table.ts | 6 +- .../unused-entities/hui-unused-entities.ts | 2 +- yarn.lock | 162 +++++++----------- 37 files changed, 132 insertions(+), 153 deletions(-) diff --git a/hassio/src/addon-view/config/hassio-addon-config.ts b/hassio/src/addon-view/config/hassio-addon-config.ts index 415e3e3e91..29b73b8e90 100644 --- a/hassio/src/addon-view/config/hassio-addon-config.ts +++ b/hassio/src/addon-view/config/hassio-addon-config.ts @@ -39,7 +39,7 @@ class HassioAddonConfig extends LitElement { @property({ type: Boolean }) private _configHasChanged = false; - @query("ha-yaml-editor") private _editor!: HaYamlEditor; + @query("ha-yaml-editor", true) private _editor!: HaYamlEditor; protected render(): TemplateResult { const editor = this._editor; diff --git a/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts b/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts index 8149e97744..2d8d028cdf 100644 --- a/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts +++ b/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts @@ -39,7 +39,7 @@ class HassioRepositoriesDialog extends LitElement { @property({ attribute: false }) private _dialogParams?: HassioRepositoryDialogParams; - @query("#repository_input") private _optionInput?: PaperInputElement; + @query("#repository_input", true) private _optionInput?: PaperInputElement; @internalProperty() private _opened = false; diff --git a/package.json b/package.json index e176dd4e88..7227096b4b 100644 --- a/package.json +++ b/package.json @@ -103,8 +103,8 @@ "js-yaml": "^3.13.1", "leaflet": "^1.4.0", "leaflet-draw": "^1.0.4", - "lit-element": "^2.3.1", - "lit-html": "^1.2.1", + "lit-element": "^2.4.0", + "lit-html": "^1.3.0", "lit-virtualizer": "^0.4.2", "marked": "^1.1.1", "mdn-polyfills": "^5.16.0", @@ -180,7 +180,7 @@ "html-minifier": "^4.0.0", "husky": "^1.3.1", "lint-staged": "^8.1.5", - "lit-analyzer": "^1.2.0", + "lit-analyzer": "^1.2.1", "lodash.template": "^4.5.0", "magic-string": "^0.25.7", "map-stream": "^0.0.7", @@ -201,7 +201,7 @@ "source-map-url": "^0.4.0", "systemjs": "^6.3.2", "terser-webpack-plugin": "^3.0.6", - "ts-lit-plugin": "^1.2.0", + "ts-lit-plugin": "^1.2.1", "ts-mocha": "^7.0.0", "typescript": "^3.8.3", "vinyl-buffer": "^1.0.1", @@ -218,8 +218,8 @@ "resolutions": { "@webcomponents/webcomponentsjs": "^2.2.10", "@polymer/polymer": "3.1.0", - "lit-html": "1.2.1", - "lit-element": "2.3.1", + "lit-html": "1.3.0", + "lit-element": "2.4.0", "@material/animation": "8.0.0-canary.096a7a066.0", "@material/base": "8.0.0-canary.096a7a066.0", "@material/feature-targeting": "8.0.0-canary.096a7a066.0", diff --git a/src/components/buttons/ha-progress-button.ts b/src/components/buttons/ha-progress-button.ts index a446d456fc..c6c325fdab 100644 --- a/src/components/buttons/ha-progress-button.ts +++ b/src/components/buttons/ha-progress-button.ts @@ -21,7 +21,7 @@ class HaProgressButton extends LitElement { @property({ type: Boolean }) public raised = false; - @query("mwc-button") private _button?: Button; + @query("mwc-button", true) private _button?: Button; public render(): TemplateResult { return html` diff --git a/src/components/data-table/ha-data-table.ts b/src/components/data-table/ha-data-table.ts index db83db5a6d..bb984a8cce 100644 --- a/src/components/data-table/ha-data-table.ts +++ b/src/components/data-table/ha-data-table.ts @@ -101,6 +101,9 @@ export class HaDataTable extends LitElement { @property({ type: String }) public searchLabel?: string; + @property({ type: Boolean, attribute: "no-label-float" }) + public noLabelFloat? = false; + @property({ type: String }) public filter = ""; @internalProperty() private _filterable = false; @@ -113,9 +116,9 @@ export class HaDataTable extends LitElement { @internalProperty() private _filteredData: DataTableRowData[] = []; - @query("slot[name='header']") private _header!: HTMLSlotElement; + @internalProperty() private _headerHeight = 0; - @query(".mdc-data-table__table") private _table!: HTMLDivElement; + @query("slot[name='header']") private _header!: HTMLSlotElement; private _checkableRowsCount?: number; @@ -206,6 +209,7 @@ export class HaDataTable extends LitElement { ` @@ -220,7 +224,7 @@ export class HaDataTable extends LitElement { style=${styleMap({ height: this.autoHeight ? `${(this._filteredData.length || 1) * 53 + 57}px` - : `calc(100% - ${this._header?.clientHeight}px)`, + : `calc(100% - ${this._headerHeight}px)`, })} >
@@ -523,7 +527,7 @@ export class HaDataTable extends LitElement { return; } await this.updateComplete; - this._table.style.height = `calc(100% - ${this._header.clientHeight}px)`; + this._headerHeight = this._header.clientHeight; } @eventOptions({ passive: true }) diff --git a/src/components/entity/ha-entity-attribute-picker.ts b/src/components/entity/ha-entity-attribute-picker.ts index ee2958323b..909526c110 100644 --- a/src/components/entity/ha-entity-attribute-picker.ts +++ b/src/components/entity/ha-entity-attribute-picker.ts @@ -55,7 +55,7 @@ class HaEntityAttributePicker extends LitElement { @property({ type: Boolean }) private _opened = false; - @query("vaadin-combo-box-light") private _comboBox!: HTMLElement; + @query("vaadin-combo-box-light", true) private _comboBox!: HTMLElement; protected shouldUpdate(changedProps: PropertyValues) { return !(!changedProps.has("_opened") && this._opened); diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts index 94ddcf4517..365f39856f 100644 --- a/src/components/entity/ha-entity-picker.ts +++ b/src/components/entity/ha-entity-picker.ts @@ -97,7 +97,7 @@ export class HaEntityPicker extends LitElement { @property({ type: Boolean }) private _opened = false; - @query("vaadin-combo-box-light") private _comboBox!: HTMLElement; + @query("vaadin-combo-box-light", true) private _comboBox!: HTMLElement; private _initedStates = false; diff --git a/src/components/ha-button-menu.ts b/src/components/ha-button-menu.ts index 7adc266a56..a6ce70d2c9 100644 --- a/src/components/ha-button-menu.ts +++ b/src/components/ha-button-menu.ts @@ -23,7 +23,7 @@ export class HaButtonMenu extends LitElement { @property({ type: Boolean }) public disabled = false; - @query("mwc-menu") private _menu?: Menu; + @query("mwc-menu", true) private _menu?: Menu; public get items() { return this._menu?.items; diff --git a/src/components/ha-form/ha-form-boolean.ts b/src/components/ha-form/ha-form-boolean.ts index c8c956ceca..454a01e718 100644 --- a/src/components/ha-form/ha-form-boolean.ts +++ b/src/components/ha-form/ha-form-boolean.ts @@ -27,7 +27,7 @@ export class HaFormBoolean extends LitElement implements HaFormElement { @property() public suffix!: string; - @query("paper-checkbox") private _input?: HTMLElement; + @query("paper-checkbox", true) private _input?: HTMLElement; public focus() { if (this._input) { diff --git a/src/components/ha-form/ha-form-float.ts b/src/components/ha-form/ha-form-float.ts index d915434a3d..9720f0ffd2 100644 --- a/src/components/ha-form/ha-form-float.ts +++ b/src/components/ha-form/ha-form-float.ts @@ -21,7 +21,7 @@ export class HaFormFloat extends LitElement implements HaFormElement { @property() public suffix!: string; - @query("paper-input") private _input?: HTMLElement; + @query("paper-input", true) private _input?: HTMLElement; public focus() { if (this._input) { diff --git a/src/components/ha-form/ha-form-multi_select.ts b/src/components/ha-form/ha-form-multi_select.ts index b46218ae6f..29f174a160 100644 --- a/src/components/ha-form/ha-form-multi_select.ts +++ b/src/components/ha-form/ha-form-multi_select.ts @@ -35,7 +35,7 @@ export class HaFormMultiSelect extends LitElement implements HaFormElement { @internalProperty() private _init = false; - @query("paper-menu-button") private _input?: HTMLElement; + @query("paper-menu-button", true) private _input?: HTMLElement; public focus(): void { if (this._input) { diff --git a/src/components/ha-form/ha-form-positive_time_period_dict.ts b/src/components/ha-form/ha-form-positive_time_period_dict.ts index b43bbd4ffa..d5a0db5975 100644 --- a/src/components/ha-form/ha-form-positive_time_period_dict.ts +++ b/src/components/ha-form/ha-form-positive_time_period_dict.ts @@ -20,7 +20,7 @@ export class HaFormTimePeriod extends LitElement implements HaFormElement { @property() public suffix!: string; - @query("paper-time-input") private _input?: HTMLElement; + @query("paper-time-input", true) private _input?: HTMLElement; public focus() { if (this._input) { diff --git a/src/components/ha-form/ha-form-select.ts b/src/components/ha-form/ha-form-select.ts index 359a06c5a8..bac4f8d963 100644 --- a/src/components/ha-form/ha-form-select.ts +++ b/src/components/ha-form/ha-form-select.ts @@ -24,7 +24,7 @@ export class HaFormSelect extends LitElement implements HaFormElement { @property() public suffix!: string; - @query("ha-paper-dropdown-menu") private _input?: HTMLElement; + @query("ha-paper-dropdown-menu", true) private _input?: HTMLElement; public focus() { if (this._input) { diff --git a/src/components/ha-hls-player.ts b/src/components/ha-hls-player.ts index 61f189713c..124fb2fdf2 100644 --- a/src/components/ha-hls-player.ts +++ b/src/components/ha-hls-player.ts @@ -38,7 +38,7 @@ class HaHLSPlayer extends LitElement { @property({ type: Boolean, attribute: "allow-exoplayer" }) public allowExoPlayer = false; - @query("video") private _videoEl!: HTMLVideoElement; + @query("video", true) private _videoEl!: HTMLVideoElement; @internalProperty() private _attached = false; diff --git a/src/components/ha-yaml-editor.ts b/src/components/ha-yaml-editor.ts index 596e878b51..c905ec24e5 100644 --- a/src/components/ha-yaml-editor.ts +++ b/src/components/ha-yaml-editor.ts @@ -44,7 +44,7 @@ export class HaYamlEditor extends LitElement { @internalProperty() private _yaml = ""; - @query("ha-code-editor") private _editor?: HaCodeEditor; + @query("ha-code-editor", true) private _editor?: HaCodeEditor; public setValue(value): void { try { diff --git a/src/dialogs/image-cropper-dialog/image-cropper-dialog.ts b/src/dialogs/image-cropper-dialog/image-cropper-dialog.ts index ed9e3a05aa..c2ab0ca148 100644 --- a/src/dialogs/image-cropper-dialog/image-cropper-dialog.ts +++ b/src/dialogs/image-cropper-dialog/image-cropper-dialog.ts @@ -29,7 +29,7 @@ export class HaImagecropperDialog extends LitElement { @internalProperty() private _open = false; - @query("img") private _image!: HTMLImageElement; + @query("img", true) private _image!: HTMLImageElement; private _cropper?: Cropper; diff --git a/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts b/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts index aafdb13ee0..305d3206c8 100644 --- a/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts +++ b/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts @@ -57,7 +57,7 @@ export class HaVoiceCommandDialog extends LitElement { @internalProperty() private _agentInfo?: AgentInfo; - @query("#messages") private messages!: PaperDialogScrollableElement; + @query("#messages", true) private messages!: PaperDialogScrollableElement; private recognition!: SpeechRecognition; diff --git a/src/layouts/hass-tabs-subpage-data-table.ts b/src/layouts/hass-tabs-subpage-data-table.ts index 58ea90fb99..5476653f9e 100644 --- a/src/layouts/hass-tabs-subpage-data-table.ts +++ b/src/layouts/hass-tabs-subpage-data-table.ts @@ -99,7 +99,7 @@ export class HaTabsSubpageDataTable extends LitElement { */ @property() public tabs!: PageNavigation[]; - @query("ha-data-table") private _dataTable!: HaDataTable; + @query("ha-data-table", true) private _dataTable!: HaDataTable; public clearSelection() { this._dataTable.clearSelection(); diff --git a/src/managers/notification-manager.ts b/src/managers/notification-manager.ts index 2e4bed3c13..9fa591fc1b 100644 --- a/src/managers/notification-manager.ts +++ b/src/managers/notification-manager.ts @@ -33,7 +33,7 @@ class NotificationManager extends LitElement { @internalProperty() private _noCancelOnOutsideClick = false; - @query("ha-toast") private _toast!: HaToast; + @query("ha-toast", true) private _toast!: HaToast; public async showDialog({ message, diff --git a/src/panels/config/automation/action/types/ha-automation-action-event.ts b/src/panels/config/automation/action/types/ha-automation-action-event.ts index 3cb54dbb42..238e72287e 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-event.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-event.ts @@ -21,7 +21,7 @@ export class HaEventAction extends LitElement implements ActionElement { @property() public action!: EventAction; - @query("ha-yaml-editor") private _yamlEditor?: HaYamlEditor; + @query("ha-yaml-editor", true) private _yamlEditor?: HaYamlEditor; private _actionData?: EventAction["event_data"]; diff --git a/src/panels/config/automation/action/types/ha-automation-action-service.ts b/src/panels/config/automation/action/types/ha-automation-action-service.ts index c7e564bcb8..55c80675eb 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-service.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-service.ts @@ -34,7 +34,7 @@ export class HaServiceAction extends LitElement implements ActionElement { @property({ attribute: false }) public action!: ServiceAction; - @query("ha-yaml-editor") private _yamlEditor?: HaYamlEditor; + @query("ha-yaml-editor", true) private _yamlEditor?: HaYamlEditor; private _actionData?: ServiceAction["data"]; diff --git a/src/panels/config/automation/thingtalk/dialog-thingtalk.ts b/src/panels/config/automation/thingtalk/dialog-thingtalk.ts index 60f027fe53..c6cf09de79 100644 --- a/src/panels/config/automation/thingtalk/dialog-thingtalk.ts +++ b/src/panels/config/automation/thingtalk/dialog-thingtalk.ts @@ -50,7 +50,7 @@ class DialogThingtalk extends LitElement { @internalProperty() private _placeholders?: PlaceholderContainer; - @query("#input") private _input?: PaperInputElement; + @query("#input", true) private _input?: PaperInputElement; private _value!: string; diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts index c458191d8e..cb14412545 100644 --- a/src/panels/config/entities/ha-config-entities.ts +++ b/src/panels/config/entities/ha-config-entities.ts @@ -103,7 +103,7 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) { @internalProperty() private _selectedEntities: string[] = []; - @query("hass-tabs-subpage-data-table") + @query("hass-tabs-subpage-data-table", true) private _dataTable!: HaTabsSubpageDataTable; private getDialog?: () => DialogEntityEditor | undefined; diff --git a/src/panels/config/helpers/forms/ha-input_select-form.ts b/src/panels/config/helpers/forms/ha-input_select-form.ts index eef74de859..657df02826 100644 --- a/src/panels/config/helpers/forms/ha-input_select-form.ts +++ b/src/panels/config/helpers/forms/ha-input_select-form.ts @@ -36,7 +36,7 @@ class HaInputSelectForm extends LitElement { @internalProperty() private _options: string[] = []; - @query("#option_input") private _optionInput?: PaperInputElement; + @query("#option_input", true) private _optionInput?: PaperInputElement; set item(item: InputSelect) { this._item = item; 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 a7929f0bda..2817dcb4db 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 @@ -42,7 +42,7 @@ export class ZHAAddGroupPage extends LitElement { @internalProperty() private _groupName = ""; - @query("zha-device-endpoint-data-table") + @query("zha-device-endpoint-data-table", true) private _zhaDevicesDataTable!: ZHADeviceEndpointDataTable; private _firstUpdatedCalled = false; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-clusters-data-table.ts b/src/panels/config/integrations/integration-panels/zha/zha-clusters-data-table.ts index 96fd1e679a..b602ada4ba 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-clusters-data-table.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-clusters-data-table.ts @@ -31,7 +31,7 @@ export class ZHAClustersDataTable extends LitElement { @property() public clusters: Cluster[] = []; - @query("ha-data-table") private _dataTable!: HaDataTable; + @query("ha-data-table", true) private _dataTable!: HaDataTable; private _clusters = memoizeOne((clusters: Cluster[]) => { let outputClusters: ClusterRowData[] = clusters; diff --git a/src/panels/config/integrations/integration-panels/zha/zha-device-endpoint-data-table.ts b/src/panels/config/integrations/integration-panels/zha/zha-device-endpoint-data-table.ts index 0a12acabe6..9537ed3572 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-device-endpoint-data-table.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-device-endpoint-data-table.ts @@ -42,7 +42,7 @@ export class ZHADeviceEndpointDataTable extends LitElement { @property({ type: Array }) public deviceEndpoints: ZHADeviceEndpoint[] = []; - @query("ha-data-table") private _dataTable!: HaDataTable; + @query("ha-data-table", true) private _dataTable!: HaDataTable; private _deviceEndpoints = memoizeOne( (deviceEndpoints: ZHADeviceEndpoint[]) => { diff --git a/src/panels/config/integrations/integration-panels/zha/zha-group-binding.ts b/src/panels/config/integrations/integration-panels/zha/zha-group-binding.ts index bbf2306703..56b710b014 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-group-binding.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-group-binding.ts @@ -59,7 +59,7 @@ export class ZHAGroupBindingControl extends LitElement { private _clustersToBind?: Cluster[]; - @query("zha-clusters-data-table") + @query("zha-clusters-data-table", true) private _zhaClustersDataTable!: ZHAClustersDataTable; protected updated(changedProperties: PropertyValues): void { diff --git a/src/panels/config/integrations/integration-panels/zha/zha-group-page.ts b/src/panels/config/integrations/integration-panels/zha/zha-group-page.ts index c4a928b669..a0acfbb314 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-group-page.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-group-page.ts @@ -57,7 +57,7 @@ export class ZHAGroupPage extends LitElement { @internalProperty() private _selectedDevicesToRemove: string[] = []; - @query("#addMembers") + @query("#addMembers", true) private _zhaAddMembersDataTable!: ZHADeviceEndpointDataTable; @query("#removeMembers") diff --git a/src/panels/config/logs/dialog-system-log-detail.ts b/src/panels/config/logs/dialog-system-log-detail.ts index 24d73c7a94..a1f00819db 100644 --- a/src/panels/config/logs/dialog-system-log-detail.ts +++ b/src/panels/config/logs/dialog-system-log-detail.ts @@ -36,7 +36,7 @@ class DialogSystemLogDetail extends LitElement { @internalProperty() private _manifest?: IntegrationManifest; - @query("paper-tooltip") private _toolTip?: PaperTooltipElement; + @query("paper-tooltip", true) private _toolTip?: PaperTooltipElement; public async showDialog(params: SystemLogDetailDialogParams): Promise { this._params = params; diff --git a/src/panels/config/logs/ha-config-logs.ts b/src/panels/config/logs/ha-config-logs.ts index 84247d748c..178fa70863 100644 --- a/src/panels/config/logs/ha-config-logs.ts +++ b/src/panels/config/logs/ha-config-logs.ts @@ -28,7 +28,7 @@ export class HaConfigLogs extends LitElement { @property() public route!: Route; - @query("system-log-card") private systemLog?: SystemLogCard; + @query("system-log-card", true) private systemLog?: SystemLogCard; public connectedCallback() { super.connectedCallback(); diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-create-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-create-card.ts index 9b3963485c..dcd85faf58 100644 --- a/src/panels/lovelace/editor/card-editor/hui-dialog-create-card.ts +++ b/src/panels/lovelace/editor/card-editor/hui-dialog-create-card.ts @@ -119,14 +119,13 @@ export class HuiCreateDialogCard extends LitElement implements HassDialog { > ` : html` -
- -
+ ` )} @@ -203,12 +202,14 @@ export class HuiCreateDialogCard extends LitElement implements HassDialog { var(--mdc-dialog-scroll-divider-color, rgba(0, 0, 0, 0.12)); } - .entity-picker-container { - display: flex; - flex-direction: column; - height: 100%; - min-height: calc(100vh - 112px); - margin-top: -20px; + hui-entity-picker-table { + display: block; + height: calc(100vh - 198px); + } + @media all and (max-width: 450px), all and (max-height: 500px) { + hui-entity-picker-table { + height: calc(100vh - 158px); + } } `, ]; diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-delete-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-delete-card.ts index 08f3678efc..b70afdd32e 100644 --- a/src/panels/lovelace/editor/card-editor/hui-dialog-delete-card.ts +++ b/src/panels/lovelace/editor/card-editor/hui-dialog-delete-card.ts @@ -28,7 +28,7 @@ export class HuiDialogDeleteCard extends LitElement { @internalProperty() private _cardConfig?: LovelaceCardConfig; - @query("ha-paper-dialog") private _dialog!: HaPaperDialog; + @query("ha-paper-dialog", true) private _dialog!: HaPaperDialog; public async showDialog(params: DeleteCardDialogParams): Promise { this._params = params; diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts index 5b2681eb0b..dc2eecbe57 100755 --- a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts +++ b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts @@ -65,7 +65,7 @@ export class HuiDialogEditCard extends LitElement implements HassDialog { @internalProperty() private _guiModeAvailable? = true; - @query("hui-element-editor") private _cardEditorEl?: HuiElementEditor; + @query("hui-element-editor", true) private _cardEditorEl?: HuiElementEditor; @internalProperty() private _GUImode = true; diff --git a/src/panels/lovelace/editor/card-editor/hui-entity-picker-table.ts b/src/panels/lovelace/editor/card-editor/hui-entity-picker-table.ts index 3a724fc6e2..c9e2bb6f03 100644 --- a/src/panels/lovelace/editor/card-editor/hui-entity-picker-table.ts +++ b/src/panels/lovelace/editor/card-editor/hui-entity-picker-table.ts @@ -27,12 +27,14 @@ export class HuiEntityPickerTable extends LitElement { @property({ type: Boolean }) public narrow?: boolean; + @property({ type: Boolean, attribute: "no-label-float" }) + public noLabelFloat? = false; + @property({ type: Array }) public entities!: DataTableRowData[]; protected render(): TemplateResult { return html`