Removed unneessary casting

.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/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));
-      }
     `;
   }
 }

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/pages/components/ha-form.ts

@@ -38,7 +38,6 @@ const SCHEMAS: {
       select: "Select",
       icon: "Icon",
       media: "Media",
-      location: "Location",
     },
     schema: [
       { name: "addon", selector: { addon: {} } },
@@ -76,10 +75,6 @@ const SCHEMAS: {
           media: {},
         },
       },
-      {
-        name: "location",
-        selector: { location: { radius: true, icon: "mdi:home" } },
-      },
     ],
   },
   {

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

@@ -168,11 +168,6 @@ const SCHEMAS: {
       },
       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" } },
-      },
     },
   },
 ];
@@ -284,7 +279,7 @@ class DemoHaSelector extends LitElement implements ProvideHassElement {
           can_play: true,
           can_expand: false,
           children_media_class: null,
-          thumbnail: "https://brands.home-assistant.io/_/image/logo.png",
+          thumbnail: null,
         },
         {
           title: "movie.mp4",

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,

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>

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

@@ -1,4 +1,5 @@
 import "@material/mwc-button";
+import "@material/mwc-select";
 import "@material/mwc-list/mwc-list-item";
 import {
   css,
@@ -13,7 +14,6 @@ import { stopPropagation } from "../../../../src/common/dom/stop_propagation";
 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,
@@ -57,7 +57,7 @@ class HassioAddonAudio extends LitElement {
             ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
             : ""}
           ${this._inputDevices &&
-          html`<ha-select
+          html`<mwc-select
             .label=${this.supervisor.localize(
               "addon.configuration.audio.input"
             )}
@@ -74,9 +74,9 @@ class HassioAddonAudio extends LitElement {
                 </mwc-list-item>
               `
             )}
-          </ha-select>`}
+          </mwc-select>`}
           ${this._outputDevices &&
-          html`<ha-select
+          html`<mwc-select
             .label=${this.supervisor.localize(
               "addon.configuration.audio.output"
             )}
@@ -93,7 +93,7 @@ class HassioAddonAudio extends LitElement {
                 >
               `
             )}
-          </ha-select>`}
+          </mwc-select>`}
         </div>
         <div class="card-actions">
           <ha-progress-button @click=${this._saveSettings}>
@@ -119,10 +119,10 @@ class HassioAddonAudio extends LitElement {
         .card-actions {
           text-align: right;
         }
-        ha-select {
+        mwc-select {
           width: 100%;
         }
-        ha-select:last-child {
+        mwc-select:last-child {
           margin-top: 8px;
         }
       `,

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";
@@ -92,8 +92,6 @@ 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) {
@@ -111,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}`);
@@ -175,23 +169,24 @@ export class SupervisorBackupContent extends LitElement {
         : ""}
       ${this.backupType === "partial"
         ? html`<div class="partial-picker">
-            <ha-formfield
+            ${this.backup && this.backup.homeassistant
-              .label=${html`<supervisor-formfield-label
+              ? html`
-                label="Home Assistant"
+                  <ha-formfield
-                .iconPath=${mdiHomeAssistant}
+                    .label=${html`<supervisor-formfield-label
-                .version=${this.backup
+                      label="Home Assistant"
-                  ? this.backup.homeassistant
+                      .iconPath=${mdiHomeAssistant}
-                  : this.hass.config.version}
+                      .version=${this.backup.homeassistant}
-              >
+                    >
-              </supervisor-formfield-label>`}
+                    </supervisor-formfield-label>`}
-            >
+                  >
-              <ha-checkbox
+                    <ha-checkbox
-                .checked=${this.homeAssistant}
+                      .checked=${this.homeAssistant}
-                @click=${this.toggleHomeAssistant}
+                      @click=${this.toggleHomeAssistant}
-              >
+                    >
-              </ha-checkbox>
+                    </ha-checkbox>
-            </ha-formfield>
+                  </ha-formfield>
-
+                `
+              : ""}
             ${foldersSection?.templates.length
               ? html`
                   <ha-formfield

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,11 @@
 import "@material/mwc-list/mwc-list-item";
+import "@material/mwc-select";
 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,12 +89,11 @@ class HassioDatadiskDialog extends LitElement {
                     )}
                     <br /><br />
 
-                    <ha-select
+                    <mwc-select
                       .label=${this.dialogParams.supervisor.localize(
                         "dialog.datadisk_move.select_device"
                       )}
                       @selected=${this._select_device}
-                      dialogInitialFocus
                     >
                       ${this.devices.map(
                         (device) =>
@@ -102,7 +101,7 @@ class HassioDatadiskDialog extends LitElement {
                             >${device}</mwc-list-item
                           >`
                       )}
-                    </ha-select>
+                    </mwc-select>
                   `
                 : this.devices === undefined
                 ? this.dialogParams.supervisor.localize(
@@ -112,11 +111,7 @@ class HassioDatadiskDialog extends LitElement {
                     "dialog.datadisk_move.no_devices"
                   )}
 
-              <mwc-button
+              <mwc-button slot="secondaryAction" @click=${this.closeDialog}>
-                slot="secondaryAction"
-                @click=${this.closeDialog}
-                dialogInitialFocus
-              >
                 ${this.dialogParams.supervisor.localize(
                   "dialog.datadisk_move.cancel"
                 )}
@@ -161,7 +156,7 @@ class HassioDatadiskDialog extends LitElement {
       haStyle,
       haStyleDialog,
       css`
