Migrate config-users dialog(s) to wa

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,14 +21,6 @@
 -->
 
 
-## Screenshots
-<!--
-  If your PR includes visual changes, please add screenshots or a short video
-  showing the before and after. This helps reviewers understand the impact of
-  your changes.
-  Note: Remove this section if this PR has no visual changes.
--->
-
 ## Type of change
 <!--
   What type of change does your PR introduce to the Home Assistant frontend?
@@ -43,6 +35,16 @@
 - [ ] Breaking change (fix/feature causing existing functionality to break)
 - [ ] Code quality improvements to existing code or addition of tests
 
+## Example configuration
+<!--
+  Supplying a configuration snippet, makes it easier for a maintainer to test
+  your PR.
+-->
+
+```yaml
+
+```
+
 ## Additional information
 <!--
   Details are important, and help maintainers processing your PR.
@@ -52,8 +54,6 @@
 - This PR fixes or closes issue: fixes #
 - This PR is related to issue or discussion:
 - Link to documentation pull request:
-- Link to developer documentation pull request:
-- Link to backend pull request:
 
 ## Checklist
 <!--
@@ -61,50 +61,18 @@
   creating the PR. If you're unsure about any of them, don't hesitate to ask.
   We're here to help! This is simply a reminder of what we are going to look
   for before merging your code.
-
-  AI tools are welcome, but contributors are responsible for *fully*
-  understanding the code before submitting a PR.
 -->
 
-- [ ] I understand the code I am submitting and can explain how it works.
 - [ ] The code change is tested and works locally.
 - [ ] There is no commented out code in this PR.
-- [ ] I have followed the [development checklist][dev-checklist]
-- [ ] I have followed the [perfect PR recommendations][perfect-pr]
-- [ ] Any generated code has been carefully reviewed for correctness and compliance with project standards.
+- [ ] Tests have been added to verify that the new code works.
 
 If user exposed functionality or configuration variables are added/changed:
 
 - [ ] Documentation added/updated for [www.home-assistant.io][docs-repository]
 
-<!--
-  This project is very active and we have a high turnover of pull requests.
-
-  Unfortunately, the number of incoming pull requests is higher than what our
-  reviewers can review and merge so there is a long backlog of pull requests
-  waiting for review. You can help here!
-
-  By reviewing another pull request, you will help raise the code quality of
-  that pull request and the final review will be faster. This way the general
-  pace of pull request reviews will go up and your wait time will go down.
-
-  When picking a pull request to review, try to choose one that hasn't yet
-  been reviewed.
-
-  Thanks for helping out!
--->
-
-To help with the load of incoming pull requests:
-
-- [ ] I have reviewed two other [open pull requests][prs] in this repository.
-
-[prs]: https://github.com/home-assistant/frontend/pulls?q=is%3Aopen+is%3Apr+-author%3A%40me+-draft%3Atrue+sort%3Acreated-desc+review%3Anone+-status%3Afailure
-
 <!--
   Thank you for contributing <3
-
-  Below, some useful links you could explore:
 -->
-[dev-checklist]: https://developers.home-assistant.io/docs/development_checklist/
+
 [docs-repository]: https://github.com/home-assistant/home-assistant.io
-[perfect-pr]: https://developers.home-assistant.io/docs/review-process/#creating-the-perfect-pr

.github/copilot-instructions.md

@@ -194,13 +194,13 @@ The View Transitions API creates smooth animations between DOM state changes. Wh
 - **Utility wrapper**: `src/common/util/view-transition.ts` - `withViewTransition()` function with graceful fallback
 - **Real-world example**: `src/util/launch-screen.ts` - Launch screen fade pattern with browser support detection
 - **Animation keyframes**: `src/resources/theme/animations.globals.ts` - Global `fade-in`, `fade-out`, `scale` animations
-- **Animation duration**: `src/resources/theme/core.globals.ts` - `--ha-animation-duration-fast` (150ms), `--ha-animation-duration-normal` (250ms), `--ha-animation-duration-slow` (350ms) (all respect `prefers-reduced-motion`)
+- **Animation duration**: `src/resources/theme/core.globals.ts` - `--ha-animation-base-duration` (350ms, respects `prefers-reduced-motion`)
 
 **Implementation Guidelines:**
 
 1. Always use `withViewTransition()` wrapper for automatic fallback
 2. Keep transitions simple (subtle crossfades and fades work best)
-3. Use `--ha-animation-duration-*` CSS variables for consistent timing (`fast`, `normal`, `slow`)
+3. Use `--ha-animation-base-duration` CSS variable for consistent timing
 4. Assign unique `view-transition-name` to elements (must be unique at any given time)
 5. For Lit components: Override `performUpdate()` or use `::part()` for internal elements
 
