Skip to content

FIx entities picker #6951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ludeeus merged 1 commit into from
Sep 12, 2020
Merged

FIx entities picker #6951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/components/entity/ha-entity-picker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { HassEntity } from "home-assistant-js-websocket";
import {
css,
CSSResult,
customElement,
html,
LitElement,
property,
Expand Down Expand Up @@ -51,7 +52,8 @@ const rowRenderer = (
root.querySelector("[secondary]")!.textContent = model.item.entity_id;
};

class HaEntityPicker extends LitElement {
@customElement("ha-entity-picker")
export class HaEntityPicker extends LitElement {
@property({ type: Boolean }) public autofocus = false;

@property({ type: Boolean }) public disabled?: boolean;
Expand Down Expand Up @@ -276,8 +278,6 @@ class HaEntityPicker extends LitElement {
}
}

customElements.define("ha-entity-picker", HaEntityPicker);

declare global {
interface HTMLElementTagNameMap {
"ha-entity-picker": HaEntityPicker;
Expand Down
31 changes: 16 additions & 15 deletions src/panels/lovelace/components/hui-entity-editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import Sortable, {
} from "sortablejs/modular/sortable.core.esm";
import { fireEvent } from "../../../common/dom/fire_event";
import "../../../components/entity/ha-entity-picker";
import type { HaEntityPicker } from "../../../components/entity/ha-entity-picker";
import "../../../components/ha-icon-button";
import { sortableStyles } from "../../../resources/ha-sortable-style";
import { HomeAssistant } from "../../../types";
import { EditorTarget } from "../editor/types";
import { EntityConfig } from "../entity-rows/types";

@customElement("hui-entity-editor")
Expand Down Expand Up @@ -73,7 +73,7 @@ export class HuiEntityEditor extends LitElement {
.hass=${this.hass}
.value=${entityConf.entity}
.index=${index}
@change=${this._valueChanged}
@value-changed=${this._valueChanged}
allow-custom-entity
></ha-entity-picker>
</div>
Expand All @@ -83,7 +83,7 @@ export class HuiEntityEditor extends LitElement {
</div>
<ha-entity-picker
.hass=${this.hass}
@change=${this._addEntity}
@value-changed=${this._addEntity}
></ha-entity-picker>
`;
}
Expand Down Expand Up @@ -136,15 +136,15 @@ export class HuiEntityEditor extends LitElement {
});
}

private async _addEntity(ev: Event): Promise<void> {
const target = ev.target! as EditorTarget;
if (target.value === "") {
private async _addEntity(ev: CustomEvent): Promise<void> {
const value = ev.detail.value;
if (value === "") {
return;
}
const newConfigEntities = this.entities!.concat({
entity: target.value as string,
entity: value as string,
});
target.value = "";
(ev.target as HaEntityPicker).value = "";
fireEvent(this, "entities-changed", { entities: newConfigEntities });
}

Expand All @@ -160,16 +160,17 @@ export class HuiEntityEditor extends LitElement {
fireEvent(this, "entities-changed", { entities: newEntities });
}

private _valueChanged(ev: Event): void {
const target = ev.target! as EditorTarget;
private _valueChanged(ev: CustomEvent): void {
const value = ev.detail.value;
const index = (ev.target as any).index;
const newConfigEntities = this.entities!.concat();

if (target.value === "") {
newConfigEntities.splice(target.index!, 1);
if (value === "") {
newConfigEntities.splice(index, 1);
} else {
newConfigEntities[target.index!] = {
...newConfigEntities[target.index!],
entity: target.value!,
newConfigEntities[index] = {
...newConfigEntities[index],
entity: value!,
};
}

Expand Down