Save height and width when you start filtering to make timing less fragile

.devcontainer/devcontainer.json

@@ -16,9 +16,6 @@
     "runem.lit-plugin",
     "ms-python.vscode-pylance"
   ],
-  "containerEnv": {
-    "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
-  },
   "settings": {
     "terminal.integrated.shell.linux": "/bin/bash",
     "files.eol": "\n",

build-scripts/bundle.js

@@ -33,10 +33,6 @@ module.exports.emptyPackages = ({ latestBuild, isHassioBuild }) =>
       require.resolve(
         path.resolve(paths.polymer_dir, "src/components/ha-icon.ts")
       ),
-    isHassioBuild &&
-      require.resolve(
-        path.resolve(paths.polymer_dir, "src/components/ha-icon-picker.ts")
-      ),
   ].filter(Boolean);
 
 module.exports.definedVars = ({ isProdBuild, latestBuild, defineOverlay }) => ({

demo/src/entrypoint.ts

@@ -2,3 +2,8 @@ import "../../src/resources/ha-style";
 import "../../src/resources/roboto";
 import "../../src/resources/safari-14-attachshadow-patch";
 import "./ha-demo";
+
+/* polyfill for paper-dropdown */
+setTimeout(() => {
+  import("web-animations-js/web-animations-next-lite.min");
+}, 1000);

gallery/sidebar.js

@@ -20,6 +20,7 @@ module.exports = [
       "editor-trigger",
       "editor-condition",
       "editor-action",
+      "selectors",
       "trace",
       "trace-timeline",
     ],

gallery/src/pages/automation/describe-action.ts

@@ -3,20 +3,10 @@ import { html, css, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import "../../../../src/components/ha-card";
 import { describeAction } from "../../../../src/data/script_i18n";
-import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import { HomeAssistant } from "../../../../src/types";
 
-const ENTITIES = [
-  getEntity("scene", "kitchen_morning", "scening", {
-    friendly_name: "Kitchen Morning",
-  }),
-  getEntity("media_player", "kitchen", "playing", {
-    friendly_name: "Sonos Kitchen",
-  }),
-];
-
-const ACTIONS = [
+const actions = [
   { wait_template: "{{ true }}", alias: "Something with an alias" },
   { delay: "0:05" },
   { wait_template: "{{ true }}" },
@@ -29,20 +19,8 @@ const ACTIONS = [
     device_id: "abcdefgh",
     domain: "plex",
     entity_id: "media_player.kitchen",
-    type: "turn_on",
   },
   { scene: "scene.kitchen_morning" },
-  {
-    service: "scene.turn_on",
-    target: { entity_id: "scene.kitchen_morning" },
-    metadata: {},
-  },
-  {
-    service: "media_player.play_media",
-    target: { entity_id: "media_player.kitchen" },
-    data: { media_content_id: "", media_content_type: "" },
-    metadata: { title: "Happy Song" },
-  },
   {
     wait_for_trigger: [
       {
@@ -74,7 +52,7 @@ export class DemoAutomationDescribeAction extends LitElement {
     }
     return html`
       <ha-card header="Actions">
-        ${ACTIONS.map(
+        ${actions.map(
           (conf) => html`
             <div class="action">
               <span>${describeAction(this.hass, conf as any)}</span>
@@ -90,7 +68,6 @@ export class DemoAutomationDescribeAction extends LitElement {
     super.firstUpdated(changedProps);
     const hass = provideHass(this);
     hass.updateTranslations(null, "en");
-    hass.addEntities(ENTITIES);
   }
 
   static get styles() {

gallery/src/pages/automation/editor-action.ts

@@ -14,7 +14,7 @@ import { HaDelayAction } from "../../../../src/panels/config/automation/action/t
 import { HaDeviceAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-device_id";
 import { HaEventAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-event";
 import { HaRepeatAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-repeat";
-import { HaSceneAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-activate_scene";
+import { HaSceneAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-scene";
 import { HaServiceAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-service";
 import { HaWaitForTriggerAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-wait_for_trigger";
 import { HaWaitAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-wait_template";

gallery/src/pages/automation/selectors.markdown

@@ -0,0 +1,3 @@
+---
+title: Selectors
+---

gallery/src/pages/automation/selectors.ts

@@ -0,0 +1,102 @@
+/* eslint-disable lit/no-template-arrow */
+import { LitElement, TemplateResult, html } from "lit";
+import { customElement, state } from "lit/decorators";
+import { provideHass } from "../../../../src/fake_data/provide_hass";
+import type { HomeAssistant } from "../../../../src/types";
+import "../../components/demo-black-white-row";
+import { mockEntityRegistry } from "../../../../demo/src/stubs/entity_registry";
+import { mockDeviceRegistry } from "../../../../demo/src/stubs/device_registry";
+import { mockAreaRegistry } from "../../../../demo/src/stubs/area_registry";
+import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
+import "../../../../src/panels/config/automation/trigger/ha-automation-trigger";
+import { Selector } from "../../../../src/data/selector";
+import "../../../../src/components/ha-selector/ha-selector";
+
+const SCHEMAS: { name: string; selector: Selector }[] = [
+  { name: "Addon", selector: { addon: {} } },
+
+  { name: "Entity", selector: { entity: {} } },
+  { name: "Device", selector: { device: {} } },
+  { name: "Area", selector: { area: {} } },
+  { name: "Target", selector: { target: {} } },
+  {
+    name: "Number",
+    selector: {
+      number: {
+        min: 0,
+        max: 10,
+      },
+    },
+  },
+  { name: "Boolean", selector: { boolean: {} } },
+  { name: "Time", selector: { time: {} } },
+  { name: "Action", selector: { action: {} } },
+  { name: "Text", selector: { text: { multiline: false } } },
+  { name: "Text Multiline", selector: { text: { multiline: true } } },
+  { name: "Object", selector: { object: {} } },
+  {
+    name: "Select",
+    selector: {
+      select: {
+        options: ["Everyone Home", "Some Home", "All gone"],
+      },
+    },
+  },
+];
+
+@customElement("demo-automation-selectors")
+class DemoHaSelector extends LitElement {
+  @state() private hass!: HomeAssistant;
+
+  private data: any = SCHEMAS.map(() => undefined);
+
+  constructor() {
+    super();
+    const hass = provideHass(this);
+    hass.updateTranslations(null, "en");
+    hass.updateTranslations("config", "en");
+    mockEntityRegistry(hass);
+    mockDeviceRegistry(hass);
+    mockAreaRegistry(hass);
+    mockHassioSupervisor(hass);
+  }
+
+  protected render(): TemplateResult {
+    const valueChanged = (ev) => {
+      const sampleIdx = ev.target.sampleIdx;
+      this.data[sampleIdx] = ev.detail.value;
+      this.requestUpdate();
+    };
+    return html`
+      ${SCHEMAS.map(
+        (info, sampleIdx) => html`
+          <demo-black-white-row
+            .title=${info.name}
+            .value=${{ selector: info.selector, data: this.data[sampleIdx] }}
+          >
+            ${["light", "dark"].map(
+              (slot) =>
+                html`
+                  <ha-selector
+                    slot=${slot}
+                    .hass=${this.hass}
+                    .selector=${info.selector}
+                    .label=${info.name}
+                    .value=${this.data[sampleIdx]}
+                    .sampleIdx=${sampleIdx}
+                    @value-changed=${valueChanged}
+                  ></ha-selector>
+                `
+            )}
+          </demo-black-white-row>
+        `
+      )}
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "demo-automation-selectors": DemoHaSelector;
+  }
+}

gallery/src/pages/components/ha-form.ts

@@ -36,8 +36,6 @@ const SCHEMAS: {
       text_multiline: "Text Multiline",
       object: "Object",
       select: "Select",
-      icon: "Icon",
-      media: "Media",
     },
     schema: [
       { name: "addon", selector: { addon: {} } },
@@ -63,18 +61,6 @@ const SCHEMAS: {
           select: { options: ["Everyone Home", "Some Home", "All gone"] },
         },
       },
-      {
-        name: "icon",
-        selector: {
-          icon: {},
-        },
-      },
-      {
-        name: "media",
-        selector: {
-          media: {},
-        },
-      },
     ],
   },
   {

gallery/src/pages/components/ha-selector.markdown

@@ -1,3 +1,3 @@
 ---
-title: Selectors
+title: Target Selectors
 ---

gallery/src/pages/components/ha-selector.ts

@@ -12,100 +12,6 @@ import { mockEntityRegistry } from "../../../../demo/src/stubs/entity_registry";
 import { mockDeviceRegistry } from "../../../../demo/src/stubs/device_registry";
 import { mockAreaRegistry } from "../../../../demo/src/stubs/area_registry";
 import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
-import { getEntity } from "../../../../src/fake_data/entity";
-import { ProvideHassElement } from "../../../../src/mixins/provide-hass-lit-mixin";
-import { showDialog } from "../../../../src/dialogs/make-dialog-manager";
-
-const ENTITIES = [
-  getEntity("alarm_control_panel", "alarm", "disarmed", {
-    friendly_name: "Alarm",
-  }),
-  getEntity("media_player", "livingroom", "playing", {
-    friendly_name: "Livingroom",
-  }),
-  getEntity("media_player", "lounge", "idle", {
-    friendly_name: "Lounge",
-    supported_features: 444983,
-  }),
-  getEntity("light", "bedroom", "on", {
-    friendly_name: "Bedroom",
-  }),
-  getEntity("switch", "coffee", "off", {
-    friendly_name: "Coffee",
-  }),
-];
-
-const DEVICES = [
-  {
-    area_id: "bedroom",
-    configuration_url: null,
-    config_entries: ["config_entry_1"],
-    connections: [],
-    disabled_by: null,
-    entry_type: null,
-    id: "device_1",
-    identifiers: [["demo", "volume1"] as [string, string]],
-    manufacturer: null,
-    model: null,
-    name_by_user: null,
-    name: "Dishwasher",
-    sw_version: null,
-    hw_version: null,
-    via_device_id: null,
-  },
-  {
-    area_id: "backyard",
-    configuration_url: null,
-    config_entries: ["config_entry_2"],
-    connections: [],
-    disabled_by: null,
-    entry_type: null,
-    id: "device_2",
-    identifiers: [["demo", "pwm1"] as [string, string]],
-    manufacturer: null,
-    model: null,
-    name_by_user: null,
-    name: "Lamp",
-    sw_version: null,
-    hw_version: null,
-    via_device_id: null,
-  },
-  {
-    area_id: null,
-    configuration_url: null,
-    config_entries: ["config_entry_3"],
-    connections: [],
-    disabled_by: null,
-    entry_type: null,
-    id: "device_3",
-    identifiers: [["demo", "pwm1"] as [string, string]],
-    manufacturer: null,
-    model: null,
-    name_by_user: "User name",
-    name: "Technical name",
-    sw_version: null,
-    hw_version: null,
-    via_device_id: null,
-  },
-];
-
-const AREAS = [
-  {
-    area_id: "backyard",
-    name: "Backyard",
-    picture: null,
-  },
-  {
-    area_id: "bedroom",
-    name: "Bedroom",
-    picture: null,
-  },
-  {
-    area_id: "livingroom",
-    name: "Livingroom",
-    picture: null,
-  },
-];
 
 const SCHEMAS: {
   name: string;
@@ -166,15 +72,13 @@ const SCHEMAS: {
         name: "Select",
         selector: { select: { options: ["Option 1", "Option 2"] } },
       },
-      icon: { name: "Icon", selector: { icon: {} } },
-      media: { name: "Media", selector: { media: {} } },
     },
   },
 ];
 
 @customElement("demo-components-ha-selector")
-class DemoHaSelector extends LitElement implements ProvideHassElement {
-  @state() public hass!: HomeAssistant;
+class DemoHaSelector extends LitElement {
+  @state() private hass!: HomeAssistant;
 
   private data = SCHEMAS.map(() => ({}));
 
@@ -183,130 +87,12 @@ class DemoHaSelector extends LitElement implements ProvideHassElement {
     const hass = provideHass(this);
     hass.updateTranslations(null, "en");
     hass.updateTranslations("config", "en");
-    hass.addEntities(ENTITIES);
     mockEntityRegistry(hass);
-    mockDeviceRegistry(hass, DEVICES);
-    mockAreaRegistry(hass, AREAS);
+    mockDeviceRegistry(hass);
+    mockAreaRegistry(hass);
     mockHassioSupervisor(hass);
-    hass.mockWS("auth/sign_path", (params) => params);
-    hass.mockWS("media_player/browse_media", this._browseMedia);
   }
 
-  public provideHass(el) {
-    el.hass = this.hass;
-  }
-
-  public connectedCallback() {
-    super.connectedCallback();
-    this.addEventListener("show-dialog", this._dialogManager);
-  }
-
-  public disconnectedCallback() {
-    super.disconnectedCallback();
-    this.removeEventListener("show-dialog", this._dialogManager);
-  }
-
-  private _browseMedia = ({ media_content_id }) => {
-    if (media_content_id === undefined) {
-      return {
-        title: "Media",
-        media_class: "directory",
-        media_content_type: "",
-        media_content_id: "media-source://media_source/local/.",
-        can_play: false,
-        can_expand: true,
-        children_media_class: "directory",
-        thumbnail: null,
-        children: [
-          {
-            title: "Misc",
-            media_class: "directory",
-            media_content_type: "",
-            media_content_id: "media-source://media_source/local/misc",
-            can_play: false,
-            can_expand: true,
-            children_media_class: null,
-            thumbnail: null,
-          },
-          {
-            title: "Movies",
-            media_class: "directory",
-            media_content_type: "",
-            media_content_id: "media-source://media_source/local/movies",
-            can_play: true,
-            can_expand: true,
-            children_media_class: "movie",
-            thumbnail: null,
-          },
-          {
-            title: "Music",
-            media_class: "album",
-            media_content_type: "",
-            media_content_id: "media-source://media_source/local/music",
-            can_play: false,
-            can_expand: true,
-            children_media_class: "music",
-            thumbnail: "/images/album_cover_2.jpg",
-          },
-        ],
-      };
-    }
-    return {
-      title: "Subfolder",
-      media_class: "directory",
-      media_content_type: "",
-      media_content_id: "media-source://media_source/local/sub",
-      can_play: false,
-      can_expand: true,
-      children_media_class: "directory",
-      thumbnail: null,
-      children: [
-        {
-          title: "audio.mp3",
-          media_class: "music",
-          media_content_type: "audio/mpeg",
-          media_content_id: "media-source://media_source/local/audio.mp3",
-          can_play: true,
-          can_expand: false,
-          children_media_class: null,
-          thumbnail: "/images/album_cover.jpg",
-        },
-        {
-          title: "image.jpg",
-          media_class: "image",
-          media_content_type: "image/jpeg",
-          media_content_id: "media-source://media_source/local/image.jpg",
-          can_play: true,
-          can_expand: false,
-          children_media_class: null,
-          thumbnail: null,
-        },
-        {
-          title: "movie.mp4",
-          media_class: "movie",
-          media_content_type: "image/jpeg",
-          media_content_id: "media-source://media_source/local/movie.mp4",
-          can_play: true,
-          can_expand: false,
-          children_media_class: null,
-          thumbnail: null,
-        },
-      ],
-    };
-  };
-
-  private _dialogManager = (e) => {
-    const { dialogTag, dialogImport, dialogParams, addHistory } = e.detail;
-    showDialog(
-      this,
-      this.shadowRoot!,
-      dialogTag,
-      dialogParams,
-      dialogImport,
-      addHistory
-    );
-  };
-
   protected render(): TemplateResult {
     return html`
       ${SCHEMAS.map((info, idx) => {
@@ -345,6 +131,7 @@ class DemoHaSelector extends LitElement implements ProvideHassElement {
   }
 
   static styles = css`
+    paper-input,
     ha-selector {
       width: 60;
     }

hassio/src/addon-store/hassio-addon-store.ts

@@ -221,14 +221,13 @@ class HassioAddonStore extends LitElement {
         margin-top: 24px;
       }
       .search {
-        position: sticky;
-        top: 0;
-        z-index: 2;
+        padding: 0 16px;
+        background: var(--sidebar-background-color);
+        border-bottom: 1px solid var(--divider-color);
       }
-      search-input {
-        display: block;
-        --mdc-text-field-fill-color: var(--sidebar-background-color);
-        --mdc-text-field-idle-line-color: var(--divider-color);
+      .search search-input {
+        position: relative;
+        top: 2px;
       }
       .advanced {
         padding: 12px;

hassio/src/addon-view/config/hassio-addon-audio.ts

@@ -1,6 +1,7 @@
 import "@material/mwc-button";
-import "@material/mwc-select";
-import "@material/mwc-list/mwc-list-item";
+import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
+import "@polymer/paper-item/paper-item";
+import "@polymer/paper-listbox/paper-listbox";
 import {
   css,
   CSSResultGroup,
@@ -10,7 +11,7 @@ import {
   TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { stopPropagation } from "../../../../src/common/dom/stop_propagation";
+import "web-animations-js/web-animations-next-lite.min";
 import "../../../../src/components/buttons/ha-progress-button";
 import "../../../../src/components/ha-alert";
 import "../../../../src/components/ha-card";
@@ -56,44 +57,49 @@ class HassioAddonAudio extends LitElement {
           ${this._error
             ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
             : ""}
-          ${this._inputDevices &&
-          html`<mwc-select
+
+          <paper-dropdown-menu
             .label=${this.supervisor.localize(
               "addon.configuration.audio.input"
             )}
-            @selected=${this._setInputDevice}
-            @closed=${stopPropagation}
-            fixedMenuPosition
-            naturalMenuWidth
-            .value=${this._selectedInput!}
+            @iron-select=${this._setInputDevice}
           >
-            ${this._inputDevices.map(
-              (item) => html`
-                <mwc-list-item .value=${item.device || ""}>
-                  ${item.name}
-                </mwc-list-item>
-              `
-            )}
-          </mwc-select>`}
-          ${this._outputDevices &&
-          html`<mwc-select
+            <paper-listbox
+              slot="dropdown-content"
+              attr-for-selected="device"
+              .selected=${this._selectedInput!}
+            >
+              ${this._inputDevices &&
+              this._inputDevices.map(
+                (item) => html`
+                  <paper-item device=${item.device || ""}>
+                    ${item.name}
+                  </paper-item>
+                `
+              )}
+            </paper-listbox>
+          </paper-dropdown-menu>
+          <paper-dropdown-menu
             .label=${this.supervisor.localize(
               "addon.configuration.audio.output"
             )}
-            @selected=${this._setOutputDevice}
-            @closed=${stopPropagation}
-            fixedMenuPosition
-            naturalMenuWidth
-            .value=${this._selectedOutput!}
+            @iron-select=${this._setOutputDevice}
           >
-            ${this._outputDevices.map(
-              (item) => html`
-                <mwc-list-item .value=${item.device || ""}
-                  >${item.name}</mwc-list-item
-                >
-              `
-            )}
-          </mwc-select>`}
+            <paper-listbox
+              slot="dropdown-content"
+              attr-for-selected="device"
+              .selected=${this._selectedOutput!}
+            >
+              ${this._outputDevices &&
+              this._outputDevices.map(
+                (item) => html`
+                  <paper-item device=${item.device || ""}
+                    >${item.name}</paper-item
+                  >
+                `
+              )}
+            </paper-listbox>
+          </paper-dropdown-menu>
         </div>
         <div class="card-actions">
           <ha-progress-button @click=${this._saveSettings}>
@@ -110,7 +116,8 @@ class HassioAddonAudio extends LitElement {
       hassioStyle,
       css`
         :host,
-        ha-card {
+        ha-card,
+        paper-dropdown-menu {
           display: block;
         }
         paper-item {
@@ -119,30 +126,24 @@ class HassioAddonAudio extends LitElement {
         .card-actions {
           text-align: right;
         }
-        mwc-select {
-          width: 100%;
-        }
-        mwc-select:last-child {
-          margin-top: 8px;
-        }
       `,
     ];
   }
 
-  protected willUpdate(changedProperties: PropertyValues): void {
-    super.willUpdate(changedProperties);
+  protected update(changedProperties: PropertyValues): void {
+    super.update(changedProperties);
     if (changedProperties.has("addon")) {
       this._addonChanged();
     }
   }
 
   private _setInputDevice(ev): void {
-    const device = ev.target.value;
+    const device = ev.detail.item.getAttribute("device");
     this._selectedInput = device;
   }
 
   private _setOutputDevice(ev): void {
-    const device = ev.target.value;
+    const device = ev.detail.item.getAttribute("device");
     this._selectedOutput = device;
   }
 

hassio/src/addon-view/info/hassio-addon-info.ts

@@ -9,7 +9,6 @@ import {
   mdiFlask,
   mdiHomeAssistant,
   mdiKey,
-  mdiLinkLock,
   mdiNetwork,
   mdiNumeric1,
   mdiNumeric2,
@@ -17,8 +16,6 @@ import {
   mdiNumeric4,
   mdiNumeric5,
   mdiNumeric6,
-  mdiNumeric7,
-  mdiNumeric8,
   mdiPound,
   mdiShield,
 } from "@mdi/js";
@@ -34,7 +31,6 @@ import "../../../../src/components/buttons/ha-progress-button";
 import "../../../../src/components/ha-alert";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-chip";
-import "../../../../src/components/ha-chip-set";
 import "../../../../src/components/ha-markdown";
 import "../../../../src/components/ha-settings-row";
 import "../../../../src/components/ha-svg-icon";
@@ -88,8 +84,6 @@ const RATING_ICON = {
   4: mdiNumeric4,
   5: mdiNumeric5,
   6: mdiNumeric6,
-  7: mdiNumeric7,
-  8: mdiNumeric8,
 };
 
 @customElement("hassio-addon-info")
@@ -215,7 +209,7 @@ class HassioAddonInfo extends LitElement {
                 >`}
           </div>
 
-          <ha-chip-set class="capabilities">
+          <div class="capabilities">
             ${this.addon.stage !== "stable"
               ? html` <ha-chip
                   hasIcon
@@ -240,9 +234,9 @@ class HassioAddonInfo extends LitElement {
             <ha-chip
               hasIcon
               class=${classMap({
-                green: Number(this.addon.rating) >= 6,
-                yellow: [3, 4, 5].includes(Number(this.addon.rating)),
-                red: Number(this.addon.rating) >= 2,
+                green: [5, 6].includes(Number(this.addon.rating)),
+                yellow: [3, 4].includes(Number(this.addon.rating)),
+                red: [1, 2].includes(Number(this.addon.rating)),
               })}
               @click=${this._showMoreInfo}
               id="rating"
@@ -370,17 +364,7 @@ class HassioAddonInfo extends LitElement {
                   </ha-chip>
                 `
               : ""}
-            ${this.addon.signed
-              ? html`
-                  <ha-chip hasIcon @click=${this._showMoreInfo} id="signed">
-                    <ha-svg-icon slot="icon" .path=${mdiLinkLock}></ha-svg-icon>
-                    ${this.supervisor.localize(
-                      "addon.dashboard.capability.label.signed"
-                    )}
-                  </ha-chip>
-                `
-              : ""}
-          </ha-chip-set>
+          </div>
 
           <div class="description light-color">
             ${this.addon.description}.<br />

hassio/src/dashboard/hassio-update.ts

@@ -148,6 +148,7 @@ export class HassioUpdate extends LitElement {
         }
         ha-settings-row {
           padding: 0;
+          --paper-item-body-two-line-min-height: 32px;
         }
       `,
     ];

hassio/src/dialogs/datadisk/dialog-hassio-datadisk.ts

@@ -1,5 +1,6 @@
-import "@material/mwc-list/mwc-list-item";
-import "@material/mwc-select";
+import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
+import "@polymer/paper-item/paper-item";
+import "@polymer/paper-listbox/paper-listbox";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -89,19 +90,18 @@ class HassioDatadiskDialog extends LitElement {
                     )}
                     <br /><br />
 
-                    <mwc-select
+                    <paper-dropdown-menu
                       .label=${this.dialogParams.supervisor.localize(
                         "dialog.datadisk_move.select_device"
                       )}
-                      @selected=${this._select_device}
+                      @value-changed=${this._select_device}
                     >
-                      ${this.devices.map(
-                        (device) =>
-                          html`<mwc-list-item .value=${device}
-                            >${device}</mwc-list-item
-                          >`
-                      )}
-                    </mwc-select>
+                      <paper-listbox slot="dropdown-content">
+                        ${this.devices.map(
+                          (device) => html`<paper-item>${device}</paper-item>`
+                        )}
+                      </paper-listbox>
+                    </paper-dropdown-menu>
                   `
                 : this.devices === undefined
                 ? this.dialogParams.supervisor.localize(
@@ -130,8 +130,8 @@ class HassioDatadiskDialog extends LitElement {
     `;
   }
 
-  private _select_device(ev) {
-    this.selectedDevice = ev.target.value;
+  private _select_device(event) {
+    this.selectedDevice = event.detail.value;
   }
 
   private async _moveDatadisk() {
@@ -156,7 +156,7 @@ class HassioDatadiskDialog extends LitElement {
       haStyle,
       haStyleDialog,
       css`
-        mwc-select {
+        paper-dropdown-menu {
           width: 100%;
         }
         ha-circular-progress {

hassio/src/dialogs/hardware/dialog-hassio-hardware.ts

@@ -178,7 +178,7 @@ class HassioHardwareDialog extends LitElement {
           padding: 0.2em 0.4em;
         }
         search-input {
-          margin: 8px 16px 0;
+          margin: 0 16px;
           display: block;
         }
         .device-property {

hassio/src/system/hassio-supervisor-log.ts

@@ -1,4 +1,7 @@
 import "@material/mwc-button";
+import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
+import "@polymer/paper-item/paper-item";
+import "@polymer/paper-listbox/paper-listbox";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../../../src/components/buttons/ha-progress-button";
@@ -70,19 +73,24 @@ class HassioSupervisorLog extends LitElement {
           : ""}
         ${this.hass.userData?.showAdvanced
           ? html`
-              <mwc-select
+              <paper-dropdown-menu
                 .label=${this.supervisor.localize("system.log.log_provider")}
-                @selected=${this._setLogProvider}
-                .value=${this._selectedLogProvider}
+                @iron-select=${this._setLogProvider}
               >
-                ${logProviders.map(
-                  (provider) => html`
-                    <mwc-list-item .value=${provider.key}>
-                      ${provider.name}
-                    </mwc-list-item>
-                  `
-                )}
-              </mwc-select>
+                <paper-listbox
+                  slot="dropdown-content"
+                  attr-for-selected="provider"
+                  .selected=${this._selectedLogProvider}
+                >
+                  ${logProviders.map(
+                    (provider) => html`
+                      <paper-item provider=${provider.key}>
+                        ${provider.name}
+                      </paper-item>
+                    `
+                  )}
+                </paper-listbox>
+              </paper-dropdown-menu>
             `
           : ""}
 
@@ -102,7 +110,7 @@ class HassioSupervisorLog extends LitElement {
   }
 
   private async _setLogProvider(ev): Promise<void> {
-    const provider = ev.target.value;
+    const provider = ev.detail.item.getAttribute("provider");
     this._selectedLogProvider = provider;
     this._loadData();
   }
@@ -145,9 +153,9 @@ class HassioSupervisorLog extends LitElement {
         pre {
           white-space: pre-wrap;
         }
-        mwc-select {
-          width: 100%;
-          margin-bottom: 4px;
+        paper-dropdown-menu {
+          padding: 0 2%;
+          width: 96%;
         }
       `,
     ];

hassio/src/update-available/update-available-card.ts

@@ -10,6 +10,7 @@ import {
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../src/common/dom/fire_event";
+import "../../../src/common/search/search-input";
 import "../../../src/components/buttons/ha-progress-button";
 import "../../../src/components/ha-alert";
 import "../../../src/components/ha-button-menu";

package.json

@@ -106,7 +106,7 @@
     "deep-freeze": "^0.0.1",
     "fuse.js": "^6.0.0",
     "google-timezones-json": "^1.0.2",
-    "hls.js": "^1.1.5",
+    "hls.js": "^1.0.11",
     "home-assistant-js-websocket": "^6.0.1",
     "idb-keyval": "^5.1.3",
     "intl-messageformat": "^9.9.1",

script/core

@@ -4,8 +4,6 @@
 # Stop on errors
 set -e
 
-WD="${WORKSPACE_DIRECTORY:=/workspaces/frontend}"
-
 if [ -z "${DEVCONTAINER}" ]; then
   echo "This task should only run inside a devcontainer, for local install HA Core in a venv."
   exit 1
@@ -18,9 +16,9 @@ if [ -z $(which hass) ]; then
     git+git://github.com/home-assistant/home-assistant.git@dev
 fi
 
-if [ ! -d "${WD}/config" ]; then
+if [ ! -d "/workspaces/frontend/config" ]; then
   echo "Creating default configuration."
-  mkdir -p "${WD}/config";
+  mkdir -p "/workspaces/frontend/config";
   hass --script ensure_config -c config
   echo "demo:
 
@@ -28,24 +26,24 @@ logger:
   default: info
   logs:
     homeassistant.components.frontend: debug
-" >> "${WD}/config/configuration.yaml"
+" >> /workspaces/frontend/config/configuration.yaml
 
   if [ ! -z "${HASSIO}" ]; then
   echo "
 # frontend:
-#   development_repo: ${WD}
+#   development_repo: /workspaces/frontend
 
 hassio:
-  development_repo: ${WD}" >> "${WD}/config/configuration.yaml"
+  development_repo: /workspaces/frontend" >> /workspaces/frontend/config/configuration.yaml
   else
   echo "
 frontend:
-  development_repo: ${WD}
+  development_repo: /workspaces/frontend
 
 # hassio:
-#   development_repo: ${WD}" >> "${WD}/config/configuration.yaml"
+#   development_repo: /workspaces/frontend" >> /workspaces/frontend/config/configuration.yaml
   fi
 
 fi
 
-hass -c "${WD}/config"
+hass -c /workspaces/frontend/config

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name         = home-assistant-frontend
-version      = 20220220.0
+version      = 20220203.0
 author       = The Home Assistant Authors
 author_email = hello@home-assistant.io
 license      = Apache-2.0

src/common/entity/can_toggle_domain.ts

@@ -1,4 +1,4 @@
-import type { HomeAssistant } from "../../types";
+import { HomeAssistant } from "../../types";
 
 export const canToggleDomain = (hass: HomeAssistant, domain: string) => {
   const services = hass.services[domain];

src/common/entity/can_toggle_state.ts

@@ -1,30 +1,14 @@
-import type { HassEntity } from "home-assistant-js-websocket";
-import type { HomeAssistant } from "../../types";
+import { HassEntity } from "home-assistant-js-websocket";
+import { HomeAssistant } from "../../types";
 import { canToggleDomain } from "./can_toggle_domain";
 import { computeStateDomain } from "./compute_state_domain";
 import { supportsFeature } from "./supports-feature";
 
 export const canToggleState = (hass: HomeAssistant, stateObj: HassEntity) => {
   const domain = computeStateDomain(stateObj);
-
   if (domain === "group") {
-    if (
-      stateObj.attributes?.entity_id?.some((entity) => {
-        const entityStateObj = hass.states[entity];
-        if (!entityStateObj) {
-          return false;
-        }
-
-        const entityDomain = computeStateDomain(entityStateObj);
-        return canToggleDomain(hass, entityDomain);
-      })
-    ) {
-      return stateObj.state === "on" || stateObj.state === "off";
-    }
-
-    return false;
+    return stateObj.state === "on" || stateObj.state === "off";
   }
-
   if (domain === "climate") {
     return supportsFeature(stateObj, 4096);
   }

src/common/entity/compute_state_display.ts

@@ -123,11 +123,7 @@ export const computeStateDisplay = (
     domain === "scene" ||
     (domain === "sensor" && stateObj.attributes.device_class === "timestamp")
   ) {
-    try {
-      return formatDateTime(new Date(compareState), locale);
-    } catch (_err) {
-      return compareState;
-    }
+    return formatDateTime(new Date(compareState), locale);
   }
 
   return (

src/common/entity/strip_prefix_from_entity_name.ts

@@ -1,32 +1,24 @@
-const SUFFIXES = [" ", ": "];
-
 /**
  * Strips a device name from an entity name.
  * @param entityName the entity name
- * @param lowerCasedPrefix the prefix to strip, lower cased
+ * @param lowerCasedPrefixWithSpaceSuffix the prefix to strip, lower cased with a space suffix
  * @returns
  */
 export const stripPrefixFromEntityName = (
   entityName: string,
-  lowerCasedPrefix: string
+  lowerCasedPrefixWithSpaceSuffix: string
 ) => {
-  const lowerCasedEntityName = entityName.toLowerCase();
-
-  for (const suffix of SUFFIXES) {
-    const lowerCasedPrefixWithSuffix = `${lowerCasedPrefix}${suffix}`;
-
-    if (lowerCasedEntityName.startsWith(lowerCasedPrefixWithSuffix)) {
-      const newName = entityName.substring(lowerCasedPrefixWithSuffix.length);
-
-      // If first word already has an upper case letter (e.g. from brand name)
-      // leave as-is, otherwise capitalize the first word.
-      return hasUpperCase(newName.substr(0, newName.indexOf(" ")))
-        ? newName
-        : newName[0].toUpperCase() + newName.slice(1);
-    }
+  if (!entityName.toLowerCase().startsWith(lowerCasedPrefixWithSpaceSuffix)) {
+    return undefined;
   }
 
-  return undefined;
+  const newName = entityName.substring(lowerCasedPrefixWithSpaceSuffix.length);
+
+  // If first word already has an upper case letter (e.g. from brand name)
+  // leave as-is, otherwise capitalize the first word.
+  return hasUpperCase(newName.substr(0, newName.indexOf(" ")))
+    ? newName
+    : newName[0].toUpperCase() + newName.slice(1);
 };
 
 const hasUpperCase = (str: string): boolean => str.toLowerCase() !== str;

src/common/search/search-input.ts

@@ -14,9 +14,6 @@ class SearchInput extends LitElement {
 
   @property() public filter?: string;
 
-  @property({ type: Boolean })
-  public suffix = false;
-
   @property({ type: Boolean })
   public autofocus = false;
 
@@ -36,7 +33,7 @@ class SearchInput extends LitElement {
         .label=${this.label || "Search"}
         .value=${this.filter || ""}
         .icon=${true}
-        .iconTrailing=${this.filter || this.suffix}
+        .iconTrailing=${this.filter}
         @input=${this._filterInputChanged}
       >
         <slot name="prefix" slot="leadingIcon">
@@ -46,18 +43,16 @@ class SearchInput extends LitElement {
             .path=${mdiMagnify}
           ></ha-svg-icon>
         </slot>
-        <div class="trailing" slot="trailingIcon">
-          ${this.filter &&
-          html`
-            <ha-icon-button
-              @click=${this._clearSearch}
-              .label=${this.hass.localize("ui.common.clear")}
-              .path=${mdiClose}
-              class="clear-button"
-            ></ha-icon-button>
-          `}
-          <slot name="suffix"></slot>
-        </div>
+        ${this.filter &&
+        html`
+          <ha-icon-button
+            slot="trailingIcon"
+            @click=${this._clearSearch}
+            .label=${this.hass.localize("ui.common.clear")}
+            .path=${mdiClose}
+            class="clear-button"
+          ></ha-icon-button>
+        `}
       </ha-textfield>
     `;
   }
@@ -86,16 +81,15 @@ class SearchInput extends LitElement {
       ha-svg-icon {
         outline: none;
       }
+      ha-icon-button {
+        --mdc-icon-button-size: 24px;
+      }
       .clear-button {
         --mdc-icon-size: 20px;
       }
       ha-textfield {
         display: inherit;
       }
-      .trailing {
-        display: flex;
-        align-items: center;
-      }
     `;
   }
 }

src/common/style/icon_color_css.ts

@@ -15,7 +15,6 @@ export const iconColorCSS = css`
   ha-state-icon[data-domain="media_player"][data-state="on"],
   ha-state-icon[data-domain="media_player"][data-state="paused"],
   ha-state-icon[data-domain="media_player"][data-state="playing"],
-  ha-state-icon[data-domain="remote"][data-state="on"],
   ha-state-icon[data-domain="script"][data-state="on"],
   ha-state-icon[data-domain="sun"][data-state="above_horizon"],
   ha-state-icon[data-domain="switch"][data-state="on"],

src/components/entity/ha-statistic-picker.ts

@@ -1,3 +1,6 @@
+import "@polymer/paper-input/paper-input";
+import "@polymer/paper-item/paper-icon-item";
+import "@polymer/paper-item/paper-item-body";
 import { HassEntity } from "home-assistant-js-websocket";
 import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { ComboBoxLitRenderer } from "lit-vaadin-helpers";

src/components/ha-button-related-filter-menu.ts

@@ -4,7 +4,6 @@ import { mdiFilterVariant } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
-import { stopPropagation } from "../common/dom/stop_propagation";
 import { computeStateName } from "../common/entity/compute_state_name";
 import { computeDeviceName } from "../data/device_registry";
 import { findRelated, RelatedResult } from "../data/search";
@@ -66,7 +65,6 @@ export class HaRelatedFilterButtonMenu extends LitElement {
         .fullwidth=${this.narrow}
         .corner=${this.corner}
         @closed=${this._onClosed}
-        @input=${stopPropagation}
       >
         <ha-area-picker
           .label=${this.hass.localize(
@@ -76,7 +74,6 @@ export class HaRelatedFilterButtonMenu extends LitElement {
           .value=${this.value?.area}
           no-add
           @value-changed=${this._areaPicked}
-          @click=${this._preventDefault}
         ></ha-area-picker>
         <ha-device-picker
           .label=${this.hass.localize(
@@ -85,7 +82,6 @@ export class HaRelatedFilterButtonMenu extends LitElement {
           .hass=${this.hass}
           .value=${this.value?.device}
           @value-changed=${this._devicePicked}
-          @click=${this._preventDefault}
         ></ha-device-picker>
         <ha-entity-picker
           .label=${this.hass.localize(
@@ -95,7 +91,6 @@ export class HaRelatedFilterButtonMenu extends LitElement {
           .value=${this.value?.entity}
           .excludeDomains=${this.excludeDomains}
           @value-changed=${this._entityPicked}
-          @click=${this._preventDefault}
         ></ha-entity-picker>
       </mwc-menu-surface>
     `;
@@ -108,17 +103,11 @@ export class HaRelatedFilterButtonMenu extends LitElement {
     this._open = true;
   }
 
-  private _onClosed(ev): void {
-    ev.stopPropagation();
+  private _onClosed(): void {
     this._open = false;
   }
 
-  private _preventDefault(ev) {
-    ev.preventDefault();
-  }
-
   private async _entityPicked(ev: CustomEvent) {
-    ev.stopPropagation();
     const entityId = ev.detail.value;
     if (!entityId) {
       fireEvent(this, "related-changed", { value: undefined });
@@ -138,7 +127,6 @@ export class HaRelatedFilterButtonMenu extends LitElement {
   }
 
   private async _devicePicked(ev: CustomEvent) {
-    ev.stopPropagation();
     const deviceId = ev.detail.value;
     if (!deviceId) {
       fireEvent(this, "related-changed", { value: undefined });
@@ -162,7 +150,6 @@ export class HaRelatedFilterButtonMenu extends LitElement {
   }
 
   private async _areaPicked(ev: CustomEvent) {
-    ev.stopPropagation();
     const areaId = ev.detail.value;
     if (!areaId) {
       fireEvent(this, "related-changed", { value: undefined });
@@ -186,7 +173,9 @@ export class HaRelatedFilterButtonMenu extends LitElement {
       :host {
         display: inline-block;
         position: relative;
-        --mdc-menu-min-width: 250px;
+      }
+      :host([narrow]) {
+        position: static;
       }
       ha-area-picker,
       ha-device-picker,
@@ -196,15 +185,8 @@ export class HaRelatedFilterButtonMenu extends LitElement {
         padding: 4px 16px;
         box-sizing: border-box;
       }
-      ha-area-picker {
-        padding-top: 16px;
-      }
-      ha-entity-picker {
-        padding-bottom: 16px;
-      }
       :host([narrow]) ha-area-picker,
-      :host([narrow]) ha-device-picker,
-      :host([narrow]) ha-entity-picker {
+      :host([narrow]) ha-device-picker {
         width: 100%;
       }
     `;

src/components/ha-date-input.ts

@@ -1,11 +1,11 @@
 import { mdiCalendar } from "@mdi/js";
+import "@polymer/paper-input/paper-input";
 import { css, CSSResultGroup, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { formatDateNumeric } from "../common/datetime/format_date";
 import { fireEvent } from "../common/dom/fire_event";
 import { HomeAssistant } from "../types";
 import "./ha-svg-icon";
-import "./ha-textfield";
 
 const loadDatePickerDialog = () => import("./ha-dialog-date-picker");
 
@@ -38,17 +38,17 @@ export class HaDateInput extends LitElement {
   @property() public label?: string;
 
   render() {
-    return html`<ha-textfield
+    return html`<paper-input
       .label=${this.label}
       .disabled=${this.disabled}
-      iconTrailing="calendar"
+      no-label-float
       @click=${this._openDialog}
       .value=${this.value
         ? formatDateNumeric(new Date(this.value), this.locale)
         : ""}
     >
-      <ha-svg-icon slot="trailingIcon" .path=${mdiCalendar}></ha-svg-icon>
-    </ha-textfield>`;
+      <ha-svg-icon slot="suffix" .path=${mdiCalendar}></ha-svg-icon>
+    </paper-input>`;
   }
 
   private _openDialog() {
@@ -73,6 +73,9 @@ export class HaDateInput extends LitElement {
 
   static get styles(): CSSResultGroup {
     return css`
+      paper-input {
+        width: 110px;
+      }
       ha-svg-icon {
         color: var(--secondary-text-color);
       }

src/components/ha-form/ha-form-multi_select.ts

@@ -11,8 +11,7 @@ import {
 import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import "../ha-button-menu";
-import "../ha-check-list-item";
-import type { HaCheckListItem } from "../ha-check-list-item";
+import { HaCheckListItem } from "../ha-check-list-item";
 import "../ha-checkbox";
 import type { HaCheckbox } from "../ha-checkbox";
 import "../ha-formfield";

src/components/ha-form/ha-form.ts

@@ -32,12 +32,7 @@ export class HaForm extends LitElement implements HaFormElement {
 
   @property() public computeError?: (schema: HaFormSchema, error) => string;
 
-  @property() public computeLabel?: (
-    schema: HaFormSchema,
-    data?: HaFormDataContainer
-  ) => string;
-
-  @property() public computeHelper?: (schema: HaFormSchema) => string;
+  @property() public computeLabel?: (schema: HaFormSchema) => string;
 
   public focus() {
     const root = this.shadowRoot?.querySelector(".root");
@@ -76,7 +71,6 @@ export class HaForm extends LitElement implements HaFormElement {
           : ""}
         ${this.schema.map((item) => {
           const error = getValue(this.error, item);
-
           return html`
             ${error
               ? html`
@@ -91,15 +85,14 @@ export class HaForm extends LitElement implements HaFormElement {
                   .hass=${this.hass}
                   .selector=${item.selector}
                   .value=${getValue(this.data, item)}
-                  .label=${this._computeLabel(item, this.data)}
+                  .label=${this._computeLabel(item)}
                   .disabled=${this.disabled}
-                  .helper=${this._computeHelper(item)}
                   .required=${item.required || false}
                 ></ha-selector>`
               : dynamicElement(`ha-form-${item.type}`, {
                   schema: item,
                   data: getValue(this.data, item),
-                  label: this._computeLabel(item, this.data),
+                  label: this._computeLabel(item),
                   disabled: this.disabled,
                 })}
           `;
@@ -114,7 +107,6 @@ export class HaForm extends LitElement implements HaFormElement {
     root.addEventListener("value-changed", (ev) => {
       ev.stopPropagation();
       const schema = (ev.target as HaFormElement).schema as HaFormSchema;
-
       fireEvent(this, "value-changed", {
         value: { ...this.data, [schema.name]: ev.detail.value },
       });
@@ -122,18 +114,14 @@ export class HaForm extends LitElement implements HaFormElement {
     return root;
   }
 
-  private _computeLabel(schema: HaFormSchema, data: HaFormDataContainer) {
+  private _computeLabel(schema: HaFormSchema) {
     return this.computeLabel
-      ? this.computeLabel(schema, data)
+      ? this.computeLabel(schema)
       : schema
       ? schema.name
       : "";
   }
 
-  private _computeHelper(schema: HaFormSchema) {
-    return this.computeHelper ? this.computeHelper(schema) : "";
-  }
-
   private _computeError(error, schema: HaFormSchema | HaFormSchema[]) {
     return this.computeError ? this.computeError(error, schema) : error;
   }

src/components/ha-form/types.ts

@@ -49,7 +49,7 @@ export interface HaFormSelectSchema extends HaFormBaseSchema {
 
 export interface HaFormMultiSelectSchema extends HaFormBaseSchema {
   type: "multi_select";
-  options: Record<string, string> | string[] | Array<[string, string]>;
+  options: Record<string, string> | string[];
 }
 
 export interface HaFormFloatSchema extends HaFormBaseSchema {

src/components/ha-hls-player.ts

@@ -43,8 +43,6 @@ class HaHLSPlayer extends LitElement {
 
   @state() private _error?: string;
 
-  @state() private _errorIsFatal = false;
-
   private _hlsPolyfillInstance?: HlsLite;
 
   private _exoPlayer = false;
@@ -55,7 +53,6 @@ class HaHLSPlayer extends LitElement {
     super.connectedCallback();
     HaHLSPlayer.streamCount += 1;
     if (this.hasUpdated) {
-      this._resetError();
       this._startHls();
     }
   }
@@ -67,23 +64,16 @@ class HaHLSPlayer extends LitElement {
   }
 
   protected render(): TemplateResult {
+    if (this._error) {
+      return html`<ha-alert alert-type="error">${this._error}</ha-alert>`;
+    }
     return html`
-      ${this._error
-        ? html`<ha-alert
-            alert-type="error"
-            class=${this._errorIsFatal ? "fatal" : "retry"}
-          >
-            ${this._error}
-          </ha-alert>`
-        : ""}
-      ${!this._errorIsFatal
-        ? html`<video
-            ?autoplay=${this.autoPlay}
-            .muted=${this.muted}
-            ?playsinline=${this.playsInline}
-            ?controls=${this.controls}
-          ></video>`
-        : ""}
+      <video
+        ?autoplay=${this.autoPlay}
+        .muted=${this.muted}
+        ?playsinline=${this.playsInline}
+        ?controls=${this.controls}
+      ></video>
     `;
   }
 
@@ -97,11 +87,12 @@ class HaHLSPlayer extends LitElement {
     }
 
     this._cleanUp();
-    this._resetError();
     this._startHls();
   }
 
   private async _startHls(): Promise<void> {
+    this._error = undefined;
+
     const masterPlaylistPromise = fetch(this.url);
 
     const Hls: typeof HlsType = (await import("hls.js/dist/hls.light.min"))
@@ -119,8 +110,8 @@ class HaHLSPlayer extends LitElement {
     }
 
     if (!hlsSupported) {
-      this._setFatalError(
-        this.hass.localize("ui.components.media-browser.video_not_supported")
+      this._error = this.hass.localize(
+        "ui.components.media-browser.video_not_supported"
       );
       return;
     }
@@ -228,16 +219,9 @@ class HaHLSPlayer extends LitElement {
     this._hlsPolyfillInstance = hls;
     hls.attachMedia(videoEl);
     hls.on(Hls.Events.MEDIA_ATTACHED, () => {
-      this._resetError();
       hls.loadSource(url);
     });
-    hls.on(Hls.Events.FRAG_LOADED, (_event, _data: any) => {
-      this._resetError();
-    });
-    hls.on(Hls.Events.ERROR, (_event, data: any) => {
-      // Some errors are recovered automatically by the hls player itself, and the others handled
-      // in this function require special actions to recover. Errors retried in this function
-      // are done with backoff to not cause unecessary failures.
+    hls.on(Hls.Events.ERROR, (_, data: any) => {
       if (!data.fatal) {
         return;
       }
@@ -257,22 +241,22 @@ class HaHLSPlayer extends LitElement {
                 error += " (" + data.response.code + ")";
               }
             }
-            this._setRetryableError(error);
-            break;
+            this._error = error;
+            return;
           }
           case Hls.ErrorDetails.MANIFEST_LOAD_TIMEOUT:
-            this._setRetryableError("Timeout while starting stream");
-            break;
+            this._error = "Timeout while starting stream";
+            return;
           default:
-            this._setRetryableError("Stream network error");
-            break;
+            this._error = "Unknown stream network error (" + data.details + ")";
+            return;
         }
-        hls.startLoad();
+        this._error = "Error with media stream contents (" + data.details + ")";
       } else if (data.type === Hls.ErrorTypes.MEDIA_ERROR) {
-        this._setRetryableError("Error with media stream contents");
-        hls.recoverMediaError();
+        this._error = "Error with media stream contents (" + data.details + ")";
       } else {
-        this._setFatalError("Error playing stream");
+        this._error =
+          "Unknown error with stream (" + data.type + ", " + data.details + ")";
       }
     });
   }
@@ -300,21 +284,6 @@ class HaHLSPlayer extends LitElement {
     }
   }
 
-  private _resetError() {
-    this._error = undefined;
-    this._errorIsFatal = false;
-  }
-
-  private _setFatalError(errorMessage: string) {
-    this._error = errorMessage;
-    this._errorIsFatal = true;
-  }
-
-  private _setRetryableError(errorMessage: string) {
-    this._error = errorMessage;
-    this._errorIsFatal = false;
-  }
-
   static get styles(): CSSResultGroup {
     return css`
       :host,
@@ -327,14 +296,10 @@ class HaHLSPlayer extends LitElement {
         max-height: var(--video-max-height, calc(100vh - 97px));
       }
 
-      .fatal {
+      ha-alert {
         display: block;
         padding: 100px 16px;
       }
-
-      .retry {
-        display: block;
-      }
     `;
   }
 }

src/components/ha-paper-dropdown-menu.ts

@@ -0,0 +1,28 @@
+import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
+import { PolymerElement } from "@polymer/polymer";
+import { Constructor } from "../types";
+
+const paperDropdownClass = customElements.get(
+  "paper-dropdown-menu"
+) as Constructor<PolymerElement>;
+
+// patches paper drop down to properly support RTL - https://github.com/PolymerElements/paper-dropdown-menu/issues/183
+export class HaPaperDropdownClass extends paperDropdownClass {
+  public ready() {
+    super.ready();
+    // wait to check for direction since otherwise direction is wrong even though top level is RTL
+    setTimeout(() => {
+      if (window.getComputedStyle(this).direction === "rtl") {
+        this.style.textAlign = "right";
+      }
+    }, 100);
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-paper-dropdown-menu": HaPaperDropdownClass;
+  }
+}
+
+customElements.define("ha-paper-dropdown-menu", HaPaperDropdownClass);

src/components/ha-picture-upload.ts

@@ -1,4 +1,5 @@
 import { mdiImagePlus } from "@mdi/js";
+import "@polymer/paper-input/paper-input-container";
 import { html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";

src/components/ha-selector/ha-selector-icon.ts

@@ -1,39 +0,0 @@
-import "../ha-icon-picker";
-import { html, LitElement } from "lit";
-import { customElement, property } from "lit/decorators";
-import { HomeAssistant } from "../../types";
-import { IconSelector } from "../../data/selector";
-import { fireEvent } from "../../common/dom/fire_event";
-
-@customElement("ha-selector-icon")
-export class HaIconSelector extends LitElement {
-  @property() public hass!: HomeAssistant;
-
-  @property() public selector!: IconSelector;
-
-  @property() public value?: string;
-
-  @property() public label?: string;
-
-  @property({ type: Boolean, reflect: true }) public disabled = false;
-
-  protected render() {
-    return html`
-      <ha-icon-picker
-        .label=${this.label}
-        .value=${this.value}
-        @value-changed=${this._valueChanged}
-      ></ha-icon-picker>
-    `;
-  }
-
-  private _valueChanged(ev: CustomEvent) {
-    fireEvent(this, "value-changed", { value: ev.detail.value });
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-selector-icon": HaIconSelector;
-  }
-}

src/components/ha-selector/ha-selector-media.ts

@@ -1,264 +0,0 @@
-import { mdiPlayBox, mdiPlus } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
-import { fireEvent } from "../../common/dom/fire_event";
-import { supportsFeature } from "../../common/entity/supports-feature";
-import { getSignedPath } from "../../data/auth";
-import {
-  MediaClassBrowserSettings,
-  MediaPickedEvent,
-  SUPPORT_BROWSE_MEDIA,
-} from "../../data/media-player";
-import type { MediaSelector, MediaSelectorValue } from "../../data/selector";
-import type { HomeAssistant } from "../../types";
-import "../ha-alert";
-import "../ha-form/ha-form";
-import type { HaFormSchema } from "../ha-form/types";
-import { showMediaBrowserDialog } from "../media-player/show-media-browser-dialog";
-
-const MANUAL_SCHEMA = [
-  { name: "media_content_id", required: false, selector: { text: {} } },
-  { name: "media_content_type", required: false, selector: { text: {} } },
-];
-
-@customElement("ha-selector-media")
-export class HaMediaSelector extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public selector!: MediaSelector;
-
-  @property({ attribute: false }) public value?: MediaSelectorValue;
-
-  @property() public label?: string;
-
-  @property({ type: Boolean, reflect: true }) public disabled = false;
-
-  @state() private _thumbnailUrl?: string | null;
-
-  willUpdate(changedProps: PropertyValues<this>) {
-    if (changedProps.has("value")) {
-      const thumbnail = this.value?.metadata?.thumbnail;
-      const oldThumbnail = (changedProps.get("value") as this["value"])
-        ?.metadata?.thumbnail;
-      if (thumbnail === oldThumbnail) {
-        return;
-      }
-      if (thumbnail && thumbnail.startsWith("/")) {
-        this._thumbnailUrl = undefined;
-        // Thumbnails served by local API require authentication
-        getSignedPath(this.hass, thumbnail).then((signedPath) => {
-          this._thumbnailUrl = signedPath.path;
-        });
-      } else {
-        this._thumbnailUrl = thumbnail;
-      }
-    }
-  }
-
-  protected render() {
-    const stateObj = this.value?.entity_id
-      ? this.hass.states[this.value.entity_id]
-      : undefined;
-
-    const supportsBrowse =
-      !this.value?.entity_id ||
-      (stateObj && supportsFeature(stateObj, SUPPORT_BROWSE_MEDIA));
-
-    return html`<ha-entity-picker
-        .hass=${this.hass}
-        .value=${this.value?.entity_id}
-        .label=${this.label ||
-        this.hass.localize("ui.components.selectors.media.pick_media_player")}
-        .disabled=${this.disabled}
-        include-domains='["media_player"]'
-        allow-custom-entity
-        @value-changed=${this._entityChanged}
-      ></ha-entity-picker>
-      ${!supportsBrowse
-        ? html`<ha-alert>
-              ${this.hass.localize(
-                "ui.components.selectors.media.browse_not_supported"
-              )}
-            </ha-alert>
-            <ha-form
-              .hass=${this.hass}
-              .data=${this.value}
-              .schema=${MANUAL_SCHEMA}
-              .computeLabel=${this._computeLabelCallback}
-            ></ha-form>`
-        : html`<ha-card
-            outlined
-            @click=${this._pickMedia}
-            class=${this.disabled || !this.value?.entity_id ? "disabled" : ""}
-          >
-            <div
-              class="thumbnail ${classMap({
-                portrait:
-                  !!this.value?.metadata?.media_class &&
-                  MediaClassBrowserSettings[
-                    this.value.metadata.children_media_class ||
-                      this.value.metadata.media_class
-                  ].thumbnail_ratio === "portrait",
-              })}"
-            >
-              ${this.value?.metadata?.thumbnail
-                ? html`
-                    <div
-                      class="${classMap({
-                        "centered-image":
-                          !!this.value.metadata.media_class &&
-                          ["app", "directory"].includes(
-                            this.value.metadata.media_class
-                          ),
-                      })}
-                        image"
-                      style=${this._thumbnailUrl
-                        ? `background-image: url(${this._thumbnailUrl});`
-                        : ""}
-                    ></div>
-                  `
-                : html`
-                    <div class="icon-holder image">
-                      <ha-svg-icon
-                        class="folder"
-                        .path=${!this.value?.media_content_id
-                          ? mdiPlus
-                          : this.value?.metadata?.media_class
-                          ? MediaClassBrowserSettings[
-                              this.value.metadata.media_class === "directory"
-                                ? this.value.metadata.children_media_class ||
-                                  this.value.metadata.media_class
-                                : this.value.metadata.media_class
-                            ].icon
-                          : mdiPlayBox}
-                      ></ha-svg-icon>
-                    </div>
-                  `}
-            </div>
-            <div class="title">
-              ${!this.value?.media_content_id
-                ? this.hass.localize("ui.components.selectors.media.pick_media")
-                : this.value.metadata?.title || this.value.media_content_id}
-            </div>
-          </ha-card>`}`;
-  }
-
-  private _computeLabelCallback = (schema: HaFormSchema): string =>
-    this.hass.localize(`ui.components.selectors.media.${schema.name}`);
-
-  private _entityChanged(ev: CustomEvent) {
-    ev.stopPropagation();
-    fireEvent(this, "value-changed", {
-      value: {
-        entity_id: ev.detail.value,
-        media_content_id: "",
-        media_content_type: "",
-      },
-    });
-  }
-
-  private _pickMedia() {
-    showMediaBrowserDialog(this, {
-      action: "pick",
-      entityId: this.value!.entity_id!,
-      navigateIds: this.value!.metadata?.navigateIds,
-      mediaPickedCallback: (pickedMedia: MediaPickedEvent) => {
-        fireEvent(this, "value-changed", {
-          value: {
-            ...this.value,
-            media_content_id: pickedMedia.item.media_content_id,
-            media_content_type: pickedMedia.item.media_content_type,
-            metadata: {
-              title: pickedMedia.item.title,
-              thumbnail: pickedMedia.item.thumbnail,
-              media_class: pickedMedia.item.media_class,
-              children_media_class: pickedMedia.item.children_media_class,
-              navigateIds: pickedMedia.navigateIds?.map((id) => ({
-                media_content_type: id.media_content_type,
-                media_content_id: id.media_content_id,
-              })),
-            },
-          },
-        });
-      },
-    });
-  }
-
-  static get styles(): CSSResultGroup {
-    return css`
-      ha-entity-picker {
-        display: block;
-        margin-bottom: 16px;
-      }
-      mwc-button {
-        margin-top: 8px;
-      }
-      ha-alert {
-        display: block;
-        margin-bottom: 16px;
-      }
-      ha-card {
-        position: relative;
-        width: 200px;
-        box-sizing: border-box;
-        cursor: pointer;
-      }
-      ha-card.disabled {
-        pointer-events: none;
-        color: var(--disabled-text-color);
-      }
-      ha-card .thumbnail {
-        width: 100%;
-        position: relative;
-        box-sizing: border-box;
-        transition: padding-bottom 0.1s ease-out;
-        padding-bottom: 100%;
-      }
-      ha-card .thumbnail.portrait {
-        padding-bottom: 150%;
-      }
-      ha-card .image {
-        border-radius: 3px 3px 0 0;
-      }
-      .folder {
-        --mdc-icon-size: calc(var(--media-browse-item-size, 175px) * 0.4);
-      }
-      .title {
-        font-size: 16px;
-        padding-top: 16px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        margin-bottom: 16px;
-        padding-left: 16px;
-        padding-right: 4px;
-        white-space: nowrap;
-      }
-      .image {
-        position: absolute;
-        top: 0;
-        right: 0;
-        left: 0;
-        bottom: 0;
-        background-size: cover;
-        background-repeat: no-repeat;
-        background-position: center;
-      }
-      .centered-image {
-        margin: 0 8px;
-        background-size: contain;
-      }
-      .icon-holder {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-selector-media": HaMediaSelector;
-  }
-}

src/components/ha-selector/ha-selector-select.ts

@@ -2,7 +2,7 @@ import { css, CSSResultGroup, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import { stopPropagation } from "../../common/dom/stop_propagation";
-import { SelectOption, SelectSelector } from "../../data/selector";
+import { SelectSelector } from "../../data/selector";
 import { HomeAssistant } from "../../types";
 import "@material/mwc-select/mwc-select";
 import "@material/mwc-list/mwc-list-item";
@@ -17,8 +17,6 @@ export class HaSelectSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean }) public disabled = false;
 
   protected render() {
@@ -27,17 +25,15 @@ export class HaSelectSelector extends LitElement {
       naturalMenuWidth
       .label=${this.label}
       .value=${this.value}
-      .helper=${this.helper}
       .disabled=${this.disabled}
       @closed=${stopPropagation}
       @selected=${this._valueChanged}
     >
-      ${this.selector.select.options.map((item: string | SelectOption) => {
-        const value = typeof item === "object" ? item.value : item;
-        const label = typeof item === "object" ? item.label : item;
-
-        return html`<mwc-list-item .value=${value}>${label}</mwc-list-item>`;
-      })}
+      ${this.selector.select.options.map(
+        (item: string) => html`
+          <mwc-list-item .value=${item}>${item}</mwc-list-item>
+        `
+      )}
     </mwc-select>`;
   }
 

src/components/ha-selector/ha-selector-time.ts

@@ -22,7 +22,6 @@ export class HaTimeSelector extends LitElement {
         .value=${this.value}
         .locale=${this.hass.locale}
         .disabled=${this.disabled}
-        .label=${this.label}
         enable-second
       ></ha-time-input>
     `;

src/components/ha-selector/ha-selector.ts

@@ -17,8 +17,6 @@ import "./ha-selector-select";
 import "./ha-selector-target";
 import "./ha-selector-text";
 import "./ha-selector-time";
-import "./ha-selector-icon";
-import "./ha-selector-media";
 
 @customElement("ha-selector")
 export class HaSelector extends LitElement {
@@ -30,8 +28,6 @@ export class HaSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property() public helper?: string;
-
   @property() public placeholder?: any;
 
   @property({ type: Boolean }) public disabled = false;
@@ -56,7 +52,6 @@ export class HaSelector extends LitElement {
         placeholder: this.placeholder,
         disabled: this.disabled,
         required: this.required,
-        helper: this.helper,
         id: "selector",
       })}
     `;

src/components/ha-service-control.ts

@@ -489,6 +489,9 @@ export class HaServiceControl extends LitElement {
         margin: var(--service-control-padding, 0 16px);
         padding: 16px 0;
       }
+      :host(:not([narrow])) ha-settings-row paper-input {
+        width: 60%;
+      }
       :host(:not([narrow])) ha-settings-row ha-selector {
         width: 60%;
       }

src/components/ha-textfield.ts

@@ -68,14 +68,6 @@ export class HaTextField extends TextFieldBase {
       :host([no-spinner]) input[type="number"] {
         -moz-appearance: textfield;
       }
-
-      .mdc-text-field__ripple {
-        overflow: hidden;
-      }
-
-      .mdc-text-field {
-        overflow: var(--text-field-overflow);
-      }
     `,
   ];
 }

src/components/media-player/dialog-media-player-browse.ts

@@ -28,10 +28,10 @@ class DialogMediaPlayerBrowse extends LitElement {
 
   public showDialog(params: MediaPlayerBrowseDialogParams): void {
     this._params = params;
-    this._navigateIds = params.navigateIds || [
+    this._navigateIds = [
       {
-        media_content_id: undefined,
-        media_content_type: undefined,
+        media_content_id: this._params.mediaContentId,
+        media_content_type: this._params.mediaContentType,
       },
     ];
   }

src/components/media-player/ha-browse-media-tts.ts

@@ -1,280 +0,0 @@
-import "@material/mwc-select";
-import "@material/mwc-list/mwc-list-item";
-import { css, html, LitElement, PropertyValues } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import { fireEvent } from "../../common/dom/fire_event";
-import { fetchCloudStatus, updateCloudPref } from "../../data/cloud";
-import {
-  CloudTTSInfo,
-  getCloudTTSInfo,
-  getCloudTtsLanguages,
-  getCloudTtsSupportedGenders,
-} from "../../data/cloud/tts";
-import {
-  MediaPlayerBrowseAction,
-  MediaPlayerItem,
-} from "../../data/media-player";
-import { HomeAssistant } from "../../types";
-import "../ha-textarea";
-import { buttonLinkStyle } from "../../resources/styles";
-import { showAlertDialog } from "../../dialogs/generic/show-dialog-box";
-import { LocalStorage } from "../../common/decorators/local-storage";
-import { stopPropagation } from "../../common/dom/stop_propagation";
-
-export interface TtsMediaPickedEvent {
-  item: MediaPlayerItem;
-}
-
-declare global {
-  interface HASSDomEvents {
-    "tts-picked": TtsMediaPickedEvent;
-  }
-}
-
-@customElement("ha-browse-media-tts")
-class BrowseMediaTTS extends LitElement {
-  @property() public hass!: HomeAssistant;
-
-  @property() public item;
-
-  @property() public action!: MediaPlayerBrowseAction;
-
-  @state() private _cloudDefaultOptions?: [string, string];
-
-  @state() private _cloudOptions?: [string, string];
-
-  @state() private _cloudTTSInfo?: CloudTTSInfo;
-
-  @LocalStorage("cloudTtsTryMessage", true, false) private _message!: string;
-
-  protected render() {
-    return html`<ha-card>
-      <div class="card-content">
-        <ha-textarea
-          autogrow
-          .label=${this.hass.localize(
-            "ui.components.media-browser.tts.message"
-          )}
-          .value=${this._message ||
-          this.hass.localize(
-            "ui.components.media-browser.tts.example_message",
-            {
-              name: this.hass.user?.name || "",
-            }
-          )}
-        >
-        </ha-textarea>
-        ${this._cloudDefaultOptions ? this._renderCloudOptions() : ""}
-      </div>
-      <div class="card-actions">
-        ${this._cloudDefaultOptions &&
-        (this._cloudDefaultOptions![0] !== this._cloudOptions![0] ||
-          this._cloudDefaultOptions![1] !== this._cloudOptions![1])
-          ? html`
-              <button class="link" @click=${this._storeDefaults}>
-                ${this.hass.localize(
-                  "ui.components.media-browser.tts.set_as_default"
-                )}
-              </button>
-            `
-          : html`<span></span>`}
-
-        <mwc-button @click=${this._ttsClicked}>
-          ${this.hass.localize(
-            `ui.components.media-browser.tts.action_${this.action}`
-          )}
-        </mwc-button>
-      </div>
-    </ha-card> `;
-  }
-
-  private _renderCloudOptions() {
-    if (!this._cloudTTSInfo || !this._cloudOptions) {
-      return "";
-    }
-    const languages = this.getLanguages(this._cloudTTSInfo);
-    const selectedVoice = this._cloudOptions;
-    const genders = this.getSupportedGenders(
-      selectedVoice[0],
-      this._cloudTTSInfo,
-      this.hass.localize
-    );
-
-    return html`
-      <div class="cloud-options">
-        <mwc-select
-          fixedMenuPosition
-          naturalMenuWidth
-          .label=${this.hass.localize(
-            "ui.components.media-browser.tts.language"
-          )}
-          .value=${selectedVoice[0]}
-          @selected=${this._handleLanguageChange}
-          @closed=${stopPropagation}
-        >
-          ${languages.map(
-            ([key, label]) =>
-              html`<mwc-list-item .value=${key}>${label}</mwc-list-item>`
-          )}
-        </mwc-select>
-
-        <mwc-select
-          fixedMenuPosition
-          naturalMenuWidth
-          .label=${this.hass.localize("ui.components.media-browser.tts.gender")}
-          .value=${selectedVoice[1]}
-          @selected=${this._handleGenderChange}
-          @closed=${stopPropagation}
-        >
-          ${genders.map(
-            ([key, label]) =>
-              html`<mwc-list-item .value=${key}>${label}</mwc-list-item>`
-          )}
-        </mwc-select>
-      </div>
-    `;
-  }
-
-  protected override willUpdate(changedProps: PropertyValues): void {
-    super.willUpdate(changedProps);
-
-    if (changedProps.has("item")) {
-      if (this.item.media_content_id) {
-        const params = new URLSearchParams(
-          this.item.media_content_id.split("?")[1]
-        );
-        const message = params.get("message");
-        const language = params.get("language");
-        const gender = params.get("gender");
-        if (message) {
-          this._message = message;
-        }
-        if (language && gender) {
-          this._cloudOptions = [language, gender];
-        }
-      }
-
-      if (this.isCloudItem && !this._cloudTTSInfo) {
-        getCloudTTSInfo(this.hass).then((info) => {
-          this._cloudTTSInfo = info;
-        });
-        fetchCloudStatus(this.hass).then((status) => {
-          if (status.logged_in) {
-            this._cloudDefaultOptions = status.prefs.tts_default_voice;
-            if (!this._cloudOptions) {
-              this._cloudOptions = { ...this._cloudDefaultOptions };
-            }
-          }
-        });
-      }
-    }
-
-    if (changedProps.has("message")) {
-      return;
-    }
-
-    // Re-rendering can reset message because textarea content is newer than local storage.
-    // But we don't want to write every keystroke to local storage.
-    // So instead we just do it when we're going to render.
-    const message = this.shadowRoot!.querySelector("ha-textarea")?.value;
-    if (message !== undefined && message !== this._message) {
-      this._message = message;
-    }
-  }
-
-  async _handleLanguageChange(ev) {
-    if (ev.target.value === this._cloudOptions![0]) {
-      return;
-    }
-    this._cloudOptions = [ev.target.value, this._cloudOptions![1]];
-  }
-
-  async _handleGenderChange(ev) {
-    if (ev.target.value === this._cloudOptions![1]) {
-      return;
-    }
-    this._cloudOptions = [this._cloudOptions![0], ev.target.value];
-  }
-
-  private getLanguages = memoizeOne(getCloudTtsLanguages);
-
-  private getSupportedGenders = memoizeOne(getCloudTtsSupportedGenders);
-
-  private get isCloudItem(): boolean {
-    return this.item.media_content_id.startsWith("media-source://tts/cloud");
-  }
-
-  private async _ttsClicked(): Promise<void> {
-    const message = this.shadowRoot!.querySelector("ha-textarea")!.value;
-    this._message = message;
-    const item = { ...this.item };
-    const query = new URLSearchParams();
-    query.append("message", message);
-    if (this._cloudOptions) {
-      query.append("language", this._cloudOptions[0]);
-      query.append("gender", this._cloudOptions[1]);
-    }
-    item.media_content_id = `${
-      item.media_content_id.split("?")[0]
-    }?${query.toString()}`;
-    item.can_play = true;
-    item.title = message;
-    fireEvent(this, "tts-picked", { item });
-  }
-
-  private async _storeDefaults() {
-    const oldDefaults = this._cloudDefaultOptions!;
-    this._cloudDefaultOptions = [...this._cloudOptions!];
-    try {
-      await updateCloudPref(this.hass, {
-        tts_default_voice: this._cloudDefaultOptions,
-      });
-    } catch (err: any) {
-      this._cloudDefaultOptions = oldDefaults;
-      showAlertDialog(this, {
-        text: this.hass.localize(
-          "ui.components.media-browser.tts.faild_to_store_defaults",
-          { error: err.message || err }
-        ),
-      });
-    }
-  }
-
-  static override styles = [
-    buttonLinkStyle,
-    css`
-      :host {
-        margin: 16px auto;
-        padding: 0 8px;
-        display: flex;
-        flex-direction: column;
-        max-width: 400px;
-      }
-      .cloud-options {
-        margin-top: 16px;
-        display: flex;
-        justify-content: space-between;
-      }
-      .cloud-options mwc-select {
-        width: 48%;
-      }
-      ha-textarea {
-        width: 100%;
-      }
-      button.link {
-        color: var(--primary-color);
-      }
-      .card-actions {
-        display: flex;
-        justify-content: space-between;
-      }
-    `,
-  ];
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-browse-media-tts": BrowseMediaTTS;
-  }
-}

src/components/media-player/ha-media-player-browse.ts

@@ -1,7 +1,8 @@
 import "@material/mwc-button/mwc-button";
 import "@material/mwc-list/mwc-list";
 import "@material/mwc-list/mwc-list-item";
-import { mdiArrowUpRight, mdiPlay, mdiPlus } from "@mdi/js";
+import { mdiPlay, mdiPlus } from "@mdi/js";
+import "@polymer/paper-item/paper-item";
 import "@polymer/paper-tooltip/paper-tooltip";
 import {
   css,
@@ -48,20 +49,11 @@ import "../ha-icon-button";
 import "../ha-svg-icon";
 import "../ha-fab";
 import { browseLocalMediaPlayer } from "../../data/media_source";
-import { isTTSMediaSource } from "../../data/tts";
-import { TtsMediaPickedEvent } from "./ha-browse-media-tts";
 
 declare global {
   interface HASSDomEvents {
     "media-picked": MediaPickedEvent;
-    "media-browsed": {
-      // Items of the new browse stack
-      ids: MediaPlayerItemId[];
-      // Current fetched item for this browse stack
-      current?: MediaPlayerItem;
-      // If the new stack should replace the old stack
-      replace?: boolean;
-    };
+    "media-browsed": { ids: MediaPlayerItemId[]; current?: MediaPlayerItem };
   }
 }
 
@@ -254,160 +246,159 @@ export class HaMediaPlayerBrowse extends LitElement {
                       ${this._renderError(this._error)}
                     </div>
                   `
-                : isTTSMediaSource(currentItem.media_content_id)
-                ? html`
-                    <ha-browse-media-tts
-                      .item=${currentItem}
-                      .hass=${this.hass}
-                      .action=${this.action}
-                      @tts-picked=${this._ttsPicked}
-                    ></ha-browse-media-tts>
-                  `
-                : !currentItem.children?.length
-                ? html`
-                    <div class="container no-items">
-                      ${currentItem.media_content_id ===
-                      "media-source://media_source/local/."
-                        ? html`
-                            <div class="highlight-add-button">
-                              <span>
-                                <ha-svg-icon
-                                  .path=${mdiArrowUpRight}
-                                ></ha-svg-icon>
-                              </span>
-                              <span>
-                                ${this.hass.localize(
-                                  "ui.components.media-browser.file_management.highlight_button"
-                                )}
-                              </span>
+                : currentItem.children?.length
+                ? childrenMediaClass.layout === "grid"
+                  ? html`
+                      <div
+                        class="children ${classMap({
+                          portrait:
+                            childrenMediaClass.thumbnail_ratio === "portrait",
+                        })}"
+                      >
+                        ${currentItem.children.map(
+                          (child) => html`
+                            <div
+                              class="child"
+                              .item=${child}
+                              @click=${this._childClicked}
+                            >
+                              <ha-card outlined>
+                                <div class="thumbnail">
+                                  ${child.thumbnail
+                                    ? html`
+                                        <div
+                                          class="${[
+                                            "app",
+                                            "directory",
+                                          ].includes(child.media_class)
+                                            ? "centered-image"
+                                            : ""} image lazythumbnail"
+                                          data-src=${child.thumbnail}
+                                        ></div>
+                                      `
+                                    : html`
+                                        <div class="icon-holder image">
+                                          <ha-svg-icon
+                                            class="folder"
+                                            .path=${MediaClassBrowserSettings[
+                                              child.media_class === "directory"
+                                                ? child.children_media_class ||
+                                                  child.media_class
+                                                : child.media_class
+                                            ].icon}
+                                          ></ha-svg-icon>
+                                        </div>
+                                      `}
+                                  ${child.can_play
+                                    ? html`
+                                        <ha-icon-button
+                                          class="play ${classMap({
+                                            can_expand: child.can_expand,
+                                          })}"
+                                          .item=${child}
+                                          .label=${this.hass.localize(
+                                            `ui.components.media-browser.${this.action}-media`
+                                          )}
+                                          .path=${this.action === "play"
+                                            ? mdiPlay
+                                            : mdiPlus}
+                                          @click=${this._actionClicked}
+                                        ></ha-icon-button>
+                                      `
+                                    : ""}
+                                </div>
+                                <div class="title">
+                                  ${child.title}
+                                  <paper-tooltip
+                                    fitToVisibleBounds
+                                    position="top"
+                                    offset="4"
+                                    >${child.title}</paper-tooltip
+                                  >
+                                </div>
+                              </ha-card>
                             </div>
                           `
-                        : this.hass.localize(
-                            "ui.components.media-browser.no_items"
-                          )}
-                    </div>
-                  `
-                : childrenMediaClass.layout === "grid"
-                ? html`
-                    <div
-                      class="children ${classMap({
-                        portrait:
-                          childrenMediaClass.thumbnail_ratio === "portrait",
-                      })}"
-                    >
-                      ${currentItem.children.map(
-                        (child) => html`
-                          <div
-                            class="child"
-                            .item=${child}
-                            @click=${this._childClicked}
-                          >
-                            <ha-card outlined>
-                              <div class="thumbnail">
-                                ${child.thumbnail
-                                  ? html`
-                                      <div
-                                        class="${["app", "directory"].includes(
-                                          child.media_class
-                                        )
-                                          ? "centered-image"
-                                          : ""} image lazythumbnail"
-                                        data-src=${child.thumbnail}
-                                      ></div>
-                                    `
-                                  : html`
-                                      <div class="icon-holder image">
-                                        <ha-svg-icon
-                                          class="folder"
-                                          .path=${MediaClassBrowserSettings[
-                                            child.media_class === "directory"
-                                              ? child.children_media_class ||
-                                                child.media_class
-                                              : child.media_class
-                                          ].icon}
-                                        ></ha-svg-icon>
-                                      </div>
-                                    `}
-                                ${child.can_play
-                                  ? html`
-                                      <ha-icon-button
-                                        class="play ${classMap({
-                                          can_expand: child.can_expand,
-                                        })}"
-                                        .item=${child}
-                                        .label=${this.hass.localize(
-                                          `ui.components.media-browser.${this.action}-media`
-                                        )}
-                                        .path=${this.action === "play"
-                                          ? mdiPlay
-                                          : mdiPlus}
-                                        @click=${this._actionClicked}
-                                      ></ha-icon-button>
-                                    `
-                                  : ""}
-                              </div>
-                              <div class="title">
-                                ${child.title}
-                                <paper-tooltip
-                                  fitToVisibleBounds
-                                  position="top"
-                                  offset="4"
-                                  >${child.title}</paper-tooltip
-                                >
-                              </div>
-                            </ha-card>
-                          </div>
-                        `
-                      )}
-                    </div>
-                  `
-                : html`
-                    <mwc-list>
-                      ${currentItem.children.map(
-                        (child) => html`
-                          <mwc-list-item
-                            @click=${this._childClicked}
-                            .item=${child}
-                            .graphic=${mediaClass.show_list_images
-                              ? "medium"
-                              : "avatar"}
-                            dir=${computeRTLDirection(this.hass)}
-                          >
-                            <div
-                              class=${classMap({
-                                graphic: true,
-                                lazythumbnail:
-                                  mediaClass.show_list_images === true,
-                              })}
-                              data-src=${ifDefined(
-                                mediaClass.show_list_images && child.thumbnail
-                                  ? child.thumbnail
-                                  : undefined
-                              )}
-                              slot="graphic"
+                        )}
+                      </div>
+                    `
+                  : html`
+                      <mwc-list>
+                        ${currentItem.children.map(
+                          (child) => html`
+                            <mwc-list-item
+                              @click=${this._childClicked}
+                              .item=${child}
+                              .graphic=${mediaClass.show_list_images
+                                ? "medium"
+                                : "avatar"}
+                              dir=${computeRTLDirection(this.hass)}
                             >
-                              <ha-icon-button
-                                class="play ${classMap({
-                                  show:
-                                    !mediaClass.show_list_images ||
-                                    !child.thumbnail,
-                                })}"
-                                .item=${child}
-                                .label=${this.hass.localize(
-                                  `ui.components.media-browser.${this.action}-media`
+                              <div
+                                class=${classMap({
+                                  graphic: true,
+                                  lazythumbnail:
+                                    mediaClass.show_list_images === true,
+                                })}
+                                data-src=${ifDefined(
+                                  mediaClass.show_list_images && child.thumbnail
+                                    ? child.thumbnail
+                                    : undefined
                                 )}
-                                .path=${this.action === "play"
-                                  ? mdiPlay
-                                  : mdiPlus}
-                                @click=${this._actionClicked}
-                              ></ha-icon-button>
-                            </div>
-                            <span class="title">${child.title}</span>
-                          </mwc-list-item>
-                          <li divider role="separator"></li>
-                        `
+                                slot="graphic"
+                              >
+                                <ha-icon-button
+                                  class="play ${classMap({
+                                    show:
+                                      !mediaClass.show_list_images ||
+                                      !child.thumbnail,
+                                  })}"
+                                  .item=${child}
+                                  .label=${this.hass.localize(
+                                    `ui.components.media-browser.${this.action}-media`
+                                  )}
+                                  .path=${this.action === "play"
+                                    ? mdiPlay
+                                    : mdiPlus}
+                                  @click=${this._actionClicked}
+                                ></ha-icon-button>
+                              </div>
+                              <span class="title">${child.title}</span>
+                            </mwc-list-item>
+                            <li divider role="separator"></li>
+                          `
+                        )}
+                      </mwc-list>
+                    `
+                : html`
+                    <div class="container no-items">
+                      ${this.hass.localize(
+                        "ui.components.media-browser.no_items"
                       )}
-                    </mwc-list>
+                      <br />
+                      ${currentItem.media_content_id ===
+                      "media-source://media_source/local/."
+                        ? html`<br />${this.hass.localize(
+                              "ui.components.media-browser.learn_adding_local_media",
+                              "documentation",
+                              html`<a
+                                href=${documentationUrl(
+                                  this.hass,
+                                  "/more-info/local-media/add-media"
+                                )}
+                                target="_blank"
+                                rel="noreferrer"
+                                >${this.hass.localize(
+                                  "ui.components.media-browser.documentation"
+                                )}</a
+                              >`
+                            )}
+                            <br />
+                            ${this.hass.localize(
+                              "ui.components.media-browser.local_media_files"
+                            )}`
+                        : ""}
+                    </div>
                   `
             }
           </div>
@@ -434,8 +425,8 @@ export class HaMediaPlayerBrowse extends LitElement {
 
     if (changedProps.has("entityId")) {
       this._setError(undefined);
-    } else if (!changedProps.has("navigateIds")) {
-      // Neither entity ID or navigateIDs changed, nothing to fetch
+    }
+    if (!changedProps.has("navigateIds")) {
       return;
     }
 
@@ -444,7 +435,6 @@ export class HaMediaPlayerBrowse extends LitElement {
     const oldNavigateIds = changedProps.get("navigateIds") as
       | this["navigateIds"]
       | undefined;
-    const navigateIds = this.navigateIds;
 
     // We're navigating. Reset the shizzle.
     this._content?.scrollTo(0, 0);
@@ -453,9 +443,11 @@ export class HaMediaPlayerBrowse extends LitElement {
     const oldParentItem = this._parentItem;
     this._currentItem = undefined;
     this._parentItem = undefined;
-    const currentId = navigateIds[navigateIds.length - 1];
+    const currentId = this.navigateIds[this.navigateIds.length - 1];
     const parentId =
-      navigateIds.length > 1 ? navigateIds[navigateIds.length - 2] : undefined;
+      this.navigateIds.length > 1
+        ? this.navigateIds[this.navigateIds.length - 2]
+        : undefined;
     let currentProm: Promise<MediaPlayerItem> | undefined;
     let parentProm: Promise<MediaPlayerItem> | undefined;
 
@@ -464,9 +456,9 @@ export class HaMediaPlayerBrowse extends LitElement {
       if (
         // Check if we navigated to a child
         oldNavigateIds &&
-        navigateIds.length === oldNavigateIds.length + 1 &&
+        this.navigateIds.length > oldNavigateIds.length &&
         oldNavigateIds.every((oldVal, idx) => {
-          const curVal = navigateIds[idx];
+          const curVal = this.navigateIds[idx];
           return (
             curVal.media_content_id === oldVal.media_content_id &&
             curVal.media_content_type === oldVal.media_content_type
@@ -477,8 +469,8 @@ export class HaMediaPlayerBrowse extends LitElement {
       } else if (
         // Check if we navigated to a parent
         oldNavigateIds &&
-        navigateIds.length === oldNavigateIds.length - 1 &&
-        navigateIds.every((curVal, idx) => {
+        this.navigateIds.length < oldNavigateIds.length &&
+        this.navigateIds.every((curVal, idx) => {
           const oldVal = oldNavigateIds[idx];
           return (
             curVal.media_content_id === oldVal.media_content_id &&
@@ -501,33 +493,11 @@ export class HaMediaPlayerBrowse extends LitElement {
       (item) => {
         this._currentItem = item;
         fireEvent(this, "media-browsed", {
-          ids: navigateIds,
+          ids: this.navigateIds,
           current: item,
         });
       },
-      (err) => {
-        // When we change entity ID, we will first try to see if the new entity is
-        // able to resolve the new path. If that results in an error, browse the root.
-        const isNewEntityWithSamePath =
-          oldNavigateIds &&
-          changedProps.has("entityId") &&
-          navigateIds.length === oldNavigateIds.length &&
-          oldNavigateIds.every(
-            (oldItem, idx) =>
-              navigateIds[idx].media_content_id === oldItem.media_content_id &&
-              navigateIds[idx].media_content_type === oldItem.media_content_type
-          );
-        if (isNewEntityWithSamePath) {
-          fireEvent(this, "media-browsed", {
-            ids: [
-              { media_content_id: undefined, media_content_type: undefined },
-            ],
-            replace: true,
-          });
-        } else {
-          this._setError(err);
-        }
-      }
+      (err) => this._setError(err)
     );
     // Fetch parent
     if (!parentProm && parentId !== undefined) {
@@ -563,17 +533,7 @@ export class HaMediaPlayerBrowse extends LitElement {
   }
 
   private _runAction(item: MediaPlayerItem): void {
-    fireEvent(this, "media-picked", { item, navigateIds: this.navigateIds });
-  }
-
-  private _ttsPicked(ev: CustomEvent<TtsMediaPickedEvent>): void {
-    ev.stopPropagation();
-    const navigateIds = this.navigateIds.slice(0, -1);
-    navigateIds.push(ev.detail.item);
-    fireEvent(this, "media-picked", {
-      ...ev.detail,
-      navigateIds,
-    });
+    fireEvent(this, "media-picked", { item });
   }
 
   private async _childClicked(ev: MouseEvent): Promise<void> {
@@ -776,18 +736,6 @@ export class HaMediaPlayerBrowse extends LitElement {
           padding-left: 32px;
         }
 
-        .highlight-add-button {
-          display: flex;
-          flex-direction: row-reverse;
-          margin-right: 48px;
-        }
-
-        .highlight-add-button ha-svg-icon {
-          position: relative;
-          top: -0.5em;
-          margin-left: 8px;
-        }
-
         .content {
           overflow-y: auto;
           box-sizing: border-box;

src/components/media-player/show-media-browser-dialog.ts

@@ -3,13 +3,13 @@ import {
   MediaPickedEvent,
   MediaPlayerBrowseAction,
 } from "../../data/media-player";
-import { MediaPlayerItemId } from "./ha-media-player-browse";
 
 export interface MediaPlayerBrowseDialogParams {
   action: MediaPlayerBrowseAction;
   entityId: string;
   mediaPickedCallback: (pickedMedia: MediaPickedEvent) => void;
-  navigateIds?: MediaPlayerItemId[];
+  mediaContentId?: string;
+  mediaContentType?: string;
 }
 
 export const showMediaBrowserDialog = (

src/data/cloud.ts

@@ -47,7 +47,6 @@ export interface CloudPreferences {
 export interface CloudStatusLoggedIn {
   logged_in: true;
   cloud: "disconnected" | "connecting" | "connected";
-  cloud_last_disconnect_reason: { clean: boolean; reason: string } | null;
   email: string;
   google_registered: boolean;
   google_entities: EntityFilter;
@@ -187,3 +186,10 @@ export const updateCloudAlexaEntityConfig = (
     entity_id: entityId,
     ...values,
   });
+
+export interface CloudTTSInfo {
+  languages: Array<[string, string]>;
+}
+
+export const getCloudTTSInfo = (hass: HomeAssistant) =>
+  hass.callWS<CloudTTSInfo>({ type: "cloud/tts/info" });

src/data/cloud/tts.ts

@@ -1,70 +0,0 @@
-import { caseInsensitiveStringCompare } from "../../common/string/compare";
-import { LocalizeFunc } from "../../common/translations/localize";
-import { translationMetadata } from "../../resources/translations-metadata";
-import { HomeAssistant } from "../../types";
-
-export interface CloudTTSInfo {
-  languages: Array<[string, string]>;
-}
-
-export const getCloudTTSInfo = (hass: HomeAssistant) =>
-  hass.callWS<CloudTTSInfo>({ type: "cloud/tts/info" });
-
-export const getCloudTtsLanguages = (info?: CloudTTSInfo) => {
-  const languages: Array<[string, string]> = [];
-
-  if (!info) {
-    return languages;
-  }
-
-  const seen = new Set<string>();
-  for (const [lang] of info.languages) {
-    if (seen.has(lang)) {
-      continue;
-    }
-    seen.add(lang);
-
-    let label = lang;
-
-    if (lang in translationMetadata.translations) {
-      label = translationMetadata.translations[lang].nativeName;
-    } else {
-      const [langFamily, dialect] = lang.split("-");
-      if (langFamily in translationMetadata.translations) {
-        label = `${translationMetadata.translations[langFamily].nativeName}`;
-
-        if (langFamily.toLowerCase() !== dialect.toLowerCase()) {
-          label += ` (${dialect})`;
-        }
-      }
-    }
-
-    languages.push([lang, label]);
-  }
-  return languages.sort((a, b) => caseInsensitiveStringCompare(a[1], b[1]));
-};
-
-export const getCloudTtsSupportedGenders = (
-  language: string,
-  info: CloudTTSInfo | undefined,
-  localize: LocalizeFunc
-) => {
-  const genders: Array<[string, string]> = [];
-
-  if (!info) {
-    return genders;
-  }
-
-  for (const [curLang, gender] of info.languages) {
-    if (curLang === language) {
-      genders.push([
-        gender,
-        localize(`ui.panel.media-browser.tts.gender_${gender}`) ||
-          localize(`ui.panel.config.cloud.account.tts.${gender}`) ||
-          gender,
-      ]);
-    }
-  }
-
-  return genders.sort((a, b) => caseInsensitiveStringCompare(a[1], b[1]));
-};

src/data/hassio/addon.ts

@@ -84,10 +84,9 @@ export interface HassioAddonDetails extends HassioAddonInfo {
   options: Record<string, unknown>;
   privileged: any;
   protected: boolean;
-  rating: "1-8";
+  rating: "1-6";
   schema: HaFormSchema[] | null;
   services_role: string[];
-  signed: boolean;
   slug: string;
   startup: AddonStartup;
   stdin: boolean;

src/data/media-player.ts

@@ -28,7 +28,6 @@ import type {
   HassEntityBase,
 } from "home-assistant-js-websocket";
 import { supportsFeature } from "../common/entity/supports-feature";
-import { MediaPlayerItemId } from "../components/media-player/ha-media-player-browse";
 import type { HomeAssistant } from "../types";
 import { UNAVAILABLE_STATES } from "./entity";
 
@@ -148,7 +147,6 @@ export const MediaClassBrowserSettings: {
 
 export interface MediaPickedEvent {
   item: MediaPlayerItem;
-  navigateIds: MediaPlayerItemId[];
 }
 
 export interface MediaPlayerThumbnail {
@@ -263,10 +261,8 @@ export const computeMediaControls = (
     });
   }
 
-  const assumedState = stateObj.attributes.assumed_state === true;
-
   if (
-    (state === "playing" || state === "paused" || assumedState) &&
+    (state === "playing" || state === "paused") &&
     supportsFeature(stateObj, SUPPORT_PREVIOUS_TRACK)
   ) {
     buttons.push({
@@ -276,15 +272,14 @@ export const computeMediaControls = (
   }
 
   if (
-    !assumedState &&
-    ((state === "playing" &&
+    (state === "playing" &&
       (supportsFeature(stateObj, SUPPORT_PAUSE) ||
         supportsFeature(stateObj, SUPPORT_STOP))) ||
-      ((state === "paused" || state === "idle") &&
-        supportsFeature(stateObj, SUPPORT_PLAY)) ||
-      (state === "on" &&
-        (supportsFeature(stateObj, SUPPORT_PLAY) ||
-          supportsFeature(stateObj, SUPPORT_PAUSE))))
+    ((state === "paused" || state === "idle") &&
+      supportsFeature(stateObj, SUPPORT_PLAY)) ||
+    (state === "on" &&
+      (supportsFeature(stateObj, SUPPORT_PLAY) ||
+        supportsFeature(stateObj, SUPPORT_PAUSE)))
   ) {
     buttons.push({
       icon:
@@ -304,29 +299,8 @@ export const computeMediaControls = (
     });
   }
 
-  if (assumedState && supportsFeature(stateObj, SUPPORT_PLAY)) {
-    buttons.push({
-      icon: mdiPlay,
-      action: "media_play",
-    });
-  }
-
-  if (assumedState && supportsFeature(stateObj, SUPPORT_PAUSE)) {
-    buttons.push({
-      icon: mdiPause,
-      action: "media_pause",
-    });
-  }
-
-  if (assumedState && supportsFeature(stateObj, SUPPORT_STOP)) {
-    buttons.push({
-      icon: mdiStop,
-      action: "media_stop",
-    });
-  }
-
   if (
-    (state === "playing" || state === "paused" || assumedState) &&
+    (state === "playing" || state === "paused") &&
     supportsFeature(stateObj, SUPPORT_NEXT_TRACK)
   ) {
     buttons.push({

src/data/mqtt.ts

@@ -22,7 +22,6 @@ export interface MQTTEntityDebugInfo {
   entity_id: string;
   discovery_data: MQTTDiscoveryDebugInfo;
   subscriptions: MQTTTopicDebugInfo[];
-  transmitted: MQTTTopicDebugInfo[];
 }
 
 export interface MQTTTriggerDebugInfo {
@@ -44,6 +43,15 @@ export const subscribeMQTTTopic = (
     topic,
   });
 
+export const removeMQTTDeviceEntry = (
+  hass: HomeAssistant,
+  deviceId: string
+): Promise<void> =>
+  hass.callWS({
+    type: "mqtt/device/remove",
+    device_id: deviceId,
+  });
+
 export const fetchMQTTDebugInfo = (
   hass: HomeAssistant,
   deviceId: string

src/data/script.ts

@@ -3,17 +3,6 @@ import {
   HassEntityBase,
   HassServiceTarget,
 } from "home-assistant-js-websocket";
-import {
-  object,
-  optional,
-  string,
-  union,
-  array,
-  assign,
-  literal,
-  is,
-  Describe,
-} from "superstruct";
 import { computeObjectId } from "../common/entity/compute_object_id";
 import { navigate } from "../common/navigate";
 import { HomeAssistant } from "../types";
@@ -23,48 +12,6 @@ import { BlueprintInput } from "./blueprint";
 export const MODES = ["single", "restart", "queued", "parallel"] as const;
 export const MODES_MAX = ["queued", "parallel"];
 
-export const baseActionStruct = object({
-  alias: optional(string()),
-});
-
-const targetStruct = object({
-  entity_id: optional(union([string(), array(string())])),
-  device_id: optional(union([string(), array(string())])),
-  area_id: optional(union([string(), array(string())])),
-});
-
-export const serviceActionStruct: Describe<ServiceAction> = assign(
-  baseActionStruct,
-  object({
-    service: optional(string()),
-    service_template: optional(string()),
-    entity_id: optional(string()),
-    target: optional(targetStruct),
-    data: optional(object()),
-  })
-);
-
-const playMediaActionStruct: Describe<PlayMediaAction> = assign(
-  baseActionStruct,
-  object({
-    service: literal("media_player.play_media"),
-    target: optional(object({ entity_id: optional(string()) })),
-    entity_id: optional(string()),
-    data: object({ media_content_id: string(), media_content_type: string() }),
-    metadata: object(),
-  })
-);
-
-const activateSceneActionStruct: Describe<ServiceSceneAction> = assign(
-  baseActionStruct,
-  object({
-    service: literal("scene.turn_on"),
-    target: optional(object({ entity_id: optional(string()) })),
-    entity_id: optional(string()),
-    metadata: object(),
-  })
-);
-
 export interface ScriptEntity extends HassEntityBase {
   attributes: HassEntityAttributeBase & {
     last_triggered: string;
@@ -101,12 +48,11 @@ export interface ServiceAction {
   service_template?: string;
   entity_id?: string;
   target?: HassServiceTarget;
-  data?: Record<string, unknown>;
+  data?: Record<string, any>;
 }
 
 export interface DeviceAction {
   alias?: string;
-  type: string;
   device_id: string;
   domain: string;
   entity_id: string;
@@ -124,18 +70,10 @@ export interface DelayAction {
   delay: number | Partial<DelayActionParts> | string;
 }
 
-export interface ServiceSceneAction {
-  alias?: string;
-  service: "scene.turn_on";
-  target?: { entity_id?: string };
-  entity_id?: string;
-  metadata: Record<string, unknown>;
-}
-export interface LegacySceneAction {
+export interface SceneAction {
   alias?: string;
   scene: string;
 }
-export type SceneAction = ServiceSceneAction | LegacySceneAction;
 
 export interface WaitAction {
   alias?: string;
@@ -151,15 +89,6 @@ export interface WaitForTriggerAction {
   continue_on_timeout?: boolean;
 }
 
-export interface PlayMediaAction {
-  alias?: string;
-  service: "media_player.play_media";
-  target?: { entity_id?: string };
-  entity_id?: string;
-  data: { media_content_id: string; media_content_type: string };
-  metadata: Record<string, unknown>;
-}
-
 export interface RepeatAction {
   alias?: string;
   repeat: CountRepeat | WhileRepeat | UntilRepeat;
@@ -216,7 +145,6 @@ export type Action =
   | RepeatAction
   | ChooseAction
   | VariablesAction
-  | PlayMediaAction
   | UnknownAction;
 
 export interface ActionTypes {
@@ -231,7 +159,6 @@ export interface ActionTypes {
   wait_for_trigger: WaitForTriggerAction;
   variables: VariablesAction;
   service: ServiceAction;
-  play_media: PlayMediaAction;
   unknown: UnknownAction;
 }
 
@@ -306,14 +233,6 @@ export const getActionType = (action: Action): ActionType => {
     return "variables";
   }
   if ("service" in action) {
-    if ("metadata" in action) {
-      if (is(action, activateSceneActionStruct)) {
-        return "activate_scene";
-      }
-      if (is(action, playMediaActionStruct)) {
-        return "play_media";
-      }
-    }
     return "service";
   }
   return "unknown";

src/data/script_i18n.ts

@@ -9,10 +9,8 @@ import {
   ActionType,
   ActionTypes,
   DelayAction,
-  DeviceAction,
   EventAction,
   getActionType,
-  PlayMediaAction,
   SceneAction,
   VariablesAction,
   WaitForTriggerAction,
@@ -106,30 +104,9 @@ export const describeAction = <T extends ActionType>(
 
   if (actionType === "activate_scene") {
     const config = action as SceneAction;
-    let entityId: string | undefined;
-    if ("scene" in config) {
-      entityId = config.scene;
-    } else {
-      entityId = config.target?.entity_id || config.entity_id;
-    }
-    const sceneStateObj = entityId ? hass.states[entityId] : undefined;
+    const sceneStateObj = hass.states[config.scene];
     return `Activate scene ${
-      sceneStateObj
-        ? computeStateName(sceneStateObj)
-        : "scene" in config
-        ? config.scene
-        : config.target?.entity_id || config.entity_id
-    }`;
-  }
-
-  if (actionType === "play_media") {
-    const config = action as PlayMediaAction;
-    const entityId = config.target?.entity_id || config.entity_id;
-    const mediaStateObj = entityId ? hass.states[entityId] : undefined;
-    return `Play ${config.metadata.title || config.data.media_content_id} on ${
-      mediaStateObj
-        ? computeStateName(mediaStateObj)
-        : config.target?.entity_id || config.entity_id
+      sceneStateObj ? computeStateName(sceneStateObj) : config.scene
     }`;
   }
 
@@ -161,13 +138,5 @@ export const describeAction = <T extends ActionType>(
     return `Test ${describeCondition(action as Condition)}`;
   }
 
-  if (actionType === "device_action") {
-    const config = action as DeviceAction;
-    const stateObj = hass.states[config.entity_id as string];
-    return `${config.type || "Perform action with"} ${
-      stateObj ? computeStateName(stateObj) : config.entity_id
-    }`;
-  }
-
   return actionType;
 };

src/data/selector.ts

@@ -12,9 +12,7 @@ export type Selector =
   | ActionSelector
   | StringSelector
   | ObjectSelector
-  | SelectSelector
-  | IconSelector
-  | MediaSelector;
+  | SelectSelector;
 
 export interface EntitySelector {
   entity: {
@@ -135,36 +133,8 @@ export interface ObjectSelector {
   object: {};
 }
 
-export interface SelectOption {
-  value: string;
-  label: string;
-}
-
 export interface SelectSelector {
   select: {
-    options: string[] | SelectOption[];
-  };
-}
-
-export interface IconSelector {
-  // eslint-disable-next-line @typescript-eslint/ban-types
-  icon: {};
-}
-
-export interface MediaSelector {
-  // eslint-disable-next-line @typescript-eslint/ban-types
-  media: {};
-}
-
-export interface MediaSelectorValue {
-  entity_id?: string;
-  media_content_id?: string;
-  media_content_type?: string;
-  metadata?: {
-    title?: string;
-    thumbnail?: string | null;
-    media_class?: string;
-    children_media_class?: string | null;
-    navigateIds?: { media_content_type: string; media_content_id: string }[];
+    options: string[];
   };
 }

src/data/tasmota.ts

@@ -0,0 +1,10 @@
+import { HomeAssistant } from "../types";
+
+export const removeTasmotaDeviceEntry = (
+  hass: HomeAssistant,
+  deviceId: string
+): Promise<void> =>
+  hass.callWS({
+    type: "tasmota/device/remove",
+    device_id: deviceId,
+  });

src/data/tts.ts

@@ -10,11 +10,3 @@ export const convertTextToSpeech = (
     options?: Record<string, unknown>;
   }
 ) => hass.callApi<{ url: string; path: string }>("POST", "tts_get_url", data);
-
-const TTS_MEDIA_SOURCE_PREFIX = "media-source://tts/";
-
-export const isTTSMediaSource = (mediaContentId: string) =>
-  mediaContentId.startsWith(TTS_MEDIA_SOURCE_PREFIX);
-
-export const getProviderFromTTSMediaSource = (mediaContentId: string) =>
-  mediaContentId.substring(TTS_MEDIA_SOURCE_PREFIX.length);

src/data/zwave_js.ts

@@ -2,19 +2,6 @@ import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { HomeAssistant } from "../types";
 import { DeviceRegistryEntry } from "./device_registry";
 
-export enum InclusionState {
-  /** The controller isn't doing anything regarding inclusion. */
-  Idle,
-  /** The controller is waiting for a node to be included. */
-  Including,
-  /** The controller is waiting for a node to be excluded. */
-  Excluding,
-  /** The controller is busy including or excluding a node. */
-  Busy,
-  /** The controller listening for SmartStart nodes to announce themselves. */
-  SmartStart,
-}
-
 export const enum InclusionStrategy {
   /**
    * Always uses Security S2 if supported, otherwise uses Security S0 for certain devices which don't work without encryption and uses no encryption otherwise.
@@ -119,33 +106,16 @@ export interface ZWaveJSNetwork {
 }
 
 export interface ZWaveJSClient {
-  state: "connected" | "disconnected";
+  state: string;
   ws_server_url: string;
   server_version: string;
   driver_version: string;
 }
 
 export interface ZWaveJSController {
-  home_id: number;
-  library_version: string;
-  type: number;
-  own_node_id: number;
-  is_secondary: boolean;
-  is_using_home_id_from_other_network: boolean;
-  is_sis_present: boolean;
-  was_real_primary: boolean;
-  is_static_update_controller: boolean;
-  is_slave: boolean;
-  serial_api_version: string;
-  manufacturer_id: number;
-  product_id: number;
-  product_type: number;
-  supported_function_types: number[];
-  suc_node_id: number;
-  supports_timers: boolean;
-  is_heal_network_active: boolean;
-  inclusion_state: InclusionState;
+  home_id: string;
   nodes: number[];
+  is_heal_network_active: boolean;
 }
 
 export interface ZWaveJSNodeStatus {
@@ -156,7 +126,6 @@ export interface ZWaveJSNodeStatus {
   is_routing: boolean | null;
   zwave_plus_version: number | null;
   highest_security_class: SecurityClass | null;
-  is_controller_node: boolean;
 }
 
 export interface ZwaveJSNodeMetadata {
@@ -339,12 +308,6 @@ export const stopZwaveInclusion = (hass: HomeAssistant, entry_id: string) =>
     entry_id,
   });
 
-export const stopZwaveExclusion = (hass: HomeAssistant, entry_id: string) =>
-  hass.callWS({
-    type: "zwave_js/stop_exclusion",
-    entry_id,
-  });
-
 export const zwaveGrantSecurityClasses = (
   hass: HomeAssistant,
   entry_id: string,

src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts

@@ -83,7 +83,6 @@ class DialogConfigEntrySystemOptions extends LitElement {
             .checked=${!this._disableNewEntities}
             @change=${this._disableNewEntitiesChanged}
             .disabled=${this._submitting}
-            dialogInitialFocus
           ></ha-switch>
         </ha-formfield>
         ${this._allowUpdatePolling()

src/dialogs/config-flow/step-flow-form.ts

@@ -47,7 +47,6 @@ class StepFlowForm extends LitElement {
           ? html`<ha-alert alert-type="error">${this._errorMsg}</ha-alert>`
           : ""}
         <ha-form
-          .hass=${this.hass}
           .data=${stepData}
           .disabled=${this._loading}
           @value-changed=${this._stepDataChanged}

src/dialogs/config-flow/step-flow-pick-handler.ts

@@ -1,36 +1,30 @@
-import "@material/mwc-list/mwc-list";
-import "@material/mwc-list/mwc-list-item";
 import Fuse from "fuse.js";
 import {
   css,
   CSSResultGroup,
   html,
   LitElement,
-  PropertyValues,
   TemplateResult,
+  PropertyValues,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { styleMap } from "lit/directives/style-map";
 import memoizeOne from "memoize-one";
-import { isComponentLoaded } from "../../common/config/is_component_loaded";
 import { fireEvent } from "../../common/dom/fire_event";
-import { navigate } from "../../common/navigate";
 import "../../common/search/search-input";
 import { caseInsensitiveStringCompare } from "../../common/string/compare";
 import { LocalizeFunc } from "../../common/translations/localize";
 import "../../components/ha-icon-next";
-import { getConfigEntries } from "../../data/config_entries";
 import { domainToName } from "../../data/integration";
-import { showZWaveJSAddNodeDialog } from "../../panels/config/integrations/integration-panels/zwave_js/show-dialog-zwave_js-add-node";
 import { HomeAssistant } from "../../types";
 import { brandsUrl } from "../../util/brands-url";
 import { documentationUrl } from "../../util/documentation-url";
 import { configFlowContentStyles } from "./styles";
+import "@material/mwc-list/mwc-list-item";
 
 interface HandlerObj {
   name: string;
   slug: string;
-  is_add?: boolean;
 }
 
 declare global {
@@ -82,17 +76,6 @@ class StepFlowPickHandler extends LitElement {
   protected render(): TemplateResult {
     const handlers = this._getHandlers();
 
-    const addDeviceRows: HandlerObj[] = ["zha", "zwave_js"]
-      .filter((domain) => isComponentLoaded(this.hass, domain))
-      .map((domain) => ({
-        name: this.hass.localize(
-          `ui.panel.config.integrations.add_${domain}_device`
-        ),
-        slug: domain,
-        is_add: true,
-      }))
-      .sort((a, b) => caseInsensitiveStringCompare(a.name, b.name));
-
     return html`
       <h2>${this.hass.localize("ui.panel.config.integrations.new")}</h2>
       <search-input
@@ -103,20 +86,39 @@ class StepFlowPickHandler extends LitElement {
         .label=${this.hass.localize("ui.panel.config.integrations.search")}
         @keypress=${this._maybeSubmit}
       ></search-input>
-      <mwc-list
+      <div
         style=${styleMap({
           width: `${this._width}px`,
           height: `${this._height}px`,
         })}
       >
-        ${addDeviceRows.length
-          ? html`
-              ${addDeviceRows.map((handler) => this._renderRow(handler))}
-              <li divider padded class="divider" role="separator"></li>
-            `
-          : ""}
         ${handlers.length
-          ? handlers.map((handler) => this._renderRow(handler))
+          ? handlers.map(
+              (handler: HandlerObj) =>
+                html`
+                  <mwc-list-item
+                    graphic="medium"
+                    hasMeta
+                    @click=${this._handlerPicked}
+                    .handler=${handler}
+                  >
+                    <img
+                      slot="graphic"
+                      loading="lazy"
+                      src=${brandsUrl({
+                        domain: handler.slug,
+                        type: "icon",
+                        useFallback: true,
+                        darkOptimized: this.hass.themes?.darkMode,
+                      })}
+                      referrerpolicy="no-referrer"
+                    />
+
+                    ${handler.name}
+                    <ha-icon-next slot="meta"></ha-icon-next>
+                  </mwc-list-item>
+                `
+            )
           : html`
               <p>
                 ${this.hass.localize(
@@ -139,32 +141,7 @@ class StepFlowPickHandler extends LitElement {
                 >.
               </p>
             `}
-      </mwc-list>
-    `;
-  }
-
-  private _renderRow(handler: HandlerObj) {
-    return html`
-      <mwc-list-item
-        graphic="medium"
-        .hasMeta=${!handler.is_add}
-        .handler=${handler}
-        @click=${this._handlerPicked}
-      >
-        <img
-          slot="graphic"
-          loading="lazy"
-          src=${brandsUrl({
-            domain: handler.slug,
-            type: "icon",
-            useFallback: true,
-            darkOptimized: this.hass.themes?.darkMode,
-          })}
-          referrerpolicy="no-referrer"
-        />
-        <span>${handler.name}</span>
-        ${handler.is_add ? "" : html`<ha-icon-next slot="meta"></ha-icon-next>`}
-      </mwc-list-item>
+      </div>
     `;
   }
 
@@ -185,7 +162,7 @@ class StepFlowPickHandler extends LitElement {
     ) {
       // Store the width and height so that when we search, box doesn't jump
       const boundingRect =
-        this.shadowRoot!.querySelector("mwc-list")!.getBoundingClientRect();
+        this.shadowRoot!.querySelector("div")!.getBoundingClientRect();
       this._width = boundingRect.width;
       this._height = boundingRect.height;
     }
@@ -212,31 +189,8 @@ class StepFlowPickHandler extends LitElement {
   }
 
   private async _handlerPicked(ev) {
-    const handler: HandlerObj = ev.currentTarget.handler;
-
-    if (handler.is_add) {
-      if (handler.slug === "zwave_js") {
-        const entries = await getConfigEntries(this.hass);
-        const entry = entries.find((ent) => ent.domain === "zwave_js");
-
-        if (!entry) {
-          return;
-        }
-
-        showZWaveJSAddNodeDialog(this, {
-          entry_id: entry.entry_id,
-        });
-      } else if (handler.slug === "zha") {
-        navigate("/config/zha/add");
-      }
-
-      // This closes dialog.
-      fireEvent(this, "flow-update");
-      return;
-    }
-
     fireEvent(this, "handler-picked", {
-      handler: handler.slug,
+      handler: ev.currentTarget.handler.slug,
     });
   }
 
@@ -264,23 +218,20 @@ class StepFlowPickHandler extends LitElement {
         }
         search-input {
           display: block;
-          margin: 16px 16px 0;
+          margin: 8px 16px 0;
         }
         ha-icon-next {
           margin-right: 8px;
         }
-        mwc-list {
+        div {
           overflow: auto;
           max-height: 600px;
         }
-        .divider {
-          border-bottom-color: var(--divider-color);
-        }
         h2 {
           padding-right: 66px;
         }
         @media all and (max-height: 900px) {
-          mwc-list {
+          div {
             max-height: calc(100vh - 134px);
           }
         }

src/dialogs/more-info/controls/more-info-light.ts

@@ -615,6 +615,10 @@ class MoreInfoLight extends LitElement {
         color: var(--secondary-text-color);
       }
 
+      paper-item {
+        cursor: pointer;
+      }
+
       hr {
         border-color: var(--divider-color);
         border-bottom: none;

src/dialogs/more-info/controls/more-info-media_player.ts

@@ -5,6 +5,7 @@ import {
   mdiLoginVariant,
   mdiMusicNote,
   mdiPlayBoxMultiple,
+  mdiSend,
   mdiVolumeHigh,
   mdiVolumeMinus,
   mdiVolumeOff,
@@ -12,7 +13,7 @@ import {
 } from "@mdi/js";
 import "@polymer/paper-input/paper-input";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property } from "lit/decorators";
+import { customElement, property, query } from "lit/decorators";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import { stopPropagation } from "../../../common/dom/stop_propagation";
 import { supportsFeature } from "../../../common/entity/supports-feature";
@@ -21,7 +22,7 @@ import "../../../components/ha-icon-button";
 import "../../../components/ha-slider";
 import "../../../components/ha-svg-icon";
 import { showMediaBrowserDialog } from "../../../components/media-player/show-media-browser-dialog";
-import { UNAVAILABLE, UNKNOWN } from "../../../data/entity";
+import { UNAVAILABLE, UNAVAILABLE_STATES, UNKNOWN } from "../../../data/entity";
 import {
   computeMediaControls,
   MediaPickedEvent,
@@ -42,6 +43,8 @@ class MoreInfoMediaPlayer extends LitElement {
 
   @property({ attribute: false }) public stateObj?: MediaPlayerEntity;
 
+  @query("#ttsInput") private _ttsInput?: HTMLInputElement;
+
   protected render(): TemplateResult {
     if (!this.stateObj) {
       return html``;
@@ -72,17 +75,13 @@ class MoreInfoMediaPlayer extends LitElement {
               </div>
               ${supportsFeature(stateObj, SUPPORT_BROWSE_MEDIA)
                 ? html`
-                    <mwc-button
+                    <ha-icon-button
                       .label=${this.hass.localize(
                         "ui.card.media_player.browse_media"
                       )}
+                      .path=${mdiPlayBoxMultiple}
                       @click=${this._showBrowseMedia}
-                    >
-                      <ha-svg-icon
-                        .path=${mdiPlayBoxMultiple}
-                        slot="icon"
-                      ></ha-svg-icon>
-                    </mwc-button>
+                    ></ha-icon-button>
                   `
                 : ""}
             </div>
@@ -184,8 +183,21 @@ class MoreInfoMediaPlayer extends LitElement {
       supportsFeature(stateObj, SUPPORT_PLAY_MEDIA)
         ? html`
             <div class="tts">
-              Text to speech has moved to the media browser.
+              <paper-input
+                id="ttsInput"
+                .disabled=${UNAVAILABLE_STATES.includes(stateObj.state)}
+                .label=${this.hass.localize(
+                  "ui.card.media_player.text_to_speak"
+                )}
+                @keydown=${this._ttsCheckForEnter}
+              ></paper-input>
+              <ha-icon-button
+                .path=${mdiSend}
+                .disabled=${UNAVAILABLE_STATES.includes(stateObj.state)}
+                @click=${this._sendTTS}
+              ></ha-icon-button>
             </div>
+          </div>
           `
         : ""}
     `;
@@ -195,14 +207,14 @@ class MoreInfoMediaPlayer extends LitElement {
     return css`
       ha-icon-button[action="turn_off"],
       ha-icon-button[action="turn_on"],
-      ha-slider {
+      ha-slider,
+      #ttsInput {
         flex-grow: 1;
       }
 
       .controls {
         display: flex;
         align-items: center;
-        --mdc-theme-primary: currentColor;
       }
 
       .basic-controls {
@@ -211,7 +223,8 @@ class MoreInfoMediaPlayer extends LitElement {
 
       .volume,
       .source-input,
-      .sound-input {
+      .sound-input,
+      .tts {
         display: flex;
         align-items: center;
         justify-content: space-between;
@@ -228,15 +241,6 @@ class MoreInfoMediaPlayer extends LitElement {
         margin-left: 10px;
         flex-grow: 1;
       }
-
-      .tts {
-        margin-top: 16px;
-        font-style: italic;
-      }
-
-      mwc-button > ha-svg-icon {
-        vertical-align: text-bottom;
-      }
     `;
   }
 
@@ -291,6 +295,32 @@ class MoreInfoMediaPlayer extends LitElement {
     });
   }
 
+  private _ttsCheckForEnter(e: KeyboardEvent) {
+    if (e.keyCode === 13) this._sendTTS();
+  }
+
+  private _sendTTS() {
+    const ttsInput = this._ttsInput;
+    if (!ttsInput) {
+      return;
+    }
+
+    const services = this.hass.services.tts;
+    const serviceKeys = Object.keys(services).sort();
+
+    const service = serviceKeys.find((key) => key.indexOf("_say") !== -1);
+
+    if (!service) {
+      return;
+    }
+
+    this.hass.callService("tts", service, {
+      entity_id: this.stateObj!.entity_id,
+      message: ttsInput.value,
+    });
+    ttsInput.value = "";
+  }
+
   private _showBrowseMedia(): void {
     showMediaBrowserDialog(this, {
       action: "play",

src/dialogs/more-info/controls/more-info-remote.ts

@@ -1,4 +1,4 @@
-import { html, LitElement, TemplateResult } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { supportsFeature } from "../../../common/entity/supports-feature";
 import "../../../components/ha-attributes";
@@ -66,6 +66,14 @@ class MoreInfoRemote extends LitElement {
       activity: newVal,
     });
   }
+
+  static get styles(): CSSResultGroup {
+    return css`
+      paper-item {
+        cursor: pointer;
+      }
+    `;
+  }
 }
 
 declare global {

src/dialogs/more-info/controls/more-info-vacuum.ts

@@ -241,6 +241,9 @@ class MoreInfoVacuum extends LitElement {
       .status-subtitle {
         color: var(--secondary-text-color);
       }
+      paper-item {
+        cursor: pointer;
+      }
       .flex-horizontal {
         display: flex;
         flex-direction: row;

src/dialogs/more-info/ha-more-info-dialog.ts

@@ -338,9 +338,7 @@ export class MoreInfoDialog extends LitElement {
           flex-shrink: 0;
           display: block;
         }
-        .content {
-          outline: none;
-        }
+
         @media all and (max-width: 450px), all and (max-height: 500px) {
           ha-header-bar {
             --mdc-theme-primary: var(--app-header-background-color);
@@ -354,6 +352,10 @@ export class MoreInfoDialog extends LitElement {
             var(--mdc-dialog-scroll-divider-color, rgba(0, 0, 0, 0.12));
         }
 
+        .content {
+          outline: none;
+        }
+
         @media all and (min-width: 451px) and (min-height: 501px) {
           ha-dialog {
             --mdc-dialog-max-width: 90vw;

src/entrypoints/app.ts

@@ -1,11 +1,7 @@
-import {
-  setPassiveTouchGestures,
-  setCancelSyntheticClickEvents,
-} from "@polymer/polymer/lib/utils/settings";
+import { setPassiveTouchGestures } from "@polymer/polymer/lib/utils/settings";
 import "../layouts/home-assistant";
 import "../resources/ha-style";
 import "../resources/roboto";
 import "../util/legacy-support";
 
 setPassiveTouchGestures(true);
-setCancelSyntheticClickEvents(false);

src/entrypoints/authorize.ts

@@ -1,10 +1,13 @@
 // Compat needs to be first import
 import "../resources/compatibility";
-import { setCancelSyntheticClickEvents } from "@polymer/polymer/lib/utils/settings";
 import "../auth/ha-authorize";
 import "../resources/ha-style";
 import "../resources/roboto";
 import "../resources/safari-14-attachshadow-patch";
 import "../resources/array.flat.polyfill";
 
-setCancelSyntheticClickEvents(false);
+/* polyfill for paper-dropdown */
+setTimeout(
+  () => import("web-animations-js/web-animations-next-lite.min"),
+  2000
+);

src/entrypoints/custom-panel.ts

@@ -1,6 +1,5 @@
 // Compat needs to be first import
 import "../resources/compatibility";
-import { setCancelSyntheticClickEvents } from "@polymer/polymer/lib/utils/settings";
 import "../resources/safari-14-attachshadow-patch";
 
 import { PolymerElement } from "@polymer/polymer";
@@ -16,8 +15,6 @@ import { createCustomPanelElement } from "../util/custom-panel/create-custom-pan
 import { loadCustomPanel } from "../util/custom-panel/load-custom-panel";
 import { setCustomPanelProperties } from "../util/custom-panel/set-custom-panel-properties";
 
-setCancelSyntheticClickEvents(false);
-
 declare global {
   interface Window {
     loadES5Adapter: () => Promise<unknown>;
@@ -50,8 +47,7 @@ function initialize(
 ) {
   const style = document.createElement("style");
 
-  style.innerHTML = `
-  body { margin:0; }
+  style.innerHTML = `body { margin:0; } 
   @media (prefers-color-scheme: dark) {
     body {
       background-color: #111111;

src/entrypoints/onboarding.ts

@@ -1,14 +1,11 @@
 // Compat needs to be first import
 import "../resources/compatibility";
-import { setCancelSyntheticClickEvents } from "@polymer/polymer/lib/utils/settings";
 import "../onboarding/ha-onboarding";
 import "../resources/ha-style";
 import "../resources/roboto";
 import "../resources/safari-14-attachshadow-patch";
 import "../resources/array.flat.polyfill";
 
-setCancelSyntheticClickEvents(false);
-
 declare global {
   interface Window {
     stepsPromise: Promise<Response>;

src/layouts/hass-tabs-subpage-data-table.ts

@@ -1,4 +1,5 @@
 import "@material/mwc-button/mwc-button";
+import { mdiFilterVariant } from "@mdi/js";
 import "@polymer/paper-tooltip/paper-tooltip";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query } from "lit/decorators";
@@ -156,31 +157,30 @@ export class HaTabsSubpageDataTable extends LitElement {
       : hiddenLabel;
 
     const headerToolbar = html`<search-input
-      .hass=${this.hass}
-      .filter=${this.filter}
-      .suffix=${!this.narrow}
-      @value-changed=${this._handleSearchChange}
-      .label=${this.searchLabel ||
-      this.hass.localize("ui.components.data-table.search")}
-    >
-      ${!this.narrow
-        ? html`<div
-            class="filters"
-            slot="suffix"
-            @click=${this._preventDefault}
-          >
-            ${filterInfo
-              ? html`<div class="active-filters">
-                  ${filterInfo}
-                  <mwc-button @click=${this._clearFilter}>
-                    ${this.hass.localize("ui.components.data-table.clear")}
-                  </mwc-button>
-                </div>`
-              : ""}
-            <slot name="filter-menu"></slot>
-          </div>`
-        : ""}
-    </search-input>`;
+        .hass=${this.hass}
+        .filter=${this.filter}
+        @value-changed=${this._handleSearchChange}
+        .label=${this.searchLabel ||
+        this.hass.localize("ui.components.data-table.search")}
+      >
+      </search-input>
+      <div class="filters">
+        ${filterInfo
+          ? html`<div class="active-filters">
+              ${this.narrow
+                ? html`<div>
+                    <ha-svg-icon .path=${mdiFilterVariant}></ha-svg-icon>
+                    <paper-tooltip animation-delay="0" position="left">
+                      ${filterInfo}
+                    </paper-tooltip>
+                  </div>`
+                : filterInfo}
+              <mwc-button @click=${this._clearFilter}>
+                ${this.hass.localize("ui.components.data-table.clear")}
+              </mwc-button>
+            </div>`
+          : ""}<slot name="filter-menu"></slot>
+      </div>`;
 
     return html`
       <hass-tabs-subpage
@@ -195,16 +195,7 @@ export class HaTabsSubpageDataTable extends LitElement {
         .mainPage=${this.mainPage}
         .supervisor=${this.supervisor}
       >
-        <div slot="toolbar-icon">
-          ${this.narrow
-            ? html`<div class="filter-menu">
-                ${this.numHidden || this.activeFilters
-                  ? html`<span class="badge">${this.numHidden || "!"}</span>`
-                  : ""}
-                <slot name="filter-menu"></slot>
-              </div>`
-            : ""}<slot name="toolbar-icon"></slot>
-        </div>
+        <div slot="toolbar-icon"><slot name="toolbar-icon"></slot></div>
         ${this.narrow
           ? html`
               <div slot="header">
@@ -242,10 +233,6 @@ export class HaTabsSubpageDataTable extends LitElement {
     `;
   }
 
-  private _preventDefault(ev) {
-    ev.preventDefault();
-  }
-
   private _handleSearchChange(ev: CustomEvent) {
     if (this.filter === ev.detail.value) {
       return;
@@ -280,12 +267,6 @@ export class HaTabsSubpageDataTable extends LitElement {
         align-items: center;
         color: var(--secondary-text-color);
       }
-      search-input {
-        --mdc-text-field-fill-color: var(--sidebar-background-color);
-        --mdc-text-field-idle-line-color: var(--divider-color);
-        --text-field-overflow: visible;
-        z-index: 5;
-      }
       .table-header search-input {
         display: block;
         position: absolute;
@@ -295,19 +276,16 @@ export class HaTabsSubpageDataTable extends LitElement {
       }
       .search-toolbar search-input {
         display: block;
-        width: 100%;
         color: var(--secondary-text-color);
+        --mdc-text-field-fill-color: transparant;
+        --mdc-text-field-idle-line-color: var(--divider-color);
         --mdc-ripple-color: transparant;
       }
       .filters {
-        --mdc-text-field-fill-color: var(--input-fill-color);
-        --mdc-text-field-idle-line-color: var(--input-idle-line-color);
-        --mdc-shape-small: 4px;
-        --text-field-overflow: initial;
         display: flex;
         justify-content: flex-end;
+        width: 100%;
         margin-right: 8px;
-        color: var(--primary-text-color);
       }
       .active-filters {
         color: var(--primary-text-color);
@@ -317,8 +295,6 @@ export class HaTabsSubpageDataTable extends LitElement {
         padding: 2px 2px 2px 8px;
         margin-left: 4px;
         font-size: 14px;
-        width: max-content;
-        cursor: initial;
       }
       .active-filters ha-svg-icon {
         color: var(--primary-color);
@@ -337,24 +313,6 @@ export class HaTabsSubpageDataTable extends LitElement {
         left: 0;
         content: "";
       }
-      .badge {
-        min-width: 20px;
-        box-sizing: border-box;
-        border-radius: 50%;
-        font-weight: 400;
-        background-color: var(--primary-color);
-        line-height: 20px;
-        text-align: center;
-        padding: 0px 4px;
-        color: var(--text-primary-color);
-        position: absolute;
-        right: 0;
-        top: 4px;
-        font-size: 0.65em;
-      }
-      .filter-menu {
-        position: relative;
-      }
     `;
   }
 }

src/layouts/hass-tabs-subpage.ts

@@ -272,7 +272,6 @@ class HassTabsSubpage extends LitElement {
       ha-menu-button,
       ha-icon-button-arrow-prev,
       ::slotted([slot="toolbar-icon"]) {
-        display: flex;
         flex-shrink: 0;
         pointer-events: auto;
         color: var(--sidebar-icon-color);

src/layouts/home-assistant.ts

@@ -78,7 +78,8 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
     super.firstUpdated(changedProps);
     this._initializeHass();
     setTimeout(() => registerServiceWorker(this), 1000);
-
+    /* polyfill for paper-dropdown */
+    import("web-animations-js/web-animations-next-lite.min");
     this.addEventListener("hass-suspend-when-hidden", (ev) => {
       this._updateHass({ suspendWhenHidden: ev.detail.suspend });
       storeState(this.hass!);

src/onboarding/onboarding-integrations.ts

@@ -140,6 +140,8 @@ class OnboardingIntegrations extends LitElement {
     this._scanUSBDevices();
     loadConfigFlowDialog();
     this._loadConfigEntries();
+    /* polyfill for paper-dropdown */
+    import("web-animations-js/web-animations-next-lite.min");
   }
 
   private _createFlow() {

src/panels/config/automation/action/ha-automation-action-row.ts

@@ -1,8 +1,8 @@
 import { ActionDetail } from "@material/mwc-list/mwc-list-foundation";
 import "@material/mwc-list/mwc-list-item";
+import { mdiArrowDown, mdiArrowUp, mdiDotsVertical } from "@mdi/js";
 import "@material/mwc-select";
 import type { Select } from "@material/mwc-select";
-import { mdiArrowDown, mdiArrowUp, mdiDotsVertical } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -11,23 +11,22 @@ import { fireEvent } from "../../../../common/dom/fire_event";
 import { stringCompare } from "../../../../common/string/compare";
 import { handleStructError } from "../../../../common/structs/handle-errors";
 import { LocalizeFunc } from "../../../../common/translations/localize";
-import "../../../../components/ha-alert";
 import "../../../../components/ha-button-menu";
 import "../../../../components/ha-card";
+import "../../../../components/ha-alert";
 import "../../../../components/ha-icon-button";
 import type { HaYamlEditor } from "../../../../components/ha-yaml-editor";
-import { Action, getActionType } from "../../../../data/script";
+import type { Action } from "../../../../data/script";
 import { showConfirmationDialog } from "../../../../dialogs/generic/show-dialog-box";
 import { haStyle } from "../../../../resources/styles";
 import type { HomeAssistant } from "../../../../types";
-import "./types/ha-automation-action-activate_scene";
 import "./types/ha-automation-action-choose";
 import "./types/ha-automation-action-condition";
 import "./types/ha-automation-action-delay";
 import "./types/ha-automation-action-device_id";
 import "./types/ha-automation-action-event";
-import "./types/ha-automation-action-play_media";
 import "./types/ha-automation-action-repeat";
+import "./types/ha-automation-action-scene";
 import "./types/ha-automation-action-service";
 import "./types/ha-automation-action-wait_for_trigger";
 import "./types/ha-automation-action-wait_template";
@@ -36,8 +35,7 @@ const OPTIONS = [
   "condition",
   "delay",
   "event",
-  "play_media",
-  "activate_scene",
+  "scene",
   "service",
   "wait_template",
   "wait_for_trigger",
@@ -46,15 +44,8 @@ const OPTIONS = [
   "device_id",
 ];
 
-const getType = (action: Action | undefined) => {
-  if (!action) {
-    return undefined;
-  }
-  if ("service" in action || "scene" in action) {
-    return getActionType(action);
-  }
-  return OPTIONS.find((option) => option in action);
-};
+const getType = (action: Action | undefined) =>
+  action ? OPTIONS.find((option) => option in action) : undefined;
 
 declare global {
   // for fire event
@@ -122,30 +113,24 @@ export default class HaAutomationActionRow extends LitElement {
       ).sort((a, b) => stringCompare(a[1], b[1]))
   );
 
-  protected willUpdate(changedProperties: PropertyValues) {
-    if (!changedProperties.has("action")) {
-      return;
-    }
-    this._uiModeAvailable = getType(this.action) !== undefined;
-    if (!this._uiModeAvailable && !this._yamlMode) {
-      this._yamlMode = true;
-    }
-  }
-
   protected updated(changedProperties: PropertyValues) {
     if (!changedProperties.has("action")) {
       return;
     }
-    if (this._yamlMode) {
-      const yamlEditor = this._yamlEditor;
-      if (yamlEditor && yamlEditor.value !== this.action) {
-        yamlEditor.setValue(this.action);
-      }
+    this._uiModeAvailable = Boolean(getType(this.action));
+    if (!this._uiModeAvailable && !this._yamlMode) {
+      this._yamlMode = true;
+    }
+
+    const yamlEditor = this._yamlEditor;
+    if (this._yamlMode && yamlEditor && yamlEditor.value !== this.action) {
+      yamlEditor.setValue(this.action);
     }
   }
 
   protected render() {
     const type = getType(this.action);
+    const selected = type ? OPTIONS.indexOf(type) : -1;
     const yamlMode = this._yamlMode;
 
     return html`
@@ -220,7 +205,7 @@ export default class HaAutomationActionRow extends LitElement {
             : ""}
           ${yamlMode
             ? html`
-                ${type === undefined
+                ${selected === -1
                   ? html`
                       ${this.hass.localize(
                         "ui.panel.config.automation.editor.actions.unsupported_action",

src/panels/config/automation/action/types/ha-automation-action-choose.ts

@@ -1,4 +1,5 @@
 import { mdiDelete } from "@mdi/js";
+import "@polymer/paper-input/paper-input";
 import { css, CSSResultGroup, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../../../../common/dom/fire_event";

src/panels/config/automation/action/types/ha-automation-action-device_id.ts

@@ -69,7 +69,6 @@ export class HaDeviceAction extends LitElement {
       ${this._capabilities?.extra_fields
         ? html`
             <ha-form
-              .hass=${this.hass}
               .data=${this._extraFieldsData(this.action, this._capabilities)}
               .schema=${this._capabilities.extra_fields}
               .computeLabel=${this._extraFieldsComputeLabelCallback(

src/panels/config/automation/action/types/ha-automation-action-play_media.ts

@@ -1,68 +0,0 @@
-import "@polymer/paper-input/paper-input";
-import { html, LitElement } from "lit";
-import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import { fireEvent } from "../../../../../common/dom/fire_event";
-import "../../../../../components/ha-selector/ha-selector-media";
-import { PlayMediaAction } from "../../../../../data/script";
-import type { MediaSelectorValue } from "../../../../../data/selector";
-import type { HomeAssistant } from "../../../../../types";
-import { ActionElement } from "../ha-automation-action-row";
-
-@customElement("ha-automation-action-play_media")
-export class HaPlayMediaAction extends LitElement implements ActionElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public action!: PlayMediaAction;
-
-  @property({ type: Boolean }) public narrow = false;
-
-  public static get defaultConfig(): PlayMediaAction {
-    return {
-      service: "media_player.play_media",
-      target: { entity_id: "" },
-      data: { media_content_id: "", media_content_type: "" },
-      metadata: {},
-    };
-  }
-
-  private _getSelectorValue = memoizeOne(
-    (action: PlayMediaAction): MediaSelectorValue => ({
-      entity_id: action.target?.entity_id || action.entity_id,
-      media_content_id: action.data?.media_content_id,
-      media_content_type: action.data?.media_content_type,
-      metadata: action.metadata,
-    })
-  );
-
-  protected render() {
-    return html`
-      <ha-selector-media
-        .hass=${this.hass}
-        .value=${this._getSelectorValue(this.action)}
-        @value-changed=${this._valueChanged}
-      ></ha-selector-media>
-    `;
-  }
-
-  private _valueChanged(ev: CustomEvent<{ value: MediaSelectorValue }>) {
-    ev.stopPropagation();
-    fireEvent(this, "value-changed", {
-      value: {
-        service: "media_player.play_media",
-        target: { entity_id: ev.detail.value.entity_id },
-        data: {
-          media_content_id: ev.detail.value.media_content_id,
-          media_content_type: ev.detail.value.media_content_type,
-        },
-        metadata: ev.detail.value.metadata || {},
-      } as PlayMediaAction,
-    });
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-automation-action-play_media": HaPlayMediaAction;
-  }
-}

src/panels/config/automation/action/types/ha-automation-action-scene.ts

@@ -9,30 +9,18 @@ import { ActionElement } from "../ha-automation-action-row";
 
 const includeDomains = ["scene"];
 
-@customElement("ha-automation-action-activate_scene")
+@customElement("ha-automation-action-scene")
 export class HaSceneAction extends LitElement implements ActionElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property() public action!: SceneAction;
 
   public static get defaultConfig(): SceneAction {
-    return {
-      service: "scene.turn_on",
-      target: {
-        entity_id: "",
-      },
-      metadata: {},
-    };
+    return { scene: "" };
   }
 
   protected render() {
-    let scene;
-
-    if ("scene" in this.action) {
-      scene = this.action.scene;
-    } else {
-      scene = this.action.target?.entity_id;
-    }
+    const { scene } = this.action;
 
     return html`
       <ha-entity-picker
@@ -48,19 +36,13 @@ export class HaSceneAction extends LitElement implements ActionElement {
   private _entityPicked(ev: PolymerChangedEvent<string>) {
     ev.stopPropagation();
     fireEvent(this, "value-changed", {
-      value: {
-        service: "scene.turn_on",
-        target: {
-          entity_id: ev.detail.value,
-        },
-        metadata: {},
-      },
+      value: { ...this.action, scene: ev.detail.value },
     });
   }
 }
 
 declare global {
   interface HTMLElementTagNameMap {
-    "ha-automation-action-activate_scene": HaSceneAction;
+    "ha-automation-action-scene": HaSceneAction;
   }
 }

src/panels/config/automation/action/types/ha-automation-action-service.ts

@@ -1,3 +1,4 @@
+import "@polymer/paper-input/paper-input";
 import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { any, assert, object, optional, string } from "superstruct";
@@ -30,7 +31,7 @@ export class HaServiceAction extends LitElement implements ActionElement {
     return { service: "", data: {} };
   }
 
-  protected willUpdate(changedProperties: PropertyValues) {
+  protected updated(changedProperties: PropertyValues) {
     if (!changedProperties.has("action")) {
       return;
     }

src/panels/config/automation/condition/ha-automation-condition-editor.ts

@@ -6,7 +6,7 @@ import memoizeOne from "memoize-one";
 import { dynamicElement } from "../../../../common/dom/dynamic-element-directive";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { stringCompare } from "../../../../common/string/compare";
-import type { LocalizeFunc } from "../../../../common/translations/localize";
+import { LocalizeFunc } from "../../../../common/translations/localize";
 import "../../../../components/ha-card";
 import "../../../../components/ha-yaml-editor";
 import type { Condition } from "../../../../data/automation";

src/panels/config/automation/condition/ha-automation-condition-row.ts

@@ -1,6 +1,7 @@
 import { ActionDetail } from "@material/mwc-list/mwc-list-foundation";
 import "@material/mwc-list/mwc-list-item";
 import { mdiDotsVertical } from "@mdi/js";
+import "@polymer/paper-item/paper-item";
 import { css, CSSResultGroup, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../common/dom/fire_event";
@@ -27,7 +28,7 @@ export const handleChangeEvent = (
   if (!name) {
     return;
   }
-  const newVal = ev.detail?.value || (ev.currentTarget as any)?.value;
+  const newVal = ev.detail.value;
 
   if ((element.condition[name] || "") === newVal) {
     return;

src/panels/config/automation/condition/types/ha-automation-condition-device.ts

@@ -1,4 +1,4 @@
-import { css, html, LitElement } from "lit";
+import { html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../../common/dom/fire_event";
@@ -11,7 +11,7 @@ import {
   DeviceCondition,
   fetchDeviceConditionCapabilities,
 } from "../../../../../data/device_automation";
-import type { HomeAssistant } from "../../../../../types";
+import { HomeAssistant } from "../../../../../types";
 
 @customElement("ha-automation-condition-device")
 export class HaDeviceCondition extends LitElement {
@@ -69,7 +69,6 @@ export class HaDeviceCondition extends LitElement {
       ${this._capabilities?.extra_fields
         ? html`
             <ha-form
-              .hass=${this.hass}
               .data=${this._extraFieldsData(this.condition, this._capabilities)}
               .schema=${this._capabilities.extra_fields}
               .computeLabel=${this._extraFieldsComputeLabelCallback(
@@ -148,13 +147,6 @@ export class HaDeviceCondition extends LitElement {
         `ui.panel.config.automation.editor.conditions.type.device.extra_fields.${schema.name}`
       ) || schema.name;
   }
-
-  static styles = css`
-    ha-device-picker {
-      display: block;
-      margin-bottom: 24px;
-    }
-  `;
 }
 
 declare global {

src/panels/config/automation/condition/types/ha-automation-condition-logical.ts

@@ -1,20 +1,17 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../../../../common/dom/fire_event";
-import type {
-  Condition,
-  LogicalCondition,
-} from "../../../../../data/automation";
-import type { HomeAssistant } from "../../../../../types";
+import { Condition, LogicalCondition } from "../../../../../data/automation";
+import { HomeAssistant } from "../../../../../types";
 import "../ha-automation-condition";
-import type { ConditionElement } from "../ha-automation-condition-row";
+import { ConditionElement } from "../ha-automation-condition-row";
 import { HaStateCondition } from "./ha-automation-condition-state";
 
 @customElement("ha-automation-condition-logical")
 export class HaLogicalCondition extends LitElement implements ConditionElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public condition!: LogicalCondition;
+  @property() public condition!: LogicalCondition;
 
   public static get defaultConfig() {
     return {

src/panels/config/automation/condition/types/ha-automation-condition-numeric_state.ts

@@ -1,17 +1,17 @@
-import "../../../../../components/ha-form/ha-form";
+import "@polymer/paper-input/paper-input";
+import "@polymer/paper-input/paper-textarea";
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import { fireEvent } from "../../../../../common/dom/fire_event";
-import type { HaFormSchema } from "../../../../../components/ha-form/types";
+import "../../../../../components/entity/ha-entity-picker";
 import { NumericStateCondition } from "../../../../../data/automation";
-import type { HomeAssistant } from "../../../../../types";
+import { HomeAssistant } from "../../../../../types";
+import { handleChangeEvent } from "../ha-automation-condition-row";
 
 @customElement("ha-automation-condition-numeric_state")
 export default class HaNumericStateCondition extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public condition!: NumericStateCondition;
+  @property() public condition!: NumericStateCondition;
 
   public static get defaultConfig() {
     return {
@@ -19,54 +19,60 @@ export default class HaNumericStateCondition extends LitElement {
     };
   }
 
-  private _schema = memoizeOne((entityId): HaFormSchema[] => [
-    { name: "entity_id", required: true, selector: { entity: {} } },
-    {
-      name: "attribute",
-      selector: { attribute: { entity_id: entityId } },
-    },
-    { name: "above", selector: { text: {} } },
-    { name: "below", selector: { text: {} } },
-    {
-      name: "value_template",
-      selector: { text: { multiline: true } },
-    },
-  ]);
-
   public render() {
-    const schema = this._schema(this.condition.entity_id);
+    const { value_template, entity_id, attribute, below, above } =
+      this.condition;
 
     return html`
-      <ha-form
-        .hass=${this.hass}
-        .data=${this.condition}
-        .schema=${schema}
+      <ha-entity-picker
+        .value=${entity_id}
+        .name=${"entity_id"}
         @value-changed=${this._valueChanged}
-        .computeLabel=${this._computeLabelCallback}
-      ></ha-form>
+        .hass=${this.hass}
+        allow-custom-entity
+      ></ha-entity-picker>
+      <ha-entity-attribute-picker
+        .hass=${this.hass}
+        .entityId=${entity_id}
+        .value=${attribute}
+        .name=${"attribute"}
+        .label=${this.hass.localize(
+          "ui.panel.config.automation.editor.triggers.type.state.attribute"
+        )}
+        @value-changed=${this._valueChanged}
+        allow-custom-value
+      ></ha-entity-attribute-picker>
+      <paper-input
+        .label=${this.hass.localize(
+          "ui.panel.config.automation.editor.conditions.type.numeric_state.above"
+        )}
+        name="above"
+        .value=${above}
+        @value-changed=${this._valueChanged}
+      ></paper-input>
+      <paper-input
+        .label=${this.hass.localize(
+          "ui.panel.config.automation.editor.conditions.type.numeric_state.below"
+        )}
+        name="below"
+        .value=${below}
+        @value-changed=${this._valueChanged}
+      ></paper-input>
+      <paper-textarea
+        .label=${this.hass.localize(
+          "ui.panel.config.automation.editor.conditions.type.numeric_state.value_template"
+        )}
+        name="value_template"
+        .value=${value_template}
+        @value-changed=${this._valueChanged}
+        dir="ltr"
+      ></paper-textarea>
     `;
   }
 
   private _valueChanged(ev: CustomEvent): void {
-    ev.stopPropagation();
-    const newTrigger = ev.detail.value;
-    fireEvent(this, "value-changed", { value: newTrigger });
+    handleChangeEvent(this, ev);
   }
-
-  private _computeLabelCallback = (schema: HaFormSchema): string => {
-    switch (schema.name) {
-      case "entity_id":
-        return this.hass.localize("ui.components.entity.entity-picker.entity");
-      case "attribute":
-        return this.hass.localize(
-          "ui.components.entity.entity-attribute-picker.attribute"
-        );
-      default:
-        return this.hass.localize(
-          `ui.panel.config.automation.editor.triggers.type.numeric_state.${schema.name}`
-        );
-    }
-  };
 }
 
 declare global {

src/panels/config/automation/condition/types/ha-automation-condition-state.ts

@@ -1,14 +1,19 @@
+import "@polymer/paper-input/paper-input";
 import { html, LitElement, PropertyValues } from "lit";
 import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
 import { assert, literal, object, optional, string, union } from "superstruct";
 import { createDurationData } from "../../../../../common/datetime/create_duration_data";
 import { fireEvent } from "../../../../../common/dom/fire_event";
-import type { HaFormSchema } from "../../../../../components/ha-form/types";
-import type { StateCondition } from "../../../../../data/automation";
-import type { HomeAssistant } from "../../../../../types";
+import "../../../../../components/entity/ha-entity-attribute-picker";
+import "../../../../../components/entity/ha-entity-picker";
+import "../../../../../components/ha-duration-input";
+import { StateCondition } from "../../../../../data/automation";
+import { HomeAssistant } from "../../../../../types";
 import { forDictStruct } from "../../structs";
-import type { ConditionElement } from "../ha-automation-condition-row";
+import {
+  ConditionElement,
+  handleChangeEvent,
+} from "../ha-automation-condition-row";
 
 const stateConditionStruct = object({
   condition: literal("state"),
@@ -22,22 +27,12 @@ const stateConditionStruct = object({
 export class HaStateCondition extends LitElement implements ConditionElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public condition!: StateCondition;
+  @property() public condition!: StateCondition;
 
   public static get defaultConfig() {
     return { entity_id: "", state: "" };
   }
 
-  private _schema = memoizeOne((entityId) => [
-    { name: "entity_id", required: true, selector: { entity: {} } },
-    {
-      name: "attribute",
-      selector: { attribute: { entity_id: entityId } },
-    },
-    { name: "state", selector: { text: {} } },
-    { name: "for", selector: { duration: {} } },
-  ]);
-
   public shouldUpdate(changedProperties: PropertyValues) {
     if (changedProperties.has("condition")) {
       try {
@@ -51,52 +46,50 @@ export class HaStateCondition extends LitElement implements ConditionElement {
   }
 
   protected render() {
-    const trgFor = createDurationData(this.condition.for);
-    const data = { ...this.condition, ...{ for: trgFor } };
-    const schema = this._schema(this.condition.entity_id);
+    const { entity_id, attribute, state } = this.condition;
+    const forTime = createDurationData(this.condition.for);
 
     return html`
-      <ha-form
-        .hass=${this.hass}
-        .data=${data}
-        .schema=${schema}
+      <ha-entity-picker
+        .value=${entity_id}
+        .name=${"entity_id"}
         @value-changed=${this._valueChanged}
-        .computeLabel=${this._computeLabelCallback}
-      ></ha-form>
+        .hass=${this.hass}
+        allow-custom-entity
+      ></ha-entity-picker>
+      <ha-entity-attribute-picker
+        .hass=${this.hass}
+        .entityId=${entity_id}
+        .value=${attribute}
+        .name=${"attribute"}
+        .label=${this.hass.localize(
+          "ui.panel.config.automation.editor.triggers.type.state.attribute"
+        )}
+        @value-changed=${this._valueChanged}
+        allow-custom-value
+      ></ha-entity-attribute-picker>
+      <paper-input
+        .label=${this.hass.localize(
+          "ui.panel.config.automation.editor.conditions.type.state.state"
+        )}
+        .name=${"state"}
+        .value=${state}
+        @value-changed=${this._valueChanged}
+      ></paper-input>
+      <ha-duration-input
+        .label=${this.hass.localize(
+          "ui.panel.config.automation.editor.triggers.type.state.for"
+        )}
+        .name=${"for"}
+        .data=${forTime}
+        @value-changed=${this._valueChanged}
+      ></ha-duration-input>
     `;
   }
 
   private _valueChanged(ev: CustomEvent): void {
-    ev.stopPropagation();
-    const newTrigger = ev.detail.value;
-
-    Object.keys(newTrigger).forEach((key) =>
-      newTrigger[key] === undefined || newTrigger[key] === ""
-        ? delete newTrigger[key]
-        : {}
-    );
-
-    fireEvent(this, "value-changed", { value: newTrigger });
+    handleChangeEvent(this, ev);
   }
-
-  private _computeLabelCallback = (schema: HaFormSchema): string => {
-    switch (schema.name) {
-      case "entity_id":
-        return this.hass.localize("ui.components.entity.entity-picker.entity");
-      case "attribute":
-        return this.hass.localize(
-          "ui.components.entity.entity-attribute-picker.attribute"
-        );
-      case "for":
-        return this.hass.localize(
-          `ui.panel.config.automation.editor.triggers.type.state.for`
-        );
-      default:
-        return this.hass.localize(
-          `ui.panel.config.automation.editor.conditions.type.state.${schema.name}`
-        );
-    }
-  };
 }
 
 declare global {

src/panels/config/automation/condition/types/ha-automation-condition-sun.ts

@@ -1,12 +1,16 @@
-import { html, LitElement } from "lit";
+import "@polymer/paper-input/paper-input";
+import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import type { SunCondition } from "../../../../../data/automation";
 import type { HomeAssistant } from "../../../../../types";
-import type { ConditionElement } from "../ha-automation-condition-row";
-import type { LocalizeFunc } from "../../../../../common/translations/localize";
-import type { HaFormSchema } from "../../../../../components/ha-form/types";
+import {
+  ConditionElement,
+  handleChangeEvent,
+} from "../ha-automation-condition-row";
+import "../../../../../components/ha-radio";
+import "../../../../../components/ha-formfield";
+import type { HaRadio } from "../../../../../components/ha-radio";
 
 @customElement("ha-automation-condition-sun")
 export class HaSunCondition extends LitElement implements ConditionElement {
@@ -18,72 +22,111 @@ export class HaSunCondition extends LitElement implements ConditionElement {
     return {};
   }
 
-  private _schema = memoizeOne((localize: LocalizeFunc) => [
-    {
-      name: "before",
-      type: "select",
-      required: true,
-      options: [
-        [
-          "sunrise",
-          localize(
-            "ui.panel.config.automation.editor.conditions.type.sun.sunrise"
-          ),
-        ],
-        [
-          "sunset",
-          localize(
-            "ui.panel.config.automation.editor.conditions.type.sun.sunset"
-          ),
-        ],
-      ],
-    },
-    { name: "before_offset", selector: { text: {} } },
-    {
-      name: "after",
-      type: "select",
-      required: true,
-      options: [
-        [
-          "sunrise",
-          localize(
-            "ui.panel.config.automation.editor.conditions.type.sun.sunrise"
-          ),
-        ],
-        [
-          "sunset",
-          localize(
-            "ui.panel.config.automation.editor.conditions.type.sun.sunset"
-          ),
-        ],
-      ],
-    },
-    { name: "after_offset", selector: { text: {} } },
-  ]);
-
   protected render() {
-    const schema = this._schema(this.hass.localize);
+    const { after, after_offset, before, before_offset } = this.condition;
     return html`
-      <ha-form
-        .schema=${schema}
-        .data=${this.condition}
-        .hass=${this.hass}
-        .computeLabel=${this._computeLabelCallback}
+      <label>
+        ${this.hass.localize(
+          "ui.panel.config.automation.editor.conditions.type.sun.before"
+        )}
+        <ha-formfield
+          .label=${this.hass.localize(
+            "ui.panel.config.automation.editor.conditions.type.sun.sunrise"
+          )}
+        >
+          <ha-radio
+            name="before"
+            value="sunrise"
+            .checked=${before === "sunrise"}
+            @change=${this._radioGroupPicked}
+          ></ha-radio>
+        </ha-formfield>
+        <ha-formfield
+          .label=${this.hass.localize(
+            "ui.panel.config.automation.editor.conditions.type.sun.sunset"
+          )}
+        >
+          <ha-radio
+            name="before"
+            value="sunset"
+            .checked=${before === "sunset"}
+            @change=${this._radioGroupPicked}
+          ></ha-radio>
+        </ha-formfield>
+      </label>
+
+      <paper-input
+        .label=${this.hass.localize(
+          "ui.panel.config.automation.editor.conditions.type.sun.before_offset"
+        )}
+        name="before_offset"
+        .value=${before_offset}
         @value-changed=${this._valueChanged}
-      ></ha-form>
+      ></paper-input>
+
+      <label>
+        ${this.hass.localize(
+          "ui.panel.config.automation.editor.conditions.type.sun.after"
+        )}
+
+        <ha-formfield
+          .label=${this.hass.localize(
+            "ui.panel.config.automation.editor.conditions.type.sun.sunrise"
+          )}
+        >
+          <ha-radio
+            name="after"
+            value="sunrise"
+            .checked=${after === "sunrise"}
+            @change=${this._radioGroupPicked}
+          ></ha-radio>
+        </ha-formfield>
+        <ha-formfield
+          .label=${this.hass.localize(
+            "ui.panel.config.automation.editor.conditions.type.sun.sunset"
+          )}
+        >
+          <ha-radio
+            name="after"
+            value="sunset"
+            .checked=${after === "sunset"}
+            @change=${this._radioGroupPicked}
+          ></ha-radio>
+        </ha-formfield>
+      </label>
+
+      <paper-input
+        .label=${this.hass.localize(
+          "ui.panel.config.automation.editor.conditions.type.sun.after_offset"
+        )}
+        name="after_offset"
+        .value=${after_offset}
+        @value-changed=${this._valueChanged}
+      ></paper-input>
     `;
   }
 
   private _valueChanged(ev: CustomEvent): void {
-    ev.stopPropagation();
-    const newTrigger = ev.detail.value;
-    fireEvent(this, "value-changed", { value: newTrigger });
+    handleChangeEvent(this, ev);
   }
 
-  private _computeLabelCallback = (schema: HaFormSchema): string =>
-    this.hass.localize(
-      `ui.panel.config.automation.editor.conditions.type.sun.${schema.name}`
-    );
+  private _radioGroupPicked(ev: CustomEvent) {
+    const key = (ev.target as HaRadio).name;
+    ev.stopPropagation();
+    fireEvent(this, "value-changed", {
+      value: {
+        ...this.condition,
+        [key]: (ev.target as HaRadio).value,
+      },
+    });
+  }
+
+  static styles = css`
+    label {
+      display: flex;
+      align-items: center;
+    }
+  `;
 }
 
 declare global {

src/panels/config/automation/condition/types/ha-automation-condition-template.ts

@@ -1,15 +1,15 @@
-import "../../../../../components/ha-textarea";
-import { css, html, LitElement } from "lit";
+import "@polymer/paper-input/paper-textarea";
+import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
-import type { TemplateCondition } from "../../../../../data/automation";
-import type { HomeAssistant } from "../../../../../types";
+import { TemplateCondition } from "../../../../../data/automation";
+import { HomeAssistant } from "../../../../../types";
 import { handleChangeEvent } from "../ha-automation-condition-row";
 
 @customElement("ha-automation-condition-template")
 export class HaTemplateCondition extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public condition!: TemplateCondition;
+  @property() public condition!: TemplateCondition;
 
   public static get defaultConfig() {
     return { value_template: "" };
@@ -18,32 +18,19 @@ export class HaTemplateCondition extends LitElement {
   protected render() {
     const { value_template } = this.condition;
     return html`
-      <ha-textarea
-        name="value_template"
+      <paper-textarea
         .label=${this.hass.localize(
           "ui.panel.config.automation.editor.conditions.type.template.value_template"
         )}
+        name="value_template"
         .value=${value_template}
-        @input=${this._valueChanged}
+        @value-changed=${this._valueChanged}
         dir="ltr"
-        autogrow
-      ></ha-textarea>
+      ></paper-textarea>
     `;
   }
 
   private _valueChanged(ev: CustomEvent): void {
     handleChangeEvent(this, ev);
   }
-
-  static styles = css`
-    ha-textarea {
-      display: block;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-automation-condition-template": HaTemplateCondition;
-  }
 }

src/panels/config/automation/condition/types/ha-automation-condition-time.ts

@@ -1,12 +1,20 @@
-import { html, LitElement } from "lit";
+import { Radio } from "@material/mwc-radio";
+import { css, CSSResultGroup, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../../common/dom/fire_event";
-import type { TimeCondition } from "../../../../../data/automation";
-import type { HomeAssistant } from "../../../../../types";
-import type { ConditionElement } from "../ha-automation-condition-row";
-import type { LocalizeFunc } from "../../../../../common/translations/localize";
-import type { HaFormSchema } from "../../../../../components/ha-form/types";
+import { computeRTLDirection } from "../../../../../common/util/compute_rtl";
+import "../../../../../components/ha-formfield";
+import "../../../../../components/ha-radio";
+import { HaSwitch } from "../../../../../components/ha-switch";
+import { TimeCondition } from "../../../../../data/automation";
+import { HomeAssistant } from "../../../../../types";
+import {
+  ConditionElement,
+  handleChangeEvent,
+} from "../ha-automation-condition-row";
+import "../../../../../components/ha-time-input";
+
+const includeDomains = ["input_datetime"];
 
 const DAYS = {
   mon: 1,
@@ -18,6 +26,10 @@ const DAYS = {
   sun: 7,
 };
 
+interface WeekdayHaSwitch extends HaSwitch {
+  day: string;
+}
+
 @customElement("ha-automation-condition-time")
 export class HaTimeCondition extends LitElement implements ConditionElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -32,136 +44,176 @@ export class HaTimeCondition extends LitElement implements ConditionElement {
     return {};
   }
 
-  private _schema = memoizeOne(
-    (
-      localize: LocalizeFunc,
-      inputModeAfter?: boolean,
-      inputModeBefore?: boolean
-    ): HaFormSchema[] => {
-      const modeAfterSchema = inputModeAfter
-        ? { name: "after", selector: { entity: { domain: "input_datetime" } } }
-        : { name: "after", selector: { time: {} } };
-
-      const modeBeforeSchema = inputModeBefore
-        ? { name: "before", selector: { entity: { domain: "input_datetime" } } }
-        : { name: "before", selector: { time: {} } };
-
-      return [
-        {
-          name: "mode_after",
-          type: "select",
-          required: true,
-          options: [
-            [
-              "value",
-              localize(
-                "ui.panel.config.automation.editor.conditions.type.time.type_value"
-              ),
-            ],
-            [
-              "input",
-              localize(
-                "ui.panel.config.automation.editor.conditions.type.time.type_input"
-              ),
-            ],
-          ],
-        },
-        modeAfterSchema,
-        {
-          name: "mode_before",
-          type: "select",
-          required: true,
-          options: [
-            [
-              "value",
-              localize(
-                "ui.panel.config.automation.editor.conditions.type.time.type_value"
-              ),
-            ],
-            [
-              "input",
-              localize(
-                "ui.panel.config.automation.editor.conditions.type.time.type_input"
-              ),
-            ],
-          ],
-        },
-        modeBeforeSchema,
-        {
-          type: "multi_select",
-          name: "weekday",
-          options: Object.keys(DAYS).map((day) => [
-            day,
-            localize(
-              `ui.panel.config.automation.editor.conditions.type.time.weekdays.${day}`
-            ),
-          ]),
-        },
-      ];
-    }
-  );
-
   protected render() {
+    const { after, before, weekday } = this.condition;
+
     const inputModeBefore =
-      this._inputModeBefore ??
-      this.condition.before?.startsWith("input_datetime.");
+      this._inputModeBefore ?? before?.startsWith("input_datetime.");
     const inputModeAfter =
-      this._inputModeAfter ??
-      this.condition.after?.startsWith("input_datetime.");
-
-    const schema: HaFormSchema[] = this._schema(
-      this.hass.localize,
-      inputModeAfter,
-      inputModeBefore
-    );
-
-    const data = {
-      mode_before: "value",
-      mode_after: "value",
-      ...this.condition,
-    };
+      this._inputModeAfter ?? after?.startsWith("input_datetime.");
 
     return html`
-      <ha-form
-        .hass=${this.hass}
-        .data=${data}
-        .schema=${schema}
-        @value-changed=${this._valueChanged}
-        .computeLabel=${this._computeLabelCallback}
-      ></ha-form>
+      <ha-formfield
+        .label=${this.hass!.localize(
+          "ui.panel.config.automation.editor.conditions.type.time.type_value"
+        )}
+      >
+        <ha-radio
+          @change=${this._handleModeChanged}
+          name="mode_after"
+          value="value"
+          ?checked=${!inputModeAfter}
+        ></ha-radio>
+      </ha-formfield>
+      <ha-formfield
+        .label=${this.hass!.localize(
+          "ui.panel.config.automation.editor.conditions.type.time.type_input"
+        )}
+      >
+        <ha-radio
+          @change=${this._handleModeChanged}
+          name="mode_after"
+          value="input"
+          ?checked=${inputModeAfter}
+        ></ha-radio>
+      </ha-formfield>
+      ${inputModeAfter
+        ? html`<ha-entity-picker
+            .label=${this.hass.localize(
+              "ui.panel.config.automation.editor.conditions.type.time.after"
+            )}
+            .includeDomains=${includeDomains}
+            .name=${"after"}
+            .value=${after?.startsWith("input_datetime.") ? after : ""}
+            @value-changed=${this._valueChanged}
+            .hass=${this.hass}
+            allow-custom-entity
+          ></ha-entity-picker>`
+        : html`<ha-time-input
+            .label=${this.hass.localize(
+              "ui.panel.config.automation.editor.conditions.type.time.after"
+            )}
+            .locale=${this.hass.locale}
+            .name=${"after"}
+            .value=${after?.startsWith("input_datetime.") ? "" : after}
+            @value-changed=${this._valueChanged}
+          ></ha-time-input>`}
+
+      <ha-formfield
+        .label=${this.hass!.localize(
+          "ui.panel.config.automation.editor.conditions.type.time.type_value"
+        )}
+      >
+        <ha-radio
+          @change=${this._handleModeChanged}
+          name="mode_before"
+          value="value"
+          ?checked=${!inputModeBefore}
+        ></ha-radio>
+      </ha-formfield>
+      <ha-formfield
+        .label=${this.hass!.localize(
+          "ui.panel.config.automation.editor.conditions.type.time.type_input"
+        )}
+      >
+        <ha-radio
+          @change=${this._handleModeChanged}
+          name="mode_before"
+          value="input"
+          ?checked=${inputModeBefore}
+        ></ha-radio>
+      </ha-formfield>
+      ${inputModeBefore
+        ? html`<ha-entity-picker
+            .label=${this.hass.localize(
+              "ui.panel.config.automation.editor.conditions.type.time.before"
+            )}
+            .includeDomains=${includeDomains}
+            .name=${"before"}
+            .value=${before?.startsWith("input_datetime.") ? before : ""}
+            @value-changed=${this._valueChanged}
+            .hass=${this.hass}
+            allow-custom-entity
+          ></ha-entity-picker>`
+        : html`<ha-time-input
+            .label=${this.hass.localize(
+              "ui.panel.config.automation.editor.conditions.type.time.before"
+            )}
+            .name=${"before"}
+            .locale=${this.hass.locale}
+            .value=${before?.startsWith("input_datetime.") ? "" : before}
+            @value-changed=${this._valueChanged}
+          ></ha-time-input>`}
+      ${Object.keys(DAYS).map(
+        (day) => html`
+          <ha-formfield
+            alignEnd
+            spaceBetween
+            class="weekday-toggle"
+            .label=${this.hass!.localize(
+              `ui.panel.config.automation.editor.conditions.type.time.weekdays.${day}`
+            )}
+            .dir=${computeRTLDirection(this.hass!)}
+          >
+            <ha-switch
+              .day=${day}
+              .checked=${!weekday || weekday === day || weekday.includes(day)}
+              @change=${this._dayValueChanged}
+            >
+            </ha-switch>
+          </ha-formfield>
+        `
+      )}
     `;
   }
 
-  private _valueChanged(ev: CustomEvent): void {
-    ev.stopPropagation();
-    const newValue = ev.detail.value;
-
-    const newModeAfter = newValue.mode_after === "input";
-    const newModeBefore = newValue.mode_before === "input";
-
-    if (newModeAfter !== this._inputModeAfter) {
-      this._inputModeAfter = newModeAfter;
-      newValue.after = undefined;
+  private _handleModeChanged(ev: Event) {
+    const target = ev.target as Radio;
+    if (target.getAttribute("name") === "mode_after") {
+      this._inputModeAfter = target.value === "input";
+    } else {
+      this._inputModeBefore = target.value === "input";
     }
-
-    if (newModeBefore !== this._inputModeBefore) {
-      this._inputModeBefore = newModeBefore;
-      newValue.before = undefined;
-    }
-
-    Object.keys(newValue).forEach((key) =>
-      newValue[key] === undefined || newValue[key] === ""
-        ? delete newValue[key]
-        : {}
-    );
-
-    fireEvent(this, "value-changed", { value: newValue });
   }
 
-  private _computeLabelCallback = (schema: HaFormSchema): string =>
-    this.hass.localize(
-      `ui.panel.config.automation.editor.conditions.type.time.${schema.name}`
-    );
+  private _valueChanged(ev: CustomEvent): void {
+    handleChangeEvent(this, ev);
+  }
+
+  private _dayValueChanged(ev: CustomEvent): void {
+    const daySwitch = ev.currentTarget as WeekdayHaSwitch;
+
+    let days: string[];
+
+    if (!this.condition.weekday) {
+      days = Object.keys(DAYS);
+    } else {
+      days = !Array.isArray(this.condition.weekday)
+        ? [this.condition.weekday]
+        : this.condition.weekday;
+    }
+
+    if (daySwitch.checked) {
+      days.push(daySwitch.day);
+    } else {
+      days = days.filter((d) => d !== daySwitch.day);
+    }
+
+    days.sort((a: string, b: string) => DAYS[a] - DAYS[b]);
+
+    fireEvent(this, "value-changed", {
+      value: { ...this.condition, weekday: days },
+    });
+  }
+
+  static get styles(): CSSResultGroup {
+    return css`
+      .weekday-toggle {
+        display: flex;
+        height: 40px;
+      }
+    `;
+  }
 }
 
 declare global {

src/panels/config/automation/condition/types/ha-automation-condition-trigger.ts

@@ -1,16 +1,15 @@
-import "@material/mwc-list/mwc-list-item";
-import "@material/mwc-select";
+import "@polymer/paper-dropdown-menu/paper-dropdown-menu-light";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import { ensureArray } from "../../../../../common/ensure-array";
-import type {
+import {
   AutomationConfig,
   Trigger,
   TriggerCondition,
 } from "../../../../../data/automation";
-import type { HomeAssistant } from "../../../../../types";
+import { HomeAssistant } from "../../../../../types";
 
 @customElement("ha-automation-condition-trigger")
 export class HaTriggerCondition extends LitElement {
@@ -18,7 +17,7 @@ export class HaTriggerCondition extends LitElement {
 
   @property({ attribute: false }) public condition!: TriggerCondition;
 
-  @state() private _triggers: Trigger[] = [];
+  @state() private _triggers?: Trigger | Trigger[];
 
   private _unsub?: UnsubscribeFunc;
 
@@ -44,40 +43,46 @@ export class HaTriggerCondition extends LitElement {
 
   protected render() {
     const { id } = this.condition;
-
-    if (!this._triggers.length) {
+    if (!this._triggers) {
       return this.hass.localize(
         "ui.panel.config.automation.editor.conditions.type.trigger.no_triggers"
       );
     }
-    return html`<mwc-select
+    return html`<paper-dropdown-menu-light
       .label=${this.hass.localize(
         "ui.panel.config.automation.editor.conditions.type.trigger.id"
       )}
-      .value=${id}
-      @selected=${this._triggerPicked}
+      no-animations
     >
-      ${this._triggers.map(
-        (trigger) =>
-          html`
-            <mwc-list-item .value=${trigger.id}> ${trigger.id} </mwc-list-item>
-          `
-      )}
-    </mwc-select>`;
+      <paper-listbox
+        slot="dropdown-content"
+        .selected=${id}
+        attr-for-selected="data-trigger-id"
+        @selected-item-changed=${this._triggerPicked}
+      >
+        ${ensureArray(this._triggers).map((trigger) =>
+          trigger.id
+            ? html`
+                <paper-item data-trigger-id=${trigger.id}>
+                  ${trigger.id}
+                </paper-item>
+              `
+            : ""
+        )}
+      </paper-listbox>
+    </paper-dropdown-menu-light>`;
   }
 
   private _automationUpdated(config?: AutomationConfig) {
-    this._triggers = config?.trigger
-      ? ensureArray(config.trigger).filter((t) => t.id)
-      : [];
+    this._triggers = config?.trigger;
   }
 
-  private _triggerPicked(ev) {
+  private _triggerPicked(ev: CustomEvent) {
     ev.stopPropagation();
-    if (!ev.target.value) {
+    if (!ev.detail.value) {
       return;
     }
-    const newTrigger = ev.target.value;
+    const newTrigger = ev.detail.value.dataset.triggerId;
     if (this.condition.id === newTrigger) {
       return;
     }

src/panels/config/automation/condition/types/ha-automation-condition-zone.ts

@@ -1,4 +1,4 @@
-import { css, html, LitElement } from "lit";
+import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import { computeStateDomain } from "../../../../../common/entity/compute_state_domain";
@@ -71,13 +71,6 @@ export class HaZoneCondition extends LitElement {
       value: { ...this.condition, zone: ev.detail.value },
     });
   }
-
-  static styles = css`
-    ha-entity-picker {
-      display: block;
-      margin-bottom: 24px;
-    }
-  `;
 }
 
 declare global {

src/panels/config/automation/manual-automation-editor.ts

@@ -85,7 +85,6 @@ export class HaManualAutomationEditor extends LitElement {
               )}
               .value=${this.config.mode ? MODES.indexOf(this.config.mode) : 0}
               @selected=${this._modeChanged}
-              fixedMenuPosition
             >
               ${MODES.map(
                 (mode) => html`
@@ -318,9 +317,6 @@ export class HaManualAutomationEditor extends LitElement {
         ha-entity-toggle {
           margin-right: 8px;
         }
-        mwc-select {
-          margin-top: 8px;
-        }
       `,
     ];
   }

src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts

@@ -1,4 +1,4 @@
-import { css, html, LitElement } from "lit";
+import { html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../../common/dom/fire_event";
@@ -69,7 +69,6 @@ export class HaDeviceTrigger extends LitElement {
       ${this._capabilities?.extra_fields
         ? html`
             <ha-form
-              .hass=${this.hass}
               .data=${this._extraFieldsData(this.trigger, this._capabilities)}
               .schema=${this._capabilities.extra_fields}
               .computeLabel=${this._extraFieldsComputeLabelCallback(
@@ -151,13 +150,6 @@ export class HaDeviceTrigger extends LitElement {
         `ui.panel.config.automation.editor.triggers.type.device.extra_fields.${schema.name}`
       ) || schema.name;
   }
-
-  static styles = css`
-    ha-device-picker {
-      display: block;
-      margin-bottom: 24px;
-    }
-  `;
 }
 
 declare global {

src/panels/config/automation/trigger/types/ha-automation-trigger-numeric_state.ts

@@ -1,13 +1,15 @@
-import "../../../../../components/ha-form/ha-form";
+import "@polymer/paper-input/paper-input";
+import "@polymer/paper-input/paper-textarea";
 import { html, LitElement, PropertyValues } from "lit";
 import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import type { HaFormSchema } from "../../../../../components/ha-form/types";
 import { createDurationData } from "../../../../../common/datetime/create_duration_data";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import { hasTemplate } from "../../../../../common/string/has-template";
-import type { NumericStateTrigger } from "../../../../../data/automation";
-import type { HomeAssistant } from "../../../../../types";
+import "../../../../../components/entity/ha-entity-picker";
+import { NumericStateTrigger } from "../../../../../data/automation";
+import { HomeAssistant } from "../../../../../types";
+import { handleChangeEvent } from "../ha-automation-trigger-row";
+import "../../../../../components/ha-duration-input";
 
 @customElement("ha-automation-trigger-numeric_state")
 export class HaNumericStateTrigger extends LitElement {
@@ -15,21 +17,6 @@ export class HaNumericStateTrigger extends LitElement {
 
   @property() public trigger!: NumericStateTrigger;
 
-  private _schema = memoizeOne((entityId): HaFormSchema[] => [
-    { name: "entity_id", required: true, selector: { entity: {} } },
-    {
-      name: "attribute",
-      selector: { attribute: { entity_id: entityId } },
-    },
-    { name: "above", selector: { text: {} } },
-    { name: "below", selector: { text: {} } },
-    {
-      name: "value_template",
-      selector: { text: { multiline: true } },
-    },
-    { name: "for", selector: { duration: {} } },
-  ]);
-
   public willUpdate(changedProperties: PropertyValues) {
     if (!changedProperties.has("trigger")) {
       return;
@@ -51,46 +38,67 @@ export class HaNumericStateTrigger extends LitElement {
   }
 
   public render() {
+    const { value_template, entity_id, attribute, below, above } = this.trigger;
     const trgFor = createDurationData(this.trigger.for);
 
-    const data = { ...this.trigger, for: trgFor };
-    const schema = this._schema(this.trigger.entity_id);
-
     return html`
-      <ha-form
-        .hass=${this.hass}
-        .data=${data}
-        .schema=${schema}
+      <ha-entity-picker
+        .value=${entity_id}
         @value-changed=${this._valueChanged}
-        .computeLabel=${this._computeLabelCallback}
-      ></ha-form>
+        .name=${"entity_id"}
+        .hass=${this.hass}
+        allow-custom-entity
+      ></ha-entity-picker>
+      <ha-entity-attribute-picker
+        .hass=${this.hass}
+        .entityId=${entity_id}
+        .value=${attribute}
+        .name=${"attribute"}
+        .label=${this.hass.localize(
+          "ui.panel.config.automation.editor.triggers.type.state.attribute"
+        )}
+        @value-changed=${this._valueChanged}
+        allow-custom-value
+      ></ha-entity-attribute-picker>
+      <paper-input
+        .label=${this.hass.localize(
+          "ui.panel.config.automation.editor.triggers.type.numeric_state.above"
+        )}
+        name="above"
+        .value=${above}
+        @value-changed=${this._valueChanged}
+      ></paper-input>
+      <paper-input
+        .label=${this.hass.localize(
+          "ui.panel.config.automation.editor.triggers.type.numeric_state.below"
+        )}
+        name="below"
+        .value=${below}
+        @value-changed=${this._valueChanged}
+      ></paper-input>
+      <paper-textarea
+        .label=${this.hass.localize(
+          "ui.panel.config.automation.editor.triggers.type.numeric_state.value_template"
+        )}
+        name="value_template"
+        .value=${value_template}
+        @value-changed=${this._valueChanged}
+        dir="ltr"
+      ></paper-textarea>
+      <ha-duration-input
+        .label=${this.hass.localize(
+          "ui.panel.config.automation.editor.triggers.type.state.for"
+        )}
+        .name=${"for"}
+        .data=${trgFor}
+        @value-changed=${this._valueChanged}
+      ></ha-duration-input>
     `;
   }
 
   private _valueChanged(ev: CustomEvent): void {
-    ev.stopPropagation();
-    const newTrigger = ev.detail.value;
-    fireEvent(this, "value-changed", { value: newTrigger });
+    handleChangeEvent(this, ev);
   }
-
-  private _computeLabelCallback = (schema: HaFormSchema): string => {
-    switch (schema.name) {
-      case "entity_id":
-        return this.hass.localize("ui.components.entity.entity-picker.entity");
-      case "attribute":
-        return this.hass.localize(
-          "ui.components.entity.entity-attribute-picker.attribute"
-        );
-      case "for":
-        return this.hass.localize(
-          `ui.panel.config.automation.editor.triggers.type.state.for`
-        );
-      default:
-        return this.hass.localize(
-          `ui.panel.config.automation.editor.triggers.type.numeric_state.${schema.name}`
-        );
-    }
-  };
 }
 
 declare global {

src/panels/config/automation/trigger/types/ha-automation-trigger-state.ts

@@ -32,6 +32,14 @@ const stateTriggerStruct = assign(
   })
 );
 
+const SCHEMA = [
+  { name: "entity_id", selector: { entity: {} } },
+  { name: "attribute", selector: { attribute: { entity_id: "" } } },
+  { name: "from", required: false, selector: { text: {} } },
+  { name: "to", required: false, selector: { text: {} } },
+  { name: "for", required: false, selector: { duration: {} } },
+];
+
 @customElement("ha-automation-trigger-state")
 export class HaStateTrigger extends LitElement implements TriggerElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -42,16 +50,14 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
     return { entity_id: "" };
   }
 
-  private _schema = memoizeOne((entityId) => [
-    { name: "entity_id", required: true, selector: { entity: {} } },
-    {
+  private _schema = memoizeOne((entityId) => {
+    const schema = [...SCHEMA];
+    schema[1] = {
       name: "attribute",
       selector: { attribute: { entity_id: entityId } },
-    },
-    { name: "from", selector: { text: {} } },
-    { name: "to", selector: { text: {} } },
-    { name: "for", selector: { duration: {} } },
-  ]);
+    };
+    return schema;
+  });
 
   public shouldUpdate(changedProperties: PropertyValues) {
     if (!changedProperties.has("trigger")) {
@@ -112,12 +118,13 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
     fireEvent(this, "value-changed", { value: newTrigger });
   }
 
-  private _computeLabelCallback = (schema: HaFormSchema): string =>
-    this.hass.localize(
+  private _computeLabelCallback(schema: HaFormSchema): string {
+    return this.hass.localize(
       schema.name === "entity_id"
         ? "ui.components.entity.entity-picker.entity"
         : `ui.panel.config.automation.editor.triggers.type.state.${schema.name}`
     );
+  }
 }
 
 declare global {

src/panels/config/automation/trigger/types/ha-automation-trigger-sun.ts

@@ -45,10 +45,9 @@ export class HaSunTrigger extends LitElement implements TriggerElement {
   }
 
   protected render() {
-    const schema = this._schema(this.hass.localize);
     return html`
       <ha-form
-        .schema=${schema}
+        .schema=${this._schema(this.hass.localize)}
         .data=${this.trigger}
         .hass=${this.hass}
         .computeLabel=${this._computeLabelCallback}

src/panels/config/automation/trigger/types/ha-automation-trigger-tag.ts

@@ -1,13 +1,13 @@
-import "@material/mwc-list/mwc-list-item";
-import "@material/mwc-select";
+import "@polymer/paper-input/paper-input";
 import { html, LitElement, PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../../common/dom/fire_event";
-import { caseInsensitiveStringCompare } from "../../../../../common/string/compare";
 import { TagTrigger } from "../../../../../data/automation";
 import { fetchTags, Tag } from "../../../../../data/tag";
 import { HomeAssistant } from "../../../../../types";
 import { TriggerElement } from "../ha-automation-trigger-row";
+import "../../../../../components/ha-paper-dropdown-menu";
+import { caseInsensitiveStringCompare } from "../../../../../common/string/compare";
 
 @customElement("ha-automation-trigger-tag")
 export class HaTagTrigger extends LitElement implements TriggerElement {
@@ -29,22 +29,27 @@ export class HaTagTrigger extends LitElement implements TriggerElement {
   protected render() {
     const { tag_id } = this.trigger;
     return html`
-      <mwc-select
+      <ha-paper-dropdown-menu
         .label=${this.hass.localize(
           "ui.panel.config.automation.editor.triggers.type.tag.label"
         )}
-        .disabled=${this._tags.length === 0}
-        .value=${tag_id}
-        @selected=${this._tagChanged}
+        ?disabled=${this._tags.length === 0}
       >
-        ${this._tags.map(
-          (tag) => html`
-            <mwc-list-item .value=${tag.id}>
-              ${tag.name || tag.id}
-            </mwc-list-item>
-          `
-        )}
-      </mwc-select>
+        <paper-listbox
+          slot="dropdown-content"
+          .selected=${tag_id}
+          attr-for-selected="tag_id"
+          @iron-select=${this._tagChanged}
+        >
+          ${this._tags.map(
+            (tag) => html`
+              <paper-item tag_id=${tag.id} .tag=${tag}>
+                ${tag.name || tag.id}
+              </paper-item>
+            `
+          )}
+        </paper-listbox>
+      </ha-paper-dropdown-menu>
     `;
   }
 
@@ -59,14 +64,8 @@ export class HaTagTrigger extends LitElement implements TriggerElement {
     fireEvent(this, "value-changed", {
       value: {
         ...this.trigger,
-        tag_id: ev.target.value,
+        tag_id: ev.detail.item.tag.id,
       },
     });
   }
 }
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-automation-trigger-tag": HaTagTrigger;
-  }
-}

src/panels/config/automation/trigger/types/ha-automation-trigger-template.ts

@@ -1,15 +1,15 @@
-import "../../../../../components/ha-textarea";
-import { css, html, LitElement } from "lit";
+import "@polymer/paper-input/paper-textarea";
+import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
-import type { TemplateTrigger } from "../../../../../data/automation";
-import type { HomeAssistant } from "../../../../../types";
+import { TemplateTrigger } from "../../../../../data/automation";
+import { HomeAssistant } from "../../../../../types";
 import { handleChangeEvent } from "../ha-automation-trigger-row";
 
 @customElement("ha-automation-trigger-template")
 export class HaTemplateTrigger extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public trigger!: TemplateTrigger;
+  @property() public trigger!: TemplateTrigger;
 
   public static get defaultConfig() {
     return { value_template: "" };
@@ -18,32 +18,19 @@ export class HaTemplateTrigger extends LitElement {
   protected render() {
     const { value_template } = this.trigger;
     return html`
-      <ha-textarea
-        name="value_template"
+      <paper-textarea
         .label=${this.hass.localize(
           "ui.panel.config.automation.editor.triggers.type.template.value_template"
         )}
+        name="value_template"
         .value=${value_template}
-        @input=${this._valueChanged}
+        @value-changed=${this._valueChanged}
         dir="ltr"
-        autogrow
-      ></ha-textarea>
+      ></paper-textarea>
     `;
   }
 
   private _valueChanged(ev: CustomEvent): void {
     handleChangeEvent(this, ev);
   }
-
-  static styles = css`
-    ha-textarea {
-      display: block;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-automation-trigger-template": HaTemplateTrigger;
-  }
 }

src/panels/config/automation/trigger/types/ha-automation-trigger-time.ts

@@ -1,19 +1,23 @@
-import memoizeOne from "memoize-one";
 import { html, LitElement, PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import type { TimeTrigger } from "../../../../../data/automation";
-import type { HomeAssistant } from "../../../../../types";
-import type { TriggerElement } from "../ha-automation-trigger-row";
-import type { LocalizeFunc } from "../../../../../common/translations/localize";
-import type { HaFormSchema } from "../../../../../components/ha-form/types";
+import "../../../../../components/entity/ha-entity-picker";
+import "../../../../../components/ha-formfield";
+import "../../../../../components/ha-radio";
+import { TimeTrigger } from "../../../../../data/automation";
+import { HomeAssistant } from "../../../../../types";
+import {
+  handleChangeEvent,
+  TriggerElement,
+} from "../ha-automation-trigger-row";
+import "../../../../../components/ha-time-input";
 import { fireEvent } from "../../../../../common/dom/fire_event";
-import "../../../../../components/ha-form/ha-form";
 
+const includeDomains = ["input_datetime"];
 @customElement("ha-automation-trigger-time")
 export class HaTimeTrigger extends LitElement implements TriggerElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public trigger!: TimeTrigger;
+  @property() public trigger!: TimeTrigger;
 
   @state() private _inputMode?: boolean;
 
@@ -21,37 +25,6 @@ export class HaTimeTrigger extends LitElement implements TriggerElement {
     return { at: "" };
   }
 
-  private _schema = memoizeOne(
-    (localize: LocalizeFunc, inputMode?: boolean): HaFormSchema[] => {
-      const modeSchema = inputMode
-        ? { name: "at", selector: { entity: { domain: "input_datetime" } } }
-        : { name: "at", selector: { time: {} } };
-
-      return [
-        {
-          name: "mode",
-          type: "select",
-          required: true,
-          options: [
-            [
-              "value",
-              localize(
-                "ui.panel.config.automation.editor.triggers.type.time.type_value"
-              ),
-            ],
-            [
-              "input",
-              localize(
-                "ui.panel.config.automation.editor.triggers.type.time.type_input"
-              ),
-            ],
-          ],
-        },
-        modeSchema,
-      ];
-    }
-  );
-
   public willUpdate(changedProperties: PropertyValues) {
     if (!changedProperties.has("trigger")) {
       return;
@@ -77,43 +50,67 @@ export class HaTimeTrigger extends LitElement implements TriggerElement {
       this._inputMode ??
       (at?.startsWith("input_datetime.") || at?.startsWith("sensor."));
 
-    const schema: HaFormSchema[] = this._schema(this.hass.localize, inputMode);
+    return html`<ha-formfield
+        .label=${this.hass!.localize(
+          "ui.panel.config.automation.editor.triggers.type.time.type_value"
+        )}
+      >
+        <ha-radio
+          @change=${this._handleModeChanged}
+          name="mode"
+          value="value"
+          ?checked=${!inputMode}
+        ></ha-radio>
+      </ha-formfield>
+      <ha-formfield
+        .label=${this.hass!.localize(
+          "ui.panel.config.automation.editor.triggers.type.time.type_input"
+        )}
+      >
+        <ha-radio
+          @change=${this._handleModeChanged}
+          name="mode"
+          value="input"
+          ?checked=${inputMode}
+        ></ha-radio>
+      </ha-formfield>
 
-    const data = {
-      mode: "value",
-      ...this.trigger,
-    };
+      ${inputMode
+        ? html`<ha-entity-picker
+            .label=${this.hass.localize(
+              "ui.panel.config.automation.editor.triggers.type.time.at"
+            )}
+            .includeDomains=${includeDomains}
+            .name=${"at"}
+            .value=${at?.startsWith("input_datetime.") ||
+            at?.startsWith("sensor.")
+              ? at
+              : ""}
+            @value-changed=${this._valueChanged}
+            .hass=${this.hass}
+            allow-custom-entity
+          ></ha-entity-picker>`
+        : html`<ha-time-input
+            .label=${this.hass.localize(
+              "ui.panel.config.automation.editor.triggers.type.time.at"
+            )}
+            .name=${"at"}
+            .value=${at?.startsWith("input_datetime.") ||
+            at?.startsWith("sensor.")
+              ? ""
+              : at}
+            .locale=${this.hass.locale}
+            @value-changed=${this._valueChanged}
+          ></ha-time-input>`} `;
+  }
 
-    return html`
-      <ha-form
-        .hass=${this.hass}
-        .data=${data}
-        .schema=${schema}
-        @value-changed=${this._valueChanged}
-        .computeLabel=${this._computeLabelCallback}
-      ></ha-form>
-    `;
+  private _handleModeChanged(ev: Event) {
+    this._inputMode = (ev.target as any).value === "input";
   }
 
   private _valueChanged(ev: CustomEvent): void {
-    ev.stopPropagation();
-    const newValue = ev.detail.value;
-
-    this._inputMode = newValue.mode.value === "input";
-
-    Object.keys(newValue).forEach((key) =>
-      newValue[key] === undefined || newValue[key] === ""
-        ? delete newValue[key]
-        : {}
-    );
-
-    fireEvent(this, "value-changed", { value: newValue });
+    handleChangeEvent(this, ev);
   }
-
-  private _computeLabelCallback = (schema: HaFormSchema): string =>
-    this.hass.localize(
-      `ui.panel.config.automation.editor.triggers.type.time.${schema.name}`
-    );
 }
 
 declare global {