@@ -214,6 +214,13 @@ By default, `:root` receives `view-transition-name: root`, creating a full-page
 - Only one view transition can run at a time
 - **Shadow DOM incompatibility**: View transitions operate at document level and do not work within Shadow DOM due to style isolation ([spec discussion](https://github.com/w3c/csswg-drafts/issues/10303)). For web components, set `view-transition-name` on the `:host` element or use document-level transitions
 
+**Current Usage & Planned Applications:**
+
+- Launch screen fade out (implemented)
+- Automation sidebar transitions (planned - #27238)
+- More info dialog content changes (planned - #27672)
+- Toolbar navigation, ha-spinner transitions (planned)
+
 **Specification & Documentation:**
 
 For browser support, API details, and current specifications, refer to these authoritative sources (note: check publication dates as specs evolve):
@@ -239,7 +246,12 @@ For browser support, API details, and current specifications, refer to these aut
 
 ## Component Library
 
-### Dialog Component
+### Dialog Components
+
+**Available Dialog Types:**
+
+- `ha-wa-dialog` - Preferred for new dialogs (Web Awesome based)
+- `ha-dialog` - Legacy component (still widely used)
 
 **Opening Dialogs (Fire Event Pattern - Recommended):**
 
@@ -253,7 +265,6 @@ fireEvent(this, "show-dialog", {
 
 **Dialog Implementation Requirements:**
 
-- Use `ha-dialog` component
 - Implement `HassDialog<T>` interface
 - Use `@state() private _open = false` to control dialog visibility
 - Set `_open = true` in `showDialog()`, `_open = false` in `closeDialog()`
@@ -269,6 +280,7 @@ fireEvent(this, "show-dialog", {
 
 - Use `width` attribute with predefined sizes: `"small"` (320px), `"medium"` (560px - default), `"large"` (720px), or `"full"`
 - Custom sizing is NOT recommended - use the standard width presets
+- Example: `<ha-wa-dialog width="small">` for alert/confirmation dialogs
 
 **Button Appearance Guidelines:**
 
@@ -278,9 +290,17 @@ fireEvent(this, "show-dialog", {
 - **Button sizes**: Use `size="small"` (32px height) or default/medium (40px height)
 - Always place primary action in `slot="primaryAction"` and secondary in `slot="secondaryAction"` within `ha-dialog-footer`
 
+**Recent Examples:**
+
+See these files for current patterns:
+
+- `src/panels/config/repairs/dialog-repairs-issue.ts`
+- `src/dialogs/restart/dialog-restart.ts`
+- `src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts`
+
 **Gallery Documentation:**
 
-- `gallery/src/pages/components/ha-dialog.markdown`
+- `gallery/src/pages/components/ha-wa-dialog.markdown`
 - `gallery/src/pages/components/ha-dialogs.markdown`
 
 ### Form Component (ha-form)
@@ -288,6 +308,7 @@ fireEvent(this, "show-dialog", {
 - Schema-driven using `HaFormSchema[]`
 - Supports entity, device, area, target, number, boolean, time, action, text, object, select, icon, media, location selectors
 - Built-in validation with error display
+- Use `dialogInitialFocus` in dialogs
 - Use `computeLabel`, `computeError`, `computeHelper` for translations
 
 ```typescript
@@ -372,6 +393,81 @@ export class HaPanelMyFeature extends SubscribeMixin(LitElement) {
 }
 ```
 
+### Creating a Dialog
+
+```typescript
+@customElement("dialog-my-feature")
+export class DialogMyFeature
+  extends LitElement
+  implements HassDialog<MyDialogParams>
+{
+  @property({ attribute: false })
+  hass!: HomeAssistant;
+
+  @state()
+  private _params?: MyDialogParams;
+
+  @state()
+  private _open = false;
+
+  public async showDialog(params: MyDialogParams): Promise<void> {
+    this._params = params;
+    this._open = true;
+  }
+
+  public closeDialog(): void {
+    this._open = false;
+  }
+
+  private _dialogClosed(): void {
+    this._params = undefined;
+    fireEvent(this, "dialog-closed", { dialog: this.localName });
+  }
+
+  protected render() {
+    if (!this._params) {
+      return nothing;
+    }
+
+    return html`
+      <ha-wa-dialog
+        .hass=${this.hass}
+        .open=${this._open}
+        header-title=${this._params.title}
+        header-subtitle=${this._params.subtitle}
+        @closed=${this._dialogClosed}
+      >
+        <p>Dialog content</p>
+        <ha-dialog-footer slot="footer">
+          <ha-button
+            slot="secondaryAction"
+            appearance="plain"
+            @click=${this.closeDialog}
+          >
+            ${this.hass.localize("ui.common.cancel")}
+          </ha-button>
+          <ha-button slot="primaryAction" @click=${this._submit}>
+            ${this.hass.localize("ui.common.save")}
+          </ha-button>
+        </ha-dialog-footer>
+      </ha-wa-dialog>
+    `;
+  }
+
+  static styles = [haStyleDialog, css``];
+}
+```
+
+### Dialog Design Guidelines
+
+- Max width: 560px (Alert/confirmation: 320px fixed width)
+- Close X-icon on top left (all screen sizes)
+- Submit button grouped with cancel at bottom right
+- Keep button labels short: "Save", "Delete", "Enable"
+- Destructive actions use red warning button
+- Always use a title (best practice)
+- Strive for minimalism
+
 #### Creating a Lovelace Card
 
 **Purpose**: Cards allow users to tell different stories about their house (based on gallery)
@@ -462,10 +558,6 @@ this.hass.localize("ui.panel.config.updates.update_available", {
 - Use HTTPS - All external resources must use HTTPS
 - CSP compliance - Ensure code works with Content Security Policy
 
-### Pull Requests
-
-When creating a pull request, you **must** use the PR template located at `.github/PULL_REQUEST_TEMPLATE.md`. Read the template file and use its full content as the PR body, filling in each section appropriately. Do not omit, reorder, or rewrite the template sections. Do not check the checklist items on behalf of the user — those are the user's responsibility to review and check. If the PR includes UI changes, remind the user to add screenshots or a short video to the PR after creating it.
-
 ### Text and Copy Guidelines
 
 #### Terminology Standards
@@ -623,6 +715,9 @@ this.hass.localize("ui.panel.config.automation.delete_confirm", {
 
 ### Component-Specific Checks
 
+- [ ] Dialogs implement HassDialog interface
+- [ ] Dialog styling uses haStyleDialog
+- [ ] Dialog accessibility includes dialogInitialFocus
 - [ ] ha-alert used correctly for messages
 - [ ] ha-form uses proper schema structure
 - [ ] Components handle all states (loading, error, unavailable)

.github/workflows/codeql-analysis.yml

@@ -36,14 +36,14 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
+        uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
         with:
           languages: ${{ matrix.language }}
 
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
+        uses: github/codeql-action/autobuild@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -57,4 +57,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
+        uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0

.github/workflows/restrict-task-creation.yml

@@ -5,38 +5,9 @@ on:
   issues:
     types: [opened]
 
-permissions: {}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.issue.number }}
-
 jobs:
-  add-no-stale:
-    name: Add no-stale label
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write # To add labels to issues
-    if: >-
-      github.event.issue.type.name == 'Task'
-      || github.event.issue.type.name == 'Epic'
-      || github.event.issue.type.name == 'Opportunity'
-    steps:
-      - name: Add no-stale label
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
-        with:
-          script: |
-            await github.rest.issues.addLabels({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              labels: ['no-stale']
-            });
-
   check-authorization:
-    name: Check authorization
     runs-on: ubuntu-latest
-    permissions:
-      issues: write # To comment on, label, and close issues
     # Only run if this is a Task issue type (from the issue form)
     if: github.event.issue.type.name == 'Task'
     steps:

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 90 days stale policy
-        uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
+        uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 90

.nvmrc

@@ -1 +1 @@
-24.14.0
+24.13.0

demo/src/stubs/energy.ts

@@ -14,28 +14,40 @@ export const mockEnergy = (hass: MockHomeAssistant) => {
       energy_sources: [
         {
           type: "grid",
-          stat_energy_from: "sensor.energy_consumption_tarif_1",
-          stat_energy_to: "sensor.energy_production_tarif_1",
-          stat_cost: "sensor.energy_consumption_tarif_1_cost",
-          stat_compensation: "sensor.energy_production_tarif_1_compensation",
-          entity_energy_price: null,
-          number_energy_price: null,
-          entity_energy_price_export: null,
-          number_energy_price_export: null,
-          stat_rate: "sensor.power_grid",
-          cost_adjustment_day: 0,
-        },
-        {
-          type: "grid",
-          stat_energy_from: "sensor.energy_consumption_tarif_2",
-          stat_energy_to: "sensor.energy_production_tarif_2",
-          stat_cost: "sensor.energy_consumption_tarif_2_cost",
-          stat_compensation: "sensor.energy_production_tarif_2_compensation",
-          entity_energy_price: null,
-          number_energy_price: null,
-          entity_energy_price_export: null,
-          number_energy_price_export: null,
-          stat_rate: "sensor.power_grid_return",
+          flow_from: [
+            {
+              stat_energy_from: "sensor.energy_consumption_tarif_1",
+              stat_cost: "sensor.energy_consumption_tarif_1_cost",
+              entity_energy_price: null,
+              number_energy_price: null,
+            },
+            {
+              stat_energy_from: "sensor.energy_consumption_tarif_2",
+              stat_cost: "sensor.energy_consumption_tarif_2_cost",
+              entity_energy_price: null,
+              number_energy_price: null,
+            },
+          ],
+          flow_to: [
+            {
+              stat_energy_to: "sensor.energy_production_tarif_1",
+              stat_compensation:
+                "sensor.energy_production_tarif_1_compensation",
+              entity_energy_price: null,
+              number_energy_price: null,
+            },
+            {
+              stat_energy_to: "sensor.energy_production_tarif_2",
+              stat_compensation:
+                "sensor.energy_production_tarif_2_compensation",
+              entity_energy_price: null,
+              number_energy_price: null,
+            },
+          ],
+          power: [
+            { stat_rate: "sensor.power_grid" },
+            { stat_rate: "sensor.power_grid_return" },
+          ],
           cost_adjustment_day: 0,
         },
         {

eslint.config.mjs

@@ -12,7 +12,6 @@ import eslintConfigPrettier from "eslint-config-prettier";
 import { configs as litConfigs } from "eslint-plugin-lit";
 import { configs as wcConfigs } from "eslint-plugin-wc";
 import { configs as a11yConfigs } from "eslint-plugin-lit-a11y";
-import html from "@html-eslint/eslint-plugin";
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = path.dirname(_filename);
@@ -193,13 +192,5 @@ export default tseslint.config(
     languageOptions: {
       globals: globals.audioWorklet,
     },
-  },
-  {
-    plugins: {
-      html,
-    },
-    rules: {
-      "html/no-invalid-attr-value": "error",
-    },
   }
 );

gallery/src/pages/components/ha-adaptive-dialog.ts

@@ -21,8 +21,8 @@ type DialogType =
   | "basic"
   | "basic-subtitle-below"
   | "basic-subtitle-above"
-  | "allow-mode-change"
   | "form"
+  | "form-block-mode"
   | "actions"
   | "large"
   | "small";
@@ -69,8 +69,8 @@ export class DemoHaAdaptiveDialog extends LitElement {
           <ha-button @click=${this._handleOpenDialog("form")}
             >Adaptive dialog with form</ha-button
           >
-          <ha-button @click=${this._handleOpenDialog("allow-mode-change")}
-            >Adaptive dialog with allow mode change</ha-button
+          <ha-button @click=${this._handleOpenDialog("form-block-mode")}
+            >Adaptive dialog with form (block mode change)</ha-button
           >
           <ha-button @click=${this._handleOpenDialog("actions")}
             >Adaptive dialog with actions</ha-button
@@ -164,15 +164,27 @@ export class DemoHaAdaptiveDialog extends LitElement {
 
         <ha-adaptive-dialog
           .hass=${this._hass}
-          .allowModeChange=${this._openDialog === "allow-mode-change"}
-          header-title="Adaptive dialog with allow mode change"
-          header-subtitle="Resize the window while this dialog is open"
+          .open=${this._openDialog === "form-block-mode"}
+          header-title="Adaptive dialog with form (block mode change)"
+          header-subtitle="This form will not reset when the viewport size changes"
+          block-mode-change
           @closed=${this._handleClosed}
         >
-          <div>
-            This dialog can switch between dialog mode and bottom sheet mode
-            while open.
-          </div>
+          <ha-form autofocus .schema=${SCHEMA}></ha-form>
+          <ha-dialog-footer slot="footer">
+            <ha-button
+              @click=${this._handleClosed}
+              slot="secondaryAction"
+              variant="plain"
+              >Cancel</ha-button
+            >
+            <ha-button
+              @click=${this._handleClosed}
+              slot="primaryAction"
+              variant="accent"
+              >Submit</ha-button
+            >
+          </ha-dialog-footer>
         </ha-adaptive-dialog>
 
         <ha-adaptive-dialog
@@ -203,7 +215,7 @@ export class DemoHaAdaptiveDialog extends LitElement {
           <li>
             <strong>Dialog mode:</strong> Used on larger screens (width &gt;
             870px and height &gt; 500px). Renders as a centered dialog using
-            <code>ha-dialog</code>.
+            <code>ha-wa-dialog</code>.
           </li>
           <li>
             <strong>Bottom sheet mode:</strong> Used on mobile devices and
@@ -213,9 +225,10 @@ export class DemoHaAdaptiveDialog extends LitElement {
         </ul>
 
         <p>
-          By default, the mode is determined at mount time and then stays fixed
-          while the dialog is open. To allow switching modes while the viewport
-          changes, use the <code>allow-mode-change</code> attribute.
+          The mode is determined automatically and updates when the window is
+          resized. To prevent mode changes after the initial mount (useful for
+          preventing form resets), use the <code>block-mode-change</code>
+          attribute.
         </p>
 
         <h3>Width</h3>
@@ -381,15 +394,15 @@ export class DemoHaAdaptiveDialog extends LitElement {
 
         <p>
           If you don't need responsive behavior, use
-          <code>ha-dialog</code> directly for desktop-only dialogs or
+          <code>ha-wa-dialog</code> directly for desktop-only dialogs or
           <code>ha-bottom-sheet</code> for mobile-only sheets.
         </p>
 
         <p>
-          Use the <code>allow-mode-change</code> attribute when you want the
-          dialog to switch between modes as the viewport changes after opening.
-          For forms, you can keep the default behavior to avoid resetting fields
-          on resize.
+          Use the <code>block-mode-change</code> attribute when you want to
+          prevent the dialog from switching modes after it's opened. This is
+          especially useful for forms, as it prevents form data from being lost
+          when users resize their browser window.
         </p>
 
         <h3>Example usage</h3>
@@ -397,6 +410,7 @@ export class DemoHaAdaptiveDialog extends LitElement {
         <pre><code>&lt;ha-adaptive-dialog
   .hass=\${this.hass}
   open
+  width="medium"
   header-title="Dialog title"
   header-subtitle="Dialog subtitle"
 &gt;
@@ -413,10 +427,27 @@ export class DemoHaAdaptiveDialog extends LitElement {
   &lt;/ha-dialog-footer&gt;
 &lt;/ha-adaptive-dialog&gt;</code></pre>
 
+        <p>Example with <code>block-mode-change</code> for forms:</p>
+
+        <pre><code>&lt;ha-adaptive-dialog
+  .hass=\${this.hass}
+  open
+  header-title="Edit configuration"
+  block-mode-change
+&gt;
+  &lt;ha-form .schema=\${schema} .data=\${data}&gt;&lt;/ha-form&gt;
+  &lt;ha-dialog-footer slot="footer"&gt;
+    &lt;ha-button slot="secondaryAction" variant="plain"
+      &gt;Cancel&lt;/ha-button
+    &gt;
+    &lt;ha-button slot="primaryAction" variant="accent"&gt;Save&lt;/ha-button&gt;
+  &lt;/ha-dialog-footer&gt;
+&lt;/ha-adaptive-dialog&gt;</code></pre>
+
         <h3>API</h3>
 
         <p>
-          This component combines <code>ha-dialog</code> and
+          This component combines <code>ha-wa-dialog</code> and
           <code>ha-bottom-sheet</code> with automatic mode switching based on
           screen size.
         </p>
@@ -490,10 +521,12 @@ export class DemoHaAdaptiveDialog extends LitElement {
               <td></td>
             </tr>
             <tr>
-              <td><code>allow-mode-change</code></td>
+              <td><code>block-mode-change</code></td>
               <td>
-                When set, the dialog can switch between modes as the viewport
-                size changes while it is open.
+                When set, the mode is determined at mount time based on the
+                current screen size, but subsequent mode changes are blocked.
+                Useful for preventing forms from resetting when the viewport
+                size changes.
               </td>
               <td><code>false</code></td>
               <td><code>false</code>, <code>true</code></td>

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

@@ -1,3 +0,0 @@
----
-title: Dialog (ha-dialog)
----

gallery/src/pages/components/ha-wa-dialog.markdown

@@ -0,0 +1,3 @@
+---
+title: Dialog (ha-wa-dialog)
+---

gallery/src/pages/components/ha-wa-dialog.ts

@@ -6,7 +6,7 @@ import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-dialog-footer";
 import "../../../../src/components/ha-form/ha-form";
 import "../../../../src/components/ha-icon-button";
-import "../../../../src/components/ha-dialog";
+import "../../../../src/components/ha-wa-dialog";
 import type { HaFormSchema } from "../../../../src/components/ha-form/types";
 
 const SCHEMA: HaFormSchema[] = [
@@ -22,14 +22,14 @@ type DialogType =
   | "form"
   | "actions";
 
-@customElement("demo-components-ha-dialog")
-export class DemoHaDialog extends LitElement {
+@customElement("demo-components-ha-wa-dialog")
+export class DemoHaWaDialog extends LitElement {
   @state() private _openDialog: DialogType = false;
 
   protected render() {
     return html`
       <div class="content">
-        <h1>Dialog <code>&lt;ha-dialog&gt;</code></h1>
+        <h1>Dialog <code>&lt;ha-wa-dialog&gt;</code></h1>
 
         <p class="subtitle">Dialog component built with WebAwesome.</p>
 
@@ -53,24 +53,24 @@ export class DemoHaDialog extends LitElement {
           >
         </div>
 
-        <ha-dialog
+        <ha-wa-dialog
           .open=${this._openDialog === "basic"}
           header-title="Basic dialog"
           @closed=${this._handleClosed}
         >
           <div>Dialog content</div>
-        </ha-dialog>
+        </ha-wa-dialog>
 
-        <ha-dialog
+        <ha-wa-dialog
           .open=${this._openDialog === "basic-subtitle-below"}
           header-title="Basic dialog with subtitle"
           header-subtitle="This is a basic dialog with a subtitle below"
           @closed=${this._handleClosed}
         >
           <div>Dialog content</div>
-        </ha-dialog>
+        </ha-wa-dialog>
 
-        <ha-dialog
+        <ha-wa-dialog
           .open=${this._openDialog === "basic-subtitle-above"}
           header-title="Dialog with subtitle above"
           header-subtitle="This is a basic dialog with a subtitle above"
@@ -78,9 +78,9 @@ export class DemoHaDialog extends LitElement {
           @closed=${this._handleClosed}
         >
           <div>Dialog content</div>
-        </ha-dialog>
+        </ha-wa-dialog>
 
-        <ha-dialog
+        <ha-wa-dialog
           .open=${this._openDialog === "form"}
           header-title="Dialog with form"
           header-subtitle="This is a dialog with a form and a footer"
@@ -91,18 +91,17 @@ export class DemoHaDialog extends LitElement {
           <ha-dialog-footer slot="footer">
             <ha-button
               data-dialog="close"
-              appearance="plain"
               slot="secondaryAction"
+              variant="plain"
+              >Cancel</ha-button
+            >
+            <ha-button data-dialog="close" slot="primaryAction" variant="accent"
+              >Submit</ha-button
             >
-              Cancel
-            </ha-button>
-            <ha-button data-dialog="close" slot="primaryAction">
-              Submit
-            </ha-button>
           </ha-dialog-footer>
-        </ha-dialog>
+        </ha-wa-dialog>
 
-        <ha-dialog
+        <ha-wa-dialog
           .open=${this._openDialog === "actions"}
           header-title="Dialog with actions"
           header-subtitle="This is a dialog with header actions"
@@ -114,7 +113,7 @@ export class DemoHaDialog extends LitElement {
           </div>
 
           <div>Dialog content</div>
-        </ha-dialog>
+        </ha-wa-dialog>
 
         <h2>Design</h2>
 
@@ -229,19 +228,19 @@ export class DemoHaDialog extends LitElement {
             <tr>
               <th>Slot</th>
               <th>Description</th>
-              <th>Appearance to use</th>
+              <th>Variant to use</th>
             </tr>
           </thead>
           <tbody>
             <tr>
               <td><code>secondaryAction</code></td>
               <td>The secondary action button(s).</td>
-              <td><code>appearance="plain"</code></td>
+              <td><code>plain</code></td>
             </tr>
             <tr>
               <td><code>primaryAction</code></td>
               <td>The primary action button(s).</td>
-              <td>Default (no appearance attribute)</td>
+              <td><code>accent</code></td>
             </tr>
           </tbody>
         </table>
@@ -250,7 +249,7 @@ export class DemoHaDialog extends LitElement {
 
         <h3>Example Usage</h3>
 
-        <pre><code>&lt;ha-dialog
+        <pre><code>&lt;ha-wa-dialog
   open
   header-title="Dialog title"
   header-subtitle="Dialog subtitle"
@@ -262,18 +261,12 @@ export class DemoHaDialog extends LitElement {
   &lt;/div&gt;
   &lt;div&gt;Dialog content&lt;/div&gt;
   &lt;ha-dialog-footer slot="footer"&gt;
-    &lt;ha-button
-      data-dialog="close"
-      appearance="plain"
-      slot="secondaryAction"
+    &lt;ha-button data-dialog="close" slot="secondaryAction" variant="plain"
+      &gt;Cancel&lt;/ha-button
     &gt;
-      Cancel
-    &lt;/ha-button&gt;
-    &lt;ha-button data-dialog="close" slot="primaryAction"&gt;
-      Submit
-    &lt;/ha-button&gt;
+    &lt;ha-button slot="primaryAction" variant="accent"&gt;Submit&lt;/ha-button&gt;
   &lt;/ha-dialog-footer&gt;
-&lt;/ha-dialog&gt;</code></pre>
+&lt;/ha-wa-dialog&gt;</code></pre>
 
         <h3>API</h3>
 
@@ -521,6 +514,6 @@ export class DemoHaDialog extends LitElement {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "demo-components-ha-dialog": DemoHaDialog;
+    "demo-components-ha-wa-dialog": DemoHaWaDialog;
   }
 }

gallery/src/pages/concepts/home.markdown

@@ -18,7 +18,7 @@ The Home Assistant interface is based on Material Design. It's a design system c
 
 We want to make it as easy for designers to contribute as it is for developers. There’s a lot a designer can contribute to:
 
-- Meet us at <a href="https://www.home-assistant.io/join-chat-design" rel="noopener noreferrer" target="_blank">Discord #designers channel</a>. If you can't see the channel, make sure you set the correct role in Channels & Roles.
+- Meet us at <a href="https://www.home-assistant.io/join-chat" rel="noopener noreferrer" target="_blank">devs_ux Discord</a>. Feel free to share your designs, user test or strategic ideas.
 - Start designing with our <a href="https://www.figma.com/community/file/967153512097289521/Home-Assistant-DesignKit" rel="noopener noreferrer" target="_blank">Figma DesignKit</a>.
 - Find the latest UX <a href="https://github.com/home-assistant/frontend/discussions?discussions_q=label%3Aux" rel="noopener noreferrer" target="_blank">discussions</a> and <a href="https://github.com/home-assistant/frontend/labels/ux" rel="noopener noreferrer" target="_blank">issues</a> on GitHub. Everyone can start a new issue or discussion!
 

landing-page/src/ha-landing-page.ts

@@ -222,9 +222,6 @@ class HaLandingPage extends LandingPageBaseElement {
         flex-direction: column;
         gap: var(--ha-space-4);
       }
-      ha-language-picker {
-        min-width: 200px;
-      }
       ha-alert p {
         text-align: unset;
       }

package.json

@@ -29,15 +29,15 @@
     "@babel/runtime": "7.28.6",
     "@braintree/sanitize-url": "7.1.2",
     "@codemirror/autocomplete": "6.20.0",
-    "@codemirror/commands": "6.10.2",
+    "@codemirror/commands": "6.10.1",
     "@codemirror/language": "6.12.1",
     "@codemirror/legacy-modes": "6.5.2",
     "@codemirror/search": "6.6.0",
     "@codemirror/state": "6.5.4",
-    "@codemirror/view": "6.39.15",
+    "@codemirror/view": "6.39.12",
     "@date-fns/tz": "1.4.1",
     "@egjs/hammerjs": "2.0.17",
-    "@formatjs/intl-datetimeformat": "7.2.2",
+    "@formatjs/intl-datetimeformat": "7.2.1",
     "@formatjs/intl-displaynames": "7.2.1",
     "@formatjs/intl-durationformat": "0.10.1",
     "@formatjs/intl-getcanonicallocales": "3.2.1",
@@ -52,7 +52,7 @@
     "@fullcalendar/list": "6.1.20",
     "@fullcalendar/luxon3": "6.1.20",
     "@fullcalendar/timegrid": "6.1.20",
-    "@home-assistant/webawesome": "3.2.1-ha.3",
+    "@home-assistant/webawesome": "3.0.0-ha.2",
     "@lezer/highlight": "1.2.3",
     "@lit-labs/motion": "1.1.0",
     "@lit-labs/observers": "2.1.0",
@@ -68,6 +68,7 @@
     "@material/mwc-fab": "0.27.0",
     "@material/mwc-floating-label": "0.27.0",
     "@material/mwc-formfield": "patch:@material/mwc-formfield@npm%3A0.27.0#~/.yarn/patches/@material-mwc-formfield-npm-0.27.0-9528cb60f6.patch",
+    "@material/mwc-icon-button": "0.27.0",
     "@material/mwc-linear-progress": "0.27.0",
     "@material/mwc-list": "patch:@material/mwc-list@npm%3A0.27.0#~/.yarn/patches/@material-mwc-list-npm-0.27.0-5344fc9de4.patch",
     "@material/mwc-radio": "0.27.0",
@@ -83,7 +84,7 @@
     "@mdi/js": "7.4.47",
     "@mdi/svg": "7.4.47",
     "@replit/codemirror-indentation-markers": "6.5.3",
-    "@swc/helpers": "0.5.19",
+    "@swc/helpers": "0.5.18",
     "@thomasloven/round-slider": "0.6.0",
     "@tsparticles/engine": "3.9.1",
     "@tsparticles/preset-links": "3.2.0",
@@ -118,7 +119,7 @@
     "lit": "3.3.2",
     "lit-html": "3.3.2",
     "luxon": "3.7.2",
-    "marked": "17.0.3",
+    "marked": "17.0.1",
     "memoize-one": "6.0.0",
     "node-vibrant": "4.0.4",
     "object-hash": "3.0.0",
@@ -131,7 +132,7 @@
     "stacktrace-js": "2.0.2",
     "superstruct": "2.0.2",
     "tinykeys": "3.0.0",
-    "ua-parser-js": "2.0.9",
+    "ua-parser-js": "2.0.8",
     "vue": "2.7.16",
     "vue2-daterange-picker": "0.6.8",
     "weekstart": "2.0.0",
@@ -148,14 +149,13 @@
     "@babel/helper-define-polyfill-provider": "0.6.6",
     "@babel/plugin-transform-runtime": "7.29.0",
     "@babel/preset-env": "7.29.0",
-    "@bundle-stats/plugin-webpack-filter": "4.21.10",
-    "@html-eslint/eslint-plugin": "0.56.0",
+    "@bundle-stats/plugin-webpack-filter": "4.21.9",
     "@lokalise/node-api": "15.6.1",
     "@octokit/auth-oauth-device": "8.0.3",
-    "@octokit/plugin-retry": "8.1.0",
+    "@octokit/plugin-retry": "8.0.3",
     "@octokit/rest": "22.0.1",
-    "@rsdoctor/rspack-plugin": "1.5.2",
-    "@rspack/core": "1.7.6",
+    "@rsdoctor/rspack-plugin": "1.5.1",
+    "@rspack/core": "1.7.4",
     "@rspack/dev-server": "1.2.1",
     "@types/babel__plugin-transform-runtime": "7.9.5",
     "@types/chromecast-caf-receiver": "6.0.25",
@@ -172,7 +172,7 @@
     "@types/mocha": "10.0.10",
     "@types/qrcode": "1.5.6",
     "@types/sortablejs": "1.15.9",
-    "@types/tar": "7.0.87",
+    "@types/tar": "6.1.13",
     "@types/ua-parser-js": "0.7.39",
     "@types/webspeechapi": "0.0.29",
     "@vitest/coverage-v8": "4.0.18",
@@ -180,25 +180,25 @@
     "babel-plugin-template-html-minifier": "4.1.0",
     "browserslist-useragent-regexp": "4.1.3",
     "del": "8.0.1",
-    "eslint": "9.39.3",
+    "eslint": "9.39.2",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "10.1.8",
     "eslint-import-resolver-webpack": "0.13.10",
     "eslint-plugin-import": "2.32.0",
-    "eslint-plugin-lit": "2.2.1",
+    "eslint-plugin-lit": "2.1.1",
     "eslint-plugin-lit-a11y": "5.1.1",
-    "eslint-plugin-unused-imports": "4.4.1",
-    "eslint-plugin-wc": "3.1.0",
+    "eslint-plugin-unused-imports": "4.3.0",
+    "eslint-plugin-wc": "3.0.2",
     "fancy-log": "2.0.0",
     "fs-extra": "11.3.3",
-    "glob": "13.0.6",
+    "glob": "13.0.0",
     "gulp": "5.0.1",
     "gulp-brotli": "3.0.0",
     "gulp-json-transform": "0.5.0",
     "gulp-rename": "2.1.0",
     "html-minifier-terser": "7.2.0",
     "husky": "9.1.7",
-    "jsdom": "28.1.0",
+    "jsdom": "28.0.0",
     "jszip": "3.10.1",
     "lint-staged": "16.2.7",
     "lit-analyzer": "2.0.3",
@@ -210,12 +210,12 @@
     "rspack-manifest-plugin": "5.2.1",
     "serve": "14.2.5",
     "sinon": "21.0.1",
-    "tar": "7.5.9",
+    "tar": "7.5.7",
     "terser-webpack-plugin": "5.3.16",
     "ts-lit-plugin": "2.0.2",
     "typescript": "5.9.3",
-    "typescript-eslint": "8.56.0",
-    "vite-tsconfig-paths": "6.1.1",
+    "typescript-eslint": "8.54.0",
+    "vite-tsconfig-paths": "6.0.5",
     "vitest": "4.0.18",
     "webpack-stats-plugin": "1.1.3",
     "webpackbar": "7.0.0",
@@ -235,6 +235,6 @@
   },
   "packageManager": "yarn@4.12.0",
   "volta": {
-    "node": "24.14.0"
+    "node": "24.13.0"
   }
 }

src/auth/ha-auth-form-string.ts

@@ -1,7 +1,10 @@
+/* eslint-disable lit/prefer-static-styles */
+import type { TemplateResult } from "lit";
+import { html } from "lit";
 import { customElement } from "lit/decorators";
 import { HaFormString } from "../components/ha-form/ha-form-string";
 import "../components/ha-icon-button";
-import "../components/ha-input";
+import "./ha-auth-textfield";
 
 @customElement("ha-auth-form-string")
 export class HaAuthFormString extends HaFormString {
@@ -9,9 +12,59 @@ export class HaAuthFormString extends HaFormString {
     return this;
   }
 
-  public connectedCallback(): void {
-    super.connectedCallback();
-    this.style.position = "relative";
+  protected render(): TemplateResult {
+    return html`
+      <style>
+        ha-auth-form-string {
+          display: block;
+          position: relative;
+        }
+        ha-auth-form-string[own-margin] {
+          margin-bottom: 5px;
+        }
+        ha-auth-form-string ha-auth-textfield {
+          display: block !important;
+        }
+        ha-auth-form-string ha-icon-button {
+          position: absolute;
+          top: 8px;
+          right: 8px;
+          inset-inline-start: initial;
+          inset-inline-end: 8px;
+          --mdc-icon-button-size: 40px;
+          --mdc-icon-size: 20px;
+          color: var(--secondary-text-color);
+          direction: var(--direction);
+        }
+      </style>
+      <ha-auth-textfield
+        .type=${!this.isPassword
+          ? this.stringType
+          : this.unmaskedPassword
+            ? "text"
+            : "password"}
+        .label=${this.label}
+        .value=${this.data || ""}
+        .helper=${this.helper}
+        helperPersistent
+        .disabled=${this.disabled}
+        .required=${this.schema.required}
+        .autoValidate=${this.schema.required}
+        .name=${this.schema.name}
+        .autocomplete=${this.schema.autocomplete}
+        ?autofocus=${this.schema.autofocus}
+        .suffix=${this.isPassword
+          ? // reserve some space for the icon.
+            html`<div style="width: 24px"></div>`
+          : this.schema.description?.suffix}
+        .validationMessage=${this.schema.required
+          ? this.localize?.("ui.panel.page-authorize.form.error_required")
+          : undefined}
+        @input=${this._valueChanged}
+        @change=${this._valueChanged}
+      ></ha-auth-textfield>
+      ${this.renderIcon()}
+    `;
   }
 }
 

src/auth/ha-auth-textfield.ts

@@ -0,0 +1,264 @@
+/* eslint-disable lit/value-after-constraints */
+/* eslint-disable lit/prefer-static-styles */
+import { floatingLabel } from "@material/mwc-floating-label/mwc-floating-label-directive";
+import type { TemplateResult } from "lit";
+import { html } from "lit";
+import { customElement } from "lit/decorators";
+import { ifDefined } from "lit/directives/if-defined";
+import { live } from "lit/directives/live";
+import { HaTextField } from "../components/ha-textfield";
+
+@customElement("ha-auth-textfield")
+export class HaAuthTextField extends HaTextField {
+  protected renderLabel(): TemplateResult | string {
+    return !this.label
+      ? ""
+      : html`
+          <span
+            .floatingLabelFoundation=${floatingLabel(
+              this.label
+            ) as unknown as any}
+            .id=${this.name}
+            >${this.label}</span
+          >
+        `;
+  }
+
+  protected renderInput(shouldRenderHelperText: boolean): TemplateResult {
+    const minOrUndef = this.minLength === -1 ? undefined : this.minLength;
+    const maxOrUndef = this.maxLength === -1 ? undefined : this.maxLength;
+    const autocapitalizeOrUndef = this.autocapitalize
+      ? (this.autocapitalize as
+          | "off"
+          | "none"
+          | "on"
+          | "sentences"
+          | "words"
+          | "characters")
+      : undefined;
+    const showValidationMessage = this.validationMessage && !this.isUiValid;
+    const ariaLabelledbyOrUndef = this.label ? this.name : undefined;
+    const ariaControlsOrUndef = shouldRenderHelperText
+      ? "helper-text"
+      : undefined;
+    const ariaDescribedbyOrUndef =
+      this.focused || this.helperPersistent || showValidationMessage
+        ? "helper-text"
+        : undefined;
+    // TODO: live() directive needs casting for lit-analyzer
+    // https://github.com/runem/lit-analyzer/pull/91/files
+    // TODO: lit-analyzer labels min/max as (number|string) instead of string
+    return html`<input
+      aria-labelledby=${ifDefined(ariaLabelledbyOrUndef)}
+      aria-controls=${ifDefined(ariaControlsOrUndef)}
+      aria-describedby=${ifDefined(ariaDescribedbyOrUndef)}
+      class="mdc-text-field__input"
+      type=${this.type}
+      .value=${live(this.value) as unknown as string}
+      ?disabled=${this.disabled}
+      placeholder=${this.placeholder}
+      ?required=${this.required}
+      ?readonly=${this.readOnly}
+      minlength=${ifDefined(minOrUndef)}
+      maxlength=${ifDefined(maxOrUndef)}
+      pattern=${ifDefined(this.pattern ? this.pattern : undefined)}
+      min=${ifDefined(this.min === "" ? undefined : (this.min as number))}
+      max=${ifDefined(this.max === "" ? undefined : (this.max as number))}
+      step=${ifDefined(this.step === null ? undefined : (this.step as number))}
+      size=${ifDefined(this.size === null ? undefined : this.size)}
+      name=${ifDefined(this.name === "" ? undefined : this.name)}
+      inputmode=${ifDefined(this.inputMode)}
+      autocapitalize=${ifDefined(autocapitalizeOrUndef)}
+      ?autofocus=${this.autofocus}
+      @input=${this.handleInputChange}
+      @focus=${this.onInputFocus}
+      @blur=${this.onInputBlur}
+    />`;
+  }
+
+  public render() {
+    return html`
+      <style>
+        ha-auth-textfield {
+          display: inline-flex;
+          flex-direction: column;
+          outline: none;
+        }
+        ha-auth-textfield:not([disabled]):hover
+          :not(.mdc-text-field--invalid):not(.mdc-text-field--focused)
+          mwc-notched-outline {
+          --mdc-notched-outline-border-color: var(
+            --mdc-text-field-outlined-hover-border-color,
+            rgba(0, 0, 0, 0.87)
+          );
+        }
+
+        ha-auth-textfield:not([disabled])
+          .mdc-text-field:not(.mdc-text-field--outlined) {
+          background-color: var(--mdc-text-field-fill-color, whitesmoke);
+        }
+
+        ha-auth-textfield:not([disabled])
+          .mdc-text-field.mdc-text-field--invalid
+          mwc-notched-outline {
+          --mdc-notched-outline-border-color: var(
+            --mdc-text-field-error-color,
+            var(--mdc-theme-error, #b00020)
+          );
+        }
+
+        ha-auth-textfield:not([disabled])
+          .mdc-text-field.mdc-text-field--invalid
+          + .mdc-text-field-helper-line
+          .mdc-text-field-character-counter,
+        ha-auth-textfield:not([disabled])
+          .mdc-text-field.mdc-text-field--invalid
+          .mdc-text-field__icon {
+          color: var(
+            --mdc-text-field-error-color,
+            var(--mdc-theme-error, #b00020)
+          );
+        }
+
+        ha-auth-textfield:not([disabled])
+          .mdc-text-field:not(.mdc-text-field--invalid):not(
+            .mdc-text-field--focused
+          )
+          .mdc-floating-label,
+        ha-auth-textfield:not([disabled])
+          .mdc-text-field:not(.mdc-text-field--invalid):not(
+            .mdc-text-field--focused
+          )
+          .mdc-floating-label::after {
+          color: var(--mdc-text-field-label-ink-color, rgba(0, 0, 0, 0.6));
+        }
+
+        ha-auth-textfield:not([disabled])
+          .mdc-text-field.mdc-text-field--focused
+          mwc-notched-outline {
+          --mdc-notched-outline-stroke-width: 2px;
+        }
+
+        ha-auth-textfield:not([disabled])
+          .mdc-text-field.mdc-text-field--focused:not(.mdc-text-field--invalid)
+          mwc-notched-outline {
+          --mdc-notched-outline-border-color: var(
+            --mdc-text-field-focused-label-color,
+            var(--mdc-theme-primary, rgba(98, 0, 238, 0.87))
+          );
+        }
+
+        ha-auth-textfield:not([disabled])
+          .mdc-text-field.mdc-text-field--focused:not(.mdc-text-field--invalid)
+          .mdc-floating-label {
+          color: #6200ee;
+          color: var(--mdc-theme-primary, #6200ee);
+        }
+
+        ha-auth-textfield:not([disabled])
+          .mdc-text-field
+          .mdc-text-field__input {
+          color: var(--mdc-text-field-ink-color, rgba(0, 0, 0, 0.87));
+        }
+
+        ha-auth-textfield:not([disabled])
+          .mdc-text-field
+          .mdc-text-field__input::placeholder {
+          color: var(--mdc-text-field-label-ink-color, rgba(0, 0, 0, 0.6));
+        }
+
+        ha-auth-textfield:not([disabled])
+          .mdc-text-field-helper-line
+          .mdc-text-field-helper-text:not(
+            .mdc-text-field-helper-text--validation-msg
+          ),
+        ha-auth-textfield:not([disabled])
+          .mdc-text-field-helper-line:not(.mdc-text-field--invalid)
+          .mdc-text-field-character-counter {
+          color: var(--mdc-text-field-label-ink-color, rgba(0, 0, 0, 0.6));
+        }
+
+        ha-auth-textfield[disabled]
+          .mdc-text-field:not(.mdc-text-field--outlined) {
+          background-color: var(--mdc-text-field-disabled-fill-color, #fafafa);
+        }
+
+        ha-auth-textfield[disabled]
+          .mdc-text-field.mdc-text-field--outlined
+          mwc-notched-outline {
+          --mdc-notched-outline-border-color: var(
+            --mdc-text-field-outlined-disabled-border-color,
+            rgba(0, 0, 0, 0.06)
+          );
+        }
+
+        ha-auth-textfield[disabled]
+          .mdc-text-field:not(.mdc-text-field--invalid):not(
+            .mdc-text-field--focused
+          )
+          .mdc-floating-label,
+        ha-auth-textfield[disabled]
+          .mdc-text-field:not(.mdc-text-field--invalid):not(
+            .mdc-text-field--focused
+          )
+          .mdc-floating-label::after {
+          color: var(--mdc-text-field-disabled-ink-color, rgba(0, 0, 0, 0.38));
+        }
+
+        ha-auth-textfield[disabled] .mdc-text-field .mdc-text-field__input,
+        ha-auth-textfield[disabled]
+          .mdc-text-field
+          .mdc-text-field__input::placeholder {
+          color: var(--mdc-text-field-disabled-ink-color, rgba(0, 0, 0, 0.38));
+        }
+
+        ha-auth-textfield[disabled]
+          .mdc-text-field-helper-line
+          .mdc-text-field-helper-text,
+        ha-auth-textfield[disabled]
+          .mdc-text-field-helper-line
+          .mdc-text-field-character-counter {
+          color: var(--mdc-text-field-disabled-ink-color, rgba(0, 0, 0, 0.38));
+        }
+        ha-auth-textfield:not([disabled])
+          .mdc-text-field.mdc-text-field--focused:not(.mdc-text-field--invalid)
+          .mdc-floating-label {
+          color: var(--mdc-theme-primary, #6200ee);
+        }
+        ha-auth-textfield[no-spinner] input::-webkit-outer-spin-button,
+        ha-auth-textfield[no-spinner] input::-webkit-inner-spin-button {
+          -webkit-appearance: none;
+          margin: 0;
+        }
+
+        /* Firefox */
+        ha-auth-textfield[no-spinner] input[type="number"] {
+          -moz-appearance: textfield;
+        }
+      </style>
+      ${super.render()}
+    `;
+  }
+
+  protected createRenderRoot() {
+    // add parent style to light dom
+    const style = document.createElement("style");
+    style.textContent = HaTextField.elementStyles as unknown as string;
+    this.append(style);
+    return this;
+  }
+
+  public firstUpdated() {
+    super.firstUpdated();
+
+    if (this.autofocus) {
+      this.focus();
+    }
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-auth-textfield": HaAuthTextField;
+  }
+}

src/common/const.ts

@@ -116,6 +116,3 @@ export const UNIT_F = "°F";
 
 /** Entity ID of the default view. */
 export const DEFAULT_VIEW_ENTITY_ID = "group.default_view";
-
-/** String to visually separate labels on UI */
-export const STRINGS_SEPARATOR_DOT = " · ";

src/common/datetime/format_date.ts

@@ -210,39 +210,3 @@ const formatDateWeekdayShortMem = memoizeOne(
       timeZone: resolveTimeZone(locale.time_zone, serverTimeZone),
     })
 );
-
-// Mon, Aug 10
-export const formatDateWeekdayVeryShortDate = (
-  dateObj: Date,
-  locale: FrontendLocaleData,
-  config: HassConfig
-) =>
-  formatDateWeekdayVeryShortDateMem(locale, config.time_zone).format(dateObj);
-
-const formatDateWeekdayVeryShortDateMem = memoizeOne(
-  (locale: FrontendLocaleData, serverTimeZone: string) =>
-    new Intl.DateTimeFormat(locale.language, {
-      weekday: "short",
-      month: "short",
-      day: "numeric",
-      timeZone: resolveTimeZone(locale.time_zone, serverTimeZone),
-    })
-);
-
-// Mon, Aug 10, 2021
-export const formatDateWeekdayShortDate = (
-  dateObj: Date,
-  locale: FrontendLocaleData,
-  config: HassConfig
-) => formatDateWeekdayShortDateMem(locale, config.time_zone).format(dateObj);
-
-const formatDateWeekdayShortDateMem = memoizeOne(
-  (locale: FrontendLocaleData, serverTimeZone: string) =>
-    new Intl.DateTimeFormat(locale.language, {
-      weekday: "short",
-      month: "short",
-      day: "numeric",
-      year: "numeric",
-      timeZone: resolveTimeZone(locale.time_zone, serverTimeZone),
-    })
-);

src/common/entity/compute_state_display.ts

@@ -3,14 +3,13 @@ import { UNAVAILABLE, UNKNOWN } from "../../data/entity/entity";
 import type { EntityRegistryDisplayEntry } from "../../data/entity/entity_registry";
 import type { FrontendLocaleData } from "../../data/translation";
 import { TimeZone } from "../../data/translation";
-import type { HomeAssistant, ValuePart } from "../../types";
+import type { HomeAssistant } from "../../types";
 import { formatDate } from "../datetime/format_date";
 import { formatDateTime } from "../datetime/format_date_time";
 import { DURATION_UNITS, formatDuration } from "../datetime/format_duration";
 import { formatTime } from "../datetime/format_time";
 import {
   formatNumber,
-  formatNumberToParts,
   getNumberFormatOptions,
   isNumericFromAttributes,
 } from "../number/format_number";
@@ -52,36 +51,8 @@ export const computeStateDisplayFromEntityAttributes = (
   attributes: any,
   state: string
 ): string => {
-  const parts = computeStateToPartsFromEntityAttributes(
-    localize,
-    locale,
-    sensorNumericDeviceClasses,
-    config,
-    entity,
-    entityId,
-    attributes,
-    state
-  );
-  return parts.map((part) => part.value).join("");
-};
-
-const computeStateToPartsFromEntityAttributes = (
-  localize: LocalizeFunc,
-  locale: FrontendLocaleData,
-  sensorNumericDeviceClasses: string[],
-  config: HassConfig,
-  entity: EntityRegistryDisplayEntry | undefined,
-  entityId: string,
-  attributes: any,
-  state: string
-): ValuePart[] => {
   if (state === UNKNOWN || state === UNAVAILABLE) {
-    return [
-      {
-        type: "value",
-        value: localize(`state.default.${state}`),
-      },
-    ];
+    return localize(`state.default.${state}`);
   }
 
   const domain = computeDomain(entityId);
@@ -102,27 +73,19 @@ const computeStateToPartsFromEntityAttributes = (
       DURATION_UNITS.includes(attributes.unit_of_measurement)
     ) {
       try {
-        return [
-          {
-            type: "value",
-            value: formatDuration(
-              locale,
-              state,
-              attributes.unit_of_measurement,
-              entity?.display_precision
-            ),
-          },
-        ];
+        return formatDuration(
+          locale,
+          state,
+          attributes.unit_of_measurement,
+          entity?.display_precision
+        );
       } catch (_err) {
         // fallback to default
       }
     }
-
-    // state is monetary
     if (attributes.device_class === "monetary") {
-      let parts: Record<string, string>[] = [];
       try {
-        parts = formatNumberToParts(state, locale, {
+        return formatNumber(state, locale, {
           style: "currency",
           currency: attributes.unit_of_measurement,
           minimumFractionDigits: 2,
@@ -135,34 +98,8 @@ const computeStateToPartsFromEntityAttributes = (
       } catch (_err) {
         // fallback to default
       }
-
-      const TYPE_MAP: Record<string, ValuePart["type"]> = {
-        integer: "value",
-        group: "value",
-        decimal: "value",
-        fraction: "value",
-        literal: "literal",
-        currency: "unit",
-      };
-
-      const valueParts: ValuePart[] = [];
-
-      for (const part of parts) {
-        const type = TYPE_MAP[part.type];
-        if (!type) continue;
-        const last = valueParts[valueParts.length - 1];
-        // Merge consecutive numeric parts (e.g. "1" + "," + "234" + "." + "56" → "1,234.56")
-        if (type === "value" && last?.type === "value") {
-          last.value += part.value;
-        } else {
-          valueParts.push({ type, value: part.value });
-        }
-      }
-
-      return valueParts;
     }
 
-    // default processing of numeric values
     const value = formatNumber(
       state,
       locale,
@@ -177,14 +114,10 @@ const computeStateToPartsFromEntityAttributes = (
       attributes.unit_of_measurement;
 
     if (unit) {
-      return [
-        { type: "value", value: value },
-        { type: "literal", value: blankBeforeUnit(unit, locale) },
-        { type: "unit", value: unit },
-      ];
+      return `${value}${blankBeforeUnit(unit, locale)}${unit}`;
     }
 
-    return [{ type: "value", value: value }];
+    return value;
   }
 
   if (["date", "input_datetime", "time"].includes(domain)) {
@@ -196,51 +129,36 @@ const computeStateToPartsFromEntityAttributes = (
       const components = state.split(" ");
       if (components.length === 2) {
         // Date and time.
-        return [
-          {
-            type: "value",
-            value: formatDateTime(
-              new Date(components.join("T")),
-              { ...locale, time_zone: TimeZone.local },
-              config
-            ),
-          },
-        ];
+        return formatDateTime(
+          new Date(components.join("T")),
+          { ...locale, time_zone: TimeZone.local },
+          config
+        );
       }
       if (components.length === 1) {
         if (state.includes("-")) {
           // Date only.
-          return [
-            {
-              type: "value",
-              value: formatDate(
-                new Date(`${state}T00:00`),
-                { ...locale, time_zone: TimeZone.local },
-                config
-              ),
-            },
-          ];
+          return formatDate(
+            new Date(`${state}T00:00`),
+            { ...locale, time_zone: TimeZone.local },
+            config
+          );
         }
         if (state.includes(":")) {
           // Time only.
           const now = new Date();
-          return [
-            {
-              type: "value",
-              value: formatTime(
-                new Date(`${now.toISOString().split("T")[0]}T${state}`),
-                { ...locale, time_zone: TimeZone.local },
-                config
-              ),
-            },
-          ];
+          return formatTime(
+            new Date(`${now.toISOString().split("T")[0]}T${state}`),
+            { ...locale, time_zone: TimeZone.local },
+            config
+          );
         }
       }
-      return [{ type: "value", value: state }];
+      return state;
     } catch (_e) {
       // Formatting methods may throw error if date parsing doesn't go well,
       // just return the state string in that case.
-      return [{ type: "value", value: state }];
+      return state;
     }
   }
 
@@ -264,58 +182,25 @@ const computeStateToPartsFromEntityAttributes = (
     (domain === "sensor" && attributes.device_class === "timestamp")
   ) {
     try {
-      return [
-        {
-          type: "value",
-          value: formatDateTime(new Date(state), locale, config),
-        },
-      ];
+      return formatDateTime(new Date(state), locale, config);
     } catch (_err) {
-      return [{ type: "value", value: state }];
+      return state;
     }
   }
 
-  return [
-    {
-      type: "value",
-      value:
-        (entity?.translation_key &&
-          localize(
-            `component.${entity.platform}.entity.${domain}.${entity.translation_key}.state.${state}`
-          )) ||
-        // Return device class translation
-        (attributes.device_class &&
-          localize(
-            `component.${domain}.entity_component.${attributes.device_class}.state.${state}`
-          )) ||
-        // Return default translation
-        localize(`component.${domain}.entity_component._.state.${state}`) ||
-        // We don't know! Return the raw state.
-        state,
-    },
-  ];
-};
-
-export const computeStateToParts = (
-  localize: LocalizeFunc,
-  stateObj: HassEntity,
-  locale: FrontendLocaleData,
-  sensorNumericDeviceClasses: string[],
-  config: HassConfig,
-  entities: HomeAssistant["entities"],
-  state?: string
-): ValuePart[] => {
-  const entity = entities?.[stateObj.entity_id] as
-    | EntityRegistryDisplayEntry
-    | undefined;
-  return computeStateToPartsFromEntityAttributes(
-    localize,
-    locale,
-    sensorNumericDeviceClasses,
-    config,
-    entity,
-    stateObj.entity_id,
-    stateObj.attributes,
-    state !== undefined ? state : stateObj.state
+  return (
+    (entity?.translation_key &&
+      localize(
+        `component.${entity.platform}.entity.${domain}.${entity.translation_key}.state.${state}`
+      )) ||
+    // Return device class translation
+    (attributes.device_class &&
+      localize(
+        `component.${domain}.entity_component.${attributes.device_class}.state.${state}`
+      )) ||
+    // Return default translation
+    localize(`component.${domain}.entity_component._.state.${state}`) ||
+    // We don't know! Return the raw state.
+    state
   );
 };

src/common/entity/context/get_entity_context.ts

@@ -38,18 +38,6 @@ export const getEntityContext = (
   return getEntityEntryContext(entry, entities, devices, areas, floors);
 };
 
-export const getEntityAreaId = (
-  entityId: string,
-  entities: HomeAssistant["entities"],
-  devices: HomeAssistant["devices"]
-): string | undefined => {
-  const entry = entities[entityId];
-  if (!entry) return undefined;
-  const deviceId = entry.device_id;
-  const device = deviceId ? devices[deviceId] : undefined;
-  return entry.area_id || device?.area_id || undefined;
-};
-
 export const getEntityEntryContext = (
   entry:
     | EntityRegistryDisplayEntry

src/common/number/format_number.ts

@@ -5,6 +5,7 @@ import type {
 import type { EntityRegistryDisplayEntry } from "../../data/entity/entity_registry";
 import type { FrontendLocaleData } from "../../data/translation";
 import { NumberFormat } from "../../data/translation";
+import { round } from "./round";
 
 /**
  * Returns true if the entity is considered numeric based on the attributes it has
@@ -51,22 +52,7 @@ export const formatNumber = (
   num: string | number,
   localeOptions?: FrontendLocaleData,
   options?: Intl.NumberFormatOptions
-): string =>
-  formatNumberToParts(num, localeOptions, options)
-    .map((part) => part.value)
-    .join("");
-
-/**
- * Returns an array of objects containing the formatted number in parts
- * Similar to Intl.NumberFormat.prototype.formatToParts()
- *
- * Input params - same as for formatNumber()
- */
-export const formatNumberToParts = (
-  num: string | number,
-  localeOptions?: FrontendLocaleData,
-  options?: Intl.NumberFormatOptions
-): any[] => {
+): string => {
   const locale = localeOptions
     ? numberFormatToLocale(localeOptions)
     : undefined;
@@ -85,7 +71,7 @@ export const formatNumberToParts = (
     return new Intl.NumberFormat(
       locale,
       getDefaultFormatOptions(num, options)
-    ).formatToParts(Number(num));
+    ).format(Number(num));
   }
 
   if (
@@ -100,10 +86,15 @@ export const formatNumberToParts = (
         ...options,
         useGrouping: false,
       })
-    ).formatToParts(Number(num));
+    ).format(Number(num));
   }
 
-  return [{ type: "literal", value: num }];
+  if (typeof num === "string") {
+    return num;
+  }
+  return `${round(num, options?.maximumFractionDigits).toString()}${
+    options?.style === "currency" ? ` ${options.currency}` : ""
+  }`;
 };
 
 /**

src/common/number/normalize-by-si-prefix.ts

@@ -1,28 +0,0 @@
-const SI_PREFIX_MULTIPLIERS: Record<string, number> = {
-  T: 1e12,
-  G: 1e9,
-  M: 1e6,
-  k: 1e3,
-  m: 1e-3,
-  "\u00B5": 1e-6, // µ (micro sign)
-  "\u03BC": 1e-6, // μ (greek small letter mu)
-};
-
-/**
- * Normalize a numeric value by detecting SI unit prefixes (T, G, M, k, m, µ).
- * Only applies when the unit is longer than 1 character and starts with a
- * recognized prefix, avoiding false positives on standalone units like "m" (meters).
- */
-export const normalizeValueBySIPrefix = (
-  value: number,
-  unit: string | undefined
-): number => {
-  if (!unit || unit.length <= 1) {
-    return value;
-  }
-  const prefix = unit[0];
-  if (prefix in SI_PREFIX_MULTIPLIERS) {
-    return value * SI_PREFIX_MULTIPLIERS[prefix];
-  }
-  return value;
-};

src/common/translations/entity-state.ts

@@ -12,10 +12,6 @@ export type FormatEntityStateFunc = (
   stateObj: HassEntity,
   state?: string
 ) => string;
-export type FormatEntityStateToPartsFunc = (
-  stateObj: HassEntity,
-  state?: string
-) => ValuePart[];
 export type FormatEntityAttributeValueFunc = (
   stateObj: HassEntity,
   attribute: string,
@@ -50,13 +46,12 @@ export const computeFormatFunctions = async (
   sensorNumericDeviceClasses: string[]
 ): Promise<{
   formatEntityState: FormatEntityStateFunc;
-  formatEntityStateToParts: FormatEntityStateToPartsFunc;
   formatEntityAttributeValue: FormatEntityAttributeValueFunc;
   formatEntityAttributeValueToParts: FormatEntityAttributeValueToPartsFunc;
   formatEntityAttributeName: FormatEntityAttributeNameFunc;
   formatEntityName: FormatEntityNameFunc;
 }> => {
-  const { computeStateDisplay, computeStateToParts } =
+  const { computeStateDisplay } =
     await import("../entity/compute_state_display");
   const {
     computeAttributeValueDisplay,
@@ -75,16 +70,6 @@ export const computeFormatFunctions = async (
         entities,
         state
       ),
-    formatEntityStateToParts: (stateObj, state) =>
-      computeStateToParts(
-        localize,
-        stateObj,
-        locale,
-        sensorNumericDeviceClasses,
-        config,
-        entities,
-        state
-      ),
     formatEntityAttributeValue: (stateObj, attribute, value) =>
       computeAttributeValueDisplay(
         localize,

src/components/chart/ha-chart-base.ts

@@ -18,11 +18,9 @@ import { classMap } from "lit/directives/class-map";
 import { styleMap } from "lit/directives/style-map";
 import { ensureArray } from "../../common/array/ensure-array";
 import { getAllGraphColors } from "../../common/color/colors";
-import type { HASSDomEvent } from "../../common/dom/fire_event";
 import { fireEvent } from "../../common/dom/fire_event";
+import type { HASSDomEvent } from "../../common/dom/fire_event";
 import { listenMediaQuery } from "../../common/dom/media_query";
-import { afterNextRender } from "../../common/util/render-status";
-import { filterXSS } from "../../common/util/xss";
 import { themesContext } from "../../data/context";
 import type { Themes } from "../../data/ws-themes";
 import type { ECOption } from "../../resources/echarts/echarts";
@@ -30,6 +28,8 @@ import type { HomeAssistant } from "../../types";
 import { isMac } from "../../util/is_mac";
 import "../chips/ha-assist-chip";
 import "../ha-icon-button";
+import { afterNextRender } from "../../common/util/render-status";
+import { filterXSS } from "../../common/util/xss";
 import { formatTimeLabel } from "./axis-label";
 import { downSampleLineData } from "./down-sample";
 
@@ -1115,13 +1115,13 @@ export class HaChartBase extends LitElement {
     .chart-controls ::slotted(ha-icon-button) {
       background: var(--card-background-color);
       border-radius: var(--ha-border-radius-sm);
-      --ha-icon-button-size: 32px;
+      --mdc-icon-button-size: 32px;
       color: var(--primary-color);
       border: 1px solid var(--divider-color);
     }
     .chart-controls.small ha-icon-button,
     .chart-controls.small ::slotted(ha-icon-button) {
-      --ha-icon-button-size: 22px;
+      --mdc-icon-button-size: 22px;
       --mdc-icon-size: 16px;
     }
     .chart-controls ha-icon-button.inactive,

src/components/chart/state-history-chart-line.ts

@@ -306,10 +306,7 @@ export class StateHistoryChartLine extends LitElement {
         visualMap: this._visualMap,
         tooltip: {
           trigger: "axis",
-          renderMode: "html",
-          position: "bottom",
-          align: "center",
-          confine: true,
+          appendTo: document.body,
           formatter: this._renderTooltip,
         },
       };

src/components/chart/state-history-chart-timeline.ts

@@ -255,10 +255,7 @@ export class StateHistoryChartTimeline extends LitElement {
         right: rtl ? labelWidth : 1,
       },
       tooltip: {
-        renderMode: "html",
-        position: "bottom",
-        align: "center",
-        confine: true,
+        appendTo: document.body,
         formatter: this._renderTooltip,
       },
     };

src/components/chart/statistics-chart.ts

@@ -335,10 +335,7 @@ export class StatisticsChart extends LitElement {
       },
       tooltip: {
         trigger: "axis",
-        renderMode: "html",
-        position: "bottom",
-        align: "center",
-        confine: true,
+        appendTo: document.body,
         formatter: this._renderTooltip,
       },
     };
@@ -575,7 +572,6 @@ export class StatisticsChart extends LitElement {
       let firstSum: number | null | undefined = null;
       stats.forEach((stat) => {
         const startDate = new Date(stat.start);
-        const endDate = new Date(stat.end);
         if (prevDate === startDate) {
           return;
         }
@@ -605,25 +601,10 @@ export class StatisticsChart extends LitElement {
           dataValues.push(val);
         });
         if (!this._hiddenStats.has(statistic_id)) {
-          pushData(
-            startDate,
-            endDate.getTime() < endTime.getTime() ? endDate : endTime,
-            dataValues
-          );
+          pushData(startDate, new Date(stat.end), dataValues);
         }
       });
 
-      // Close out the last stat segment at prevEndTime
-      const lastEndTime = prevEndTime;
-      const lastValues = prevValues;
-      if (lastEndTime && lastValues) {
-        statDataSets.forEach((d, i) => {
-          d.data!.push(
-            this._transformDataValue([lastEndTime, ...lastValues[i]!])
-          );
-        });
-      }
-
       // Append current state if viewing recent data
       const now = new Date();
       // allow 10m of leeway for "now", because stats are 5 minute aggregated
@@ -638,6 +619,16 @@ export class StatisticsChart extends LitElement {
               isFinite(currentValue) &&
               !this._hiddenStats.has(statistic_id)
             ) {
+              // First, close out the last stat segment at prevEndTime
+              const lastEndTime = prevEndTime;
+              const lastValues = prevValues;
+              if (lastEndTime && lastValues) {
+                statDataSets.forEach((d, i) => {
+                  d.data!.push(
+                    this._transformDataValue([lastEndTime, ...lastValues[i]!])
+                  );
+                });
+              }
               // Then push the current state at now
               statTypes.forEach((type, i) => {
                 const val: (number | null)[] = [];

src/components/chart/timeline-color.ts

@@ -6,7 +6,6 @@ import { computeDomain } from "../../common/entity/compute_domain";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
 import { FIXED_DOMAIN_STATES } from "../../common/entity/get_states";
 import { stateColorProperties } from "../../common/entity/state_color";
-import { slugify } from "../../common/string/slugify";
 import { UNAVAILABLE, UNKNOWN } from "../../data/entity/entity";
 import { computeCssValue } from "../../resources/css-variables";
 
@@ -33,22 +32,6 @@ function computeTimelineStateColor(
     return computeCssValue("--history-unknown-color", computedStyles);
   }
 
-  const domain = computeDomain(stateObj.entity_id);
-
-  // Zone states for person/device_tracker don't have specific CSS color variables,
-  // so they all fall back to the same --state-person-active-color.
-  // Only use a custom CSS variable if explicitly defined (e.g. --state-person-kitchen-color),
-  // otherwise return undefined to get unique colors from the generic color handler.
-  if (
-    (domain === "person" || domain === "device_tracker") &&
-    !((FIXED_DOMAIN_STATES[domain] || []) as readonly string[]).includes(state)
-  ) {
-    return computeCssValue(
-      `--state-${domain}-${slugify(state, "_")}-color`,
-      computedStyles
-    );
-  }
-
   const properties = stateColorProperties(stateObj, state);
 
   if (!properties) {
@@ -58,6 +41,8 @@ function computeTimelineStateColor(
   const rgb = computeCssValue(properties, computedStyles);
 
   if (!rgb) return undefined;
+
+  const domain = computeDomain(stateObj.entity_id);
   const shade = DOMAIN_STATE_SHADES[domain]?.[state] as number | number;
   if (!shade) {
     return rgb;

src/components/data-table/dialog-data-table-settings.ts

@@ -9,13 +9,10 @@ import { fireEvent } from "../../common/dom/fire_event";
 import { haStyleDialog } from "../../resources/styles";
 import type { HomeAssistant } from "../../types";
 import "../ha-button";
-import "../ha-dialog-footer";
-import "../ha-icon-button";
+import { createCloseHeading } from "../ha-dialog";
 import "../ha-list";
 import "../ha-list-item";
 import "../ha-sortable";
-import "../ha-svg-icon";
-import "../ha-dialog";
 import type {
   DataTableColumnContainer,
   DataTableColumnData,
@@ -32,49 +29,17 @@ export class DialogDataTableSettings extends LitElement {
 
   @state() private _hiddenColumns?: string[];
 
-  private _lastFixedKeys: string[] = [];
-
-  @state() private _open = false;
-
   public showDialog(params: DataTableSettingsDialogParams) {
     this._params = params;
-    this._columnOrder = this._preserveLastFixed(params.columnOrder);
+    this._columnOrder = params.columnOrder;
     this._hiddenColumns = params.hiddenColumns;
-    this._open = true;
   }
 
   public closeDialog() {
-    this._open = false;
-  }
-
-  private _dialogClosed() {
     this._params = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
-  private _lastFixedCount(): number {
-    const lastFixedKeys = Object.keys(this._params!.columns).filter(
-      (col) => this._params!.columns[col].lastFixed
-    );
-    if (lastFixedKeys.length) {
-      this._lastFixedKeys = lastFixedKeys;
-    }
-    return lastFixedKeys.length;
-  }
-
-  private _preserveLastFixed(columnOrder) {
-    let strippedColumnOrder;
-    const lastFixedCount = this._lastFixedCount();
-    if (lastFixedCount && columnOrder) {
-      strippedColumnOrder = [...columnOrder];
-      strippedColumnOrder.splice(
-        columnOrder.length - lastFixedCount,
-        lastFixedCount
-      );
-    }
-    return strippedColumnOrder;
-  }
-
   private _sortedColumns = memoizeOne(
     (
       columns: DataTableColumnContainer,
@@ -82,7 +47,7 @@ export class DialogDataTableSettings extends LitElement {
       hiddenColumns: string[] | undefined
     ) =>
       Object.keys(columns)
-        .filter((col) => !columns[col].hidden && !columns[col].lastFixed)
+        .filter((col) => !columns[col].hidden)
         .sort((a, b) => {
           const orderA = columnOrder?.indexOf(a) ?? -1;
           const orderB = columnOrder?.indexOf(b) ?? -1;
@@ -127,10 +92,12 @@ export class DialogDataTableSettings extends LitElement {
 
     return html`
       <ha-dialog
-        .hass=${this.hass}
-        .open=${this._open}
-        header-title=${localize("ui.components.data-table.settings.header")}
-        @closed=${this._dialogClosed}
+        open
+        @closed=${this.closeDialog}
+        .heading=${createCloseHeading(
+          this.hass,
+          localize("ui.components.data-table.settings.header")
+        )}
       >
         <ha-sortable
           @item-moved=${this._columnMoved}
@@ -185,17 +152,15 @@ export class DialogDataTableSettings extends LitElement {
             )}
           </ha-list>
         </ha-sortable>
-        <ha-dialog-footer slot="footer">
-          <ha-button
-            slot="secondaryAction"
-            appearance="plain"
-            @click=${this._reset}
-            >${localize("ui.components.data-table.settings.restore")}</ha-button
-          >
-          <ha-button slot="primaryAction" @click=${this.closeDialog}>
-            ${localize("ui.components.data-table.settings.done")}
-          </ha-button>
-        </ha-dialog-footer>
+        <ha-button
+          appearance="plain"
+          slot="secondaryAction"
+          @click=${this._reset}
+          >${localize("ui.components.data-table.settings.restore")}</ha-button
+        >
+        <ha-button slot="primaryAction" @click=${this.closeDialog}>
+          ${localize("ui.components.data-table.settings.done")}
+        </ha-button>
       </ha-dialog>
     `;
   }
@@ -220,8 +185,7 @@ export class DialogDataTableSettings extends LitElement {
 
     this._columnOrder = columnOrder;
 
-    const reportedOrder = columnOrder.concat(this._lastFixedKeys);
-    this._params!.onUpdate(reportedOrder, this._hiddenColumns);
+    this._params!.onUpdate(this._columnOrder, this._hiddenColumns);
   }
 
   private _toggle(ev) {
@@ -302,8 +266,7 @@ export class DialogDataTableSettings extends LitElement {
 
     this._hiddenColumns = hidden;
 
-    const reportedOrder = this._columnOrder.concat(this._lastFixedKeys);
-    this._params!.onUpdate(reportedOrder, this._hiddenColumns);
+    this._params!.onUpdate(this._columnOrder, this._hiddenColumns);
   }
 
   private _reset() {
@@ -319,9 +282,21 @@ export class DialogDataTableSettings extends LitElement {
       haStyleDialog,
       css`
         ha-dialog {
+          --mdc-dialog-max-width: 500px;
           --dialog-z-index: 10;
           --dialog-content-padding: 0 8px;
         }
+        @media all and (max-width: 451px) {
+          ha-dialog {
+            --vertical-align-dialog: flex-start;
+            --dialog-surface-margin-top: 250px;
+            --ha-dialog-border-radius: var(--ha-border-radius-4xl)
+              var(--ha-border-radius-4xl) var(--ha-border-radius-square)
+              var(--ha-border-radius-square);
+            --mdc-dialog-min-height: calc(100% - 250px);
+            --mdc-dialog-max-height: calc(100% - 250px);
+          }
+        }
         ha-list-item {
           --mdc-list-side-padding: 12px;
           overflow: visible;

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

@@ -13,7 +13,6 @@ import { classMap } from "lit/directives/class-map";
 import { ifDefined } from "lit/directives/if-defined";
 import { styleMap } from "lit/directives/style-map";
 import memoizeOne from "memoize-one";
-import { STRINGS_SEPARATOR_DOT } from "../../common/const";
 import { restoreScroll } from "../../common/decorators/restore-scroll";
 import { fireEvent } from "../../common/dom/fire_event";
 import { stringCompare } from "../../common/string/compare";
@@ -86,7 +85,6 @@ export interface DataTableColumnData<T = any> extends DataTableSortColumnData {
   flex?: number;
   forceLTR?: boolean;
   hidden?: boolean;
-  lastFixed?: boolean;
 }
 
 export type ClonedDataTableColumnData = Omit<DataTableColumnData, "title"> & {
@@ -136,6 +134,9 @@ export class HaDataTable extends LitElement {
 
   @property({ attribute: false }) public searchLabel?: string;
 
+  @property({ type: Boolean, attribute: "no-label-float" })
+  public noLabelFloat? = false;
+
   @property({ type: String }) public filter = "";
 
   @property({ attribute: false }) public groupColumn?: string;
@@ -357,11 +358,6 @@ export class HaDataTable extends LitElement {
         .sort((a, b) => {
           const orderA = columnOrder!.indexOf(a);
           const orderB = columnOrder!.indexOf(b);
-          const fixedA = Boolean(columns[a].lastFixed);
-          const fixedB = Boolean(columns[b].lastFixed);
-          if (fixedA !== fixedB) {
-            return fixedA ? 1 : -1;
-          }
           if (orderA !== orderB) {
             if (orderA === -1) {
               return 1;
@@ -397,6 +393,7 @@ export class HaDataTable extends LitElement {
                     .hass=${this.hass}
                     @value-changed=${this._handleSearchChange}
                     .label=${this.searchLabel}
+                    .noLabelFloat=${this.noLabelFloat}
                   ></search-input>
                 </div>
               `
@@ -430,9 +427,9 @@ export class HaDataTable extends LitElement {
                       <ha-checkbox
                         class="mdc-data-table__row-checkbox"
                         @change=${this._handleHeaderRowCheckboxClick}
-                        .indeterminate=${!!this._checkedRows.length &&
+                        .indeterminate=${this._checkedRows.length &&
                         this._checkedRows.length !== this._checkableRowsCount}
-                        .checked=${!!this._checkedRows.length &&
+                        .checked=${this._checkedRows.length &&
                         this._checkedRows.length === this._checkableRowsCount}
                       >
                       </ha-checkbox>
@@ -639,7 +636,7 @@ export class HaDataTable extends LitElement {
                           .map(
                             ([key2, column2], i) =>
                               html`${i !== 0
-                                ? STRINGS_SEPARATOR_DOT
+                                ? " · "
                                 : nothing}${column2.template
                                 ? column2.template(row)
                                 : row[key2]}`
@@ -1089,12 +1086,9 @@ export class HaDataTable extends LitElement {
         }
 
         .mdc-data-table__row.empty-row {
-          height: max(
-            var(
-              --data-table-empty-row-height,
-              var(--data-table-row-height, 52px)
-            ),
-            var(--safe-area-inset-bottom, 0px)
+          height: var(
+            --data-table-empty-row-height,
+            var(--data-table-row-height, 52px)
           );
         }
 
@@ -1198,7 +1192,6 @@ export class HaDataTable extends LitElement {
 
         .mdc-data-table__cell--numeric {
           text-align: var(--float-end);
-          direction: ltr;
         }
 
         .mdc-data-table__cell--icon {

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

@@ -1,5 +1,5 @@
 import { consume } from "@lit/context";
-import { html, LitElement, nothing } from "lit";
+import { css, html, LitElement, nothing } from "lit";
 import { property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
@@ -13,6 +13,8 @@ import {
 import type { EntityRegistryEntry } from "../../data/entity/entity_registry";
 import type { HomeAssistant, ValueChangedEvent } from "../../types";
 import "../ha-generic-picker";
+import "../ha-md-select";
+import "../ha-md-select-option";
 import type { PickerValueRenderer } from "../ha-picker-field";
 
 const NO_AUTOMATION_KEY = "NO_AUTOMATION";
@@ -215,4 +217,10 @@ export abstract class HaDeviceAutomationPicker<
     delete value.metadata;
     fireEvent(this, "value-changed", { value });
   }
+
+  static styles = css`
+    ha-select {
+      display: block;
+    }
+  `;
 }

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

@@ -6,7 +6,6 @@ import { fireEvent } from "../../common/dom/fire_event";
 import type { HomeAssistant, ValueChangedEvent } from "../../types";
 import "../ha-generic-picker";
 import type { PickerComboBoxItem } from "../ha-picker-combo-box";
-import type { PickerValueRenderer } from "../ha-picker-field";
 
 @customElement("ha-entity-attribute-picker")
 class HaEntityAttributePicker extends LitElement {
@@ -95,19 +94,12 @@ class HaEntityAttributePicker extends LitElement {
         .helper=${this.helper}
         .allowCustomValue=${this.allowCustomValue}
         .getItems=${this._getItems}
-        .valueRenderer=${this._valueRenderer}
         @value-changed=${this._valueChanged}
       >
       </ha-generic-picker>
     `;
   }
 
-  private _valueRenderer: PickerValueRenderer = (value: string) => {
-    const items = this._getItems();
-    const item = items.find((option) => option.id === value);
-    return html`<span slot="headline">${item?.primary ?? value}</span>`;
-  };
-
   private _valueChanged(ev: ValueChangedEvent<string>) {
     ev.stopPropagation();
     const newValue = ev.detail.value;

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

@@ -164,7 +164,7 @@ export class HaEntityToggle extends LitElement {
       min-width: 38px;
     }
     ha-icon-button {
-      --ha-icon-button-size: 40px;
+      --mdc-icon-button-size: 40px;
       color: var(--ha-icon-button-inactive-color, var(--primary-text-color));
       transition: color 0.5s;
     }

src/components/entity/ha-state-label-badge.ts

@@ -9,7 +9,16 @@ import secondsToDuration from "../../common/datetime/seconds_to_duration";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
 import { computeStateName } from "../../common/entity/compute_state_name";
 import { FIXED_DOMAIN_STATES } from "../../common/entity/get_states";
-import { isUnavailableState, UNAVAILABLE } from "../../data/entity/entity";
+import {
+  formatNumber,
+  getNumberFormatOptions,
+  isNumericState,
+} from "../../common/number/format_number";
+import {
+  isUnavailableState,
+  UNAVAILABLE,
+  UNKNOWN,
+} from "../../data/entity/entity";
 import type { EntityRegistryDisplayEntry } from "../../data/entity/entity_registry";
 import { timerTimeRemaining } from "../../data/timer";
 import type { HomeAssistant } from "../../types";
@@ -171,11 +180,16 @@ export class HaStateLabelBadge extends LitElement {
         }
       // eslint-disable-next-line: disable=no-fallthrough
       default:
-        return isUnavailableState(entityState.state)
+        return entityState.state === UNKNOWN ||
+          entityState.state === UNAVAILABLE
           ? "—"
-          : this.hass!.formatEntityStateToParts(entityState).find(
-              (part) => part.type === "value"
-            )?.value;
+          : isNumericState(entityState)
+            ? formatNumber(
+                entityState.state,
+                this.hass!.locale,
+                getNumberFormatOptions(entityState, entry)
+              )
+            : this.hass!.formatEntityState(entityState);
     }
   }
 
@@ -224,11 +238,7 @@ export class HaStateLabelBadge extends LitElement {
     if (domain === "timer") {
       return secondsToDuration(_timerTimeRemaining);
     }
-    return (
-      this.hass!.formatEntityStateToParts(entityState).find(
-        (part) => part.type === "unit"
-      )?.value || null
-    );
+    return entityState.attributes.unit_of_measurement || null;
   }
 
   private _clearInterval() {

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

@@ -1,5 +1,5 @@
 import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
-import { mdiChartLine, mdiHelpCircleOutline, mdiShape } from "@mdi/js";
+import { mdiChartLine, mdiHelpCircle, mdiShape } from "@mdi/js";
 import type { HassEntity } from "home-assistant-js-websocket";
 import { html, LitElement, nothing, type PropertyValues } from "lit";
 import { customElement, property, query } from "lit/decorators";
@@ -163,7 +163,7 @@ export class HaStatisticPicker extends LitElement {
         primary: this.hass.localize(
           "ui.components.statistic-picker.missing_entity"
         ),
-        icon_path: mdiHelpCircleOutline,
+        icon_path: mdiHelpCircle,
       },
     ];
   }

src/components/entity/state-badge.ts

@@ -15,7 +15,6 @@ import { iconColorCSS } from "../../common/style/icon_color_css";
 import { cameraUrlWithWidthHeight } from "../../data/camera";
 import { CLIMATE_HVAC_ACTION_TO_MODE } from "../../data/climate";
 import type { HomeAssistant } from "../../types";
-import { addBrandsAuth } from "../../util/brands-url";
 import "../ha-state-icon";
 
 @customElement("state-badge")
@@ -138,7 +137,6 @@ export class StateBadge extends LitElement {
           let imageUrl =
             stateObj.attributes.entity_picture_local ||
             stateObj.attributes.entity_picture;
-          imageUrl = addBrandsAuth(imageUrl);
           if (this.hass) {
             imageUrl = this.hass.hassUrl(imageUrl);
           }

src/components/ha-adaptive-dialog.ts

@@ -6,8 +6,8 @@ import type { HomeAssistant } from "../types";
 import "./ha-bottom-sheet";
 import "./ha-dialog-header";
 import "./ha-icon-button";
-import "./ha-dialog";
-import type { DialogWidth } from "./ha-dialog";
+import "./ha-wa-dialog";
+import type { DialogWidth } from "./ha-wa-dialog";
 
 type DialogSheetMode = "dialog" | "bottom-sheet";
 
@@ -18,11 +18,10 @@ type DialogSheetMode = "dialog" | "bottom-sheet";
  * @extends {LitElement}
  *
  * @summary
- * A responsive dialog component that automatically switches between a full dialog (ha-dialog)
+ * A responsive dialog component that automatically switches between a full dialog (ha-wa-dialog)
  * and a bottom sheet (ha-bottom-sheet) based on screen size. Uses dialog mode on larger screens
  * (>870px width and >500px height) and bottom sheet mode on smaller screens or mobile devices.
  *
- * @slot header - Replace the entire header area.
  * @slot headerNavigationIcon - Leading header action (e.g. close/back button).
  * @slot headerTitle - Custom title content (used when header-title is not set).
  * @slot headerSubtitle - Custom subtitle content (used when header-subtitle is not set).
@@ -36,19 +35,15 @@ type DialogSheetMode = "dialog" | "bottom-sheet";
  * @cssprop --ha-dialog-hide-duration - Hide animation duration (dialog mode only).
  *
  * @attr {boolean} open - Controls the dialog/sheet open state.
- * @attr {("alert"|"standard")} type - Dialog type (dialog mode only). Defaults to "standard".
  * @attr {("small"|"medium"|"large"|"full")} width - Preferred dialog width preset (dialog mode only). Defaults to "medium".
- * @attr {boolean} prevent-scrim-close - Prevents closing by clicking the scrim/overlay.
  * @attr {string} header-title - Header title text. If not set, the headerTitle slot is used.
  * @attr {string} header-subtitle - Header subtitle text. If not set, the headerSubtitle slot is used.
  * @attr {("above"|"below")} header-subtitle-position - Position of the subtitle relative to the title. Defaults to "below".
- * @attr {boolean} flexcontent - Makes the content body a flex container.
- * @attr {boolean} without-header - Hides the default header.
- * @attr {boolean} allow-mode-change - When set, the component can switch between dialog and bottom-sheet modes as the viewport changes.
+ * @attr {boolean} block-mode-change - When set, the mode is determined at mount time based on the current screen size, but subsequent mode changes are blocked. Useful for preventing forms from resetting when the viewport size changes.
  *
- * @event opened - Fired when the dialog/sheet is shown.
+ * @event opened - Fired when the dialog/sheet is shown (dialog mode only).
  * @event closed - Fired after the dialog/sheet is hidden.
- * @event after-show - Fired after show animation completes.
+ * @event after-show - Fired after show animation completes (dialog mode only).
  *
  * @remarks
  * **Responsive Behavior:**
@@ -56,9 +51,9 @@ type DialogSheetMode = "dialog" | "bottom-sheet";
  * Dialog mode is used for screens wider than 870px and taller than 500px.
  * Bottom sheet mode is used for mobile devices and smaller screens.
  *
- * By default, the mode is determined once at mount time and is then kept stable to avoid state
- * loss (like form resets) during viewport changes. Set `allow-mode-change` to opt into live
- * mode switching while the dialog is open.
+ * When `block-mode-change` is set, the mode is determined once at mount time based on the initial
+ * screen size. Subsequent viewport size changes will not trigger mode switches, which is useful
+ * for preventing form resets or other state loss when users resize their browser window.
  *
  * **Focus Management:**
  * To automatically focus an element when opened, add the `autofocus` attribute to it.
@@ -78,15 +73,9 @@ export class HaAdaptiveDialog extends LitElement {
   @property({ type: Boolean, reflect: true })
   public open = false;
 
-  @property({ reflect: true })
-  public type: "alert" | "standard" = "standard";
-
   @property({ type: String, reflect: true, attribute: "width" })
   public width: DialogWidth = "medium";
 
-  @property({ type: Boolean, reflect: true, attribute: "prevent-scrim-close" })
-  public preventScrimClose = false;
-
   @property({ attribute: "header-title" })
   public headerTitle?: string;
 
@@ -96,15 +85,12 @@ export class HaAdaptiveDialog extends LitElement {
   @property({ type: String, attribute: "header-subtitle-position" })
   public headerSubtitlePosition: "above" | "below" = "below";
 
-  @property({ type: Boolean, attribute: "allow-mode-change" })
-  public allowModeChange = false;
+  @property({ type: Boolean, attribute: "block-mode-change" })
+  public blockModeChange = false;
 
   @property({ type: Boolean, attribute: "without-header" })
   public withoutHeader = false;
 
-  @property({ type: Boolean, reflect: true, attribute: "flexcontent" })
-  public flexContent = false;
-
   @state() private _mode: DialogSheetMode = "dialog";
 
   private _unsubMediaQuery?: () => void;
@@ -116,7 +102,7 @@ export class HaAdaptiveDialog extends LitElement {
     this._unsubMediaQuery = listenMediaQuery(
       "(max-width: 870px), (max-height: 500px)",
       (matches) => {
-        if (!this._modeSet || this.allowModeChange) {
+        if (!this._modeSet || !this.blockModeChange) {
           this._mode = matches ? "bottom-sheet" : "dialog";
           this._modeSet = true;
         }
@@ -134,50 +120,33 @@ export class HaAdaptiveDialog extends LitElement {
   render() {
     if (this._mode === "bottom-sheet") {
       return html`
-        <ha-bottom-sheet
-          .ariaLabelledBy=${this.ariaLabelledBy ||
-          (this.headerTitle !== undefined ? "ha-dialog-title" : undefined)}
-          .ariaDescribedBy=${this.ariaDescribedBy}
-          .flexContent=${this.flexContent}
-          .hass=${this.hass}
-          .open=${this.open}
-          .preventScrimClose=${this.preventScrimClose}
-        >
+        <ha-bottom-sheet .open=${this.open} flexcontent>
           ${!this.withoutHeader
-            ? html`
-                <slot name="header" slot="header">
-                  <ha-dialog-header
-                    .subtitlePosition=${this.headerSubtitlePosition}
-                  >
-                    <slot name="headerNavigationIcon" slot="navigationIcon">
-                      <ha-icon-button
-                        data-dialog="close"
-                        .label=${this.hass?.localize("ui.common.close") ??
-                        "Close"}
-                        .path=${mdiClose}
-                      ></ha-icon-button>
-                    </slot>
-                    ${this.headerTitle !== undefined
-                      ? html`<span
-                          slot="title"
-                          class="title"
-                          id="ha-dialog-title"
-                        >
-                          ${this.headerTitle}
-                        </span>`
-                      : html`<slot name="headerTitle" slot="title"></slot>`}
-                    ${this.headerSubtitle !== undefined
-                      ? html`<span slot="subtitle"
-                          >${this.headerSubtitle}</span
-                        >`
-                      : html`<slot
-                          name="headerSubtitle"
-                          slot="subtitle"
-                        ></slot>`}
-                    <slot name="headerActionItems" slot="actionItems"></slot>
-                  </ha-dialog-header>
+            ? html`<ha-dialog-header
+                slot="header"
+                .subtitlePosition=${this.headerSubtitlePosition}
+              >
+                <slot name="headerNavigationIcon" slot="navigationIcon">
+                  <ha-icon-button
+                    data-drawer="close"
+                    .label=${this.hass?.localize("ui.common.close") ?? "Close"}
+                    .path=${mdiClose}
+                  ></ha-icon-button>
                 </slot>
-              `
+                ${this.headerTitle !== undefined
+                  ? html`<span
+                      slot="title"
+                      class="title"
+                      id="ha-wa-dialog-title"
+                    >
+                      ${this.headerTitle}
+                    </span>`
+                  : html`<slot name="headerTitle" slot="title"></slot>`}
+                ${this.headerSubtitle !== undefined
+                  ? html`<span slot="subtitle">${this.headerSubtitle}</span>`
+                  : html`<slot name="headerSubtitle" slot="subtitle"></slot>`}
+                <slot name="headerActionItems" slot="actionItems"></slot>
+              </ha-dialog-header>`
             : nothing}
           <slot></slot>
           <slot name="footer" slot="footer"></slot>
@@ -186,18 +155,16 @@ export class HaAdaptiveDialog extends LitElement {
     }
 
     return html`
-      <ha-dialog
+      <ha-wa-dialog
         .hass=${this.hass}
         .open=${this.open}
-        .type=${this.type}
         .width=${this.width}
-        .preventScrimClose=${this.preventScrimClose}
         .ariaLabelledBy=${this.ariaLabelledBy}
         .ariaDescribedBy=${this.ariaDescribedBy}
         .headerTitle=${this.headerTitle}
         .headerSubtitle=${this.headerSubtitle}
         .headerSubtitlePosition=${this.headerSubtitlePosition}
-        .flexContent=${this.flexContent}
+        flexcontent
         .withoutHeader=${this.withoutHeader}
       >
         <slot name="headerNavigationIcon" slot="headerNavigationIcon">
@@ -212,7 +179,7 @@ export class HaAdaptiveDialog extends LitElement {
         <slot name="headerActionItems" slot="headerActionItems"></slot>
         <slot></slot>
         <slot name="footer" slot="footer"></slot>
-      </ha-dialog>
+      </ha-wa-dialog>
     `;
   }
 
@@ -220,17 +187,10 @@ export class HaAdaptiveDialog extends LitElement {
     return [
       css`
         ha-bottom-sheet {
-          --ha-bottom-sheet-border-radius: var(--ha-border-radius-2xl);
           --ha-bottom-sheet-surface-background: var(
             --ha-dialog-surface-background,
             var(--card-background-color, var(--ha-color-surface-default))
           );
-          --ha-bottom-sheet-padding: 0 var(--safe-area-inset-right)
-            var(--safe-area-inset-bottom) var(--safe-area-inset-left);
-          --ha-bottom-sheet-content-padding: var(
-            --dialog-content-padding,
-            0 var(--ha-space-6) var(--ha-space-6) var(--ha-space-6)
-          );
         }
       `,
     ];

src/components/ha-alert.ts

@@ -135,7 +135,7 @@ class HaAlert extends LitElement {
     }
     .action ha-icon-button {
       --mdc-theme-primary: var(--primary-text-color);
-      --ha-icon-button-size: 36px;
+      --mdc-icon-button-size: 36px;
     }
     .issue-type.info > .icon {
       color: var(--info-color);

src/components/ha-analytics.ts

@@ -5,7 +5,7 @@ import { fireEvent } from "../common/dom/fire_event";
 import type { LocalizeFunc } from "../common/translations/localize";
 import type { Analytics, AnalyticsPreferences } from "../data/analytics";
 import { haStyle } from "../resources/styles";
-import "./ha-md-list-item";
+import "./ha-settings-row";
 import "./ha-switch";
 import "./ha-tooltip";
 import type { HaSwitch } from "./ha-switch";
@@ -33,80 +33,105 @@ export class HaAnalytics extends LitElement {
     const baseEnabled = !loading && this.analytics!.preferences.base;
 
     return html`
-      <ha-md-list-item>
-        <span slot="headline"
-          >${this.localize(
+      <ha-settings-row>
+        <span slot="heading" data-for="base">
+          ${this.localize(
             `ui.panel.${this.translationKeyPanel}.analytics.preferences.base.title`
-          )}</span
-        >
-        <span slot="supporting-text"
-          >${this.localize(
+          )}
+        </span>
+        <span slot="description" data-for="base">
+          ${this.localize(
             `ui.panel.${this.translationKeyPanel}.analytics.preferences.base.description`
-          )}</span
-        >
+          )}
+        </span>
         <ha-switch
-          slot="end"
           @change=${this._handleRowClick}
           .checked=${!!baseEnabled}
           .preference=${"base"}
           .disabled=${loading}
           name="base"
-        ></ha-switch>
-      </ha-md-list-item>
+        >
+        </ha-switch>
+      </ha-settings-row>
       ${ADDITIONAL_PREFERENCES.map(
         (preference) => html`
-          <ha-md-list-item>
-            <span slot="headline"
-              >${this.localize(
+          <ha-settings-row>
+            <span slot="heading" data-for=${preference}>
+              ${this.localize(
                 `ui.panel.${this.translationKeyPanel}.analytics.preferences.${preference}.title`
-              )}</span
-            >
-            <span slot="supporting-text"
-              >${this.localize(
+              )}
+            </span>
+            <span slot="description" data-for=${preference}>
+              ${this.localize(
                 `ui.panel.${this.translationKeyPanel}.analytics.preferences.${preference}.description`
-              )}</span
-            >
-            <ha-switch
-              slot="end"
-              .id="switch-${preference}"
-              @change=${this._handleRowClick}
-              .checked=${!!this.analytics?.preferences[preference]}
-              .preference=${preference}
-              name=${preference}
-            ></ha-switch>
-            ${baseEnabled
-              ? nothing
-              : html`<ha-tooltip .for="switch-${preference}" placement="right">
-                  ${this.localize(
-                    `ui.panel.${this.translationKeyPanel}.analytics.need_base_enabled`
-                  )}
-                </ha-tooltip>`}
-          </ha-md-list-item>
+              )}
+            </span>
+            <span>
+              <ha-switch
+                .id="switch-${preference}"
+                @change=${this._handleRowClick}
+                .checked=${!!this.analytics?.preferences[preference]}
+                .preference=${preference}
+                name=${preference}
+              >
+              </ha-switch>
+              ${baseEnabled
+                ? nothing
+                : html`<ha-tooltip
+                    .for="switch-${preference}"
+                    placement="right"
+                  >
+                    ${this.localize(
+                      `ui.panel.${this.translationKeyPanel}.analytics.need_base_enabled`
+                    )}
+                  </ha-tooltip>`}
+            </span>
+          </ha-settings-row>
         `
       )}
-      <ha-md-list-item>
-        <span slot="headline"
-          >${this.localize(
+      <ha-settings-row>
+        <span slot="heading" data-for="diagnostics">
+          ${this.localize(
             `ui.panel.${this.translationKeyPanel}.analytics.preferences.diagnostics.title`
-          )}</span
-        >
-        <span slot="supporting-text"
-          >${this.localize(
+          )}
+        </span>
+        <span slot="description" data-for="diagnostics">
+          ${this.localize(
             `ui.panel.${this.translationKeyPanel}.analytics.preferences.diagnostics.description`
-          )}</span
-        >
+          )}
+        </span>
         <ha-switch
-          slot="end"
           @change=${this._handleRowClick}
           .checked=${!!this.analytics?.preferences.diagnostics}
           .preference=${"diagnostics"}
           .disabled=${loading}
           name="diagnostics"
-        ></ha-switch>
-      </ha-md-list-item>
+        >
+        </ha-switch>
+      </ha-settings-row>
     `;
   }
 
+  protected updated(changedProps) {
+    super.updated(changedProps);
+
+    this.shadowRoot!.querySelectorAll("*[data-for]").forEach((el) => {
+      const forEl = (el as HTMLElement).dataset.for;
+      delete (el as HTMLElement).dataset.for;
+
+      el.addEventListener("click", () => {
+        const toFocus = this.shadowRoot!.querySelector(
+          `*[name=${forEl}]`
+        ) as HTMLElement | null;
+
+        if (toFocus) {
+          toFocus.focus();
+          toFocus.click();
+        }
+      });
+    });
+  }
+
   private _handleRowClick(ev: Event) {
     const target = ev.currentTarget as HaSwitch;
     const preference = (target as any).preference;
@@ -139,10 +164,13 @@ export class HaAnalytics extends LitElement {
           color: var(--error-color);
         }
 
-        ha-md-list-item {
-          --md-list-item-leading-space: 0;
-          --md-list-item-trailing-space: 0;
-          --md-item-overflow: visible;
+        ha-settings-row {
+          padding: 0;
+        }
+
+        span[slot="heading"],
+        span[slot="description"] {
+          cursor: pointer;
         }
       `,
     ];

src/components/ha-area-picker.ts

@@ -163,7 +163,7 @@ export class HaAreaPicker extends LitElement {
         {
           id: ADD_NEW_ID + searchString,
           primary: this.hass.localize(
-            "ui.components.area-picker.add_new_suggestion",
+            "ui.components.area-picker.add_new_sugestion",
             {
               name: searchString,
             }

src/components/ha-assist-chat.ts

@@ -1,9 +1,8 @@
 import { mdiAlertCircle, mdiMicrophone, mdiSend } from "@mdi/js";
-import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
+import type { PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
-import { haStyleScrollbar } from "../resources/styles";
 import { supportsFeature } from "../common/entity/supports-feature";
 import {
   runAssistPipeline,
@@ -115,7 +114,7 @@ export class HaAssistChat extends LitElement {
     const supportsSTT = this.pipeline?.stt_engine && !this.disableSpeech;
 
     return html`
-      <div class="messages ha-scrollbar">
+      <div class="messages">
         ${controlHA
           ? nothing
           : html`
@@ -586,167 +585,154 @@ export class HaAssistChat extends LitElement {
     return progress;
   }
 
-  static get styles(): CSSResultGroup {
-    return [
-      haStyleScrollbar,
-      css`
-        :host {
-          flex: 1;
-          display: flex;
-          flex-direction: column;
-          min-height: 0;
-        }
-        ha-alert {
-          margin-bottom: var(--ha-space-2);
-        }
-        ha-textfield {
-          display: block;
-        }
-        .messages {
-          flex: 1 1 400px;
-          display: block;
-          box-sizing: border-box;
-          overflow-y: auto;
-          min-height: 0;
-          max-height: 100%;
-          display: flex;
-          flex-direction: column;
-          padding: 0 var(--ha-space-3) var(--ha-space-4);
-        }
-        .input {
-          padding: var(--ha-space-1) var(--ha-space-4) var(--ha-space-6);
-        }
-        .spacer {
-          flex: 1;
-        }
-        .message {
-          font-size: var(--ha-font-size-l);
-          clear: both;
-          max-width: -webkit-fill-available;
-          overflow-wrap: break-word;
-          scroll-margin-top: var(--ha-space-6);
-          margin: var(--ha-space-2) 0;
-          padding: var(--ha-space-2);
-          border-radius: var(--ha-border-radius-xl);
-        }
-        @media all and (max-width: 450px), all and (max-height: 500px) {
-          .message {
-            font-size: var(--ha-font-size-l);
-          }
-        }
-        .message.user {
-          margin-left: var(--ha-space-6);
-          margin-inline-start: var(--ha-space-6);
-          margin-inline-end: initial;
-          align-self: flex-end;
-          border-bottom-right-radius: 0px;
-          --markdown-link-color: var(--text-primary-color);
-          background-color: var(
-            --chat-background-color-user,
-            var(--primary-color)
-          );
-          color: var(--text-primary-color);
-          direction: var(--direction);
-        }
-        .message.hass {
-          margin-right: var(--ha-space-6);
-          margin-inline-end: var(--ha-space-6);
-          margin-inline-start: initial;
-          align-self: flex-start;
-          border-bottom-left-radius: 0px;
-          background-color: var(
-            --chat-background-color-hass,
-            var(--secondary-background-color)
-          );
+  static styles = css`
+    :host {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+    }
+    ha-alert {
+      margin-bottom: 8px;
+    }
+    ha-textfield {
+      display: block;
+    }
+    .messages {
+      flex: 1;
+      display: block;
+      box-sizing: border-box;
+      overflow-y: auto;
+      max-height: 100%;
+      display: flex;
+      flex-direction: column;
+      padding: 0 12px 16px;
+    }
+    .spacer {
+      flex: 1;
+    }
+    .message {
+      font-size: var(--ha-font-size-l);
+      clear: both;
+      max-width: -webkit-fill-available;
+      overflow-wrap: break-word;
+      scroll-margin-top: 24px;
+      margin: 8px 0;
+      padding: 8px;
+      border-radius: var(--ha-border-radius-xl);
+    }
+    @media all and (max-width: 450px), all and (max-height: 500px) {
+      .message {
+        font-size: var(--ha-font-size-l);
+      }
+    }
+    .message.user {
+      margin-left: 24px;
+      margin-inline-start: 24px;
+      margin-inline-end: initial;
+      align-self: flex-end;
+      border-bottom-right-radius: 0px;
+      --markdown-link-color: var(--text-primary-color);
+      background-color: var(--chat-background-color-user, var(--primary-color));
+      color: var(--text-primary-color);
+      direction: var(--direction);
+    }
+    .message.hass {
+      margin-right: 24px;
+      margin-inline-end: 24px;
+      margin-inline-start: initial;
+      align-self: flex-start;
+      border-bottom-left-radius: 0px;
+      background-color: var(
+        --chat-background-color-hass,
+        var(--secondary-background-color)
+      );
 
-          color: var(--primary-text-color);
-          direction: var(--direction);
-        }
-        .message.error {
-          background-color: var(--error-color);
-          color: var(--text-primary-color);
-        }
-        ha-markdown {
-          --markdown-image-border-radius: calc(var(--ha-border-radius-xl) / 2);
-          --markdown-table-border-color: var(--divider-color);
-          --markdown-code-background-color: var(--primary-background-color);
-          --markdown-code-text-color: var(--primary-text-color);
-          --markdown-list-indent: 1.15em;
-        }
-        ha-markdown:not(:has(ha-markdown-element)) {
-          min-height: 1lh;
-          min-width: 1lh;
-          flex-shrink: 0;
-        }
-        .bouncer {
-          width: 48px;
-          height: 48px;
-          position: absolute;
-        }
-        .double-bounce1,
-        .double-bounce2 {
-          width: 48px;
-          height: 48px;
-          border-radius: var(--ha-border-radius-circle);
-          background-color: var(--primary-color);
-          opacity: 0.2;
-          position: absolute;
-          top: 0;
-          left: 0;
-          -webkit-animation: sk-bounce 2s infinite ease-in-out;
-          animation: sk-bounce 2s infinite ease-in-out;
-        }
-        .double-bounce2 {
-          -webkit-animation-delay: -1s;
-          animation-delay: -1s;
-        }
-        @-webkit-keyframes sk-bounce {
-          0%,
-          100% {
-            -webkit-transform: scale(0);
-          }
-          50% {
-            -webkit-transform: scale(1);
-          }
-        }
-        @keyframes sk-bounce {
-          0%,
-          100% {
-            transform: scale(0);
-            -webkit-transform: scale(0);
-          }
-          50% {
-            transform: scale(1);
-            -webkit-transform: scale(1);
-          }
-        }
+      color: var(--primary-text-color);
+      direction: var(--direction);
+    }
+    .message.error {
+      background-color: var(--error-color);
+      color: var(--text-primary-color);
+    }
+    ha-markdown {
+      --markdown-image-border-radius: calc(var(--ha-border-radius-xl) / 2);
+      --markdown-table-border-color: var(--divider-color);
+      --markdown-code-background-color: var(--primary-background-color);
+      --markdown-code-text-color: var(--primary-text-color);
+      --markdown-list-indent: 1.15em;
+      &:not(:has(ha-markdown-element)) {
+        min-height: 1lh;
+        min-width: 1lh;
+        flex-shrink: 0;
+      }
+    }
+    .bouncer {
+      width: 48px;
+      height: 48px;
+      position: absolute;
+    }
+    .double-bounce1,
+    .double-bounce2 {
+      width: 48px;
+      height: 48px;
+      border-radius: var(--ha-border-radius-circle);
+      background-color: var(--primary-color);
+      opacity: 0.2;
+      position: absolute;
+      top: 0;
+      left: 0;
+      -webkit-animation: sk-bounce 2s infinite ease-in-out;
+      animation: sk-bounce 2s infinite ease-in-out;
+    }
+    .double-bounce2 {
+      -webkit-animation-delay: -1s;
+      animation-delay: -1s;
+    }
+    @-webkit-keyframes sk-bounce {
+      0%,
+      100% {
+        -webkit-transform: scale(0);
+      }
+      50% {
+        -webkit-transform: scale(1);
+      }
+    }
+    @keyframes sk-bounce {
+      0%,
+      100% {
+        transform: scale(0);
+        -webkit-transform: scale(0);
+      }
+      50% {
+        transform: scale(1);
+        -webkit-transform: scale(1);
+      }
+    }
 
-        .listening-icon {
-          position: relative;
-          color: var(--secondary-text-color);
-          margin-right: -24px;
-          margin-inline-end: -24px;
-          margin-inline-start: initial;
-          direction: var(--direction);
-          transform: scaleX(var(--scale-direction));
-        }
+    .listening-icon {
+      position: relative;
+      color: var(--secondary-text-color);
+      margin-right: -24px;
+      margin-inline-end: -24px;
+      margin-inline-start: initial;
+      direction: var(--direction);
+      transform: scaleX(var(--scale-direction));
+    }
 
-        .listening-icon[active] {
-          color: var(--primary-color);
-        }
+    .listening-icon[active] {
+      color: var(--primary-color);
+    }
 
-        .unsupported {
-          color: var(--error-color);
-          position: absolute;
-          --mdc-icon-size: 16px;
-          right: 5px;
-          inset-inline-end: 5px;
-          inset-inline-start: initial;
-          top: 0px;
-        }
-      `,
-    ];
-  }
+    .unsupported {
+      color: var(--error-color);
+      position: absolute;
+      --mdc-icon-size: 16px;
+      right: 5px;
+      inset-inline-end: 5px;
+      inset-inline-start: initial;
+      top: 0px;
+    }
+  `;
 }
 
 declare global {

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

@@ -4,10 +4,10 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
 import { fireEvent } from "../common/dom/fire_event";
+import type { HaSelectSelectEvent } from "./ha-select";
 import "./ha-icon-button";
 import "./ha-input-helper-text";
 import "./ha-select";
-import type { HaSelectSelectEvent } from "./ha-select";
 import "./ha-textfield";
 import type { HaTextField } from "./ha-textfield";
 
@@ -368,7 +368,7 @@ export class HaBaseTimeInput extends LitElement {
     }
     ha-icon-button {
       position: relative;
-      --ha-icon-button-size: 36px;
+      --mdc-icon-button-size: 36px;
       --mdc-icon-size: 20px;
       color: var(--secondary-text-color);
       direction: var(--direction);

src/components/ha-bottom-sheet.ts

@@ -1,52 +1,21 @@
 import "@home-assistant/webawesome/dist/components/drawer/drawer";
-import type WaDrawer from "@home-assistant/webawesome/dist/components/drawer/drawer";
 import { css, html, LitElement, type PropertyValues } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
-import type { HASSDomEvent } from "../common/dom/fire_event";
-import { fireEvent } from "../common/dom/fire_event";
 import { SwipeGestureRecognizer } from "../common/util/swipe-gesture-recognizer";
 import { ScrollableFadeMixin } from "../mixins/scrollable-fade-mixin";
 import { haStyleScrollbar } from "../resources/styles";
-import type { HomeAssistant } from "../types";
-import { isIosApp } from "../util/is_ios";
 
 export const BOTTOM_SHEET_ANIMATION_DURATION_MS = 300;
 
-const SWIPE_LOCKED_COMPONENTS = new Set([
-  "ha-control-slider",
-  "ha-slider",
-  "ha-control-switch",
-  "ha-control-circular-slider",
-  "ha-hs-color-picker",
-  "ha-map",
-  "ha-more-info-control-select-container",
-  "ha-filter-chip",
-]);
-
-const SWIPE_LOCKED_CLASSES = new Set(["volume-slider-container", "forecast"]);
-
 @customElement("ha-bottom-sheet")
 export class HaBottomSheet extends ScrollableFadeMixin(LitElement) {
-  @property({ attribute: false }) public hass?: HomeAssistant;
-
-  @property({ attribute: "aria-labelledby" })
-  public ariaLabelledBy?: string;
-
-  @property({ attribute: "aria-describedby" })
-  public ariaDescribedBy?: string;
-
   @property({ type: Boolean }) public open = false;
 
   @property({ type: Boolean, reflect: true, attribute: "flexcontent" })
   public flexContent = false;
 
-  @property({ type: Boolean, reflect: true, attribute: "prevent-scrim-close" })
-  public preventScrimClose = false;
-
   @state() private _drawerOpen = false;
 
-  @state() private _sliderInteractionActive = false;
-
   @query("#drawer") private _drawer!: HTMLElement;
 
   @query("#body") private _bodyElement!: HTMLDivElement;
@@ -59,124 +28,14 @@ export class HaBottomSheet extends ScrollableFadeMixin(LitElement) {
 
   private _isDragging = false;
 
-  private _escapePressed = false;
-
-  private _handleShow = async () => {
-    this._drawerOpen = true;
-    this.open = true;
-    fireEvent(this, "opened");
-
-    await this.updateComplete;
-
-    requestAnimationFrame(() => {
-      if (this.hass && isIosApp(this.hass)) {
-        const element = this.renderRoot.querySelector("[autofocus]");
-        if (element !== null) {
-          if (!element.id) {
-            element.id = "ha-bottom-sheet-autofocus";
-          }
-          this.hass.auth.external?.fireMessage({
-            type: "focus_element",
-            payload: {
-              element_id: element.id,
-            },
-          });
-        }
-        return;
-      }
-      (
-        this.renderRoot.querySelector("[autofocus]") as HTMLElement | null
-      )?.focus();
+  private _handleAfterHide(afterHideEvent: Event) {
+    afterHideEvent.stopPropagation();
+    this.open = false;
+    const ev = new Event("closed", {
+      bubbles: true,
+      composed: true,
     });
-  };
-
-  private _handleAfterShow = () => {
-    fireEvent(this, "after-show");
-  };
-
-  private _handleSliderInteractionStart = () => {
-    this._sliderInteractionActive = true;
-  };
-
-  private _handleSliderInteractionStop = () => {
-    this._sliderInteractionActive = false;
-  };
-
-  private _handleAfterHide = (ev: CustomEvent<{ source: Element }>) => {
-    if (this._sliderInteractionActive) {
-      this._drawerOpen = true;
-      this.open = true;
-      return;
-    }
-
-    if (ev.eventPhase === Event.AT_TARGET) {
-      this.open = false;
-      this._drawerOpen = false;
-      fireEvent(this, "closed");
-    }
-  };
-
-  private _handleHide = (ev: CustomEvent<{ source: Element }>) => {
-    // Ignore bubbled wa-hide events from nested drawers (e.g., picker bottom sheet)
-    if (ev.eventPhase !== Event.AT_TARGET) {
-      return;
-    }
-
-    const sourceIsDrawer = ev.detail.source === (ev.target as WaDrawer).drawer;
-
-    if (this._sliderInteractionActive) {
-      ev.preventDefault();
-      this._drawerOpen = true;
-      this.open = true;
-      this._escapePressed = false;
-      return;
-    }
-    if (this.preventScrimClose && this._escapePressed && sourceIsDrawer) {
-      ev.preventDefault();
-    }
-
-    this._escapePressed = false;
-  };
-
-  private _handleKeyDown = (ev: KeyboardEvent) => {
-    if (ev.key === "Escape") {
-      this._escapePressed = true;
-      ev.stopPropagation();
-      (ev.currentTarget as WaDrawer).open = false;
-    }
-  };
-
-  private _handleCloseAction = (ev: Event) => {
-    const shouldClose = ev
-      .composedPath()
-      .some(
-        (node) =>
-          node instanceof HTMLElement &&
-          (node.getAttribute("data-dialog") === "close" ||
-            node.getAttribute("data-drawer") === "close")
-      );
-
-    if (shouldClose) {
-      this._drawerOpen = false;
-    }
-  };
-
-  connectedCallback() {
-    super.connectedCallback();
-    this.addEventListener(
-      "slider-interaction-start",
-      this._handleSliderInteractionStart,
-      {
-        capture: true,
-      }
-    );
-    this.addEventListener(
-      "slider-interaction-stop",
-      this._handleSliderInteractionStop,
-      {
-        capture: true,
-      }
-    );
+    this.dispatchEvent(ev);
   }
 
   protected updated(changedProperties: PropertyValues): void {
@@ -192,21 +51,10 @@ export class HaBottomSheet extends ScrollableFadeMixin(LitElement) {
         id="drawer"
         placement="bottom"
         .open=${this._drawerOpen}
-        .lightDismiss=${!this.preventScrimClose}
-        .ariaLabelledby=${this.ariaLabelledBy}
-        .ariaDescribedby=${this.ariaDescribedBy}
-        @keydown=${this._handleKeyDown}
-        @wa-show=${this._handleShow}
-        @wa-after-show=${this._handleAfterShow}
-        @wa-hide=${this._handleHide}
         @wa-after-hide=${this._handleAfterHide}
-        @click=${this._handleCloseAction}
         without-header
         @touchstart=${this._handleTouchStart}
       >
-        <div class="handle-wrapper" aria-hidden="true">
-          <div class="handle"></div>
-        </div>
         <slot name="header"></slot>
         <div class="content-wrapper">
           <div id="body" class="body ha-scrollbar">
@@ -220,37 +68,17 @@ export class HaBottomSheet extends ScrollableFadeMixin(LitElement) {
   }
 
   private _handleTouchStart = (ev: TouchEvent) => {
-    if (this.preventScrimClose) {
-      return;
-    }
-
-    const path = ev.composedPath();
-
-    for (const target of path) {
-      if (target === this._drawer) {
+    // Check if any element inside drawer in the composed path has scrollTop > 0
+    for (const path of ev.composedPath()) {
+      const el = path as HTMLElement;
+      if (el === this._drawer) {
         break;
       }
-
-      if (!(target instanceof HTMLElement)) {
-        continue;
-      }
-
-      if (
-        // Check if any element inside drawer in the composed path has scrollTop > 0 (list)
-        target.scrollTop > 0 ||
-        // Check if the element is a swipe locked component or has a swipe locked class
-        SWIPE_LOCKED_COMPONENTS.has(target.localName) ||
-        Array.from(target.classList).some((cls) =>
-          SWIPE_LOCKED_CLASSES.has(cls)
-        )
-      ) {
+      if (el.scrollTop > 0) {
         return;
       }
     }
 
-    // Stop propagation so parent bottom sheets don't also start tracking
-    // this gesture (same pattern as _handleKeyDown for Escape)
-    ev.stopPropagation();
     this._startResizing(ev.touches[0].clientY);
   };
 
@@ -346,20 +174,6 @@ export class HaBottomSheet extends ScrollableFadeMixin(LitElement) {
 
   disconnectedCallback() {
     super.disconnectedCallback();
-    this.removeEventListener(
-      "slider-interaction-start",
-      this._handleSliderInteractionStart,
-      {
-        capture: true,
-      }
-    );
-    this.removeEventListener(
-      "slider-interaction-stop",
-      this._handleSliderInteractionStop,
-      {
-        capture: true,
-      }
-    );
     this._unregisterResizeHandlers();
     this._isDragging = false;
   }
@@ -385,7 +199,6 @@ export class HaBottomSheet extends ScrollableFadeMixin(LitElement) {
         wa-drawer::part(body) {
           max-width: var(--ha-bottom-sheet-max-width);
           width: 100%;
-          position: relative;
           border-top-left-radius: var(
             --ha-bottom-sheet-border-radius,
             var(--ha-dialog-border-radius, var(--ha-border-radius-2xl))
@@ -408,35 +221,6 @@ export class HaBottomSheet extends ScrollableFadeMixin(LitElement) {
           display: flex;
           flex-direction: column;
         }
-        :host([prevent-scrim-close]) .handle-wrapper {
-          display: none;
-        }
-        .handle-wrapper {
-          position: absolute;
-          top: 0;
-          inset-inline-start: 0;
-          width: 100%;
-          padding-bottom: 2px;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          pointer-events: none;
-          z-index: 1;
-        }
-        .handle-wrapper .handle {
-          height: 16px;
-          width: 200px;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-        }
-        .handle-wrapper .handle::after {
-          content: "";
-          border-radius: var(--ha-border-radius-md);
-          height: 4px;
-          background: var(--ha-bottom-sheet-handle-color, var(--divider-color));
-          width: 40px;
-        }
         .content-wrapper {
           position: relative;
           flex: 1;
@@ -444,24 +228,16 @@ export class HaBottomSheet extends ScrollableFadeMixin(LitElement) {
           flex-direction: column;
           min-height: 0;
         }
-        .body {
-          padding: var(--ha-bottom-sheet-content-padding, 0);
-          box-sizing: border-box;
-        }
         :host([flexcontent]) .body {
           flex: 1;
           max-width: 100%;
           display: flex;
           flex-direction: column;
           padding: var(
-            --ha-bottom-sheet-content-padding,
-            var(
-              --ha-bottom-sheet-padding,
-              0 var(--safe-area-inset-right) var(--safe-area-inset-bottom)
-                var(--safe-area-inset-left)
-            )
+            --ha-bottom-sheet-padding,
+            0 var(--safe-area-inset-right) var(--safe-area-inset-bottom)
+              var(--safe-area-inset-left)
           );
-          box-sizing: border-box;
         }
         slot[name="footer"] {
           display: block;
@@ -486,18 +262,6 @@ export class HaBottomSheet extends ScrollableFadeMixin(LitElement) {
 }
 
 declare global {
-  interface HASSDomEvents {
-    "slider-interaction-start": undefined;
-    "slider-interaction-stop": undefined;
-  }
-  interface HTMLElementEventMap {
-    "slider-interaction-start": HASSDomEvent<
-      HASSDomEvents["slider-interaction-start"]
-    >;
-    "slider-interaction-stop": HASSDomEvent<
-      HASSDomEvents["slider-interaction-stop"]
-    >;
-  }
   interface HTMLElementTagNameMap {
     "ha-bottom-sheet": HaBottomSheet;
   }

src/components/ha-button.ts

@@ -42,7 +42,7 @@ export class HaButton extends Button {
       Button.styles,
       css`
         :host {
-          --wa-form-control-padding-inline: var(--ha-space-4);
+          --wa-form-control-padding-inline: 16px;
           --wa-font-weight-action: var(--ha-font-weight-medium);
           --wa-form-control-border-radius: var(
             --ha-button-border-radius,
@@ -68,7 +68,7 @@ export class HaButton extends Button {
             var(--button-height, 32px)
           );
           font-size: var(--wa-font-size-s, var(--ha-font-size-m));
-          --wa-form-control-padding-inline: var(--ha-space-3);
+          --wa-form-control-padding-inline: 12px;
         }
 
         :host([variant="brand"]) {
@@ -84,9 +84,6 @@ export class HaButton extends Button {
           --button-color-fill-loud-hover: var(
             --ha-color-fill-primary-loud-hover
           );
-          --button-color-fill-quiet-active: var(
-            --ha-color-fill-primary-quiet-active
-          );
         }
 
         :host([variant="neutral"]) {
@@ -102,9 +99,6 @@ export class HaButton extends Button {
           --button-color-fill-loud-hover: var(
             --ha-color-fill-neutral-loud-hover
           );
-          --button-color-fill-quiet-active: var(
-            --ha-color-fill-neutral-normal-active
-          );
         }
 
         :host([variant="success"]) {
@@ -120,9 +114,6 @@ export class HaButton extends Button {
           --button-color-fill-loud-hover: var(
             --ha-color-fill-success-loud-hover
           );
-          --button-color-fill-quiet-active: var(
-            --ha-color-fill-success-quiet-active
-          );
         }
 
         :host([variant="warning"]) {
@@ -138,9 +129,6 @@ export class HaButton extends Button {
           --button-color-fill-loud-hover: var(
             --ha-color-fill-warning-loud-hover
           );
-          --button-color-fill-quiet-active: var(
-            --ha-color-fill-warning-quiet-active
-          );
         }
 
         :host([variant="danger"]) {
@@ -156,9 +144,6 @@ export class HaButton extends Button {
           --button-color-fill-loud-hover: var(
             --ha-color-fill-danger-loud-hover
           );
-          --button-color-fill-quiet-active: var(
-            --ha-color-fill-danger-quiet-active
-          );
         }
 
         :host([appearance~="plain"]) .button {
@@ -202,10 +187,6 @@ export class HaButton extends Button {
           background-color: var(--ha-color-fill-disabled-normal-resting);
           color: var(--ha-color-on-disabled-normal);
         }
-        :host([appearance~="plain"])
-          .button:not(.disabled):not(.loading):active {
-          background-color: var(--button-color-fill-quiet-active);
-        }
 
         :host([appearance~="accent"]) .button {
           background-color: var(
@@ -231,17 +212,17 @@ export class HaButton extends Button {
         }
 
         slot[name="start"]::slotted(*) {
-          margin-inline-end: var(--ha-space-1);
+          margin-inline-end: 4px;
         }
         slot[name="end"]::slotted(*) {
-          margin-inline-start: var(--ha-space-1);
+          margin-inline-start: 4px;
         }
 
         .button.has-start {
-          padding-inline-start: var(--ha-space-2);
+          padding-inline-start: 8px;
         }
         .button.has-end {
-          padding-inline-end: var(--ha-space-2);
+          padding-inline-end: 8px;
         }
 
         .label {

src/components/ha-camera-stream.ts

@@ -2,7 +2,6 @@ import { css, html, LitElement, nothing, type PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
 import { styleMap } from "lit/directives/style-map";
-import { STATE_RUNNING } from "home-assistant-js-websocket";
 import memoizeOne from "memoize-one";
 import { computeStateName } from "../common/entity/compute_state_name";
 import { supportsFeature } from "../common/entity/supports-feature";
@@ -59,22 +58,12 @@ export class HaCameraStream extends LitElement {
   @state() private _webRtcStreams?: { hasAudio: boolean; hasVideo: boolean };
 
   public willUpdate(changedProps: PropertyValues): void {
-    const entityChanged =
+    if (
       changedProps.has("stateObj") &&
       this.stateObj &&
       (changedProps.get("stateObj") as CameraEntity | undefined)?.entity_id !==
-        this.stateObj.entity_id;
-
-    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
-    const backendStarted =
-      changedProps.has("hass") &&
-      this.hass &&
-      this.stateObj &&
-      oldHass &&
-      this.hass.config.state === STATE_RUNNING &&
-      oldHass.config?.state !== STATE_RUNNING;
-
-    if (entityChanged || backendStarted) {
+        this.stateObj.entity_id
+    ) {
       this._getCapabilities();
       this._getPosterUrl();
     }

src/components/ha-code-editor.ts

@@ -20,7 +20,7 @@ import {
   mdiUndo,
 } from "@mdi/js";
 import type { HassEntities } from "home-assistant-js-websocket";
-import type { CSSResultGroup, PropertyValues } from "lit";
+import type { PropertyValues } from "lit";
 import { css, html, ReactiveElement, render } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -28,7 +28,6 @@ import { fireEvent } from "../common/dom/fire_event";
 import { stopPropagation } from "../common/dom/stop_propagation";
 import { getEntityContext } from "../common/entity/context/get_entity_context";
 import { copyToClipboard } from "../common/util/copy-clipboard";
-import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant } from "../types";
 import { showToast } from "../util/toast";
 import "./ha-code-editor-completion-items";
@@ -311,11 +310,6 @@ export class HaCodeEditor extends ReactiveElement {
     });
     this._canCopy = this._value?.length > 0;
 
-    const cmScroller = this.codemirror.dom.querySelector(".cm-scroller");
-    if (cmScroller) {
-      cmScroller.classList.add("ha-scrollbar");
-    }
-
     // Update the toolbar. Creating it if required
     this._updateToolbar();
   }
@@ -808,105 +802,100 @@ export class HaCodeEditor extends ReactiveElement {
     return [];
   };
 
-  static get styles(): CSSResultGroup {
-    return [
-      haStyleScrollbar,
-      css`
-        :host {
-          position: relative;
-          display: block;
-          --code-editor-toolbar-height: 28px;
-        }
+  static styles = css`
+    :host {
+      position: relative;
+      display: block;
+      --code-editor-toolbar-height: 28px;
+    }
 
-        :host(.error-state) .cm-gutters {
-          border-color: var(--error-state-color, var(--error-color)) !important;
-        }
+    :host(.error-state) .cm-gutters {
+      border-color: var(--error-state-color, var(--error-color)) !important;
+    }
 
-        :host(.hasToolbar) .cm-gutters {
-          padding-top: 0;
-        }
+    :host(.hasToolbar) .cm-gutters {
+      padding-top: 0;
+    }
 
-        :host(.hasToolbar) .cm-focused .cm-gutters {
-          padding-top: 1px;
-        }
+    :host(.hasToolbar) .cm-focused .cm-gutters {
+      padding-top: 1px;
+    }
 
-        :host(.error-state) .cm-content {
-          border-color: var(--error-state-color, var(--error-color)) !important;
-        }
+    :host(.error-state) .cm-content {
+      border-color: var(--error-state-color, var(--error-color)) !important;
+    }
 
-        :host(.hasToolbar) .cm-content {
-          border: none;
-          border-top: 1px solid var(--secondary-text-color);
-        }
+    :host(.hasToolbar) .cm-content {
+      border: none;
+      border-top: 1px solid var(--secondary-text-color);
+    }
 
-        :host(.hasToolbar) .cm-focused .cm-content {
-          border-top: 2px solid var(--primary-color);
-          padding-top: 15px;
-        }
+    :host(.hasToolbar) .cm-focused .cm-content {
+      border-top: 2px solid var(--primary-color);
+      padding-top: 15px;
+    }
 
-        :host(.fullscreen) {
-          position: fixed !important;
-          top: calc(var(--header-height, 56px) + 8px) !important;
-          left: 8px !important;
-          right: 8px !important;
-          bottom: 8px !important;
-          z-index: 6;
-          border-radius: var(--ha-border-radius-lg) !important;
-          box-shadow: 0 2px 10px rgba(0, 0, 0, 0.3) !important;
-          overflow: hidden !important;
-          background-color: var(
-            --code-editor-background-color,
-            var(--card-background-color)
-          ) !important;
-          margin: 0 !important;
-          padding-top: var(--safe-area-inset-top) !important;
-          padding-left: var(--safe-area-inset-left) !important;
-          padding-right: var(--safe-area-inset-right) !important;
-          padding-bottom: var(--safe-area-inset-bottom) !important;
-          box-sizing: border-box !important;
-          display: block !important;
-        }
+    :host(.fullscreen) {
+      position: fixed !important;
+      top: calc(var(--header-height, 56px) + 8px) !important;
+      left: 8px !important;
+      right: 8px !important;
+      bottom: 8px !important;
+      z-index: 6;
+      border-radius: var(--ha-border-radius-lg) !important;
+      box-shadow: 0 2px 10px rgba(0, 0, 0, 0.3) !important;
+      overflow: hidden !important;
+      background-color: var(
+        --code-editor-background-color,
+        var(--card-background-color)
+      ) !important;
+      margin: 0 !important;
+      padding-top: var(--safe-area-inset-top) !important;
+      padding-left: var(--safe-area-inset-left) !important;
+      padding-right: var(--safe-area-inset-right) !important;
+      padding-bottom: var(--safe-area-inset-bottom) !important;
+      box-sizing: border-box !important;
+      display: block !important;
+    }
 
-        :host(.hasToolbar) .cm-editor {
-          padding-top: var(--code-editor-toolbar-height);
-        }
+    :host(.hasToolbar) .cm-editor {
+      padding-top: var(--code-editor-toolbar-height);
+    }
 
-        :host(.fullscreen) .cm-editor {
-          height: 100% !important;
-          max-height: 100% !important;
-          border-radius: var(--ha-border-radius-square) !important;
-        }
+    :host(.fullscreen) .cm-editor {
+      height: 100% !important;
+      max-height: 100% !important;
+      border-radius: var(--ha-border-radius-square) !important;
+    }
 
-        :host(:not(.hasToolbar)) .code-editor-toolbar {
-          display: none !important;
-        }
+    :host(:not(.hasToolbar)) .code-editor-toolbar {
+      display: none !important;
+    }
 
-        .code-editor-toolbar {
-          --icon-button-toolbar-height: var(--code-editor-toolbar-height);
-          --icon-button-toolbar-color: var(
-            --code-editor-gutter-color,
-            var(--secondary-background-color, whitesmoke)
-          );
-          border-top-left-radius: var(--ha-border-radius-sm);
-          border-top-right-radius: var(--ha-border-radius-sm);
-        }
+    .code-editor-toolbar {
+      --icon-button-toolbar-height: var(--code-editor-toolbar-height);
+      --icon-button-toolbar-color: var(
+        --code-editor-gutter-color,
+        var(--secondary-background-color, whitesmoke)
+      );
+      border-top-left-radius: var(--ha-border-radius-sm);
+      border-top-right-radius: var(--ha-border-radius-sm);
+    }
 
-        .completion-info {
-          display: grid;
-          gap: 3px;
-          padding: 8px;
-        }
+    .completion-info {
+      display: grid;
+      gap: 3px;
+      padding: 8px;
+    }
 
-        /* Hide completion info on narrow screens */
-        @media (max-width: 600px) {
-          .cm-completionInfo,
-          .completion-info {
-            display: none;
-          }
-        }
-      `,
-    ];
-  }
+    /* Hide completion info on narrow screens */
+    @media (max-width: 600px) {
+      .cm-completionInfo,
+      .completion-info {
+        display: none;
+      }
+    }
+  `;
 }
 
 declare global {

src/components/ha-color-picker.ts

@@ -6,7 +6,7 @@ import memoizeOne from "memoize-one";
 import { computeCssColor, THEME_COLORS } from "../common/color/compute-color";
 import { fireEvent } from "../common/dom/fire_event";
 import type { LocalizeKeys } from "../common/translations/localize";
-import type { HomeAssistant, ValueChangedEvent } from "../types";
+import type { HomeAssistant } from "../types";
 import "./ha-generic-picker";
 import type { PickerComboBoxItem } from "./ha-picker-combo-box";
 import type { PickerValueRenderer } from "./ha-picker-field";
@@ -224,7 +224,7 @@ export class HaColorPicker extends LitElement {
     `;
   }
 
-  private _valueChanged(ev: ValueChangedEvent<string | undefined>) {
+  private _valueChanged(ev: CustomEvent<{ value?: string }>) {
     ev.stopPropagation();
     const selected = ev.detail.value;
     const normalized =

src/components/ha-control-select-menu.ts

@@ -89,7 +89,7 @@ export class HaControlSelectMenu extends LitElement {
   private _renderOption = (option: SelectOption) =>
     html`<ha-dropdown-item
       .value=${option.value}
-      .selected=${this.value === option.value}
+      class=${this.value === option.value ? "selected" : ""}
       >${option.iconPath
         ? html`<ha-svg-icon slot="icon" .path=${option.iconPath}></ha-svg-icon>`
         : option.icon
@@ -263,6 +263,15 @@ export class HaControlSelectMenu extends LitElement {
         cursor: not-allowed;
         color: var(--disabled-color);
       }
+      ha-dropdown-item.selected {
+        font-weight: var(--ha-font-weight-medium);
+        color: var(--primary-color);
+        background-color: var(--ha-color-fill-primary-quiet-resting);
+        --icon-primary-color: var(--primary-color);
+      }
+      ha-dropdown-item.selected:hover {
+        background-color: var(--ha-color-fill-primary-quiet-hover);
+      }
 
       ha-dropdown::part(menu) {
         min-width: var(--control-select-menu-width);

src/components/ha-copy-textfield.ts

@@ -95,7 +95,7 @@ export class HaCopyTextfield extends LitElement {
       right: 8px;
       inset-inline-start: initial;
       inset-inline-end: 8px;
-      --ha-icon-button-size: 40px;
+      --mdc-icon-button-size: 40px;
       --mdc-icon-size: 20px;
       color: var(--secondary-text-color);
       direction: var(--direction);

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

@@ -7,9 +7,8 @@ import { nextRender } from "../common/util/render-status";
 import { haStyleDialog } from "../resources/styles";
 import type { HomeAssistant } from "../types";
 import type { DatePickerDialogParams } from "./ha-date-input";
-import "./ha-button";
-import "./ha-dialog-footer";
 import "./ha-dialog";
+import "./ha-button";
 
 @customElement("ha-dialog-date-picker")
 export class HaDialogDatePicker extends LitElement {
@@ -23,8 +22,6 @@ export class HaDialogDatePicker extends LitElement {
 
   @state() private _params?: DatePickerDialogParams;
 
-  @state() private _open = false;
-
   @state() private _value?: string;
 
   public async showDialog(params: DatePickerDialogParams): Promise<void> {
@@ -33,14 +30,9 @@ export class HaDialogDatePicker extends LitElement {
     await nextRender();
     this._params = params;
     this._value = params.value;
-    this._open = true;
   }
 
   public closeDialog() {
-    this._open = false;
-  }
-
-  private _dialogClosed() {
     this._params = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
@@ -49,13 +41,7 @@ export class HaDialogDatePicker extends LitElement {
     if (!this._params) {
       return nothing;
     }
-    return html`<ha-dialog
-      .hass=${this.hass}
-      .open=${this._open}
-      width="small"
-      without-header
-      @closed=${this._dialogClosed}
-    >
+    return html`<ha-dialog open @closed=${this.closeDialog}>
       <app-datepicker
         .value=${this._value}
         .min=${this._params.min}
@@ -64,39 +50,34 @@ export class HaDialogDatePicker extends LitElement {
         @datepicker-value-updated=${this._valueChanged}
         .firstDayOfWeek=${this._params.firstWeekday}
       ></app-datepicker>
-
-      <div class="bottom-actions">
-        ${this._params.canClear
-          ? html`<ha-button
-              slot="secondaryAction"
-              @click=${this._clear}
-              variant="danger"
-              appearance="plain"
-            >
-              ${this.hass.localize("ui.dialogs.date-picker.clear")}
-            </ha-button>`
-          : nothing}
-        <ha-button
-          appearance="plain"
-          slot="secondaryAction"
-          @click=${this._setToday}
-        >
-          ${this.hass.localize("ui.dialogs.date-picker.today")}
-        </ha-button>
-      </div>
-
-      <ha-dialog-footer slot="footer">
-        <ha-button
-          appearance="plain"
-          slot="secondaryAction"
-          @click=${this.closeDialog}
-        >
-          ${this.hass.localize("ui.common.cancel")}
-        </ha-button>
-        <ha-button slot="primaryAction" @click=${this._setValue}>
-          ${this.hass.localize("ui.common.ok")}
-        </ha-button>
-      </ha-dialog-footer>
+      ${this._params.canClear
+        ? html`<ha-button
+            slot="secondaryAction"
+            @click=${this._clear}
+            variant="danger"
+            appearance="plain"
+          >
+            ${this.hass.localize("ui.dialogs.date-picker.clear")}
+          </ha-button>`
+        : nothing}
+      <ha-button
+        appearance="plain"
+        slot="secondaryAction"
+        @click=${this._setToday}
+      >
+        ${this.hass.localize("ui.dialogs.date-picker.today")}
+      </ha-button>
+      <ha-button
+        appearance="plain"
+        slot="primaryAction"
+        dialogaction="cancel"
+        class="cancel-btn"
+      >
+        ${this.hass.localize("ui.common.cancel")}
+      </ha-button>
+      <ha-button slot="primaryAction" @click=${this._setValue}>
+        ${this.hass.localize("ui.common.ok")}
+      </ha-button>
     </ha-dialog>`;
   }
 
@@ -129,18 +110,9 @@ export class HaDialogDatePicker extends LitElement {
     css`
       ha-dialog {
         --dialog-content-padding: 0;
-      }
-      .bottom-actions {
-        display: flex;
-        gap: var(--ha-space-4);
-        justify-content: center;
-        align-items: center;
-        width: 100%;
-        margin-bottom: var(--ha-space-1);
+        --justify-action-buttons: space-between;
       }
       app-datepicker {
-        display: block;
-        margin-inline: auto;
         --app-datepicker-accent-color: var(--primary-color);
         --app-datepicker-bg-color: transparent;
         --app-datepicker-color: var(--primary-text-color);
@@ -157,6 +129,11 @@ export class HaDialogDatePicker extends LitElement {
       app-datepicker::part(body) {
         direction: ltr;
       }
+      @media all and (min-width: 450px) {
+        ha-dialog {
+          --mdc-dialog-min-width: 300px;
+        }
+      }
       @media all and (max-width: 450px), all and (max-height: 500px) {
         app-datepicker {
           width: 100%;

src/components/ha-dialog-footer.ts

@@ -9,7 +9,7 @@ import { customElement } from "lit/decorators";
  *
  * @summary
  * A simple footer container for dialog actions,
- * typically used as the `footer` slot in `ha-dialog`.
+ * typically used as the `footer` slot in `ha-wa-dialog`.
  *
  * @slot primaryAction - Primary action button(s), aligned to the end.
  * @slot secondaryAction - Secondary action button(s), placed before the primary action.

src/components/ha-dialog.ts

@@ -1,450 +1,193 @@
-import "@home-assistant/webawesome/dist/components/dialog/dialog";
-import type WaDialog from "@home-assistant/webawesome/dist/components/dialog/dialog";
+import { DialogBase } from "@material/mwc-dialog/mwc-dialog-base";
+import { styles } from "@material/mwc-dialog/mwc-dialog.css";
 import { mdiClose } from "@mdi/js";
-import { css, html, LitElement, nothing } from "lit";
-import {
-  customElement,
-  eventOptions,
-  property,
-  query,
-  state,
-} from "lit/decorators";
-import { ifDefined } from "lit/directives/if-defined";
-import { fireEvent } from "../common/dom/fire_event";
-import { ScrollableFadeMixin } from "../mixins/scrollable-fade-mixin";
-import { haStyleScrollbar } from "../resources/styles";
+import type { TemplateResult } from "lit";
+import { css, html } from "lit";
+import { customElement } from "lit/decorators";
+import { FOCUS_TARGET } from "../dialogs/make-dialog-manager";
 import type { HomeAssistant } from "../types";
-import { isIosApp } from "../util/is_ios";
-import "./ha-dialog-header";
 import "./ha-icon-button";
 
-export type DialogWidth = "small" | "medium" | "large" | "full";
+const SUPPRESS_DEFAULT_PRESS_SELECTOR = ["button", "ha-list-item"];
 
-type DialogHideEvent = CustomEvent<{ source?: Element }>;
+export const createCloseHeading = (
+  hass: HomeAssistant | undefined,
+  title: string | TemplateResult
+) => html`
+  <div class="header_title">
+    <ha-icon-button
+      .label=${hass?.localize("ui.common.close") ?? "Close"}
+      .path=${mdiClose}
+      dialogAction="close"
+      class="header_button"
+    ></ha-icon-button>
+    <span>${title}</span>
+  </div>
+`;
 
-/**
- * Home Assistant dialog component
- *
- * @element ha-dialog
- * @extends {LitElement}
- *
- * @summary
- * A stylable dialog built using the `wa-dialog` component, providing a standardized header (ha-dialog-header),
- * body, and footer (preferably using `ha-dialog-footer`) with slots
- *
- * You can open and close the dialog declaratively by using the `data-dialog="close"` attribute.
- * @see https://webawesome.com/docs/components/dialog/#opening-and-closing-dialogs-declaratively
- *
- * @slot header - Replace the entire header area.
- * @slot headerNavigationIcon - Leading header action (e.g. close/back button).
- * @slot headerTitle - Custom title content (used when header-title is not set).
- * @slot headerSubtitle - Custom subtitle content (used when header-subtitle is not set).
- * @slot headerActionItems - Trailing header actions (e.g. buttons, menus).
- * @slot - Dialog content body.
- * @slot footer - Dialog footer content.
- *
- * @csspart dialog - The dialog surface.
- * @csspart header - The header container.
- * @csspart body - The scrollable body container.
- * @csspart footer - The footer container.
- *
- * @cssprop --dialog-content-padding - Padding for the dialog content sections.
- * @cssprop --ha-dialog-show-duration - Show animation duration.
- * @cssprop --ha-dialog-hide-duration - Hide animation duration.
- * @cssprop --ha-dialog-surface-background - Dialog background color.
- * @cssprop --ha-dialog-border-radius - Border radius of the dialog surface.
- * @cssprop --dialog-surface-margin-top - Top margin for the dialog surface.
- *
- * @attr {boolean} open - Controls the dialog open state.
- * @attr {("alert"|"standard")} type - Dialog type. Defaults to "standard".
- * @attr {("small"|"medium"|"large"|"full")} width - Preferred dialog width preset. Defaults to "medium".
- * @attr {boolean} prevent-scrim-close - Prevents closing the dialog by clicking the scrim/overlay. Defaults to false.
- * @attr {string} header-title - Header title text. If not set, the headerTitle slot is used.
- * @attr {string} header-subtitle - Header subtitle text. If not set, the headerSubtitle slot is used.
- * @attr {("above"|"below")} header-subtitle-position - Position of the subtitle relative to the title. Defaults to "below".
- * @attr {boolean} flexcontent - Makes the dialog body a flex container for flexible layouts.
- *
- * @event opened - Fired when the dialog is shown.
- * @event closed - Fired after the dialog is hidden.
- *
- * @remarks
- * **Focus Management:**
- * To automatically focus an element when the dialog opens, add the `autofocus` attribute to it.
- * Components with `delegatesFocus: true` (like `ha-form`) will forward focus to their first focusable child.
- * Example: `<ha-form autofocus .schema=${schema}></ha-form>`
- *
- * @see https://github.com/home-assistant/frontend/issues/27143
- */
 @customElement("ha-dialog")
-export class HaDialog extends ScrollableFadeMixin(LitElement) {
-  @property({ attribute: false }) public hass?: HomeAssistant;
+export class HaDialog extends DialogBase {
+  protected readonly [FOCUS_TARGET];
 
-  @property({ attribute: "aria-labelledby" })
-  public ariaLabelledBy?: string;
-
-  @property({ attribute: "aria-describedby" })
-  public ariaDescribedBy?: string;
-
-  @property({ type: Boolean, reflect: true })
-  public open = false;
-
-  @property({ reflect: true })
-  public type: "alert" | "standard" = "standard";
-
-  @property({ type: String, reflect: true, attribute: "width" })
-  public width: DialogWidth = "medium";
-
-  @property({ type: Boolean, reflect: true, attribute: "prevent-scrim-close" })
-  public preventScrimClose = false;
-
-  @property({ attribute: "header-title" })
-  public headerTitle?: string;
-
-  @property({ attribute: "header-subtitle" })
-  public headerSubtitle?: string;
-
-  @property({ type: String, attribute: "header-subtitle-position" })
-  public headerSubtitlePosition: "above" | "below" = "below";
-
-  @property({ type: Boolean, reflect: true, attribute: "flexcontent" })
-  public flexContent = false;
-
-  @property({ type: Boolean, attribute: "without-header" })
-  public withoutHeader = false;
-
-  @state()
-  private _open = false;
-
-  @query(".body") public bodyContainer!: HTMLDivElement;
-
-  @state()
-  private _bodyScrolled = false;
-
-  private _escapePressed = false;
-
-  protected get scrollableElement(): HTMLElement | null {
-    return this.bodyContainer;
+  public scrollToPos(x: number, y: number) {
+    this.contentElement?.scrollTo(x, y);
   }
 
-  protected updated(
-    changedProperties: Map<string | number | symbol, unknown>
-  ): void {
-    super.updated(changedProperties);
-
-    if (changedProperties.has("open")) {
-      this._open = this.open;
-    }
+  protected renderHeading() {
+    return html`<slot name="heading"> ${super.renderHeading()} </slot>`;
   }
 
-  protected render() {
-    return html`
-      <wa-dialog
-        .open=${this._open}
-        .lightDismiss=${!this.preventScrimClose}
-        without-header
-        aria-labelledby=${ifDefined(
-          this.ariaLabelledBy ||
-            (this.headerTitle !== undefined ? "ha-dialog-title" : undefined)
-        )}
-        aria-describedby=${ifDefined(this.ariaDescribedBy)}
-        @keydown=${this._handleKeyDown}
-        @wa-hide=${this._handleHide}
-        @wa-show=${this._handleShow}
-        @wa-after-show=${this._handleAfterShow}
-        @wa-after-hide=${this._handleAfterHide}
-      >
-        ${!this.withoutHeader
-          ? html` <slot name="header">
-              <ha-dialog-header
-                .subtitlePosition=${this.headerSubtitlePosition}
-                .showBorder=${this._bodyScrolled}
-              >
-                <slot name="headerNavigationIcon" slot="navigationIcon">
-                  <ha-icon-button
-                    data-dialog="close"
-                    .label=${this.hass?.localize("ui.common.close") ?? "Close"}
-                    .path=${mdiClose}
-                  ></ha-icon-button>
-                </slot>
-                ${this.headerTitle !== undefined
-                  ? html`<span slot="title" class="title" id="ha-dialog-title">
-                      ${this.headerTitle}
-                    </span>`
-                  : html`<slot name="headerTitle" slot="title"></slot>`}
-                ${this.headerSubtitle !== undefined
-                  ? html`<span slot="subtitle">${this.headerSubtitle}</span>`
-                  : html`<slot name="headerSubtitle" slot="subtitle"></slot>`}
-                <slot name="headerActionItems" slot="actionItems"></slot>
-              </ha-dialog-header>
-            </slot>`
-          : nothing}
-        <div class="content-wrapper">
-          <div class="body ha-scrollbar" @scroll=${this._handleBodyScroll}>
-            <slot></slot>
-          </div>
-          ${this.renderScrollableFades()}
-        </div>
-        <slot name="footer" slot="footer"></slot>
-      </wa-dialog>
-    `;
-  }
-
-  private _handleShow = async () => {
-    this._open = true;
-    fireEvent(this, "opened");
-
-    await this.updateComplete;
-
-    requestAnimationFrame(() => {
-      if (this.hass && isIosApp(this.hass)) {
-        const element = this.querySelector("[autofocus]");
-        if (element !== null) {
-          if (!element.id) {
-            element.id = "ha-dialog-autofocus";
-          }
-          this.hass?.auth.external?.fireMessage({
-            type: "focus_element",
-            payload: {
-              element_id: element.id,
-            },
-          });
-        }
-        return;
-      }
-      (this.querySelector("[autofocus]") as HTMLElement | null)?.focus();
+  protected firstUpdated(): void {
+    super.firstUpdated();
+    this.suppressDefaultPressSelector = [
+      this.suppressDefaultPressSelector,
+      SUPPRESS_DEFAULT_PRESS_SELECTOR,
+    ].join(", ");
+    this._updateScrolledAttribute();
+    this.contentElement?.addEventListener("scroll", this._onScroll, {
+      passive: true,
     });
-  };
+  }
 
-  private _handleAfterShow = () => {
-    fireEvent(this, "after-show");
-  };
-
-  private _handleAfterHide = (ev: DialogHideEvent) => {
-    if (ev.eventPhase === Event.AT_TARGET) {
-      this._open = false;
-      fireEvent(this, "closed");
-    }
-  };
-
-  public disconnectedCallback(): void {
+  disconnectedCallback(): void {
     super.disconnectedCallback();
-    this._open = false;
+    this.contentElement.removeEventListener("scroll", this._onScroll);
   }
 
-  @eventOptions({ passive: true })
-  private _handleBodyScroll(ev: Event) {
-    this._bodyScrolled = (ev.target as HTMLDivElement).scrollTop > 0;
+  private _onScroll = () => {
+    this._updateScrolledAttribute();
+  };
+
+  private _updateScrolledAttribute() {
+    if (!this.contentElement) return;
+    this.toggleAttribute("scrolled", this.contentElement.scrollTop !== 0);
   }
 
-  private _handleKeyDown(ev: KeyboardEvent) {
-    if (ev.key === "Escape") {
-      this._escapePressed = true;
-      ev.stopPropagation();
-      (ev.currentTarget as WaDialog).open = false;
-    }
-  }
+  static override styles = [
+    styles,
+    css`
+      :host([scrolled]) ::slotted(ha-dialog-header) {
+        border-bottom: 1px solid
+          var(--mdc-dialog-scroll-divider-color, rgba(0, 0, 0, 0.12));
+      }
+      .mdc-dialog {
+        --mdc-dialog-scroll-divider-color: var(
+          --dialog-scroll-divider-color,
+          var(--divider-color)
+        );
+        z-index: var(--dialog-z-index, 8);
+        --mdc-dialog-box-shadow: var(--dialog-box-shadow, none);
+        --mdc-typography-headline6-font-weight: var(--ha-font-weight-normal);
+        --mdc-typography-headline6-font-size: 1.574rem;
+      }
+      .mdc-dialog::before {
+        content: "";
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        top: 0;
+        left: 0;
+        pointer-events: none;
+        -webkit-backdrop-filter: var(
+          --ha-dialog-scrim-backdrop-filter,
+          var(--dialog-backdrop-filter, none)
+        );
+        backdrop-filter: var(
+          --ha-dialog-scrim-backdrop-filter,
+          var(--dialog-backdrop-filter, none)
+        );
+      }
+      .mdc-dialog .mdc-dialog__scrim {
+        background-color: var(--mdc-dialog-scrim-color, none);
+      }
+      .mdc-dialog__actions {
+        justify-content: var(--justify-action-buttons, flex-end);
+        padding: var(--ha-space-3) var(--ha-space-4) var(--ha-space-4)
+          var(--ha-space-4);
+      }
+      .mdc-dialog__actions span:nth-child(1) {
+        flex: var(--secondary-action-button-flex, unset);
+      }
+      .mdc-dialog__actions span:nth-child(2) {
+        flex: var(--primary-action-button-flex, unset);
+      }
+      .mdc-dialog__container {
+        align-items: var(--vertical-align-dialog, center);
+        padding: var(--dialog-container-padding, 0);
+      }
+      .mdc-dialog__title {
+        padding: var(--ha-space-4) var(--ha-space-4) 0 var(--ha-space-4);
+      }
+      .mdc-dialog__title:has(span) {
+        padding: var(--ha-space-3) var(--ha-space-3) 0;
+      }
+      .mdc-dialog__title::before {
+        content: unset;
+      }
+      .mdc-dialog .mdc-dialog__content {
+        position: var(--dialog-content-position, relative);
+        padding: var(--dialog-content-padding, var(--ha-space-6));
+      }
+      :host([hideactions]) .mdc-dialog .mdc-dialog__content {
+        padding-bottom: var(--dialog-content-padding, var(--ha-space-6));
+      }
+      .mdc-dialog .mdc-dialog__surface {
+        position: var(--dialog-surface-position, relative);
+        top: var(--dialog-surface-top);
+        margin-top: var(--dialog-surface-margin-top);
+        min-width: var(--mdc-dialog-min-width, auto);
+        min-height: var(--mdc-dialog-min-height, auto);
+        border-radius: var(
+          --ha-dialog-border-radius,
+          var(--ha-border-radius-3xl)
+        );
+        -webkit-backdrop-filter: var(--ha-dialog-surface-backdrop-filter, none);
+        backdrop-filter: var(--ha-dialog-surface-backdrop-filter, none);
+        background: var(
+          --ha-dialog-surface-background,
+          var(--mdc-theme-surface, #fff)
+        );
+        padding: var(--dialog-surface-padding, 0);
+      }
+      :host([flexContent]) .mdc-dialog .mdc-dialog__content {
+        display: flex;
+        flex-direction: column;
+      }
 
-  private _handleHide(ev: DialogHideEvent) {
-    const sourceIsDialog = ev.detail?.source === (ev.target as WaDialog).dialog;
-
-    if (this.preventScrimClose && this._escapePressed && sourceIsDialog) {
-      ev.preventDefault();
-    }
-
-    this._escapePressed = false;
-  }
-
-  static get styles() {
-    return [
-      ...super.styles,
-      haStyleScrollbar,
-      css`
-        wa-dialog {
-          --full-width: var(
-            --ha-dialog-width-full,
-            min(95vw, var(--safe-width))
-          );
-          --width: min(var(--ha-dialog-width-md, 580px), var(--full-width));
-          --spacing: var(--dialog-content-padding, var(--ha-space-6));
-          --show-duration: var(--ha-dialog-show-duration, 200ms);
-          --hide-duration: var(--ha-dialog-hide-duration, 200ms);
-          --ha-dialog-surface-background: var(
-            --card-background-color,
-            var(--ha-color-surface-default)
-          );
-          --wa-color-surface-raised: var(
-            --ha-dialog-surface-background,
-            var(--card-background-color, var(--ha-color-surface-default))
-          );
-          --wa-panel-border-radius: var(
-            --ha-dialog-border-radius,
-            var(--ha-border-radius-3xl)
-          );
-          max-width: var(--ha-dialog-max-width, var(--safe-width));
-        }
-        @media (prefers-reduced-motion: reduce) {
-          wa-dialog {
-            --show-duration: 0ms;
-            --hide-duration: 0ms;
-          }
-        }
-
-        :host([width="small"]) wa-dialog {
-          --width: min(var(--ha-dialog-width-sm, 320px), var(--full-width));
-        }
-
-        :host([width="large"]) wa-dialog {
-          --width: min(var(--ha-dialog-width-lg, 1024px), var(--full-width));
-        }
-
-        :host([width="full"]) wa-dialog {
-          --width: var(--full-width);
-        }
-
-        wa-dialog::part(dialog) {
-          color: var(--primary-text-color);
-          min-width: var(--width, var(--full-width));
-          max-width: var(--width, var(--full-width));
-          max-height: var(
-            --ha-dialog-max-height,
-            calc(var(--safe-height) - var(--ha-space-20))
-          );
-          min-height: var(--ha-dialog-min-height);
-          margin-top: var(--dialog-surface-margin-top, auto);
-          /* Used to offset the dialog from the safe areas when space is limited */
-          transform: translate(
-            calc(
-              var(--safe-area-offset-left, 0px) - var(
-                  --safe-area-offset-right,
-                  0px
-                )
-            ),
-            calc(
-              var(--safe-area-offset-top, 0px) - var(
-                  --safe-area-offset-bottom,
-                  0px
-                )
-            )
-          );
-          display: flex;
-          flex-direction: column;
-          overflow: hidden;
-        }
-
-        @media all and (max-width: 450px), all and (max-height: 500px) {
-          :host([type="standard"]) {
-            --ha-dialog-border-radius: 0;
-          }
-
-          :host([type="standard"]) wa-dialog {
-            /* Make the container fill the whole screen width and not the safe width */
-            --full-width: var(--ha-dialog-width-full, 100vw);
-            --width: var(--full-width);
-          }
-
-          :host([type="standard"]) wa-dialog::part(dialog) {
-            /* Make the dialog fill the whole screen height and not the safe height */
-            min-height: var(--ha-dialog-min-height, 100vh);
-            min-height: var(--ha-dialog-min-height, 100dvh);
-            max-height: var(--ha-dialog-max-height, 100vh);
-            max-height: var(--ha-dialog-max-height, 100dvh);
-            margin-top: 0;
-            margin-bottom: 0;
-            /* Use safe area as padding instead of the container size */
-            padding-top: var(--safe-area-inset-top);
-            padding-bottom: var(--safe-area-inset-bottom);
-            padding-left: var(--safe-area-inset-left);
-            padding-right: var(--safe-area-inset-right);
-            /* Reset the transform to center the dialog */
-            transform: none;
-          }
-        }
-
-        .header-title-container {
-          display: flex;
-          align-items: center;
-        }
-
-        .header-title {
-          margin: 0;
-          margin-bottom: 0;
-          color: var(--ha-dialog-header-title-color, var(--primary-text-color));
-          font-size: var(
-            --ha-dialog-header-title-font-size,
-            var(--ha-font-size-2xl)
-          );
-          line-height: var(
-            --ha-dialog-header-title-line-height,
-            var(--ha-line-height-condensed)
-          );
-          font-weight: var(
-            --ha-dialog-header-title-font-weight,
-            var(--ha-font-weight-normal)
-          );
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          margin-right: var(--ha-space-3);
-        }
-
-        wa-dialog::part(body) {
-          padding: 0;
-          display: flex;
-          flex-direction: column;
-          max-width: 100%;
-          overflow: hidden;
-        }
-
-        .content-wrapper {
-          position: relative;
-          flex: 1;
-          display: flex;
-          flex-direction: column;
-          min-height: 0;
-        }
-
-        .body {
-          position: var(--dialog-content-position, relative);
-          padding: var(
-            --dialog-content-padding,
-            0 var(--ha-space-6) var(--ha-space-6) var(--ha-space-6)
-          );
-          overflow: auto;
-          flex-grow: 1;
-        }
-        :host([flexcontent]) .body {
-          max-width: 100%;
-          flex: 1;
-          display: flex;
-          flex-direction: column;
-        }
-
-        wa-dialog::part(footer) {
-          padding: 0;
-        }
-
-        ::slotted([slot="footer"]) {
-          display: flex;
-          padding: var(--ha-space-3) var(--ha-space-4) var(--ha-space-4)
-            var(--ha-space-4);
-          gap: var(--ha-space-3);
-          justify-content: flex-end;
-          align-items: center;
-          width: 100%;
-        }
-      `,
-    ];
-  }
+      .header_title {
+        display: flex;
+        align-items: center;
+        direction: var(--direction);
+      }
+      .header_title span {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        display: block;
+        padding-left: var(--ha-space-1);
+        padding-right: var(--ha-space-1);
+        margin-right: var(--ha-space-3);
+        margin-inline-end: var(--ha-space-3);
+        margin-inline-start: initial;
+      }
+      .header_button {
+        text-decoration: none;
+        color: inherit;
+        inset-inline-start: initial;
+        inset-inline-end: calc(var(--ha-space-3) * -1);
+        direction: var(--direction);
+      }
+      .dialog-actions {
+        inset-inline-start: initial !important;
+        inset-inline-end: 0 !important;
+        direction: var(--direction);
+      }
+    `,
+  ];
 }
 
 declare global {
   interface HTMLElementTagNameMap {
     "ha-dialog": HaDialog;
   }
-
-  interface HASSDomEvents {
-    opened: undefined;
-    "after-show": undefined;
-    closed: undefined;
-  }
 }

src/components/ha-divider.ts

@@ -0,0 +1,50 @@
+import { css, html, LitElement, nothing } from "lit";
+import { ifDefined } from "lit/directives/if-defined";
+import { customElement, property } from "lit/decorators";
+
+@customElement("ha-divider")
+export class HaMdDivider extends LitElement {
+  @property() public label?: string;
+
+  public render() {
+    return html`
+      <div
+        role=${ifDefined(this.label ? "separator" : undefined)}
+        aria-label=${ifDefined(this.label)}
+      >
+        <span class="line"></span>
+        ${this.label
+          ? html`
+              <span class="label">${this.label}</span>
+              <span class="line"></span>
+            `
+          : nothing}
+      </div>
+    `;
+  }
+
+  static styles = css`
+    :host {
+      width: var(--ha-divider-width, 100%);
+    }
+    div {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    .label {
+      padding: var(--ha-divider-label-padding, 0 16px);
+    }
+    .line {
+      flex: 1;
+      background-color: var(--divider-color);
+      height: var(--ha-divider-line-height, 1px);
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-divider": HaMdDivider;
+  }
+}

src/components/ha-dropdown-item.ts

@@ -2,7 +2,7 @@ import DropdownItem from "@home-assistant/webawesome/dist/components/dropdown-it
 import "@home-assistant/webawesome/dist/components/icon/icon";
 import { mdiCheckboxBlankOutline, mdiCheckboxMarked } from "@mdi/js";
 import { css, type CSSResultGroup, html } from "lit";
-import { customElement, property } from "lit/decorators";
+import { customElement } from "lit/decorators";
 import "./ha-svg-icon";
 
 /**
@@ -17,8 +17,6 @@ import "./ha-svg-icon";
  */
 @customElement("ha-dropdown-item")
 export class HaDropdownItem extends DropdownItem {
-  @property({ type: Boolean, reflect: true }) selected = false;
-
   protected renderCheckboxIcon() {
     return html`
       <ha-svg-icon
@@ -49,16 +47,6 @@ export class HaDropdownItem extends DropdownItem {
         :host([variant="danger"]) #icon ::slotted(*) {
           color: var(--ha-color-on-danger-quiet);
         }
-
-        :host([selected]) {
-          font-weight: var(--ha-font-weight-medium);
-          color: var(--primary-color);
-          background-color: var(--ha-color-fill-primary-quiet-resting);
-          --icon-primary-color: var(--primary-color);
-        }
-        :host([selected]:hover) {
-          background-color: var(--ha-color-fill-primary-quiet-hover);
-        }
       `,
     ];
   }

src/components/ha-dropdown.ts

@@ -2,7 +2,6 @@ import Dropdown from "@home-assistant/webawesome/dist/components/dropdown/dropdo
 import { css, type CSSResultGroup } from "lit";
 import { customElement, property } from "lit/decorators";
 import type { HaDropdownItem } from "./ha-dropdown-item";
-import type { HaIconButton } from "./ha-icon-button";
 
 /**
  * Event type for the ha-dropdown component when an item is selected.
@@ -23,68 +22,11 @@ export type HaDropdownSelectEvent<T = string> = CustomEvent<{
  *
  */
 @customElement("ha-dropdown")
-// @ts-ignore Allow to set an alternative anchor element
 export class HaDropdown extends Dropdown {
   @property({ attribute: false }) dropdownTag = "ha-dropdown";
 
   @property({ attribute: false }) dropdownItemTag = "ha-dropdown-item";
 
-  public get anchorElement(): HTMLButtonElement | HaIconButton | undefined {
-    // @ts-ignore Allow to set an anchor element on popup
-    return this.popup?.anchor as HTMLButtonElement | HaIconButton | undefined;
-  }
-
-  public set anchorElement(
-    element: HTMLButtonElement | HaIconButton | undefined
-  ) {
-    // @ts-ignore Allow to get the current anchor element from popup
-    if (!this.popup) {
-      return;
-    }
-
-    // @ts-ignore
-    if (this.popup.anchor && this.popup.anchor.localName === "ha-icon-button") {
-      // @ts-ignore
-      (this.popup.anchor as HaIconButton).selected = false;
-    }
-
-    // @ts-ignore Allow to get the current anchor element from popup
-    this.popup.anchor = element;
-  }
-
-  /** Get the slotted trigger button, a <wa-button> or <button> element */
-  // @ts-ignore Override parent method to be able to use alternative anchor
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  private override getTrigger(): HTMLButtonElement | HaIconButton | null {
-    if (this.anchorElement) {
-      return this.anchorElement;
-    }
-    // @ts-ignore fallback to default trigger slot if no anchorElement is set
-    return super.getTrigger();
-  }
-
-  // @ts-ignore
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  private override async showMenu() {
-    // @ts-ignore
-    await super.showMenu();
-    const triggerElement = this.getTrigger();
-    if (triggerElement && triggerElement.localName === "ha-icon-button") {
-      (triggerElement as HaIconButton).selected = true;
-    }
-  }
-
-  // @ts-ignore
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  private override async hideMenu() {
-    const triggerElement = this.getTrigger();
-    if (triggerElement && triggerElement.localName === "ha-icon-button") {
-      (triggerElement as HaIconButton).selected = false;
-    }
-    // @ts-ignore
-    await super.hideMenu();
-  }
-
   static get styles(): CSSResultGroup {
     return [
       Dropdown.styles,

src/components/ha-duration-input.ts

@@ -6,7 +6,6 @@ import { fireEvent } from "../common/dom/fire_event";
 import "./ha-base-time-input";
 import type { TimeChangedEvent } from "./ha-base-time-input";
 import "./ha-button-toggle-group";
-import type { ValueChangedEvent } from "../types";
 
 export interface HaDurationData {
   days?: number;
@@ -37,9 +36,6 @@ class HaDurationInput extends LitElement {
   @property({ attribute: "allow-negative", type: Boolean })
   public allowNegative = false;
 
-  @property({ attribute: "enable-second", type: Boolean })
-  public enableSecond = true;
-
   @property({ type: Boolean }) public disabled = false;
 
   private _toggleNegative = false;
@@ -68,7 +64,7 @@ class HaDurationInput extends LitElement {
           .autoValidate=${this.required}
           .disabled=${this.disabled}
           errorMessage="Required"
-          .enableSecond=${this.enableSecond}
+          enable-second
           .enableMillisecond=${this.enableMillisecond}
           .enableDay=${this.enableDay}
           format="24"
@@ -156,18 +152,16 @@ class HaDurationInput extends LitElement {
         : NaN;
   }
 
-  private _durationChanged(
-    ev: ValueChangedEvent<TimeChangedEvent | undefined>
-  ) {
+  private _durationChanged(ev: CustomEvent<{ value?: TimeChangedEvent }>) {
     ev.stopPropagation();
     const value = ev.detail.value ? { ...ev.detail.value } : undefined;
 
     if (value) {
       value.hours ||= 0;
       value.minutes ||= 0;
+      value.seconds ||= 0;
 
       if ("days" in value) value.days ||= 0;
-      if ("seconds" in value) value.seconds ||= 0;
       if ("milliseconds" in value) value.milliseconds ||= 0;
 
       if (this.allowNegative) {
@@ -186,11 +180,8 @@ class HaDurationInput extends LitElement {
         value.milliseconds %= 1000;
       }
 
-      if (!this.enableSecond && !value.seconds) {
-        // @ts-ignore
-        delete value.seconds;
-      } else if (this.enableSecond && value.seconds > 59) {
-        value.minutes = (value.minutes ?? 0) + Math.floor(value.seconds / 60);
+      if (value.seconds > 59) {
+        value.minutes += Math.floor(value.seconds / 60);
         value.seconds %= 60;
       }
 

src/components/ha-fab.ts

@@ -39,7 +39,7 @@ export class HaFab extends FabBase {
       }
       :disabled {
         --mdc-theme-secondary: var(--disabled-text-color);
-        cursor: not-allowed !important;
+        pointer-events: none;
       }
     `,
     // safari workaround - must be explicit

src/components/ha-file-upload.ts

@@ -4,14 +4,14 @@ import type { PropertyValues, TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
-import { ensureArray } from "../common/array/ensure-array";
 import { fireEvent } from "../common/dom/fire_event";
-import { blankBeforePercent } from "../common/translations/blank_before_percent";
-import type { LocalizeFunc } from "../common/translations/localize";
 import type { HomeAssistant } from "../types";
-import { bytesToString } from "../util/bytes-to-string";
 import "./ha-button";
 import "./ha-icon-button";
+import { blankBeforePercent } from "../common/translations/blank_before_percent";
+import { ensureArray } from "../common/array/ensure-array";
+import { bytesToString } from "../util/bytes-to-string";
+import type { LocalizeFunc } from "../common/translations/localize";
 
 declare global {
   interface HASSDomEvents {
@@ -317,7 +317,7 @@ export class HaFileUpload extends LitElement {
     }
     ha-button {
       --mdc-button-outline-color: var(--primary-color);
-      --ha-icon-button-size: 24px;
+      --mdc-icon-button-size: 24px;
     }
     mwc-linear-progress {
       width: 100%;

src/components/ha-filter-categories.ts

@@ -26,12 +26,12 @@ import { showCategoryRegistryDetailDialog } from "../panels/config/category/show
 import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant } from "../types";
 import "./ha-dropdown";
-import type { HaDropdownSelectEvent } from "./ha-dropdown";
 import "./ha-dropdown-item";
 import "./ha-expansion-panel";
 import "./ha-icon";
 import "./ha-list";
 import "./ha-list-item";
+import type { HaDropdownSelectEvent } from "./ha-dropdown";
 
 @customElement("ha-filter-categories")
 export class HaFilterCategories extends SubscribeMixin(LitElement) {
@@ -315,12 +315,8 @@ export class HaFilterCategories extends SubscribeMixin(LitElement) {
         }
         ha-list {
           --mdc-list-item-meta-size: auto;
-          --mdc-list-side-padding-right: var(--ha-space-1);
-          --mdc-list-side-padding-left: var(--ha-space-4);
-          --ha-icon-button-size: 36px;
-        }
-        ha-list-item {
-          --mdc-list-item-graphic-margin: var(--ha-space-4);
+          --mdc-list-side-padding-right: 4px;
+          --mdc-icon-button-size: 36px;
         }
         ha-dropdown-item {
           font-size: var(--ha-font-size-m);

src/components/ha-filter-devices.ts

@@ -122,10 +122,7 @@ export class HaFilterDevices extends LitElement {
       setTimeout(() => {
         if (!this.expanded) return;
         this.renderRoot.querySelector("ha-list")!.style.height =
-          `${this.clientHeight - 49 - 4 - 32}px`;
-        // 49px - height of a header + 1px
-        // 4px - padding-top of the search-input
-        // 32px - height of the search input
+          `${this.clientHeight - 49 - 32}px`; // 32px is the height of the search input
       }, 300);
     }
   }

src/components/ha-filter-domains.ts

@@ -110,10 +110,7 @@ export class HaFilterDomains extends LitElement {
       setTimeout(() => {
         if (!this.expanded) return;
         this.renderRoot.querySelector("ha-list")!.style.height =
-          `${this.clientHeight - 49 - 4 - 32}px`;
-        // 49px - height of a header + 1px
-        // 4px - padding-top of the search-input
-        // 32px - height of the search input
+          `${this.clientHeight - 49 - 32}px`; // 32px is the height of the search input
       }, 300);
     }
   }
@@ -182,9 +179,6 @@ export class HaFilterDomains extends LitElement {
           margin-inline-start: initial;
           margin-inline-end: 8px;
         }
-        ha-check-list-item {
-          --mdc-list-item-graphic-margin: var(--ha-space-4);
-        }
         .badge {
           display: inline-block;
           margin-left: 8px;

src/components/ha-filter-entities.ts

@@ -101,10 +101,7 @@ export class HaFilterEntities extends LitElement {
       setTimeout(() => {
         if (!this.expanded) return;
         this.renderRoot.querySelector("ha-list")!.style.height =
-          `${this.clientHeight - 49 - 4 - 32}px`;
-        // 49px - height of a header + 1px
-        // 4px - padding-top of the search-input
-        // 32px - height of the search input
+          `${this.clientHeight - 49 - 32}px`; // 32px is the height of the search input
       }, 300);
     }
   }

src/components/ha-filter-integrations.ts

@@ -99,10 +99,7 @@ export class HaFilterIntegrations extends LitElement {
       setTimeout(() => {
         if (!this.expanded) return;
         this.renderRoot.querySelector("ha-list")!.style.height =
-          `${this.clientHeight - 49 - 4 - 32}px`;
-        // 49px - height of a header + 1px
-        // 4px - padding-top of the search-input
-        // 32px - height of the search input
+          `${this.clientHeight - 49 - 32}px`; // 32px is the height of the search input
       }, 300);
     }
   }
@@ -202,9 +199,6 @@ export class HaFilterIntegrations extends LitElement {
           margin-inline-start: auto;
           margin-inline-end: 8px;
         }
-        ha-check-list-item {
-          --mdc-list-item-graphic-margin: var(--ha-space-4);
-        }
         .badge {
           display: inline-block;
           margin-left: 8px;

src/components/ha-filter-labels.ts

@@ -145,11 +145,7 @@ export class HaFilterLabels extends SubscribeMixin(LitElement) {
       setTimeout(() => {
         if (!this.expanded) return;
         this.renderRoot.querySelector("ha-list")!.style.height =
-          `${this.clientHeight - (49 + 48 + 32 + 4)}px`;
-        // 49px - height of a header + 1px
-        // 4px - padding-top of the search-input
-        // 32px - height of the search input
-        // 48px - height of ha-list-item
+          `${this.clientHeight - (49 + 48 + 32)}px`;
       }, 300);
     }
   }

src/components/ha-filter-voice-assistants.ts

@@ -164,9 +164,6 @@ export class HaFilterVoiceAssistants extends LitElement {
           margin-inline-start: auto;
           margin-inline-end: 8px;
         }
-        ha-check-list-item {
-          --mdc-list-item-graphic-margin: var(--ha-space-4);
-        }
         .badge {
           display: inline-block;
           margin-left: 8px;

src/components/ha-floor-picker.ts

@@ -359,7 +359,7 @@ export class HaFloorPicker extends LitElement {
         {
           id: ADD_NEW_ID + searchString,
           primary: this.hass.localize(
-            "ui.components.floor-picker.add_new_suggestion",
+            "ui.components.floor-picker.add_new_sugestion",
             {
               name: searchString,
             }

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

@@ -76,11 +76,6 @@ export class HaFormFloat extends LitElement implements HaFormElement {
       return;
     }
 
-    // Allow user to start typing a negative zero
-    if (rawValue === "-0") {
-      return;
-    }
-
     if (rawValue !== "") {
       value = parseFloat(rawValue);
       if (isNaN(value)) {

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

@@ -1,16 +1,20 @@
+import { mdiEye, mdiEyeOff } from "@mdi/js";
 import type { PropertyValues, TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
-import type { LocalizeFunc } from "../../common/translations/localize";
 import "../ha-icon-button";
-import "../ha-input";
-import type { HaInput } from "../ha-input";
+import "../ha-textfield";
+import type { HaTextField } from "../ha-textfield";
 import type {
   HaFormElement,
   HaFormStringData,
   HaFormStringSchema,
 } from "./types";
+import type {
+  LocalizeFunc,
+  LocalizeKeys,
+} from "../../common/translations/localize";
 
 const MASKED_FIELDS = ["password", "secret", "token"];
 
@@ -33,7 +37,7 @@ export class HaFormString extends LitElement implements HaFormElement {
 
   @state() protected unmaskedPassword = false;
 
-  @query("ha-input") private _input?: HaInput;
+  @query("ha-textfield") private _input?: HaTextField;
 
   public focus(): void {
     if (this._input) {
@@ -43,29 +47,48 @@ export class HaFormString extends LitElement implements HaFormElement {
 
   protected render(): TemplateResult {
     return html`
-      <ha-input
-        .passwordToggle=${this.isPassword}
-        .passwordVisible=${this.unmaskedPassword}
-        .type=${!this.isPassword ? this.stringType : "password"}
+      <ha-textfield
+        .type=${!this.isPassword
+          ? this.stringType
+          : this.unmaskedPassword
+            ? "text"
+            : "password"}
         .label=${this.label}
         .value=${this.data || ""}
-        .hint=${this.helper}
+        .helper=${this.helper}
+        helperPersistent
         .disabled=${this.disabled}
-        .required=${!!this.schema.required}
-        .autoValidate=${!!this.schema.required}
+        .required=${this.schema.required}
+        .autoValidate=${this.schema.required}
         .name=${this.schema.name}
-        .autofocus=${!!this.schema.autofocus}
+        .autofocus=${this.schema.autofocus}
         .autocomplete=${this.schema.autocomplete}
+        .suffix=${this.isPassword
+          ? // reserve some space for the icon.
+            html`<div style="width: 24px"></div>`
+          : this.schema.description?.suffix}
         .validationMessage=${this.schema.required
           ? this.localize?.("ui.common.error_required")
           : undefined}
         @input=${this._valueChanged}
         @change=${this._valueChanged}
-      >
-        ${this.schema.description?.suffix
-          ? html`<span slot="end">${this.schema.description.suffix}</span>`
-          : nothing}
-      </ha-input>
+      ></ha-textfield>
+      ${this.renderIcon()}
+    `;
+  }
+
+  protected renderIcon() {
+    if (!this.isPassword) return nothing;
+    return html`
+      <ha-icon-button
+        .label=${this.localize?.(
+          `${this.localizeBaseKey}.${
+            this.unmaskedPassword ? "hide_password" : "show_password"
+          }` as LocalizeKeys
+        )}
+        @click=${this.toggleUnmaskedPassword}
+        .path=${this.unmaskedPassword ? mdiEyeOff : mdiEye}
+      ></ha-icon-button>
     `;
   }
 
@@ -75,8 +98,12 @@ export class HaFormString extends LitElement implements HaFormElement {
     }
   }
 
+  protected toggleUnmaskedPassword(): void {
+    this.unmaskedPassword = !this.unmaskedPassword;
+  }
+
   protected _valueChanged(ev: Event): void {
-    let value: string | undefined = (ev.target as HaInput).value;
+    let value: string | undefined = (ev.target as HaTextField).value;
     if (this.data === value) {
       return;
     }
@@ -88,10 +115,10 @@ export class HaFormString extends LitElement implements HaFormElement {
     });
   }
 
-  protected get stringType(): "email" | "url" | "text" {
+  protected get stringType(): string {
     if (this.schema.format) {
       if (["email", "url"].includes(this.schema.format)) {
-        return this.schema.format as "email" | "url";
+        return this.schema.format;
       }
       if (this.schema.format === "fqdnurl") {
         return "url";
@@ -112,6 +139,20 @@ export class HaFormString extends LitElement implements HaFormElement {
     :host([own-margin]) {
       margin-bottom: 5px;
     }
+    ha-textfield {
+      display: block;
+    }
+    ha-icon-button {
+      position: absolute;
+      top: 8px;
+      right: 8px;
+      inset-inline-start: initial;
+      inset-inline-end: 8px;
+      --mdc-icon-button-size: 40px;
+      --mdc-icon-size: 20px;
+      color: var(--secondary-text-color);
+      direction: var(--direction);
+    }
   `;
 }
 

src/components/ha-formfield.ts

@@ -53,7 +53,7 @@ export class HaFormfield extends FormfieldBase {
       :host(:not([alignEnd])) ::slotted(ha-switch) {
         margin-right: 10px;
         margin-inline-end: 10px;
-        margin-inline-start: initial;
+        margin-inline-start: inline;
       }
       .mdc-form-field {
         align-items: var(--ha-formfield-align-items, center);

src/components/ha-generic-picker.ts

@@ -194,6 +194,7 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
                   .image=${this.image}
                   .label=${label}
                   .placeholder=${this.placeholder}
+                  .helper=${this.helper}
                   .value=${this.value}
                   .valueRenderer=${this.valueRenderer}
                   .required=${this.required}
@@ -433,10 +434,6 @@ export class HaGenericPicker extends PickerMixin(LitElement) {
           --wa-space-l: 0;
         }
 
-        wa-popover::part(dialog)::backdrop {
-          background: none;
-        }
-
         wa-popover::part(body) {
           width: max(var(--body-width), 250px);
           max-width: var(

src/components/ha-grid-size-picker.ts

@@ -1,14 +1,14 @@
-import { mdiRestore } from "@mdi/js";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import "../panels/lovelace/editor/card-editor/ha-grid-layout-slider";
+import "./ha-icon-button";
+import { mdiRestore } from "@mdi/js";
 import { styleMap } from "lit/directives/style-map";
 import { fireEvent } from "../common/dom/fire_event";
 import { conditionalClamp } from "../common/number/clamp";
 import type { CardGridSize } from "../panels/lovelace/common/compute-card-grid-size";
 import { DEFAULT_GRID_SIZE } from "../panels/lovelace/common/compute-card-grid-size";
-import "../panels/lovelace/editor/card-editor/ha-grid-layout-slider";
 import type { HomeAssistant } from "../types";
-import "./ha-icon-button";
 
 @customElement("ha-grid-size-picker")
 export class HaGridSizeEditor extends LitElement {
@@ -245,7 +245,7 @@ export class HaGridSizeEditor extends LitElement {
       }
       .reset {
         grid-area: reset;
-        --ha-icon-button-size: 36px;
+        --mdc-icon-button-size: 36px;
       }
       .preview {
         position: relative;

src/components/ha-help-tooltip.ts

@@ -1,4 +1,4 @@
-import { mdiHelpCircleOutline } from "@mdi/js";
+import { mdiHelpCircle } from "@mdi/js";
 import type { TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
@@ -25,7 +25,7 @@ export class HaHelpTooltip extends LitElement {
 
   protected render(): TemplateResult {
     return html`
-      <ha-svg-icon id="svg-icon" .path=${mdiHelpCircleOutline}></ha-svg-icon>
+      <ha-svg-icon id="svg-icon" .path=${mdiHelpCircle}></ha-svg-icon>
       <ha-tooltip for="svg-icon" .placement=${this.position}>
         ${this.label}
       </ha-tooltip>

src/components/ha-icon-button-arrow-prev.ts

@@ -14,14 +14,6 @@ export class HaIconButtonArrowPrev extends LitElement {
 
   @property() public label?: string;
 
-  @property() href?: string;
-
-  @property() target?: "_blank" | "_parent" | "_self" | "_top";
-
-  @property() rel?: string;
-
-  @property() download?: string;
-
   @state() private _icon =
     mainWindow.document.dir === "rtl" ? mdiArrowRight : mdiArrowLeft;
 
@@ -31,10 +23,6 @@ export class HaIconButtonArrowPrev extends LitElement {
         .disabled=${this.disabled}
         .label=${this.label || this.hass?.localize("ui.common.back") || "Back"}
         .path=${this._icon}
-        .href=${this.href}
-        .target=${this.target}
-        .rel=${this.rel}
-        .download=${this.download}
       ></ha-icon-button>
     `;
   }

src/components/ha-icon-button-next.ts

@@ -14,14 +14,6 @@ export class HaIconButtonNext extends LitElement {
 
   @property() public label?: string;
 
-  @property() href?: string;
-
-  @property() target?: "_blank" | "_parent" | "_self" | "_top";
-
-  @property() rel?: string;
-
-  @property() download?: string;
-
   @state() private _icon =
     mainWindow.document.dir === "rtl" ? mdiChevronLeft : mdiChevronRight;
 
@@ -31,10 +23,6 @@ export class HaIconButtonNext extends LitElement {
         .disabled=${this.disabled}
         .label=${this.label || this.hass?.localize("ui.common.next") || "Next"}
         .path=${this._icon}
-        .href=${this.href}
-        .target=${this.target}
-        .rel=${this.rel}
-        .download=${this.download}
       ></ha-icon-button>
     `;
   }

src/components/ha-icon-button-prev.ts

@@ -14,14 +14,6 @@ export class HaIconButtonPrev extends LitElement {
 
   @property() public label?: string;
 
-  @property() href?: string;
-
-  @property() target?: "_blank" | "_parent" | "_self" | "_top";
-
-  @property() rel?: string;
-
-  @property() download?: string;
-
   @state() private _icon =
     mainWindow.document.dir === "rtl" ? mdiChevronRight : mdiChevronLeft;
 
@@ -31,10 +23,6 @@ export class HaIconButtonPrev extends LitElement {
         .disabled=${this.disabled}
         .label=${this.label || this.hass?.localize("ui.common.back") || "Back"}
         .path=${this._icon}
-        .href=${this.href}
-        .target=${this.target}
-        .rel=${this.rel}
-        .download=${this.download}
       ></ha-icon-button>
     `;
   }

src/components/ha-icon-button-toggle.ts

@@ -1,4 +1,3 @@
-import type { CSSResultGroup } from "lit";
 import { css } from "lit";
 import { customElement, property } from "lit/decorators";
 import { HaIconButton } from "./ha-icon-button";
@@ -7,48 +6,41 @@ import { HaIconButton } from "./ha-icon-button";
 export class HaIconButtonToggle extends HaIconButton {
   @property({ type: Boolean, reflect: true }) selected = false;
 
-  static styles: CSSResultGroup = [
-    HaIconButton.styles,
-    css`
-      :host {
-        position: relative;
-      }
-      ha-button::part(base) {
-        position: relative;
-        transition: color 180ms ease-in-out;
-      }
-      ha-button::part(base)::before {
-        opacity: 0;
-        transition: opacity 180ms ease-in-out;
-        background-color: var(--primary-text-color);
-        border-radius: var(--ha-border-radius-2xl);
-        height: 40px;
-        width: 40px;
-        content: "";
-        position: absolute;
-        top: -10px;
-        left: -10px;
-        bottom: -10px;
-        right: -10px;
-        margin: auto;
-        box-sizing: border-box;
-      }
-      :host([border-only]) ha-button::part(base)::before {
-        background-color: transparent;
-        border: 2px solid var(--primary-text-color);
-      }
-      :host([selected]) ha-button::part(base) {
-        color: var(--primary-background-color);
-        background-color: unset;
-      }
-      :host([selected]:not([disabled])) ha-button::part(base)::before {
-        opacity: 1;
-      }
-      ::slotted(*) {
-        display: block;
-      }
-    `,
-  ];
+  static styles = css`
+    :host {
+      position: relative;
+    }
+    mwc-icon-button {
+      position: relative;
+      transition: color 180ms ease-in-out;
+    }
+    mwc-icon-button::before {
+      opacity: 0;
+      transition: opacity 180ms ease-in-out;
+      background-color: var(--primary-text-color);
+      border-radius: var(--ha-border-radius-2xl);
+      height: 40px;
+      width: 40px;
+      content: "";
+      position: absolute;
+      top: -10px;
+      left: -10px;
+      bottom: -10px;
+      right: -10px;
+      margin: auto;
+      box-sizing: border-box;
+    }
+    :host([border-only]) mwc-icon-button::before {
+      background-color: transparent;
+      border: 2px solid var(--primary-text-color);
+    }
+    :host([selected]) mwc-icon-button {
+      color: var(--primary-background-color);
+    }
+    :host([selected]:not([disabled])) mwc-icon-button::before {
+      opacity: 1;
+    }
+  `;
 }
 
 declare global {

src/components/ha-icon-button-toolbar.ts

@@ -109,7 +109,7 @@ export class HaIconButtonToolbar extends LitElement {
 
     .icon-toolbar-button {
       color: var(--secondary-text-color);
-      --ha-icon-button-size: var(--icon-button-toolbar-button);
+      --mdc-icon-button-size: var(--icon-button-toolbar-button);
       --mdc-icon-size: var(--icon-button-toolbar-icon);
       /* Ensure button is clickable on iOS */
       cursor: pointer;

src/components/ha-icon-button.ts

@@ -1,8 +1,9 @@
-import type { CSSResultGroup, TemplateResult } from "lit";
+import "@material/mwc-icon-button";
+import type { IconButton } from "@material/mwc-icon-button";
+import type { TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
-import { customElement, property } from "lit/decorators";
+import { customElement, property, query } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
-import "./ha-button";
 import "./ha-svg-icon";
 
 @customElement("ha-icon-button")
@@ -18,19 +19,15 @@ export class HaIconButton extends LitElement {
   // These should always be set as properties, not attributes,
   // so that only the <button> element gets the attribute
   @property({ type: String, attribute: "aria-haspopup" })
-  ariaHasPopup!: "false" | "true" | "menu" | "listbox" | "tree" | "grid";
+  override ariaHasPopup!: IconButton["ariaHasPopup"];
 
   @property({ attribute: "hide-title", type: Boolean }) hideTitle = false;
 
-  @property({ type: Boolean, reflect: true }) selected = false;
+  @query("mwc-icon-button", true) private _button?: IconButton;
 
-  @property() href?: string;
-
-  @property() target?: "_blank" | "_parent" | "_self" | "_top";
-
-  @property() rel?: string;
-
-  @property() download?: string;
+  public override focus() {
+    this._button?.focus();
+  }
 
   static shadowRootOptions: ShadowRootInit = {
     mode: "open",
@@ -39,68 +36,30 @@ export class HaIconButton extends LitElement {
 
   protected render(): TemplateResult {
     return html`
-      <ha-button
-        appearance="plain"
-        variant="neutral"
+      <mwc-icon-button
         aria-label=${ifDefined(this.label)}
         title=${ifDefined(this.hideTitle ? undefined : this.label)}
         aria-haspopup=${ifDefined(this.ariaHasPopup)}
         .disabled=${this.disabled}
-        .iconTag=${this.path ? "ha-svg-icon" : "span"}
-        .href=${this.href}
-        .target=${this.target}
-        .rel=${this.rel}
-        .download=${this.download}
       >
         ${this.path
           ? html`<ha-svg-icon .path=${this.path}></ha-svg-icon>`
-          : html`<span><slot></slot></span>`}
-      </ha-button>
+          : html`<slot></slot>`}
+      </mwc-icon-button>
     `;
   }
 
-  static styles: CSSResultGroup = css`
+  static styles = css`
     :host {
       display: inline-block;
       outline: none;
-      --ha-button-height: var(--ha-icon-button-size, 48px);
     }
-    ha-button {
-      position: relative;
-      isolation: isolate;
-      --wa-form-control-padding-inline: var(
-        --ha-icon-button-padding-inline,
-        --ha-space-2
-      );
-      --wa-color-on-normal: currentColor;
-      --wa-color-fill-quiet: transparent;
-    }
-    ha-button::after {
-      content: "";
-      position: absolute;
-      inset: 0;
-      z-index: -1;
-      border-radius: 50%;
-      background-color: currentColor;
-      opacity: 0;
+    :host([disabled]) {
       pointer-events: none;
     }
-    ha-button::part(base) {
-      width: var(--wa-form-control-height);
-      aspect-ratio: 1;
-      outline-offset: -4px;
-    }
-    ha-button::part(label) {
-      display: flex;
-    }
-    :host([selected]) ha-button::after {
-      opacity: 0.1;
-    }
-
-    @media (hover: hover) {
-      :host(:hover:not([disabled])) ha-button::after {
-        opacity: 0.1;
-      }
+    mwc-icon-button {
+      --mdc-theme-on-primary: currentColor;
+      --mdc-theme-text-disabled-on-light: var(--disabled-text-color);
     }
   `;
 }

src/components/ha-icon-overflow-menu.ts

@@ -9,6 +9,7 @@ import type { HomeAssistant } from "../types";
 import "./ha-dropdown";
 import "./ha-dropdown-item";
 import "./ha-icon-button";
+import "./ha-md-divider";
 import "./ha-svg-icon";
 import "./ha-tooltip";
 

src/components/ha-input.ts

@@ -1,473 +0,0 @@
-import { preventDefault } from "@fullcalendar/core/internal";
-import "@home-assistant/webawesome/dist/components/animation/animation";
-import "@home-assistant/webawesome/dist/components/input/input";
-import type WaInput from "@home-assistant/webawesome/dist/components/input/input";
-import { mdiClose, mdiEye, mdiEyeOff, mdiInformationOutline } from "@mdi/js";
-import { LitElement, type PropertyValues, css, html, nothing } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
-import "./ha-icon-button";
-import "./ha-svg-icon";
-import "./ha-tooltip";
-
-@customElement("ha-input")
-export class HaInput extends LitElement {
-  /** The type of input. */
-  @property()
-  public type:
-    | "date"
-    | "datetime-local"
-    | "email"
-    | "number"
-    | "password"
-    | "search"
-    | "tel"
-    | "text"
-    | "time"
-    | "url" = "text";
-
-  /** The current value of the input. */
-  @property()
-  public value?: string;
-
-  /** The input's size. */
-  @property()
-  public size: "small" | "medium" | "large" = "medium";
-
-  /** The input's visual appearance. */
-  @property()
-  public appearance: "filled" | "outlined" | "filled-outlined" = "outlined";
-
-  /** Draws a pill-style input with rounded edges. */
-  @property({ type: Boolean })
-  public pill = false;
-
-  /** The input's label. */
-  @property()
-  public label = "";
-
-  /** The input's hint. */
-  @property()
-  public hint? = "";
-
-  /** Adds a clear button when the input is not empty. */
-  @property({ type: Boolean, attribute: "with-clear" })
-  public withClear = false;
-
-  /** Placeholder text to show as a hint when the input is empty. */
-  @property()
-  public placeholder = "";
-
-  /** Makes the input readonly. */
-  @property({ type: Boolean })
-  public readonly = false;
-
-  /** Adds a button to toggle the password's visibility. */
-  @property({ type: Boolean, attribute: "password-toggle" })
-  public passwordToggle = false;
-
-  /** Determines whether or not the password is currently visible. */
-  @property({ type: Boolean, attribute: "password-visible" })
-  public passwordVisible = false;
-
-  /** Hides the browser's built-in increment/decrement spin buttons for number inputs. */
-  @property({ type: Boolean, attribute: "without-spin-buttons" })
-  public withoutSpinButtons = false;
-
-  /** Makes the input a required field. */
-  @property({ type: Boolean })
-  public required = false;
-
-  /** A regular expression pattern to validate input against. */
-  @property()
-  public pattern?: string;
-
-  /** The minimum length of input that will be considered valid. */
-  @property({ type: Number })
-  public minlength?: number;
-
-  /** The maximum length of input that will be considered valid. */
-  @property({ type: Number })
-  public maxlength?: number;
-
-  /** The input's minimum value. Only applies to date and number input types. */
-  @property()
-  public min?: number | string;
-
-  /** The input's maximum value. Only applies to date and number input types. */
-  @property()
-  public max?: number | string;
-
-  /** Specifies the granularity that the value must adhere to. */
-  @property()
-  public step?: number | "any";
-
-  /** Controls whether and how text input is automatically capitalized. */
-  @property()
-  // eslint-disable-next-line lit/no-native-attributes
-  public autocapitalize:
-    | "off"
-    | "none"
-    | "on"
-    | "sentences"
-    | "words"
-    | "characters"
-    | "" = "";
-
-  /** Indicates whether the browser's autocorrect feature is on or off. */
-  @property({ type: Boolean })
-  public autocorrect = false;
-
-  /** Specifies what permission the browser has to provide assistance in filling out form field values. */
-  @property()
-  public autocomplete?: string;
-
-  /** Indicates that the input should receive focus on page load. */
-  @property({ type: Boolean })
-  // eslint-disable-next-line lit/no-native-attributes
-  public autofocus = false;
-
-  /** Used to customize the label or icon of the Enter key on virtual keyboards. */
-  @property()
-  // eslint-disable-next-line lit/no-native-attributes
-  public enterkeyhint:
-    | "enter"
-    | "done"
-    | "go"
-    | "next"
-    | "previous"
-    | "search"
-    | "send"
-    | "" = "";
-
-  /** Enables spell checking on the input. */
-  @property({ type: Boolean })
-  // eslint-disable-next-line lit/no-native-attributes
-  public spellcheck = true;
-
-  /** Tells the browser what type of data will be entered by the user. */
-  @property()
-  // eslint-disable-next-line lit/no-native-attributes
-  public inputmode:
-    | "none"
-    | "text"
-    | "decimal"
-    | "numeric"
-    | "tel"
-    | "search"
-    | "email"
-    | "url"
-    | "" = "";
-
-  /** The name of the input, submitted as a name/value pair with form data. */
-  @property()
-  public name?: string;
-
-  /** Disables the form control. */
-  @property({ type: Boolean })
-  public disabled = false;
-
-  /** Custom validation message to show when the input is invalid. */
-  @property({ attribute: "validation-message" })
-  public validationMessage? = "";
-
-  /** When true, validates the input on blur instead of on form submit. */
-  @property({ type: Boolean, attribute: "auto-validate" })
-  public autoValidate = false;
-
-  @property({ type: Boolean })
-  public invalid = false;
-
-  @state()
-  private _invalid = false;
-
-  @query("wa-input")
-  private _input?: WaInput;
-
-  static shadowRootOptions: ShadowRootInit = {
-    mode: "open",
-    delegatesFocus: true,
-  };
-
-  /** Selects all the text in the input. */
-  public select(): void {
-    this._input?.select();
-  }
-
-  /** Sets the start and end positions of the text selection (0-based). */
-  public setSelectionRange(
-    selectionStart: number,
-    selectionEnd: number,
-    selectionDirection?: "forward" | "backward" | "none"
-  ): void {
-    this._input?.setSelectionRange(
-      selectionStart,
-      selectionEnd,
-      selectionDirection
-    );
-  }
-
-  /** Replaces a range of text with a new string. */
-  public setRangeText(
-    replacement: string,
-    start?: number,
-    end?: number,
-    selectMode?: "select" | "start" | "end" | "preserve"
-  ): void {
-    this._input?.setRangeText(replacement, start, end, selectMode);
-  }
-
-  /** Displays the browser picker for an input element. */
-  public showPicker(): void {
-    this._input?.showPicker();
-  }
-
-  /** Increments the value of a numeric input type by the value of the step attribute. */
-  public stepUp(): void {
-    this._input?.stepUp();
-  }
-
-  /** Decrements the value of a numeric input type by the value of the step attribute. */
-  public stepDown(): void {
-    this._input?.stepDown();
-  }
-
-  public checkValidity(): boolean {
-    return this._input?.checkValidity() ?? true;
-  }
-
-  public reportValidity(): boolean {
-    const valid = this.checkValidity();
-
-    this._invalid = !valid;
-    return valid;
-  }
-
-  protected override updated(changedProperties: PropertyValues): void {
-    super.updated(changedProperties);
-
-    const nativeInput = this._input?.input;
-    if (!nativeInput) return;
-
-    // wa-input hardcodes aria-describedby="hint" pointing to its internal hint slot wrapper.
-    // We remove it and use aria-description instead to properly convey our hint or error text.
-    // TODO: fix upstream in wa-input
-    nativeInput.removeAttribute("aria-describedby");
-
-    // wa-input doesn't set aria-invalid on its internal <input>, so we do it manually
-    // TODO: fix upstream in wa-input
-    if (changedProperties.has("invalid") || changedProperties.has("_invalid")) {
-      const isInvalid = this.invalid || this._invalid;
-      nativeInput.setAttribute("aria-invalid", String(isInvalid));
-    }
-
-    // Expose hint or validation error to screen readers on the input itself
-    const description =
-      this.invalid || this._invalid
-        ? this.validationMessage || this._input?.validationMessage
-        : this.hint;
-
-    if (description) {
-      nativeInput.setAttribute("aria-description", description);
-    } else {
-      nativeInput.removeAttribute("aria-description");
-    }
-  }
-
-  protected render() {
-    return html`
-      <wa-input
-        .type=${this.type}
-        .value=${this.value ?? null}
-        .size=${this.size}
-        .appearance=${this.appearance}
-        .withClear=${this.withClear}
-        .placeholder=${this.placeholder}
-        .readonly=${this.readonly}
-        .passwordToggle=${this.passwordToggle}
-        .passwordVisible=${this.passwordVisible}
-        .withoutSpinButtons=${this.withoutSpinButtons}
-        .required=${this.required}
-        .pattern=${this.pattern}
-        .minlength=${this.minlength}
-        .maxlength=${this.maxlength}
-        .min=${this.min}
-        .max=${this.max}
-        .step=${this.step}
-        .autocapitalize=${this.autocapitalize || undefined}
-        .autocorrect=${this.autocorrect ? "on" : "off"}
-        .autocomplete=${this.autocomplete}
-        .autofocus=${this.autofocus}
-        .enterkeyhint=${this.enterkeyhint || undefined}
-        .spellcheck=${this.spellcheck}
-        .inputmode=${this.inputmode || undefined}
-        .name=${this.name}
-        .disabled=${this.disabled}
-        class=${this.invalid || this._invalid ? "invalid" : ""}
-        @input=${this._handleInput}
-        @change=${this._handleChange}
-        @blur=${this._handleBlur}
-        @wa-invalid=${this._handleInvalid}
-      >
-        <div class="label" slot="label">
-          <span>
-            <slot name="label">${this.label}</slot>
-          </span>
-          ${this.hint
-            ? html`<ha-icon-button
-                  @click=${preventDefault}
-                  .path=${mdiInformationOutline}
-                  .label=${"Hint"}
-                  hide-title
-                  id="hint"
-                ></ha-icon-button>
-                <ha-tooltip for="hint">${this.hint}</ha-tooltip> `
-            : nothing}
-        </div>
-        <slot name="start" slot="start"></slot>
-        <slot name="end" slot="end"></slot>
-        <slot name="clear-icon" slot="clear-icon">
-          <ha-svg-icon .path=${mdiClose}></ha-svg-icon>
-        </slot>
-        <slot name="show-password-icon" slot="show-password-icon">
-          <ha-svg-icon .path=${mdiEye}></ha-svg-icon>
-        </slot>
-        <slot name="hide-password-icon" slot="hide-password-icon">
-          <ha-svg-icon .path=${mdiEyeOff}></ha-svg-icon>
-        </slot>
-        <div
-          slot="hint"
-          class="error ${this.invalid || this._invalid ? "visible" : ""}"
-          role="alert"
-          aria-live="assertive"
-        >
-          <span
-            >${this.validationMessage || this._input?.validationMessage}</span
-          >
-        </div>
-      </wa-input>
-    `;
-  }
-
-  private _handleInput() {
-    this.value = this._input?.value ?? undefined;
-    if (this._invalid && this._input?.checkValidity()) {
-      this._invalid = false;
-    }
-  }
-
-  private _handleChange() {
-    this.value = this._input?.value ?? undefined;
-  }
-
-  private _handleBlur() {
-    if (this.autoValidate) {
-      this._invalid = !this._input?.checkValidity();
-    }
-  }
-
-  private _handleInvalid() {
-    this._invalid = true;
-  }
-
-  static styles = css`
-    :host {
-      display: flex;
-      align-items: flex-start;
-      padding-top: var(--ha-input-padding-top, var(--ha-space-2));
-      padding-bottom: var(--ha-input-padding-bottom, var(--ha-space-2));
-      text-align: var(--ha-input-text-align, start);
-    }
-    wa-input {
-      flex: 1;
-      min-width: 0;
-    }
-
-    wa-input::part(base):focus-within {
-      outline: none;
-      --wa-form-control-border-color: var(--ha-color-border-primary-normal);
-    }
-
-    wa-input.invalid,
-    wa-input.invalid::part(base):focus-within {
-      --wa-form-control-border-color: var(--ha-color-border-danger-normal);
-    }
-
-    wa-input::part(label) {
-      margin-block-end: 2px;
-    }
-
-    .label {
-      height: 24px;
-      display: flex;
-      width: 100%;
-      align-items: center;
-      color: var(--ha-color-text-secondary);
-      font-size: var(--ha-font-size-s);
-      font-weight: var(--ha-font-weight-medium);
-      gap: var(--ha-space-1);
-    }
-
-    .label span {
-      line-height: 1;
-      flex: 1;
-      min-width: 0;
-      overflow-x: clip;
-      overflow-y: visible;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-
-    .label ha-svg-icon {
-      color: var(--ha-color-on-disabled-normal);
-      --mdc-icon-size: 16px;
-    }
-
-    #hint {
-      --ha-icon-button-size: 16px;
-      --mdc-icon-size: 16px;
-      color: var(--ha-color-on-disabled-normal);
-    }
-
-    wa-input::part(hint) {
-      margin-block-start: 0;
-      color: var(--ha-color-on-danger-quiet);
-      font-size: var(--ha-font-size-s);
-      margin-inline-start: var(--ha-space-3);
-    }
-
-    .error {
-      padding-top: var(--ha-space-1);
-      transition:
-        opacity 0.3s ease-out,
-        height 0.3s ease-out;
-      height: 0;
-      overflow: hidden;
-    }
-
-    .error span {
-      transition: transform 0.3s ease-out;
-      display: inline-block;
-      transform: translateY(
-        calc(-1 * (var(--ha-font-size-s) + var(--ha-space-1)))
-      );
-    }
-
-    .error.visible {
-      height: calc(var(--ha-font-size-s) + var(--ha-space-2));
-    }
-
-    .error.visible span {
-      transform: translateY(0);
-    }
-
-    wa-input::part(end) {
-      color: var(--ha-color-text-secondary);
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-input": HaInput;
-  }
-}

src/components/ha-label-picker.ts

@@ -182,7 +182,7 @@ export class HaLabelPicker extends SubscribeMixin(LitElement) {
         {
           id: ADD_NEW_ID + searchString,
           primary: this.hass.localize(
-            "ui.components.label-picker.add_new_suggestion",
+            "ui.components.label-picker.add_new_sugestion",
             {
               name: searchString,
             }

src/components/ha-language-picker.ts

@@ -191,6 +191,7 @@ export class HaLanguagePicker extends LitElement {
   static styles = css`
     ha-generic-picker {
       width: 100%;
+      min-width: 200px;
       display: block;
     }
   `;

src/components/ha-markdown.ts

@@ -84,11 +84,13 @@ export class HaMarkdown extends LitElement {
     ha-markdown-element > :is(ol, ul) {
       padding-inline-start: var(--markdown-list-indent, revert);
     }
-    li:has(input[type="checkbox"]) {
-      list-style: none;
-    }
-    li:has(input[type="checkbox"]) > input[type="checkbox"] {
-      margin-left: 0;
+    li {
+      &:has(input[type="checkbox"]) {
+        list-style: none;
+        & > input[type="checkbox"] {
+          margin-left: 0;
+        }
+      }
     }
     svg {
       background-color: var(--markdown-svg-background-color, none);
@@ -135,10 +137,10 @@ export class HaMarkdown extends LitElement {
       --markdown-table-border-width: 0;
       --markdown-table-padding-inline: 0;
       --markdown-table-padding-block: 0;
-    }
-    table[role="presentation"] th,
-    table[role="presentation"] td {
-      vertical-align: middle;
+      th,
+      td {
+        vertical-align: middle;
+      }
     }
     table[role="presentation"] td[valign="top"],
     table[role="presentation"] th[valign="top"] {

src/components/ha-md-divider.ts

@@ -0,0 +1,22 @@
+import { Divider } from "@material/web/divider/internal/divider";
+import { styles } from "@material/web/divider/internal/divider-styles";
+import { css } from "lit";
+import { customElement } from "lit/decorators";
+
+@customElement("ha-md-divider")
+export class HaMdDivider extends Divider {
+  static override styles = [
+    styles,
+    css`
+      :host {
+        --md-divider-color: var(--divider-color);
+      }
+    `,
+  ];
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-md-divider": HaMdDivider;
+  }
+}

src/components/ha-md-menu-item.ts

@@ -0,0 +1,52 @@
+import { MenuItemEl } from "@material/web/menu/internal/menuitem/menu-item";
+import { styles } from "@material/web/menu/internal/menuitem/menu-item-styles";
+import { css } from "lit";
+import { customElement, property } from "lit/decorators";
+
+@customElement("ha-md-menu-item")
+export class HaMdMenuItem extends MenuItemEl {
+  @property({ attribute: false }) clickAction?: (item?: HTMLElement) => void;
+
+  static override styles = [
+    styles,
+    css`
+      :host {
+        --ha-icon-display: block;
+        --md-sys-color-primary: var(--primary-text-color);
+        --md-sys-color-on-primary: var(--primary-text-color);
+        --md-sys-color-secondary: var(--secondary-text-color);
+        --md-sys-color-surface: var(--card-background-color);
+        --md-sys-color-on-surface: var(--primary-text-color);
+        --md-sys-color-on-surface-variant: var(--secondary-text-color);
+        --md-sys-color-secondary-container: rgba(
+          var(--rgb-primary-color),
+          0.15
+        );
+        --md-sys-color-on-secondary-container: var(--text-primary-color);
+        --mdc-icon-size: 16px;
+
+        --md-sys-color-on-primary-container: var(--primary-text-color);
+        --md-sys-color-on-secondary-container: var(--primary-text-color);
+        --md-menu-item-label-text-font: Roboto, sans-serif;
+      }
+      :host(.warning) {
+        --md-menu-item-label-text-color: var(--error-color);
+        --md-menu-item-leading-icon-color: var(--error-color);
+      }
+      ::slotted([slot="headline"]) {
+        text-wrap: nowrap;
+      }
+      :host([disabled]) {
+        opacity: 1;
+        --md-menu-item-label-text-color: var(--disabled-text-color);
+        --md-menu-item-leading-icon-color: var(--disabled-text-color);
+      }
+    `,
+  ];
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-md-menu-item": HaMdMenuItem;
+  }
+}

src/components/ha-md-menu.ts

@@ -0,0 +1,47 @@
+import { Menu } from "@material/web/menu/internal/menu";
+import { styles } from "@material/web/menu/internal/menu-styles";
+import type { CloseMenuEvent } from "@material/web/menu/menu";
+import {
+  CloseReason,
+  KeydownCloseKey,
+} from "@material/web/menu/internal/controllers/shared";
+import { css } from "lit";
+import { customElement } from "lit/decorators";
+import type { HaMdMenuItem } from "./ha-md-menu-item";
+
+@customElement("ha-md-menu")
+export class HaMdMenu extends Menu {
+  connectedCallback(): void {
+    super.connectedCallback();
+    this.addEventListener("close-menu", this._handleCloseMenu);
+  }
+
+  private _handleCloseMenu(ev: CloseMenuEvent) {
+    if (
+      ev.detail.reason.kind === CloseReason.KEYDOWN &&
+      ev.detail.reason.key === KeydownCloseKey.ESCAPE
+    ) {
+      return;
+    }
+    (ev.detail.initiator as HaMdMenuItem).clickAction?.(ev.detail.initiator);
+  }
+
+  static override styles = [
+    styles,
+    css`
+      :host {
+        --md-sys-color-surface-container: var(--card-background-color);
+      }
+    `,
+  ];
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-md-menu": HaMdMenu;
+  }
+
+  interface HTMLElementEventMap {
+    "close-menu": CloseMenuEvent;
+  }
+}

src/components/ha-md-select-option.ts

@@ -0,0 +1,27 @@
+import { SelectOptionEl } from "@material/web/select/internal/selectoption/select-option";
+import { styles } from "@material/web/menu/internal/menuitem/menu-item-styles";
+import { css } from "lit";
+import { customElement } from "lit/decorators";
+
+@customElement("ha-md-select-option")
+export class HaMdSelectOption extends SelectOptionEl {
+  static override styles = [
+    styles,
+    css`
+      :host {
+        --ha-icon-display: block;
+        --md-sys-color-primary: var(--primary-text-color);
+        --md-sys-color-secondary: var(--secondary-text-color);
+        --md-sys-color-surface: var(--card-background-color);
+        --md-sys-color-on-surface: var(--primary-text-color);
+        --md-sys-color-on-surface-variant: var(--secondary-text-color);
+      }
+    `,
+  ];
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-md-select-option": HaMdSelectOption;
+  }
+}

src/components/ha-md-select.ts

@@ -0,0 +1,36 @@
+import { FilledSelect } from "@material/web/select/internal/filled-select";
+import { styles as sharedStyles } from "@material/web/select/internal/shared-styles";
+import { styles } from "@material/web/select/internal/filled-select-styles";
+import { css } from "lit";
+import { customElement } from "lit/decorators";
+
+@customElement("ha-md-select")
+export class HaMdSelect extends FilledSelect {
+  static override styles = [
+    sharedStyles,
+    styles,
+    css`
+      :host {
+        --ha-icon-display: block;
+        --md-sys-color-primary: var(--primary-text-color);
+        --md-sys-color-secondary: var(--secondary-text-color);
+        --md-sys-color-surface: var(--card-background-color);
+        --md-sys-color-on-surface-variant: var(--secondary-text-color);
+
+        --md-sys-color-surface-container-highest: var(--input-fill-color);
+        --md-sys-color-on-surface: var(--input-ink-color);
+
+        --md-sys-color-surface-container: var(--input-fill-color);
+        --md-sys-color-on-secondary-container: var(--primary-text-color);
+        --md-sys-color-secondary-container: var(--input-fill-color);
+        --md-menu-container-color: var(--card-background-color);
+      }
+    `,
+  ];
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-md-select": HaMdSelect;
+  }
+}

src/components/ha-md-textfield.ts

@@ -0,0 +1,34 @@
+import { styles } from "@material/web/textfield/internal/filled-styles";
+import { FilledTextField } from "@material/web/textfield/internal/filled-text-field";
+import { styles as sharedStyles } from "@material/web/textfield/internal/shared-styles";
+import { css } from "lit";
+import { customElement } from "lit/decorators";
+
+@customElement("ha-md-textfield")
+export class HaMdTextfield extends FilledTextField {
+  static override styles = [
+    sharedStyles,
+    styles,
+    css`
+      :host {
+        --ha-icon-display: block;
+        --md-sys-color-primary: var(--primary-text-color);
+        --md-sys-color-secondary: var(--secondary-text-color);
+        --md-sys-color-surface: var(--card-background-color);
+        --md-sys-color-on-surface-variant: var(--secondary-text-color);
+
+        --md-sys-color-surface-container-highest: var(--input-fill-color);
+        --md-sys-color-on-surface: var(--input-ink-color);
+
+        --md-sys-color-surface-container: var(--input-fill-color);
+        --md-sys-color-secondary-container: var(--input-fill-color);
+      }
+    `,
+  ];
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-md-textfield": HaMdTextfield;
+  }
+}

src/components/ha-navigation-picker.ts

@@ -1,5 +1,5 @@
 import Fuse from "fuse.js";
-import { mdiDevices, mdiPlus, mdiTextureBox } from "@mdi/js";
+import { mdiDevices, mdiTextureBox } from "@mdi/js";
 import { html, LitElement, nothing, type PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -237,22 +237,6 @@ export class HaNavigationPicker extends LitElement {
     addGroup("views", views);
     addGroup("other_routes", otherRoutes);
 
-    if (
-      searchString &&
-      !this._navigationItems.some((navItem) => navItem.id === searchString)
-    ) {
-      items.push({
-        id: searchString,
-        primary: this.hass.localize(
-          "ui.components.navigation-picker.add_custom_path"
-        ),
-        secondary: `"${searchString}"`,
-        icon_path: mdiPlus,
-        sorting_label: searchString,
-        group: "other_routes",
-      });
-    }
-
     return items;
   };
 

src/components/ha-password-field.ts

@@ -0,0 +1,211 @@
+import type { TextAreaCharCounter } from "@material/mwc-textfield/mwc-textfield-base";
+import { mdiEye, mdiEyeOff } from "@mdi/js";
+import { LitElement, css, html } from "lit";
+import {
+  customElement,
+  eventOptions,
+  property,
+  query,
+  state,
+} from "lit/decorators";
+import type { HomeAssistant } from "../types";
+import "./ha-icon-button";
+import "./ha-textfield";
+import type { HaTextField } from "./ha-textfield";
+
+@customElement("ha-password-field")
+export class HaPasswordField extends LitElement {
+  @property({ attribute: false }) public hass?: HomeAssistant;
+
+  @property({ type: Boolean }) public invalid?: boolean;
+
+  @property({ attribute: "error-message" }) public errorMessage?: string;
+
+  @property({ type: Boolean }) public icon = false;
+
+  // eslint-disable-next-line lit/attribute-names
+  @property({ type: Boolean }) public iconTrailing = false;
+
+  @property() public autocomplete?: string;
+
+  @property({ type: Boolean }) public autocorrect = true;
+
+  @property({ attribute: "input-spellcheck" })
+  public inputSpellcheck?: string;
+
+  @property({ type: String }) value = "";
+
+  @property({ type: String }) placeholder = "";
+
+  @property({ type: String }) label = "";
+
+  @property({ type: Boolean, reflect: true }) disabled = false;
+
+  @property({ type: Boolean }) required = false;
+
+  // eslint-disable-next-line lit/attribute-names
+  @property({ type: Number }) minLength = -1;
+
+  // eslint-disable-next-line lit/attribute-names
+  @property({ type: Number }) maxLength = -1;
+
+  @property({ type: Boolean, reflect: true }) outlined = false;
+
+  @property({ type: String }) helper = "";
+
+  // eslint-disable-next-line lit/attribute-names
+  @property({ type: Boolean }) validateOnInitialRender = false;
+
+  // eslint-disable-next-line lit/attribute-names
+  @property({ type: String }) validationMessage = "";
+
+  // eslint-disable-next-line lit/attribute-names
+  @property({ type: Boolean }) autoValidate = false;
+
+  @property({ type: String }) pattern = "";
+
+  @property({ type: Number }) size: number | null = null;
+
+  // eslint-disable-next-line lit/attribute-names
+  @property({ type: Boolean }) helperPersistent = false;
+
+  // eslint-disable-next-line lit/attribute-names
+  @property({ type: Boolean }) charCounter: boolean | TextAreaCharCounter =
+    false;
+
+  // eslint-disable-next-line lit/attribute-names
+  @property({ type: Boolean }) endAligned = false;
+
+  @property({ type: String }) prefix = "";
+
+  @property({ type: String }) suffix = "";
+
+  @property({ type: String }) name = "";
+
+  @property({ type: String, attribute: "input-mode" })
+  inputMode!: string;
+
+  // eslint-disable-next-line lit/attribute-names
+  @property({ type: Boolean }) readOnly = false;
+
+  // eslint-disable-next-line lit/no-native-attributes
+  @property({ attribute: false }) autocapitalize = "";
+
+  @state() private _unmaskedPassword = false;
+
+  @query("ha-textfield") private _textField!: HaTextField;
+
+  protected render() {
+    return html`<ha-textfield
+        .invalid=${this.invalid}
+        .errorMessage=${this.errorMessage}
+        .icon=${this.icon}
+        .iconTrailing=${this.iconTrailing}
+        .autocomplete=${this.autocomplete}
+        .autocorrect=${this.autocorrect}
+        .inputSpellcheck=${this.inputSpellcheck}
+        .value=${this.value}
+        .placeholder=${this.placeholder}
+        .label=${this.label}
+        .disabled=${this.disabled}
+        .required=${this.required}
+        .minLength=${this.minLength}
+        .maxLength=${this.maxLength}
+        .outlined=${this.outlined}
+        .helper=${this.helper}
+        .validateOnInitialRender=${this.validateOnInitialRender}
+        .validationMessage=${this.validationMessage}
+        .autoValidate=${this.autoValidate}
+        .pattern=${this.pattern}
+        .size=${this.size}
+        .helperPersistent=${this.helperPersistent}
+        .charCounter=${this.charCounter}
+        .endAligned=${this.endAligned}
+        .prefix=${this.prefix}
+        .name=${this.name}
+        .inputMode=${this.inputMode}
+        .readOnly=${this.readOnly}
+        .autocapitalize=${this.autocapitalize}
+        .type=${this._unmaskedPassword ? "text" : "password"}
+        .suffix=${html`<div style="width: 24px"></div>`}
+        @input=${this._handleInputEvent}
+        @change=${this._handleChangeEvent}
+      ></ha-textfield>
+      <ha-icon-button
+        .label=${this.hass?.localize(
+          this._unmaskedPassword
+            ? "ui.components.selectors.text.hide_password"
+            : "ui.components.selectors.text.show_password"
+        ) || (this._unmaskedPassword ? "Hide password" : "Show password")}
+        @click=${this._toggleUnmaskedPassword}
+        .path=${this._unmaskedPassword ? mdiEyeOff : mdiEye}
+      ></ha-icon-button>`;
+  }
+
+  public focus(): void {
+    this._textField.focus();
+  }
+
+  public checkValidity(): boolean {
+    return this._textField.checkValidity();
+  }
+
+  public reportValidity(): boolean {
+    return this._textField.reportValidity();
+  }
+
+  public setCustomValidity(message: string): void {
+    return this._textField.setCustomValidity(message);
+  }
+
+  public layout(): Promise<void> {
+    return this._textField.layout();
+  }
+
+  private _toggleUnmaskedPassword(): void {
+    this._unmaskedPassword = !this._unmaskedPassword;
+  }
+
+  @eventOptions({ passive: true })
+  private _handleInputEvent(ev) {
+    this.value = ev.target.value;
+  }
+
+  @eventOptions({ passive: true })
+  private _handleChangeEvent(ev) {
+    this.value = ev.target.value;
+    this._reDispatchEvent(ev);
+  }
+
+  private _reDispatchEvent(oldEvent: Event) {
+    const newEvent = new Event(oldEvent.type, oldEvent);
+    this.dispatchEvent(newEvent);
+  }
+
+  static styles = css`
+    :host {
+      display: block;
+      position: relative;
+    }
+    ha-textfield {
+      width: 100%;
+    }
+    ha-icon-button {
+      position: absolute;
+      top: 8px;
+      right: 8px;
+      inset-inline-start: initial;
+      inset-inline-end: 8px;
+      --mdc-icon-button-size: 40px;
+      --mdc-icon-size: 20px;
+      color: var(--secondary-text-color);
+      direction: var(--direction);
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-password-field": HaPasswordField;
+  }
+}

src/components/ha-picker-combo-box.ts

@@ -362,18 +362,6 @@ export class HaPickerComboBox extends ScrollableFadeMixin(LitElement) {
     const additionalItems = this._getAdditionalItems();
     items.push(...additionalItems);
 
-    if (this.allowCustomValue && this._search) {
-      items.push({
-        id: this._search,
-        primary:
-          this.customValueLabel ??
-          this.hass?.localize("ui.components.combo-box.add_custom_item") ??
-          "Add custom item",
-        secondary: `"${this._search}"`,
-        icon_path: mdiPlus,
-      });
-    }
-
     if (this.mode === "dialog") {
       items.push({ id: PADDING_ID, primary: "" }); // padding for safe area inset
     }
@@ -796,7 +784,7 @@ export class HaPickerComboBox extends ScrollableFadeMixin(LitElement) {
         :host {
           display: flex;
           flex-direction: column;
-          padding-top: var(--ha-space-4);
+          padding-top: var(--ha-space-3);
           flex: 1;
         }
 

src/components/ha-picker-field.ts

@@ -126,7 +126,6 @@ export class HaPickerField extends PickerMixin(LitElement) {
           );
         }
         ha-combo-box-item {
-          position: relative;
           background-color: var(--mdc-text-field-fill-color, whitesmoke);
           border-radius: var(--ha-border-radius-sm);
           border-end-end-radius: 0;
@@ -185,8 +184,8 @@ export class HaPickerField extends PickerMixin(LitElement) {
 
         .clear {
           margin: 0 -8px;
-          --ha-icon-button-size: 32px;
-          --ha-icon-button-padding-inline: var(--ha-space-1);
+          --mdc-icon-button-size: 32px;
+          --mdc-icon-size: 20px;
         }
         .arrow {
           --mdc-icon-size: 20px;

src/components/ha-qr-scanner.ts

@@ -135,7 +135,9 @@ class HaQrScanner extends LitElement {
                     (camera) => html`
                       <ha-dropdown-item
                         .value=${camera.id}
-                        .selected=${this._selectedCamera === camera.id}
+                        class=${this._selectedCamera === camera.id
+                          ? "selected"
+                          : ""}
                       >
                         ${camera.label}
                       </ha-dropdown-item>
@@ -378,6 +380,9 @@ class HaQrScanner extends LitElement {
       color: white;
       border-radius: var(--ha-border-radius-circle);
     }
+    ha-dropdown-item.selected {
+      font-weight: var(--ha-font-weight-bold);
+    }
     .row {
       display: flex;
       align-items: center;

src/components/ha-segmented-bar.ts

@@ -61,7 +61,6 @@ class HaSegmentedBar extends LitElement {
                 : html`
                     <ha-tooltip for="segment-${index}" placement="top">
                       ${segment.label}
-                      (${((segment.value / totalValue) * 100).toFixed(1)}%)
                     </ha-tooltip>
                   `}
               <div

src/components/ha-select.ts

@@ -5,7 +5,6 @@ import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
 import "./ha-dropdown";
 import "./ha-dropdown-item";
-import "./ha-input-helper-text";
 import "./ha-picker-field";
 import type { HaPickerField } from "./ha-picker-field";
 import "./ha-svg-icon";
@@ -76,7 +75,7 @@ export class HaSelect extends LitElement {
 
   protected override render() {
     if (this.disabled) {
-      return html`${this._renderField()}${this._renderHelper()}`;
+      return this._renderField();
     }
 
     return html`
@@ -95,8 +94,10 @@ export class HaSelect extends LitElement {
                   .disabled=${typeof option === "string"
                     ? false
                     : (option.disabled ?? false)}
-                  .selected=${this.value ===
-                  (typeof option === "string" ? option : option.value)}
+                  class=${this.value ===
+                  (typeof option === "string" ? option : option.value)
+                    ? "selected"
+                    : ""}
                 >
                   ${option.iconPath
                     ? html`<ha-svg-icon
@@ -117,7 +118,6 @@ export class HaSelect extends LitElement {
             )
           : html`<slot></slot>`}
       </ha-dropdown>
-      ${this._renderHelper()}
     `;
   }
 
@@ -133,6 +133,7 @@ export class HaSelect extends LitElement {
         aria-label=${ifDefined(this.label)}
         @clear=${this._clearValue}
         .label=${this.label}
+        .helper=${this.helper}
         .value=${valueLabel}
         .required=${this.required}
         .disabled=${this.disabled}
@@ -145,14 +146,6 @@ export class HaSelect extends LitElement {
     `;
   }
 
-  private _renderHelper() {
-    return this.helper
-      ? html`<ha-input-helper-text .disabled=${this.disabled}
-          >${this.helper}</ha-input-helper-text
-        >`
-      : nothing;
-  }
-
   private _handleSelect(ev: CustomEvent<{ item: { value: string } }>) {
     ev.stopPropagation();
     const value = ev.detail.item.value;
@@ -189,6 +182,10 @@ export class HaSelect extends LitElement {
     ha-picker-field.opened {
       --mdc-text-field-idle-line-color: var(--primary-color);
     }
+    ha-dropdown-item.selected:hover {
+      background-color: var(--ha-color-fill-primary-quiet-hover);
+    }
+
     ha-dropdown-item .content {
       display: flex;
       gap: var(--ha-space-1);
@@ -204,9 +201,12 @@ export class HaSelect extends LitElement {
       min-width: var(--select-menu-width);
     }
 
-    ha-input-helper-text {
-      display: block;
-      margin: var(--ha-space-2) 0 0;
+    :host ::slotted(ha-dropdown-item.selected),
+    ha-dropdown-item.selected {
+      font-weight: var(--ha-font-weight-medium);
+      color: var(--primary-color);
+      background-color: var(--ha-color-fill-primary-quiet-resting);
+      --icon-primary-color: var(--primary-color);
     }
   `;
 }

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

@@ -66,7 +66,6 @@ export class HaTimeDuration extends LitElement {
         .enableDay=${this.selector.duration?.enable_day}
         .enableMillisecond=${this.selector.duration?.enable_millisecond}
         .allowNegative=${this.selector.duration?.allow_negative}
-        .enableSecond=${this.selector.duration?.enable_second ?? true}
       ></ha-duration-input>
     `;
   }

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

@@ -64,7 +64,7 @@ export class HaEntitySelector extends LitElement {
     if (!this.selector.entity?.multiple) {
       return html`<ha-entity-picker
         .hass=${this.hass}
-        .value=${typeof this.value === "string" ? this.value : ""}
+        .value=${this.value}
         .label=${this.label}
         .placeholder=${this.placeholder}
         .helper=${this.helper}

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

@@ -13,11 +13,7 @@ import {
 } from "../../data/media-player";
 import type { MediaSelector, MediaSelectorValue } from "../../data/selector";
 import type { HomeAssistant } from "../../types";
-import {
-  brandsUrl,
-  extractDomainFromBrandUrl,
-  isBrandUrl,
-} from "../../util/brands-url";
+import { brandsUrl, extractDomainFromBrandUrl } from "../../util/brands-url";
 import "../ha-alert";
 import "../ha-form/ha-form";
 import type { SchemaUnion } from "../ha-form/types";
@@ -76,7 +72,16 @@ export class HaMediaSelector extends LitElement {
       if (thumbnail === oldThumbnail) {
         return;
       }
-      if (thumbnail && isBrandUrl(thumbnail)) {
+      if (thumbnail && thumbnail.startsWith("/")) {
+        this._thumbnailUrl = undefined;
+        // Thumbnails served by local API require authentication
+        getSignedPath(this.hass, thumbnail).then((signedPath) => {
+          this._thumbnailUrl = signedPath.path;
+        });
+      } else 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({
@@ -84,12 +89,6 @@ export class HaMediaSelector extends LitElement {
           type: "icon",
           darkOptimized: this.hass.themes?.darkMode,
         });
-      } else if (thumbnail && thumbnail.startsWith("/")) {
-        this._thumbnailUrl = undefined;
-        // Thumbnails served by local API require authentication
-        getSignedPath(this.hass, thumbnail).then((signedPath) => {
-          this._thumbnailUrl = signedPath.path;
-        });
       } else {
         this._thumbnailUrl = thumbnail;
       }