${this.hass.localize("ui.panel.config.thread.my_network")}
${networks.preferred
@@ -242,12 +242,12 @@ export class ThreadConfigPanel extends SubscribeMixin(LitElement) {
)}
>`
: ""}
-
${showDefaultRouter
- ? html`
+ ? html`
${isDefaultRouter
? this.hass.localize(
"ui.panel.config.thread.default_router"
@@ -265,28 +268,28 @@ export class ThreadConfigPanel extends SubscribeMixin(LitElement) {
: this.hass.localize(
"ui.panel.config.thread.set_default_router"
)}
- `
+ `
: ""}
${otbr
- ? html`
+ ? html`
${this.hass.localize(
"ui.panel.config.thread.reset_border_router"
- )}
-
+
${this.hass.localize(
"ui.panel.config.thread.change_channel"
- )}
${network.dataset?.preferred
? ""
- : html`
+ : html`
${this.hass.localize(
"ui.panel.config.thread.add_to_my_network"
)}
- `}`
+ `}`
: ""}
- `
+ `
: ""}
`;
})}`
@@ -480,24 +483,22 @@ export class ThreadConfigPanel extends SubscribeMixin(LitElement) {
});
}
- private _handleRouterAction(ev: CustomEvent
) {
+ private _handleRouterAction(ev: CustomEvent<{ item: { value: string } }>) {
const network = (ev.currentTarget as any).network as ThreadNetwork;
const router = (ev.currentTarget as any).router as ThreadRouter;
const otbr = (ev.currentTarget as any).otbr as OTBRInfo;
- const index = network.dataset
- ? Number(ev.detail.index)
- : Number(ev.detail.index) + 1;
- switch (index) {
- case 0:
+ const action = ev.detail.item.value;
+ switch (action) {
+ case "set-default":
this._setPreferredBorderAgent(network.dataset!, router);
break;
- case 1:
+ case "reset-router":
this._resetBorderRouter(otbr);
break;
- case 2:
+ case "change-channel":
this._changeChannel(otbr);
break;
- case 3:
+ case "add-to-network":
this._setDataset(otbr);
break;
}
@@ -713,7 +714,7 @@ export class ThreadConfigPanel extends SubscribeMixin(LitElement) {
ha-svg-icon[slot="meta"] {
width: 24px;
}
- ha-button-menu a {
+ ha-dropdown a {
text-decoration: none;
}
.routers {
diff --git a/src/panels/config/scene/ha-scene-editor.ts b/src/panels/config/scene/ha-scene-editor.ts
index a6d41123d5..a8c1080af2 100644
--- a/src/panels/config/scene/ha-scene-editor.ts
+++ b/src/panels/config/scene/ha-scene-editor.ts
@@ -1,6 +1,6 @@
+import "@home-assistant/webawesome/dist/components/divider/divider";
import { consume } from "@lit/context";
-import type { ActionDetail } from "@material/mwc-list/mwc-list-foundation";
import {
mdiCog,
mdiContentDuplicate,
@@ -32,13 +32,13 @@ import "../../../components/entity/ha-entities-picker";
import "../../../components/ha-alert";
import "../../../components/ha-area-picker";
import "../../../components/ha-button";
-import "../../../components/ha-button-menu";
import "../../../components/ha-card";
+import "../../../components/ha-dropdown";
+import "../../../components/ha-dropdown-item";
import "../../../components/ha-fab";
import "../../../components/ha-icon-button";
import "../../../components/ha-icon-picker";
import "../../../components/ha-list";
-import "../../../components/ha-list-item";
import "../../../components/ha-svg-icon";
import "../../../components/ha-textfield";
import { fullEntitiesContext } from "../../../data/context";
@@ -227,9 +227,9 @@ export class HaSceneEditor extends PreventUnsavedMixin(
? computeStateName(this._scene)
: this.hass.localize("ui.panel.config.scene.editor.default_name")}
>
-
-
${this.hass.localize("ui.panel.config.scene.picker.apply")}
-
-
-
+
+
+
${this.hass.localize("ui.panel.config.scene.picker.show_info")}
-
-
+
+
${this.hass.localize(
"ui.panel.config.automation.picker.show_settings"
)}
-
-
+
+
-
+
${this.hass.localize(
`ui.panel.config.scene.picker.${this._getCategory(this._entityRegistryEntries, this._scene?.entity_id) ? "edit_category" : "assign_category"}`
)}
-
-
+
+
-
+
${this.hass.localize(
`ui.panel.config.automation.editor.edit_${this._mode !== "yaml" ? "yaml" : "ui"}`
)}
-
-
+
+
-
+
-
+
${this.hass.localize(
"ui.panel.config.scene.picker.duplicate_scene"
)}
-
-
+
+
-
${this.hass.localize("ui.panel.config.scene.picker.delete_scene")}
-
-
+
+
${this._errors ? html` ${this._errors}
` : ""}
${this._mode === "yaml" ? this._renderYamlMode() : this._renderUiMode()}
) {
- switch (ev.detail.index) {
- case 0:
+ private async _handleMenuAction(
+ ev: CustomEvent<{ item: { value: string } }>
+ ) {
+ const action = ev.detail.item.value;
+ switch (action) {
+ case "apply":
activateScene(this.hass, this._scene!.entity_id);
break;
- case 1:
+ case "show-info":
fireEvent(this, "hass-more-info", { entityId: this._scene!.entity_id });
break;
- case 2:
+ case "show-settings":
showMoreInfoDialog(this, {
entityId: this._scene!.entity_id,
view: "settings",
});
break;
- case 3:
+ case "edit-category":
this._editCategory(this._scene!);
break;
- case 4:
+ case "toggle-yaml":
if (this._mode === "yaml") {
this._initEntities(this._config!);
this._exitYamlMode();
@@ -677,10 +677,10 @@ export class HaSceneEditor extends PreventUnsavedMixin(
this._enterYamlMode();
}
break;
- case 5:
+ case "duplicate":
this._duplicate();
break;
- case 6:
+ case "delete":
this._deleteTapped();
break;
}
@@ -1289,9 +1289,6 @@ export class HaSceneEditor extends PreventUnsavedMixin(
justify-content: center;
align-items: center;
}
- li[role="separator"] {
- border-bottom-color: var(--divider-color);
- }
ha-list-item.entity {
padding-right: 28px;
}
diff --git a/src/panels/developer-tools/ha-panel-developer-tools.ts b/src/panels/developer-tools/ha-panel-developer-tools.ts
index e7259784c5..70cdd2724a 100644
--- a/src/panels/developer-tools/ha-panel-developer-tools.ts
+++ b/src/panels/developer-tools/ha-panel-developer-tools.ts
@@ -1,12 +1,11 @@
-import type { ActionDetail } from "@material/mwc-list";
import { mdiDotsVertical } from "@mdi/js";
import type { CSSResultGroup, TemplateResult } from "lit";
import { css, html, LitElement } from "lit";
import { customElement, property } from "lit/decorators";
import { navigate } from "../../common/navigate";
-import "../../components/ha-button-menu";
+import "../../components/ha-dropdown";
+import "../../components/ha-dropdown-item";
import "../../components/ha-icon-button";
-import "../../components/ha-list-item";
import "../../components/ha-menu-button";
import "../../components/ha-tab-group";
import "../../components/ha-tab-group-tab";
@@ -40,16 +39,16 @@ class PanelDeveloperTools extends LitElement {
${this.hass.localize("panel.developer_tools")}
-
+
-
+
${this.hass.localize("ui.panel.developer-tools.tabs.debug.title")}
-
-
+
+