-
+ ${this._clusters.map(
+ (entry, idx) => html`
+ ${computeClusterKey(entry)}
+ `
+ )}
+
${this.showHelp
? html`
@@ -122,8 +122,8 @@ export class ZHAClusters extends LitElement {
}
}
- private _selectedClusterChanged(event: ItemSelectedEvent): void {
- this._selectedClusterIndex = event.target!.selected;
+ private _selectedClusterChanged(event): void {
+ this._selectedClusterIndex = Number(event.target!.value);
fireEvent(this, "zha-cluster-selected", {
cluster: this._clusters[this._selectedClusterIndex],
});
@@ -137,6 +137,9 @@ export class ZHAClusters extends LitElement {
return [
haStyle,
css`
+ mwc-select {
+ margin-top: 16px;
+ }
.menu {
width: 100%;
}
diff --git a/src/panels/config/integrations/integration-panels/zha/zha-device-binding.ts b/src/panels/config/integrations/integration-panels/zha/zha-device-binding.ts
index 024e35db24..4ff919838e 100644
--- a/src/panels/config/integrations/integration-panels/zha/zha-device-binding.ts
+++ b/src/panels/config/integrations/integration-panels/zha/zha-device-binding.ts
@@ -1,8 +1,7 @@
import "@material/mwc-button/mwc-button";
import { mdiHelpCircle } from "@mdi/js";
-import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
-import "@polymer/paper-item/paper-item";
-import "@polymer/paper-listbox/paper-listbox";
+import "@material/mwc-list/mwc-list-item";
+import "@material/mwc-select";
import {
css,
CSSResultGroup,
@@ -21,6 +20,7 @@ import { haStyle } from "../../../../../resources/styles";
import { HomeAssistant } from "../../../../../types";
import "../../../ha-config-section";
import { ItemSelectedEvent } from "./types";
+import { stopPropagation } from "../../../../../common/dom/stop_propagation";
@customElement("zha-device-binding-control")
export class ZHADeviceBindingControl extends LitElement {
@@ -62,23 +62,25 @@ export class ZHADeviceBindingControl extends LitElement {
-
+
${this._showHelp
? html`
@@ -111,7 +113,7 @@ export class ZHADeviceBindingControl extends LitElement {
}
private _bindTargetIndexChanged(event: ItemSelectedEvent): void {
- this._bindTargetIndex = event.target!.selected;
+ this._bindTargetIndex = Number(event.target!.value);
this._deviceToBind =
this._bindTargetIndex === -1
? undefined
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 47466a42e5..f5d284ea5c 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
@@ -1,8 +1,5 @@
import "@material/mwc-button/mwc-button";
import { mdiHelpCircle } from "@mdi/js";
-import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
-import "@polymer/paper-item/paper-item";
-import "@polymer/paper-listbox/paper-listbox";
import {
css,
CSSResultGroup,
@@ -13,6 +10,7 @@ import {
} from "lit";
import { customElement, property, state, query } from "lit/decorators";
import type { HASSDomEvent } from "../../../../../common/dom/fire_event";
+import { stopPropagation } from "../../../../../common/dom/stop_propagation";
import "../../../../../components/buttons/ha-call-service-button";
import { SelectionChangedEvent } from "../../../../../components/data-table/ha-data-table";
import "../../../../../components/ha-card";
@@ -95,22 +93,24 @@ export class ZHAGroupBindingControl extends LitElement {
-
+ ${this.groups.map(
+ (group, idx) =>
+ html`${group.name} `
+ )}
+
${this._showHelp
? html`
@@ -179,7 +179,7 @@ export class ZHAGroupBindingControl extends LitElement {
}
private _bindTargetIndexChanged(event: ItemSelectedEvent): void {
- this._bindTargetIndex = event.target!.selected;
+ this._bindTargetIndex = Number(event.target!.value);
this._groupToBind =
this._bindTargetIndex === -1
? undefined
diff --git a/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts b/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts
index 05e23fade9..779df732af 100644
--- a/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts
+++ b/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts
@@ -440,19 +440,15 @@ export class ZHANetworkVisualizationPage extends LitElement {
search-input {
flex: 1;
+ display: block;
}
search-input.header {
- display: block;
- position: relative;
- top: -2px;
color: var(--secondary-text-color);
}
ha-device-picker {
flex: 1;
- position: relative;
- top: -4px;
}
.controls {
diff --git a/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js b/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js
index 91081d5158..865d808f66 100644
--- a/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js
+++ b/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js
@@ -513,6 +513,7 @@ class HaConfigZwave extends LocalizeMixin(EventsMixin(PolymerElement)) {
ready() {
super.ready();
+ import("web-animations-js/web-animations-next-lite.min");
this.addEventListener("hass-service-called", (ev) =>
this.serviceCalled(ev)
);