Keyboard accessibility for automation-action-row (convert M2->M3) (#24121)

This commit is contained in:
karwosts 2025-02-14 04:02:16 -08:00 committed by GitHub
parent 920ec035c5
commit 41df7a3f4a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,5 +1,4 @@
import { consume } from "@lit-labs/context"; import { consume } from "@lit-labs/context";
import type { ActionDetail } from "@material/mwc-list/mwc-list-foundation";
import { import {
mdiAlertCircleCheck, mdiAlertCircleCheck,
mdiArrowDown, mdiArrowDown,
@ -27,7 +26,9 @@ import { stopPropagation } from "../../../../common/dom/stop_propagation";
import { capitalizeFirstLetter } from "../../../../common/string/capitalize-first-letter"; import { capitalizeFirstLetter } from "../../../../common/string/capitalize-first-letter";
import { handleStructError } from "../../../../common/structs/handle-errors"; import { handleStructError } from "../../../../common/structs/handle-errors";
import "../../../../components/ha-alert"; import "../../../../components/ha-alert";
import "../../../../components/ha-button-menu"; import "../../../../components/ha-md-button-menu";
import "../../../../components/ha-md-menu-item";
import "../../../../components/ha-md-divider";
import "../../../../components/ha-card"; import "../../../../components/ha-card";
import "../../../../components/ha-expansion-panel"; import "../../../../components/ha-expansion-panel";
import "../../../../components/ha-icon-button"; import "../../../../components/ha-icon-button";
@ -240,89 +241,104 @@ export default class HaAutomationActionRow extends LitElement {
</div> ` </div> `
: nothing} : nothing}
<ha-button-menu <ha-md-button-menu
slot="icons" slot="icons"
@action=${this._handleAction}
@click=${preventDefault} @click=${preventDefault}
@keydown=${stopPropagation}
@closed=${stopPropagation} @closed=${stopPropagation}
fixed positioning="fixed"
> >
<ha-icon-button <ha-icon-button
slot="trigger" slot="trigger"
.label=${this.hass.localize("ui.common.menu")} .label=${this.hass.localize("ui.common.menu")}
.path=${mdiDotsVertical} .path=${mdiDotsVertical}
></ha-icon-button> ></ha-icon-button>
<ha-list-item graphic="icon"> <ha-md-menu-item .clickAction=${this._runAction}>
${this.hass.localize( ${this.hass.localize(
"ui.panel.config.automation.editor.actions.run" "ui.panel.config.automation.editor.actions.run"
)} )}
<ha-svg-icon slot="graphic" .path=${mdiPlay}></ha-svg-icon> <ha-svg-icon slot="start" .path=${mdiPlay}></ha-svg-icon>
</ha-list-item> </ha-md-menu-item>
<ha-list-item graphic="icon" .disabled=${this.disabled}> <ha-md-menu-item
.clickAction=${this._renameAction}
.disabled=${this.disabled}
>
${this.hass.localize( ${this.hass.localize(
"ui.panel.config.automation.editor.actions.rename" "ui.panel.config.automation.editor.actions.rename"
)} )}
<ha-svg-icon slot="graphic" .path=${mdiRenameBox}></ha-svg-icon> <ha-svg-icon slot="start" .path=${mdiRenameBox}></ha-svg-icon>
</ha-list-item> </ha-md-menu-item>
<li divider role="separator"></li> <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
<ha-list-item graphic="icon" .disabled=${this.disabled}> <ha-md-menu-item
.clickAction=${this._duplicateAction}
.disabled=${this.disabled}
>
${this.hass.localize( ${this.hass.localize(
"ui.panel.config.automation.editor.actions.duplicate" "ui.panel.config.automation.editor.actions.duplicate"
)} )}
<ha-svg-icon <ha-svg-icon
slot="graphic" slot="start"
.path=${mdiContentDuplicate} .path=${mdiContentDuplicate}
></ha-svg-icon> ></ha-svg-icon>
</ha-list-item> </ha-md-menu-item>
<ha-list-item graphic="icon" .disabled=${this.disabled}> <ha-md-menu-item
.clickAction=${this._copyAction}
.disabled=${this.disabled}
>
${this.hass.localize( ${this.hass.localize(
"ui.panel.config.automation.editor.triggers.copy" "ui.panel.config.automation.editor.triggers.copy"
)} )}
<ha-svg-icon slot="graphic" .path=${mdiContentCopy}></ha-svg-icon> <ha-svg-icon slot="start" .path=${mdiContentCopy}></ha-svg-icon>
</ha-list-item> </ha-md-menu-item>
<ha-list-item graphic="icon" .disabled=${this.disabled}> <ha-md-menu-item
.clickAction=${this._cutAction}
.disabled=${this.disabled}
>
${this.hass.localize( ${this.hass.localize(
"ui.panel.config.automation.editor.triggers.cut" "ui.panel.config.automation.editor.triggers.cut"
)} )}
<ha-svg-icon slot="graphic" .path=${mdiContentCut}></ha-svg-icon> <ha-svg-icon slot="start" .path=${mdiContentCut}></ha-svg-icon>
</ha-list-item> </ha-md-menu-item>
<ha-list-item <ha-md-menu-item
graphic="icon" .clickAction=${this._moveUp}
.disabled=${this.disabled || this.first} .disabled=${this.disabled || this.first}
> >
${this.hass.localize("ui.panel.config.automation.editor.move_up")} ${this.hass.localize("ui.panel.config.automation.editor.move_up")}
<ha-svg-icon slot="graphic" .path=${mdiArrowUp}></ha-svg-icon <ha-svg-icon slot="start" .path=${mdiArrowUp}></ha-svg-icon
></ha-list-item> ></ha-md-menu-item>
<ha-list-item <ha-md-menu-item
graphic="icon" .clickAction=${this._moveDown}
.disabled=${this.disabled || this.last} .disabled=${this.disabled || this.last}
> >
${this.hass.localize( ${this.hass.localize(
"ui.panel.config.automation.editor.move_down" "ui.panel.config.automation.editor.move_down"
)} )}
<ha-svg-icon slot="graphic" .path=${mdiArrowDown}></ha-svg-icon <ha-svg-icon slot="start" .path=${mdiArrowDown}></ha-svg-icon
></ha-list-item> ></ha-md-menu-item>
<ha-list-item graphic="icon" .disabled=${!this._uiModeAvailable}> <ha-md-menu-item
.clickAction=${this._toggleYamlMode}
.disabled=${!this._uiModeAvailable}
>
${this.hass.localize( ${this.hass.localize(
`ui.panel.config.automation.editor.edit_${!yamlMode ? "yaml" : "ui"}` `ui.panel.config.automation.editor.edit_${!yamlMode ? "yaml" : "ui"}`
)} )}
<ha-svg-icon <ha-svg-icon slot="start" .path=${mdiPlaylistEdit}></ha-svg-icon>
slot="graphic" </ha-md-menu-item>
.path=${mdiPlaylistEdit}
></ha-svg-icon>
</ha-list-item>
<li divider role="separator"></li> <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
<ha-list-item graphic="icon" .disabled=${this.disabled}> <ha-md-menu-item
.clickAction=${this._onDisable}
.disabled=${this.disabled}
>
${this.action.enabled === false ${this.action.enabled === false
? this.hass.localize( ? this.hass.localize(
"ui.panel.config.automation.editor.actions.enable" "ui.panel.config.automation.editor.actions.enable"
@ -331,15 +347,15 @@ export default class HaAutomationActionRow extends LitElement {
"ui.panel.config.automation.editor.actions.disable" "ui.panel.config.automation.editor.actions.disable"
)} )}
<ha-svg-icon <ha-svg-icon
slot="graphic" slot="start"
.path=${this.action.enabled === false .path=${this.action.enabled === false
? mdiPlayCircleOutline ? mdiPlayCircleOutline
: mdiStopCircleOutline} : mdiStopCircleOutline}
></ha-svg-icon> ></ha-svg-icon>
</ha-list-item> </ha-md-menu-item>
<ha-list-item <ha-md-menu-item
class="warning" class="warning"
graphic="icon" .clickAction=${this._onDelete}
.disabled=${this.disabled} .disabled=${this.disabled}
> >
${this.hass.localize( ${this.hass.localize(
@ -347,11 +363,11 @@ export default class HaAutomationActionRow extends LitElement {
)} )}
<ha-svg-icon <ha-svg-icon
class="warning" class="warning"
slot="graphic" slot="start"
.path=${mdiDelete} .path=${mdiDelete}
></ha-svg-icon> ></ha-svg-icon>
</ha-list-item> </ha-md-menu-item>
</ha-button-menu> </ha-md-button-menu>
<div <div
class=${classMap({ class=${classMap({
@ -424,47 +440,6 @@ export default class HaAutomationActionRow extends LitElement {
} }
} }
private async _handleAction(ev: CustomEvent<ActionDetail>) {
switch (ev.detail.index) {
case 0:
this._runAction();
break;
case 1:
await this._renameAction();
break;
case 2:
fireEvent(this, "duplicate");
break;
case 3:
this._setClipboard();
break;
case 4:
this._setClipboard();
fireEvent(this, "value-changed", { value: null });
break;
case 5:
fireEvent(this, "move-up");
break;
case 6:
fireEvent(this, "move-down");
break;
case 7:
if (this._yamlMode) {
this._switchUiMode();
} else {
this._switchYamlMode();
}
this.expand();
break;
case 8:
this._onDisable();
break;
case 9:
this._onDelete();
break;
}
}
private _setClipboard() { private _setClipboard() {
this._clipboard = { this._clipboard = {
...this._clipboard, ...this._clipboard,
@ -472,16 +447,16 @@ export default class HaAutomationActionRow extends LitElement {
}; };
} }
private _onDisable() { private _onDisable = () => {
const enabled = !(this.action.enabled ?? true); const enabled = !(this.action.enabled ?? true);
const value = { ...this.action, enabled }; const value = { ...this.action, enabled };
fireEvent(this, "value-changed", { value }); fireEvent(this, "value-changed", { value });
if (this._yamlMode) { if (this._yamlMode) {
this._yamlEditor?.setValue(value); this._yamlEditor?.setValue(value);
} }
} };
private async _runAction() { private _runAction = async () => {
const validated = await validateConfig(this.hass, { const validated = await validateConfig(this.hass, {
actions: this.action, actions: this.action,
}); });
@ -513,9 +488,9 @@ export default class HaAutomationActionRow extends LitElement {
"ui.panel.config.automation.editor.actions.run_action_success" "ui.panel.config.automation.editor.actions.run_action_success"
), ),
}); });
} };
private _onDelete() { private _onDelete = () => {
showConfirmationDialog(this, { showConfirmationDialog(this, {
title: this.hass.localize( title: this.hass.localize(
"ui.panel.config.automation.editor.actions.delete_confirm_title" "ui.panel.config.automation.editor.actions.delete_confirm_title"
@ -530,7 +505,7 @@ export default class HaAutomationActionRow extends LitElement {
fireEvent(this, "value-changed", { value: null }); fireEvent(this, "value-changed", { value: null });
}, },
}); });
} };
private _onYamlChange(ev: CustomEvent) { private _onYamlChange(ev: CustomEvent) {
ev.stopPropagation(); ev.stopPropagation();
@ -561,7 +536,7 @@ export default class HaAutomationActionRow extends LitElement {
this._yamlMode = true; this._yamlMode = true;
} }
private async _renameAction(): Promise<void> { private _renameAction = async (): Promise<void> => {
const alias = await showPromptDialog(this, { const alias = await showPromptDialog(this, {
title: this.hass.localize( title: this.hass.localize(
"ui.panel.config.automation.editor.actions.change_alias" "ui.panel.config.automation.editor.actions.change_alias"
@ -598,7 +573,37 @@ export default class HaAutomationActionRow extends LitElement {
this._yamlEditor?.setValue(value); this._yamlEditor?.setValue(value);
} }
} }
} };
private _duplicateAction = () => {
fireEvent(this, "duplicate");
};
private _copyAction = () => {
this._setClipboard();
};
private _cutAction = () => {
this._setClipboard();
fireEvent(this, "value-changed", { value: null });
};
private _moveUp = () => {
fireEvent(this, "move-up");
};
private _moveDown = () => {
fireEvent(this, "move-down");
};
private _toggleYamlMode = () => {
if (this._yamlMode) {
this._switchUiMode();
} else {
this._switchYamlMode();
}
this.expand();
};
public expand() { public expand() {
this.updateComplete.then(() => { this.updateComplete.then(() => {
@ -610,7 +615,6 @@ export default class HaAutomationActionRow extends LitElement {
return [ return [
haStyle, haStyle,
css` css`
ha-button-menu,
ha-icon-button { ha-icon-button {
--mdc-theme-text-primary-on-background: var(--primary-text-color); --mdc-theme-text-primary-on-background: var(--primary-text-color);
} }
@ -649,18 +653,11 @@ export default class HaAutomationActionRow extends LitElement {
border-top-right-radius: var(--ha-card-border-radius, 12px); border-top-right-radius: var(--ha-card-border-radius, 12px);
border-top-left-radius: var(--ha-card-border-radius, 12px); border-top-left-radius: var(--ha-card-border-radius, 12px);
} }
mwc-list-item[disabled] {
--mdc-theme-text-primary-on-background: var(--disabled-text-color);
}
mwc-list-item.hidden {
display: none;
}
.warning ul { .warning ul {
margin: 4px 0; margin: 4px 0;
} }
li[role="separator"] { ha-md-menu-item > ha-svg-icon {
border-bottom-color: var(--divider-color); --mdc-icon-size: 24px;
} }
`, `,
]; ];