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",

.github/workflows/release.yaml

@@ -10,18 +10,10 @@ env:
   NODE_VERSION: 14
   NODE_OPTIONS: --max_old_space_size=6144
 
-# Set default workflow permissions
-# All scopes not mentioned here are set to no access
-# https://docs.github.com/en/actions/security-guides/automatic-token-authentication#permissions-for-the-github_token
-permissions:
-  actions: none
-
 jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
-    permissions:
-      contents: write  # Required to upload release assets
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v2
@@ -55,13 +47,6 @@ jobs:
 
           script/release
 
-      - name: Upload release assets
-        uses: softprops/action-gh-release@v0.1.14
-        with:
-          files: |
-            dist/*.whl
-            dist/*.tar.gz
-
   wheels-init:
     name: Init wheels build
     needs: release

.yarnrc.yml

@@ -6,4 +6,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-3.2.0.cjs
+yarnPath: .yarn/releases/yarn-3.0.2.cjs

README.md

@@ -2,7 +2,7 @@
 
 This is the repository for the official [Home Assistant](https://home-assistant.io) frontend.
 
-[![Screenshot of the frontend](https://raw.githubusercontent.com/home-assistant/frontend/master/docs/screenshot.png)](https://demo.home-assistant.io/)
+[![Screenshot of the frontend](https://raw.githubusercontent.com/home-assistant/home-assistant-polymer/master/docs/screenshot.png)](https://demo.home-assistant.io/)
 
 - [View demo of Home Assistant](https://demo.home-assistant.io/)
 - [More information about Home Assistant](https://home-assistant.io)

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 }) => ({

build-scripts/gulp/gallery.js

@@ -3,7 +3,7 @@
 const gulp = require("gulp");
 const fs = require("fs");
 const path = require("path");
-const { marked } = require("marked");
+const marked = require("marked");
 const glob = require("glob");
 const yaml = require("js-yaml");
 

build-scripts/gulp/translations.js

@@ -7,7 +7,7 @@ const source = require("vinyl-source-stream");
 const vinylBuffer = require("vinyl-buffer");
 const gulp = require("gulp");
 const fs = require("fs");
-const flatmap = require("gulp-flatmap");
+const foreach = require("gulp-foreach");
 const merge = require("gulp-merge-json");
 const rename = require("gulp-rename");
 const transform = require("gulp-json-transform");
@@ -183,7 +183,7 @@ gulp.task("build-merged-translations", () =>
     })
     .pipe(transform((data, file) => lokaliseTransform(data, data, file)))
     .pipe(
-      flatmap((stream, file) => {
+      foreach((stream, file) => {
         // For each language generate a merged json file. It begins with the master
         // translation as a failsafe for untranslated strings, and merges all parent
         // tags into one file for each specific subtag

cast/src/receiver/layout/hc-lovelace.ts

@@ -1,5 +1,5 @@
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, query } from "lit/decorators";
+import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
 import { LovelaceConfig } from "../../../../src/data/lovelace";
 import { Lovelace } from "../../../../src/panels/lovelace/types";
@@ -20,8 +20,6 @@ class HcLovelace extends LitElement {
 
   @property() public urlPath: string | null = null;
 
-  @query("hui-view") private _huiView?: HTMLElement;
-
   protected render(): TemplateResult {
     const index = this._viewIndex;
     if (index === undefined) {
@@ -80,12 +78,12 @@ class HcLovelace extends LitElement {
           this.lovelaceConfig.background;
 
         if (configBackground) {
-          this._huiView!.style.setProperty(
+          (this.shadowRoot!.querySelector(
+            "hui-view"
+          ) as HTMLElement)!.style.setProperty(
             "--lovelace-background",
             configBackground
           );
-        } else {
-          this._huiView!.style.removeProperty("--lovelace-background");
         }
       }
     }
@@ -118,9 +116,6 @@ class HcLovelace extends LitElement {
       :host > * {
         flex: 1;
       }
-      hui-view {
-        background: var(--lovelace-background, var(--primary-background-color));
-      }
     `;
   }
 }

cast/src/receiver/second-load.ts

@@ -1,3 +1,4 @@
+import "web-animations-js/web-animations-next-lite.min";
 import "../../../src/resources/ha-style";
 import "../../../src/resources/roboto";
 import "./layout/hc-lovelace";

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);

demo/src/stubs/hassio_supervisor.ts

@@ -31,7 +31,7 @@ export const mockHassioSupervisor = (hass: MockHomeAssistant) => {
             version_latest: "3.6.2",
             update_available: false,
             repository: "a0d7b954",
-            icon: false,
+            icon: true,
             logo: true,
           },
           {

gallery/script/netlify_build_gallery

@@ -23,7 +23,7 @@ if [[ "${PULL_REQUEST}" == "true" ]]; then
     createStatus "pending" "Building design preview" "https://app.netlify.com/sites/home-assistant-gallery/deploys/$BUILD_ID"
     gulp build-gallery
     if [ $? -eq 0 ]; then
-      createStatus "success" "Build complete" "$DEPLOY_PRIME_URL"
+      createStatus "success" "Build complete" "$DEPLOY_URL"
     else
       createStatus "error" "Build failed" "https://app.netlify.com/sites/home-assistant-gallery/deploys/$BUILD_ID"
     fi

gallery/sidebar.js

@@ -20,6 +20,7 @@ module.exports = [
       "editor-trigger",
       "editor-condition",
       "editor-action",
+      "selectors",
       "trace",
       "trace-timeline",
     ],
@@ -36,17 +37,12 @@ module.exports = [
     category: "misc",
     header: "Miscelaneous",
   },
-  {
-    category: "brand",
-    header: "Brand",
-  },
   {
     category: "user-test",
-    header: "Users",
-    pages: ["user-types", "configuration-menu"],
+    header: "User Tests",
   },
   {
     category: "design.home-assistant.io",
-    header: "About",
+    header: "Design Documentation",
   },
 ];

gallery/src/components/demo-black-white-row.ts

@@ -53,19 +53,13 @@ class DemoBlackWhiteRow extends LitElement {
 
   firstUpdated(changedProps) {
     super.firstUpdated(changedProps);
-    applyThemesOnElement(
-      this.shadowRoot!.querySelector(".dark"),
-      {
-        default_theme: "default",
-        default_dark_theme: "default",
-        themes: {},
-        darkMode: true,
-        theme: "default",
-      },
-      undefined,
-      undefined,
-      true
-    );
+    applyThemesOnElement(this.shadowRoot!.querySelector(".dark"), {
+      default_theme: "default",
+      default_dark_theme: "default",
+      themes: {},
+      darkMode: true,
+      theme: "default",
+    });
   }
 
   handleSubmit(ev) {

gallery/src/components/demo-cards.ts

@@ -78,9 +78,6 @@ class DemoCards extends LitElement {
     ha-formfield {
       margin-right: 16px;
     }
-    #container {
-      background-color: var(--primary-background-color);
-    }
   `;
 }
 

gallery/src/components/page-description.ts

@@ -12,14 +12,7 @@ class PageDescription extends HaMarkdown {
     if (!PAGES[this.page].description) {
       return html``;
     }
-
     return html`
-      <div class="heading">
-        <div class="title">
-          ${PAGES[this.page].metadata.title || this.page.split("/")[1]}
-        </div>
-        <div class="subtitle">${PAGES[this.page].metadata.subtitle}</div>
-      </div>
       ${until(
         PAGES[this.page]
           .description()
@@ -32,22 +25,9 @@ class PageDescription extends HaMarkdown {
   static styles = [
     HaMarkdown.styles,
     css`
-      .heading {
-        padding: 16px;
-        border-bottom: 1px solid var(--secondary-background-color);
-      }
-      .title {
-        font-size: 42px;
-        line-height: 56px;
-        padding-bottom: 8px;
-      }
-      .subtitle {
-        font-size: 18px;
-        line-height: 24px;
-      }
       .root {
         max-width: 800px;
-        margin: 16px auto;
+        margin: 0 auto;
       }
       .root > *:first-child {
         margin-top: 0;

gallery/src/data/text.ts

@@ -1,11 +0,0 @@
-export const LONG_TEXT = `
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc laoreet velit ut elit volutpat, eget ultrices odio lacinia. In imperdiet malesuada est, nec sagittis metus ultricies quis. Sed nisl ex, convallis porttitor ante quis, hendrerit tristique justo. Mauris pharetra venenatis augue, eu maximus sem cursus in. Quisque sed consequat risus. Suspendisse facilisis ligula a odio consectetur condimentum. Curabitur vehicula elit nec augue mollis, et volutpat massa dictum.
-
-Nam pellentesque auctor rutrum. Suspendisse elit est, sodales vel diam nec, porttitor faucibus massa. Ut pretium ac orci eu pharetra. Praesent in nibh at magna viverra rutrum eu vitae tortor. Etiam eget sem ex. Fusce tristique odio nec lacus mattis, vitae tempor nunc malesuada. Maecenas faucibus magna vel libero maximus egestas. Vestibulum luctus semper velit, in lobortis risus tempus non. Curabitur bibendum ornare commodo. Quisque commodo neque sit amet tincidunt lacinia. Proin elementum ante velit, eu congue nulla semper quis. Pellentesque consequat vel nunc at scelerisque. Mauris sit amet venenatis diam, blandit viverra leo. Integer commodo laoreet orci.
-
-Curabitur ipsum tortor, sodales ut augue sed, commodo porttitor libero. Pellentesque molestie vitae mi consectetur tempor. In sed lectus consequat, lobortis neque non, semper ipsum. Etiam eget ex et nibh sagittis pulvinar lacinia ac mauris. Aenean ligula eros, viverra ac nibh at, venenatis semper quam. Sed interdum ligula sit amet massa tincidunt tincidunt. Suspendisse potenti. Aliquam egestas facilisis est, sed faucibus erat scelerisque id. Duis dolor quam, viverra vitae orci euismod, laoreet pellentesque justo. Nunc malesuada non erat at ullamcorper. Mauris eget posuere odio. Vestibulum turpis nunc, pharetra eget ante in, feugiat mollis justo. Proin porttitor, diam nec vulputate pretium, tellus arcu rhoncus turpis, a blandit nisi nulla quis arcu. Nunc ac ullamcorper ligula, nec facilisis leo.
-
-In vitae eros sollicitudin, iaculis ex eget, egestas orci. Etiam sed pretium lorem. Nam nisi enim, consectetur sit amet semper ac, semper pharetra diam. In pulvinar neque sapien, ac ullamcorper est lacinia a. Etiam tincidunt velit sed diam malesuada, eu ornare ex consectetur. Phasellus in imperdiet tellus. Sed bibendum, dui sit amet fringilla aliquet, enim odio sollicitudin lorem, vel semper turpis mauris vel mauris. Aenean congue magna ac massa cursus, in dictum orci commodo. Pellentesque mollis velit in sollicitudin tincidunt. Vestibulum et efficitur nulla.
-
-Quisque posuere, velit sed porttitor dapibus, neque augue fringilla felis, eu luctus nisi nisl nec ipsum. Curabitur pellentesque ac lectus eget ultricies. Vestibulum est dolor, lacinia pharetra vulputate a, facilisis a magna. Nam vitae arcu nibh. Praesent finibus blandit ante, ac gravida ex mollis eget. Donec quam est, pulvinar vitae neque ut, bibendum aliquam erat. Nullam mollis arcu at sem tincidunt, in tristique lectus facilisis. Aenean ut lacus vel nisl finibus iaculis non a turpis. Integer eget ipsum ante. Donec nunc neque, vestibulum ac magna ac, posuere scelerisque dui. Pellentesque massa nibh, rhoncus id dolor quis, placerat posuere turpis. Donec aliquet augue nisi, eu finibus dui auctor et. Vestibulum eu varius lorem. Quisque lectus ante, malesuada pretium risus eget, interdum mattis enim.
-`;

gallery/src/ha-gallery.ts

@@ -5,7 +5,6 @@ import { html, css, LitElement, PropertyValues } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import "../../src/components/ha-icon-button";
 import "../../src/managers/notification-manager";
-import "../../src/components/ha-expansion-panel";
 import { haStyle } from "../../src/resources/styles";
 import { PAGES, SIDEBAR } from "../build/import-pages";
 import { dynamicElement } from "../../src/common/dom/dynamic-element-directive";
@@ -45,10 +44,6 @@ class HaGallery extends LitElement {
       for (const page of group.pages!) {
         const key = `${group.category}/${page}`;
         const active = this._page === key;
-        if (!(key in PAGES)) {
-          console.error("Undefined page referenced in sidebar.js:", key);
-          continue;
-        }
         const title = PAGES[key].metadata.title || page;
         links.push(html`
           <a ?active=${active} href=${`#${group.category}/${page}`}>${title}</a>
@@ -58,9 +53,10 @@ class HaGallery extends LitElement {
       sidebar.push(
         group.header
           ? html`
-              <ha-expansion-panel .header=${group.header}>
+              <details>
+                <summary class="section">${group.header}</summary>
                 ${links}
-              </ha-expansion-panel>
+              </details>
             `
           : links
       );
@@ -96,34 +92,27 @@ class HaGallery extends LitElement {
             ${dynamicElement(`demo-${this._page.replace("/", "-")}`)}
           </div>
           <div class="page-footer">
-            <div class="header">Help us to improve our documentation</div>
-            <div class="secondary">
-              Suggest an edit to this page, or provide/view feedback for this
-              page.
-            </div>
-            <div>
-              ${PAGES[this._page].description ||
-              Object.keys(PAGES[this._page].metadata).length > 0
-                ? html`
-                    <a
-                      href=${`${GITHUB_DEMO_URL}${this._page}.markdown`}
-                      target="_blank"
-                    >
-                      Edit text
-                    </a>
-                  `
-                : ""}
-              ${PAGES[this._page].demo
-                ? html`
-                    <a
-                      href=${`${GITHUB_DEMO_URL}${this._page}.ts`}
-                      target="_blank"
-                    >
-                      Edit demo
-                    </a>
-                  `
-                : ""}
-            </div>
+            ${PAGES[this._page].description ||
+            Object.keys(PAGES[this._page].metadata).length > 0
+              ? html`
+                  <a
+                    href=${`${GITHUB_DEMO_URL}${this._page}.markdown`}
+                    target="_blank"
+                  >
+                    Edit text
+                  </a>
+                `
+              : ""}
+            ${PAGES[this._page].demo
+              ? html`
+                  <a
+                    href=${`${GITHUB_DEMO_URL}${this._page}.ts`}
+                    target="_blank"
+                  >
+                    Edit demo
+                  </a>
+                `
+              : ""}
           </div>
         </div>
       </mwc-drawer>
@@ -197,16 +186,27 @@ class HaGallery extends LitElement {
         padding: 4px;
       }
 
+      .sidebar details {
+        margin-top: 1em;
+        margin-left: 1em;
+      }
+
+      .sidebar summary {
+        cursor: pointer;
+        font-weight: bold;
+        margin-bottom: 8px;
+      }
+
       .sidebar a {
         color: var(--primary-text-color);
         display: block;
-        padding: 12px;
+        padding: 4px 12px;
         text-decoration: none;
         position: relative;
       }
 
       .sidebar a[active]::before {
-        border-radius: 12px;
+        border-radius: 4px;
         position: absolute;
         top: 0;
         right: 2px;
@@ -237,32 +237,14 @@ class HaGallery extends LitElement {
 
       .page-footer {
         text-align: center;
-        margin: 16px;
-        padding: 16px;
-        border-radius: 12px;
-        background-color: var(--primary-background-color);
-      }
-
-      .page-footer div {
-        margin-top: 4px;
-      }
-
-      .page-footer .header {
-        font-size: 16px;
-        font-weight: 500;
-        line-height: 28px;
-        text-align: center;
-      }
-
-      .page-footer .secondary {
-        line-height: 23px;
-        text-align: center;
+        margin: 16px 0;
+        padding-top: 16px;
+        border-top: 1px solid rgba(0, 0, 0, 0.12);
       }
 
       .page-footer a {
         display: inline-block;
         margin: 0 8px;
-        text-decoration: none;
       }
     `,
   ];

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/brand/logo.markdown

@@ -1,34 +0,0 @@
----
-title: "Logo"
----
-
-![Using our logo](/images/using-our-logo.png)
-
-# Using our logo
-
-As a community, we are proud of our logo. Follow these guidelines to ensure it always looks its best. Our logo follows Google's material design spec and uses the blue interface color.
-
-[Download Logo](https://github.com/home-assistant/assets/tree/master/logo)
-
-![Logo](/images/logo.png)
-
-
-## Using the icon
-
-Our icon is a shorter and most used version of our logo. The icon can exist without the wordmark, the wordmark should never exist without the icon.
-
-![Logo variants](/images/logo-variants.png)
-
-## Using the right variant
-
-The pretty blue logo with a background shadow, pictured top left, is our primary logo. It should only be used with black, white, and non-duotone photography.
-
-When needed you can use our logo without a shadow, as seen as the second variant. 
-
-The outlined logo should only be used on packaging.
-
-## Exclusion zone
-
-The logo needs some personal space. It's exclusion zone is equal to a quarter the height of the icon.
-
-![Clearspace](/images/clearspace.png)

gallery/src/pages/brand/our-story.markdown

@@ -1,41 +0,0 @@
----
-title: "Our story"
----
-
-## Open source home automation that puts local control and privacy first
-
-Home Assistant is a free and open-source software for home automation that is designed to be the central control system for smart home devices with a focus on local control and privacy. It can be accessed via a web-based user interface, via apps for Android and iOS, or using voice commands via a supported virtual assistant like Google Assistant and Amazon Alexa.
-
-IoT devices and services are supported by modular support for controlling proprietary ecosystems if they provide public access via an Open API for third-party integrations and protocols like Bluetooth, MQTT, Zigbee, and Z-Wave, After the Home Assistant software application is installed as a computer appliance it will act as a central control system for home automation. Information from all entities it sees can be used and controlled from within scripts trigger automations using scheduling and "blueprint" subroutines, e.g. for controlling lighting, climate, entertainment systems, and appliances.
-
-# Open Home
-
-The Open Home is our vision for the smart home. It defines the values that we put at the heart of every decision we make at Home Assistant. It’s woven into our architecture, licensing, community, and everything else.
-
-The Open Home is about privacy, choice, and durability.
-
-## Privacy
-
-Your home should be your safe space. A place where you can be your true self without having to bother about what the world thinks of you. A place where you don’t need to act differently to avoid an algorithm categorizing your behavior. Privacy for the Open Home means that devices need to work locally. No one else needs to know if you turn on a light bulb or change the thermostat.
-
-It is okay for a product to offer a cloud connection, but it should be extra and opt-in.
-
-## Choice
-
-Devices in your home gather data about themselves and their surroundings. Your data. Vendors shouldn’t be able to limit your access to your data or limit the interoperability of your devices with the rest of your smart home.
-
-Choice for the Open Home means that devices need to make the gathered data available through local APIs. This avoids vendor lock-in and allows users to create their own smart home with devices from different manufacturers.
-
-## Durability
-
-If there is one thing that technology firms are very good at, it is launching new products. However, maintaining the products and making sure they keep working is an afterthought for most. The result is that vendors can decide to no longer support your device, crippling its features or even preventing it from working at all. As we install more and more devices in our home, durability is becoming more and more important. We shouldn’t have to buy everything new every couple of years because the manufacturer decided to move on.
-
-Durability for the Open Home means that devices are designed and built to keep working. Not just this year, but for the next decade.
-
-# Our history
-
-The project was started as a Python application by Paulus Schoutsen in September 2013 and first published publicly on GitHub in November 2013. In July 2017, a managed operating system called Hass.io was initially introduced to make it easier use to use Home Assistant on single-board computers like the Raspberry Pi series. Its bundled "supervisor" management system allowed users to manage, backup, and update the local installation and introduced the option to extend the functionality of the software with add-ons.
-
-An optional subscription service was introduced in December 2017 for $5/month to solve the complexities associated with secured remote access, as well as linking to Amazon Alexa and Google Assistant. Nabu Casa, Inc. was formed in September 2018 to take over the subscription service. The company's funding is based solely on revenue from the subscription service. It is used to finance the project's infrastructure and to pay for full-time employees contributing to the project.
-
-In January 2020, branding was adjusted to make it easier to refer to different parts of the project. The main piece of software was renamed to Home Assistant Core, while the full suite of software with the embedded operating system and bundled "supervisor" management system was renamed to Home Assistant.

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

@@ -1,6 +1,5 @@
 ---
 title: Alerts
-subtitle: An alert displays a short, important message in a way that attracts the user's attention without interrupting the user's task.
 ---
 
 # Alert `<ha-alert>`

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

@@ -3,7 +3,18 @@ import { customElement } from "lit/decorators";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-faded";
 import "../../../../src/components/ha-markdown";
-import { LONG_TEXT } from "../../data/text";
+
+const LONG_TEXT = `
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc laoreet velit ut elit volutpat, eget ultrices odio lacinia. In imperdiet malesuada est, nec sagittis metus ultricies quis. Sed nisl ex, convallis porttitor ante quis, hendrerit tristique justo. Mauris pharetra venenatis augue, eu maximus sem cursus in. Quisque sed consequat risus. Suspendisse facilisis ligula a odio consectetur condimentum. Curabitur vehicula elit nec augue mollis, et volutpat massa dictum.
+
+Nam pellentesque auctor rutrum. Suspendisse elit est, sodales vel diam nec, porttitor faucibus massa. Ut pretium ac orci eu pharetra. Praesent in nibh at magna viverra rutrum eu vitae tortor. Etiam eget sem ex. Fusce tristique odio nec lacus mattis, vitae tempor nunc malesuada. Maecenas faucibus magna vel libero maximus egestas. Vestibulum luctus semper velit, in lobortis risus tempus non. Curabitur bibendum ornare commodo. Quisque commodo neque sit amet tincidunt lacinia. Proin elementum ante velit, eu congue nulla semper quis. Pellentesque consequat vel nunc at scelerisque. Mauris sit amet venenatis diam, blandit viverra leo. Integer commodo laoreet orci.
+
+Curabitur ipsum tortor, sodales ut augue sed, commodo porttitor libero. Pellentesque molestie vitae mi consectetur tempor. In sed lectus consequat, lobortis neque non, semper ipsum. Etiam eget ex et nibh sagittis pulvinar lacinia ac mauris. Aenean ligula eros, viverra ac nibh at, venenatis semper quam. Sed interdum ligula sit amet massa tincidunt tincidunt. Suspendisse potenti. Aliquam egestas facilisis est, sed faucibus erat scelerisque id. Duis dolor quam, viverra vitae orci euismod, laoreet pellentesque justo. Nunc malesuada non erat at ullamcorper. Mauris eget posuere odio. Vestibulum turpis nunc, pharetra eget ante in, feugiat mollis justo. Proin porttitor, diam nec vulputate pretium, tellus arcu rhoncus turpis, a blandit nisi nulla quis arcu. Nunc ac ullamcorper ligula, nec facilisis leo.
+
+In vitae eros sollicitudin, iaculis ex eget, egestas orci. Etiam sed pretium lorem. Nam nisi enim, consectetur sit amet semper ac, semper pharetra diam. In pulvinar neque sapien, ac ullamcorper est lacinia a. Etiam tincidunt velit sed diam malesuada, eu ornare ex consectetur. Phasellus in imperdiet tellus. Sed bibendum, dui sit amet fringilla aliquet, enim odio sollicitudin lorem, vel semper turpis mauris vel mauris. Aenean congue magna ac massa cursus, in dictum orci commodo. Pellentesque mollis velit in sollicitudin tincidunt. Vestibulum et efficitur nulla.
+
+Quisque posuere, velit sed porttitor dapibus, neque augue fringilla felis, eu luctus nisi nisl nec ipsum. Curabitur pellentesque ac lectus eget ultricies. Vestibulum est dolor, lacinia pharetra vulputate a, facilisis a magna. Nam vitae arcu nibh. Praesent finibus blandit ante, ac gravida ex mollis eget. Donec quam est, pulvinar vitae neque ut, bibendum aliquam erat. Nullam mollis arcu at sem tincidunt, in tristique lectus facilisis. Aenean ut lacus vel nisl finibus iaculis non a turpis. Integer eget ipsum ante. Donec nunc neque, vestibulum ac magna ac, posuere scelerisque dui. Pellentesque massa nibh, rhoncus id dolor quis, placerat posuere turpis. Donec aliquet augue nisi, eu finibus dui auctor et. Vestibulum eu varius lorem. Quisque lectus ante, malesuada pretium risus eget, interdum mattis enim.
+`;
 
 const SMALL_TEXT = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.";
 

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

@@ -1,109 +1,17 @@
 /* eslint-disable lit/no-template-arrow */
 import "@material/mwc-button";
