Add sortable options to input_select settings menu (#17706)

* Sortable options in input_select settings menu

* fix lint

* no ripple, default cursor

* Update src/panels/config/helpers/forms/ha-input_select-form.ts

Co-authored-by: Paul Bottein <paul.bottein@gmail.com>

* sortableStyles

* Use ha-list-item and mwc-list

---------

Co-authored-by: Paul Bottein <paul.bottein@gmail.com>
This commit is contained in:
karwosts 2023-08-30 00:59:06 -07:00 committed by GitHub
parent 6197b55da8
commit ae9fcebfd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,10 +1,14 @@
import "@material/mwc-button/mwc-button"; import "@material/mwc-list/mwc-list";
import "@material/mwc-list/mwc-list-item"; import { mdiDelete, mdiDrag } from "@mdi/js";
import { mdiDelete } from "@mdi/js";
import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
import { customElement, property, query, state } from "lit/decorators"; import { customElement, property, query, state } from "lit/decorators";
import { repeat } from "lit/directives/repeat";
import type { SortableEvent } from "sortablejs";
import { sortableStyles } from "../../../../resources/ha-sortable-style";
import { fireEvent } from "../../../../common/dom/fire_event"; import { fireEvent } from "../../../../common/dom/fire_event";
import "../../../../components/ha-button";
import "../../../../components/ha-icon-button"; import "../../../../components/ha-icon-button";
import "../../../../components/ha-list-item";
import "../../../../components/ha-icon-picker"; import "../../../../components/ha-icon-picker";
import "../../../../components/ha-textfield"; import "../../../../components/ha-textfield";
import type { HaTextField } from "../../../../components/ha-textfield"; import type { HaTextField } from "../../../../components/ha-textfield";
@ -12,6 +16,10 @@ import type { InputSelect } from "../../../../data/input_select";
import { showConfirmationDialog } from "../../../../dialogs/generic/show-dialog-box"; import { showConfirmationDialog } from "../../../../dialogs/generic/show-dialog-box";
import { haStyle } from "../../../../resources/styles"; import { haStyle } from "../../../../resources/styles";
import type { HomeAssistant } from "../../../../types"; import type { HomeAssistant } from "../../../../types";
import {
loadSortable,
SortableInstance,
} from "../../../../resources/sortable.ondemand";
@customElement("ha-input_select-form") @customElement("ha-input_select-form")
class HaInputSelectForm extends LitElement { class HaInputSelectForm extends LitElement {
@ -27,8 +35,59 @@ class HaInputSelectForm extends LitElement {
@state() private _options: string[] = []; @state() private _options: string[] = [];
private _sortable?: SortableInstance;
@query("#option_input", true) private _optionInput?: HaTextField; @query("#option_input", true) private _optionInput?: HaTextField;
public connectedCallback() {
super.connectedCallback();
this._createSortable();
}
public disconnectedCallback() {
super.disconnectedCallback();
this._destroySortable();
}
private async _createSortable() {
const Sortable = await loadSortable();
this._sortable = new Sortable(this.shadowRoot!.querySelector(".options")!, {
animation: 150,
fallbackClass: "sortable-fallback",
handle: ".handle",
onChoose: (evt: SortableEvent) => {
(evt.item as any).placeholder =
document.createComment("sort-placeholder");
evt.item.after((evt.item as any).placeholder);
},
onEnd: (evt: SortableEvent) => {
// put back in original location
if ((evt.item as any).placeholder) {
(evt.item as any).placeholder.replaceWith(evt.item);
delete (evt.item as any).placeholder;
}
this._dragged(evt);
},
});
}
private _dragged(ev: SortableEvent): void {
if (ev.oldIndex === ev.newIndex) return;
const options = this._options.concat();
const option = options.splice(ev.oldIndex!, 1)[0];
options.splice(ev.newIndex!, 0, option);
fireEvent(this, "value-changed", {
value: { ...this._item, options },
});
}
private _destroySortable() {
this._sortable?.destroy();
this._sortable = undefined;
}
set item(item: InputSelect) { set item(item: InputSelect) {
this._item = item; this._item = item;
if (item) { if (item) {
@ -86,30 +145,39 @@ class HaInputSelectForm extends LitElement {
"ui.dialogs.helper_settings.input_select.options" "ui.dialogs.helper_settings.input_select.options"
)}: )}:
</div> </div>
${this._options.length <mwc-list class="options">
? this._options.map( ${this._options.length
(option, index) => html` ? repeat(
<mwc-list-item class="option" hasMeta> this._options,
${option} (option) => option,
<ha-icon-button (option, index) => html`
slot="meta" <ha-list-item class="option" hasMeta>
.index=${index} <div class="optioncontent">
.label=${this.hass.localize( <div class="handle">
"ui.dialogs.helper_settings.input_select.remove_option" <ha-svg-icon .path=${mdiDrag}></ha-svg-icon>
)} </div>
@click=${this._removeOption} ${option}
.path=${mdiDelete} </div>
></ha-icon-button> <ha-icon-button
</mwc-list-item> slot="meta"
` .index=${index}
) .label=${this.hass.localize(
: html` "ui.dialogs.helper_settings.input_select.remove_option"
<mwc-list-item noninteractive> )}
${this.hass!.localize( @click=${this._removeOption}
"ui.dialogs.helper_settings.input_select.no_options" .path=${mdiDelete}
)} ></ha-icon-button>
</mwc-list-item> </ha-list-item>
`} `
)
: html`
<ha-list-item noninteractive>
${this.hass!.localize(
"ui.dialogs.helper_settings.input_select.no_options"
)}
</ha-list-item>
`}
</mwc-list>
<div class="layout horizontal center"> <div class="layout horizontal center">
<ha-textfield <ha-textfield
class="flex-auto" class="flex-auto"
@ -119,10 +187,10 @@ class HaInputSelectForm extends LitElement {
)} )}
@keydown=${this._handleKeyAdd} @keydown=${this._handleKeyAdd}
></ha-textfield> ></ha-textfield>
<mwc-button @click=${this._addOption} <ha-button @click=${this._addOption}
>${this.hass!.localize( >${this.hass!.localize(
"ui.dialogs.helper_settings.input_select.add" "ui.dialogs.helper_settings.input_select.add"
)}</mwc-button )}</ha-button
> >
</div> </div>
</div> </div>
@ -190,6 +258,7 @@ class HaInputSelectForm extends LitElement {
static get styles(): CSSResultGroup { static get styles(): CSSResultGroup {
return [ return [
haStyle, haStyle,
sortableStyles,
css` css`
.form { .form {
color: var(--primary-text-color); color: var(--primary-text-color);
@ -199,6 +268,10 @@ class HaInputSelectForm extends LitElement {
border-radius: 4px; border-radius: 4px;
margin-top: 4px; margin-top: 4px;
--mdc-icon-button-size: 24px; --mdc-icon-button-size: 24px;
--mdc-ripple-color: transparent;
--mdc-list-side-padding: 16px;
cursor: default;
background-color: var(--card-background-color);
} }
mwc-button { mwc-button {
margin-left: 8px; margin-left: 8px;
@ -214,6 +287,18 @@ class HaInputSelectForm extends LitElement {
margin-top: 8px; margin-top: 8px;
margin-bottom: 8px; margin-bottom: 8px;
} }
.handle {
cursor: move;
padding-right: 12px;
}
.handle ha-svg-icon {
pointer-events: none;
height: 24px;
}
.optioncontent {
display: flex;
align-items: center;
}
`, `,
]; ];
} }