-        ha-select {
+        mwc-select {
           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(

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
+        <ha-markdown .content=${this.content || ""}></ha-markdown>
-          .content=${this.content || ""}
-          dialogInitialFocus
-        ></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/hassio-main.ts

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

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

@@ -4,7 +4,6 @@ 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,7 +70,7 @@ class HassioSupervisorLog extends LitElement {
           : ""}
         ${this.hass.userData?.showAdvanced
           ? html`
-              <ha-select
+              <mwc-select
                 .label=${this.supervisor.localize("system.log.log_provider")}
                 @selected=${this._setLogProvider}
                 .value=${this._selectedLogProvider}
@@ -83,7 +82,7 @@ class HassioSupervisorLog extends LitElement {
                     </mwc-list-item>
                   `
                 )}
-              </ha-select>
+              </mwc-select>
             `
           : ""}
 
@@ -146,7 +145,7 @@ class HassioSupervisorLog extends LitElement {
         pre {
           white-space: pre-wrap;
         }
-        ha-select {
+        mwc-select {
           width: 100%;
           margin-bottom: 4px;
         }

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",
@@ -96,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",
@@ -117,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",
@@ -137,12 +135,12 @@
     "vue": "^2.6.12",
     "vue2-daterange-picker": "^0.5.1",
     "web-animations-js": "^2.3.2",
-    "workbox-cacheable-response": "^6.4.2",
+    "workbox-cacheable-response": "^6.1.5",
-    "workbox-core": "^6.4.2",
+    "workbox-core": "^6.1.5",
-    "workbox-expiration": "^6.4.2",
+    "workbox-expiration": "^6.1.5",
-    "workbox-precaching": "^6.4.2",
+    "workbox-precaching": "^6.1.5",
-    "workbox-routing": "^6.4.2",
+    "workbox-routing": "^6.1.5",
-    "workbox-strategies": "^6.4.2",
+    "workbox-strategies": "^6.1.5",
     "xss": "^1.0.9"
   },
   "devDependencies": {
@@ -171,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",
@@ -198,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",
@@ -235,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": {
@@ -255,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

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name         = home-assistant-frontend
-version      = 20220301.2
+version      = 20220220.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

src/auth/ha-authorize.ts

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

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"]>,
+  themeSettings?: Partial<HomeAssistant["selectedTheme"]>
-  main?: boolean
 ) => {
-  // 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/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/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 "../../components/ha-icon-button";
-import "./ha-svg-icon";
+import "../../components/ha-svg-icon";
-import "./ha-textfield";
+import "../../components/ha-textfield";
-import type { HaTextField } from "./ha-textfield";
+import type { HaTextField } from "../../components/ha-textfield";
-import { HomeAssistant } from "../types";
+import { HomeAssistant } from "../../types";
-import { fireEvent } from "../common/dom/fire_event";
+import { fireEvent } from "../dom/fire_event";
 
 @customElement("search-input")
 class SearchInput extends LitElement {
@@ -35,7 +35,7 @@ class SearchInput extends LitElement {
         .autofocus=${this.autofocus}
         .label=${this.label || "Search"}
         .value=${this.filter || ""}
-        icon
+        .icon=${true}
         .iconTrailing=${this.filter || this.suffix}
         @input=${this._filterInputChanged}
       >

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/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:after {
-            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/entity/ha-entities-picker.ts

@@ -114,7 +114,7 @@ class HaEntitiesPickerLight extends LitElement {
     const newValue = event.detail.value;
     if (
       newValue === curValue ||
-      (newValue !== undefined && !isValidEntityId(newValue))
+      (newValue !== "" && !isValidEntityId(newValue))
     ) {
       return;
     }
@@ -147,7 +147,7 @@ class HaEntitiesPickerLight extends LitElement {
   }
 
   static override styles = css`
-    div {
+    ha-entity-picker {
       margin-top: 8px;
     }
   `;

src/components/ha-base-time-input.ts

@@ -1,6 +1,6 @@
 import { LitElement, html, TemplateResult, css } from "lit";
 import { customElement, property } from "lit/decorators";
-import "./ha-select";
+import "@material/mwc-select/mwc-select";
 import "@material/mwc-list/mwc-list-item";
 import "./ha-textfield";
 import { fireEvent } from "../common/dom/fire_event";
@@ -193,7 +193,7 @@ export class HaBaseTimeInput extends LitElement {
           : ""}
         ${this.format === 24
           ? ""
-          : html`<ha-select
+          : html`<mwc-select
               .required=${this.required}
               .value=${this.amPm}
               .disabled=${this.disabled}
@@ -205,7 +205,7 @@ export class HaBaseTimeInput extends LitElement {
             >
               <mwc-list-item value="AM">AM</mwc-list-item>
               <mwc-list-item value="PM">PM</mwc-list-item>
-            </ha-select>`}
+            </mwc-select>`}
       </div>
     `;
   }
@@ -280,7 +280,7 @@ export class HaBaseTimeInput extends LitElement {
     ha-textfield:last-child {
       --text-field-border-top-right-radius: var(--mdc-shape-medium);
     }
-    ha-select {
+    mwc-select {
       --mdc-shape-small: 0;
       width: 85px;
     }

src/components/ha-blueprint-picker.ts

@@ -1,5 +1,5 @@
 import "@material/mwc-list/mwc-list-item";
-import "./ha-select";
+import "@material/mwc-select/mwc-select";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -24,7 +24,7 @@ class HaBluePrintPicker extends LitElement {
   @property({ type: Boolean }) public disabled = false;
 
   public open() {
-    const select = this.shadowRoot?.querySelector("ha-select");
+    const select = this.shadowRoot?.querySelector("mwc-select");
     if (select) {
       // @ts-expect-error
       select.menuOpen = true;
@@ -49,7 +49,7 @@ class HaBluePrintPicker extends LitElement {
       return html``;
     }
     return html`
-      <ha-select
+      <mwc-select
         .label=${this.label ||
         this.hass.localize("ui.components.blueprint-picker.label")}
         fixedMenuPosition
@@ -71,7 +71,7 @@ class HaBluePrintPicker extends LitElement {
             </mwc-list-item>
           `
         )}
-      </ha-select>
+      </mwc-select>
     `;
   }
 
@@ -101,7 +101,7 @@ class HaBluePrintPicker extends LitElement {
       :host {
         display: inline-block;
       }
-      ha-select {
+      mwc-select {
         width: 100%;
         min-width: 200px;
         display: block;

src/components/ha-button-menu.ts

@@ -1,5 +1,5 @@
 import "@material/mwc-menu";
-import type { Corner, Menu, MenuCorner } from "@material/mwc-menu";
+import type { Corner, Menu } from "@material/mwc-menu";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query } from "lit/decorators";
 
@@ -7,12 +7,6 @@ import { customElement, property, query } from "lit/decorators";
 export class HaButtonMenu extends LitElement {
   @property() public corner: Corner = "TOP_START";
 
-  @property() public menuCorner: MenuCorner = "START";
-
-  @property({ type: Number }) public x?: number;
-
-  @property({ type: Number }) public y?: number;
-
   @property({ type: Boolean }) public multi = false;
 
   @property({ type: Boolean }) public activatable = false;
@@ -38,12 +32,9 @@ export class HaButtonMenu extends LitElement {
       </div>
       <mwc-menu
         .corner=${this.corner}
-        .menuCorner=${this.menuCorner}
         .fixed=${this.fixed}
         .multi=${this.multi}
         .activatable=${this.activatable}
-        .y=${this.y}
-        .x=${this.x}
       >
         <slot></slot>
       </mwc-menu>

src/components/ha-date-input.ts

@@ -41,7 +41,7 @@ export class HaDateInput extends LitElement {
     return html`<ha-textfield
       .label=${this.label}
       .disabled=${this.disabled}
-      iconTrailing
+      iconTrailing="calendar"
       @click=${this._openDialog}
       .value=${this.value
         ? formatDateNumeric(new Date(this.value), this.locale)

src/components/ha-date-range-picker.ts

@@ -3,6 +3,7 @@ import "@material/mwc-list/mwc-list";
 import { ActionDetail } from "@material/mwc-list/mwc-list-foundation";
 import "@material/mwc-list/mwc-list-item";
 import { mdiCalendar } from "@mdi/js";
+import "@polymer/paper-input/paper-input";
 import {
   css,
   CSSResultGroup,
@@ -18,7 +19,6 @@ import { computeRTLDirection } from "../common/util/compute_rtl";
 import { HomeAssistant } from "../types";
 import "./date-range-picker";
 import "./ha-svg-icon";
-import "./ha-textfield";
 
 export interface DateRangePickerRanges {
   [key: string]: [Date, Date];
@@ -61,7 +61,7 @@ export class HaDateRangePicker extends LitElement {
       >
         <div slot="input" class="date-range-inputs">
           <ha-svg-icon .path=${mdiCalendar}></ha-svg-icon>
-          <ha-textfield
+          <paper-input
             .value=${formatDateTime(this.startDate, this.hass.locale)}
             .label=${this.hass.localize(
               "ui.components.date-range-picker.start_date"
@@ -69,16 +69,16 @@ export class HaDateRangePicker extends LitElement {
             .disabled=${this.disabled}
             @click=${this._handleInputClick}
             readonly
-          ></ha-textfield>
+          ></paper-input>
-          <ha-textfield
+          <paper-input
             .value=${formatDateTime(this.endDate, this.hass.locale)}
-            .label=${this.hass.localize(
+            label=${this.hass.localize(
               "ui.components.date-range-picker.end_date"
             )}
             .disabled=${this.disabled}
             @click=${this._handleInputClick}
             readonly
-          ></ha-textfield>
+          ></paper-input>
         </div>
         ${this.ranges
           ? html`<div
@@ -158,13 +158,13 @@ export class HaDateRangePicker extends LitElement {
         border-top: 1px solid var(--divider-color);
       }
 
-      ha-textfield {
+      paper-input {
         display: inline-block;
         max-width: 250px;
         min-width: 200px;
       }
 
-      ha-textfield:last-child {
+      paper-input:last-child {
         margin-left: 8px;
       }
 
@@ -176,7 +176,7 @@ export class HaDateRangePicker extends LitElement {
       }
 
       @media only screen and (max-width: 500px) {
-        ha-textfield {
+        paper-input {
           min-width: inherit;
         }
 

src/components/ha-expansion-panel.ts

@@ -1,13 +1,6 @@
 import { mdiChevronDown } from "@mdi/js";
-import {
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-  css,
+import { customElement, property, query } from "lit/decorators";
-  CSSResultGroup,
-  html,
-  LitElement,
-  PropertyValues,
-  TemplateResult,
-} from "lit";
-import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { fireEvent } from "../common/dom/fire_event";
 import { nextRender } from "../common/util/render-status";
@@ -23,21 +16,11 @@ class HaExpansionPanel extends LitElement {
 
   @property() secondary?: string;
 
-  @state() _showContent = this.expanded;
-
   @query(".container") private _container!: HTMLDivElement;
 
   protected render(): TemplateResult {
     return html`
-      <div
+      <div class="summary" @click=${this._toggleContainer}>
-        id="summary"
-        @click=${this._toggleContainer}
-        @keydown=${this._toggleContainer}
-        role="button"
-        tabindex="0"
-        aria-expanded=${this.expanded}
-        aria-controls="sect1"
-      >
         <slot class="header" name="header">
           ${this.header}
           <slot class="secondary" name="secondary">${this.secondary}</slot>
@@ -50,37 +33,21 @@ class HaExpansionPanel extends LitElement {
       <div
         class="container ${classMap({ expanded: this.expanded })}"
         @transitionend=${this._handleTransitionEnd}
-        role="region"
-        aria-labelledby="summary"
-        aria-hidden=${!this.expanded}
-        tabindex="-1"
       >
-        ${this._showContent ? html`<slot></slot>` : ""}
+        <slot></slot>
       </div>
     `;
   }
 
-  protected willUpdate(changedProps: PropertyValues) {
-    if (changedProps.has("expanded") && this.expanded) {
-      this._showContent = this.expanded;
-    }
-  }
-
   private _handleTransitionEnd() {
     this._container.style.removeProperty("height");
-    this._showContent = this.expanded;
   }
 
-  private async _toggleContainer(ev): Promise<void> {
+  private async _toggleContainer(): Promise<void> {
-    if (ev.type === "keydown" && ev.key !== "Enter" && ev.key !== " ") {
-      return;
-    }
-    ev.preventDefault();
     const newExpanded = !this.expanded;
     fireEvent(this, "expanded-will-change", { expanded: newExpanded });
 
     if (newExpanded) {
-      this._showContent = true;
       // allow for dynamic content to be rendered
       await nextRender();
     }
@@ -113,21 +80,17 @@ class HaExpansionPanel extends LitElement {
           var(--divider-color, #e0e0e0)
         );
         border-radius: var(--ha-card-border-radius, 4px);
+        padding: 0 8px;
       }
 
-      #summary {
+      .summary {
         display: flex;
-        padding: var(--expansion-panel-summary-padding, 0 8px);
+        padding: var(--expansion-panel-summary-padding, 0);
         min-height: 48px;
         align-items: center;
         cursor: pointer;
         overflow: hidden;
         font-weight: 500;
-        outline: none;
-      }
-
-      #summary:focus {
-        background: var(--input-fill-color);
       }
 
       .summary-icon {
@@ -140,7 +103,6 @@ class HaExpansionPanel extends LitElement {
       }
 
       .container {
-        padding: var(--expansion-panel-content-padding, 0 8px);
         overflow: hidden;
         transition: height 300ms cubic-bezier(0.4, 0, 0.2, 1);
         height: 0px;

src/components/ha-file-upload.ts

@@ -1,5 +1,6 @@
-import { styles } from "@material/mwc-textfield/mwc-textfield.css";
 import { mdiClose } from "@mdi/js";
+import "@polymer/iron-input/iron-input";
+import "@polymer/paper-input/paper-input-container";
 import { css, html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
@@ -20,7 +21,7 @@ export class HaFileUpload extends LitElement {
 
   @property() public accept!: string;
 
-  @property() public icon?: string;
+  @property() public icon!: string;
 
   @property() public label!: string;
 
@@ -38,7 +39,15 @@ export class HaFileUpload extends LitElement {
   protected firstUpdated(changedProperties: PropertyValues) {
     super.firstUpdated(changedProperties);
     if (this.autoOpenFileDialog) {
-      this._openFilePicker();
+      this._input?.click();
+    }
+  }
+
+  protected updated(changedProperties: PropertyValues) {
+    if (changedProperties.has("_drag") && !this.uploading) {
+      (
+        this.shadowRoot!.querySelector("paper-input-container") as any
+      )._setFocused(this._drag);
     }
   }
 
@@ -51,75 +60,51 @@ export class HaFileUpload extends LitElement {
             active
           ></ha-circular-progress>`
         : html`
-            <label
+            <label for="input">
-              for="input"
+              <paper-input-container
-              class="mdc-text-field mdc-text-field--filled ${classMap({
+                .alwaysFloatLabel=${Boolean(this.value)}
-                "mdc-text-field--focused": this._drag,
+                @drop=${this._handleDrop}
-                "mdc-text-field--with-leading-icon": Boolean(this.icon),
+                @dragenter=${this._handleDragStart}
-                "mdc-text-field--with-trailing-icon": Boolean(this.value),
+                @dragover=${this._handleDragStart}
-              })}"
+                @dragleave=${this._handleDragEnd}
-              @drop=${this._handleDrop}
+                @dragend=${this._handleDragEnd}
-              @dragenter=${this._handleDragStart}
+                class=${classMap({
-              @dragover=${this._handleDragStart}
+                  dragged: this._drag,
-              @dragleave=${this._handleDragEnd}
+                })}
-              @dragend=${this._handleDragEnd}
-            >
-              <span class="mdc-text-field__ripple"></span>
-              <span
-                class="mdc-floating-label ${this.value || this._drag
-                  ? "mdc-floating-label--float-above"
-                  : ""}"
-                id="label"
-                >${this.label}</span
               >
-              ${this.icon
+                <label for="input" slot="label"> ${this.label} </label>
-                ? html`<span
+                <iron-input slot="input">
-                    class="mdc-text-field__icon mdc-text-field__icon--leading"
+                  <input
-                    tabindex="-1"
+                    id="input"
-                  >
+                    type="file"
-                    <ha-icon-button
+                    class="file"
-                      @click=${this._openFilePicker}
+                    accept=${this.accept}
-                      .path=${this.icon}
+                    @change=${this._handleFilePicked}
-                    ></ha-icon-button>
+                  />
-                  </span>`
+                  ${this.value}
-                : ""}
+                </iron-input>
-              <div class="value">${this.value}</div>
+                ${this.value
-              <input
+                  ? html`
-                id="input"
+                      <ha-icon-button
-                type="file"
+                        slot="suffix"
-                class="mdc-text-field__input file"
+                        @click=${this._clearValue}
-                accept=${this.accept}
+                        .label=${this.hass?.localize("ui.common.close") ||
-                @change=${this._handleFilePicked}
+                        "close"}
-                aria-labelledby="label"
+                        .path=${mdiClose}
-              />
+                      ></ha-icon-button>
-              ${this.value
+                    `
-                ? html`<span
+                  : html`
-                    class="mdc-text-field__icon mdc-text-field__icon--trailing"
+                      <ha-icon-button
-                    tabindex="1"
+                        slot="suffix"
-                  >
+                        .path=${this.icon}
-                    <ha-icon-button
+                      ></ha-icon-button>
-                      slot="suffix"
+                    `}
-                      @click=${this._clearValue}
+              </paper-input-container>
-                      .label=${this.hass?.localize("ui.common.close") ||
-                      "close"}
-                      .path=${mdiClose}
-                    ></ha-icon-button>
-                  </span>`
-                : ""}
-              <span
-                class="mdc-line-ripple ${this._drag
-                  ? "mdc-line-ripple--active"
-                  : ""}"
-              ></span>
             </label>
           `}
     `;
   }
 
-  private _openFilePicker() {
-    this._input?.click();
-  }
-
   private _handleDrop(ev: DragEvent) {
     ev.preventDefault();
     ev.stopPropagation();
@@ -152,66 +137,40 @@ export class HaFileUpload extends LitElement {
   }
 
   static get styles() {
-    return [
+    return css`
-      styles,
+      paper-input-container {
-      css`
+        position: relative;
-        :host {
+        padding: 8px;
-          display: block;
+        margin: 0 -8px;
-        }
+      }
-        .mdc-text-field--filled {
+      paper-input-container.dragged:before {
-          height: auto;
+        position: var(--layout-fit_-_position);
-          padding-top: 16px;
+        top: var(--layout-fit_-_top);
-          cursor: pointer;
+        right: var(--layout-fit_-_right);
-        }
+        bottom: var(--layout-fit_-_bottom);
-        .mdc-text-field--filled.mdc-text-field--with-trailing-icon {
+        left: var(--layout-fit_-_left);
-          padding-top: 28px;
+        background: currentColor;
-        }
+        content: "";
-        .mdc-text-field:not(.mdc-text-field--disabled) .mdc-text-field__icon {
+        opacity: var(--dark-divider-opacity);
-          color: var(--secondary-text-color);
+        pointer-events: none;
-        }
+        border-radius: 4px;
-        .mdc-text-field--filled.mdc-text-field--with-trailing-icon
+      }
-          .mdc-text-field__icon {
+      input.file {
-          align-self: flex-end;
+        display: none;
-        }
+      }
-        .mdc-text-field__icon--leading {
+      img {
-          margin-bottom: 12px;
+        max-width: 125px;
-        }
+        max-height: 125px;
-        .mdc-text-field--filled .mdc-floating-label--float-above {
+      }
-          transform: scale(0.75);
+      ha-icon-button {
-          top: 8px;
+        --mdc-icon-button-size: 24px;
-        }
+        --mdc-icon-size: 20px;
-        .dragged:before {
+      }
-          position: var(--layout-fit_-_position);
+      ha-circular-progress {
-          top: var(--layout-fit_-_top);
+        display: block;
-          right: var(--layout-fit_-_right);
+        text-align-last: center;
-          bottom: var(--layout-fit_-_bottom);
+      }
-          left: var(--layout-fit_-_left);
+    `;
-          background: currentColor;
-          content: "";
-          opacity: var(--dark-divider-opacity);
-          pointer-events: none;
-          border-radius: 4px;
-        }
-        .value {
-          width: 100%;
-        }
-        input.file {
-          display: none;
-        }
-        img {
-          max-width: 100%;
-          max-height: 125px;
-        }
-        ha-icon-button {
-          --mdc-icon-button-size: 24px;
-          --mdc-icon-size: 20px;
-        }
-        ha-circular-progress {
-          display: block;
-          text-align-last: center;
-        }
-      `,
-    ];
   }
 }
 

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

@@ -9,9 +9,7 @@ export class HaFormConstant extends LitElement implements HaFormElement {
   @property() public label!: string;
 
   protected render(): TemplateResult {
-    return html`<span class="label">${this.label}</span>${this.schema.value
+    return html`<span class="label">${this.label}</span>: ${this.schema.value}`;
-        ? `: ${this.schema.value}`
-        : ""}`;
   }
 
   static get styles(): CSSResultGroup {

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

@@ -1,95 +0,0 @@
-import "./ha-form";
-import {
-  css,
-  CSSResultGroup,
-  html,
-  LitElement,
-  PropertyValues,
-  TemplateResult,
-} from "lit";
-import { customElement, property } from "lit/decorators";
-import type {
-  HaFormGridSchema,
-  HaFormDataContainer,
-  HaFormElement,
-  HaFormSchema,
-} from "./types";
-import type { HomeAssistant } from "../../types";
-
-@customElement("ha-form-grid")
-export class HaFormGrid extends LitElement implements HaFormElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public data!: HaFormDataContainer;
-
-  @property({ attribute: false }) public schema!: HaFormGridSchema;
-
-  @property({ type: Boolean }) public disabled = false;
-
-  @property() public computeLabel?: (
-    schema: HaFormSchema,
-    data?: HaFormDataContainer
-  ) => string;
-
-  @property() public computeHelper?: (schema: HaFormSchema) => string;
-
-  protected firstUpdated(changedProps: PropertyValues) {
-    super.firstUpdated(changedProps);
-    this.setAttribute("own-margin", "");
-  }
-
-  protected updated(changedProps: PropertyValues): void {
-    super.updated(changedProps);
-    if (changedProps.has("schema")) {
-      if (this.schema.column_min_width) {
-        this.style.setProperty(
-          "--form-grid-min-width",
-          this.schema.column_min_width
-        );
-      } else {
-        this.style.setProperty("--form-grid-min-width", "");
-      }
-    }
-  }
-
-  protected render(): TemplateResult {
-    return html`
-      ${this.schema.schema.map(
-        (item) =>
-          html`
-            <ha-form
-              .hass=${this.hass}
-              .data=${this.data}
-              .schema=${[item]}
-              .disabled=${this.disabled}
-              .computeLabel=${this.computeLabel}
-              .computeHelper=${this.computeHelper}
-            ></ha-form>
-          `
-      )}
-    `;
-  }
-
-  static get styles(): CSSResultGroup {
-    return css`
-      :host {
-        display: grid !important;
-        grid-template-columns: repeat(
-          var(--form-grid-column-count, auto-fit),
-          minmax(var(--form-grid-min-width, 200px), 1fr)
-        );
-        grid-gap: 8px;
-      }
-      :host > ha-form {
-        display: block;
-        margin-bottom: 24px;
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-form-grid": HaFormGrid;
-  }
-}

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

@@ -1,3 +1,4 @@
+import "@material/mwc-select/mwc-select";
 import { mdiMenuDown, mdiMenuUp } from "@mdi/js";
 import {
   css,

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

@@ -1,14 +1,15 @@
+import "@material/mwc-select";
+import type { Select } from "@material/mwc-select";
 import "@material/mwc-list/mwc-list-item";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
-import { stopPropagation } from "../../common/dom/stop_propagation";
 import "../ha-radio";
-import type { HaRadio } from "../ha-radio";
-import "../ha-select";
-import type { HaSelect } from "../ha-select";
 import { HaFormElement, HaFormSelectData, HaFormSelectSchema } from "./types";
 
+import { stopPropagation } from "../../common/dom/stop_propagation";
+import type { HaRadio } from "../ha-radio";
+
 @customElement("ha-form-select")
 export class HaFormSelect extends LitElement implements HaFormElement {
   @property({ attribute: false }) public schema!: HaFormSelectSchema;
@@ -19,7 +20,7 @@ export class HaFormSelect extends LitElement implements HaFormElement {
 
   @property({ type: Boolean }) public disabled = false;
 
-  @query("ha-select", true) private _input?: HTMLElement;
+  @query("mwc-select", true) private _input?: HTMLElement;
 
   public focus() {
     if (this._input) {
@@ -49,7 +50,7 @@ export class HaFormSelect extends LitElement implements HaFormElement {
     }
 
     return html`
-      <ha-select
+      <mwc-select
         fixedMenuPosition
         naturalMenuWidth
         .label=${this.label}
@@ -66,13 +67,13 @@ export class HaFormSelect extends LitElement implements HaFormElement {
             <mwc-list-item .value=${value}>${label}</mwc-list-item>
           `
         )}
-      </ha-select>
+      </mwc-select>
     `;
   }
 
   private _valueChanged(ev: CustomEvent) {
     ev.stopPropagation();
-    let value: string | undefined = (ev.target as HaSelect | HaRadio).value;
+    let value: string | undefined = (ev.target as Select | HaRadio).value;
 
     if (value === this.data) {
       return;
@@ -89,7 +90,7 @@ export class HaFormSelect extends LitElement implements HaFormElement {
 
   static get styles(): CSSResultGroup {
     return css`
-      ha-select,
+      mwc-select,
       mwc-formfield {
         display: block;
       }

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

@@ -1,18 +1,10 @@
-import {
+import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit";
-  css,
-  CSSResultGroup,
-  html,
-  LitElement,
-  PropertyValues,
-  TemplateResult,
-} from "lit";
 import { customElement, property } from "lit/decorators";
 import { dynamicElement } from "../../common/dom/dynamic-element-directive";
 import { fireEvent } from "../../common/dom/fire_event";
 import "../ha-alert";
 import "./ha-form-boolean";
 import "./ha-form-constant";
-import "./ha-form-grid";
 import "./ha-form-float";
 import "./ha-form-integer";
 import "./ha-form-multi_select";
@@ -22,20 +14,17 @@ import "./ha-form-string";
 import { HaFormElement, HaFormDataContainer, HaFormSchema } from "./types";
 import { HomeAssistant } from "../../types";
 
-const getValue = (obj, item) =>
+const getValue = (obj, item) => (obj ? obj[item.name] : null);
-  obj ? (!item.name ? obj : obj[item.name]) : null;
-
-const getError = (obj, item) => (obj && item.name ? obj[item.name] : null);
 
 let selectorImported = false;
 
 @customElement("ha-form")
 export class HaForm extends LitElement implements HaFormElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
+  @property() public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public data!: HaFormDataContainer;
+  @property() public data!: HaFormDataContainer;
 
-  @property({ attribute: false }) public schema!: HaFormSchema[];
+  @property() public schema!: HaFormSchema[];
 
   @property() public error?: Record<string, string>;
 
@@ -75,7 +64,7 @@ export class HaForm extends LitElement implements HaFormElement {
     }
   }
 
-  protected render(): TemplateResult {
+  protected render() {
     return html`
       <div class="root">
         ${this.error && this.error.base
@@ -86,7 +75,7 @@ export class HaForm extends LitElement implements HaFormElement {
             `
           : ""}
         ${this.schema.map((item) => {
-          const error = getError(this.error, item);
+          const error = getValue(this.error, item);
 
           return html`
             ${error
@@ -112,9 +101,6 @@ export class HaForm extends LitElement implements HaFormElement {
                   data: getValue(this.data, item),
                   label: this._computeLabel(item, this.data),
                   disabled: this.disabled,
-                  hass: this.hass,
-                  computeLabel: this.computeLabel,
-                  computeHelper: this.computeHelper,
                 })}
           `;
         })}
@@ -129,12 +115,8 @@ export class HaForm extends LitElement implements HaFormElement {
       ev.stopPropagation();
       const schema = (ev.target as HaFormElement).schema as HaFormSchema;
 
-      const newValue = !schema.name
-        ? ev.detail.value
-        : { [schema.name]: ev.detail.value };
-
       fireEvent(this, "value-changed", {
-        value: { ...this.data, ...newValue },
+        value: { ...this.data, [schema.name]: ev.detail.value },
       });
     });
     return root;

src/components/ha-form/types.ts

@@ -11,8 +11,7 @@ export type HaFormSchema =
   | HaFormSelectSchema
   | HaFormMultiSelectSchema
   | HaFormTimeSchema
-  | HaFormSelector
+  | HaFormSelector;
-  | HaFormGridSchema;
 
 export interface HaFormBaseSchema {
   name: string;
@@ -26,13 +25,6 @@ export interface HaFormBaseSchema {
   };
 }
 
-export interface HaFormGridSchema extends HaFormBaseSchema {
-  type: "grid";
-  name: "";
-  column_min_width?: string;
-  schema: HaFormSchema[];
-}
-
 export interface HaFormSelector extends HaFormBaseSchema {
   type?: never;
   selector: Selector;
@@ -40,7 +32,7 @@ export interface HaFormSelector extends HaFormBaseSchema {
 
 export interface HaFormConstantSchema extends HaFormBaseSchema {
   type: "constant";
-  value?: string;
+  value: string;
 }
 
 export interface HaFormIntegerSchema extends HaFormBaseSchema {

src/components/ha-qr-scanner.ts

@@ -1,5 +1,6 @@
 import "@material/mwc-button/mwc-button";
 import "@material/mwc-list/mwc-list-item";
+import "@material/mwc-select/mwc-select";
 import { mdiCamera } from "@mdi/js";
 import { css, html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";

src/components/ha-select.ts

@@ -1,57 +0,0 @@
-import { SelectBase } from "@material/mwc-select/mwc-select-base";
-import { styles } from "@material/mwc-select/mwc-select.css";
-import { css, html, nothing } from "lit";
-import { customElement, property } from "lit/decorators";
-import { debounce } from "../common/util/debounce";
-import { nextRender } from "../common/util/render-status";
-
-@customElement("ha-select")
-export class HaSelect extends SelectBase {
-  // @ts-ignore
-  @property({ type: Boolean }) public icon?: boolean;
-
-  protected override renderLeadingIcon() {
-    if (!this.icon) {
-      return nothing;
-    }
-
-    return html`<span class="mdc-select__icon"
-      ><slot name="icon"></slot
-    ></span>`;
-  }
-
-  connectedCallback() {
-    super.connectedCallback();
-    window.addEventListener("translations-updated", this._translationsUpdated);
-  }
-
-  disconnectedCallback() {
-    super.disconnectedCallback();
-    window.removeEventListener(
-      "translations-updated",
-      this._translationsUpdated
-    );
-  }
-
-  private _translationsUpdated = debounce(async () => {
-    await nextRender();
-    this.layoutOptions();
-  }, 500);
-
-  static override styles = [
-    styles,
-    css`
-      .mdc-select:not(.mdc-select--disabled) .mdc-select__icon {
-        color: var(--secondary-text-color);
-      }
-      .mdc-select__anchor {
-        width: var(--ha-select-min-width, 200px);
-      }
-    `,
-  ];
-}
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-select": HaSelect;
-  }
-}

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

@@ -35,12 +35,9 @@ export class HaBooleanSelector extends LitElement {
 
   static get styles(): CSSResultGroup {
     return css`
-      :host {
-        height: 56px;
-        display: flex;
-      }
       ha-formfield {
         width: 100%;
+        margin: 16px 0;
         --mdc-typography-body2-font-size: 1em;
       }
     `;

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

@@ -50,13 +50,7 @@ export class HaEntitySelector extends SubscribeMixin(LitElement) {
 
   private _filterEntities = (entity: HassEntity): boolean => {
     if (this.selector.entity?.domain) {
-      const filterDomain = this.selector.entity.domain;
+      if (computeStateDomain(entity) !== this.selector.entity.domain) {
-      const filterDomainIsArray = Array.isArray(filterDomain);
-      const entityDomain = computeStateDomain(entity);
-      if (
-        (filterDomainIsArray && !filterDomain.includes(entityDomain)) ||
-        (!filterDomainIsArray && entityDomain !== filterDomain)
-      ) {
         return false;
       }
     }

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

@@ -22,8 +22,6 @@ export class HaIconSelector extends LitElement {
       <ha-icon-picker
         .label=${this.label}
         .value=${this.value}
-        .fallbackPath=${this.selector.icon.fallbackPath}
-        .placeholder=${this.selector.icon.placeholder}
         @value-changed=${this._valueChanged}
       ></ha-icon-picker>
     `;

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

@@ -1,80 +0,0 @@
-import { html, LitElement } from "lit";
-import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import { fireEvent } from "../../common/dom/fire_event";
-import type {
-  LocationSelector,
-  LocationSelectorValue,
-} from "../../data/selector";
-import "../../panels/lovelace/components/hui-theme-select-editor";
-import type { HomeAssistant } from "../../types";
-import type { MarkerLocation } from "../map/ha-locations-editor";
-import "../map/ha-locations-editor";
-
-@customElement("ha-selector-location")
-export class HaLocationSelector extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public selector!: LocationSelector;
-
-  @property() public value?: LocationSelectorValue;
-
-  @property() public label?: string;
-
-  @property({ type: Boolean, reflect: true }) public disabled = false;
-
-  protected render() {
-    return html`
-      <ha-locations-editor
-        class="flex"
-        .hass=${this.hass}
-        .locations=${this._location(this.selector, this.value)}
-        @location-updated=${this._locationChanged}
-        @radius-updated=${this._radiusChanged}
-      ></ha-locations-editor>
-    `;
-  }
-
-  private _location = memoizeOne(
-    (
-      selector: LocationSelector,
-      value?: LocationSelectorValue
-    ): MarkerLocation[] => {
-      const computedStyles = getComputedStyle(this);
-      const zoneRadiusColor = selector.location.radius
-        ? computedStyles.getPropertyValue("--zone-radius-color") ||
-          computedStyles.getPropertyValue("--accent-color")
-        : undefined;
-      return [
-        {
-          id: "location",
-          latitude: value?.latitude || this.hass.config.latitude,
-          longitude: value?.longitude || this.hass.config.longitude,
-          radius: selector.location.radius ? value?.radius || 1000 : undefined,
-          radius_color: zoneRadiusColor,
-          icon: selector.location.icon,
-          location_editable: true,
-          radius_editable: true,
-        },
-      ];
-    }
-  );
-
-  private _locationChanged(ev: CustomEvent) {
-    const [latitude, longitude] = ev.detail.location;
-    fireEvent(this, "value-changed", {
-      value: { ...this.value, latitude, longitude },
-    });
-  }
-
-  private _radiusChanged(ev: CustomEvent) {
-    const radius = ev.detail.radius;
-    fireEvent(this, "value-changed", { value: { ...this.value, radius } });
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-selector-location": HaLocationSelector;
-  }
-}

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

@@ -12,7 +12,6 @@ import {
 } from "../../data/media-player";
 import type { MediaSelector, MediaSelectorValue } from "../../data/selector";
 import type { HomeAssistant } from "../../types";
-import { brandsUrl, extractDomainFromBrandUrl } from "../../util/brands-url";
 import "../ha-alert";
 import "../ha-form/ha-form";
 import type { HaFormSchema } from "../ha-form/types";
@@ -51,18 +50,6 @@ export class HaMediaSelector extends LitElement {
         getSignedPath(this.hass, thumbnail).then((signedPath) => {
           this._thumbnailUrl = signedPath.path;
         });
-      } else if (
-        thumbnail &&
-        thumbnail.startsWith("https://brands.home-assistant.io")
-      ) {
-        // The backend is not aware of the theme used by the users,
-        // so we rewrite the URL to show a proper icon
-        this._thumbnailUrl = brandsUrl({
-          domain: extractDomainFromBrandUrl(thumbnail),
-          type: "icon",
-          useFallback: true,
-          darkOptimized: this.hass.themes?.darkMode,
-        });
       } else {
         this._thumbnailUrl = thumbnail;
       }

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

@@ -19,24 +19,22 @@ export class HaNumberSelector extends LitElement {
 
   @property() public label?: string;
 
-  @property({ type: Boolean }) public required = true;
-
   @property({ type: Boolean }) public disabled = false;
 
   protected render() {
-    return html`${this.selector.number.mode !== "box"
+    return html`${this.label}
-        ? html`${this.label}<ha-slider
+      ${this.selector.number.mode !== "box"
-              .min=${this.selector.number.min}
+        ? html`<ha-slider
-              .max=${this.selector.number.max}
+            .min=${this.selector.number.min}
-              .value=${this._value}
+            .max=${this.selector.number.max}
-              .step=${this.selector.number.step ?? 1}
+            .value=${this._value}
-              .disabled=${this.disabled}
+            .step=${this.selector.number.step ?? 1}
-              .required=${this.required}
+            .disabled=${this.disabled}
-              pin
+            pin
-              ignore-bar-touch
+            ignore-bar-touch
-              @change=${this._handleSliderChange}
+            @change=${this._handleSliderChange}
-            >
+          >
-            </ha-slider>`
+          </ha-slider>`
         : ""}
       <ha-textfield
         inputMode="numeric"
@@ -46,10 +44,9 @@ export class HaNumberSelector extends LitElement {
         class=${classMap({ single: this.selector.number.mode === "box" })}
         .min=${this.selector.number.min}
         .max=${this.selector.number.max}
-        .value=${this.value || ""}
+        .value=${this.value}
         .step=${this.selector.number.step ?? 1}
         .disabled=${this.disabled}
-        .required=${this.required}
         .suffix=${this.selector.number.unit_of_measurement}
         type="number"
         autoValidate
@@ -60,16 +57,14 @@ export class HaNumberSelector extends LitElement {
   }
 
   private get _value() {
-    return this.value ?? (this.selector.number.min || 0);
+    return this.value ?? 0;
   }
 
   private _handleInputChange(ev) {
     ev.stopPropagation();
     const value =
       ev.target.value === "" || isNaN(ev.target.value)
-        ? this.required
+        ? undefined
-          ? this.selector.number.min || 0
-          : undefined
         : Number(ev.target.value);
     if (this.value === value) {
       return;

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

@@ -1,11 +1,11 @@
-import "@material/mwc-list/mwc-list-item";
 import { css, CSSResultGroup, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import { stopPropagation } from "../../common/dom/stop_propagation";
 import { SelectOption, SelectSelector } from "../../data/selector";
 import { HomeAssistant } from "../../types";
-import "../ha-select";
+import "@material/mwc-select/mwc-select";
+import "@material/mwc-list/mwc-list-item";
 
 @customElement("ha-selector-select")
 export class HaSelectSelector extends LitElement {
@@ -22,7 +22,7 @@ export class HaSelectSelector extends LitElement {
   @property({ type: Boolean }) public disabled = false;
 
   protected render() {
-    return html`<ha-select
+    return html`<mwc-select
       fixedMenuPosition
       naturalMenuWidth
       .label=${this.label}
@@ -38,7 +38,7 @@ export class HaSelectSelector extends LitElement {
 
         return html`<mwc-list-item .value=${value}>${label}</mwc-list-item>`;
       })}
-    </ha-select>`;
+    </mwc-select>`;
   }
 
   private _valueChanged(ev) {
@@ -53,7 +53,7 @@ export class HaSelectSelector extends LitElement {
 
   static get styles(): CSSResultGroup {
     return css`
-      ha-select {
+      mwc-select {
         width: 100%;
       }
     `;

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

@@ -69,14 +69,10 @@ export class HaTextSelector extends LitElement {
   }
 
   private _handleChange(ev) {
-    let value = ev.target.value;
+    const value = ev.target.value;
     if (this.value === value) {
       return;
     }
-    if (value === "" && !this.required) {
-      value = undefined;
-    }
-
     fireEvent(this, "value-changed", { value });
   }
 

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

@@ -1,34 +0,0 @@
-import "../../panels/lovelace/components/hui-theme-select-editor";
-import { html, LitElement } from "lit";
-import { customElement, property } from "lit/decorators";
-import type { HomeAssistant } from "../../types";
-import type { ThemeSelector } from "../../data/selector";
-
-@customElement("ha-selector-theme")
-export class HaThemeSelector extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public selector!: ThemeSelector;
-
-  @property() public value?: string;
-
-  @property() public label?: string;
-
-  @property({ type: Boolean, reflect: true }) public disabled = false;
-
-  protected render() {
-    return html`
-      <hui-theme-select-editor
-        .hass=${this.hass}
-        .value=${this.value}
-        .label=${this.label}
-      ></hui-theme-select-editor>
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-selector-theme": HaThemeSelector;
-  }
-}

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

@@ -1,8 +1,8 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { dynamicElement } from "../../common/dom/dynamic-element-directive";
-import type { Selector } from "../../data/selector";
+import { Selector } from "../../data/selector";
-import type { HomeAssistant } from "../../types";
+import { HomeAssistant } from "../../types";
 import "./ha-selector-action";
 import "./ha-selector-addon";
 import "./ha-selector-area";
@@ -19,8 +19,6 @@ import "./ha-selector-text";
 import "./ha-selector-time";
 import "./ha-selector-icon";
 import "./ha-selector-media";
-import "./ha-selector-theme";
-import "./ha-selector-location";
 
 @customElement("ha-selector")
 export class HaSelector extends LitElement {

src/components/ha-textfield.ts

@@ -9,12 +9,6 @@ export class HaTextField extends TextFieldBase {
 
   @property({ attribute: "error-message" }) public errorMessage?: string;
 
-  // @ts-ignore
-  @property({ type: Boolean }) public icon?: boolean;
-
-  // @ts-ignore
-  @property({ type: Boolean }) public iconTrailing?: boolean;
-
   override updated(changedProperties: PropertyValues) {
     super.updated(changedProperties);
     if (
@@ -59,15 +53,6 @@ export class HaTextField extends TextFieldBase {
         padding-right: var(--text-field-suffix-padding-right, 0px);
       }
 
-      .mdc-text-field:not(.mdc-text-field--disabled)
-        .mdc-text-field__affix--suffix {
-        color: var(--secondary-text-color);
-      }
-
-      .mdc-text-field__icon {
-        color: var(--secondary-text-color);
-      }
-
       input {
         text-align: var(--text-field-text-align);
       }

src/components/ha-web-rtc-player.ts

@@ -43,7 +43,7 @@ class HaWebRtcPlayer extends LitElement {
 
   private _remoteStream?: MediaStream;
 
-  protected override render(): TemplateResult {
+  protected render(): TemplateResult {
     if (this._error) {
       return html`<ha-alert alert-type="error">${this._error}</ha-alert>`;
     }
@@ -58,19 +58,12 @@ class HaWebRtcPlayer extends LitElement {
     `;
   }
 
-  public override connectedCallback() {
+  public disconnectedCallback() {
-    super.connectedCallback();
-    if (this.hasUpdated) {
-      this._startWebRtc();
-    }
-  }
-
-  public override disconnectedCallback() {
     super.disconnectedCallback();
     this._cleanUp();
   }
 
-  protected override updated(changedProperties: PropertyValues<this>) {
+  protected updated(changedProperties: PropertyValues<this>) {
     if (!changedProperties.has("entityid")) {
       return;
     }

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

@@ -1,337 +0,0 @@
-import { animate } from "@lit-labs/motion";
-import "@material/mwc-list/mwc-list";
-import "@material/mwc-list/mwc-list-item";
-import { mdiClose, mdiDelete } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { repeat } from "lit/directives/repeat";
-import { fireEvent } from "../../common/dom/fire_event";
-import { computeRTLDirection } from "../../common/util/compute_rtl";
-import {
-  MediaClassBrowserSettings,
-  MediaPlayerItem,
-} from "../../data/media-player";
-import {
-  browseLocalMediaPlayer,
-  removeLocalMedia,
-} from "../../data/media_source";
-import { showConfirmationDialog } from "../../dialogs/generic/show-dialog-box";
-import { haStyleDialog } from "../../resources/styles";
-import type { HomeAssistant } from "../../types";
-import "../ha-circular-progress";
-import "../ha-dialog";
-import "../ha-header-bar";
-import "../ha-svg-icon";
-import "../ha-check-list-item";
-import "./ha-media-player-browse";
-import "./ha-media-upload-button";
-import type { MediaManageDialogParams } from "./show-media-manage-dialog";
-
-@customElement("dialog-media-manage")
-class DialogMediaManage extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @state() private _currentItem?: MediaPlayerItem;
-
-  @state() private _params?: MediaManageDialogParams;
-
-  @state() private _uploading = false;
-
-  @state() private _deleting = false;
-
-  @state() private _selected = new Set<number>();
-
-  private _filesChanged = false;
-
-  public showDialog(params: MediaManageDialogParams): void {
-    this._params = params;
-    this._refreshMedia();
-  }
-
-  public closeDialog() {
-    if (this._filesChanged && this._params!.onClose) {
-      this._params!.onClose();
-    }
-    this._params = undefined;
-    this._currentItem = undefined;
-    this._uploading = false;
-    this._deleting = false;
-    this._filesChanged = false;
-    fireEvent(this, "dialog-closed", { dialog: this.localName });
-  }
-
-  protected render(): TemplateResult {
-    if (!this._params) {
-      return html``;
-    }
-
-    const children =
-      this._currentItem?.children?.filter((child) => !child.can_expand) || [];
-
-    let fileIndex = 0;
-
-    return html`
-      <ha-dialog
-        open
-        scrimClickAction
-        escapeKeyAction
-        hideActions
-        flexContent
-        .heading=${this._params.currentItem.title}
-        @closed=${this.closeDialog}
-      >
-        <ha-header-bar slot="heading">
-          ${this._selected.size === 0
-            ? html`
-                <span slot="title">
-                  ${this.hass.localize(
-                    "ui.components.media-browser.file_management.title"
-                  )}
-                </span>
-
-                <ha-media-upload-button
-                  .disabled=${this._deleting}
-                  .hass=${this.hass}
-                  .currentItem=${this._params.currentItem}
-                  @uploading=${this._startUploading}
-                  @media-refresh=${this._doneUploading}
-                  slot="actionItems"
-                ></ha-media-upload-button>
-                ${this._uploading
-                  ? ""
-                  : html`
-                      <ha-icon-button
-                        .label=${this.hass.localize("ui.dialogs.generic.close")}
-                        .path=${mdiClose}
-                        dialogAction="close"
-                        slot="actionItems"
-                        class="header_button"
-                        dir=${computeRTLDirection(this.hass)}
-                      ></ha-icon-button>
-                    `}
-              `
-            : html`
-                <mwc-button
-                  class="danger"
-                  slot="title"
-                  .disabled=${this._deleting}
-                  .label=${this.hass.localize(
-                    `ui.components.media-browser.file_management.${
-                      this._deleting ? "deleting" : "delete"
-                    }`,
-                    { count: this._selected.size }
-                  )}
-                  @click=${this._handleDelete}
-                >
-                  <ha-svg-icon .path=${mdiDelete} slot="icon"></ha-svg-icon>
-                </mwc-button>
-
-                ${this._deleting
-                  ? ""
-                  : html`
-                      <mwc-button
-                        slot="actionItems"
-                        .label=${`Deselect all`}
-                        @click=${this._handleDeselectAll}
-                      >
-                        <ha-svg-icon
-                          .path=${mdiClose}
-                          slot="icon"
-                        ></ha-svg-icon>
-                      </mwc-button>
-                    `}
-              `}
-        </ha-header-bar>
-        ${!this._currentItem
-          ? html`
-              <div class="refresh">
-                <ha-circular-progress active></ha-circular-progress>
-              </div>
-            `
-          : !children.length
-          ? html`<div class="no-items">
-              <p>
-                ${this.hass.localize(
-                  "ui.components.media-browser.file_management.no_items"
-                )}
-              </p>
-              ${this._currentItem?.children?.length
-                ? html`<span class="folders"
-                    >${this.hass.localize(
-                      "ui.components.media-browser.file_management.folders_not_supported"
-                    )}</span
-                  >`
-                : ""}
-            </div>`
-          : html`
-              <mwc-list multi @selected=${this._handleSelected}>
-                ${repeat(
-                  children,
-                  (item) => item.media_content_id,
-                  (item) => {
-                    const icon = html`
-                      <ha-svg-icon
-                        slot="graphic"
-                        .path=${MediaClassBrowserSettings[
-                          item.media_class === "directory"
-                            ? item.children_media_class || item.media_class
-                            : item.media_class
-                        ].icon}
-                      ></ha-svg-icon>
-                    `;
-                    return html`
-                      <ha-check-list-item
-                        ${animate({
-                          id: item.media_content_id,
-                          skipInitial: true,
-                        })}
-                        graphic="icon"
-                        .disabled=${this._uploading || this._deleting}
-                        .selected=${this._selected.has(fileIndex++)}
-                        .item=${item}
-                      >
-                        ${icon} ${item.title}
-                      </ha-check-list-item>
-                    `;
-                  }
-                )}
-              </mwc-list>
-            `}
-      </ha-dialog>
-    `;
-  }
-
-  private _handleSelected(ev) {
-    this._selected = ev.detail.index;
-  }
-
-  private _startUploading() {
-    this._uploading = true;
-    this._filesChanged = true;
-  }
-
-  private _doneUploading() {
-    this._uploading = false;
-    this._refreshMedia();
-  }
-
-  private _handleDeselectAll() {
-    if (this._selected.size) {
-      this._selected = new Set();
-    }
-  }
-
-  private async _handleDelete() {
-    if (
-      !(await showConfirmationDialog(this, {
-        text: this.hass.localize(
-          "ui.components.media-browser.file_management.confirm_delete",
-          { count: this._selected.size }
-        ),
-        warning: true,
-      }))
-    ) {
-      return;
-    }
-    this._filesChanged = true;
-    this._deleting = true;
-
-    const toDelete: MediaPlayerItem[] = [];
-    let fileIndex = 0;
-    this._currentItem!.children!.forEach((item) => {
-      if (item.can_expand) {
-        return;
-      }
-      if (this._selected.has(fileIndex++)) {
-        toDelete.push(item);
-      }
-    });
-
-    try {
-      await Promise.all(
-        toDelete.map(async (item) => {
-          await removeLocalMedia(this.hass, item.media_content_id);
-          this._currentItem = {
-            ...this._currentItem!,
-            children: this._currentItem!.children!.filter((i) => i !== item),
-          };
-        })
-      );
-    } finally {
-      this._deleting = false;
-      this._selected = new Set();
-    }
-  }
-
-  private async _refreshMedia() {
-    this._selected = new Set();
-    this._currentItem = undefined;
-    this._currentItem = await browseLocalMediaPlayer(
-      this.hass,
-      this._params!.currentItem.media_content_id
-    );
-  }
-
-  static get styles(): CSSResultGroup {
-    return [
-      haStyleDialog,
-      css`
-        ha-dialog {
-          --dialog-z-index: 8;
-          --dialog-content-padding: 0;
-        }
-
-        @media (min-width: 800px) {
-          ha-dialog {
-            --mdc-dialog-max-width: 800px;
-            --dialog-surface-position: fixed;
-            --dialog-surface-top: 40px;
-            --mdc-dialog-max-height: calc(100vh - 72px);
-          }
-        }
-
-        ha-header-bar {
-          --mdc-theme-on-primary: var(--primary-text-color);
-          --mdc-theme-primary: var(--mdc-theme-surface);
-          flex-shrink: 0;
-          border-bottom: 1px solid var(--divider-color, rgba(0, 0, 0, 0.12));
-        }
-
-        ha-media-upload-button,
-        mwc-button {
-          --mdc-theme-primary: var(--mdc-theme-on-primary);
-        }
-
-        .danger {
-          --mdc-theme-primary: var(--error-color);
-        }
-
-        ha-svg-icon[slot="icon"] {
-          vertical-align: middle;
-        }
-
-        .refresh {
-          display: flex;
-          height: 200px;
-          justify-content: center;
-          align-items: center;
-        }
-
-        .no-items {
-          text-align: center;
-          padding: 16px;
-        }
-        .folders {
-          color: var(--secondary-text-color);
-          font-style: italic;
-        }
-      `,
-    ];
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "dialog-media-manage": DialogMediaManage;
-  }
-}

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

@@ -1,7 +1,7 @@
 import "../ha-header-bar";
 import { mdiArrowLeft, mdiClose } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import { fireEvent, HASSDomEvent } from "../../common/dom/fire_event";
 import { computeRTLDirection } from "../../common/util/compute_rtl";
 import type {
@@ -13,11 +13,7 @@ import { haStyleDialog } from "../../resources/styles";
 import type { HomeAssistant } from "../../types";
 import "../ha-dialog";
 import "./ha-media-player-browse";
-import "./ha-media-manage-button";
+import type { MediaPlayerItemId } from "./ha-media-player-browse";
-import type {
-  HaMediaPlayerBrowse,
-  MediaPlayerItemId,
-} from "./ha-media-player-browse";
 import { MediaPlayerBrowseDialogParams } from "./show-media-browser-dialog";
 
 @customElement("dialog-media-player-browse")
@@ -30,8 +26,6 @@ class DialogMediaPlayerBrowse extends LitElement {
 
   @state() private _params?: MediaPlayerBrowseDialogParams;
 
-  @query("ha-media-player-browse") private _browser!: HaMediaPlayerBrowse;
-
   public showDialog(params: MediaPlayerBrowseDialogParams): void {
     this._params = params;
     this._navigateIds = params.navigateIds || [
@@ -86,12 +80,6 @@ class DialogMediaPlayerBrowse extends LitElement {
               : this._currentItem.title}
           </span>
 
-          <ha-media-manage-button
-            slot="actionItems"
-            .hass=${this.hass}
-            .currentItem=${this._currentItem}
-            @media-refresh=${this._refreshMedia}
-          ></ha-media-manage-button>
           <ha-icon-button
             .label=${this.hass.localize("ui.dialogs.generic.close")}
             .path=${mdiClose}
@@ -136,10 +124,6 @@ class DialogMediaPlayerBrowse extends LitElement {
     return this._params!.action || "play";
   }
 
-  private _refreshMedia() {
-    this._browser.refresh();
-  }
-
   static get styles(): CSSResultGroup {
     return [
       haStyleDialog,
@@ -173,10 +157,6 @@ class DialogMediaPlayerBrowse extends LitElement {
           flex-shrink: 0;
           border-bottom: 1px solid var(--divider-color, rgba(0, 0, 0, 0.12));
         }
-
-        ha-media-manage-button {
-          --mdc-theme-primary: var(--mdc-theme-on-primary);
-        }
       `,
     ];
   }

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

@@ -1,10 +1,9 @@
+import "@material/mwc-select";
 import "@material/mwc-list/mwc-list-item";
 import { css, html, LitElement, PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
-import { LocalStorage } from "../../common/decorators/local-storage";
 import { fireEvent } from "../../common/dom/fire_event";
-import { stopPropagation } from "../../common/dom/stop_propagation";
 import { fetchCloudStatus, updateCloudPref } from "../../data/cloud";
 import {
   CloudTTSInfo,
@@ -16,11 +15,12 @@ import {
   MediaPlayerBrowseAction,
   MediaPlayerItem,
 } from "../../data/media-player";
-import { showAlertDialog } from "../../dialogs/generic/show-dialog-box";
-import { buttonLinkStyle } from "../../resources/styles";
 import { HomeAssistant } from "../../types";
-import "../ha-select";
 import "../ha-textarea";
+import { buttonLinkStyle } from "../../resources/styles";
+import { showAlertDialog } from "../../dialogs/generic/show-dialog-box";
+import { LocalStorage } from "../../common/decorators/local-storage";
+import { stopPropagation } from "../../common/dom/stop_propagation";
 
 export interface TtsMediaPickedEvent {
   item: MediaPlayerItem;
@@ -103,7 +103,7 @@ class BrowseMediaTTS extends LitElement {
 
     return html`
       <div class="cloud-options">
-        <ha-select
+        <mwc-select
           fixedMenuPosition
           naturalMenuWidth
           .label=${this.hass.localize(
@@ -117,9 +117,9 @@ class BrowseMediaTTS extends LitElement {
             ([key, label]) =>
               html`<mwc-list-item .value=${key}>${label}</mwc-list-item>`
           )}
-        </ha-select>
+        </mwc-select>
 
-        <ha-select
+        <mwc-select
           fixedMenuPosition
           naturalMenuWidth
           .label=${this.hass.localize("ui.components.media-browser.tts.gender")}
@@ -131,7 +131,7 @@ class BrowseMediaTTS extends LitElement {
             ([key, label]) =>
               html`<mwc-list-item .value=${key}>${label}</mwc-list-item>`
           )}
-        </ha-select>
+        </mwc-select>
       </div>
     `;
   }
@@ -256,7 +256,7 @@ class BrowseMediaTTS extends LitElement {
         display: flex;
         justify-content: space-between;
       }
-      .cloud-options ha-select {
+      .cloud-options mwc-select {
         width: 48%;
       }
       ha-textarea {

src/components/media-player/ha-media-manage-button.ts

@@ -1,69 +0,0 @@
-import { mdiFolderEdit } from "@mdi/js";
-import "@material/mwc-button";
-import { css, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { MediaPlayerItem } from "../../data/media-player";
-import "../ha-svg-icon";
-import { isLocalMediaSourceContentId } from "../../data/media_source";
-import type { HomeAssistant } from "../../types";
-import { showMediaManageDialog } from "./show-media-manage-dialog";
-import { fireEvent } from "../../common/dom/fire_event";
-
-declare global {
-  interface HASSDomEvents {
-    "media-refresh": unknown;
-  }
-}
-
-@customElement("ha-media-manage-button")
-class MediaManageButton extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property() currentItem?: MediaPlayerItem;
-
-  @state() _uploading = 0;
-
-  protected render(): TemplateResult {
-    if (
-      !this.currentItem ||
-      !isLocalMediaSourceContentId(this.currentItem.media_content_id || "")
-    ) {
-      return html``;
-    }
-    return html`
-      <mwc-button
-        .label=${this.hass.localize(
-          "ui.components.media-browser.file_management.manage"
-        )}
-        @click=${this._manage}
-      >
-        <ha-svg-icon .path=${mdiFolderEdit} slot="icon"></ha-svg-icon>
-      </mwc-button>
-    `;
-  }
-
-  private _manage() {
-    showMediaManageDialog(this, {
-      currentItem: this.currentItem!,
-      onClose: () => fireEvent(this, "media-refresh"),
-    });
-  }
-
-  static styles = css`
-    mwc-button {
-      /* We use icon + text to show disabled state */
-      --mdc-button-disabled-ink-color: --mdc-theme-primary;
-    }
-
-    ha-svg-icon[slot="icon"],
-    ha-circular-progress[slot="icon"] {
-      vertical-align: middle;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-media-manage-button": MediaManageButton;
-  }
-}

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

@@ -34,24 +34,23 @@ import {
   MediaPickedEvent,
   MediaPlayerBrowseAction,
 } from "../../data/media-player";
-import { browseLocalMediaPlayer } from "../../data/media_source";
-import { isTTSMediaSource } from "../../data/tts";
 import { showAlertDialog } from "../../dialogs/generic/show-dialog-box";
 import { installResizeObserver } from "../../panels/lovelace/common/install-resize-observer";
 import { haStyle } from "../../resources/styles";
 import type { HomeAssistant } from "../../types";
-import { brandsUrl, extractDomainFromBrandUrl } from "../../util/brands-url";
 import { documentationUrl } from "../../util/documentation-url";
 import "../entity/ha-entity-picker";
 import "../ha-button-menu";
 import "../ha-card";
 import type { HaCard } from "../ha-card";
 import "../ha-circular-progress";
-import "../ha-fab";
 import "../ha-icon-button";
 import "../ha-svg-icon";
-import "./ha-browse-media-tts";
+import "../ha-fab";
+import { browseLocalMediaPlayer } from "../../data/media_source";
+import { isTTSMediaSource } from "../../data/tts";
 import type { TtsMediaPickedEvent } from "./ha-browse-media-tts";
+import "./ha-browse-media-tts";
 
 declare global {
   interface HASSDomEvents {
@@ -132,11 +131,6 @@ export class HaMediaPlayerBrowse extends LitElement {
         currentId.media_content_id,
         currentId.media_content_type
       );
-      // Update the parent with latest item.
-      fireEvent(this, "media-browsed", {
-        ids: this.navigateIds,
-        current: this._currentItem,
-      });
     } catch (err) {
       this._setError(err);
     }
@@ -164,11 +158,10 @@ export class HaMediaPlayerBrowse extends LitElement {
     const subtitle = this.hass.localize(
       `ui.components.media-browser.class.${currentItem.media_class}`
     );
-    const children = currentItem.children || [];
+
     const mediaClass = MediaClassBrowserSettings[currentItem.media_class];
-    const childrenMediaClass = currentItem.children_media_class
+    const childrenMediaClass =
-      ? MediaClassBrowserSettings[currentItem.children_media_class]
+      MediaClassBrowserSettings[currentItem.children_media_class];
-      : MediaClassBrowserSettings.directory;
 
     return html`
               ${
@@ -271,7 +264,7 @@ export class HaMediaPlayerBrowse extends LitElement {
                       @tts-picked=${this._ttsPicked}
                     ></ha-browse-media-tts>
                   `
-                : !children.length && !currentItem.not_shown
+                : !currentItem.children?.length
                 ? html`
                     <div class="container no-items">
                       ${currentItem.media_content_id ===
@@ -303,7 +296,7 @@ export class HaMediaPlayerBrowse extends LitElement {
                           childrenMediaClass.thumbnail_ratio === "portrait",
                       })}"
                     >
-                      ${children.map(
+                      ${currentItem.children.map(
                         (child) => html`
                           <div
                             class="child"
@@ -367,23 +360,11 @@ export class HaMediaPlayerBrowse extends LitElement {
                           </div>
                         `
                       )}
-                      ${currentItem.not_shown
-                        ? html`
-                            <div class="grid not-shown">
-                              <div class="title">
-                                ${this.hass.localize(
-                                  "ui.components.media-browser.not_shown",
-                                  { count: currentItem.not_shown }
-                                )}
-                              </div>
-                            </div>
-                          `
-                        : ""}
                     </div>
                   `
                 : html`
                     <mwc-list>
-                      ${children.map(
+                      ${currentItem.children.map(
                         (child) => html`
                           <mwc-list-item
                             @click=${this._childClicked}
@@ -427,25 +408,6 @@ export class HaMediaPlayerBrowse extends LitElement {
                           <li divider role="separator"></li>
                         `
                       )}
-                      ${currentItem.not_shown
-                        ? html`
-                            <mwc-list-item
-                              noninteractive
-                              class="not-shown"
-                              .graphic=${mediaClass.show_list_images
-                                ? "medium"
-                                : "avatar"}
-                              dir=${computeRTLDirection(this.hass)}
-                            >
-                              <span class="title">
-                                ${this.hass.localize(
-                                  "ui.components.media-browser.not_shown",
-                                  { count: currentItem.not_shown }
-                                )}
-                              </span>
-                            </mwc-list-item>
-                          `
-                        : ""}
                     </mwc-list>
                   `
             }
@@ -682,17 +644,6 @@ export class HaMediaPlayerBrowse extends LitElement {
                 // Thumbnails served by local API require authentication
                 const signedPath = await getSignedPath(this.hass, thumbnailUrl);
                 thumbnailUrl = signedPath.path;
-              } else if (
-                thumbnailUrl.startsWith("https://brands.home-assistant.io")
-              ) {
-                // The backend is not aware of the theme used by the users,
-                // so we rewrite the URL to show a proper icon
-                thumbnailUrl = brandsUrl({
-                  domain: extractDomainFromBrandUrl(thumbnailUrl),
-                  type: "icon",
-                  useFallback: true,
-                  darkOptimized: this.hass.themes?.darkMode,
-                });
               }
               thumbnailCard.style.backgroundImage = `url(${thumbnailUrl})`;
               observer.unobserve(thumbnailCard); // loaded, so no need to observe anymore
@@ -923,17 +874,6 @@ export class HaMediaPlayerBrowse extends LitElement {
           transition: height 0.5s, margin 0.5s;
         }
 
-        .not-shown {
-          font-style: italic;
-          color: var(--secondary-text-color);
-        }
-
-        .grid.not-shown {
-          display: flex;
-          align-items: center;
-          text-align: center;
-        }
-
         /* ============= CHILDREN ============= */
 
         mwc-list {

src/components/media-player/ha-media-upload-button.ts

@@ -1,129 +0,0 @@
-import { mdiUpload } from "@mdi/js";
-import "@material/mwc-button";
-import { css, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { fireEvent } from "../../common/dom/fire_event";
-import { MediaPlayerItem } from "../../data/media-player";
-import "../ha-circular-progress";
-import "../ha-svg-icon";
-import {
-  isLocalMediaSourceContentId,
-  uploadLocalMedia,
-} from "../../data/media_source";
-import type { HomeAssistant } from "../../types";
-import { showAlertDialog } from "../../dialogs/generic/show-dialog-box";
-
-declare global {
-  interface HASSDomEvents {
-    uploading: unknown;
-    "media-refresh": unknown;
-  }
-}
-
-@customElement("ha-media-upload-button")
-class MediaUploadButton extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property() currentItem?: MediaPlayerItem;
-
-  @state() _uploading = 0;
-
-  protected render(): TemplateResult {
-    if (
-      !this.currentItem ||
-      !isLocalMediaSourceContentId(this.currentItem.media_content_id || "")
-    ) {
-      return html``;
-    }
-    return html`
-      <mwc-button
-        .label=${this._uploading > 0
-          ? this.hass.localize(
-              "ui.components.media-browser.file_management.uploading",
-              {
-                count: this._uploading,
-              }
-            )
-          : this.hass.localize(
-              "ui.components.media-browser.file_management.add_media"
-            )}
-        .disabled=${this._uploading > 0}
-        @click=${this._startUpload}
-      >
-        ${this._uploading > 0
-          ? html`
-              <ha-circular-progress
-                size="tiny"
-                active
-                alt=""
-                slot="icon"
-              ></ha-circular-progress>
-            `
-          : html` <ha-svg-icon .path=${mdiUpload} slot="icon"></ha-svg-icon> `}
-      </mwc-button>
-    `;
-  }
-
-  private async _startUpload() {
-    if (this._uploading > 0) {
-      return;
-    }
-    const input = document.createElement("input");
-    input.type = "file";
-    input.accept = "audio/*,video/*,image/*";
-    input.multiple = true;
-    input.addEventListener(
-      "change",
-      async () => {
-        fireEvent(this, "uploading");
-        const files = input.files!;
-        document.body.removeChild(input);
-        const target = this.currentItem!.media_content_id!;
-
-        for (let i = 0; i < files.length; i++) {
-          this._uploading = files.length - i;
-
-          try {
-            // eslint-disable-next-line no-await-in-loop
-            await uploadLocalMedia(this.hass, target, files[i]);
-          } catch (err: any) {
-            showAlertDialog(this, {
-              text: this.hass.localize(
-                "ui.components.media-browser.file_management.upload_failed",
-                {
-                  reason: err.message || err,
-                }
-              ),
-            });
-            break;
-          }
-        }
-        this._uploading = 0;
-        fireEvent(this, "media-refresh");
-      },
-      { once: true }
-    );
-    // https://stackoverflow.com/questions/47664777/javascript-file-input-onchange-not-working-ios-safari-only
-    input.style.display = "none";
-    document.body.append(input);
-    input.click();
-  }
-
-  static styles = css`
-    mwc-button {
-      /* We use icon + text to show disabled state */
-      --mdc-button-disabled-ink-color: --mdc-theme-primary;
-    }
-
-    ha-svg-icon[slot="icon"],
-    ha-circular-progress[slot="icon"] {
-      vertical-align: middle;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-media-upload-button": MediaUploadButton;
-  }
-}

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

@@ -1,18 +0,0 @@
-import { fireEvent } from "../../common/dom/fire_event";
-import { MediaPlayerItem } from "../../data/media-player";
-
-export interface MediaManageDialogParams {
-  currentItem: MediaPlayerItem;
-  onClose?: () => void;
-}
-
-export const showMediaManageDialog = (
-  element: HTMLElement,
-  dialogParams: MediaManageDialogParams
-): void => {
-  fireEvent(element, "show-dialog", {
-    dialogTag: "dialog-media-manage",
-    dialogImport: () => import("./dialog-media-manage"),
-    dialogParams,
-  });
-};

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

@@ -1,4 +1,3 @@
-import "@material/mwc-list/mwc-list-item";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { property } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -6,8 +5,9 @@ import { fireEvent } from "../../common/dom/fire_event";
 import { stringCompare } from "../../common/string/compare";
 import { fetchUsers, User } from "../../data/user";
 import { HomeAssistant } from "../../types";
-import "../ha-select";
 import "./ha-user-badge";
+import "@material/mwc-select/mwc-select";
+import "@material/mwc-list/mwc-list-item";
 
 class HaUserPicker extends LitElement {
   public hass?: HomeAssistant;
@@ -34,7 +34,7 @@ class HaUserPicker extends LitElement {
 
   protected render(): TemplateResult {
     return html`
-      <ha-select
+      <mwc-select
         .label=${this.label}
         .disabled=${this.disabled}
         .value=${this.value}
@@ -58,7 +58,7 @@ class HaUserPicker extends LitElement {
             </mwc-list-item>
           `
         )}
-      </ha-select>
+      </mwc-select>
     `;
   }
 

src/data/config.ts

@@ -1,24 +0,0 @@
-import { HomeAssistant } from "../types";
-
-interface ValidConfig {
-  valid: true;
-  error: null;
-}
-
-interface InvalidConfig {
-  valid: false;
-  error: string;
-}
-
-type ValidKeys = "trigger" | "action" | "condition";
-
-export const validateConfig = <
-  T extends Partial<{ [key in ValidKeys]: unknown }>
->(
-  hass: HomeAssistant,
-  config: T
-): Promise<Record<keyof T, ValidConfig | InvalidConfig>> =>
-  hass.callWS({
-    type: "validate_config",
-    ...config,
-  });

src/data/config_entries.ts

@@ -13,7 +13,6 @@ export interface ConfigEntry {
     | "not_loaded"
     | "failed_unload";
   supports_options: boolean;
-  supports_remove_device: boolean;
   supports_unload: boolean;
   pref_disable_new_entities: boolean;
   pref_disable_polling: boolean;

src/data/device_registry.ts

@@ -1,5 +1,4 @@
 import { Connection, createCollection } from "home-assistant-js-websocket";
-import { Store } from "home-assistant-js-websocket/dist/store";
 import { computeStateName } from "../common/entity/compute_state_name";
 import { caseInsensitiveStringCompare } from "../common/string/compare";
 import { debounce } from "../common/util/debounce";
@@ -78,26 +77,12 @@ export const updateDeviceRegistryEntry = (
     ...updates,
   });
 
-export const removeConfigEntryFromDevice = (
+export const fetchDeviceRegistry = (conn) =>
-  hass: HomeAssistant,
+  conn.sendMessagePromise({
-  deviceId: string,
-  configEntryId: string
-) =>
-  hass.callWS<DeviceRegistryEntry>({
-    type: "config/device_registry/remove_config_entry",
-    device_id: deviceId,
-    config_entry_id: configEntryId,
-  });
-
-export const fetchDeviceRegistry = (conn: Connection) =>
-  conn.sendMessagePromise<DeviceRegistryEntry[]>({
     type: "config/device_registry/list",
   });
 
-const subscribeDeviceRegistryUpdates = (
+const subscribeDeviceRegistryUpdates = (conn, store) =>
-  conn: Connection,
-  store: Store<DeviceRegistryEntry[]>
-) =>
   conn.subscribeEvents(
     debounce(
       () =>

src/data/image.ts

@@ -29,7 +29,7 @@ export const createImage = async (
     body: fd,
   });
   if (resp.status === 413) {
-    throw new Error(`Uploaded image is too large (${file.name})`);
+    throw new Error("Uploaded image is too large");
   } else if (resp.status !== 200) {
     throw new Error("Unknown error");
   }

src/data/input_datetime.ts

@@ -1,4 +1,3 @@
-import { HassEntity } from "home-assistant-js-websocket";
 import { HomeAssistant } from "../types";
 
 export interface InputDateTime {
@@ -18,19 +17,6 @@ export interface InputDateTimeMutableParams {
   has_date: boolean;
 }
 
-export const stateToIsoDateString = (entityState: HassEntity) =>
-  `${entityState.attributes.year || "1970"}-${String(
-    entityState.attributes.month || "01"
-  ).padStart(2, "0")}-${String(entityState.attributes.day || "01").padStart(
-    2,
-    "0"
-  )}T${String(entityState.attributes.hour || "00").padStart(2, "0")}:${String(
-    entityState.attributes.minute || "00"
-  ).padStart(2, "0")}:${String(entityState.attributes.second || "00").padStart(
-    2,
-    "0"
-  )}`;
-
 export const setInputDateTimeValue = (
   hass: HomeAssistant,
   entityId: string,

src/data/media-player.ts

@@ -33,8 +33,7 @@ import type { HomeAssistant } from "../types";
 import { UNAVAILABLE_STATES } from "./entity";
 
 interface MediaPlayerEntityAttributes extends HassEntityAttributeBase {
-  media_content_id?: string;
+  media_content_type?: any;
-  media_content_type?: string;
   media_artist?: string;
   media_playlist?: string;
   media_series_title?: string;
@@ -168,12 +167,11 @@ export interface MediaPlayerItem {
   media_content_type: string;
   media_content_id: string;
   media_class: string;
-  children_media_class?: string;
+  children_media_class: string;
   can_play: boolean;
   can_expand: boolean;
   thumbnail?: string;
   children?: MediaPlayerItem[];
-  not_shown?: number;
 }
 
 export const browseMediaPlayer = (
@@ -341,7 +339,7 @@ export const computeMediaControls = (
 };
 
 export const formatMediaTime = (seconds: number | undefined): string => {
-  if (seconds === undefined || seconds === Infinity) {
+  if (seconds === undefined) {
     return "";
   }
 
@@ -361,17 +359,3 @@ export const cleanupMediaTitle = (title?: string): string | undefined => {
   const index = title.indexOf("?authSig=");
   return index > 0 ? title.slice(0, index) : title;
 };
-
-/**
- * Set volume of a media player entity.
- * @param hass Home Assistant object
- * @param entity_id entity ID of media player
- * @param volume_level number between 0..1
- * @returns
- */
-export const setMediaPlayerVolume = (
-  hass: HomeAssistant,
-  entity_id: string,
-  volume_level: number
-) =>
-  hass.callService("media_player", "volume_set", { entity_id, volume_level });

src/data/media_source.ts

@@ -43,18 +43,9 @@ export const uploadLocalMedia = async (
     }
   );
   if (resp.status === 413) {
-    throw new Error(`Uploaded file is too large (${file.name})`);
+    throw new Error("Uploaded image is too large");
   } else if (resp.status !== 200) {
     throw new Error("Unknown error");
   }
   return resp.json();
 };
-
-export const removeLocalMedia = async (
-  hass: HomeAssistant,
-  media_content_id: string
-) =>
-  hass.callWS({
-    type: "media_source/local_source/remove",
-    media_content_id,
-  });

src/data/selector.ts

@@ -14,14 +14,12 @@ export type Selector =
   | ObjectSelector
   | SelectSelector
   | IconSelector
-  | MediaSelector
+  | MediaSelector;
-  | ThemeSelector
-  | LocationSelector;
 
 export interface EntitySelector {
   entity: {
     integration?: string;
-    domain?: string | string[];
+    domain?: string;
     device_class?: string;
   };
 }
@@ -88,8 +86,8 @@ export interface TargetSelector {
 
 export interface NumberSelector {
   number: {
-    min?: number;
+    min: number;
-    max?: number;
+    max: number;
     step?: number;
     mode?: "box" | "slider";
     unit_of_measurement?: string;
@@ -149,15 +147,8 @@ export interface SelectSelector {
 }
 
 export interface IconSelector {
-  icon: {
-    placeholder?: string;
-    fallbackPath?: string;
-  };
-}
-
-export interface ThemeSelector {
   // eslint-disable-next-line @typescript-eslint/ban-types
-  theme: {};
+  icon: {};
 }
 
 export interface MediaSelector {
@@ -165,16 +156,6 @@ export interface MediaSelector {
   media: {};
 }
 
-export interface LocationSelector {
-  location: { radius?: boolean; icon?: string };
-}
-
-export interface LocationSelectorValue {
-  latitude: number;
-  longitude: number;
-  radius?: number;
-}
-
 export interface MediaSelectorValue {
   entity_id?: string;
   media_content_id?: string;

src/data/service.ts

@@ -1,10 +1,7 @@
 import { HomeAssistant } from "../types";
 import { Action } from "./script";
 
-export const callExecuteScript = (
+export const callExecuteScript = (hass: HomeAssistant, sequence: Action[]) =>
-  hass: HomeAssistant,
-  sequence: Action | Action[]
-) =>
   hass.callWS({
     type: "execute_script",
     sequence,

src/data/zone.ts

@@ -12,12 +12,12 @@ export interface Zone {
 }
 
 export interface ZoneMutableParams {
-  name: string;
   icon?: string;
   latitude: number;
   longitude: number;
-  passive?: boolean;
+  name: string;
-  radius?: number;
+  passive: boolean;
+  radius: number;
 }
 
 export const fetchZones = (hass: HomeAssistant) =>

src/dialogs/config-flow/dialog-data-entry-flow.ts

@@ -117,17 +117,13 @@ class DataEntryFlowDialog extends LitElement {
         );
       } catch (err: any) {
         this.closeDialog();
-        let message = err.message || err.body || "Unknown error";
-        if (typeof message !== "string") {
-          message = JSON.stringify(message);
-        }
         showAlertDialog(this, {
           title: this.hass.localize(
             "ui.panel.config.integrations.config_flow.error"
           ),
           text: `${this.hass.localize(
             "ui.panel.config.integrations.config_flow.could_not_load"
-          )}: ${message}`,
+          )}: ${err.message || err.body}`,
         });
         return;
       }
@@ -377,20 +373,13 @@ class DataEntryFlowDialog extends LitElement {
         step = await this._params!.flowConfig.createFlow(this.hass, handler);
       } catch (err: any) {
         this.closeDialog();
-        const message =
-          err?.status_code === 404
-            ? this.hass.localize(
-                "ui.panel.config.integrations.config_flow.no_config_flow"
-              )
-            : `${this.hass.localize(
-                "ui.panel.config.integrations.config_flow.could_not_load"
-              )}: ${err?.body?.message || err?.message}`;
-
         showAlertDialog(this, {
           title: this.hass.localize(
             "ui.panel.config.integrations.config_flow.error"
           ),
-          text: message,
+          text: `${this.hass.localize(
+            "ui.panel.config.integrations.config_flow.could_not_load"
+          )}: ${err.message || err.body}`,
         });
         return;
       } finally {

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

@@ -15,7 +15,7 @@ import memoizeOne from "memoize-one";
 import { isComponentLoaded } from "../../common/config/is_component_loaded";
 import { fireEvent } from "../../common/dom/fire_event";
 import { navigate } from "../../common/navigate";
-import "../../components/search-input";
+import "../../common/search/search-input";
 import { caseInsensitiveStringCompare } from "../../common/string/compare";
 import { LocalizeFunc } from "../../common/translations/localize";
 import "../../components/ha-icon-next";

src/dialogs/generic/dialog-box.ts

@@ -1,12 +1,12 @@
 import "@material/mwc-button/mwc-button";
-import { mdiAlertOutline } from "@mdi/js";
+import "@polymer/paper-input/paper-input";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import { classMap } from "lit/directives/class-map";
 import { fireEvent } from "../../common/dom/fire_event";
 import "../../components/ha-dialog";
-import "../../components/ha-svg-icon";
 import "../../components/ha-switch";
-import "../../components/ha-textfield";
+import { PolymerChangedEvent } from "../../polymer-types";
 import { haStyleDialog } from "../../resources/styles";
 import { HomeAssistant } from "../../types";
 import { DialogBoxParams } from "./show-dialog-box";
@@ -51,40 +51,38 @@ class DialogBox extends LitElement {
         ?escapeKeyAction=${confirmPrompt}
         @closed=${this._dialogClosed}
         defaultAction="ignore"
-        .heading=${html`${this._params.warning
+        .heading=${this._params.title
-          ? html`<ha-svg-icon
-              .path=${mdiAlertOutline}
-              style="color: var(--warning-color)"
-            ></ha-svg-icon> `
-          : ""}${this._params.title
           ? this._params.title
           : this._params.confirmation &&
-            this.hass.localize(
+            this.hass.localize("ui.dialogs.generic.default_confirmation_title")}
-              "ui.dialogs.generic.default_confirmation_title"
-            )}`}
       >
         <div>
           ${this._params.text
             ? html`
-                <p class=${this._params.prompt ? "no-bottom-padding" : ""}>
+                <p
+                  class=${classMap({
+                    "no-bottom-padding": Boolean(this._params.prompt),
+                    warning: Boolean(this._params.warning),
+                  })}
+                >
                   ${this._params.text}
                 </p>
               `
             : ""}
           ${this._params.prompt
             ? html`
-                <ha-textfield
+                <paper-input
                   dialogInitialFocus
-                  .value=${this._value || ""}
+                  .value=${this._value}
                   @keyup=${this._handleKeyUp}
-                  @change=${this._valueChanged}
+                  @value-changed=${this._valueChanged}
                   .label=${this._params.inputLabel
                     ? this._params.inputLabel
                     : ""}
                   .type=${this._params.inputType
                     ? this._params.inputType
                     : "text"}
-                ></ha-textfield>
+                ></paper-input>
               `
             : ""}
         </div>
@@ -109,8 +107,8 @@ class DialogBox extends LitElement {
     `;
   }
 
-  private _valueChanged(ev) {
+  private _valueChanged(ev: PolymerChangedEvent<string>) {
-    this._value = ev.target.value;
+    this._value = ev.detail.value;
   }
 
   private _dismiss(): void {
@@ -175,6 +173,9 @@ class DialogBox extends LitElement {
           /* Place above other dialogs */
           --dialog-z-index: 104;
         }
+        .warning {
+          color: var(--warning-color);
+        }
       `,
     ];
   }

src/dialogs/more-info/controls/more-info-alarm_control_panel.js

@@ -0,0 +1,281 @@
+import "@material/mwc-button";
+import "@polymer/iron-flex-layout/iron-flex-layout-classes";
+import "@polymer/paper-input/paper-input";
+import { html } from "@polymer/polymer/lib/utils/html-tag";
+/* eslint-plugin-disable lit */
+import { PolymerElement } from "@polymer/polymer/polymer-element";
+import { fireEvent } from "../../../common/dom/fire_event";
+import { FORMAT_NUMBER } from "../../../data/alarm_control_panel";
+import LocalizeMixin from "../../../mixins/localize-mixin";
+
+class MoreInfoAlarmControlPanel extends LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
+      <style include="iron-flex"></style>
+      <style>
+        paper-input {
+          margin: auto;
+          max-width: 200px;
+        }
+        .pad {
+          display: flex;
+          justify-content: center;
+          margin-bottom: 24px;
+        }
+        .pad div {
+          display: flex;
+          flex-direction: column;
+        }
+        .pad mwc-button {
+          padding: 8px;
+          width: 80px;
+        }
+        .actions mwc-button {
+          flex: 1 0 50%;
+          margin: 0 4px 16px;
+          max-width: 200px;
+        }
+        mwc-button.disarm {
+          color: var(--error-color);
+        }
+      </style>
+
+      <template is="dom-if" if="[[_codeFormat]]">
+        <paper-input
+          label="[[localize('ui.card.alarm_control_panel.code')]]"
+          value="{{_enteredCode}}"
+          type="password"
+          inputmode="[[_inputMode]]"
+          disabled="[[!_inputEnabled]]"
+        ></paper-input>
+
+        <template is="dom-if" if="[[_isNumber(_codeFormat)]]">
+          <div class="pad">
+            <div>
+              <mwc-button
+                on-click="_digitClicked"
+                disabled="[[!_inputEnabled]]"
+                data-digit="1"
+                outlined
+                >1</mwc-button
+              >
+              <mwc-button
+                on-click="_digitClicked"
+                disabled="[[!_inputEnabled]]"
+                data-digit="4"
+                outlined
+                >4</mwc-button
+              >
+              <mwc-button
+                on-click="_digitClicked"
+                disabled="[[!_inputEnabled]]"
+                data-digit="7"
+                outlined
+                >7</mwc-button
+              >
+            </div>
+            <div>
+              <mwc-button
+                on-click="_digitClicked"
+                disabled="[[!_inputEnabled]]"
+                data-digit="2"
+                outlined
+                >2</mwc-button
+              >
+              <mwc-button
+                on-click="_digitClicked"
+                disabled="[[!_inputEnabled]]"
+                data-digit="5"
+                outlined
+                >5</mwc-button
+              >
+              <mwc-button
+                on-click="_digitClicked"
+                disabled="[[!_inputEnabled]]"
+                data-digit="8"
+                outlined
+                >8</mwc-button
+              >
+              <mwc-button
+                on-click="_digitClicked"
+                disabled="[[!_inputEnabled]]"
+                data-digit="0"
+                outlined
+                >0</mwc-button
+              >
+            </div>
+            <div>
+              <mwc-button
+                on-click="_digitClicked"
+                disabled="[[!_inputEnabled]]"
+                data-digit="3"
+                outlined
+                >3</mwc-button
+              >
+              <mwc-button
+                on-click="_digitClicked"
+                disabled="[[!_inputEnabled]]"
+                data-digit="6"
+                outlined
+                >6</mwc-button
+              >
+              <mwc-button
+                on-click="_digitClicked"
+                disabled="[[!_inputEnabled]]"
+                data-digit="9"
+                outlined
+                >9</mwc-button
+              >
+              <mwc-button
+                on-click="_clearEnteredCode"
+                disabled="[[!_inputEnabled]]"
+                outlined
+              >
+                [[localize('ui.card.alarm_control_panel.clear_code')]]
+              </mwc-button>
+            </div>
+          </div>
+        </template>
+      </template>
+
+      <div class="layout horizontal center-justified actions">
+        <template is="dom-if" if="[[_disarmVisible]]">
+          <mwc-button
+            outlined
+            class="disarm"
+            on-click="_callService"
+            data-service="alarm_disarm"
+            disabled="[[!_codeValid]]"
+          >
+            [[localize('ui.card.alarm_control_panel.disarm')]]
+          </mwc-button>
+        </template>
+        <template is="dom-if" if="[[_armVisible]]">
+          <mwc-button
+            outlined
+            on-click="_callService"
+            data-service="alarm_arm_home"
+            disabled="[[!_codeValid]]"
+          >
+            [[localize('ui.card.alarm_control_panel.arm_home')]]
+          </mwc-button>
+          <mwc-button
+            outlined
+            on-click="_callService"
+            data-service="alarm_arm_away"
+            disabled="[[!_codeValid]]"
+          >
+            [[localize('ui.card.alarm_control_panel.arm_away')]]
+          </mwc-button>
+        </template>
+      </div>
+    `;
+  }
+
+  static get properties() {
+    return {
+      hass: Object,
+      stateObj: {
+        type: Object,
+        observer: "_stateObjChanged",
+      },
+      _enteredCode: {
+        type: String,
+        value: "",
+      },
+      _codeFormat: {
+        type: String,
+        value: "",
+      },
+      _codeValid: {
+        type: Boolean,
+        computed:
+          "_validateCode(_enteredCode,  _codeFormat,  _armVisible, _codeArmRequired)",
+      },
+      _disarmVisible: {
+        type: Boolean,
+        value: false,
+      },
+      _armVisible: {
+        type: Boolean,
+        value: false,
+      },
+      _inputEnabled: {
+        type: Boolean,
+        value: false,
+      },
+      _inputMode: {
+        type: String,
+        computed: "_getInputMode(_codeFormat)",
+      },
+    };
+  }
+
+  constructor() {
+    super();
+    this._armedStates = [
+      "armed_home",
+      "armed_away",
+      "armed_night",
+      "armed_custom_bypass",
+    ];
+  }
+
+  _stateObjChanged(newVal, oldVal) {
+    if (newVal) {
+      const state = newVal.state;
+      const props = {
+        _codeFormat: newVal.attributes.code_format,
+        _armVisible: state === "disarmed",
+        _codeArmRequired: newVal.attributes.code_arm_required,
+        _disarmVisible:
+          this._armedStates.includes(state) ||
+          state === "pending" ||
+          state === "triggered" ||
+          state === "arming",
+      };
+      props._inputEnabled = props._disarmVisible || props._armVisible;
+      this.setProperties(props);
+    }
+    if (oldVal) {
+      setTimeout(() => {
+        fireEvent(this, "iron-resize");
+      }, 500);
+    }
+  }
+
+  _getInputMode(format) {
+    return this._isNumber(format) ? "numeric" : "text";
+  }
+
+  _isNumber(format) {
+    return format === FORMAT_NUMBER;
+  }
+
+  _validateCode(code, format, armVisible, codeArmRequired) {
+    return !format || code.length > 0 || (armVisible && !codeArmRequired);
+  }
+
+  _digitClicked(ev) {
+    this._enteredCode += ev.target.getAttribute("data-digit");
+  }
+
+  _clearEnteredCode() {
+    this._enteredCode = "";
+  }
+
+  _callService(ev) {
+    const service = ev.target.getAttribute("data-service");
+    const data = {
+      entity_id: this.stateObj.entity_id,
+      code: this._enteredCode,
+    };
+    this.hass.callService("alarm_control_panel", service, data).then(() => {
+      this._enteredCode = "";
+    });
+  }
+}
+customElements.define(
+  "more-info-alarm_control_panel",
+  MoreInfoAlarmControlPanel
+);

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

@@ -1,165 +0,0 @@
-import "@material/mwc-button";
-import type { HassEntity } from "home-assistant-js-websocket";
-import { css, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, query } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
-import "../../../components/ha-textfield";
-import type { HaTextField } from "../../../components/ha-textfield";
-import {
-  callAlarmAction,
-  FORMAT_NUMBER,
-} from "../../../data/alarm_control_panel";
-import type { HomeAssistant } from "../../../types";
-
-const BUTTONS = ["1", "2", "3", "4", "5", "6", "7", "8", "9", "", "0", "clear"];
-const ARM_ACTIONS = ["arm_away", "arm_home"];
-const DISARM_ACTIONS = ["disarm"];
-
-@customElement("more-info-alarm_control_panel")
-export class MoreInfoAlarmControlPanel extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public stateObj?: HassEntity;
-
-  @query("#alarmCode") private _input?: HaTextField;
-
-  protected render(): TemplateResult {
-    if (!this.hass || !this.stateObj) {
-      return html``;
-    }
-
-    return html`
-      ${!this.stateObj.attributes.code_format
-        ? ""
-        : html`
-            <div class="center">
-              <ha-textfield
-                id="alarmCode"
-                .label=${this.hass.localize("ui.card.alarm_control_panel.code")}
-                type="password"
-                .inputmode=${this.stateObj.attributes.code_format ===
-                FORMAT_NUMBER
-                  ? "numeric"
-                  : "text"}
-              ></ha-textfield>
-            </div>
-          `}
-      ${this.stateObj.attributes.code_format !== FORMAT_NUMBER
-        ? ""
-        : html`
-            <div id="keypad">
-              ${BUTTONS.map((value) =>
-                value === ""
-                  ? html`<mwc-button disabled></mwc-button>`
-                  : html`
-                      <mwc-button
-                        .value=${value}
-                        @click=${this._handlePadClick}
-                        outlined
-                        class=${classMap({
-                          numberkey: value !== "clear",
-                        })}
-                      >
-                        ${value === "clear"
-                          ? this.hass!.localize(
-                              `ui.card.alarm_control_panel.clear_code`
-                            )
-                          : value}
-                      </mwc-button>
-                    `
-              )}
-            </div>
-          `}
-      <div class="actions">
-        ${(this.stateObj.state === "disarmed"
-          ? ARM_ACTIONS
-          : DISARM_ACTIONS
-        ).map(
-          (stateAction) => html`
-            <mwc-button
-              .action=${stateAction}
-              @click=${this._handleActionClick}
-              outlined
-            >
-              ${this.hass!.localize(
-                `ui.card.alarm_control_panel.${stateAction}`
-              )}
-            </mwc-button>
-          `
-        )}
-      </div>
-    `;
-  }
-
-  private _handlePadClick(e: MouseEvent): void {
-    const val = (e.currentTarget! as any).value;
-    this._input!.value = val === "clear" ? "" : this._input!.value + val;
-  }
-
-  private _handleActionClick(e: MouseEvent): void {
-    const input = this._input;
-    callAlarmAction(
-      this.hass!,
-      this.stateObj!.entity_id,
-      (e.currentTarget! as any).action,
-      input?.value || undefined
-    );
-    if (input) {
-      input.value = "";
-    }
-  }
-
-  static styles = css`
-    ha-textfield {
-      display: block;
-      margin: 8px;
-      max-width: 150px;
-      text-align: center;
-    }
-
-    #keypad {
-      display: flex;
-      justify-content: center;
-      flex-wrap: wrap;
-      margin: auto;
-      width: 100%;
-      max-width: 300px;
-    }
-
-    #keypad mwc-button {
-      padding: 8px;
-      width: 30%;
-      box-sizing: border-box;
-    }
-
-    .actions {
-      margin: 0;
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: center;
-    }
-
-    .actions mwc-button {
-      margin: 0 4px 4px;
-    }
-
-    mwc-button#disarm {
-      color: var(--error-color);
-    }
-
-    mwc-button.numberkey {
-      --mdc-typography-button-font-size: var(--keypad-font-size, 0.875rem);
-    }
-
-    .center {
-      display: flex;
-      justify-content: center;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "more-info-alarm_control_panel": MoreInfoAlarmControlPanel;
-  }
-}

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

@@ -1,4 +1,3 @@
-import "@material/mwc-list/mwc-list-item";
 import {
   css,
   CSSResultGroup,
@@ -10,11 +9,9 @@ import {
 import { property } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { fireEvent } from "../../../common/dom/fire_event";
-import { stopPropagation } from "../../../common/dom/stop_propagation";
 import { supportsFeature } from "../../../common/entity/supports-feature";
 import { computeRTLDirection } from "../../../common/util/compute_rtl";
 import "../../../components/ha-climate-control";
-import "../../../components/ha-select";
 import "../../../components/ha-slider";
 import "../../../components/ha-switch";
 import {
@@ -29,6 +26,9 @@ import {
   compareClimateHvacModes,
 } from "../../../data/climate";
 import { HomeAssistant } from "../../../types";
+import "@material/mwc-list/mwc-list-item";
+import "@material/mwc-select/mwc-select";
+import { stopPropagation } from "../../../common/dom/stop_propagation";
 
 class MoreInfoClimate extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -168,7 +168,7 @@ class MoreInfoClimate extends LitElement {
 
         <div class="container-hvac_modes">
           <div class="controls">
-            <ha-select
+            <mwc-select
               .label=${hass.localize("ui.card.climate.operation")}
               .value=${stateObj.state}
               fixedMenuPosition
@@ -186,14 +186,14 @@ class MoreInfoClimate extends LitElement {
                     </mwc-list-item>
                   `
                 )}
-            </ha-select>
+            </mwc-select>
           </div>
         </div>
 
         ${supportPresetMode && stateObj.attributes.preset_modes
           ? html`
               <div class="container-preset_modes">
-                <ha-select
+                <mwc-select
                   .label=${hass.localize("ui.card.climate.preset_mode")}
                   .value=${stateObj.attributes.preset_mode}
                   fixedMenuPosition
@@ -210,14 +210,14 @@ class MoreInfoClimate extends LitElement {
                       </mwc-list-item>
                     `
                   )}
-                </ha-select>
+                </mwc-select>
               </div>
             `
           : ""}
         ${supportFanMode && stateObj.attributes.fan_modes
           ? html`
               <div class="container-fan_list">
-                <ha-select
+                <mwc-select
                   .label=${hass.localize("ui.card.climate.fan_mode")}
                   .value=${stateObj.attributes.fan_mode}
                   fixedMenuPosition
@@ -234,14 +234,14 @@ class MoreInfoClimate extends LitElement {
                       </mwc-list-item>
                     `
                   )}
-                </ha-select>
+                </mwc-select>
               </div>
             `
           : ""}
         ${supportSwingMode && stateObj.attributes.swing_modes
           ? html`
               <div class="container-swing_list">
-                <ha-select
+                <mwc-select
                   .label=${hass.localize("ui.card.climate.swing_mode")}
                   .value=${stateObj.attributes.swing_mode}
                   fixedMenuPosition
@@ -254,7 +254,7 @@ class MoreInfoClimate extends LitElement {
                       <mwc-list-item .value=${mode}>${mode}</mwc-list-item>
                     `
                   )}
-                </ha-select>
+                </mwc-select>
               </div>
             `
           : ""}
@@ -427,7 +427,7 @@ class MoreInfoClimate extends LitElement {
         color: var(--primary-text-color);
       }
 
-      ha-select {
+      mwc-select {
         width: 100%;
         margin-top: 8px;
       }

src/dialogs/more-info/controls/more-info-configurator.js

@@ -0,0 +1,148 @@
+import "@material/mwc-button";
+import "@polymer/iron-flex-layout/iron-flex-layout-classes";
+import "@polymer/paper-input/paper-input";
+import { html } from "@polymer/polymer/lib/utils/html-tag";
+/* eslint-plugin-disable lit */
+import { PolymerElement } from "@polymer/polymer/polymer-element";
+import "../../../components/ha-circular-progress";
+import "../../../components/ha-markdown";
+
+class MoreInfoConfigurator extends PolymerElement {
+  static get template() {
+    return html`
+      <style include="iron-flex"></style>
+      <style>
+        p {
+          margin: 8px 0;
+        }
+
+        a {
+          color: var(--primary-color);
+        }
+
+        p > img {
+          max-width: 100%;
+        }
+
+        p.center {
+          text-align: center;
+        }
+
+        p.error {
+          color: #c62828;
+        }
+
+        p.submit {
+          text-align: center;
+          height: 41px;
+        }
+
+        ha-circular-progress {
+          width: 14px;
+          height: 14px;
+          margin-right: 20px;
+        }
+
+        [hidden] {
+          display: none;
+        }
+      </style>
+
+      <div class="layout vertical">
+        <template is="dom-if" if="[[isConfigurable]]">
+          <ha-markdown
+            breaks
+            content="[[stateObj.attributes.description]]"
+          ></ha-markdown>
+
+          <p class="error" hidden$="[[!stateObj.attributes.errors]]">
+            [[stateObj.attributes.errors]]
+          </p>
+
+          <template is="dom-repeat" items="[[stateObj.attributes.fields]]">
+            <paper-input
+              label="[[item.name]]"
+              name="[[item.id]]"
+              type="[[item.type]]"
+              on-change="fieldChanged"
+            ></paper-input>
+          </template>
+
+          <p class="submit" hidden$="[[!stateObj.attributes.submit_caption]]">
+            <mwc-button
+              raised=""
+              disabled="[[isConfiguring]]"
+              on-click="submitClicked"
+            >
+              <ha-circular-progress
+                active="[[isConfiguring]]"
+                hidden="[[!isConfiguring]]"
+                alt="Configuring"
+              ></ha-circular-progress>
+              [[stateObj.attributes.submit_caption]]
+            </mwc-button>
+          </p>
+        </template>
+      </div>
+    `;
+  }
+
+  static get properties() {
+    return {
+      stateObj: {
+        type: Object,
+      },
+
+      action: {
+        type: String,
+        value: "display",
+      },
+
+      isConfigurable: {
+        type: Boolean,
+        computed: "computeIsConfigurable(stateObj)",
+      },
+
+      isConfiguring: {
+        type: Boolean,
+        value: false,
+      },
+
+      fieldInput: {
+        type: Object,
+        value: function () {
+          return {};
+        },
+      },
+    };
+  }
+
+  computeIsConfigurable(stateObj) {
+    return stateObj.state === "configure";
+  }
+
+  fieldChanged(ev) {
+    const el = ev.target;
+    this.fieldInput[el.name] = el.value;
+  }
+
+  submitClicked() {
+    const data = {
+      configure_id: this.stateObj.attributes.configure_id,
+      fields: this.fieldInput,
+    };
+
+    this.isConfiguring = true;
+
+    this.hass.callService("configurator", "configure", data).then(
+      () => {
+        this.isConfiguring = false;
+      },
+      () => {
+        this.isConfiguring = false;
+      }
+    );
+  }
+}
+
+customElements.define("more-info-configurator", MoreInfoConfigurator);

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

@@ -1,128 +0,0 @@
-import "@material/mwc-button";
-import type { HassEntity } from "home-assistant-js-websocket";
-import { css, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import "../../../components/ha-alert";
-import "../../../components/ha-circular-progress";
-import "../../../components/ha-markdown";
-import "../../../components/ha-textfield";
-import type { HomeAssistant } from "../../../types";
-
-@customElement("more-info-configurator")
-export class MoreInfoConfigurator extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public stateObj?: HassEntity;
-
-  @state() private _isConfiguring = false;
-
-  private _fieldInput = {};
-
-  protected render(): TemplateResult {
-    if (this.stateObj?.state !== "configure") {
-      return html``;
-    }
-
-    return html`
-      <div class="container">
-        <ha-markdown
-          breaks
-          .content=${this.stateObj.attributes.description}
-        ></ha-markdown>
-
-        ${this.stateObj.attributes.errors
-          ? html`<ha-alert alert-type="error">
-              ${this.stateObj.attributes.errors}
-            </ha-alert>`
-          : ""}
-        ${this.stateObj.attributes.fields.map(
-          (field) => html`<ha-textfield
-            .label=${field.name}
-            .name=${field.id}
-            .type=${field.type}
-            @change=${this._fieldChanged}
-          ></ha-textfield>`
-        )}
-        ${this.stateObj.attributes.submit_caption
-          ? html`<p class="submit">
-              <mwc-button
-                raised
-                .disabled=${this._isConfiguring}
-                @click=${this._submitClicked}
-              >
-                ${this._isConfiguring
-                  ? html`<ha-circular-progress
-                      active
-                      alt="Configuring"
-                    ></ha-circular-progress>`
-                  : ""}
-                ${this.stateObj.attributes.submit_caption}
-              </mwc-button>
-            </p>`
-          : ""}
-      </div>
-    `;
-  }
-
-  private _fieldChanged(ev) {
-    const el = ev.target;
-    this._fieldInput[el.name] = el.value;
-  }
-
-  private _submitClicked() {
-    const data = {
-      configure_id: this.stateObj!.attributes.configure_id,
-      fields: this._fieldInput,
-    };
-
-    this._isConfiguring = true;
-
-    this.hass.callService("configurator", "configure", data).then(
-      () => {
-        this._isConfiguring = false;
-      },
-      () => {
-        this._isConfiguring = false;
-      }
-    );
-  }
-
-  static styles = css`
-    .container {
-      display: flex;
-      flex-direction: column;
-    }
-    p {
-      margin: 8px 0;
-    }
-
-    a {
-      color: var(--primary-color);
-    }
-
-    p > img {
-      max-width: 100%;
-    }
-
-    p.center {
-      text-align: center;
-    }
-
-    p.submit {
-      text-align: center;
-      height: 41px;
-    }
-
-    ha-circular-progress {
-      width: 14px;
-      height: 14px;
-      margin-right: 20px;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "more-info-configurator": MoreInfoConfigurator;
-  }
-}

src/dialogs/more-info/controls/more-info-fan.js

@@ -1,4 +1,3 @@
-import "@material/mwc-list/mwc-list-item";
 import "@polymer/iron-flex-layout/iron-flex-layout-classes";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 /* eslint-plugin-disable lit */
@@ -9,11 +8,12 @@ import "../../../components/ha-attributes";
 import "../../../components/ha-icon";
 import "../../../components/ha-icon-button";
 import "../../../components/ha-labeled-slider";
-import "../../../components/ha-select";
 import "../../../components/ha-switch";
 import { SUPPORT_SET_SPEED } from "../../../data/fan";
 import { EventsMixin } from "../../../mixins/events-mixin";
 import LocalizeMixin from "../../../mixins/localize-mixin";
+import "@material/mwc-list/mwc-list-item";
+import "@material/mwc-select/mwc-select";
 
 /*
  * @appliesMixin EventsMixin
@@ -37,7 +37,7 @@ class MoreInfoFan extends LocalizeMixin(EventsMixin(PolymerElement)) {
           display: block;
         }
 
-        ha-select {
+        mwc-select {
           width: 100%;
         }
       </style>
@@ -57,7 +57,7 @@ class MoreInfoFan extends LocalizeMixin(EventsMixin(PolymerElement)) {
         </div>
 
         <div class="container-preset_modes">
-          <ha-select
+          <mwc-select
             label="[[localize('ui.card.fan.preset_mode')]]"
             value="[[stateObj.attributes.preset_mode]]"
             on-selected="presetModeChanged"
@@ -71,7 +71,7 @@ class MoreInfoFan extends LocalizeMixin(EventsMixin(PolymerElement)) {
             >
               <mwc-list-item value="[[item]]">[[item]]</mwc-list-item>
             </template>
-          </ha-select>
+          </mwc-select>
         </div>
 
         <div class="container-oscillating">

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

@@ -1,4 +1,3 @@
-import "@material/mwc-list/mwc-list-item";
 import {
   css,
   CSSResultGroup,
@@ -13,7 +12,6 @@ import { fireEvent } from "../../../common/dom/fire_event";
 import { stopPropagation } from "../../../common/dom/stop_propagation";
 import { supportsFeature } from "../../../common/entity/supports-feature";
 import { computeRTLDirection } from "../../../common/util/compute_rtl";
-import "../../../components/ha-select";
 import "../../../components/ha-slider";
 import "../../../components/ha-switch";
 import {
@@ -21,6 +19,8 @@ import {
   HUMIDIFIER_SUPPORT_MODES,
 } from "../../../data/humidifier";
 import { HomeAssistant } from "../../../types";
+import "@material/mwc-list/mwc-list";
+import "@material/mwc-list/mwc-list-item";
 
 class MoreInfoHumidifier extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -67,24 +67,26 @@ class MoreInfoHumidifier extends LitElement {
 
         ${supportModes
           ? html`
-              <ha-select
+              <div class="container-modes">
-                .label=${hass.localize("ui.card.humidifier.mode")}
+                <mwc-list
-                .value=${stateObj.attributes.mode}
+                  .label=${hass.localize("ui.card.humidifier.mode")}
-                fixedMenuPosition
+                  .value=${stateObj.attributes.mode}
-                naturalMenuWidth
+                  fixedMenuPosition
-                @selected=${this._handleModeChanged}
+                  naturalMenuWidth
-                @closed=${stopPropagation}
+                  @selected=${this._handleModeChanged}
-              >
+                  @closed=${stopPropagation}
-                ${stateObj.attributes.available_modes!.map(
+                >
-                  (mode) => html`
+                  ${stateObj.attributes.available_modes!.map(
-                    <mwc-list-item .value=${mode}>
+                    (mode) => html`
-                      ${hass.localize(
+                      <mwc-list-item .value=${mode}>
-                        `state_attributes.humidifier.mode.${mode}`
+                        ${hass.localize(
-                      ) || mode}
+                          `state_attributes.humidifier.mode.${mode}`
-                    </mwc-list-item>
+                        ) || mode}
-                  `
+                      </mwc-list-item>
-                )}
+                    `
-              </ha-select>
+                  )}
+                </mwc-list>
+              </div>
             `
           : ""}
       </div>
@@ -168,7 +170,11 @@ class MoreInfoHumidifier extends LitElement {
         color: var(--primary-text-color);
       }
 
-      ha-select {
+      mwc-select {
+        width: 100%;
+      }
+
+      ha-slider {
         width: 100%;
       }
 

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

@@ -4,10 +4,7 @@ import { customElement, property } from "lit/decorators";
 import "../../../components/ha-date-input";
 import "../../../components/ha-time-input";
 import { UNAVAILABLE_STATES, UNKNOWN } from "../../../data/entity";
-import {
+import { setInputDateTimeValue } from "../../../data/input_datetime";
-  setInputDateTimeValue,
-  stateToIsoDateString,
-} from "../../../data/input_datetime";
 import type { HomeAssistant } from "../../../types";
 
 @customElement("more-info-input_datetime")
@@ -27,7 +24,7 @@ class MoreInfoInputDatetime extends LitElement {
             ? html`
                 <ha-date-input
                   .locale=${this.hass.locale}
-                  .value=${stateToIsoDateString(this.stateObj)}
+                  .value=${`${this.stateObj.attributes.year}-${this.stateObj.attributes.month}-${this.stateObj.attributes.day}`}
                   .disabled=${UNAVAILABLE_STATES.includes(this.stateObj.state)}
                   @value-changed=${this._dateChanged}
                 >

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

@@ -1,4 +1,5 @@
 import "@material/mwc-list/mwc-list-item";
+import "@material/mwc-select/mwc-select";
 import { mdiPalette } from "@mdi/js";
 import {
   css,
@@ -17,7 +18,6 @@ import "../../../components/ha-button-toggle-group";
 import "../../../components/ha-color-picker";
 import "../../../components/ha-icon-button";
 import "../../../components/ha-labeled-slider";
-import "../../../components/ha-select";
 import {
   getLightCurrentModeRgbColor,
   LightColorModes,
@@ -208,7 +208,7 @@ class MoreInfoLight extends LitElement {
               this.stateObj!.attributes.effect_list?.length
                 ? html`
                     <hr />
-                    <ha-select
+                    <mwc-select
                       .label=${this.hass.localize("ui.card.light.effect")}
                       .value=${this.stateObj.attributes.effect || ""}
                       fixedMenuPosition
@@ -223,7 +223,7 @@ class MoreInfoLight extends LitElement {
                           </mwc-list-item>
                         `
                       )}
-                    </ha-select>
+                    </mwc-select>
                   `
                 : ""}
             `

src/dialogs/more-info/controls/more-info-lock.js

@@ -0,0 +1,80 @@
+import "@material/mwc-button";
+import "@polymer/paper-input/paper-input";
+import { html } from "@polymer/polymer/lib/utils/html-tag";
+/* eslint-plugin-disable lit */
+import { PolymerElement } from "@polymer/polymer/polymer-element";
+import "../../../components/ha-attributes";
+import LocalizeMixin from "../../../mixins/localize-mixin";
+
+/*
+ * @appliesMixin LocalizeMixin
+ */
+class MoreInfoLock extends LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
+      <style>
+        paper-input {
+          display: inline-block;
+        }
+      </style>
+
+      <template is="dom-if" if="[[stateObj.attributes.code_format]]">
+        <paper-input
+          label="[[localize('ui.card.lock.code')]]"
+          value="{{enteredCode}}"
+          pattern="[[stateObj.attributes.code_format]]"
+          type="password"
+        ></paper-input>
+        <mwc-button
+          on-click="callService"
+          data-service="unlock"
+          hidden$="[[!isLocked]]"
+          >[[localize('ui.card.lock.unlock')]]</mwc-button
+        >
+        <mwc-button
+          on-click="callService"
+          data-service="lock"
+          hidden$="[[isLocked]]"
+          >[[localize('ui.card.lock.lock')]]</mwc-button
+        >
+      </template>
+      <ha-attributes
+        hass="[[hass]]"
+        state-obj="[[stateObj]]"
+        extra-filters="code_format"
+      ></ha-attributes>
+    `;
+  }
+
+  static get properties() {
+    return {
+      hass: Object,
+      stateObj: {
+        type: Object,
+        observer: "stateObjChanged",
+      },
+      enteredCode: {
+        type: String,
+        value: "",
+      },
+      isLocked: Boolean,
+    };
+  }
+
+  stateObjChanged(newVal) {
+    if (newVal) {
+      this.isLocked = newVal.state === "locked";
+    }
+  }
+
+  callService(ev) {
+    const service = ev.target.getAttribute("data-service");
+    const data = {
+      entity_id: this.stateObj.entity_id,
+      code: this.enteredCode,
+    };
+    this.hass.callService("lock", service, data);
+  }
+}
+
+customElements.define("more-info-lock", MoreInfoLock);

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

@@ -1,70 +0,0 @@
-import "@material/mwc-button";
-import type { HassEntity } from "home-assistant-js-websocket";
-import { css, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, query } from "lit/decorators";
-import "../../../components/ha-attributes";
-import "../../../components/ha-textfield";
-import type { HaTextField } from "../../../components/ha-textfield";
-import type { HomeAssistant } from "../../../types";
-
-@customElement("more-info-lock")
-class MoreInfoLock extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public stateObj?: HassEntity;
-
-  @query("ha-textfield") private _textfield?: HaTextField;
-
-  protected render(): TemplateResult {
-    if (!this.hass || !this.stateObj) {
-      return html``;
-    }
-    return html`
-      ${this.stateObj.attributes.code_format
-        ? html`
-            <ha-textfield
-              .label=${this.hass.localize("ui.card.lock.code")}
-              .pattern=${this.stateObj.attributes.code_format}
-              type="password"
-            ></ha-textfield>
-            ${this.stateObj.state === "locked"
-              ? html`<mwc-button
-                  @click=${this._callService}
-                  data-service="unlock"
-                  >${this.hass.localize("ui.card.lock.unlock")}</mwc-button
-                >`
-              : html`<mwc-button @click=${this._callService} data-service="lock"
-                  >${this.hass.localize("ui.card.lock.lock")}</mwc-button
-                >`}
-          `
-        : ""}
-      <ha-attributes
-        .hass=${this.hass}
-        .stateObj=${this.stateObj}
-        extra-filters="code_format"
-      ></ha-attributes>
-    `;
-  }
-
-  private _callService(ev) {
-    const service = ev.target.getAttribute("data-service");
-    const data = {
-      entity_id: this.stateObj!.entity_id,
-      code: this._textfield?.value,
-    };
-    this.hass.callService("lock", service, data);
-  }
-
-  static styles = css`
-    :host {
-      display: flex;
-      align-items: center;
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "more-info-lock": MoreInfoLock;
-  }
-}

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

@@ -1,5 +1,6 @@
 import "@material/mwc-button/mwc-button";
 import "@material/mwc-list/mwc-list-item";
+import "@material/mwc-select/mwc-select";
 import {
   mdiLoginVariant,
   mdiMusicNote,
@@ -9,6 +10,7 @@ import {
   mdiVolumeOff,
   mdiVolumePlus,
 } from "@mdi/js";
+import "@polymer/paper-input/paper-input";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
@@ -16,7 +18,6 @@ import { stopPropagation } from "../../../common/dom/stop_propagation";
 import { supportsFeature } from "../../../common/entity/supports-feature";
 import { computeRTLDirection } from "../../../common/util/compute_rtl";
 import "../../../components/ha-icon-button";
-import "../../../components/ha-select";
 import "../../../components/ha-slider";
 import "../../../components/ha-svg-icon";
 import { showMediaBrowserDialog } from "../../../components/media-player/show-media-browser-dialog";
@@ -50,40 +51,42 @@ class MoreInfoMediaPlayer extends LitElement {
     const controls = computeMediaControls(stateObj);
 
     return html`
-      <div class="controls">
+      ${!controls
-        <div class="basic-controls">
+        ? ""
-          ${!controls
+        : html`
-            ? ""
+            <div class="controls">
-            : controls.map(
+              <div class="basic-controls">
-                (control) => html`
+                ${controls!.map(
-                  <ha-icon-button
+                  (control) => html`
-                    action=${control.action}
+                    <ha-icon-button
-                    @click=${this._handleClick}
+                      action=${control.action}
-                    .path=${control.icon}
+                      @click=${this._handleClick}
-                    .label=${this.hass.localize(
+                      .path=${control.icon}
-                      `ui.card.media_player.${control.action}`
+                      .label=${this.hass.localize(
-                    )}
+                        `ui.card.media_player.${control.action}`
-                  >
+                      )}
-                  </ha-icon-button>
+                    >
-                `
+                    </ha-icon-button>
-              )}
+                  `
-        </div>
-        ${supportsFeature(stateObj, SUPPORT_BROWSE_MEDIA)
-          ? html`
-              <mwc-button
-                .label=${this.hass.localize(
-                  "ui.card.media_player.browse_media"
                 )}
-                @click=${this._showBrowseMedia}
+              </div>
-              >
+              ${supportsFeature(stateObj, SUPPORT_BROWSE_MEDIA)
-                <ha-svg-icon
+                ? html`
-                  .path=${mdiPlayBoxMultiple}
+                    <mwc-button
-                  slot="icon"
+                      .label=${this.hass.localize(
-                ></ha-svg-icon>
+                        "ui.card.media_player.browse_media"
-              </mwc-button>
+                      )}
-            `
+                      @click=${this._showBrowseMedia}
-          : ""}
+                    >
-      </div>
+                      <ha-svg-icon
+                        .path=${mdiPlayBoxMultiple}
+                        slot="icon"
+                      ></ha-svg-icon>
+                    </mwc-button>
+                  `
+                : ""}
+            </div>
+          `}
       ${(supportsFeature(stateObj, SUPPORT_VOLUME_SET) ||
         supportsFeature(stateObj, SUPPORT_VOLUME_BUTTONS)) &&
       ![UNAVAILABLE, UNKNOWN, "off"].includes(stateObj.state)
@@ -133,9 +136,12 @@ class MoreInfoMediaPlayer extends LitElement {
       stateObj.attributes.source_list?.length
         ? html`
             <div class="source-input">
-              <ha-select
+              <ha-svg-icon
+                class="source-input"
+                .path=${mdiLoginVariant}
+              ></ha-svg-icon>
+              <mwc-select
                 .label=${this.hass.localize("ui.card.media_player.source")}
-                icon
                 .value=${stateObj.attributes.source!}
                 @selected=${this._handleSourceChanged}
                 fixedMenuPosition
@@ -148,8 +154,7 @@ class MoreInfoMediaPlayer extends LitElement {
                       <mwc-list-item .value=${source}>${source}</mwc-list-item>
                     `
                 )}
-                <ha-svg-icon .path=${mdiLoginVariant} slot="icon"></ha-svg-icon>
+              </mwc-select>
-              </ha-select>
             </div>
           `
         : ""}
@@ -157,10 +162,10 @@ class MoreInfoMediaPlayer extends LitElement {
       stateObj.attributes.sound_mode_list?.length
         ? html`
             <div class="sound-input">
-              <ha-select
+              <ha-svg-icon .path=${mdiMusicNote}></ha-svg-icon>
+              <mwc-select
                 .label=${this.hass.localize("ui.card.media_player.sound_mode")}
                 .value=${stateObj.attributes.sound_mode!}
-                icon
                 fixedMenuPosition
                 naturalMenuWidth
                 @selected=${this._handleSoundModeChanged}
@@ -171,8 +176,7 @@ class MoreInfoMediaPlayer extends LitElement {
                     <mwc-list-item .value=${mode}>${mode}</mwc-list-item>
                   `
                 )}
-                <ha-svg-icon .path=${mdiMusicNote} slot="icon"></ha-svg-icon>
+              </mwc-select>
-              </ha-select>
             </div>
           `
         : ""}
@@ -213,8 +217,14 @@ class MoreInfoMediaPlayer extends LitElement {
         justify-content: space-between;
       }
 
-      .source-input ha-select,
+      .source-input ha-svg-icon,
-      .sound-input ha-select {
+      .sound-input ha-svg-icon {
+        padding: 7px;
+        margin-top: 24px;
+      }
+
+      .source-input mwc-select,
+      .sound-input mwc-select {
         margin-left: 10px;
         flex-grow: 1;
       }