-import { html, LitElement, TemplateResult } from "lit";
+import { LitElement, TemplateResult, html } from "lit";
 import { customElement, state } from "lit/decorators";
+import { computeInitialHaFormData } from "../../../../src/components/ha-form/compute-initial-ha-form-data";
+import type { HaFormSchema } from "../../../../src/components/ha-form/types";
+import "../../../../src/components/ha-form/ha-form";
+import "../../components/demo-black-white-row";
 import { mockAreaRegistry } from "../../../../demo/src/stubs/area_registry";
 import { mockDeviceRegistry } from "../../../../demo/src/stubs/device_registry";
 import { mockEntityRegistry } from "../../../../demo/src/stubs/entity_registry";
 import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
-import { computeInitialHaFormData } from "../../../../src/components/ha-form/compute-initial-ha-form-data";
-import "../../../../src/components/ha-form/ha-form";
-import type { HaFormSchema } from "../../../../src/components/ha-form/types";
-import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import { HomeAssistant } from "../../../../src/types";
-import "../../components/demo-black-white-row";
-
-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: {
   title: string;
@@ -128,10 +36,6 @@ const SCHEMAS: {
       text_multiline: "Text Multiline",
       object: "Object",
       select: "Select",
-      icon: "Icon",
-      media: "Media",
-      location: "Location",
-      entities: "Entities",
     },
     schema: [
       { name: "addon", selector: { addon: {} } },
@@ -139,7 +43,6 @@ const SCHEMAS: {
       {
         name: "Attribute",
         selector: { attribute: { entity_id: "" } },
-        context: { filter_entity: "entity" },
       },
       { name: "Device", selector: { device: {} } },
       { name: "Duration", selector: { duration: {} } },
@@ -147,9 +50,7 @@ const SCHEMAS: {
       { name: "target", selector: { target: {} } },
       { name: "number", selector: { number: { min: 0, max: 10 } } },
       { name: "boolean", selector: { boolean: {} } },
-      { name: "time", required: true, selector: { time: {} } },
-      { name: "datetime", required: true, selector: { datetime: {} } },
-      { name: "date", required: true, selector: { date: {} } },
+      { name: "time", selector: { time: {} } },
       { name: "action", selector: { action: {} } },
       { name: "text", selector: { text: { multiline: false } } },
       { name: "text_multiline", selector: { text: { multiline: true } } },
@@ -160,26 +61,6 @@ const SCHEMAS: {
           select: { options: ["Everyone Home", "Some Home", "All gone"] },
         },
       },
-      {
-        name: "icon",
-        selector: {
-          icon: {},
-        },
-      },
-      {
-        name: "media",
-        selector: {
-          media: {},
-        },
-      },
-      {
-        name: "location",
-        selector: { location: { radius: true, icon: "mdi:home" } },
-      },
-      {
-        name: "entities",
-        selector: { entity: { multiple: true } },
-      },
     ],
   },
   {
@@ -420,10 +301,9 @@ class DemoHaForm extends LitElement {
     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);
   }
 

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

@@ -1,5 +1,3 @@
 ---
-title: Selectors
+title: Target Selectors
 ---
-
-See the website for [list of available selectors](https://www.home-assistant.io/docs/blueprint/selectors/).

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

@@ -1,115 +1,21 @@
 /* eslint-disable lit/no-template-arrow */
 import "@material/mwc-button";
-import { css, html, LitElement, TemplateResult } from "lit";
+import { LitElement, TemplateResult, css, html } from "lit";
 import { customElement, state } from "lit/decorators";
-import { mockAreaRegistry } from "../../../../demo/src/stubs/area_registry";
-import { mockDeviceRegistry } from "../../../../demo/src/stubs/device_registry";
-import { mockEntityRegistry } from "../../../../demo/src/stubs/entity_registry";
-import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
 import "../../../../src/components/ha-selector/ha-selector";
 import "../../../../src/components/ha-settings-row";
-import { BlueprintInput } from "../../../../src/data/blueprint";
-import { showDialog } from "../../../../src/dialogs/make-dialog-manager";
-import { getEntity } from "../../../../src/fake_data/entity";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
-import { ProvideHassElement } from "../../../../src/mixins/provide-hass-lit-mixin";
 import type { HomeAssistant } from "../../../../src/types";
 import "../../components/demo-black-white-row";
-
-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,
-  },
-];
+import { BlueprintInput } from "../../../../src/data/blueprint";
+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";
 
 const SCHEMAS: {
   name: string;
-  input: Record<string, (BlueprintInput & { required?: boolean }) | null>;
+  input: Record<string, BlueprintInput | null>;
 }[] = [
   {
     name: "One of each",
@@ -146,8 +52,6 @@ const SCHEMAS: {
       },
       boolean: { name: "Boolean", selector: { boolean: {} } },
       time: { name: "Time", selector: { time: {} } },
-      date: { name: "Date", selector: { date: {} } },
-      datetime: { name: "Date Time", selector: { datetime: {} } },
       action: { name: "Action", selector: { action: {} } },
       text: {
         name: "Text",
@@ -164,107 +68,17 @@ const SCHEMAS: {
         },
       },
       object: { name: "Object", selector: { object: {} } },
-      select_radio: {
-        name: "Select (Radio)",
-        selector: {
-          select: { options: ["Option 1", "Option 2"], mode: "list" },
-        },
-      },
-      template: { name: "Template", selector: { template: {} } },
       select: {
         name: "Select",
-        selector: {
-          select: {
-            options: [
-              "Option 1",
-              "Option 2",
-              "Option 3",
-              "Option 4",
-              "Option 5",
-              "Option 6",
-            ],
-          },
-        },
-      },
-      select_custom: {
-        name: "Select (Custom)",
-        selector: {
-          select: {
-            custom_value: true,
-            options: [
-              "Option 1",
-              "Option 2",
-              "Option 3",
-              "Option 4",
-              "Option 5",
-              "Option 6",
-            ],
-          },
-        },
-      },
-      icon: { name: "Icon", selector: { icon: {} } },
-      media: { name: "Media", selector: { media: {} } },
-      location: { name: "Location", selector: { location: {} } },
-      location_radius: {
-        name: "Location with radius",
-        selector: { location: { radius: true, icon: "mdi:home" } },
-      },
-      color_temp: {
-        name: "Color Temperature",
-        selector: { color_temp: {} },
-      },
-      color_rgb: { name: "Color", selector: { color_rgb: {} } },
-    },
-  },
-  {
-    name: "Multiples",
-    input: {
-      entity: { name: "Entity", selector: { entity: { multiple: true } } },
-      device: { name: "Device", selector: { device: { multiple: true } } },
-      area: { name: "Area", selector: { area: { multiple: true } } },
-      select: {
-        name: "Select Multiple",
-        selector: {
-          select: {
-            multiple: true,
-            custom_value: true,
-            options: [
-              "Option 1",
-              "Option 2",
-              "Option 3",
-              "Option 4",
-              "Option 5",
-              "Option 6",
-            ],
-          },
-        },
-      },
-      select_checkbox: {
-        name: "Select Multiple (Checkbox)",
-        required: false,
-        selector: {
-          select: {
-            mode: "list",
-            multiple: true,
-            options: ["Option 1", "Option 2", "Option 3", "Option 4"],
-          },
-        },
+        selector: { select: { options: ["Option 1", "Option 2"] } },
       },
     },
   },
 ];
 
 @customElement("demo-components-ha-selector")
-class DemoHaSelector extends LitElement implements ProvideHassElement {
-  @state() public hass!: HomeAssistant;
-
-  @state() private _disabled = false;
-
-  @state() private _required = false;
-
-  @state() private _helper = false;
-
-  @state() private _label = true;
+class DemoHaSelector extends LitElement {
+  @state() private hass!: HomeAssistant;
 
   private data = SCHEMAS.map(() => ({}));
 
@@ -273,162 +87,14 @@ 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: "https://brands.home-assistant.io/_/image/logo.png",
-        },
-        {
-          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`
-      <div class="options">
-        <ha-formfield label="Labels">
-          <ha-switch
-            .name=${"label"}
-            .checked=${this._label}
-            @change=${this._handleOptionChange}
-          ></ha-switch>
-        </ha-formfield>
-        <ha-formfield label="Required">
-          <ha-switch
-            .name=${"required"}
-            .checked=${this._required}
-            @change=${this._handleOptionChange}
-          ></ha-switch>
-        </ha-formfield>
-        <ha-formfield label="Disabled">
-          <ha-switch
-            .name=${"disabled"}
-            .checked=${this._disabled}
-            @change=${this._handleOptionChange}
-          ></ha-switch>
-        </ha-formfield>
-        <ha-formfield label="Helper text">
-          <ha-switch
-            .name=${"helper"}
-            .checked=${this._helper}
-            @change=${this._handleOptionChange}
-          ></ha-switch>
-        </ha-formfield>
-      </div>
       ${SCHEMAS.map((info, idx) => {
         const data = this.data[idx];
         const valueChanged = (ev) => {
@@ -451,12 +117,8 @@ class DemoHaSelector extends LitElement implements ProvideHassElement {
                         .hass=${this.hass}
                         .selector=${value!.selector}
                         .key=${key}
-                        .label=${this._label ? value!.name : undefined}
                         .value=${data[key] ?? value!.default}
-                        .disabled=${this._disabled}
-                        .required=${this._required}
                         @value-changed=${valueChanged}
-                        .helper=${this._helper ? "Helper text" : undefined}
                       ></ha-selector>
                     </ha-settings-row>
                   `
@@ -468,21 +130,11 @@ class DemoHaSelector extends LitElement implements ProvideHassElement {
     `;
   }
 
-  private _handleOptionChange(ev) {
-    this[`_${ev.target.name}`] = ev.target.checked;
-  }
-
   static styles = css`
+    paper-input,
     ha-selector {
       width: 60;
     }
-    .options {
-      max-width: 800px;
-      margin: 16px auto;
-    }
-    .options ha-formfield {
-      margin-right: 16px;
-    }
   `;
 }
 

gallery/src/pages/design.home-assistant.io/editing.markdown

@@ -2,8 +2,6 @@
 title: Editing design.home-assistant.io
 ---
 
-![Home Assistant Logo](/images/logo-with-text.png)
-
 # How to edit design.home-assistant.io
 
 All pages are stored in [the pages folder][pages-folder] on GitHub. Pages are grouped in a folder per sidebar section. Each page can contain a `<page name>.markdown` description file, a `<page name>.ts` demo file or both. If both are defined the description is rendered first. The description can contain metadata to specify the title of the page.
@@ -43,12 +41,15 @@ import { html, css, LitElement } from "lit";
 import { customElement } from "lit/decorators";
 import "../../../../src/components/ha-card";
 
+
 @customElement("demo-user-experience-usability")
 export class DemoUserExperienceUsability extends LitElement {
   protected render() {
     return html`
       <ha-card>
-        <div class="card-content">Hello world!</div>
+        <div class="card-content">
+          Hello world!
+        </div>
       </ha-card>
     `;
   }

gallery/src/pages/lovelace/markdown-card.ts

@@ -9,7 +9,7 @@ const CONFIGS = [
     heading: "markdown-it demo",
     config: `
 - type: markdown
-  content: >-
+  content: >
     # h1 Heading 8-)
 
     ## h2 Heading
@@ -249,17 +249,6 @@ const CONFIGS = [
     ::: warning
     *here be dragons*
     :::
-
-    ### ha-alert
-
-    You can use our [\`ha-alert\`](https://design.home-assistant.io/#components/ha-alert) component in markdown content rendered in the Home Assistant Frontend.
-
-    <ha-alert alert-type="error">This is an error alert — check it out!</ha-alert>
-    <ha-alert alert-type="warning">This is a warning alert — check it out!</ha-alert>
-    <ha-alert alert-type="info">This is an info alert — check it out!</ha-alert>
-    <ha-alert alert-type="success">This is a success alert — check it out!</ha-alert>
-    <ha-alert title="Test alert">This is an alert with a title</ha-alert>
-
     `,
   },
 ];

gallery/src/pages/misc/integration-card.ts

@@ -29,7 +29,6 @@ const createConfigEntry = (
   source: "zeroconf",
   state: "loaded",
   supports_options: false,
-  supports_remove_device: false,
   supports_unload: true,
   disabled_by: null,
   pref_disable_new_entities: false,
@@ -188,7 +187,6 @@ const createEntityRegistryEntries = (
     device_id: "mock-device-id",
     area_id: null,
     disabled_by: null,
-    hidden_by: null,
     entity_category: null,
     entity_id: "binary_sensor.updater",
     name: null,

gallery/src/pages/more-info/update.markdown

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

gallery/src/pages/more-info/update.ts

@@ -1,189 +0,0 @@
-import { html, LitElement, PropertyValues, TemplateResult } from "lit";
-import { customElement, property, query } from "lit/decorators";
-import "../../../../src/components/ha-card";
-import {
-  UPDATE_SUPPORT_BACKUP,
-  UPDATE_SUPPORT_PROGRESS,
-  UPDATE_SUPPORT_INSTALL,
-  UPDATE_SUPPORT_RELEASE_NOTES,
-} from "../../../../src/data/update";
-import "../../../../src/dialogs/more-info/more-info-content";
-import { getEntity } from "../../../../src/fake_data/entity";
-import {
-  MockHomeAssistant,
-  provideHass,
-} from "../../../../src/fake_data/provide_hass";
-import "../../components/demo-more-infos";
-import { LONG_TEXT } from "../../data/text";
-
-const base_attributes = {
-  title: "Awesome",
-  installed_version: "1.2.2",
-  latest_version: "1.2.3",
-  release_url: "https://home-assistant.io",
-  supported_features: UPDATE_SUPPORT_INSTALL,
-  skipped_version: null,
-  in_progress: false,
-  release_summary:
-    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In nec metus aliquet, porta mi ut, ultrices odio. Etiam egestas orci tellus, non semper metus blandit tincidunt. Praesent elementum turpis vel tempor pharetra. Sed quis cursus diam. Proin sem justo.",
-};
-
-const ENTITIES = [
-  getEntity("update", "update1", "on", {
-    ...base_attributes,
-    friendly_name: "Update",
-  }),
-  getEntity("update", "update2", "on", {
-    ...base_attributes,
-    title: null,
-    friendly_name: "Update without title",
-  }),
-  getEntity("update", "update3", "on", {
-    ...base_attributes,
-    release_url: null,
-    friendly_name: "Update without release_url",
-  }),
-  getEntity("update", "update4", "on", {
-    ...base_attributes,
-    release_summary: null,
-    friendly_name: "Update without release_summary",
-  }),
-  getEntity("update", "update5", "off", {
-    ...base_attributes,
-    installed_version: "1.2.3",
-    friendly_name: "No update",
-  }),
-  getEntity("update", "update6", "off", {
-    ...base_attributes,
-    skipped_version: "1.2.3",
-    friendly_name: "Skipped version",
-  }),
-  getEntity("update", "update7", "on", {
-    ...base_attributes,
-    supported_features:
-      base_attributes.supported_features + UPDATE_SUPPORT_BACKUP,
-    friendly_name: "With backup support",
-  }),
-  getEntity("update", "update8", "on", {
-    ...base_attributes,
-    in_progress: true,
-    friendly_name: "With true in_progress",
-  }),
-  getEntity("update", "update9", "on", {
-    ...base_attributes,
-    in_progress: 25,
-    supported_features:
-      base_attributes.supported_features + UPDATE_SUPPORT_PROGRESS,
-    friendly_name: "With 25 in_progress",
-  }),
-  getEntity("update", "update10", "on", {
-    ...base_attributes,
-    in_progress: 50,
-    supported_features:
-      base_attributes.supported_features + UPDATE_SUPPORT_PROGRESS,
-    friendly_name: "With 50 in_progress",
-  }),
-  getEntity("update", "update11", "on", {
-    ...base_attributes,
-    in_progress: 75,
-    supported_features:
-      base_attributes.supported_features + UPDATE_SUPPORT_PROGRESS,
-    friendly_name: "With 75 in_progress",
-  }),
-  getEntity("update", "update12", "unavailable", {
-    ...base_attributes,
-    in_progress: 50,
-    friendly_name: "Unavailable",
-  }),
-  getEntity("update", "update13", "on", {
-    ...base_attributes,
-    supported_features: 0,
-    friendly_name: "No install support",
-  }),
-  getEntity("update", "update14", "off", {
-    ...base_attributes,
-    installed_version: null,
-    friendly_name: "Update without installed_version",
-  }),
-  getEntity("update", "update15", "off", {
-    ...base_attributes,
-    latest_version: null,
-    friendly_name: "Update without latest_version",
-  }),
-  getEntity("update", "update16", "off", {
-    ...base_attributes,
-    friendly_name: "Update with release notes",
-    supported_features:
-      base_attributes.supported_features + UPDATE_SUPPORT_RELEASE_NOTES,
-  }),
-  getEntity("update", "update17", "off", {
-    ...base_attributes,
-    friendly_name: "Update with release notes error",
-    supported_features:
-      base_attributes.supported_features + UPDATE_SUPPORT_RELEASE_NOTES,
-  }),
-  getEntity("update", "update18", "off", {
-    ...base_attributes,
-    friendly_name: "Update with release notes loading",
-    supported_features:
-      base_attributes.supported_features + UPDATE_SUPPORT_RELEASE_NOTES,
-  }),
-  getEntity("update", "update19", "on", {
-    ...base_attributes,
-    friendly_name: "Update with auto update",
-    auto_update: true,
-  }),
-  getEntity("update", "update20", "on", {
-    ...base_attributes,
-    in_progress: true,
-    title: undefined,
-    friendly_name: "Installing without title",
-  }),
-];
-
-@customElement("demo-more-info-update")
-class DemoMoreInfoUpdate extends LitElement {
-  @property() public hass!: MockHomeAssistant;
-
-  @query("demo-more-infos") private _demoRoot!: HTMLElement;
-
-  protected render(): TemplateResult {
-    return html`
-      <demo-more-infos
-        .hass=${this.hass}
-        .entities=${ENTITIES.map((ent) => ent.entityId)}
-      ></demo-more-infos>
-    `;
-  }
-
-  protected firstUpdated(changedProperties: PropertyValues) {
-    super.firstUpdated(changedProperties);
-    const hass = provideHass(this._demoRoot);
-    hass.updateTranslations(null, "en");
-    hass.addEntities(ENTITIES);
-    hass.mockWS(
-      "update/release_notes",
-      (msg: { type: string; entity_id: string }) => {
-        if (msg.entity_id === "update.update16") {
-          return LONG_TEXT;
-        }
-        if (msg.entity_id === "update.update17") {
-          return Promise.reject({
-            code: "error",
-            message: "Could not fetch release notes",
-          });
-        }
-        if (msg.entity_id === "update.update18") {
-          return undefined;
-        }
-        return null;
-      }
-    );
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "demo-more-info-update": DemoMoreInfoUpdate;
-  }
-}

gallery/src/pages/user-test/user-types.markdown

@@ -1,17 +0,0 @@
----
-title: "User types"
----
-
-We have defined three user types for Home Assistant. They are a lean segmentation of users that helps us make decisions throughout the product. User types differ from traditional personas in that the segmentation criteria aren’t demographic and don’t personify a group into a single character with a fictitious background story. 
-
-# Outgrowers
-
-Users that outgrow big tech smart home solutions. It just needs to work with easy setup via an app.
-
-# Tinkerers
-
-Technoid users in home networking and development that know how to code.
-
-# Questioner
-
-Users who want more advanced home automation, but need support to make it work.

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

@@ -14,7 +14,7 @@ import memoizeOne from "memoize-one";
 import { atLeastVersion } from "../../../src/common/config/version";
 import { fireEvent } from "../../../src/common/dom/fire_event";
 import { navigate } from "../../../src/common/navigate";
-import "../../../src/components/search-input";
+import "../../../src/common/search/search-input";
 import { extractSearchParam } from "../../../src/common/url/search-params";
 import "../../../src/components/ha-button-menu";
 import "../../../src/components/ha-icon-button";
@@ -110,6 +110,8 @@ class HassioAddonStore extends LitElement {
               <div class="search">
                 <search-input
                   .hass=${this.hass}
+                  no-label-float
+                  no-underline
                   .filter=${this._filter}
                   @value-changed=${this._filterChanged}
                 ></search-input>
@@ -219,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,5 +1,7 @@
 import "@material/mwc-button";
-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,
@@ -9,11 +11,10 @@ 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";
-import "../../../../src/components/ha-select";
 import {
   HassioAddonDetails,
   HassioAddonSetOptionParams,
@@ -56,44 +57,49 @@ class HassioAddonAudio extends LitElement {
           ${this._error
             ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
             : ""}
-          ${this._inputDevices &&
-          html`<ha-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>
-              `
-            )}
-          </ha-select>`}
-          ${this._outputDevices &&
-          html`<ha-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
-                >
-              `
-            )}
-          </ha-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;
         }
-        ha-select {
-          width: 100%;
-        }
-        ha-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/config/hassio-addon-config.ts

@@ -39,14 +39,7 @@ import type { HomeAssistant } from "../../../../src/types";
 import { suggestAddonRestart } from "../../dialogs/suggestAddonRestart";
 import { hassioStyle } from "../../resources/hassio-style";
 
-const SUPPORTED_UI_TYPES = [
-  "string",
-  "select",
-  "boolean",
-  "integer",
-  "float",
-  "schema",
-];
+const SUPPORTED_UI_TYPES = ["string", "select", "boolean", "integer", "float"];
 
 const ADDON_YAML_SCHEMA = DEFAULT_SCHEMA.extend([
   new Type("!secret", {
@@ -55,8 +48,6 @@ const ADDON_YAML_SCHEMA = DEFAULT_SCHEMA.extend([
   }),
 ]);
 
-const MASKED_FIELDS = ["password", "secret", "token"];
-
 @customElement("hassio-addon-config")
 class HassioAddonConfig extends LitElement {
   @property({ attribute: false }) public addon!: HassioAddonDetails;
@@ -84,66 +75,19 @@ class HassioAddonConfig extends LitElement {
   public computeLabel = (entry: HaFormSchema): string =>
     this.addon.translations[this.hass.language]?.configuration?.[entry.name]
       ?.name ||
-    this.addon.translations.en?.configuration?.[entry.name]?.name ||
+    this.addon.translations.en?.configuration?.[entry.name].name ||
     entry.name;
 
-  public computeHelper = (entry: HaFormSchema): string =>
-    this.addon.translations[this.hass.language]?.configuration?.[entry.name]
-      ?.description ||
-    this.addon.translations.en?.configuration?.[entry.name]?.description ||
-    "";
-
-  private _convertSchema = memoizeOne(
-    // Convert supervisor schema to selectors
-    (schema: Record<string, any>): HaFormSchema[] =>
-      schema.map((entry) =>
-        entry.type === "select"
-          ? {
-              name: entry.name,
-              required: entry.required,
-              selector: { select: { options: entry.options } },
-            }
-          : entry.type === "string"
-          ? entry.multiple
-            ? {
-                name: entry.name,
-                required: entry.required,
-                selector: {
-                  select: { options: [], multiple: true, custom_value: true },
-                },
-              }
-            : {
-                name: entry.name,
-                required: entry.required,
-                selector: {
-                  text: {
-                    type:
-                      entry.format || MASKED_FIELDS.includes(entry.name)
-                        ? "password"
-                        : "text",
-                  },
-                },
-              }
-          : entry.type === "boolean"
-          ? {
-              name: entry.name,
-              required: entry.required,
-              selector: { boolean: {} },
-            }
-          : entry.type === "schema"
-          ? {
-              name: entry.name,
-              required: entry.required,
-              selector: { object: {} },
-            }
-          : entry.type === "float" || entry.type === "integer"
-          ? {
-              name: entry.name,
-              required: entry.required,
-              selector: { number: { mode: "box" } },
-            }
-          : entry
-      )
+  private _schema = memoizeOne((schema: HaFormSchema[]): HaFormSchema[] =>
+    // @ts-expect-error supervisor does not implement [string, string] for select.options[]
+    schema.map((entry) =>
+      entry.type === "select"
+        ? {
+            ...entry,
+            options: entry.options.map((option) => [option, option]),
+          }
+        : entry
+    )
   );
 
   private _filteredShchema = memoizeOne(
@@ -196,8 +140,7 @@ class HassioAddonConfig extends LitElement {
                 .data=${this._options!}
                 @value-changed=${this._configChanged}
                 .computeLabel=${this.computeLabel}
-                .computeHelper=${this.computeHelper}
-                .schema=${this._convertSchema(
+                .schema=${this._schema(
                   this._showOptional
                     ? this.addon.schema!
                     : this._filteredShchema(
@@ -254,9 +197,8 @@ class HassioAddonConfig extends LitElement {
   protected firstUpdated(changedProps) {
     super.firstUpdated(changedProps);
     this._canShowSchema = !this.addon.schema!.find(
-      (entry) =>
-        // @ts-ignore
-        !SUPPORTED_UI_TYPES.includes(entry.type)
+      // @ts-ignore
+      (entry) => !SUPPORTED_UI_TYPES.includes(entry.type) || entry.multiple
     );
     this._yamlMode = !this._canShowSchema;
   }

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

@@ -1,3 +1,4 @@
+import { PaperInputElement } from "@polymer/paper-input/paper-input";
 import {
   css,
   CSSResultGroup,
@@ -7,13 +8,10 @@ import {
   TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
 import "../../../../src/components/buttons/ha-progress-button";
 import "../../../../src/components/ha-alert";
 import "../../../../src/components/ha-card";
-import "../../../../src/components/ha-form/ha-form";
-import type { HaFormSchema } from "../../../../src/components/ha-form/types";
 import {
   HassioAddonDetails,
   HassioAddonSetOptionParams,
@@ -26,6 +24,16 @@ import { HomeAssistant } from "../../../../src/types";
 import { suggestAddonRestart } from "../../dialogs/suggestAddonRestart";
 import { hassioStyle } from "../../resources/hassio-style";
 
+interface NetworkItem {
+  description: string;
+  container: string;
+  host: number | null;
+}
+
+interface NetworkItemInput extends PaperInputElement {
+  container: string;
+}
+
 @customElement("hassio-addon-network")
 class HassioAddonNetwork extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -34,13 +42,9 @@ class HassioAddonNetwork extends LitElement {
 
   @property({ attribute: false }) public addon!: HassioAddonDetails;
 
-  @state() private _showOptional = false;
-
-  @state() private _configHasChanged = false;
-
   @state() private _error?: string;
 
-  @state() private _config?: Record<string, any>;
+  @state() private _config?: NetworkItem[];
 
   public connectedCallback(): void {
     super.connectedCallback();
@@ -52,10 +56,6 @@ class HassioAddonNetwork extends LitElement {
       return html``;
     }
 
-    const hasHiddenOptions = Object.keys(this._config).find(
-      (entry) => this._config![entry] === null
-    );
-
     return html`
       <ha-card
         .header=${this.supervisor.localize(
@@ -63,49 +63,52 @@ class HassioAddonNetwork extends LitElement {
         )}
       >
         <div class="card-content">
-          <p>
-            ${this.supervisor.localize(
-              "addon.configuration.network.introduction"
-            )}
-          </p>
           ${this._error
             ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
             : ""}
 
-          <ha-form
-            .data=${this._config}
-            @value-changed=${this._configChanged}
-            .computeLabel=${this._computeLabel}
-            .computeHelper=${this._computeHelper}
-            .schema=${this._createSchema(
-              this._config,
-              this._showOptional,
-              this.hass.userData?.showAdvanced || false
-            )}
-          ></ha-form>
-        </div>
-        ${hasHiddenOptions
-          ? html`<ha-formfield
-              class="show-optional"
-              .label=${this.supervisor.localize(
-                "addon.configuration.network.show_disabled"
+          <table>
+            <tbody>
+              <tr>
+                <th>
+                  ${this.supervisor.localize(
+                    "addon.configuration.network.container"
+                  )}
+                </th>
+                <th>
+                  ${this.supervisor.localize(
+                    "addon.configuration.network.host"
+                  )}
+                </th>
+                <th>${this.supervisor.localize("common.description")}</th>
+              </tr>
+              ${this._config!.map(
+                (item) => html`
+                  <tr>
+                    <td>${item.container}</td>
+                    <td>
+                      <paper-input
+                        @value-changed=${this._configChanged}
+                        placeholder=${this.supervisor.localize(
+                          "addon.configuration.network.disabled"
+                        )}
+                        .value=${item.host ? String(item.host) : ""}
+                        .container=${item.container}
+                        no-label-float
+                      ></paper-input>
+                    </td>
+                    <td>${this._computeDescription(item)}</td>
+                  </tr>
+                `
               )}
-            >
-              <ha-switch
-                @change=${this._toggleOptional}
-                .checked=${this._showOptional}
-              >
-              </ha-switch>
-            </ha-formfield>`
-          : ""}
+            </tbody>
+          </table>
+        </div>
         <div class="card-actions">
           <ha-progress-button class="warning" @click=${this._resetTapped}>
             ${this.supervisor.localize("common.reset_defaults")}
           </ha-progress-button>
-          <ha-progress-button
-            @click=${this._saveTapped}
-            .disabled=${!this._configHasChanged}
-          >
+          <ha-progress-button @click=${this._saveTapped}>
             ${this.supervisor.localize("common.save")}
           </ha-progress-button>
         </div>
@@ -120,60 +123,50 @@ class HassioAddonNetwork extends LitElement {
     }
   }
 
-  private _createSchema = memoizeOne(
-    (
-      config: Record<string, number>,
-      showOptional: boolean,
-      advanced: boolean
-    ): HaFormSchema[] =>
-      (showOptional
-        ? Object.keys(config)
-        : Object.keys(config).filter((entry) => config[entry] !== null)
-      ).map((entry) => ({
-        name: entry,
-        selector: {
-          number: {
-            mode: "box",
-            min: 0,
-            max: 65535,
-            unit_of_measurement: advanced ? entry : undefined,
-          },
-        },
-      }))
-  );
-
-  private _computeLabel = (_: HaFormSchema): string => "";
-
-  private _computeHelper = (item: HaFormSchema): string =>
-    this.addon.translations[this.hass.language]?.network?.[item.name] ||
-    this.addon.translations.en?.network?.[item.name] ||
-    this.addon.network_description?.[item.name] ||
-    item.name;
+  private _computeDescription = (item: NetworkItem): string =>
+    this.addon.translations[this.hass.language]?.network?.[item.container]
+      ?.description ||
+    this.addon.translations.en?.network?.[item.container]?.description ||
+    item.description;
 
   private _setNetworkConfig(): void {
-    this._config = this.addon.network || {};
+    const network = this.addon.network || {};
+    const description = this.addon.network_description || {};
+    const items: NetworkItem[] = Object.keys(network).map((key) => ({
+      container: key,
+      host: network[key],
+      description: description[key],
+    }));
+    this._config = items.sort((a, b) => (a.container > b.container ? 1 : -1));
   }
 
-  private async _configChanged(ev: CustomEvent): Promise<void> {
-    this._configHasChanged = true;
-    this._config! = ev.detail.value;
+  private async _configChanged(ev: Event): Promise<void> {
+    const target = ev.target as NetworkItemInput;
+    this._config!.forEach((item) => {
+      if (
+        item.container === target.container &&
+        item.host !== parseInt(String(target.value), 10)
+      ) {
+        item.host = target.value ? parseInt(String(target.value), 10) : null;
+      }
+    });
   }
 
   private async _resetTapped(ev: CustomEvent): Promise<void> {
     const button = ev.currentTarget as any;
+    button.progress = true;
+
     const data: HassioAddonSetOptionParams = {
       network: null,
     };
 
     try {
       await setHassioAddonOption(this.hass, this.addon.slug, data);
-      this._configHasChanged = false;
       const eventdata = {
         success: true,
         response: undefined,
         path: "option",
       };
-      button.actionSuccess();
       fireEvent(this, "hass-api-called", eventdata);
       if (this.addon?.state === "started") {
         await suggestAddonRestart(this, this.hass, this.supervisor, this.addon);
@@ -184,21 +177,19 @@ class HassioAddonNetwork extends LitElement {
         "error",
         extractApiErrorMessage(err)
       );
-      button.actionError();
     }
-  }
 
-  private _toggleOptional() {
-    this._showOptional = !this._showOptional;
+    button.progress = false;
   }
 
   private async _saveTapped(ev: CustomEvent): Promise<void> {
     const button = ev.currentTarget as any;
+    button.progress = true;
 
     this._error = undefined;
     const networkconfiguration = {};
-    Object.entries(this._config!).forEach(([key, value]) => {
-      networkconfiguration[key] = value ?? null;
+    this._config!.forEach((item) => {
+      networkconfiguration[item.container] = parseInt(String(item.host), 10);
     });
 
     const data: HassioAddonSetOptionParams = {
@@ -207,13 +198,11 @@ class HassioAddonNetwork extends LitElement {
 
     try {
       await setHassioAddonOption(this.hass, this.addon.slug, data);
-      this._configHasChanged = false;
       const eventdata = {
         success: true,
         response: undefined,
         path: "option",
       };
-      button.actionSuccess();
       fireEvent(this, "hass-api-called", eventdata);
       if (this.addon?.state === "started") {
         await suggestAddonRestart(this, this.hass, this.supervisor, this.addon);
@@ -224,8 +213,8 @@ class HassioAddonNetwork extends LitElement {
         "error",
         extractApiErrorMessage(err)
       );
-      button.actionError();
     }
+    button.progress = false;
   }
 
   static get styles(): CSSResultGroup {
@@ -243,9 +232,6 @@ class HassioAddonNetwork extends LitElement {
           display: flex;
           justify-content: space-between;
         }
-        .show-optional {
-          padding: 16px;
-        }
       `,
     ];
   }

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/components/hassio-upload-backup.ts

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

hassio/src/components/supervisor-backup-content.ts

@@ -1,7 +1,7 @@
 import { mdiFolder, mdiHomeAssistant, mdiPuzzle } from "@mdi/js";
 import { PaperInputElement } from "@polymer/paper-input/paper-input";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, query } from "lit/decorators";
+import { customElement, property } from "lit/decorators";
 import { atLeastVersion } from "../../../src/common/config/version";
 import { formatDate } from "../../../src/common/datetime/format_date";
 import { formatDateTime } from "../../../src/common/datetime/format_date_time";
@@ -32,6 +32,13 @@ interface AddonCheckboxItem extends CheckboxItem {
 
 const _computeFolders = (folders): CheckboxItem[] => {
   const list: CheckboxItem[] = [];
+  if (folders.includes("homeassistant")) {
+    list.push({
+      slug: "homeassistant",
+      name: "Home Assistant configuration",
+      checked: false,
+    });
+  }
   if (folders.includes("ssl")) {
     list.push({ slug: "ssl", name: "SSL", checked: false });
   }
@@ -85,15 +92,13 @@ export class SupervisorBackupContent extends LitElement {
 
   @property() public confirmBackupPassword = "";
 
-  @query("paper-input, ha-radio, ha-checkbox", true) private _focusTarget;
-
   public willUpdate(changedProps) {
     super.willUpdate(changedProps);
     if (!this.hasUpdated) {
       this.folders = _computeFolders(
         this.backup
           ? this.backup.folders
-          : ["ssl", "share", "media", "addons/local"]
+          : ["homeassistant", "ssl", "share", "media", "addons/local"]
       );
       this.addons = _computeAddons(
         this.backup ? this.backup.addons : this.supervisor?.supervisor.addons
@@ -104,10 +109,6 @@ export class SupervisorBackupContent extends LitElement {
     }
   }
 
-  public override focus() {
-    this._focusTarget?.focus();
-  }
-
   private _localize = (string: string) =>
     this.supervisor?.localize(`backup.${string}`) ||
     this.localize!(`ui.panel.page-onboarding.restore.${string}`);
@@ -168,23 +169,24 @@ export class SupervisorBackupContent extends LitElement {
         : ""}
       ${this.backupType === "partial"
         ? html`<div class="partial-picker">
-            <ha-formfield
-              .label=${html`<supervisor-formfield-label
-                label="Home Assistant"
-                .iconPath=${mdiHomeAssistant}
-                .version=${this.backup
-                  ? this.backup.homeassistant
-                  : this.hass.config.version}
-              >
-              </supervisor-formfield-label>`}
-            >
-              <ha-checkbox
-                .checked=${this.homeAssistant}
-                @change=${this.toggleHomeAssistant}
-              >
-              </ha-checkbox>
-            </ha-formfield>
-
+            ${this.backup && this.backup.homeassistant
+              ? html`
+                  <ha-formfield
+                    .label=${html`<supervisor-formfield-label
+                      label="Home Assistant"
+                      .iconPath=${mdiHomeAssistant}
+                      .version=${this.backup.homeassistant}
+                    >
+                    </supervisor-formfield-label>`}
+                  >
+                    <ha-checkbox
+                      .checked=${this.homeAssistant}
+                      @click=${this.toggleHomeAssistant}
+                    >
+                    </ha-checkbox>
+                  </ha-formfield>
+                `
+              : ""}
             ${foldersSection?.templates.length
               ? html`
                   <ha-formfield

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/backup/dialog-hassio-backup-upload.ts

@@ -64,7 +64,6 @@ export class DialogHassioBackupUpload
               .path=${mdiClose}
               slot="actionItems"
               dialogAction="cancel"
-              dialogInitialFocus
             ></ha-icon-button>
           </ha-header-bar>
         </div>

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

@@ -92,7 +92,6 @@ class HassioBackupDialog
               .backup=${this._backup}
               .onboarding=${this._dialogParams.onboarding || false}
               .localize=${this._dialogParams.localize}
-              dialogInitialFocus
             >
             </supervisor-backup-content>`}
         ${this._error

hassio/src/dialogs/backup/dialog-hassio-create-backup.ts

@@ -61,7 +61,6 @@ class HassioCreateBackupDialog extends LitElement {
           : html`<supervisor-backup-content
               .hass=${this.hass}
               .supervisor=${this._dialogParams.supervisor}
-              dialogInitialFocus
             >
             </supervisor-backup-content>`}
         ${this._error

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

@@ -1,11 +1,12 @@
-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, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
 import "../../../../src/components/ha-circular-progress";
 import "../../../../src/components/ha-markdown";
-import "../../../../src/components/ha-select";
 import {
   extractApiErrorMessage,
   ignoreSupervisorError,
@@ -89,20 +90,18 @@ class HassioDatadiskDialog extends LitElement {
                     )}
                     <br /><br />
 
-                    <ha-select
+                    <paper-dropdown-menu
                       .label=${this.dialogParams.supervisor.localize(
                         "dialog.datadisk_move.select_device"
                       )}
-                      @selected=${this._select_device}
-                      dialogInitialFocus
+                      @value-changed=${this._select_device}
                     >
-                      ${this.devices.map(
-                        (device) =>
-                          html`<mwc-list-item .value=${device}
-                            >${device}</mwc-list-item
-                          >`
-                      )}
-                    </ha-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(
@@ -112,11 +111,7 @@ class HassioDatadiskDialog extends LitElement {
                     "dialog.datadisk_move.no_devices"
                   )}
 
-              <mwc-button
-                slot="secondaryAction"
-                @click=${this.closeDialog}
-                dialogInitialFocus
-              >
+              <mwc-button slot="secondaryAction" @click=${this.closeDialog}>
                 ${this.dialogParams.supervisor.localize(
                   "dialog.datadisk_move.cancel"
                 )}
@@ -135,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() {
@@ -161,7 +156,7 @@ class HassioDatadiskDialog extends LitElement {
       haStyle,
       haStyleDialog,
       css`
-        ha-select {
+        paper-dropdown-menu {
           width: 100%;
         }
         ha-circular-progress {

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

@@ -3,7 +3,7 @@ import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
-import "../../../../src/components/search-input";
+import "../../../../src/common/search/search-input";
 import { stringCompare } from "../../../../src/common/string/compare";
 import "../../../../src/components/ha-dialog";
 import "../../../../src/components/ha-expansion-panel";
@@ -80,6 +80,8 @@ class HassioHardwareDialog extends LitElement {
           ></ha-icon-button>
           <search-input
             .hass=${this.hass}
+            autofocus
+            no-label-float
             .filter=${this._filter}
             @value-changed=${this._handleSearchChange}
             .label=${this._dialogParams.supervisor.localize(
@@ -176,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/dialogs/markdown/dialog-hassio-markdown.ts

@@ -37,10 +37,7 @@ class HassioMarkdownDialog extends LitElement {
         @closed=${this.closeDialog}
         .heading=${createCloseHeading(this.hass, this.title)}
       >
-        <ha-markdown
-          .content=${this.content || ""}
-          dialogInitialFocus
-        ></ha-markdown>
+        <ha-markdown .content=${this.content || ""}></ha-markdown>
       </ha-dialog>
     `;
   }

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

@@ -119,7 +119,6 @@ export class DialogHassioNetwork
                     html`<mwc-tab
                       .id=${device.interface}
                       .label=${device.interface}
-                      dialogInitialFocus
                     >
                     </mwc-tab>`
                 )}
@@ -316,7 +315,6 @@ export class DialogHassioNetwork
               value="auto"
               name="${version}method"
               .checked=${this._interface![version]?.method === "auto"}
-              dialogInitialFocus
             >
             </ha-radio>
           </ha-formfield>

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

@@ -80,7 +80,6 @@ class HassioRegistriesDialog extends LitElement {
                 .schema=${SCHEMA}
                 @value-changed=${this._valueChanged}
                 .computeLabel=${this._computeLabel}
-                dialogInitialFocus
               ></ha-form>
               <div class="action">
                 <mwc-button
@@ -125,7 +124,7 @@ class HassioRegistriesDialog extends LitElement {
                     </ha-alert>
                   `}
               <div class="action">
-                <mwc-button @click=${this._addRegistry} dialogInitialFocus>
+                <mwc-button @click=${this._addRegistry}>
                   ${this.supervisor.localize(
                     "dialog.registries.add_new_registry"
                   )}

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

@@ -106,9 +106,6 @@ class HassioRepositoriesDialog extends LitElement {
                     </paper-item-body>
                     <div class="delete">
                       <ha-icon-button
-                        .label=${this._dialogParams!.supervisor.localize(
-                          "dialog.repositories.remove"
-                        )}
                         .disabled=${usedRepositories.includes(repo.slug)}
                         .slug=${repo.slug}
                         .path=${usedRepositories.includes(repo.slug)
@@ -142,7 +139,6 @@ class HassioRepositoriesDialog extends LitElement {
                 "dialog.repositories.add"
               )}
               @keydown=${this._handleKeyAdd}
-              dialogInitialFocus
             ></paper-input>
             <mwc-button @click=${this._addRepository}>
               ${this._processing

hassio/src/entrypoint.ts

@@ -1,12 +1,9 @@
 // Compat needs to be first import
 import "../../src/resources/compatibility";
-import { setCancelSyntheticClickEvents } from "@polymer/polymer/lib/utils/settings";
 import "../../src/resources/roboto";
 import "../../src/resources/safari-14-attachshadow-patch";
 import "./hassio-main";
 
-setCancelSyntheticClickEvents(false);
-
 const styleEl = document.createElement("style");
 styleEl.innerHTML = `
 body {

hassio/src/hassio-main.ts

@@ -121,8 +121,7 @@ export class HassioMain extends SupervisorBaseElement {
       this.parentElement,
       this.hass.themes,
       themeName,
-      themeSettings,
-      true
+      themeSettings
     );
   }
 }

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

@@ -1,10 +1,12 @@
 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";
 import "../../../src/components/ha-alert";
 import "../../../src/components/ha-card";
-import "../../../src/components/ha-select";
 import { extractApiErrorMessage } from "../../../src/data/hassio/common";
 import { fetchHassioLogs } from "../../../src/data/hassio/supervisor";
 import { Supervisor } from "../../../src/data/supervisor/supervisor";
@@ -71,19 +73,24 @@ class HassioSupervisorLog extends LitElement {
           : ""}
         ${this.hass.userData?.showAdvanced
           ? html`
-              <ha-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>
-                  `
-                )}
-              </ha-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>
             `
           : ""}
 
@@ -103,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();
   }
@@ -146,9 +153,9 @@ class HassioSupervisorLog extends LitElement {
         pre {
           white-space: pre-wrap;
         }
-        ha-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";
@@ -45,6 +46,7 @@ import { showAlertDialog } from "../../../src/dialogs/generic/show-dialog-box";
 import "../../../src/layouts/hass-loading-screen";
 import "../../../src/layouts/hass-subpage";
 import "../../../src/layouts/hass-tabs-subpage";
+import { SUPERVISOR_UPDATE_NAMES } from "../../../src/panels/config/dashboard/ha-config-updates";
 import { HomeAssistant, Route } from "../../../src/types";
 import { addonArchIsSupported, extractChangelog } from "../util/addon";
 
@@ -54,12 +56,6 @@ declare global {
   }
 }
 
-const SUPERVISOR_UPDATE_NAMES = {
-  core: "Home Assistant Core",
-  os: "Home Assistant Operating System",
-  supervisor: "Home Assistant Supervisor",
-};
-
 type updateType = "os" | "supervisor" | "core" | "addon";
 
 const changelogUrl = (

package.json

@@ -1,8 +1,8 @@
 {
-  "description": "A frontend for Home Assistant",
+  "description": "A frontend for Home Assistant using the Polymer framework",
   "repository": {
     "type": "git",
-    "url": "https://github.com/home-assistant/frontend"
+    "url": "https://github.com/home-assistant/home-assistant-polymer"
   },
   "name": "home-assistant-frontend",
   "version": "1.0.0",
@@ -46,7 +46,6 @@
     "@fullcalendar/daygrid": "5.9.0",
     "@fullcalendar/interaction": "5.9.0",
     "@fullcalendar/list": "5.9.0",
-    "@lit-labs/motion": "^1.0.2",
     "@lit-labs/virtualizer": "patch:@lit-labs/virtualizer@0.7.0-pre.2#./.yarn/patches/@lit-labs/virtualizer/event-target-shim.patch",
     "@material/chips": "14.0.0-canary.261f2db59.0",
     "@material/data-table": "14.0.0-canary.261f2db59.0",
@@ -72,13 +71,14 @@
     "@material/mwc-textfield": "0.25.3",
     "@material/mwc-top-app-bar-fixed": "^0.25.3",
     "@material/top-app-bar": "14.0.0-canary.261f2db59.0",
-    "@mdi/js": "6.6.95",
-    "@mdi/svg": "6.6.95",
+    "@mdi/js": "6.5.95",
+    "@mdi/svg": "6.5.95",
     "@polymer/app-layout": "^3.1.0",
     "@polymer/iron-flex-layout": "^3.0.1",
     "@polymer/iron-icon": "^3.0.1",
     "@polymer/iron-input": "^3.0.1",
     "@polymer/iron-resizable-behavior": "^3.0.1",
+    "@polymer/paper-dropdown-menu": "^3.2.0",
     "@polymer/paper-input": "^3.2.1",
     "@polymer/paper-item": "^3.0.1",
     "@polymer/paper-listbox": "^3.0.1",
@@ -95,7 +95,6 @@
     "@vibrant/core": "^3.2.1-alpha.1",
     "@vibrant/quantizer-mmcq": "^3.2.1-alpha.1",
     "@vue/web-component-wrapper": "^1.2.0",
-    "@webcomponents/scoped-custom-element-registry": "^0.0.5",
     "@webcomponents/webcomponentsjs": "^2.2.10",
     "app-datepicker": "^5.0.1",
     "chart.js": "^3.3.2",
@@ -107,8 +106,8 @@
     "deep-freeze": "^0.0.1",
     "fuse.js": "^6.0.0",
     "google-timezones-json": "^1.0.2",
-    "hls.js": "^1.1.5",
-    "home-assistant-js-websocket": "^7.0.3",
+    "hls.js": "^1.0.11",
+    "home-assistant-js-websocket": "^6.0.1",
     "idb-keyval": "^5.1.3",
     "intl-messageformat": "^9.9.1",
     "js-yaml": "^4.1.0",
@@ -116,7 +115,7 @@
     "leaflet-draw": "^1.0.4",
     "lit": "^2.1.2",
     "lit-vaadin-helpers": "^0.3.0",
-    "marked": "^4.0.12",
+    "marked": "^3.0.2",
     "memoize-one": "^5.2.1",
     "node-vibrant": "3.2.1-alpha.1",
     "proxy-polyfill": "^0.3.2",
@@ -135,12 +134,13 @@
     "vis-network": "^8.5.4",
     "vue": "^2.6.12",
     "vue2-daterange-picker": "^0.5.1",
-    "workbox-cacheable-response": "^6.4.2",
-    "workbox-core": "^6.4.2",
-    "workbox-expiration": "^6.4.2",
-    "workbox-precaching": "^6.4.2",
-    "workbox-routing": "^6.4.2",
-    "workbox-strategies": "^6.4.2",
+    "web-animations-js": "^2.3.2",
+    "workbox-cacheable-response": "^6.1.5",
+    "workbox-core": "^6.1.5",
+    "workbox-expiration": "^6.1.5",
+    "workbox-precaching": "^6.1.5",
+    "workbox-routing": "^6.1.5",
+    "workbox-strategies": "^6.1.5",
     "xss": "^1.0.9"
   },
   "devDependencies": {
@@ -169,7 +169,7 @@
     "@types/js-yaml": "^4",
     "@types/leaflet": "^1",
     "@types/leaflet-draw": "^1",
-    "@types/marked": "^4",
+    "@types/marked": "^2",
     "@types/mocha": "^8",
     "@types/qrcode": "^1.4.2",
     "@types/sortablejs": "^1",
@@ -196,7 +196,7 @@
     "fs-extra": "^7.0.1",
     "glob": "^7.2.0",
     "gulp": "^4.0.2",
-    "gulp-flatmap": "^1.0.2",
+    "gulp-foreach": "^0.1.0",
     "gulp-json-transform": "^0.4.6",
     "gulp-merge-json": "^1.3.1",
     "gulp-rename": "^2.0.0",
@@ -233,7 +233,7 @@
     "webpack-dev-server": "^4.3.0",
     "webpack-manifest-plugin": "^4.0.2",
     "webpackbar": "^5.0.0-3",
-    "workbox-build": "^6.4.2"
+    "workbox-build": "^6.1.5"
   },
   "_comment": "Polymer 3.2 contained a bug, fixed in https://github.com/Polymer/polymer/pull/5569, add as patch",
   "resolutions": {
@@ -253,6 +253,5 @@
   "prettier": {
     "trailingComma": "es5",
     "arrowParens": "always"
-  },
-  "packageManager": "yarn@3.2.0"
+  }
 }

public/__init__.py

@@ -2,6 +2,6 @@
 from pathlib import Path
 
 
-def where() -> Path:
+def where():
     """Return path to the frontend."""
     return Path(__file__).parent

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
@@ -15,12 +13,12 @@ if [ -z $(which hass) ]; then
   echo "Installing Home Asstant core from dev."
   python3 -m pip install --upgrade \
     colorlog \
-    git+https://github.com/home-assistant/home-assistant.git@dev
+    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      = 20220420.0
+version      = 20220203.0
 author       = The Home Assistant Authors
 author_email = hello@home-assistant.io
 license      = Apache-2.0
@@ -19,8 +19,3 @@ python_requires = >= 3.4.0
 [options.packages.find]
 include =
     hass_frontend*
-
-[mypy]
-python_version = 3.4
-show_error_codes = True
-strict = True

setup.py

@@ -0,0 +1,7 @@
+"""
+Entry point for setuptools. Required for editable installs.
+TODO: Remove file after updating to pip 21.3
+"""
+from setuptools import setup
+
+setup()

src/auth/ha-authorize.ts

@@ -101,19 +101,13 @@ class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
     this._fetchAuthProviders();
 
     if (matchMedia("(prefers-color-scheme: dark)").matches) {
-      applyThemesOnElement(
-        document.documentElement,
-        {
-          default_theme: "default",
-          default_dark_theme: null,
-          themes: {},
-          darkMode: true,
-          theme: "default",
-        },
-        undefined,
-        undefined,
-        true
-      );
+      applyThemesOnElement(document.documentElement, {
+        default_theme: "default",
+        default_dark_theme: null,
+        themes: {},
+        darkMode: true,
+        theme: "default",
+      });
     }
 
     if (!this.redirectUri) {

src/common/const.ts

@@ -187,7 +187,6 @@ export const DOMAINS_WITH_MORE_INFO = [
   "scene",
   "sun",
   "timer",
-  "update",
   "vacuum",
   "water_heater",
   "weather",
@@ -201,7 +200,6 @@ export const DOMAINS_HIDE_DEFAULT_MORE_INFO = [
   "input_text",
   "number",
   "scene",
-  "update",
   "select",
 ];
 

src/common/datetime/create_duration_data.ts

@@ -3,9 +3,9 @@ import type { ForDict } from "../../data/automation";
 
 export const createDurationData = (
   duration: string | number | ForDict | undefined
-): HaDurationData | undefined => {
+): HaDurationData => {
   if (duration === undefined) {
-    return undefined;
+    return {};
   }
   if (typeof duration !== "object") {
     if (typeof duration === "string" || isNaN(duration)) {

src/common/dom/apply_themes_on_element.ts

@@ -31,12 +31,11 @@ export const applyThemesOnElement = (
   element,
   themes: HomeAssistant["themes"],
   selectedTheme?: string,
-  themeSettings?: Partial<HomeAssistant["selectedTheme"]>,
-  main?: boolean
+  themeSettings?: Partial<HomeAssistant["selectedTheme"]>
 ) => {
-  // If there is no explicitly desired theme provided, and the element is the main element we automatically
+  // If there is no explicitly desired theme provided, we automatically
   // use the active one from `themes`.
-  const themeToApply = selectedTheme || (main ? themes.theme : undefined);
+  const themeToApply = selectedTheme || themes.theme;
 
   // If there is no explicitly desired dark mode provided, we automatically
   // use the active one from `themes`.
@@ -48,7 +47,7 @@ export const applyThemesOnElement = (
   let cacheKey = themeToApply;
   let themeRules: Partial<ThemeVars> = {};
 
-  if (themeToApply && darkMode) {
+  if (darkMode) {
     cacheKey = `${cacheKey}__dark`;
     themeRules = { ...darkStyles };
   }

src/common/dom/is-navigation-click.ts

@@ -12,7 +12,7 @@ export const isNavigationClick = (e: MouseEvent) => {
 
   const anchor = e
     .composedPath()
-    .find((n) => (n as HTMLElement).tagName === "A") as
+    .filter((n) => (n as HTMLElement).tagName === "A")[0] as
     | HTMLAnchorElement
     | undefined;
   if (

src/common/entity/binary_sensor_icon.ts

@@ -29,11 +29,8 @@ import {
   mdiPowerPlug,
   mdiPowerPlugOff,
   mdiRadioboxBlank,
+  mdiSmoke,
   mdiSnowflake,
-  mdiSmokeDetector,
-  mdiSmokeDetectorAlert,
-  mdiSmokeDetectorVariant,
-  mdiSmokeDetectorVariantAlert,
   mdiSquare,
   mdiSquareOutline,
   mdiStop,
@@ -55,8 +52,6 @@ export const binarySensorIcon = (state?: string, stateObj?: HassEntity) => {
       return is_off ? mdiBattery : mdiBatteryOutline;
     case "battery_charging":
       return is_off ? mdiBattery : mdiBatteryCharging;
-    case "carbon_monoxide":
-      return is_off ? mdiSmokeDetector : mdiSmokeDetectorAlert;
     case "cold":
       return is_off ? mdiThermometer : mdiSnowflake;
     case "connectivity":
@@ -73,7 +68,7 @@ export const binarySensorIcon = (state?: string, stateObj?: HassEntity) => {
     case "tamper":
       return is_off ? mdiCheckCircle : mdiAlertCircle;
     case "smoke":
-      return is_off ? mdiSmokeDetectorVariant : mdiSmokeDetectorVariantAlert;
+      return is_off ? mdiCheckCircle : mdiSmoke;
     case "heat":
       return is_off ? mdiThermometer : mdiFire;
     case "light":

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

@@ -1,18 +1,12 @@
 import { HassEntity } from "home-assistant-js-websocket";
 import { UNAVAILABLE, UNKNOWN } from "../../data/entity";
 import { FrontendLocaleData } from "../../data/translation";
-import {
-  updateIsInstalling,
-  UpdateEntity,
-  UPDATE_SUPPORT_PROGRESS,
-} from "../../data/update";
 import { formatDate } from "../datetime/format_date";
 import { formatDateTime } from "../datetime/format_date_time";
 import { formatTime } from "../datetime/format_time";
 import { formatNumber, isNumericState } from "../number/format_number";
 import { LocalizeFunc } from "../translations/localize";
 import { computeStateDomain } from "./compute_state_domain";
-import { supportsFeature } from "./supports-feature";
 
 export const computeStateDisplay = (
   localize: LocalizeFunc,
@@ -129,33 +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;
-    }
-  }
-
-  if (domain === "update") {
-    // When updating, and entity does not support % show "Installing"
-    // When updating, and entity does support % show "Installing (xx%)"
-    // When update available, show the version
-    // When the latest version is skipped, show the latest version
-    // When update is not available, show "Up-to-date"
-    // When update is not available and there is no latest_version show "Unavailable"
-    return compareState === "on"
-      ? updateIsInstalling(stateObj as UpdateEntity)
-        ? supportsFeature(stateObj, UPDATE_SUPPORT_PROGRESS)
-          ? localize("ui.card.update.installing_with_progress", {
-              progress: stateObj.attributes.in_progress,
-            })
-          : localize("ui.card.update.installing")
-        : stateObj.attributes.latest_version
-      : stateObj.attributes.skipped_version ===
-        stateObj.attributes.latest_version
-      ? stateObj.attributes.latest_version ??
-        localize("state.default.unavailable")
-      : localize("ui.card.update.up_to_date");
+    return formatDateTime(new Date(compareState), locale);
   }
 
   return (

src/common/entity/compute_state_domain.ts

@@ -1,4 +1,4 @@
-import type { HassEntity } from "home-assistant-js-websocket";
+import { HassEntity } from "home-assistant-js-websocket";
 import { computeDomain } from "./compute_domain";
 
 export const computeStateDomain = (stateObj: HassEntity) =>

src/common/entity/cover_icon.ts

@@ -120,7 +120,6 @@ export const computeOpenIcon = (stateObj: HassEntity): string => {
     case "awning":
     case "door":
     case "gate":
-    case "curtain":
       return mdiArrowExpandHorizontal;
     default:
       return mdiArrowUp;
@@ -132,7 +131,6 @@ export const computeCloseIcon = (stateObj: HassEntity): string => {
     case "awning":
     case "door":
     case "gate":
-    case "curtain":
       return mdiArrowCollapseHorizontal;
     default:
       return mdiArrowDown;

src/common/entity/domain_icon.ts

@@ -8,9 +8,9 @@ import {
   mdiCalendar,
   mdiCast,
   mdiCastConnected,
-  mdiCheckCircleOutline,
   mdiClock,
-  mdiCloseCircleOutline,
+  mdiEmoticonDead,
+  mdiFlash,
   mdiGestureTapButton,
   mdiLanConnect,
   mdiLanDisconnect,
@@ -18,18 +18,20 @@ import {
   mdiLockAlert,
   mdiLockClock,
   mdiLockOpen,
-  mdiPackage,
-  mdiPackageDown,
   mdiPackageUp,
   mdiPowerPlug,
   mdiPowerPlugOff,
   mdiRestart,
-  mdiToggleSwitchVariant,
-  mdiToggleSwitchVariantOff,
+  mdiSleep,
+  mdiTimerSand,
+  mdiToggleSwitch,
+  mdiToggleSwitchOff,
+  mdiCheckCircleOutline,
+  mdiCloseCircleOutline,
   mdiWeatherNight,
+  mdiZWave,
 } from "@mdi/js";
 import { HassEntity } from "home-assistant-js-websocket";
-import { updateIsInstalling, UpdateEntity } from "../../data/update";
 /**
  * Return the icon to be used for a domain.
  *
@@ -108,11 +110,21 @@ export const domainIcon = (
         case "outlet":
           return compareState === "on" ? mdiPowerPlug : mdiPowerPlugOff;
         case "switch":
-          return compareState === "on"
-            ? mdiToggleSwitchVariant
-            : mdiToggleSwitchVariantOff;
+          return compareState === "on" ? mdiToggleSwitch : mdiToggleSwitchOff;
         default:
-          return mdiToggleSwitchVariant;
+          return mdiFlash;
+      }
+
+    case "zwave":
+      switch (compareState) {
+        case "dead":
+          return mdiEmoticonDead;
+        case "sleeping":
+          return mdiSleep;
+        case "initializing":
+          return mdiTimerSand;
+        default:
+          return mdiZWave;
       }
 
     case "sensor": {
@@ -137,13 +149,6 @@ export const domainIcon = (
       return stateObj?.state === "above_horizon"
         ? FIXED_DOMAIN_ICONS[domain]
         : mdiWeatherNight;
-
-    case "update":
-      return compareState === "on"
-        ? updateIsInstalling(stateObj as UpdateEntity)
-          ? mdiPackageDown
-          : mdiPackageUp
-        : mdiPackage;
   }
 
   if (domain in FIXED_DOMAIN_ICONS) {

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

@@ -1,12 +1,12 @@
 import { mdiClose, mdiMagnify } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query } from "lit/decorators";
-import "./ha-icon-button";
-import "./ha-svg-icon";
-import "./ha-textfield";
-import type { HaTextField } from "./ha-textfield";
-import { HomeAssistant } from "../types";
-import { fireEvent } from "../common/dom/fire_event";
+import "../../components/ha-icon-button";
+import "../../components/ha-svg-icon";
+import "../../components/ha-textfield";
+import type { HaTextField } from "../../components/ha-textfield";
+import { HomeAssistant } from "../../types";
+import { fireEvent } from "../dom/fire_event";
 
 @customElement("search-input")
 class SearchInput extends LitElement {
@@ -14,9 +14,6 @@ class SearchInput extends LitElement {
 
   @property() public filter?: string;
 
-  @property({ type: Boolean })
-  public suffix = false;
-
   @property({ type: Boolean })
   public autofocus = false;
 
@@ -35,8 +32,8 @@ class SearchInput extends LitElement {
         .autofocus=${this.autofocus}
         .label=${this.label || "Search"}
         .value=${this.filter || ""}
-        icon
-        .iconTrailing=${this.filter || this.suffix}
+        .icon=${true}
+        .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/string/is_ip_address.ts

@@ -1,4 +0,0 @@
-const regexp =
-  /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
-
-export const isIPAddress = (input: string): boolean => regexp.test(input);

src/common/style/icon_color_css.ts

@@ -7,7 +7,6 @@ export const iconColorCSS = css`
   ha-state-icon[data-domain="calendar"][data-state="on"],
   ha-state-icon[data-domain="camera"][data-state="streaming"],
   ha-state-icon[data-domain="cover"][data-state="open"],
-  ha-state-icon[data-domain="device_tracker"][data-state="home"],
   ha-state-icon[data-domain="fan"][data-state="on"],
   ha-state-icon[data-domain="humidifier"][data-state="on"],
   ha-state-icon[data-domain="light"][data-state="on"],
@@ -16,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"],
@@ -71,6 +69,9 @@ export const iconColorCSS = css`
   }
 
   ha-state-icon[data-domain="plant"][data-state="problem"],
+  ha-state-icon[data-domain="zwave"][data-state="dead"] {
+    color: var(--state-icon-error-color);
+  }
 
   /* Color the icon if unavailable */
   ha-state-icon[data-state="unavailable"] {

src/common/util/debounce.ts

@@ -11,7 +11,7 @@ export const debounce = <T extends any[]>(
   immediate = false
 ) => {
   let timeout: number | undefined;
-  const debouncedFunc = (...args: T): void => {
+  return (...args: T): void => {
     const later = () => {
       timeout = undefined;
       if (!immediate) {
@@ -25,8 +25,4 @@ export const debounce = <T extends any[]>(
       func(...args);
     }
   };
-  debouncedFunc.cancel = () => {
-    clearTimeout(timeout);
-  };
-  return debouncedFunc;
 };

src/common/util/time-cache-entity-promise-func.ts

@@ -1,53 +0,0 @@
-import { HomeAssistant } from "../../types";
-
-interface ResultCache<T> {
-  [entityId: string]: Promise<T> | undefined;
-}
-
-/**
- * Call a function with result caching per entity.
- * @param cacheKey key to store the cache on hass object
- * @param cacheTime time to cache the results
- * @param func function to fetch the data
- * @param hass Home Assistant object
- * @param entityId entity to fetch data for
- * @param args extra arguments to pass to the function to fetch the data
- * @returns
- */
-export const timeCacheEntityPromiseFunc = async <T>(
-  cacheKey: string,
-  cacheTime: number,
-  func: (hass: HomeAssistant, entityId: string, ...args: any[]) => Promise<T>,
-  hass: HomeAssistant,
-  entityId: string,
-  ...args: any[]
-): Promise<T> => {
-  let cache: ResultCache<T> | undefined = (hass as any)[cacheKey];
-
-  if (!cache) {
-    cache = hass[cacheKey] = {};
-  }
-
-  const lastResult = cache[entityId];
-
-  if (lastResult) {
-    return lastResult;
-  }
-
-  const result = func(hass, entityId, ...args);
-  cache[entityId] = result;
-
-  result.then(
-    // When successful, set timer to clear cache
-    () =>
-      setTimeout(() => {
-        cache![entityId] = undefined;
-      }, cacheTime),
-    // On failure, clear cache right away
-    () => {
-      cache![entityId] = undefined;
-    }
-  );
-
-  return result;
-};

src/common/util/time-cache-function-promise.ts

@@ -1,80 +1,43 @@
 import { HomeAssistant } from "../../types";
 
-interface CacheResult<T> {
-  result: T;
-  cacheKey: any;
+interface ResultCache<T> {
+  [entityId: string]: Promise<T> | undefined;
 }
 
-/**
- * Caches a result of a promise for X time. Allows optional extra validation
- * check to invalidate the cache.
- * @param cacheKey the key to store the cache
- * @param cacheTime the time to cache the result
- * @param func the function to fetch the data
- * @param generateCacheKey optional function to generate a cache key based on current hass + cached result. Cache is invalid if generates a different cache key.
- * @param hass Home Assistant object
- * @param args extra arguments to pass to the function to fetch the data
- * @returns
- */
 export const timeCachePromiseFunc = async <T>(
   cacheKey: string,
   cacheTime: number,
-  func: (hass: HomeAssistant, ...args: any[]) => Promise<T>,
-  generateCacheKey:
-    | ((hass: HomeAssistant, lastResult: T) => unknown)
-    | undefined,
+  func: (hass: HomeAssistant, entityId: string, ...args: any[]) => Promise<T>,
   hass: HomeAssistant,
+  entityId: string,
   ...args: any[]
 ): Promise<T> => {
-  const anyHass = hass as any;
-  const lastResult: Promise<CacheResult<T>> | CacheResult<T> | undefined =
-    anyHass[cacheKey];
+  let cache: ResultCache<T> | undefined = (hass as any)[cacheKey];
 
-  const checkCachedResult = (result: CacheResult<T>): T | Promise<T> => {
-    if (
-      !generateCacheKey ||
-      generateCacheKey(hass, result.result) === result.cacheKey
-    ) {
-      return result.result;
-    }
-
-    anyHass[cacheKey] = undefined;
-    return timeCachePromiseFunc(
-      cacheKey,
-      cacheTime,
-      func,
-      generateCacheKey,
-      hass,
-      ...args
-    );
-  };
-
-  // If we have a cached result, return it if it's still valid
-  if (lastResult) {
-    return lastResult instanceof Promise
-      ? lastResult.then(checkCachedResult)
-      : checkCachedResult(lastResult);
+  if (!cache) {
+    cache = hass[cacheKey] = {};
   }
 
-  const resultPromise = func(hass, ...args);
-  anyHass[cacheKey] = resultPromise;
+  const lastResult = cache[entityId];
 
-  resultPromise.then(
+  if (lastResult) {
+    return lastResult;
+  }
+
+  const result = func(hass, entityId, ...args);
+  cache[entityId] = result;
+
+  result.then(
     // When successful, set timer to clear cache
-    (result) => {
-      anyHass[cacheKey] = {
-        result,
-        cacheKey: generateCacheKey?.(hass, result),
-      };
+    () =>
       setTimeout(() => {
-        anyHass[cacheKey] = undefined;
-      }, cacheTime);
-    },
+        cache![entityId] = undefined;
+      }, cacheTime),
     // On failure, clear cache right away
     () => {
-      anyHass[cacheKey] = undefined;
+      cache![entityId] = undefined;
     }
   );
 
-  return resultPromise;
+  return result;
 };

src/components/buttons/ha-progress-button.ts

@@ -1,9 +1,8 @@
 import "@material/mwc-button";
-import { mdiAlertOctagram, mdiCheckBold } from "@mdi/js";
+import type { Button } from "@material/mwc-button";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property, query } from "lit/decorators";
 import "../ha-circular-progress";
-import "../ha-svg-icon";
 
 @customElement("ha-progress-button")
 export class HaProgressButton extends LitElement {
@@ -13,53 +12,38 @@ export class HaProgressButton extends LitElement {
 
   @property({ type: Boolean }) public raised = false;
 
-  @state() private _result?: "success" | "error";
+  @query("mwc-button", true) private _button?: Button;
 
   public render(): TemplateResult {
-    const overlay = this._result || this.progress;
     return html`
       <mwc-button
         ?raised=${this.raised}
         .disabled=${this.disabled || this.progress}
         @click=${this._buttonTapped}
-        class=${this._result || ""}
       >
         <slot></slot>
       </mwc-button>
-      ${!overlay
-        ? ""
-        : html`
-            <div class="progress">
-              ${this._result === "success"
-                ? html`<ha-svg-icon .path=${mdiCheckBold}></ha-svg-icon>`
-                : this._result === "error"
-                ? html`<ha-svg-icon .path=${mdiAlertOctagram}></ha-svg-icon>`
-                : this.progress
-                ? html`
-                    <ha-circular-progress
-                      size="small"
-                      active
-                    ></ha-circular-progress>
-                  `
-                : ""}
-            </div>
-          `}
+      ${this.progress
+        ? html`<div class="progress">
+            <ha-circular-progress size="small" active></ha-circular-progress>
+          </div>`
+        : ""}
     `;
   }
 
   public actionSuccess(): void {
-    this._setResult("success");
+    this._tempClass("success");
   }
 
   public actionError(): void {
-    this._setResult("error");
+    this._tempClass("error");
   }
 
-  private _setResult(result: "success" | "error"): void {
-    this._result = result;
+  private _tempClass(className: string): void {
+    this._button!.classList.add(className);
     setTimeout(() => {
-      this._result = undefined;
-    }, 2000);
+      this._button!.classList.remove(className);
+    }, 1000);
   }
 
   private _buttonTapped(ev: Event): void {
@@ -85,7 +69,6 @@ export class HaProgressButton extends LitElement {
         background-color: var(--success-color);
         transition: none;
         border-radius: 4px;
-        pointer-events: none;
       }
 
       mwc-button[raised].success {
@@ -98,7 +81,6 @@ export class HaProgressButton extends LitElement {
         background-color: var(--error-color);
         transition: none;
         border-radius: 4px;
-        pointer-events: none;
       }
 
       mwc-button[raised].error {
@@ -107,21 +89,13 @@ export class HaProgressButton extends LitElement {
       }
 
       .progress {
-        bottom: 4px;
+        bottom: 0;
+        margin-top: 4px;
         position: absolute;
         text-align: center;
-        top: 4px;
+        top: 0;
         width: 100%;
       }
-
-      ha-svg-icon {
-        color: white;
-      }
-
-      mwc-button.success slot,
-      mwc-button.error slot {
-        visibility: hidden;
-      }
     `;
   }
 }

src/components/chart/statistics-chart.ts

@@ -347,8 +347,8 @@ class StatisticsChart extends LitElement {
         statTypes.forEach((type) => {
           let val: number | null;
           if (type === "sum") {
-            if (initVal === null) {
-              initVal = val = stat.state || 0;
+            if (!initVal) {
+              initVal = val = stat.state;
               prevSum = stat.sum;
             } else {
               val = initVal + ((stat.sum || 0) - prevSum!);

src/components/data-table/ha-data-table.ts

@@ -21,7 +21,7 @@ import { styleMap } from "lit/directives/style-map";
 import memoizeOne from "memoize-one";
 import { restoreScroll } from "../../common/decorators/restore-scroll";
 import { fireEvent } from "../../common/dom/fire_event";
-import "../search-input";
+import "../../common/search/search-input";
 import { debounce } from "../../common/util/debounce";
 import { nextRender } from "../../common/util/render-status";
 import { haStyleScrollbar } from "../../resources/styles";

src/components/date-range-picker.ts

@@ -115,9 +115,6 @@ class DateRangePickerElement extends WrappedElement {
             color: var(--primary-text-color);
             min-width: initial !important;
           }
-          .daterangepicker:before {
-            display: none;
-          }
           .daterangepicker:after {
             border-bottom: 6px solid var(--card-background-color);
           }

src/components/device/ha-device-automation-picker.ts

@@ -1,4 +1,5 @@
 import "@material/mwc-list/mwc-list-item";
+import "@material/mwc-select/mwc-select";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { property, state } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
@@ -7,7 +8,6 @@ import {
   deviceAutomationsEqual,
 } from "../../data/device_automation";
 import { HomeAssistant } from "../../types";
-import "../ha-select";
 
 const NO_AUTOMATION_KEY = "NO_AUTOMATION";
 const UNKNOWN_AUTOMATION_KEY = "UNKNOWN_AUTOMATION";
@@ -90,7 +90,7 @@ export abstract class HaDeviceAutomationPicker<
     }
     const value = this._value;
     return html`
-      <ha-select
+      <mwc-select
         .label=${this.label}
         .value=${value}
         @selected=${this._automationChanged}
@@ -113,7 +113,7 @@ export abstract class HaDeviceAutomationPicker<
             </mwc-list-item>
           `
         )}
-      </ha-select>
+      </mwc-select>
     `;
   }
 
@@ -167,7 +167,7 @@ export abstract class HaDeviceAutomationPicker<
 
   static get styles(): CSSResultGroup {
     return css`
-      ha-select {
+      mwc-select {
         width: 100%;
         margin-top: 4px;
       }

src/components/device/ha-device-picker.ts

@@ -52,8 +52,6 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
 
   @property() public value?: string;
 
-  @property() public helper?: string;
-
   @property() public devices?: DeviceRegistryEntry[];
 
   @property() public areas?: AreaRegistryEntry[];
@@ -88,8 +86,6 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
 
   @property({ type: Boolean }) public disabled?: boolean;
 
-  @property({ type: Boolean }) public required?: boolean;
-
   @state() private _opened?: boolean;
 
   @query("ha-combo-box", true) public comboBox!: HaComboBox;
@@ -271,10 +267,8 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
           ? this.hass.localize("ui.components.device-picker.device")
           : this.label}
         .value=${this._value}
-        .helper=${this.helper}
         .renderer=${rowRenderer}
         .disabled=${this.disabled}
-        .required=${this.required}
         item-value-path="id"
         item-label-path="name"
         @opened-changed=${this._openedChanged}

src/components/device/ha-devices-picker.ts

@@ -1,10 +1,9 @@
-import { css, html, LitElement, TemplateResult } from "lit";
+import { html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import { PolymerChangedEvent } from "../../polymer-types";
 import { HomeAssistant } from "../../types";
 import "./ha-device-picker";
-import type { HaDevicePickerDeviceFilterFunc } from "./ha-device-picker";
 
 @customElement("ha-devices-picker")
 class HaDevicesPicker extends LitElement {
@@ -12,12 +11,6 @@ class HaDevicesPicker extends LitElement {
 
   @property() public value?: string[];
 
-  @property() public helper?: string;
-
-  @property({ type: Boolean }) public disabled?: boolean;
-
-  @property({ type: Boolean }) public required?: boolean;
-
   /**
    * Show entities from specific domains.
    * @type {string}
@@ -42,8 +35,6 @@ class HaDevicesPicker extends LitElement {
 
   @property({ attribute: "pick-device-label" }) public pickDeviceLabel?: string;
 
-  @property() public deviceFilter?: HaDevicePickerDeviceFilterFunc;
-
   protected render(): TemplateResult {
     if (!this.hass) {
       return html``;
@@ -58,13 +49,11 @@ class HaDevicesPicker extends LitElement {
               allow-custom-entity
               .curValue=${entityId}
               .hass=${this.hass}
-              .deviceFilter=${this.deviceFilter}
               .includeDomains=${this.includeDomains}
               .excludeDomains=${this.excludeDomains}
               .includeDeviceClasses=${this.includeDeviceClasses}
               .value=${entityId}
               .label=${this.pickedDeviceLabel}
-              .disabled=${this.disabled}
               @value-changed=${this._deviceChanged}
             ></ha-device-picker>
           </div>
@@ -72,16 +61,11 @@ class HaDevicesPicker extends LitElement {
       )}
       <div>
         <ha-device-picker
-          allow-custom-entity
           .hass=${this.hass}
-          .helper=${this.helper}
-          .deviceFilter=${this.deviceFilter}
           .includeDomains=${this.includeDomains}
           .excludeDomains=${this.excludeDomains}
           .includeDeviceClasses=${this.includeDeviceClasses}
           .label=${this.pickDeviceLabel}
-          .disabled=${this.disabled}
-          .required=${this.required && !currentDevices.length}
           @value-changed=${this._addDevice}
         ></ha-device-picker>
       </div>
@@ -132,12 +116,6 @@ class HaDevicesPicker extends LitElement {
 
     this._updateDevices([...currentDevices, toAdd]);
   }
-
-  static override styles = css`
-    div {
-      margin-top: 8px;
-    }
-  `;
 }
 
 declare global {

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

@@ -14,12 +14,6 @@ class HaEntitiesPickerLight extends LitElement {
 
   @property({ type: Array }) public value?: string[];
 
-  @property({ type: Boolean }) public disabled?: boolean;
-
-  @property({ type: Boolean }) public required?: boolean;
-
-  @property() public helper?: string;
-
   /**
    * Show entities from specific domains.
    * @type {string}
@@ -52,29 +46,11 @@ class HaEntitiesPickerLight extends LitElement {
   @property({ type: Array, attribute: "include-unit-of-measurement" })
   public includeUnitOfMeasurement?: string[];
 
-  /**
-   * List of allowed entities to show. Will ignore all other filters.
-   * @type {Array}
-   * @attr include-entities
-   */
-  @property({ type: Array, attribute: "include-entities" })
-  public includeEntities?: string[];
-
-  /**
-   * List of entities to be excluded.
-   * @type {Array}
-   * @attr exclude-entities
-   */
-  @property({ type: Array, attribute: "exclude-entities" })
-  public excludeEntities?: string[];
-
   @property({ attribute: "picked-entity-label" })
   public pickedEntityLabel?: string;
 
   @property({ attribute: "pick-entity-label" }) public pickEntityLabel?: string;
 
-  @property() public entityFilter?: HaEntityPickerEntityFilterFunc;
-
   protected render(): TemplateResult {
     if (!this.hass) {
       return html``;
@@ -91,14 +67,11 @@ class HaEntitiesPickerLight extends LitElement {
               .hass=${this.hass}
               .includeDomains=${this.includeDomains}
               .excludeDomains=${this.excludeDomains}
-              .includeEntities=${this.includeEntities}
-              .excludeEntities=${this.excludeEntities}
               .includeDeviceClasses=${this.includeDeviceClasses}
               .includeUnitOfMeasurement=${this.includeUnitOfMeasurement}
               .entityFilter=${this._entityFilter}
               .value=${entityId}
               .label=${this.pickedEntityLabel}
-              .disabled=${this.disabled}
               @value-changed=${this._entityChanged}
             ></ha-entity-picker>
           </div>
@@ -106,19 +79,13 @@ class HaEntitiesPickerLight extends LitElement {
       )}
       <div>
         <ha-entity-picker
-          allow-custom-entity
           .hass=${this.hass}
           .includeDomains=${this.includeDomains}
           .excludeDomains=${this.excludeDomains}
-          .includeEntities=${this.includeEntities}
-          .excludeEntities=${this.excludeEntities}
           .includeDeviceClasses=${this.includeDeviceClasses}
           .includeUnitOfMeasurement=${this.includeUnitOfMeasurement}
           .entityFilter=${this._entityFilter}
           .label=${this.pickEntityLabel}
-          .helper=${this.helper}
-          .disabled=${this.disabled}
-          .required=${this.required && !currentEntities.length}
           @value-changed=${this._addEntity}
         ></ha-entity-picker>
       </div>
@@ -127,9 +94,7 @@ class HaEntitiesPickerLight extends LitElement {
 
   private _entityFilter: HaEntityPickerEntityFilterFunc = (
     stateObj: HassEntity
-  ) =>
-    (!this.value || !this.value.includes(stateObj.entity_id)) &&
-    (!this.entityFilter || this.entityFilter(stateObj));
+  ) => !this.value || !this.value.includes(stateObj.entity_id);
 
   private get _currentEntities() {
     return this.value || [];
@@ -149,7 +114,7 @@ class HaEntitiesPickerLight extends LitElement {
     const newValue = event.detail.value;
     if (
       newValue === curValue ||
-      (newValue !== undefined && !isValidEntityId(newValue))
+      (newValue !== "" && !isValidEntityId(newValue))
     ) {
       return;
     }
@@ -182,7 +147,7 @@ class HaEntitiesPickerLight extends LitElement {
   }
 
   static override styles = css`
-    div {
+    ha-entity-picker {
       margin-top: 8px;
     }
   `;

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

@@ -19,8 +19,6 @@ class HaEntityAttributePicker extends LitElement {
 
   @property({ type: Boolean }) public disabled = false;
 
-  @property({ type: Boolean }) public required = false;
-
   @property({ type: Boolean, attribute: "allow-custom-value" })
   public allowCustomValue;
 
@@ -28,8 +26,6 @@ class HaEntityAttributePicker extends LitElement {
 
   @property() public value?: string;
 
-  @property() public helper?: string;
-
   @property({ type: Boolean }) private _opened = false;
 
   @query("ha-combo-box", true) private _comboBox!: HaComboBox;
@@ -65,8 +61,6 @@ class HaEntityAttributePicker extends LitElement {
           "ui.components.entity.entity-attribute-picker.attribute"
         )}
         .disabled=${this.disabled || !this.entityId}
-        .required=${this.required}
-        .helper=${this.helper}
         .allowCustomValue=${this.allowCustomValue}
         item-value-path="value"
         item-label-path="label"

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

@@ -7,7 +7,6 @@ import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
 import { computeDomain } from "../../common/entity/compute_domain";
 import { computeStateName } from "../../common/entity/compute_state_name";
-import { caseInsensitiveStringCompare } from "../../common/string/compare";
 import { PolymerChangedEvent } from "../../polymer-types";
 import { HomeAssistant } from "../../types";
 import "../ha-combo-box";
@@ -16,21 +15,18 @@ import "../ha-icon-button";
 import "../ha-svg-icon";
 import "./state-badge";
 
-interface HassEntityWithCachedName extends HassEntity {
-  friendly_name: string;
-}
-
 export type HaEntityPickerEntityFilterFunc = (entityId: HassEntity) => boolean;
 
 // eslint-disable-next-line lit/prefer-static-styles
-const rowRenderer: ComboBoxLitRenderer<HassEntityWithCachedName> = (item) =>
-  html`<mwc-list-item graphic="avatar" .twoline=${!!item.entity_id}>
-    ${item.state
-      ? html`<state-badge slot="graphic" .stateObj=${item}></state-badge>`
-      : ""}
-    <span>${item.friendly_name}</span>
-    <span slot="secondary">${item.entity_id}</span>
-  </mwc-list-item>`;
+const rowRenderer: ComboBoxLitRenderer<HassEntity & { friendly_name: string }> =
+  (item) =>
+    html`<mwc-list-item graphic="avatar" .twoline=${!!item.entity_id}>
+      ${item.state
+        ? html`<state-badge slot="graphic" .stateObj=${item}></state-badge>`
+        : ""}
+      <span>${item.friendly_name}</span>
+      <span slot="secondary">${item.entity_id}</span>
+    </mwc-list-item>`;
 @customElement("ha-entity-picker")
 export class HaEntityPicker extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -39,8 +35,6 @@ export class HaEntityPicker extends LitElement {
 
   @property({ type: Boolean }) public disabled?: boolean;
 
-  @property({ type: Boolean }) public required?: boolean;
-
   @property({ type: Boolean, attribute: "allow-custom-entity" })
   public allowCustomEntity;
 
@@ -48,8 +42,6 @@ export class HaEntityPicker extends LitElement {
 
   @property() public value?: string;
 
-  @property() public helper?: string;
-
   /**
    * Show entities from specific domains.
    * @type {Array}
@@ -82,22 +74,6 @@ export class HaEntityPicker extends LitElement {
   @property({ type: Array, attribute: "include-unit-of-measurement" })
   public includeUnitOfMeasurement?: string[];
 
-  /**
-   * List of allowed entities to show. Will ignore all other filters.
-   * @type {Array}
-   * @attr include-entities
-   */
-  @property({ type: Array, attribute: "include-entities" })
-  public includeEntities?: string[];
-
-  /**
-   * List of entities to be excluded.
-   * @type {Array}
-   * @attr exclude-entities
-   */
-  @property({ type: Array, attribute: "exclude-entities" })
-  public excludeEntities?: string[];
-
   @property() public entityFilter?: HaEntityPickerEntityFilterFunc;
 
   @property({ type: Boolean }) public hideClearIcon = false;
@@ -120,7 +96,7 @@ export class HaEntityPicker extends LitElement {
 
   private _initedStates = false;
 
-  private _states: HassEntityWithCachedName[] = [];
+  private _states: HassEntity[] = [];
 
   private _getStates = memoizeOne(
     (
@@ -130,11 +106,9 @@ export class HaEntityPicker extends LitElement {
       excludeDomains: this["excludeDomains"],
       entityFilter: this["entityFilter"],
       includeDeviceClasses: this["includeDeviceClasses"],
-      includeUnitOfMeasurement: this["includeUnitOfMeasurement"],
-      includeEntities: this["includeEntities"],
-      excludeEntities: this["excludeEntities"]
-    ): HassEntityWithCachedName[] => {
-      let states: HassEntityWithCachedName[] = [];
+      includeUnitOfMeasurement: this["includeUnitOfMeasurement"]
+    ) => {
+      let states: HassEntity[] = [];
 
       if (!hass) {
         return [];
@@ -148,7 +122,7 @@ export class HaEntityPicker extends LitElement {
             state: "",
             last_changed: "",
             last_updated: "",
-            context: { id: "", user_id: null, parent_id: null },
+            context: { id: "", user_id: null },
             friendly_name: this.hass!.localize(
               "ui.components.entity.entity-picker.no_entities"
             ),
@@ -162,30 +136,6 @@ export class HaEntityPicker extends LitElement {
         ];
       }
 
-      if (includeEntities) {
-        entityIds = entityIds.filter((entityId) =>
-          this.includeEntities!.includes(entityId)
-        );
-
-        return entityIds
-          .map((key) => ({
-            ...hass!.states[key],
-            friendly_name: computeStateName(hass!.states[key]) || key,
-          }))
-          .sort((entityA, entityB) =>
-            caseInsensitiveStringCompare(
-              entityA.friendly_name,
-              entityB.friendly_name
-            )
-          );
-      }
-
-      if (excludeEntities) {
-        entityIds = entityIds.filter(
-          (entityId) => !excludeEntities!.includes(entityId)
-        );
-      }
-
       if (includeDomains) {
         entityIds = entityIds.filter((eid) =>
           includeDomains.includes(computeDomain(eid))
@@ -198,17 +148,10 @@ export class HaEntityPicker extends LitElement {
         );
       }
 
-      states = entityIds
-        .map((key) => ({
-          ...hass!.states[key],
-          friendly_name: computeStateName(hass!.states[key]) || key,
-        }))
-        .sort((entityA, entityB) =>
-          caseInsensitiveStringCompare(
-            entityA.friendly_name,
-            entityB.friendly_name
-          )
-        );
+      states = entityIds.sort().map((key) => ({
+        ...hass!.states[key],
+        friendly_name: computeStateName(hass!.states[key]) || key,
+      }));
 
       if (includeDeviceClasses) {
         states = states.filter(
@@ -247,7 +190,7 @@ export class HaEntityPicker extends LitElement {
             state: "",
             last_changed: "",
             last_updated: "",
-            context: { id: "", user_id: null, parent_id: null },
+            context: { id: "", user_id: null },
             friendly_name: this.hass!.localize(
               "ui.components.entity.entity-picker.no_match"
             ),
@@ -285,9 +228,7 @@ export class HaEntityPicker extends LitElement {
         this.excludeDomains,
         this.entityFilter,
         this.includeDeviceClasses,
-        this.includeUnitOfMeasurement,
-        this.includeEntities,
-        this.excludeEntities
+        this.includeUnitOfMeasurement
       );
       if (this._initedStates) {
         (this.comboBox as any).filteredItems = this._states;
@@ -306,11 +247,9 @@ export class HaEntityPicker extends LitElement {
         .label=${this.label === undefined
           ? this.hass.localize("ui.components.entity.entity-picker.entity")
           : this.label}
-        .helper=${this.helper}
         .allowCustomValue=${this.allowCustomEntity}
         .filteredItems=${this._states}
         .renderer=${rowRenderer}
-        .required=${this.required}
         @opened-changed=${this._openedChanged}
         @value-changed=${this._valueChanged}
         @filter-changed=${this._filterChanged}

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";