diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index dd96b1f316..8c1dfc307c 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -214,13 +214,6 @@ 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): @@ -246,12 +239,7 @@ For browser support, API details, and current specifications, refer to these aut ## Component Library -### Dialog Components - -**Available Dialog Types:** - -- `ha-wa-dialog` - Preferred for new dialogs (Web Awesome based) -- `ha-dialog` - Legacy component (still widely used) +### Dialog Component **Opening Dialogs (Fire Event Pattern - Recommended):** @@ -265,6 +253,7 @@ fireEvent(this, "show-dialog", { **Dialog Implementation Requirements:** +- Use `ha-dialog` component - Implement `HassDialog` interface - Use `@state() private _open = false` to control dialog visibility - Set `_open = true` in `showDialog()`, `_open = false` in `closeDialog()` @@ -280,7 +269,6 @@ 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: `` for alert/confirmation dialogs **Button Appearance Guidelines:** @@ -290,17 +278,9 @@ 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-wa-dialog.markdown` +- `gallery/src/pages/components/ha-dialog.markdown` - `gallery/src/pages/components/ha-dialogs.markdown` ### Form Component (ha-form) @@ -308,7 +288,6 @@ See these files for current patterns: - 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 @@ -393,81 +372,6 @@ export class HaPanelMyFeature extends SubscribeMixin(LitElement) { } ``` -### Creating a Dialog - -```typescript -@customElement("dialog-my-feature") -export class DialogMyFeature - extends LitElement - implements HassDialog -{ - @property({ attribute: false }) - hass!: HomeAssistant; - - @state() - private _params?: MyDialogParams; - - @state() - private _open = false; - - public async showDialog(params: MyDialogParams): Promise { - 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` - -

Dialog content

- - - ${this.hass.localize("ui.common.cancel")} - - - ${this.hass.localize("ui.common.save")} - - - - `; - } - - 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) @@ -719,9 +623,6 @@ 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) diff --git a/gallery/src/pages/components/ha-adaptive-dialog.ts b/gallery/src/pages/components/ha-adaptive-dialog.ts index 81044688e0..1956336b61 100644 --- a/gallery/src/pages/components/ha-adaptive-dialog.ts +++ b/gallery/src/pages/components/ha-adaptive-dialog.ts @@ -215,7 +215,7 @@ export class DemoHaAdaptiveDialog extends LitElement {
  • Dialog mode: Used on larger screens (width > 870px and height > 500px). Renders as a centered dialog using - ha-wa-dialog. + ha-dialog.
  • Bottom sheet mode: Used on mobile devices and @@ -394,7 +394,7 @@ export class DemoHaAdaptiveDialog extends LitElement {

    If you don't need responsive behavior, use - ha-wa-dialog directly for desktop-only dialogs or + ha-dialog directly for desktop-only dialogs or ha-bottom-sheet for mobile-only sheets.

    @@ -447,7 +447,7 @@ export class DemoHaAdaptiveDialog extends LitElement {

    API

    - This component combines ha-wa-dialog and + This component combines ha-dialog and ha-bottom-sheet with automatic mode switching based on screen size.

    diff --git a/gallery/src/pages/components/ha-dialog.markdown b/gallery/src/pages/components/ha-dialog.markdown new file mode 100644 index 0000000000..238d07c16a --- /dev/null +++ b/gallery/src/pages/components/ha-dialog.markdown @@ -0,0 +1,3 @@ +--- +title: Dialog (ha-dialog) +--- diff --git a/gallery/src/pages/components/ha-wa-dialog.ts b/gallery/src/pages/components/ha-dialog.ts similarity index 92% rename from gallery/src/pages/components/ha-wa-dialog.ts rename to gallery/src/pages/components/ha-dialog.ts index a5e121bd3e..7e555e5905 100644 --- a/gallery/src/pages/components/ha-wa-dialog.ts +++ b/gallery/src/pages/components/ha-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-wa-dialog"; +import "../../../../src/components/ha-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-wa-dialog") -export class DemoHaWaDialog extends LitElement { +@customElement("demo-components-ha-dialog") +export class DemoHaDialog extends LitElement { @state() private _openDialog: DialogType = false; protected render() { return html`
    -

    Dialog <ha-wa-dialog>

    +

    Dialog <ha-dialog>

    Dialog component built with WebAwesome.

    @@ -53,24 +53,24 @@ export class DemoHaWaDialog extends LitElement { >
    -
    Dialog content
    -     + -
    Dialog content
    -     + -
    Dialog content
    -     + - Cancel - Submit + Cancel + + + Submit + - + -
    Dialog content
    -     +

    Design

    @@ -228,19 +229,19 @@ export class DemoHaWaDialog extends LitElement { Slot Description - Variant to use + Appearance to use secondaryAction The secondary action button(s). - plain + appearance="plain" primaryAction The primary action button(s). - accent + Default (no appearance attribute) @@ -249,7 +250,7 @@ export class DemoHaWaDialog extends LitElement {

    Example Usage

    - 
    <ha-wa-dialog
+        
    <ha-dialog
   open
   header-title="Dialog title"
   header-subtitle="Dialog subtitle"
@@ -261,12 +262,18 @@ export class DemoHaWaDialog extends LitElement {
   </div>
   <div>Dialog content</div>
   <ha-dialog-footer slot="footer">
-    <ha-button data-dialog="close" slot="secondaryAction" variant="plain"
-      >Cancel</ha-button
+    <ha-button
+      data-dialog="close"
+      appearance="plain"
+      slot="secondaryAction"
     >
-    <ha-button slot="primaryAction" variant="accent">Submit</ha-button>
+      Cancel
+    </ha-button>
+    <ha-button data-dialog="close" slot="primaryAction">
+      Submit
+    </ha-button>
   </ha-dialog-footer>
-</ha-wa-dialog>
    
+</ha-dialog>

    API

    @@ -514,6 +521,6 @@ export class DemoHaWaDialog extends LitElement { declare global { interface HTMLElementTagNameMap { - "demo-components-ha-wa-dialog": DemoHaWaDialog; + "demo-components-ha-dialog": DemoHaDialog; } } diff --git a/gallery/src/pages/components/ha-wa-dialog.markdown b/gallery/src/pages/components/ha-wa-dialog.markdown deleted file mode 100644 index 2ae337e35a..0000000000 --- a/gallery/src/pages/components/ha-wa-dialog.markdown +++ /dev/null @@ -1,3 +0,0 @@ ---- -title: Dialog (ha-wa-dialog) ---- diff --git a/src/components/data-table/dialog-data-table-settings.ts b/src/components/data-table/dialog-data-table-settings.ts index bb40df58f0..ace8d013f4 100644 --- a/src/components/data-table/dialog-data-table-settings.ts +++ b/src/components/data-table/dialog-data-table-settings.ts @@ -15,7 +15,7 @@ import "../ha-list"; import "../ha-list-item"; import "../ha-sortable"; import "../ha-svg-icon"; -import "../ha-wa-dialog"; +import "../ha-dialog"; import type { DataTableColumnContainer, DataTableColumnData, @@ -101,7 +101,7 @@ export class DialogDataTableSettings extends LitElement { ); return html` - - + `; } @@ -291,7 +291,7 @@ export class DialogDataTableSettings extends LitElement { return [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-z-index: 10; --dialog-content-padding: 0 8px; } diff --git a/src/components/ha-adaptive-dialog.ts b/src/components/ha-adaptive-dialog.ts index cba11281ba..fa671caff1 100644 --- a/src/components/ha-adaptive-dialog.ts +++ b/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-wa-dialog"; -import type { DialogWidth } from "./ha-wa-dialog"; +import "./ha-dialog"; +import type { DialogWidth } from "./ha-dialog"; type DialogSheetMode = "dialog" | "bottom-sheet"; @@ -18,7 +18,7 @@ type DialogSheetMode = "dialog" | "bottom-sheet"; * @extends {LitElement} * * @summary - * A responsive dialog component that automatically switches between a full dialog (ha-wa-dialog) + * A responsive dialog component that automatically switches between a full dialog (ha-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. * @@ -134,11 +134,7 @@ export class HaAdaptiveDialog extends LitElement { > ${this.headerTitle !== undefined - ? html` + ? html` ${this.headerTitle} ` : html``} @@ -155,7 +151,7 @@ export class HaAdaptiveDialog extends LitElement { } return html` - - + `; } diff --git a/src/components/ha-dialog-date-picker.ts b/src/components/ha-dialog-date-picker.ts index 090046c7ff..c49f25e8ed 100644 --- a/src/components/ha-dialog-date-picker.ts +++ b/src/components/ha-dialog-date-picker.ts @@ -9,7 +9,7 @@ import type { HomeAssistant } from "../types"; import type { DatePickerDialogParams } from "./ha-date-input"; import "./ha-button"; import "./ha-dialog-footer"; -import "./ha-wa-dialog"; +import "./ha-dialog"; @customElement("ha-dialog-date-picker") export class HaDialogDatePicker extends LitElement { @@ -49,7 +49,7 @@ export class HaDialogDatePicker extends LitElement { if (!this._params) { return nothing; } - return html` - `; + `; } private _valueChanged(ev: CustomEvent) { @@ -127,7 +127,7 @@ export class HaDialogDatePicker extends LitElement { static styles = [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } .bottom-actions { diff --git a/src/components/ha-dialog-footer.ts b/src/components/ha-dialog-footer.ts index e6dd229bd8..91e0c33911 100644 --- a/src/components/ha-dialog-footer.ts +++ b/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-wa-dialog`. + * typically used as the `footer` slot in `ha-dialog`. * * @slot primaryAction - Primary action button(s), aligned to the end. * @slot secondaryAction - Secondary action button(s), placed before the primary action. diff --git a/src/components/ha-dialog.ts b/src/components/ha-dialog.ts index ca8a00c5e7..0e1dc00eac 100644 --- a/src/components/ha-dialog.ts +++ b/src/components/ha-dialog.ts @@ -1,193 +1,447 @@ -import { DialogBase } from "@material/mwc-dialog/mwc-dialog-base"; -import { styles } from "@material/mwc-dialog/mwc-dialog.css"; +import "@home-assistant/webawesome/dist/components/dialog/dialog"; +import type WaDialog from "@home-assistant/webawesome/dist/components/dialog/dialog"; import { mdiClose } from "@mdi/js"; -import type { TemplateResult } from "lit"; -import { css, html } from "lit"; -import { customElement } from "lit/decorators"; -import { FOCUS_TARGET } from "../dialogs/make-dialog-manager"; +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 { HomeAssistant } from "../types"; +import { isIosApp } from "../util/is_ios"; +import "./ha-dialog-header"; import "./ha-icon-button"; -const SUPPRESS_DEFAULT_PRESS_SELECTOR = ["button", "ha-list-item"]; - -export const createCloseHeading = ( - hass: HomeAssistant | undefined, - title: string | TemplateResult -) => html` -
    - - ${title} -
    -`; +export type DialogWidth = "small" | "medium" | "large" | "full"; +/** + * 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: `` + * + * @see https://github.com/home-assistant/frontend/issues/27143 + */ @customElement("ha-dialog") -export class HaDialog extends DialogBase { - protected readonly [FOCUS_TARGET]; +export class HaDialog extends ScrollableFadeMixin(LitElement) { + @property({ attribute: false }) public hass?: HomeAssistant; - public scrollToPos(x: number, y: number) { - this.contentElement?.scrollTo(x, y); + @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; } - protected renderHeading() { - return html` ${super.renderHeading()} `; + protected updated( + changedProperties: Map + ): void { + super.updated(changedProperties); + + if (changedProperties.has("open")) { + this._open = this.open; + } } - protected firstUpdated(): void { - super.firstUpdated(); - this.suppressDefaultPressSelector = [ - this.suppressDefaultPressSelector, - SUPPRESS_DEFAULT_PRESS_SELECTOR, - ].join(", "); - this._updateScrolledAttribute(); - this.contentElement?.addEventListener("scroll", this._onScroll, { - passive: true, + protected render() { + return html` + + ${!this.withoutHeader + ? html` + + + + + ${this.headerTitle !== undefined + ? html` + ${this.headerTitle} + ` + : html``} + ${this.headerSubtitle !== undefined + ? html`${this.headerSubtitle}` + : html``} + + + ` + : nothing} +
    +
    + +
    + ${this.renderScrollableFades()} +
    + +     + `; + } + + 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(); }); - } - - disconnectedCallback(): void { - super.disconnectedCallback(); - this.contentElement.removeEventListener("scroll", this._onScroll); - } - - private _onScroll = () => { - this._updateScrolledAttribute(); }; - private _updateScrolledAttribute() { - if (!this.contentElement) return; - this.toggleAttribute("scrolled", this.contentElement.scrollTop !== 0); + private _handleAfterShow = () => { + fireEvent(this, "after-show"); + }; + + private _handleAfterHide = (ev: CustomEvent<{ source: Element }>) => { + if (ev.eventPhase === Event.AT_TARGET) { + this._open = false; + fireEvent(this, "closed"); + } + }; + + public disconnectedCallback(): void { + super.disconnectedCallback(); + this._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; - } + @eventOptions({ passive: true }) + private _handleBodyScroll(ev: Event) { + this._bodyScrolled = (ev.target as HTMLDivElement).scrollTop > 0; + } - .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); - } - `, - ]; + private _handleKeyDown(ev: KeyboardEvent) { + if (ev.key === "Escape") { + this._escapePressed = true; + } + } + + private _handleHide(ev: CustomEvent<{ source: Element }>) { + if ( + this.preventScrimClose && + this._escapePressed && + ev.detail.source === (ev.target as WaDialog).dialog + ) { + 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; + + 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); + } + + 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%; + } + `, + ]; + } } declare global { interface HTMLElementTagNameMap { "ha-dialog": HaDialog; } + + interface HASSDomEvents { + opened: undefined; + "after-show": undefined; + closed: undefined; + } } diff --git a/src/components/ha-wa-dialog.ts b/src/components/ha-wa-dialog.ts deleted file mode 100644 index da7bcd7f02..0000000000 --- a/src/components/ha-wa-dialog.ts +++ /dev/null @@ -1,451 +0,0 @@ -import "@home-assistant/webawesome/dist/components/dialog/dialog"; -import type WaDialog from "@home-assistant/webawesome/dist/components/dialog/dialog"; -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 { HomeAssistant } from "../types"; -import { isIosApp } from "../util/is_ios"; -import "./ha-dialog-header"; -import "./ha-icon-button"; - -export type DialogWidth = "small" | "medium" | "large" | "full"; - -/** - * Home Assistant dialog component - * - * @element ha-wa-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: `` - * - * @see https://github.com/home-assistant/frontend/issues/27143 - */ -@customElement("ha-wa-dialog") -export class HaWaDialog 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, 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; - } - - protected updated( - changedProperties: Map - ): void { - super.updated(changedProperties); - - if (changedProperties.has("open")) { - this._open = this.open; - } - } - - protected render() { - return html` - - ${!this.withoutHeader - ? html` - - - - - ${this.headerTitle !== undefined - ? html` - ${this.headerTitle} - ` - : html``} - ${this.headerSubtitle !== undefined - ? html`${this.headerSubtitle}` - : html``} - - - ` - : nothing} -
    -
    - -
    - ${this.renderScrollableFades()} -
    - -     - `; - } - - 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-wa-dialog-autofocus"; - } - this.hass?.auth.external?.fireMessage({ - type: "focus_element", - payload: { - element_id: element.id, - }, - }); - } - return; - } - (this.querySelector("[autofocus]") as HTMLElement | null)?.focus(); - }); - }; - - private _handleAfterShow = () => { - fireEvent(this, "after-show"); - }; - - private _handleAfterHide = (ev: CustomEvent<{ source: Element }>) => { - if (ev.eventPhase === Event.AT_TARGET) { - this._open = false; - fireEvent(this, "closed"); - } - }; - - public disconnectedCallback(): void { - super.disconnectedCallback(); - this._open = false; - } - - @eventOptions({ passive: true }) - private _handleBodyScroll(ev: Event) { - this._bodyScrolled = (ev.target as HTMLDivElement).scrollTop > 0; - } - - private _handleKeyDown(ev: KeyboardEvent) { - if (ev.key === "Escape") { - this._escapePressed = true; - } - } - - private _handleHide(ev: CustomEvent<{ source: Element }>) { - if ( - this.preventScrimClose && - this._escapePressed && - ev.detail.source === (ev.target as WaDialog).dialog - ) { - 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; - - 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); - } - - 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%; - } - `, - ]; - } -} - -declare global { - interface HTMLElementTagNameMap { - "ha-wa-dialog": HaWaDialog; - } - - interface HASSDomEvents { - opened: undefined; - "after-show": undefined; - closed: undefined; - } -} diff --git a/src/components/media-player/dialog-join-media-players.ts b/src/components/media-player/dialog-join-media-players.ts index dd58dfd5c8..e0f1ec22c7 100644 --- a/src/components/media-player/dialog-join-media-players.ts +++ b/src/components/media-player/dialog-join-media-players.ts @@ -19,7 +19,7 @@ import "../ha-alert"; import "../ha-button"; import "../ha-dialog-footer"; import "../ha-dialog-header"; -import "../ha-wa-dialog"; +import "../ha-dialog"; import "./ha-media-player-toggle"; import type { JoinMediaPlayersDialogParams } from "./show-join-media-players-dialog"; @@ -76,7 +76,7 @@ class DialogJoinMediaPlayers extends LitElement { const entityId = this._entityId; return html` - - + `; } diff --git a/src/components/media-player/dialog-media-manage.ts b/src/components/media-player/dialog-media-manage.ts index 8e3c4f8ecd..b721a3812d 100644 --- a/src/components/media-player/dialog-media-manage.ts +++ b/src/components/media-player/dialog-media-manage.ts @@ -25,7 +25,7 @@ import { showConfirmationDialog } from "../../dialogs/generic/show-dialog-box"; import type { HomeAssistant } from "../../types"; import "../ha-button"; import "../ha-check-list-item"; -import "../ha-wa-dialog"; +import "../ha-dialog"; import "../ha-dialog-header"; import "../ha-dialog-footer"; import "../ha-icon-button"; @@ -99,7 +99,7 @@ class DialogMediaManage extends LitElement { let fileIndex = 0; return html` - ` : nothing} - + `; } @@ -333,7 +333,7 @@ class DialogMediaManage extends LitElement { static get styles(): CSSResultGroup { return [ css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } ha-dialog-header ha-media-upload-button, diff --git a/src/components/media-player/dialog-media-player-browse.ts b/src/components/media-player/dialog-media-player-browse.ts index 6ca57538e1..dac95ea1f5 100644 --- a/src/components/media-player/dialog-media-player-browse.ts +++ b/src/components/media-player/dialog-media-player-browse.ts @@ -24,7 +24,7 @@ import "../ha-dropdown"; import type { HaDropdownSelectEvent } from "../ha-dropdown"; import "../ha-dropdown-item"; import "../ha-icon-button-arrow-prev"; -import "../ha-wa-dialog"; +import "../ha-dialog"; import "./ha-media-manage-button"; import "./ha-media-player-browse"; import type { @@ -76,7 +76,7 @@ class DialogMediaPlayerBrowse extends LitElement { } return html` - - + `; } @@ -222,7 +222,7 @@ class DialogMediaPlayerBrowse extends LitElement { haStyleDialog, haStyleDialogFixedTop, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } @@ -237,7 +237,7 @@ class DialogMediaPlayerBrowse extends LitElement { } @media (min-width: 800px) { - ha-wa-dialog { + ha-dialog { --ha-dialog-max-width: 800px; --ha-dialog-max-height: calc( 100vh - var(--ha-space-18) - var(--safe-area-inset-y) diff --git a/src/components/target-picker/dialog/dialog-target-details.ts b/src/components/target-picker/dialog/dialog-target-details.ts index e48a81b109..9cdde455bf 100644 --- a/src/components/target-picker/dialog/dialog-target-details.ts +++ b/src/components/target-picker/dialog/dialog-target-details.ts @@ -9,7 +9,7 @@ import "../../ha-icon-next"; import "../../ha-md-list"; import "../../ha-md-list-item"; import "../../ha-svg-icon"; -import "../../ha-wa-dialog"; +import "../../ha-dialog"; import "../ha-target-picker-item-row"; import type { TargetDetailsDialogParams } from "./show-dialog-target-details"; @@ -42,7 +42,7 @@ class DialogTargetDetails extends LitElement implements HassDialog { } return html` - - + `; } } diff --git a/src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts b/src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts index f77fb9824c..1f1a271586 100644 --- a/src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts +++ b/src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts @@ -2,7 +2,7 @@ import type { CSSResultGroup } from "lit"; import { css, html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../common/dom/fire_event"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import "../../components/ha-dialog-footer"; import "../../components/ha-formfield"; import "../../components/ha-switch"; @@ -57,7 +57,7 @@ class DialogConfigEntrySystemOptions extends LitElement { } return html` - - + `; } diff --git a/src/dialogs/config-flow/dialog-data-entry-flow.ts b/src/dialogs/config-flow/dialog-data-entry-flow.ts index be9bf9d761..09a6b06ba0 100644 --- a/src/dialogs/config-flow/dialog-data-entry-flow.ts +++ b/src/dialogs/config-flow/dialog-data-entry-flow.ts @@ -6,7 +6,7 @@ import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; import type { HASSDomEvent } from "../../common/dom/fire_event"; import { fireEvent } from "../../common/dom/fire_event"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import "../../components/ha-icon-button"; import type { DataEntryFlowStep } from "../../data/data_entry_flow"; import { @@ -303,7 +303,7 @@ class DataEntryFlowDialog extends LitElement { const dialogSubtitle = this._getDialogSubtitle(); return html` - - + `; } @@ -576,7 +576,7 @@ class DataEntryFlowDialog extends LitElement { return [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } .dialog-title { diff --git a/src/dialogs/dialog-list-items/dialog-list-items.ts b/src/dialogs/dialog-list-items/dialog-list-items.ts index 16baf6beb5..8fde1286e7 100644 --- a/src/dialogs/dialog-list-items/dialog-list-items.ts +++ b/src/dialogs/dialog-list-items/dialog-list-items.ts @@ -6,7 +6,7 @@ import "../../components/ha-icon"; import "../../components/ha-md-list"; import "../../components/ha-md-list-item"; import "../../components/ha-svg-icon"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import type { HomeAssistant } from "../../types"; import type { HassDialog } from "../make-dialog-manager"; import type { ListItemsDialogParams } from "./show-list-items-dialog"; @@ -102,19 +102,19 @@ export class ListItemsDialog } return html` - ${content} - + `; } static styles = css` - ha-wa-dialog { + ha-dialog { /* Place above other dialogs */ --dialog-z-index: 104; --dialog-content-padding: 0; diff --git a/src/dialogs/enter-code/dialog-enter-code.ts b/src/dialogs/enter-code/dialog-enter-code.ts index 1f9cbbad42..d84a78711d 100644 --- a/src/dialogs/enter-code/dialog-enter-code.ts +++ b/src/dialogs/enter-code/dialog-enter-code.ts @@ -7,7 +7,7 @@ import "../../components/ha-button"; import "../../components/ha-control-button"; import "../../components/ha-dialog-footer"; import "../../components/ha-textfield"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import type { HaTextField } from "../../components/ha-textfield"; import type { HomeAssistant } from "../../types"; import type { HassDialog } from "../make-dialog-manager"; @@ -111,7 +111,7 @@ export class DialogEnterCode if (isText) { return html` - - + `; } return html` - - + `; } static styles = css` - ha-wa-dialog { + ha-dialog { /* Place above other dialogs */ --dialog-z-index: 104; } diff --git a/src/dialogs/form/dialog-form.ts b/src/dialogs/form/dialog-form.ts index 6a4d0b55ac..b8e735df18 100644 --- a/src/dialogs/form/dialog-form.ts +++ b/src/dialogs/form/dialog-form.ts @@ -4,7 +4,7 @@ import { fireEvent } from "../../common/dom/fire_event"; import "../../components/ha-button"; import "../../components/ha-form/ha-form"; import "../../components/ha-dialog-footer"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import { haStyleDialog } from "../../resources/styles"; import type { HomeAssistant } from "../../types"; import type { HassDialog } from "../make-dialog-manager"; @@ -69,7 +69,7 @@ export class DialogForm } return html` - - + `; } diff --git a/src/dialogs/generic/dialog-box.ts b/src/dialogs/generic/dialog-box.ts index 7791fdd618..923d74df19 100644 --- a/src/dialogs/generic/dialog-box.ts +++ b/src/dialogs/generic/dialog-box.ts @@ -10,7 +10,7 @@ import "../../components/ha-dialog-header"; import "../../components/ha-svg-icon"; import "../../components/ha-textfield"; import type { HaTextField } from "../../components/ha-textfield"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import type { HomeAssistant } from "../../types"; import type { DialogBoxParams } from "./show-dialog-box"; @@ -66,7 +66,7 @@ class DialogBox extends LitElement { this.hass.localize("ui.dialogs.generic.default_confirmation_title")); return html` - - + `; } diff --git a/src/dialogs/image-cropper-dialog/image-cropper-dialog.ts b/src/dialogs/image-cropper-dialog/image-cropper-dialog.ts index 30db80d45b..32edf60db3 100644 --- a/src/dialogs/image-cropper-dialog/image-cropper-dialog.ts +++ b/src/dialogs/image-cropper-dialog/image-cropper-dialog.ts @@ -8,7 +8,7 @@ import { classMap } from "lit/directives/class-map"; import { fireEvent } from "../../common/dom/fire_event"; import "../../components/ha-button"; import "../../components/ha-dialog-footer"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import { haStyleDialog } from "../../resources/styles"; import type { HomeAssistant } from "../../types"; import type { HassDialog } from "../make-dialog-manager"; @@ -95,7 +95,7 @@ export class HaImagecropperDialog } return html` - - + `; } diff --git a/src/dialogs/more-info/components/lights/dialog-light-color-favorite.ts b/src/dialogs/more-info/components/lights/dialog-light-color-favorite.ts index 06fcb931f8..cb09ccfb0b 100644 --- a/src/dialogs/more-info/components/lights/dialog-light-color-favorite.ts +++ b/src/dialogs/more-info/components/lights/dialog-light-color-favorite.ts @@ -6,7 +6,7 @@ import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-icon-button-toggle"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { EntityRegistryEntry } from "../../../../data/entity/entity_registry"; import type { LightColor, LightEntity } from "../../../../data/light"; import { @@ -147,7 +147,7 @@ class DialogLightColorFavorite extends LitElement { } return html` - - + `; } @@ -224,7 +224,7 @@ class DialogLightColorFavorite extends LitElement { return [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --ha-dialog-width-md: 420px; /* prevent width jumps when switching modes */ --ha-dialog-max-height: min( 600px, @@ -233,7 +233,7 @@ class DialogLightColorFavorite extends LitElement { } @media all and (max-width: 450px), all and (max-height: 500px) { - ha-wa-dialog { + ha-dialog { --ha-dialog-width-md: 100vw; --ha-dialog-max-height: calc(100% - 100px); } diff --git a/src/dialogs/more-info/components/siren/ha-more-info-siren-advanced-controls.ts b/src/dialogs/more-info/components/siren/ha-more-info-siren-advanced-controls.ts index ba8501c7d9..809bcfbbcd 100644 --- a/src/dialogs/more-info/components/siren/ha-more-info-siren-advanced-controls.ts +++ b/src/dialogs/more-info/components/siren/ha-more-info-siren-advanced-controls.ts @@ -13,7 +13,7 @@ import "../../../../components/ha-icon-button"; import "../../../../components/ha-list-item"; import "../../../../components/ha-select"; import "../../../../components/ha-textfield"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import { SirenEntityFeature } from "../../../../data/siren"; import { haStyle } from "../../../../resources/styles"; import type { HomeAssistant } from "../../../../types"; @@ -63,7 +63,7 @@ class MoreInfoSirenAdvancedControls extends LitElement { SirenEntityFeature.DURATION ); return html` - - + `; } diff --git a/src/dialogs/more-info/ha-more-info-dialog.ts b/src/dialogs/more-info/ha-more-info-dialog.ts index cfb29f750c..c57b8daea2 100644 --- a/src/dialogs/more-info/ha-more-info-dialog.ts +++ b/src/dialogs/more-info/ha-more-info-dialog.ts @@ -49,7 +49,7 @@ import { STATE_ATTRIBUTES, STATE_ATTRIBUTES_DOMAIN_CLASS, } from "../../data/entity/entity_attributes"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import type { EntityRegistryEntry, ExtEntityRegistryEntry, @@ -461,7 +461,7 @@ export class MoreInfoDialog extends ScrollableFadeMixin(LitElement) { const isRTL = computeRTL(this.hass); return html` - - + `; } @@ -808,7 +808,7 @@ export class MoreInfoDialog extends ScrollableFadeMixin(LitElement) { haStyleDialogFixedTop, haStyleScrollbar, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } diff --git a/src/dialogs/restart/dialog-restart-wait.ts b/src/dialogs/restart/dialog-restart-wait.ts index 847e7dfb10..f1ae9bbf29 100644 --- a/src/dialogs/restart/dialog-restart-wait.ts +++ b/src/dialogs/restart/dialog-restart-wait.ts @@ -4,7 +4,7 @@ import { LitElement, css, html } from "lit"; import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../common/dom/fire_event"; import "../../components/ha-alert"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import "../../components/ha-spinner"; import { subscribeBackupEvents, @@ -75,7 +75,7 @@ class DialogRestartWait extends LitElement { const waitMessage = this._getWaitMessage(); return html` - - + `; } @@ -120,7 +120,7 @@ class DialogRestartWait extends LitElement { haStyle, haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } .content { diff --git a/src/dialogs/shortcuts/dialog-shortcuts.ts b/src/dialogs/shortcuts/dialog-shortcuts.ts index ce9cbfaa78..6736016143 100644 --- a/src/dialogs/shortcuts/dialog-shortcuts.ts +++ b/src/dialogs/shortcuts/dialog-shortcuts.ts @@ -4,7 +4,7 @@ import { fireEvent } from "../../common/dom/fire_event"; import type { LocalizeKeys } from "../../common/translations/localize"; import "../../components/ha-alert"; import "../../components/ha-svg-icon"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import type { HomeAssistant } from "../../types"; import { isMac } from "../../util/is_mac"; @@ -211,7 +211,7 @@ class DialogShortcuts extends LitElement { protected render() { return html` - `, })} - + `; } diff --git a/src/dialogs/sidebar/dialog-edit-sidebar.ts b/src/dialogs/sidebar/dialog-edit-sidebar.ts index 66593670bb..39a25c3983 100644 --- a/src/dialogs/sidebar/dialog-edit-sidebar.ts +++ b/src/dialogs/sidebar/dialog-edit-sidebar.ts @@ -19,7 +19,7 @@ import type { import { computePanels } from "../../components/ha-sidebar"; import "../../components/ha-spinner"; import "../../components/ha-svg-icon"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import { fetchFrontendUserData, saveFrontendUserData, @@ -165,7 +165,7 @@ class DialogEditSidebar extends LitElement { const dialogTitle = this.hass.localize("ui.sidebar.edit_sidebar"); return html` - - + `; } @@ -257,13 +257,13 @@ class DialogEditSidebar extends LitElement { } static styles = css` - ha-wa-dialog { + ha-dialog { max-height: 90%; --dialog-content-padding: var(--ha-space-2) var(--ha-space-6); } @media all and (max-width: 580px), all and (max-height: 500px) { - ha-wa-dialog { + ha-dialog { min-width: 100%; min-height: 100%; } diff --git a/src/dialogs/tts-try/dialog-tts-try.ts b/src/dialogs/tts-try/dialog-tts-try.ts index 393b7ef2dc..bd3726e83f 100644 --- a/src/dialogs/tts-try/dialog-tts-try.ts +++ b/src/dialogs/tts-try/dialog-tts-try.ts @@ -6,7 +6,7 @@ import { fireEvent } from "../../common/dom/fire_event"; import "../../components/buttons/ha-progress-button"; import "../../components/ha-dialog-footer"; import "../../components/ha-textarea"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import type { HaTextArea } from "../../components/ha-textarea"; import { convertTextToSpeech } from "../../data/tts"; import { haStyleDialog } from "../../resources/styles"; @@ -69,7 +69,7 @@ export class TTSTryDialog extends LitElement { return nothing; } return html` - - + `; } diff --git a/src/dialogs/update_backup/dialog-update-backup.ts b/src/dialogs/update_backup/dialog-update-backup.ts index 056c2e209a..6e20b76ba3 100644 --- a/src/dialogs/update_backup/dialog-update-backup.ts +++ b/src/dialogs/update_backup/dialog-update-backup.ts @@ -3,7 +3,7 @@ import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../common/dom/fire_event"; import "../../components/ha-button"; import "../../components/ha-dialog-footer"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import type { HomeAssistant } from "../../types"; import type { UpdateBackupDialogParams } from "./show-update-backup-dialog"; @@ -28,7 +28,7 @@ class DialogBox extends LitElement { } return html` - - + `; } @@ -87,7 +87,7 @@ class DialogBox extends LitElement { margin: 0; color: var(--primary-text-color); } - ha-wa-dialog { + ha-dialog { /* Place above other dialogs */ --dialog-z-index: 104; } diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts index f3654ce13a..ee42100c6f 100644 --- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts +++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts @@ -7,7 +7,7 @@ import { fireEvent } from "../../common/dom/fire_event"; import { computeDomain } from "../../common/entity/compute_domain"; import { formatLanguageCode } from "../../common/language/format_language"; import "../../components/chips/ha-assist-chip"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import "../../components/ha-dropdown"; import type { HaDropdownSelectEvent } from "../../components/ha-dropdown"; import "../../components/ha-dropdown-item"; @@ -142,7 +142,7 @@ export class HaVoiceAssistantSetupDialog extends LitElement { (this._step === STEP.UPDATE && !this._previousSteps.length); return html` - ` : nothing} - + `; } @@ -371,7 +371,7 @@ export class HaVoiceAssistantSetupDialog extends LitElement { return [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } @media all and (max-width: 450px), all and (max-height: 500px) { diff --git a/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts b/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts index f5ed638b8d..a3061708b5 100644 --- a/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts +++ b/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts @@ -21,7 +21,7 @@ import "../../components/ha-dropdown-item"; import "../../components/ha-icon-button"; import "../../components/ha-icon-next"; import "../../components/ha-spinner"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import type { AssistPipeline } from "../../data/assist_pipeline"; import { getAssistPipeline, @@ -98,7 +98,7 @@ export class HaVoiceCommandDialog extends LitElement { } return html` - `} - + `; } @@ -258,7 +258,7 @@ export class HaVoiceCommandDialog extends LitElement { return [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } ha-dialog-header a { diff --git a/src/layouts/hass-tabs-subpage-data-table.ts b/src/layouts/hass-tabs-subpage-data-table.ts index 0ed446675f..5bf153f69a 100644 --- a/src/layouts/hass-tabs-subpage-data-table.ts +++ b/src/layouts/hass-tabs-subpage-data-table.ts @@ -29,7 +29,7 @@ import type { import { showDataTableSettingsDialog } from "../components/data-table/show-dialog-data-table-settings"; import "../components/ha-button"; import "../components/ha-dialog-footer"; -import "../components/ha-wa-dialog"; +import "../components/ha-dialog"; import "../components/ha-dropdown"; import "../components/ha-icon-button"; import "../components/ha-svg-icon"; @@ -538,7 +538,7 @@ export class HaTabsSubpageDataTable extends KeyboardShortcutMixin(LitElement) {
    ${this.showFilters && !showPane - ? html` - ` + ` : nothing} `; } @@ -898,7 +898,7 @@ export class HaTabsSubpageDataTable extends KeyboardShortcutMixin(LitElement) { --md-assist-chip-trailing-space: 8px; } - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } diff --git a/src/onboarding/dialogs/app-dialog.ts b/src/onboarding/dialogs/app-dialog.ts index 25c61b34e9..5416abf141 100644 --- a/src/onboarding/dialogs/app-dialog.ts +++ b/src/onboarding/dialogs/app-dialog.ts @@ -2,7 +2,7 @@ import { LitElement, css, html, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import type { LocalizeFunc } from "../../common/translations/localize"; import { fireEvent } from "../../common/dom/fire_event"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; @customElement("app-dialog") class DialogApp extends LitElement { @@ -28,7 +28,7 @@ class DialogApp extends LitElement { if (!this.localize) { return nothing; } - return html` - `; + `; } static styles = css` diff --git a/src/onboarding/dialogs/community-dialog.ts b/src/onboarding/dialogs/community-dialog.ts index bb00d14f9b..0225046e6f 100644 --- a/src/onboarding/dialogs/community-dialog.ts +++ b/src/onboarding/dialogs/community-dialog.ts @@ -3,7 +3,7 @@ import { LitElement, css, html, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../common/dom/fire_event"; import type { LocalizeFunc } from "../../common/translations/localize"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import "../../components/ha-list"; import "../../components/ha-list-item"; @@ -31,7 +31,7 @@ class DialogCommunity extends LitElement { if (!this.localize) { return nothing; } - return html` - `; + `; } static styles = css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } ha-list-item { diff --git a/src/panels/calendar/confirm-event-dialog-box.ts b/src/panels/calendar/confirm-event-dialog-box.ts index aa11008db6..20a074f6cc 100644 --- a/src/panels/calendar/confirm-event-dialog-box.ts +++ b/src/panels/calendar/confirm-event-dialog-box.ts @@ -4,7 +4,7 @@ import { fireEvent } from "../../common/dom/fire_event"; import "../../components/ha-dialog-footer"; import "../../components/ha-svg-icon"; import "../../components/ha-switch"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import { RecurrenceRange } from "../../data/calendar"; import type { HomeAssistant } from "../../types"; import type { ConfirmEventDialogBoxParams } from "./show-confirm-event-dialog-box"; @@ -40,7 +40,7 @@ class ConfirmEventDialogBox extends LitElement { } return html` - - + `; } @@ -137,7 +137,7 @@ class ConfirmEventDialogBox extends LitElement { .secondary { color: var(--secondary-text-color); } - ha-wa-dialog { + ha-dialog { /* Place above other dialogs */ --dialog-z-index: 104; } diff --git a/src/panels/calendar/dialog-calendar-event-detail.ts b/src/panels/calendar/dialog-calendar-event-detail.ts index 69f2721ec4..9d333f4cc5 100644 --- a/src/panels/calendar/dialog-calendar-event-detail.ts +++ b/src/panels/calendar/dialog-calendar-event-detail.ts @@ -15,7 +15,7 @@ import "../../components/ha-button"; import "../../components/ha-date-input"; import "../../components/ha-dialog-footer"; import "../../components/ha-time-input"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import type { CalendarEventMutableParams } from "../../data/calendar"; import { deleteCalendarEvent } from "../../data/calendar"; import { haStyleDialog } from "../../resources/styles"; @@ -65,7 +65,7 @@ class DialogCalendarEventDetail extends LitElement { } const stateObj = this.hass.states[this._calendarId!]; return html` - ` : ""} - + `; } diff --git a/src/panels/calendar/dialog-calendar-event-editor.ts b/src/panels/calendar/dialog-calendar-event-editor.ts index 24d938c23c..ac9927e38f 100644 --- a/src/panels/calendar/dialog-calendar-event-editor.ts +++ b/src/panels/calendar/dialog-calendar-event-editor.ts @@ -25,7 +25,7 @@ import "../../components/ha-switch"; import "../../components/ha-textarea"; import "../../components/ha-textfield"; import "../../components/ha-time-input"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import type { CalendarEventMutableParams } from "../../data/calendar"; import { CalendarEntityFeature, @@ -148,7 +148,7 @@ class DialogCalendarEventEditor extends LitElement { ); return html` - `} - + `; } diff --git a/src/panels/config/application_credentials/dialog-add-application-credential.ts b/src/panels/config/application_credentials/dialog-add-application-credential.ts index 8051c4d10c..45035ae46e 100644 --- a/src/panels/config/application_credentials/dialog-add-application-credential.ts +++ b/src/panels/config/application_credentials/dialog-add-application-credential.ts @@ -13,7 +13,7 @@ import "../../../components/ha-password-field"; import type { PickerComboBoxItem } from "../../../components/ha-picker-combo-box"; import "../../../components/ha-spinner"; import "../../../components/ha-textfield"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import type { ApplicationCredential, ApplicationCredentialsConfig, @@ -97,7 +97,7 @@ export class DialogAddApplicationCredential extends LitElement { ? domainToName(this.hass.localize, this._domain!) : ""; return html` - `} - + `; } diff --git a/src/panels/config/apps/dialogs/registries/dialog-registries.ts b/src/panels/config/apps/dialogs/registries/dialog-registries.ts index 6dc09c4a24..79322c5e00 100644 --- a/src/panels/config/apps/dialogs/registries/dialog-registries.ts +++ b/src/panels/config/apps/dialogs/registries/dialog-registries.ts @@ -9,7 +9,7 @@ import type { SchemaUnion } from "../../../../../components/ha-form/types"; import "../../../../../components/ha-icon-button"; import "../../../../../components/ha-icon-button-prev"; import "../../../../../components/ha-settings-row"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import { extractApiErrorMessage } from "../../../../../data/hassio/common"; import { addHassioDockerRegistry, @@ -60,7 +60,7 @@ class AppsRegistriesDialog extends LitElement { protected render(): TemplateResult { return html` - `} - + `; } diff --git a/src/panels/config/apps/dialogs/repositories/dialog-repositories.ts b/src/panels/config/apps/dialogs/repositories/dialog-repositories.ts index e13412f58e..2a20ced557 100644 --- a/src/panels/config/apps/dialogs/repositories/dialog-repositories.ts +++ b/src/panels/config/apps/dialogs/repositories/dialog-repositories.ts @@ -15,7 +15,7 @@ import "../../../../../components/ha-svg-icon"; import "../../../../../components/ha-textfield"; import type { HaTextField } from "../../../../../components/ha-textfield"; import "../../../../../components/ha-tooltip"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import type { HassioAddonInfo, HassioAddonsInfo, @@ -104,7 +104,7 @@ class AppsRepositoriesDialog extends LitElement { this._addon.addons ); return html` - - + `; } diff --git a/src/panels/config/areas/dialog-area-registry-detail.ts b/src/panels/config/areas/dialog-area-registry-detail.ts index 4223185d5a..3b7f0ccbed 100644 --- a/src/panels/config/areas/dialog-area-registry-detail.ts +++ b/src/panels/config/areas/dialog-area-registry-detail.ts @@ -19,7 +19,7 @@ import "../../../components/ha-settings-row"; import "../../../components/ha-suggest-with-ai-button"; import type { SuggestWithAIGenerateTask } from "../../../components/ha-suggest-with-ai-button"; import "../../../components/ha-textfield"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import type { GenDataTaskResult } from "../../../data/ai_task"; import type { AreaRegistryEntry, @@ -338,7 +338,7 @@ class DialogAreaDetail const isNew = !entry; return html` - - + `; } diff --git a/src/panels/config/areas/dialog-areas-floors-order.ts b/src/panels/config/areas/dialog-areas-floors-order.ts index c4b5278d1e..adcdade35c 100644 --- a/src/panels/config/areas/dialog-areas-floors-order.ts +++ b/src/panels/config/areas/dialog-areas-floors-order.ts @@ -18,7 +18,7 @@ import "../../../components/ha-md-list"; import "../../../components/ha-md-list-item"; import "../../../components/ha-sortable"; import "../../../components/ha-svg-icon"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import type { AreaRegistryEntry } from "../../../data/area/area_registry"; import { reorderAreaRegistryEntries, @@ -86,7 +86,7 @@ class DialogAreasFloorsOrder extends LitElement { ); return html` - - + `; } @@ -392,13 +392,13 @@ class DialogAreasFloorsOrder extends LitElement { haStyle, haStyleDialog, css` - ha-wa-dialog { + ha-dialog { max-height: 90%; --dialog-content-padding: var(--ha-space-2) var(--ha-space-6); } @media all and (max-width: 580px), all and (max-height: 500px) { - ha-wa-dialog { + ha-dialog { min-width: 100%; min-height: 100%; } diff --git a/src/panels/config/areas/dialog-floor-registry-detail.ts b/src/panels/config/areas/dialog-floor-registry-detail.ts index 1354b0a587..be05dde120 100644 --- a/src/panels/config/areas/dialog-floor-registry-detail.ts +++ b/src/panels/config/areas/dialog-floor-registry-detail.ts @@ -17,7 +17,7 @@ import "../../../components/ha-icon-picker"; import "../../../components/ha-settings-row"; import "../../../components/ha-svg-icon"; import "../../../components/ha-textfield"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import { updateAreaRegistryEntry } from "../../../data/area/area_registry"; import type { FloorRegistryEntry, @@ -106,7 +106,7 @@ class DialogFloorDetail extends LitElement { const entry = this._params.entry; return html` - - + `; } diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts index ea2f646388..156313a737 100644 --- a/src/panels/config/automation/add-automation-element-dialog.ts +++ b/src/panels/config/automation/add-automation-element-dialog.ts @@ -51,7 +51,7 @@ import "../../../components/ha-section-title"; import "../../../components/ha-service-icon"; import "../../../components/ha-tooltip"; import { TRIGGER_ICONS } from "../../../components/ha-trigger-icon"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/search-input"; import { ACTION_BUILDING_BLOCKS_GROUP, @@ -474,7 +474,7 @@ class DialogAddAutomationElement } return html` - ${this._renderContent()} - + `; } @@ -2077,7 +2077,7 @@ class DialogAddAutomationElement --ha-bottom-sheet-surface-background: var(--card-background-color); } - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; --ha-dialog-min-height: min( 800px, @@ -2100,7 +2100,7 @@ class DialogAddAutomationElement --ha-dialog-max-height: var(--ha-dialog-min-height); } - ha-wa-dialog a[slot="actionItems"] { + ha-dialog a[slot="actionItems"] { color: var(--secondary-text-color); } @@ -2190,7 +2190,7 @@ class DialogAddAutomationElement overflow: clip; } - ha-wa-dialog ha-automation-add-items { + ha-dialog ha-automation-add-items { margin-top: var(--ha-space-3); } diff --git a/src/panels/config/automation/automation-mode-dialog/dialog-automation-mode.ts b/src/panels/config/automation/automation-mode-dialog/dialog-automation-mode.ts index 9c98f57b71..a384c7d89a 100644 --- a/src/panels/config/automation/automation-mode-dialog/dialog-automation-mode.ts +++ b/src/panels/config/automation/automation-mode-dialog/dialog-automation-mode.ts @@ -3,7 +3,7 @@ import type { CSSResultGroup } from "lit"; import { LitElement, css, html, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../../common/dom/fire_event"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-icon-button"; import "../../../../components/ha-md-list-item"; @@ -67,7 +67,7 @@ class DialogAutomationMode extends LitElement implements HassDialog { ); return html` - - + `; } @@ -207,7 +207,7 @@ class DialogAutomationMode extends LitElement implements HassDialog { ha-textfield { display: block; } - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } .options { diff --git a/src/panels/config/automation/automation-save-dialog/dialog-automation-save.ts b/src/panels/config/automation/automation-save-dialog/dialog-automation-save.ts index 25ed3ec723..3c8f0794cc 100644 --- a/src/panels/config/automation/automation-save-dialog/dialog-automation-save.ts +++ b/src/panels/config/automation/automation-save-dialog/dialog-automation-save.ts @@ -17,7 +17,7 @@ import type { SuggestWithAIGenerateTask } from "../../../../components/ha-sugges import "../../../../components/ha-svg-icon"; import "../../../../components/ha-textarea"; import "../../../../components/ha-textfield"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../category/ha-category-picker"; import { supportsMarkdownHelper } from "../../../../common/translations/markdown_support"; @@ -255,7 +255,7 @@ class DialogAutomationSave extends LitElement implements HassDialog { ); return html` - - + `; } @@ -436,7 +436,7 @@ class DialogAutomationSave extends LitElement implements HassDialog { haStyle, haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0 var(--ha-space-6) var(--ha-space-6) var(--ha-space-6); } diff --git a/src/panels/config/automation/automation-save-timeout-dialog/dialog-automation-save-timeout.ts b/src/panels/config/automation/automation-save-timeout-dialog/dialog-automation-save-timeout.ts index 0ac163b9a8..0968e21b15 100644 --- a/src/panels/config/automation/automation-save-timeout-dialog/dialog-automation-save-timeout.ts +++ b/src/panels/config/automation/automation-save-timeout-dialog/dialog-automation-save-timeout.ts @@ -2,7 +2,7 @@ import type { CSSResultGroup } from "lit"; import { LitElement, css, html } from "lit"; import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../../common/dom/fire_event"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-spinner"; import "../../../../components/ha-alert"; import "../../../../components/ha-button"; @@ -56,7 +56,7 @@ class DialogAutomationSaveTimeout extends LitElement { ); return html` - - + `; } diff --git a/src/panels/config/automation/dialog-new-automation.ts b/src/panels/config/automation/dialog-new-automation.ts index 037b015480..c71a909b13 100644 --- a/src/panels/config/automation/dialog-new-automation.ts +++ b/src/panels/config/automation/dialog-new-automation.ts @@ -13,7 +13,7 @@ import { fireEvent } from "../../../common/dom/fire_event"; import { shouldHandleRequestSelectedEvent } from "../../../common/mwc/handle-request-selected-event"; import { stringCompare } from "../../../common/string/compare"; import "../../../components/ha-icon-next"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/ha-list"; import "../../../components/ha-list-item"; import "../../../components/ha-tip"; @@ -101,7 +101,7 @@ class DialogNewAutomation extends LitElement { const processedBlueprints = this._processedBlueprints(this.blueprints); return html` - `} - + `; } @@ -232,13 +232,13 @@ class DialogNewAutomation extends LitElement { haStyle, haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; --mdc-dialog-max-height: 60vh; --mdc-dialog-max-height: 60dvh; } @media all and (min-width: 550px) { - ha-wa-dialog { + ha-dialog { --mdc-dialog-min-width: 500px; } } diff --git a/src/panels/config/automation/paste-replace-dialog/dialog-paste-replace.ts b/src/panels/config/automation/paste-replace-dialog/dialog-paste-replace.ts index 49718379ff..ca815f3fdc 100644 --- a/src/panels/config/automation/paste-replace-dialog/dialog-paste-replace.ts +++ b/src/panels/config/automation/paste-replace-dialog/dialog-paste-replace.ts @@ -3,7 +3,7 @@ import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-yaml-editor"; import { haStyle, haStyleDialog } from "../../../../resources/styles"; @@ -38,7 +38,7 @@ class DialogPasteReplace extends LitElement { } return html` - - + `; } diff --git a/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts b/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts index f6bc08595e..850545a74a 100644 --- a/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts +++ b/src/panels/config/backup/dialogs/dialog-backup-onboarding.ts @@ -10,7 +10,7 @@ import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-icon-button"; import "../../../../components/ha-icon-button-prev"; import "../../../../components/ha-icon-next"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-md-list"; import "../../../../components/ha-md-list-item"; import "../../../../components/ha-password-field"; @@ -209,7 +209,7 @@ class DialogBackupOnboarding extends LitElement implements HassDialog { const isFirstStep = this._step === this._firstStep; return html` - ` : nothing} - + `; } @@ -544,7 +544,7 @@ class DialogBackupOnboarding extends LitElement implements HassDialog { haStyle, haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: var(--ha-space-2) var(--ha-space-6); --ha-dialog-max-height: min(605px, 100% - 48px); } diff --git a/src/panels/config/backup/dialogs/dialog-change-backup-encryption-key.ts b/src/panels/config/backup/dialogs/dialog-change-backup-encryption-key.ts index 29963cd1cf..5c5ab10e28 100644 --- a/src/panels/config/backup/dialogs/dialog-change-backup-encryption-key.ts +++ b/src/panels/config/backup/dialogs/dialog-change-backup-encryption-key.ts @@ -8,7 +8,7 @@ import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-icon-button"; import "../../../../components/ha-icon-button-prev"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-md-list"; import "../../../../components/ha-md-list-item"; import "../../../../components/ha-password-field"; @@ -89,7 +89,7 @@ class DialogChangeBackupEncryptionKey extends LitElement implements HassDialog { : ""; return html` - `} - + `; } @@ -284,7 +284,7 @@ class DialogChangeBackupEncryptionKey extends LitElement implements HassDialog { haStyle, haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: var(--ha-space-2) var(--ha-space-6); } ha-md-list { diff --git a/src/panels/config/backup/dialogs/dialog-download-decrypted-backup.ts b/src/panels/config/backup/dialogs/dialog-download-decrypted-backup.ts index 747bdc8bb0..286cc1e6ba 100644 --- a/src/panels/config/backup/dialogs/dialog-download-decrypted-backup.ts +++ b/src/panels/config/backup/dialogs/dialog-download-decrypted-backup.ts @@ -5,7 +5,7 @@ import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-alert"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-password-field"; import { canDecryptBackupOnDownload, @@ -55,7 +55,7 @@ class DialogDownloadDecryptedBackup extends LitElement implements HassDialog { } return html` - - + `; } @@ -179,7 +179,7 @@ class DialogDownloadDecryptedBackup extends LitElement implements HassDialog { haStyle, haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: var(--ha-space-2) var(--ha-space-6); } diff --git a/src/panels/config/backup/dialogs/dialog-generate-backup.ts b/src/panels/config/backup/dialogs/dialog-generate-backup.ts index eaec579816..98c8397b15 100644 --- a/src/panels/config/backup/dialogs/dialog-generate-backup.ts +++ b/src/panels/config/backup/dialogs/dialog-generate-backup.ts @@ -15,7 +15,7 @@ import "../../../../components/ha-md-list"; import "../../../../components/ha-md-list-item"; import "../../../../components/ha-select"; import "../../../../components/ha-textfield"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { BackupAgent, BackupConfig, @@ -180,7 +180,7 @@ class DialogGenerateBackup extends LitElement implements HassDialog { const selectedAgents = this._formData.agent_ids; return html` - `} - + `; } @@ -443,7 +443,7 @@ class DialogGenerateBackup extends LitElement implements HassDialog { haStyle, haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 24px; } ha-md-list { diff --git a/src/panels/config/backup/dialogs/dialog-local-backup-location.ts b/src/panels/config/backup/dialogs/dialog-local-backup-location.ts index f06f4b858a..f36d610e89 100644 --- a/src/panels/config/backup/dialogs/dialog-local-backup-location.ts +++ b/src/panels/config/backup/dialogs/dialog-local-backup-location.ts @@ -5,7 +5,7 @@ import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-alert"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-form/ha-form"; import type { HaFormSchema, @@ -63,7 +63,7 @@ class LocalBackupLocationDialog extends LitElement { return nothing; } return html` - - + `; } diff --git a/src/panels/config/backup/dialogs/dialog-new-backup.ts b/src/panels/config/backup/dialogs/dialog-new-backup.ts index 0da94b246d..25cb34cd4f 100644 --- a/src/panels/config/backup/dialogs/dialog-new-backup.ts +++ b/src/panels/config/backup/dialogs/dialog-new-backup.ts @@ -5,7 +5,7 @@ import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-icon-next"; import "../../../../components/ha-md-list"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-md-list-item"; import "../../../../components/ha-svg-icon"; import type { HassDialog } from "../../../../dialogs/make-dialog-manager"; @@ -45,7 +45,7 @@ class DialogNewBackup extends LitElement implements HassDialog { } return html` - - + `; } @@ -113,7 +113,7 @@ class DialogNewBackup extends LitElement implements HassDialog { haStyle, haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } diff --git a/src/panels/config/backup/dialogs/dialog-restore-backup.ts b/src/panels/config/backup/dialogs/dialog-restore-backup.ts index ef13362802..429eb9a46d 100644 --- a/src/panels/config/backup/dialogs/dialog-restore-backup.ts +++ b/src/panels/config/backup/dialogs/dialog-restore-backup.ts @@ -11,7 +11,7 @@ import "../../../../components/ha-password-field"; import { isComponentLoaded } from "../../../../common/config/is_component_loaded"; import "../../../../components/ha-alert"; import "../../../../components/ha-svg-icon"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { RestoreBackupParams } from "../../../../data/backup"; import { fetchBackupConfig, @@ -136,7 +136,7 @@ class DialogRestoreBackup extends LitElement implements HassDialog { ); return html` - + `; } diff --git a/src/panels/config/backup/dialogs/dialog-set-backup-encryption-key.ts b/src/panels/config/backup/dialogs/dialog-set-backup-encryption-key.ts index 0ce006f5dc..5a3753dcd3 100644 --- a/src/panels/config/backup/dialogs/dialog-set-backup-encryption-key.ts +++ b/src/panels/config/backup/dialogs/dialog-set-backup-encryption-key.ts @@ -7,7 +7,7 @@ import { copyToClipboard } from "../../../../common/util/copy-clipboard"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-icon-button"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-md-list"; import "../../../../components/ha-md-list-item"; import "../../../../components/ha-password-field"; @@ -86,7 +86,7 @@ class DialogSetBackupEncryptionKey extends LitElement implements HassDialog { : ""; return html` - `} - + `; } @@ -210,7 +210,7 @@ class DialogSetBackupEncryptionKey extends LitElement implements HassDialog { haStyle, haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: var(--ha-space-2) var(--ha-space-6); } ha-md-list { diff --git a/src/panels/config/backup/dialogs/dialog-show-backup-encryption-key.ts b/src/panels/config/backup/dialogs/dialog-show-backup-encryption-key.ts index 2a157948d9..829a911d40 100644 --- a/src/panels/config/backup/dialogs/dialog-show-backup-encryption-key.ts +++ b/src/panels/config/backup/dialogs/dialog-show-backup-encryption-key.ts @@ -8,7 +8,7 @@ import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-icon-button"; import "../../../../components/ha-icon-button-prev"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-md-list"; import "../../../../components/ha-md-list-item"; import "../../../../components/ha-password-field"; @@ -47,7 +47,7 @@ class DialogShowBackupEncryptionKey extends LitElement implements HassDialog { } return html` - - + `; } @@ -128,7 +128,7 @@ class DialogShowBackupEncryptionKey extends LitElement implements HassDialog { haStyle, haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: var(--ha-space-2) var(--ha-space-6); } ha-md-list { diff --git a/src/panels/config/backup/dialogs/dialog-upload-backup.ts b/src/panels/config/backup/dialogs/dialog-upload-backup.ts index 2e726994e7..4c56f513ef 100644 --- a/src/panels/config/backup/dialogs/dialog-upload-backup.ts +++ b/src/panels/config/backup/dialogs/dialog-upload-backup.ts @@ -11,7 +11,7 @@ import "../../../../components/ha-alert"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-file-upload"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import { CORE_LOCAL_AGENT, HASSIO_LOCAL_AGENT, @@ -74,7 +74,7 @@ export class DialogUploadBackup } return html` - - + `; } diff --git a/src/panels/config/blueprint/dialog-import-blueprint.ts b/src/panels/config/blueprint/dialog-import-blueprint.ts index d6ae408244..7ad2585120 100644 --- a/src/panels/config/blueprint/dialog-import-blueprint.ts +++ b/src/panels/config/blueprint/dialog-import-blueprint.ts @@ -12,7 +12,7 @@ import "../../../components/ha-expansion-panel"; import "../../../components/ha-markdown"; import "../../../components/ha-spinner"; import "../../../components/ha-textfield"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import type { HaTextField } from "../../../components/ha-textfield"; import type { BlueprintImportResult } from "../../../data/blueprint"; import { importBlueprint, saveBlueprint } from "../../../data/blueprint"; @@ -68,7 +68,7 @@ class DialogImportBlueprint extends LitElement { } const heading = this.hass.localize("ui.panel.config.blueprint.add.header"); return html` - `} - + `; } diff --git a/src/panels/config/category/dialog-assign-category.ts b/src/panels/config/category/dialog-assign-category.ts index 13ae103047..bee7b2130d 100644 --- a/src/panels/config/category/dialog-assign-category.ts +++ b/src/panels/config/category/dialog-assign-category.ts @@ -4,7 +4,7 @@ import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../common/dom/fire_event"; import "../../../components/ha-alert"; import "../../../components/ha-button"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/ha-dialog-footer"; import { updateEntityRegistryEntry } from "../../../data/entity/entity_registry"; import { haStyleDialog } from "../../../resources/styles"; @@ -52,7 +52,7 @@ class DialogAssignCategory extends LitElement { } const entry = this._params.entityReg.categories[this._params.scope]; return html` - - + `; } diff --git a/src/panels/config/category/dialog-category-registry-detail.ts b/src/panels/config/category/dialog-category-registry-detail.ts index 07677832eb..eab6da4cb3 100644 --- a/src/panels/config/category/dialog-category-registry-detail.ts +++ b/src/panels/config/category/dialog-category-registry-detail.ts @@ -3,7 +3,7 @@ import { css, html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../common/dom/fire_event"; import "../../../components/ha-alert"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/ha-dialog-footer"; import "../../../components/ha-icon-picker"; import "../../../components/ha-button"; @@ -65,7 +65,7 @@ class DialogCategoryDetail extends LitElement { const entry = this._params.entry; const nameInvalid = !this._isNameValid(); return html` - - + `; } diff --git a/src/panels/config/cloud/account/dialog-cloud-support-package.ts b/src/panels/config/cloud/account/dialog-cloud-support-package.ts index 61819338d5..59b8df0c06 100644 --- a/src/panels/config/cloud/account/dialog-cloud-support-package.ts +++ b/src/panels/config/cloud/account/dialog-cloud-support-package.ts @@ -5,7 +5,7 @@ import "../../../../components/ha-alert"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-markdown-element"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-select"; import "../../../../components/ha-spinner"; import "../../../../components/ha-textarea"; @@ -39,7 +39,7 @@ export class DialogSupportPackage extends LitElement { protected render() { return html` - - + `; } diff --git a/src/panels/config/cloud/account/dialog-cloud-tts-try.ts b/src/panels/config/cloud/account/dialog-cloud-tts-try.ts index d5ef75ad36..4d6cf5ebb5 100644 --- a/src/panels/config/cloud/account/dialog-cloud-tts-try.ts +++ b/src/panels/config/cloud/account/dialog-cloud-tts-try.ts @@ -16,7 +16,7 @@ import type { } from "../../../../components/ha-select"; import "../../../../components/ha-textarea"; import type { HaTextArea } from "../../../../components/ha-textarea"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import { showAutomationEditor } from "../../../../data/automation"; import { MediaPlayerEntityFeature } from "../../../../data/media-player"; import { convertTextToSpeech } from "../../../../data/tts"; @@ -91,7 +91,7 @@ export class DialogTryTts extends LitElement { }); return html` - - + `; } diff --git a/src/panels/config/cloud/dialog-cloud-already-connected/dialog-cloud-already-connected.ts b/src/panels/config/cloud/dialog-cloud-already-connected/dialog-cloud-already-connected.ts index 16ab4a3aed..083566dace 100644 --- a/src/panels/config/cloud/dialog-cloud-already-connected/dialog-cloud-already-connected.ts +++ b/src/panels/config/cloud/dialog-cloud-already-connected/dialog-cloud-already-connected.ts @@ -8,7 +8,7 @@ import "../../../../components/ha-alert"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-icon-button"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import { haStyleDialog } from "../../../../resources/styles"; import type { HomeAssistant } from "../../../../types"; import { obfuscateUrl } from "../../../../util/url"; @@ -48,7 +48,7 @@ class DialogCloudAlreadyConnected extends LitElement { const { details } = this._params; return html` - - + `; } diff --git a/src/panels/config/cloud/dialog-cloud-certificate/dialog-cloud-certificate.ts b/src/panels/config/cloud/dialog-cloud-certificate/dialog-cloud-certificate.ts index 7e9c89867a..91e24ca19f 100644 --- a/src/panels/config/cloud/dialog-cloud-certificate/dialog-cloud-certificate.ts +++ b/src/panels/config/cloud/dialog-cloud-certificate/dialog-cloud-certificate.ts @@ -7,7 +7,7 @@ import "../../../../components/ha-dialog-footer"; import { haStyleDialog } from "../../../../resources/styles"; import type { HomeAssistant } from "../../../../types"; import "../../../../components/ha-button"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { CloudCertificateParams as CloudCertificateDialogParams } from "./show-dialog-cloud-certificate"; @customElement("dialog-cloud-certificate") @@ -40,7 +40,7 @@ class DialogCloudCertificate extends LitElement { const { certificateInfo } = this._params; return html` - - + `; } diff --git a/src/panels/config/cloud/dialog-manage-cloudhook/dialog-manage-cloudhook.ts b/src/panels/config/cloud/dialog-manage-cloudhook/dialog-manage-cloudhook.ts index 28fadacc5a..be23e3c0f1 100644 --- a/src/panels/config/cloud/dialog-manage-cloudhook/dialog-manage-cloudhook.ts +++ b/src/panels/config/cloud/dialog-manage-cloudhook/dialog-manage-cloudhook.ts @@ -12,7 +12,7 @@ import type { WebhookDialogParams } from "./show-dialog-manage-cloudhook"; import "../../../../components/ha-button"; import "../../../../components/ha-copy-textfield"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; @customElement("dialog-manage-cloudhook") export class DialogManageCloudhook extends LitElement { @@ -50,7 +50,7 @@ export class DialogManageCloudhook extends LitElement { ) : documentationUrl(this.hass!, `/integrations/${webhook.domain}/`); return html` - - + `; } diff --git a/src/panels/config/core/updates/dialog-join-beta.ts b/src/panels/config/core/updates/dialog-join-beta.ts index 46c3a68d6f..d5d7e0d4d1 100644 --- a/src/panels/config/core/updates/dialog-join-beta.ts +++ b/src/panels/config/core/updates/dialog-join-beta.ts @@ -6,7 +6,7 @@ import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-alert"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { HassDialog } from "../../../../dialogs/make-dialog-manager"; import { haStyleDialog } from "../../../../resources/styles"; import type { HomeAssistant } from "../../../../types"; @@ -45,7 +45,7 @@ export class DialogJoinBeta } return html` - - + `; } diff --git a/src/panels/config/dashboard/dialog-new-dashboard.ts b/src/panels/config/dashboard/dialog-new-dashboard.ts index 089a9722f1..448be2c15c 100644 --- a/src/panels/config/dashboard/dialog-new-dashboard.ts +++ b/src/panels/config/dashboard/dialog-new-dashboard.ts @@ -9,7 +9,7 @@ import type { LocalizeFunc, LocalizeKeys, } from "../../../common/translations/localize"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/search-input"; import type { LovelaceConfig } from "../../../data/lovelace/config/types"; import type { HassDialog } from "../../../dialogs/make-dialog-manager"; @@ -112,7 +112,7 @@ class DialogNewDashboard extends LitElement implements HassDialog { const defaultConfig = this._generateDefaultConfig(this.hass.localize); return html` - - + `; } @@ -258,12 +258,12 @@ class DialogNewDashboard extends LitElement implements HassDialog { return [ haStyleScrollbar, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; --dialog-z-index: 6; --ha-dialog-min-height: 60svh; } - ha-wa-dialog::part(body) { + ha-dialog::part(body) { overflow: hidden; min-height: 0; } diff --git a/src/panels/config/developer-tools/statistics/dialog-statistics-adjust-sum.ts b/src/panels/config/developer-tools/statistics/dialog-statistics-adjust-sum.ts index 9b443f5603..9e2bf6a871 100644 --- a/src/panels/config/developer-tools/statistics/dialog-statistics-adjust-sum.ts +++ b/src/panels/config/developer-tools/statistics/dialog-statistics-adjust-sum.ts @@ -7,7 +7,7 @@ import { formatDateTime } from "../../../../common/datetime/format_date_time"; import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-spinner"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-button"; import "../../../../components/ha-form/ha-form"; import "../../../../components/ha-icon-next"; @@ -148,7 +148,7 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement { } return html` - ${content} ${footer} - + `; } diff --git a/src/panels/config/developer-tools/statistics/dialog-statistics-fix-units-changed.ts b/src/panels/config/developer-tools/statistics/dialog-statistics-fix-units-changed.ts index e42fdc42f4..a56d7ed67d 100644 --- a/src/panels/config/developer-tools/statistics/dialog-statistics-fix-units-changed.ts +++ b/src/panels/config/developer-tools/statistics/dialog-statistics-fix-units-changed.ts @@ -3,7 +3,7 @@ import { html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-button"; import "../../../../components/ha-formfield"; import "../../../../components/ha-radio"; @@ -49,7 +49,7 @@ export class DialogStatisticsFixUnitsChanged extends LitElement { } return html` - - + `; } diff --git a/src/panels/config/developer-tools/statistics/dialog-statistics-fix.ts b/src/panels/config/developer-tools/statistics/dialog-statistics-fix.ts index 93c5af1feb..eaad7fa104 100644 --- a/src/panels/config/developer-tools/statistics/dialog-statistics-fix.ts +++ b/src/panels/config/developer-tools/statistics/dialog-statistics-fix.ts @@ -4,7 +4,7 @@ import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-spinner"; import { clearStatistics, getStatisticLabel } from "../../../../data/recorder"; import { haStyle, haStyleDialog } from "../../../../resources/styles"; @@ -47,7 +47,7 @@ export class DialogStatisticsFix extends LitElement { const issue = this._params.issue; return html` - `} - + `; } diff --git a/src/panels/config/devices/device-detail/ha-device-automation-dialog.ts b/src/panels/config/devices/device-detail/ha-device-automation-dialog.ts index 0e904b5e1d..f44e621566 100644 --- a/src/panels/config/devices/device-detail/ha-device-automation-dialog.ts +++ b/src/panels/config/devices/device-detail/ha-device-automation-dialog.ts @@ -12,7 +12,7 @@ import { shouldHandleRequestSelectedEvent } from "../../../../common/mwc/handle- import "../../../../components/ha-icon-next"; import "../../../../components/ha-list"; import "../../../../components/ha-list-item"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { AutomationConfig } from "../../../../data/automation"; import { showAutomationEditor } from "../../../../data/automation"; import type { @@ -143,7 +143,7 @@ export class DialogDeviceAutomation extends LitElement { }); return html` - - + `; } @@ -261,12 +261,12 @@ export class DialogDeviceAutomation extends LitElement { haStyle, haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; --mdc-dialog-max-height: 60vh; } @media all and (min-width: 550px) { - ha-wa-dialog { + ha-dialog { --mdc-dialog-min-width: 500px; } } diff --git a/src/panels/config/devices/device-detail/integration-elements/mqtt/dialog-mqtt-device-debug-info.ts b/src/panels/config/devices/device-detail/integration-elements/mqtt/dialog-mqtt-device-debug-info.ts index ec3b51c58d..9ade4713a6 100644 --- a/src/panels/config/devices/device-detail/integration-elements/mqtt/dialog-mqtt-device-debug-info.ts +++ b/src/panels/config/devices/device-detail/integration-elements/mqtt/dialog-mqtt-device-debug-info.ts @@ -7,7 +7,7 @@ import { fireEvent } from "../../../../../../common/dom/fire_event"; import "../../../../../../components/ha-dialog-footer"; import "../../../../../../components/ha-formfield"; import "../../../../../../components/ha-switch"; -import "../../../../../../components/ha-wa-dialog"; +import "../../../../../../components/ha-dialog"; import "../../../../../../components/ha-button"; import type { HaSwitch } from "../../../../../../components/ha-switch"; import type { MQTTDeviceDebugInfo } from "../../../../../../data/mqtt"; @@ -48,7 +48,7 @@ class DialogMQTTDeviceDebugInfo extends LitElement { } return html` - - + `; } diff --git a/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts b/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts index 945c747d26..6c12e70bbe 100644 --- a/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts +++ b/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts @@ -5,7 +5,7 @@ import { fireEvent } from "../../../../common/dom/fire_event"; import { computeDeviceNameDisplay } from "../../../../common/entity/compute_device_name"; import "../../../../components/ha-alert"; import "../../../../components/ha-area-picker"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-button"; import "../../../../components/ha-labels-picker"; @@ -65,7 +65,7 @@ class DialogDeviceRegistryDetail extends LitElement { } const device = this._params.device; return html` - - + `; } diff --git a/src/panels/config/energy/dialogs/dialog-energy-battery-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-battery-settings.ts index 3133044a78..3a9a763a4a 100644 --- a/src/panels/config/energy/dialogs/dialog-energy-battery-settings.ts +++ b/src/panels/config/energy/dialogs/dialog-energy-battery-settings.ts @@ -7,7 +7,7 @@ import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-formfield"; import "../../../../components/ha-radio"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { HaRadio } from "../../../../components/ha-radio"; import type { BatterySourceTypeEnergyPreference, @@ -157,7 +157,7 @@ export class DialogEnergyBatterySettings } return html` - - + `; } diff --git a/src/panels/config/energy/dialogs/dialog-energy-device-settings-water.ts b/src/panels/config/energy/dialogs/dialog-energy-device-settings-water.ts index 55e7412b8b..329dee8293 100644 --- a/src/panels/config/energy/dialogs/dialog-energy-device-settings-water.ts +++ b/src/panels/config/energy/dialogs/dialog-energy-device-settings-water.ts @@ -8,7 +8,7 @@ import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-radio"; import "../../../../components/ha-select"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { HaSelectSelectEvent } from "../../../../components/ha-select"; import type { DeviceConsumptionEnergyPreference } from "../../../../data/energy"; import { energyStatisticHelpUrl } from "../../../../data/energy"; @@ -124,7 +124,7 @@ export class DialogEnergyDeviceSettingsWater })); return html` - - + `; } diff --git a/src/panels/config/energy/dialogs/dialog-energy-device-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-device-settings.ts index 8e85f48772..db55971961 100644 --- a/src/panels/config/energy/dialogs/dialog-energy-device-settings.ts +++ b/src/panels/config/energy/dialogs/dialog-energy-device-settings.ts @@ -8,7 +8,7 @@ import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-radio"; import "../../../../components/ha-select"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { HaSelectOption, HaSelectSelectEvent, @@ -137,7 +137,7 @@ export class DialogEnergyDeviceSettings ]; return html` - - + `; } diff --git a/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts index d78170db3d..d35454c2a1 100644 --- a/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts +++ b/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts @@ -9,7 +9,7 @@ import "../../../../components/ha-formfield"; import "../../../../components/ha-radio"; import "../../../../components/ha-button"; import "../../../../components/ha-markdown"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { HaRadio } from "../../../../components/ha-radio"; import "../../../../components/ha-textfield"; import type { GasSourceTypeEnergyPreference } from "../../../../data/energy"; @@ -132,7 +132,7 @@ export class DialogEnergyGasSettings isExternalStatistic(this._source.stat_energy_from); return html` - - + `; } diff --git a/src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts index 68555cfd2b..16ac52f7f8 100644 --- a/src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts +++ b/src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts @@ -9,7 +9,7 @@ import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-formfield"; import "../../../../components/ha-radio"; import "../../../../components/ha-markdown"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { HaRadio } from "../../../../components/ha-radio"; import type { FlowFromGridSourceEnergyPreference, @@ -129,7 +129,7 @@ export class DialogEnergyGridFlowSettings ); return html` - - + `; } diff --git a/src/panels/config/energy/dialogs/dialog-energy-grid-power-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-grid-power-settings.ts index 0807653edc..ca0b851d98 100644 --- a/src/panels/config/energy/dialogs/dialog-energy-grid-power-settings.ts +++ b/src/panels/config/energy/dialogs/dialog-energy-grid-power-settings.ts @@ -7,7 +7,7 @@ import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-formfield"; import "../../../../components/ha-radio"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { HaRadio } from "../../../../components/ha-radio"; import type { GridPowerSourceInput, @@ -126,7 +126,7 @@ export class DialogEnergyGridPowerSettings } return html` - - + `; } diff --git a/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts index d1f32e172e..3bb33d36fe 100644 --- a/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts +++ b/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts @@ -11,7 +11,7 @@ import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-radio"; import "../../../../components/ha-svg-icon"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { HaRadio } from "../../../../components/ha-radio"; import type { ConfigEntry } from "../../../../data/config_entries"; import { getConfigEntries } from "../../../../data/config_entries"; @@ -102,7 +102,7 @@ export class DialogEnergySolarSettings } return html` - - + `; } diff --git a/src/panels/config/energy/dialogs/dialog-energy-water-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-water-settings.ts index 4d71095328..894197b05a 100644 --- a/src/panels/config/energy/dialogs/dialog-energy-water-settings.ts +++ b/src/panels/config/energy/dialogs/dialog-energy-water-settings.ts @@ -9,7 +9,7 @@ import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-formfield"; import "../../../../components/ha-radio"; import "../../../../components/ha-markdown"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { HaRadio } from "../../../../components/ha-radio"; import "../../../../components/ha-textfield"; import type { WaterSourceTypeEnergyPreference } from "../../../../data/energy"; @@ -98,7 +98,7 @@ export class DialogEnergyWaterSettings isExternalStatistic(this._source.stat_energy_from); return html` - - + `; } diff --git a/src/panels/config/hardware/dialog-hardware-available.ts b/src/panels/config/hardware/dialog-hardware-available.ts index fe6eccbd92..3ecbaf7fe1 100644 --- a/src/panels/config/hardware/dialog-hardware-available.ts +++ b/src/panels/config/hardware/dialog-hardware-available.ts @@ -7,7 +7,7 @@ import { fireEvent } from "../../../common/dom/fire_event"; import { stringCompare } from "../../../common/string/compare"; import "../../../components/ha-expansion-panel"; import "../../../components/ha-icon-next"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/search-input"; import { extractApiErrorMessage } from "../../../data/hassio/common"; import type { HassioHardwareInfo } from "../../../data/hassio/hardware"; @@ -87,7 +87,7 @@ class DialogHardwareAvailable extends LitElement implements HassDialog { ); return html` - - + `; } @@ -168,7 +168,7 @@ class DialogHardwareAvailable extends LitElement implements HassDialog { return [ haStyleScrollbar, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } .content-container { diff --git a/src/panels/config/helpers/dialog-helper-detail.ts b/src/panels/config/helpers/dialog-helper-detail.ts index 95614c39fd..3b3e2b2525 100644 --- a/src/panels/config/helpers/dialog-helper-detail.ts +++ b/src/panels/config/helpers/dialog-helper-detail.ts @@ -15,7 +15,7 @@ import "../../../components/ha-list-item"; import "../../../components/ha-spinner"; import "../../../components/ha-svg-icon"; import "../../../components/ha-tooltip"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/search-input"; import { getConfigFlowHandlers } from "../../../data/config_flow"; import { createCounter } from "../../../data/counter"; @@ -283,7 +283,7 @@ export class DialogHelperDetail extends LitElement { } return html` - ${content} ${footer} - + `; } @@ -441,7 +441,7 @@ export class DialogHelperDetail extends LitElement { haStyleScrollbar, haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } ha-icon-next { diff --git a/src/panels/config/helpers/forms/dialog-schedule-block-info.ts b/src/panels/config/helpers/forms/dialog-schedule-block-info.ts index d59f202fc5..4279416a3c 100644 --- a/src/panels/config/helpers/forms/dialog-schedule-block-info.ts +++ b/src/panels/config/helpers/forms/dialog-schedule-block-info.ts @@ -4,7 +4,7 @@ import memoizeOne from "memoize-one"; import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-form/ha-form"; import "../../../../components/ha-button"; import { haStyleDialog } from "../../../../resources/styles"; @@ -79,7 +79,7 @@ class DialogScheduleBlockInfo extends LitElement { } return html` - - + `; } diff --git a/src/panels/config/integrations/dialog-add-integration.ts b/src/panels/config/integrations/dialog-add-integration.ts index 62981bea38..ff6dc35049 100644 --- a/src/panels/config/integrations/dialog-add-integration.ts +++ b/src/panels/config/integrations/dialog-add-integration.ts @@ -18,7 +18,7 @@ import type { LocalizeFunc } from "../../../common/translations/localize"; import "../../../components/ha-icon-button-prev"; import "../../../components/ha-list"; import "../../../components/ha-spinner"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/search-input"; import { getConfigEntries } from "../../../data/config_entries"; import { @@ -387,7 +387,7 @@ class AddIntegrationDialog extends LitElement { ? this._getBrandHeading(pickedIntegration, flowsInProgress) : this.hass.localize("ui.panel.config.integrations.new"); - return html``; + `; } private _getFlowsForCurrentView( @@ -819,7 +819,7 @@ class AddIntegrationDialog extends LitElement { haStyleScrollbar, haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } search-input { diff --git a/src/panels/config/integrations/dialog-pick-config-entry.ts b/src/panels/config/integrations/dialog-pick-config-entry.ts index d7972be349..46ccd252a0 100644 --- a/src/panels/config/integrations/dialog-pick-config-entry.ts +++ b/src/panels/config/integrations/dialog-pick-config-entry.ts @@ -3,7 +3,7 @@ import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../common/dom/fire_event"; import "../../../components/ha-md-list"; import "../../../components/ha-md-list-item"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import { ERROR_STATES, RECOVERABLE_STATES } from "../../../data/config_entries"; import type { HomeAssistant } from "../../../types"; import type { PickConfigEntryDialogParams } from "./show-pick-config-entry-dialog"; @@ -38,7 +38,7 @@ export class DialogPickConfigEntry extends LitElement { `component.${this._params.domain}.config_subentries.${this._params.subFlowType}.initiate_flow.user` ); return html` - ` )} - + `; } @@ -67,7 +67,7 @@ export class DialogPickConfigEntry extends LitElement { } static styles = css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } `; diff --git a/src/panels/config/integrations/dialog-yaml-integration.ts b/src/panels/config/integrations/dialog-yaml-integration.ts index 95427a00f3..159225e65e 100644 --- a/src/panels/config/integrations/dialog-yaml-integration.ts +++ b/src/panels/config/integrations/dialog-yaml-integration.ts @@ -8,7 +8,7 @@ import type { YamlIntegrationDialogParams } from "./show-add-integration-dialog" import "../../../components/ha-button"; import "../../../components/ha-dialog-footer"; import "../../../components/ha-svg-icon"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; @customElement("dialog-yaml-integration") export class DialogYamlIntegration extends LitElement { @@ -41,7 +41,7 @@ export class DialogYamlIntegration extends LitElement { ? documentationUrl(this.hass, `/integrations/${manifest.domain}`) : manifest.documentation; return html` - `} - + `; } @@ -97,7 +97,7 @@ export class DialogYamlIntegration extends LitElement { a { text-decoration: none; } - ha-wa-dialog { + ha-dialog { /* Place above other dialogs */ --dialog-z-index: 104; } diff --git a/src/panels/config/integrations/integration-panels/bluetooth/dialog-bluetooth-device-info.ts b/src/panels/config/integrations/integration-panels/bluetooth/dialog-bluetooth-device-info.ts index b686abd101..293afb2769 100644 --- a/src/panels/config/integrations/integration-panels/bluetooth/dialog-bluetooth-device-info.ts +++ b/src/panels/config/integrations/integration-panels/bluetooth/dialog-bluetooth-device-info.ts @@ -5,7 +5,7 @@ import { fireEvent } from "../../../../../common/dom/fire_event"; import { copyToClipboard } from "../../../../../common/util/copy-clipboard"; import "../../../../../components/ha-button"; import "../../../../../components/ha-dialog-footer"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import type { HomeAssistant } from "../../../../../types"; import { showToast } from "../../../../../util/toast"; import type { BluetoothDeviceInfoDialogParams } from "./show-dialog-bluetooth-device-info"; @@ -56,7 +56,7 @@ class DialogBluetoothDeviceInfo extends LitElement { } return html` - - + `; } } diff --git a/src/panels/config/integrations/integration-panels/esphome/dialog-esphome-encryption-key.ts b/src/panels/config/integrations/integration-panels/esphome/dialog-esphome-encryption-key.ts index 7cd343d814..f07eb55013 100644 --- a/src/panels/config/integrations/integration-panels/esphome/dialog-esphome-encryption-key.ts +++ b/src/panels/config/integrations/integration-panels/esphome/dialog-esphome-encryption-key.ts @@ -1,4 +1,4 @@ -import { mdiClose, mdiContentCopy } from "@mdi/js"; +import { mdiContentCopy } from "@mdi/js"; import type { CSSResultGroup } from "lit"; import { css, html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; @@ -6,9 +6,8 @@ import { fireEvent } from "../../../../../common/dom/fire_event"; import { copyToClipboard } from "../../../../../common/util/copy-clipboard"; import "../../../../../components/ha-button"; import "../../../../../components/ha-dialog-footer"; -import "../../../../../components/ha-dialog-header"; import "../../../../../components/ha-icon-button"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import { haStyleDialog } from "../../../../../resources/styles"; import type { HomeAssistant } from "../../../../../types"; import { showToast } from "../../../../../util/toast"; @@ -37,27 +36,13 @@ class DialogESPHomeEncryptionKey extends LitElement { } return html` - - - - - ${this.hass.localize( - "ui.panel.config.devices.esphome.encryption_key_title" - )} - - -

    ${this.hass.localize( @@ -80,7 +65,7 @@ class DialogESPHomeEncryptionKey extends LitElement { ${this.hass.localize("ui.common.close")} - + `; } diff --git a/src/panels/config/integrations/integration-panels/matter/dialog-matter-add-device.ts b/src/panels/config/integrations/integration-panels/matter/dialog-matter-add-device.ts index d246290d5b..534fd7dcf6 100644 --- a/src/panels/config/integrations/integration-panels/matter/dialog-matter-add-device.ts +++ b/src/panels/config/integrations/integration-panels/matter/dialog-matter-add-device.ts @@ -6,7 +6,7 @@ import { fireEvent } from "../../../../../common/dom/fire_event"; import "../../../../../components/ha-dialog-footer"; import "../../../../../components/ha-icon-button-arrow-prev"; import "../../../../../components/ha-button"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import { commissionMatterDevice, redirectOnNewMatterDevice, @@ -173,7 +173,7 @@ class DialogMatterAddDevice extends LitElement { const actions = this._renderActions(); return html` - ${actions} `} - + `; } @@ -205,7 +205,7 @@ class DialogMatterAddDevice extends LitElement { :host { --horizontal-padding: 24px; } - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } @media all and (max-width: 450px), all and (max-height: 500px) { diff --git a/src/panels/config/integrations/integration-panels/matter/dialog-matter-manage-fabrics.ts b/src/panels/config/integrations/integration-panels/matter/dialog-matter-manage-fabrics.ts index 0929b0331d..2444978944 100644 --- a/src/panels/config/integrations/integration-panels/matter/dialog-matter-manage-fabrics.ts +++ b/src/panels/config/integrations/integration-panels/matter/dialog-matter-manage-fabrics.ts @@ -6,7 +6,7 @@ import { fireEvent } from "../../../../../common/dom/fire_event"; import "../../../../../components/ha-list"; import "../../../../../components/ha-list-item"; import "../../../../../components/ha-spinner"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import type { MatterFabricData, MatterNodeDiagnostics, @@ -47,7 +47,7 @@ class DialogMatterManageFabrics extends LitElement { } return html` -

    `} -     + `; } @@ -154,7 +154,7 @@ class DialogMatterManageFabrics extends LitElement { return [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; --mdc-list-side-padding: 24px; --mdc-list-side-padding-right: 16px; diff --git a/src/panels/config/integrations/integration-panels/matter/dialog-matter-open-commissioning-window.ts b/src/panels/config/integrations/integration-panels/matter/dialog-matter-open-commissioning-window.ts index 5758e173e0..a416a3e13e 100644 --- a/src/panels/config/integrations/integration-panels/matter/dialog-matter-open-commissioning-window.ts +++ b/src/panels/config/integrations/integration-panels/matter/dialog-matter-open-commissioning-window.ts @@ -6,7 +6,7 @@ import { fireEvent } from "../../../../../common/dom/fire_event"; import { copyToClipboard } from "../../../../../common/util/copy-clipboard"; import "../../../../../components/ha-button"; import "../../../../../components/ha-dialog-footer"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import "../../../../../components/ha-qr-code"; import "../../../../../components/ha-spinner"; import { domainToName } from "../../../../../data/integration"; @@ -42,7 +42,7 @@ class DialogMatterOpenCommissioningWindow extends LitElement { } return html` - `} - + `; } diff --git a/src/panels/config/integrations/integration-panels/matter/dialog-matter-ping-node.ts b/src/panels/config/integrations/integration-panels/matter/dialog-matter-ping-node.ts index b651ea74d1..450843fa57 100644 --- a/src/panels/config/integrations/integration-panels/matter/dialog-matter-ping-node.ts +++ b/src/panels/config/integrations/integration-panels/matter/dialog-matter-ping-node.ts @@ -9,7 +9,7 @@ import "../../../../../components/ha-button"; import "../../../../../components/ha-dialog-footer"; import "../../../../../components/ha-list-item"; import "../../../../../components/ha-spinner"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import { pingMatterNode } from "../../../../../data/matter"; import { haStyle, haStyleDialog } from "../../../../../resources/styles"; import type { HomeAssistant } from "../../../../../types"; @@ -50,7 +50,7 @@ class DialogMatterPingNode extends LitElement { } return html` - `} - + `; } diff --git a/src/panels/config/integrations/integration-panels/matter/dialog-matter-reinterview-node.ts b/src/panels/config/integrations/integration-panels/matter/dialog-matter-reinterview-node.ts index 44704263e4..5964a952e6 100644 --- a/src/panels/config/integrations/integration-panels/matter/dialog-matter-reinterview-node.ts +++ b/src/panels/config/integrations/integration-panels/matter/dialog-matter-reinterview-node.ts @@ -6,7 +6,7 @@ import { fireEvent } from "../../../../../common/dom/fire_event"; import "../../../../../components/ha-button"; import "../../../../../components/ha-spinner"; import "../../../../../components/ha-dialog-footer"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import { interviewMatterNode } from "../../../../../data/matter"; import { haStyleDialog } from "../../../../../resources/styles"; import type { HomeAssistant } from "../../../../../types"; @@ -35,7 +35,7 @@ class DialogMatterReinterviewNode extends LitElement { } return html` - `} - + `; } diff --git a/src/panels/config/integrations/integration-panels/ssdp/dialog-ssdp-discovery-info.ts b/src/panels/config/integrations/integration-panels/ssdp/dialog-ssdp-discovery-info.ts index 92822ac1c8..cd6764697f 100644 --- a/src/panels/config/integrations/integration-panels/ssdp/dialog-ssdp-discovery-info.ts +++ b/src/panels/config/integrations/integration-panels/ssdp/dialog-ssdp-discovery-info.ts @@ -6,7 +6,7 @@ import type { HomeAssistant } from "../../../../../types"; import type { SSDPDiscoveryInfoDialogParams } from "./show-dialog-ssdp-discovery-info"; import "../../../../../components/ha-button"; import "../../../../../components/ha-dialog-footer"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import { showToast } from "../../../../../util/toast"; import { copyToClipboard } from "../../../../../common/util/copy-clipboard"; import { showSSDPRawDataDialog } from "./show-dialog-ssdp-raw-data"; @@ -62,7 +62,7 @@ class DialogSSDPDiscoveryInfo extends LitElement { } return html` - - + `; } } diff --git a/src/panels/config/integrations/integration-panels/ssdp/dialog-ssdp-raw-data.ts b/src/panels/config/integrations/integration-panels/ssdp/dialog-ssdp-raw-data.ts index be7a77e2ed..71a2cd6a37 100644 --- a/src/panels/config/integrations/integration-panels/ssdp/dialog-ssdp-raw-data.ts +++ b/src/panels/config/integrations/integration-panels/ssdp/dialog-ssdp-raw-data.ts @@ -5,7 +5,7 @@ import { dump } from "js-yaml"; import { fireEvent } from "../../../../../common/dom/fire_event"; import type { HomeAssistant } from "../../../../../types"; import "../../../../../components/ha-code-editor"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; export interface SSDPRawDataDialogParams { key: string; @@ -40,7 +40,7 @@ class DialogSSDPRawData extends LitElement { } return html` - - + `; } diff --git a/src/panels/config/integrations/integration-panels/thread/dialog-thread-dataset.ts b/src/panels/config/integrations/integration-panels/thread/dialog-thread-dataset.ts index 040fa9f988..8b934c13dc 100644 --- a/src/panels/config/integrations/integration-panels/thread/dialog-thread-dataset.ts +++ b/src/panels/config/integrations/integration-panels/thread/dialog-thread-dataset.ts @@ -3,7 +3,7 @@ import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../../../common/dom/fire_event"; import type { HomeAssistant } from "../../../../../types"; import type { DialogThreadDatasetParams } from "./show-dialog-thread-dataset"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; @customElement("ha-dialog-thread-dataset") class DialogThreadDataset extends LitElement { @@ -42,7 +42,7 @@ class DialogThreadDataset extends LitElement { dataset.extended_pan_id && otbrInfo.active_dataset_tlvs?.includes(dataset.extended_pan_id); - return html` - `; + `; } } diff --git a/src/panels/config/integrations/integration-panels/zeroconf/dialog-zeroconf-discovery-info.ts b/src/panels/config/integrations/integration-panels/zeroconf/dialog-zeroconf-discovery-info.ts index a8b72e2f59..acb5a69e38 100644 --- a/src/panels/config/integrations/integration-panels/zeroconf/dialog-zeroconf-discovery-info.ts +++ b/src/panels/config/integrations/integration-panels/zeroconf/dialog-zeroconf-discovery-info.ts @@ -5,7 +5,7 @@ import { fireEvent } from "../../../../../common/dom/fire_event"; import { copyToClipboard } from "../../../../../common/util/copy-clipboard"; import "../../../../../components/ha-button"; import "../../../../../components/ha-dialog-footer"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import type { HomeAssistant } from "../../../../../types"; import { showToast } from "../../../../../util/toast"; import type { ZeroconfDiscoveryInfoDialogParams } from "./show-dialog-zeroconf-discovery-info"; @@ -51,7 +51,7 @@ class DialogZeroconfDiscoveryInfo extends LitElement { } return html` - - + `; } } diff --git a/src/panels/config/integrations/integration-panels/zha/dialog-zha-change-channel.ts b/src/panels/config/integrations/integration-panels/zha/dialog-zha-change-channel.ts index 78bf3f2f7e..5f205b175f 100644 --- a/src/panels/config/integrations/integration-panels/zha/dialog-zha-change-channel.ts +++ b/src/panels/config/integrations/integration-panels/zha/dialog-zha-change-channel.ts @@ -6,7 +6,7 @@ import "../../../../../components/buttons/ha-progress-button"; import "../../../../../components/ha-alert"; import "../../../../../components/ha-button"; import "../../../../../components/ha-dialog-footer"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import "../../../../../components/ha-select"; import type { HaSelectSelectEvent } from "../../../../../components/ha-select"; import { changeZHANetworkChannel } from "../../../../../data/zha"; @@ -68,7 +68,7 @@ class DialogZHAChangeChannel extends LitElement { } return html` - - + `; } diff --git a/src/panels/config/integrations/integration-panels/zha/dialog-zha-manage-zigbee-device.ts b/src/panels/config/integrations/integration-panels/zha/dialog-zha-manage-zigbee-device.ts index a4ad341a96..751a7e8e34 100644 --- a/src/panels/config/integrations/integration-panels/zha/dialog-zha-manage-zigbee-device.ts +++ b/src/panels/config/integrations/integration-panels/zha/dialog-zha-manage-zigbee-device.ts @@ -9,7 +9,7 @@ import "../../../../../components/ha-code-editor"; import "../../../../../components/ha-dialog-header"; import "../../../../../components/ha-tab-group"; import "../../../../../components/ha-tab-group-tab"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import type { ZHADevice, ZHAGroup } from "../../../../../data/zha"; import { fetchBindableDevices, fetchGroups } from "../../../../../data/zha"; import { @@ -95,7 +95,7 @@ class DialogZHAManageZigbeeDevice extends LitElement { const tabs = this._getTabs(this._device); return html` - - + `; } diff --git a/src/panels/config/integrations/integration-panels/zha/dialog-zha-reconfigure-device.ts b/src/panels/config/integrations/integration-panels/zha/dialog-zha-reconfigure-device.ts index 95cad5c651..c223806df1 100644 --- a/src/panels/config/integrations/integration-panels/zha/dialog-zha-reconfigure-device.ts +++ b/src/panels/config/integrations/integration-panels/zha/dialog-zha-reconfigure-device.ts @@ -9,7 +9,7 @@ import "../../../../../components/ha-svg-icon"; import "../../../../../components/ha-tooltip"; import "../../../../../components/ha-button"; import "../../../../../components/ha-dialog-footer"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import type { AttributeConfigurationStatus, Cluster, @@ -79,7 +79,7 @@ class DialogZHAReconfigureDevice extends LitElement { } return html` - `} - + `; } diff --git a/src/panels/config/integrations/integration-panels/zwave_js/add-node/dialog-zwave_js-add-node.ts b/src/panels/config/integrations/integration-panels/zwave_js/add-node/dialog-zwave_js-add-node.ts index 9fdf4e11fb..a64cbff91d 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/add-node/dialog-zwave_js-add-node.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/add-node/dialog-zwave_js-add-node.ts @@ -46,7 +46,7 @@ import "../../../../../../components/ha-dialog-footer"; import "../../../../../../components/ha-fade-in"; import "../../../../../../components/ha-icon-button"; import "../../../../../../components/ha-qr-scanner"; -import "../../../../../../components/ha-wa-dialog"; +import "../../../../../../components/ha-dialog"; import { navigate } from "../../../../../../common/navigate"; import type { EntityRegistryEntry } from "../../../../../../data/entity/entity_registry"; @@ -140,7 +140,7 @@ class DialogZWaveJSAddNode extends LitElement { const actions = this._renderStepActions(); return html` - ${actions}`} - + `; } diff --git a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-hard-reset-controller.ts b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-hard-reset-controller.ts index 0ac386390e..631072c118 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-hard-reset-controller.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-hard-reset-controller.ts @@ -6,7 +6,7 @@ import { fireEvent } from "../../../../../common/dom/fire_event"; import "../../../../../components/ha-svg-icon"; import "../../../../../components/ha-button"; import "../../../../../components/ha-dialog-footer"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import { hardResetController } from "../../../../../data/zwave_js"; import { haStyleDialog } from "../../../../../resources/styles"; import type { HomeAssistant } from "../../../../../types"; @@ -57,7 +57,7 @@ class DialogZWaveJSHardResetController extends LitElement { return nothing; } - return html` ` : nothing} - `; + `; } private async _hardResetController(): Promise { diff --git a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-node-statistics.ts b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-node-statistics.ts index 36aa279dcf..aaa95d0bc7 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-node-statistics.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-node-statistics.ts @@ -10,7 +10,7 @@ import "../../../../../components/ha-help-tooltip"; import "../../../../../components/ha-list"; import "../../../../../components/ha-list-item"; import "../../../../../components/ha-svg-icon"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import type { DeviceRegistryEntry } from "../../../../../data/device/device_registry"; import { subscribeDeviceRegistry } from "../../../../../data/device/device_registry"; import type { @@ -83,7 +83,7 @@ class DialogZWaveJSNodeStatistics extends LitElement { } return html` - + `; } diff --git a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-rebuild-network-routes.ts b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-rebuild-network-routes.ts index 37e372b727..db195049e9 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-rebuild-network-routes.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-rebuild-network-routes.ts @@ -7,7 +7,7 @@ import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../../../common/dom/fire_event"; import "../../../../../components/ha-button"; import "../../../../../components/ha-dialog-footer"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import type { ZWaveJSNetwork, ZWaveJSRebuildRoutesStatusMessage, @@ -67,7 +67,7 @@ class DialogZWaveJSRebuildNetworkRoutes extends LitElement { } return html` - `} - + `; } diff --git a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-rebuild-node-routes.ts b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-rebuild-node-routes.ts index b98d983102..97f64d3963 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-rebuild-node-routes.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-rebuild-node-routes.ts @@ -7,7 +7,7 @@ import { computeDeviceNameDisplay } from "../../../../../common/entity/compute_d import "../../../../../components/ha-button"; import "../../../../../components/ha-spinner"; import "../../../../../components/ha-dialog-footer"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import type { DeviceRegistryEntry } from "../../../../../data/device/device_registry"; import type { ZWaveJSNetwork } from "../../../../../data/zwave_js"; import { @@ -54,7 +54,7 @@ class DialogZWaveJSRebuildNodeRoutes extends LitElement { } return html` - `} - + `; } diff --git a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-reinterview-node.ts b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-reinterview-node.ts index 86897dbc2c..74b20c5d06 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-reinterview-node.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-reinterview-node.ts @@ -7,7 +7,7 @@ import { fireEvent } from "../../../../../common/dom/fire_event"; import "../../../../../components/ha-spinner"; import "../../../../../components/ha-button"; import "../../../../../components/ha-dialog-footer"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import { reinterviewZwaveNode } from "../../../../../data/zwave_js"; import { haStyleDialog } from "../../../../../resources/styles"; import type { HomeAssistant } from "../../../../../types"; @@ -41,7 +41,7 @@ class DialogZWaveJSReinterviewNode extends LitElement { } return html` - `} - + `; } diff --git a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-remove-node.ts b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-remove-node.ts index ffa594677f..b0a44e84a7 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-remove-node.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-remove-node.ts @@ -16,7 +16,7 @@ import "../../../../../components/ha-icon-next"; import "../../../../../components/ha-list-item"; import "../../../../../components/ha-spinner"; import "../../../../../components/ha-dialog-footer"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import type { DeviceRegistryEntry } from "../../../../../data/device/device_registry"; import { fetchZwaveNodeStatus, @@ -101,7 +101,7 @@ class DialogZWaveJSRemoveNode extends LitElement { ); return html` - ${this._renderAction()} `} - + `; } diff --git a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-update-firmware-node.ts b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-update-firmware-node.ts index 40c822f412..2799f7188d 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-update-firmware-node.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-update-firmware-node.ts @@ -8,7 +8,7 @@ import { fireEvent } from "../../../../../common/dom/fire_event"; import { computeDeviceNameDisplay } from "../../../../../common/entity/compute_device_name"; import "../../../../../components/ha-button"; import "../../../../../components/ha-dialog-footer"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import "../../../../../components/ha-file-upload"; import "../../../../../components/ha-form/ha-form"; import type { HaFormSchema } from "../../../../../components/ha-form/types"; @@ -190,7 +190,7 @@ class DialogZWaveJSUpdateFirmwareNode extends LitElement { `; return html` - - + `; } diff --git a/src/panels/config/labels/dialog-label-detail.ts b/src/panels/config/labels/dialog-label-detail.ts index 714e58451d..40898f532f 100644 --- a/src/panels/config/labels/dialog-label-detail.ts +++ b/src/panels/config/labels/dialog-label-detail.ts @@ -8,7 +8,7 @@ import "../../../components/ha-color-picker"; import "../../../components/ha-dialog-footer"; import "../../../components/ha-icon-picker"; import "../../../components/ha-switch"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/ha-textarea"; import "../../../components/ha-textfield"; import type { LabelRegistryEntryMutableParams } from "../../../data/label/label_registry"; @@ -73,7 +73,7 @@ class DialogLabelDetail } return html` - - + `; } diff --git a/src/panels/config/labs/dialog-labs-preview-feature-enable.ts b/src/panels/config/labs/dialog-labs-preview-feature-enable.ts index 406734a4fe..eb190eab8b 100644 --- a/src/panels/config/labs/dialog-labs-preview-feature-enable.ts +++ b/src/panels/config/labs/dialog-labs-preview-feature-enable.ts @@ -5,7 +5,7 @@ import { relativeTime } from "../../../common/datetime/relative_time"; import { fireEvent } from "../../../common/dom/fire_event"; import "../../../components/ha-button"; import "../../../components/ha-dialog-footer"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/ha-md-list"; import "../../../components/ha-md-list-item"; import type { HaSwitch } from "../../../components/ha-switch"; @@ -144,7 +144,7 @@ export class DialogLabsPreviewFeatureEnable const createBackupTexts = this._computeCreateBackupTexts(); return html` - - + `; } static readonly styles = css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } diff --git a/src/panels/config/labs/dialog-labs-progress.ts b/src/panels/config/labs/dialog-labs-progress.ts index 63be7f6f6a..e6c57828ce 100644 --- a/src/panels/config/labs/dialog-labs-progress.ts +++ b/src/panels/config/labs/dialog-labs-progress.ts @@ -1,7 +1,7 @@ import { css, html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../common/dom/fire_event"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/ha-spinner"; import type { HassDialog } from "../../../dialogs/make-dialog-manager"; import type { HomeAssistant } from "../../../types"; @@ -39,7 +39,7 @@ export class DialogLabsProgress } return html` - - + `; } static readonly styles = css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: var(--ha-space-6); } diff --git a/src/panels/config/logs/dialog-download-logs.ts b/src/panels/config/logs/dialog-download-logs.ts index d0360f0523..5e4fa2271c 100644 --- a/src/panels/config/logs/dialog-download-logs.ts +++ b/src/panels/config/logs/dialog-download-logs.ts @@ -5,7 +5,7 @@ import { fireEvent } from "../../../common/dom/fire_event"; import "../../../components/ha-button"; import "../../../components/ha-dialog-footer"; import "../../../components/ha-select"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import { getSignedPath } from "../../../data/auth"; import { getHassioLogDownloadLinesUrl } from "../../../data/hassio/supervisor"; import { haStyle, haStyleDialog } from "../../../resources/styles"; @@ -66,7 +66,7 @@ class DownloadLogsDialog extends LitElement { }`; return html` - - + `; } diff --git a/src/panels/config/logs/dialog-system-log-detail.ts b/src/panels/config/logs/dialog-system-log-detail.ts index 471aa836fb..532eac2760 100644 --- a/src/panels/config/logs/dialog-system-log-detail.ts +++ b/src/panels/config/logs/dialog-system-log-detail.ts @@ -7,7 +7,7 @@ import { copyToClipboard } from "../../../common/util/copy-clipboard"; import "../../../components/ha-alert"; import "../../../components/ha-icon-button"; import "../../../components/ha-svg-icon"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import type { IntegrationManifest } from "../../../data/integration"; import { domainToName, @@ -83,7 +83,7 @@ class DialogSystemLogDetail extends LitElement { }); return html` - ${item.exception} ` : nothing} - + `; } @@ -230,7 +230,7 @@ class DialogSystemLogDetail extends LitElement { return [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0px; } diff --git a/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-configure-strategy.ts b/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-configure-strategy.ts index 471ab9d9dd..8715abc111 100644 --- a/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-configure-strategy.ts +++ b/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-configure-strategy.ts @@ -4,7 +4,7 @@ import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { LovelaceStrategyConfig } from "../../../../data/lovelace/config/strategy"; import { haStyleDialog } from "../../../../resources/styles"; import type { HomeAssistant } from "../../../../types"; @@ -47,7 +47,7 @@ export class DialogLovelaceDashboardConfigureStrategy extends LitElement { } return html` - - + `; } diff --git a/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts b/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts index 1f8d31b126..3291dd126d 100644 --- a/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts +++ b/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts @@ -7,7 +7,7 @@ import { slugify } from "../../../../common/string/slugify"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-form/ha-form"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { SchemaUnion } from "../../../../components/ha-form/types"; import type { LovelaceDashboard, @@ -70,7 +70,7 @@ export class DialogLovelaceDashboardDetail extends LitElement { const titleInvalid = !this._data.title || !this._data.title.trim(); return html` - - + `; } diff --git a/src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts b/src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts index d5148c6107..c82e16e6ac 100644 --- a/src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts +++ b/src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts @@ -2,7 +2,7 @@ import { html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; import { fireEvent } from "../../../../common/dom/fire_event"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-alert"; import "../../../../components/ha-form/ha-form"; @@ -81,7 +81,7 @@ export class DialogLovelaceResourceDetail extends LitElement { ); return html` - - + `; } diff --git a/src/panels/config/person/dialog-person-detail.ts b/src/panels/config/person/dialog-person-detail.ts index 1d26fef252..b16dfa49b4 100644 --- a/src/panels/config/person/dialog-person-detail.ts +++ b/src/panels/config/person/dialog-person-detail.ts @@ -12,7 +12,7 @@ import "../../../components/ha-picture-upload"; import type { HaPictureUpload } from "../../../components/ha-picture-upload"; import "../../../components/ha-md-list-item"; import "../../../components/ha-textfield"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import { adminChangeUsername } from "../../../data/auth"; import type { PersonMutableParams } from "../../../data/person"; import type { User } from "../../../data/user"; @@ -132,7 +132,7 @@ class DialogPersonDetail extends LitElement implements HassDialog { } const nameInvalid = this._name.trim() === ""; return html` - - + `; } diff --git a/src/panels/config/repairs/dialog-integration-startup.ts b/src/panels/config/repairs/dialog-integration-startup.ts index 6088f1021c..0ed634542c 100644 --- a/src/panels/config/repairs/dialog-integration-startup.ts +++ b/src/panels/config/repairs/dialog-integration-startup.ts @@ -2,7 +2,7 @@ import type { CSSResultGroup } from "lit"; import { css, html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../common/dom/fire_event"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import { haStyleDialog } from "../../../resources/styles"; import type { HomeAssistant } from "../../../types"; import "./integrations-startup-time"; @@ -32,7 +32,7 @@ class DialogIntegrationStartup extends LitElement { } return html` - - + `; } static styles: CSSResultGroup = [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } `, diff --git a/src/panels/config/repairs/dialog-repairs-issue.ts b/src/panels/config/repairs/dialog-repairs-issue.ts index f0a653370a..0ec9da10f1 100644 --- a/src/panels/config/repairs/dialog-repairs-issue.ts +++ b/src/panels/config/repairs/dialog-repairs-issue.ts @@ -5,7 +5,7 @@ import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../common/dom/fire_event"; import { isNavigationClick } from "../../../common/dom/is-navigation-click"; import "../../../components/ha-alert"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/ha-button"; import "../../../components/ha-svg-icon"; import "../../../components/ha-dialog-footer"; @@ -62,7 +62,7 @@ class DialogRepairsIssue extends LitElement { ) || this.hass!.localize("ui.panel.config.repairs.dialog.title"); return html` - - + `; } diff --git a/src/panels/config/repairs/dialog-system-information.ts b/src/panels/config/repairs/dialog-system-information.ts index c08a398d98..eddd07f7d2 100644 --- a/src/panels/config/repairs/dialog-system-information.ts +++ b/src/panels/config/repairs/dialog-system-information.ts @@ -10,7 +10,7 @@ import { subscribePollingCollection } from "../../../common/util/subscribe-polli import "../../../components/ha-alert"; import "../../../components/ha-button"; import "../../../components/ha-dialog-footer"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/ha-metric"; import "../../../components/ha-spinner"; import type { HassioStats } from "../../../data/hassio/common"; @@ -137,7 +137,7 @@ class DialogSystemInformation extends LitElement { const sections = this._getSections(); return html` - - + `; } diff --git a/src/panels/config/scene/scene-save-dialog/dialog-scene-save.ts b/src/panels/config/scene/scene-save-dialog/dialog-scene-save.ts index 1c21c818bd..7e45ae48e3 100644 --- a/src/panels/config/scene/scene-save-dialog/dialog-scene-save.ts +++ b/src/panels/config/scene/scene-save-dialog/dialog-scene-save.ts @@ -15,7 +15,7 @@ import "../../../../components/ha-suggest-with-ai-button"; import type { SuggestWithAIGenerateTask } from "../../../../components/ha-suggest-with-ai-button"; import "../../../../components/ha-svg-icon"; import "../../../../components/ha-textfield"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; import "../../category/ha-category-picker"; @@ -192,7 +192,7 @@ class DialogSceneSave extends LitElement { ); return html` - - + `; } diff --git a/src/panels/config/storage/dialog-mount-view.ts b/src/panels/config/storage/dialog-mount-view.ts index df6a44bad4..03ac17d719 100644 --- a/src/panels/config/storage/dialog-mount-view.ts +++ b/src/panels/config/storage/dialog-mount-view.ts @@ -12,7 +12,7 @@ import "../../../components/ha-dialog-footer"; import "../../../components/ha-form/ha-form"; import type { SchemaUnion } from "../../../components/ha-form/types"; import "../../../components/ha-icon-button"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import { extractApiErrorMessage } from "../../../data/hassio/common"; import type { SupervisorMountRequestParams } from "../../../data/supervisor/mounts"; import { @@ -210,7 +210,7 @@ class ViewMountDialog extends LitElement { return nothing; } return html` - - + `; } diff --git a/src/panels/config/storage/dialog-move-datadisk.ts b/src/panels/config/storage/dialog-move-datadisk.ts index bc92d5828c..82ceab4150 100644 --- a/src/panels/config/storage/dialog-move-datadisk.ts +++ b/src/panels/config/storage/dialog-move-datadisk.ts @@ -8,7 +8,7 @@ import "../../../components/ha-dialog-footer"; import "../../../components/ha-select"; import type { HaSelectSelectEvent } from "../../../components/ha-select"; import "../../../components/ha-spinner"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import { extractApiErrorMessage, ignoreSupervisorError, @@ -108,7 +108,7 @@ class MoveDatadiskDialog extends LitElement { } return html` - `} - + `; } diff --git a/src/panels/config/tags/dialog-tag-detail.ts b/src/panels/config/tags/dialog-tag-detail.ts index f8c86b381d..83e4fa5b30 100644 --- a/src/panels/config/tags/dialog-tag-detail.ts +++ b/src/panels/config/tags/dialog-tag-detail.ts @@ -9,7 +9,7 @@ import "../../../components/ha-dialog-footer"; import "../../../components/ha-qr-code"; import "../../../components/ha-switch"; import "../../../components/ha-textfield"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import type { Tag, UpdateTagParams } from "../../../data/tag"; import type { HassDialog } from "../../../dialogs/make-dialog-manager"; import { haStyleDialog } from "../../../resources/styles"; @@ -63,7 +63,7 @@ class DialogTagDetail } return html` - ` : ""} - + `; } diff --git a/src/panels/config/users/dialog-add-user.ts b/src/panels/config/users/dialog-add-user.ts index d2096be5a8..f36a973da7 100644 --- a/src/panels/config/users/dialog-add-user.ts +++ b/src/panels/config/users/dialog-add-user.ts @@ -11,7 +11,7 @@ import "../../../components/ha-switch"; import type { HaSwitch } from "../../../components/ha-switch"; import "../../../components/ha-textfield"; import type { HaTextField } from "../../../components/ha-textfield"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import { createAuthForUser } from "../../../data/auth"; import type { User } from "../../../data/user"; import { @@ -88,7 +88,7 @@ export class DialogAddUser extends LitElement { } return html` - - + `; } @@ -312,7 +312,7 @@ export class DialogAddUser extends LitElement { return [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-z-index: 10; } .row { diff --git a/src/panels/config/users/dialog-admin-change-password.ts b/src/panels/config/users/dialog-admin-change-password.ts index 329c5b193f..6653a53f02 100644 --- a/src/panels/config/users/dialog-admin-change-password.ts +++ b/src/panels/config/users/dialog-admin-change-password.ts @@ -8,7 +8,7 @@ import "../../../components/ha-form/ha-form"; import type { SchemaUnion } from "../../../components/ha-form/types"; import "../../../components/ha-textfield"; import "../../../components/ha-button"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import { adminChangePassword } from "../../../data/auth"; import { haStyleDialog } from "../../../resources/styles"; import type { HomeAssistant } from "../../../types"; @@ -116,7 +116,7 @@ class DialogAdminChangePassword extends LitElement { ); return html` - `} - + `; } diff --git a/src/panels/config/users/dialog-user-detail.ts b/src/panels/config/users/dialog-user-detail.ts index bfeae69c2b..26f0b60715 100644 --- a/src/panels/config/users/dialog-user-detail.ts +++ b/src/panels/config/users/dialog-user-detail.ts @@ -12,7 +12,7 @@ import "../../../components/ha-md-list-item"; import "../../../components/ha-svg-icon"; import "../../../components/ha-switch"; import "../../../components/ha-textfield"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import { adminChangeUsername } from "../../../data/auth"; import { computeUserBadges, @@ -66,7 +66,7 @@ class DialogUserDetail extends LitElement { const user = this._params.entry; const badges = computeUserBadges(this.hass, user, true); return html` - - + `; } diff --git a/src/panels/config/voice-assistants/dialog-expose-entity.ts b/src/panels/config/voice-assistants/dialog-expose-entity.ts index 6a108c5ab6..662cdd3f22 100644 --- a/src/panels/config/voice-assistants/dialog-expose-entity.ts +++ b/src/panels/config/voice-assistants/dialog-expose-entity.ts @@ -11,7 +11,7 @@ import { computeEntityNameList } from "../../../common/entity/compute_entity_nam import { computeRTL } from "../../../common/util/compute_rtl"; import "../../../components/ha-check-list-item"; import "../../../components/search-input"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/ha-button"; import "../../../components/ha-dialog-footer"; import "../../../components/ha-state-icon"; @@ -86,7 +86,7 @@ class DialogExposeEntity extends LitElement { ); return html` - - + `; } @@ -263,7 +263,7 @@ class DialogExposeEntity extends LitElement { haStyle, haStyleScrollbar, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } ha-list { diff --git a/src/panels/config/voice-assistants/dialog-voice-assistant-pipeline-detail.ts b/src/panels/config/voice-assistants/dialog-voice-assistant-pipeline-detail.ts index 2fe074e33b..f13c669725 100644 --- a/src/panels/config/voice-assistants/dialog-voice-assistant-pipeline-detail.ts +++ b/src/panels/config/voice-assistants/dialog-voice-assistant-pipeline-detail.ts @@ -9,7 +9,7 @@ import "../../../components/ha-button"; import "../../../components/ha-dropdown-item"; import "../../../components/ha-form/ha-form"; import "../../../components/ha-icon-button"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/ha-dialog-footer"; import type { AssistPipeline, @@ -142,7 +142,7 @@ export class DialogVoiceAssistantPipelineDetail extends LitElement { ); return html` - - + `; } diff --git a/src/panels/config/voice-assistants/dialog-voice-settings.ts b/src/panels/config/voice-assistants/dialog-voice-settings.ts index e669aebf86..aebfa25b2e 100644 --- a/src/panels/config/voice-assistants/dialog-voice-settings.ts +++ b/src/panels/config/voice-assistants/dialog-voice-settings.ts @@ -5,7 +5,7 @@ import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../common/dom/fire_event"; import { computeStateName } from "../../../common/entity/compute_state_name"; import "../../../components/ha-icon-button"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import { showMoreInfoDialog } from "../../../dialogs/more-info/show-ha-more-info-dialog"; import { haStyle, haStyleDialog } from "../../../resources/styles"; import type { HomeAssistant } from "../../../types"; @@ -51,7 +51,7 @@ class DialogVoiceSettings extends LitElement { this.hass.localize("ui.panel.config.entities.picker.unnamed_entity"); return html` - - + `; } @@ -90,7 +90,7 @@ class DialogVoiceSettings extends LitElement { haStyle, haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; } `, diff --git a/src/panels/config/zone/dialog-home-zone-detail.ts b/src/panels/config/zone/dialog-home-zone-detail.ts index 5c0aa87396..a2d7739848 100644 --- a/src/panels/config/zone/dialog-home-zone-detail.ts +++ b/src/panels/config/zone/dialog-home-zone-detail.ts @@ -4,7 +4,7 @@ import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; import { fireEvent } from "../../../common/dom/fire_event"; import "../../../components/ha-dialog-footer"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/ha-form/ha-form"; import "../../../components/ha-button"; import type { HomeZoneMutableParams } from "../../../data/zone"; @@ -66,7 +66,7 @@ class DialogHomeZoneDetail extends LitElement { const valid = !latInvalid && !lngInvalid; return html` - - + `; } diff --git a/src/panels/config/zone/dialog-zone-detail.ts b/src/panels/config/zone/dialog-zone-detail.ts index a8a5c0c50b..6022b0c25e 100644 --- a/src/panels/config/zone/dialog-zone-detail.ts +++ b/src/panels/config/zone/dialog-zone-detail.ts @@ -5,7 +5,7 @@ import memoizeOne from "memoize-one"; import { fireEvent } from "../../../common/dom/fire_event"; import { addDistanceToCoord } from "../../../common/location/add_distance_to_coord"; import "../../../components/ha-dialog-footer"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/ha-form/ha-form"; import "../../../components/ha-button"; import type { SchemaUnion } from "../../../components/ha-form/types"; @@ -86,7 +86,7 @@ class DialogZoneDetail extends LitElement { !radiusInvalid; return html` - - + `; } diff --git a/src/panels/home/dialogs/dialog-edit-home.ts b/src/panels/home/dialogs/dialog-edit-home.ts index f6e189e42e..d5bedc8300 100644 --- a/src/panels/home/dialogs/dialog-edit-home.ts +++ b/src/panels/home/dialogs/dialog-edit-home.ts @@ -5,7 +5,7 @@ import "../../../components/entity/ha-entities-picker"; import "../../../components/ha-alert"; import "../../../components/ha-button"; import "../../../components/ha-dialog-footer"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import type { HomeFrontendSystemData } from "../../../data/frontend"; import type { HassDialog } from "../../../dialogs/make-dialog-manager"; import { haStyleDialog } from "../../../resources/styles"; @@ -51,7 +51,7 @@ export class DialogEditHome } return html` - - + `; } @@ -138,7 +138,7 @@ export class DialogEditHome static styles = [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: var(--ha-space-6); } diff --git a/src/panels/home/dialogs/dialog-new-overview.ts b/src/panels/home/dialogs/dialog-new-overview.ts index 517d56ae03..df2310e79d 100644 --- a/src/panels/home/dialogs/dialog-new-overview.ts +++ b/src/panels/home/dialogs/dialog-new-overview.ts @@ -3,7 +3,7 @@ import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../common/dom/fire_event"; import "../../../components/ha-button"; import "../../../components/ha-dialog-footer"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import type { HassDialog } from "../../../dialogs/make-dialog-manager"; import { haStyleDialog } from "../../../resources/styles"; import type { HomeAssistant } from "../../../types"; @@ -44,7 +44,7 @@ export class DialogNewOverview } return html` - - + `; } static styles = [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: var(--ha-space-6); } diff --git a/src/panels/lovelace/editor/badge-editor/hui-dialog-create-badge.ts b/src/panels/lovelace/editor/badge-editor/hui-dialog-create-badge.ts index ce39597cd9..cfbe6d7404 100644 --- a/src/panels/lovelace/editor/badge-editor/hui-dialog-create-badge.ts +++ b/src/panels/lovelace/editor/badge-editor/hui-dialog-create-badge.ts @@ -10,7 +10,7 @@ import "../../../../components/ha-dialog-header"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-tab-group"; import "../../../../components/ha-tab-group-tab"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { LovelaceViewConfig } from "../../../../data/lovelace/config/view"; import type { HassDialog } from "../../../../dialogs/make-dialog-manager"; import { haStyleDialog } from "../../../../resources/styles"; @@ -92,7 +92,7 @@ export class HuiCreateDialogBadge : this.hass!.localize("ui.panel.lovelace.editor.edit_badge.pick_badge"); return html` - - + `; } @@ -178,16 +178,16 @@ export class HuiCreateDialogBadge return [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; --dialog-z-index: 6; } - ha-wa-dialog.table { + ha-dialog.table { --dialog-content-padding: 0; } - ha-wa-dialog::part(body) { + ha-dialog::part(body) { overflow: hidden; } diff --git a/src/panels/lovelace/editor/badge-editor/hui-dialog-edit-badge.ts b/src/panels/lovelace/editor/badge-editor/hui-dialog-edit-badge.ts index d108f310d7..239a7b38d8 100644 --- a/src/panels/lovelace/editor/badge-editor/hui-dialog-edit-badge.ts +++ b/src/panels/lovelace/editor/badge-editor/hui-dialog-edit-badge.ts @@ -7,7 +7,7 @@ import type { HASSDomEvent } from "../../../../common/dom/fire_event"; import { fireEvent } from "../../../../common/dom/fire_event"; import { computeRTLDirection } from "../../../../common/util/compute_rtl"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-icon-button"; import "../../../../components/ha-spinner"; import "../../../../components/ha-button"; @@ -205,7 +205,7 @@ export class HuiDialogEditBadge } return html` - - + `; } @@ -414,7 +414,7 @@ export class HuiDialogEditBadge --code-mirror-max-height: calc(100vh - 176px); } - ha-wa-dialog { + ha-dialog { --dialog-z-index: 6; --dialog-content-padding: var(--ha-space-2); } @@ -496,7 +496,7 @@ export class HuiDialogEditBadge margin-inline-end: auto; margin-inline-start: initial; } - ha-wa-dialog a[slot="headerActionItems"] { + ha-dialog a[slot="headerActionItems"] { color: inherit; text-decoration: none; } diff --git a/src/panels/lovelace/editor/badge-editor/hui-dialog-suggest-badge.ts b/src/panels/lovelace/editor/badge-editor/hui-dialog-suggest-badge.ts index 5318474ba0..9d8b8df370 100644 --- a/src/panels/lovelace/editor/badge-editor/hui-dialog-suggest-badge.ts +++ b/src/panels/lovelace/editor/badge-editor/hui-dialog-suggest-badge.ts @@ -6,7 +6,7 @@ import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-yaml-editor"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { HaYamlEditor } from "../../../../components/ha-yaml-editor"; import type { LovelaceBadgeConfig } from "../../../../data/lovelace/config/badge"; @@ -81,7 +81,7 @@ export class HuiDialogSuggestBadge extends LitElement { return nothing; } return html` - - + `; } @@ -135,7 +135,7 @@ export class HuiDialogSuggestBadge extends LitElement { return [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-z-index: 6; } .hidden { diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-create-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-create-card.ts index dc20ff97db..b341fe0204 100644 --- a/src/panels/lovelace/editor/card-editor/hui-dialog-create-card.ts +++ b/src/panels/lovelace/editor/card-editor/hui-dialog-create-card.ts @@ -10,7 +10,7 @@ import "../../../../components/ha-dialog-header"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-tab-group"; import "../../../../components/ha-tab-group-tab"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { LovelaceSectionConfig } from "../../../../data/lovelace/config/section"; import { isStrategySection } from "../../../../data/lovelace/config/section"; import type { LovelaceViewConfig } from "../../../../data/lovelace/config/view"; @@ -109,7 +109,7 @@ export class HuiCreateDialogCard : this.hass!.localize("ui.panel.lovelace.editor.edit_card.pick_card"); return html` - - + `; } @@ -197,16 +197,16 @@ export class HuiCreateDialogCard return [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0; --dialog-z-index: 6; } - ha-wa-dialog.table { + ha-dialog.table { --dialog-content-padding: 0; } - ha-wa-dialog::part(body) { + ha-dialog::part(body) { overflow: hidden; } diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-delete-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-delete-card.ts index 2c53d91144..895eca1eba 100644 --- a/src/panels/lovelace/editor/card-editor/hui-dialog-delete-card.ts +++ b/src/panels/lovelace/editor/card-editor/hui-dialog-delete-card.ts @@ -9,7 +9,7 @@ import type { HomeAssistant } from "../../../../types"; import "../../cards/hui-card"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { DeleteCardDialogParams } from "./show-delete-card-dialog"; @customElement("hui-dialog-delete-card") @@ -48,7 +48,7 @@ export class HuiDialogDeleteCard extends LitElement { } return html` - - + `; } diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts index 6edf402b26..e20d94359f 100644 --- a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts +++ b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts @@ -10,7 +10,7 @@ import { computeRTLDirection } from "../../../../common/util/compute_rtl"; import "../../../../components/ha-spinner"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-icon-button"; import type { LovelaceCardConfig } from "../../../../data/lovelace/config/card"; import type { LovelaceSectionConfig } from "../../../../data/lovelace/config/section"; @@ -165,7 +165,7 @@ export class HuiDialogEditCard } return html` - - + `; } @@ -389,7 +389,7 @@ export class HuiDialogEditCard --code-mirror-max-height: calc(100vh - 176px); } - ha-wa-dialog { + ha-dialog { --dialog-z-index: 6; --dialog-content-padding: var(--ha-space-2); } @@ -496,7 +496,7 @@ export class HuiDialogEditCard margin-inline-end: auto; margin-inline-start: initial; } - ha-wa-dialog a[slot="headerActionItems"] { + ha-dialog a[slot="headerActionItems"] { color: inherit; text-decoration: none; } diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-suggest-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-suggest-card.ts index b71c60e68d..d990c78b25 100644 --- a/src/panels/lovelace/editor/card-editor/hui-dialog-suggest-card.ts +++ b/src/panels/lovelace/editor/card-editor/hui-dialog-suggest-card.ts @@ -6,7 +6,7 @@ import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-button"; import "../../../../components/ha-yaml-editor"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-spinner"; import type { HaYamlEditor } from "../../../../components/ha-yaml-editor"; @@ -117,7 +117,7 @@ export class HuiDialogSuggestCard extends LitElement { return nothing; } return html` - - + `; } @@ -185,7 +185,7 @@ export class HuiDialogSuggestCard extends LitElement { return [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-z-index: 6; } .hidden { diff --git a/src/panels/lovelace/editor/dashboard-strategy-editor/dialogs/dialog-dashboard-strategy-editor.ts b/src/panels/lovelace/editor/dashboard-strategy-editor/dialogs/dialog-dashboard-strategy-editor.ts index eba5fafac8..51c15c1c09 100644 --- a/src/panels/lovelace/editor/dashboard-strategy-editor/dialogs/dialog-dashboard-strategy-editor.ts +++ b/src/panels/lovelace/editor/dashboard-strategy-editor/dialogs/dialog-dashboard-strategy-editor.ts @@ -7,7 +7,7 @@ import type { HASSDomEvent } from "../../../../../common/dom/fire_event"; import { fireEvent } from "../../../../../common/dom/fire_event"; import "../../../../../components/ha-button"; import "../../../../../components/ha-dialog-footer"; -import "../../../../../components/ha-wa-dialog"; +import "../../../../../components/ha-dialog"; import "../../../../../components/ha-dropdown"; import "../../../../../components/ha-dropdown-item"; import "../../../../../components/ha-icon-button"; @@ -135,7 +135,7 @@ class DialogDashboardStrategyEditor extends LitElement { ); return html` - - + `; } @@ -209,7 +209,7 @@ class DialogDashboardStrategyEditor extends LitElement { haStyleDialog, haStyleDialogFixedTop, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0 24px; } `, diff --git a/src/panels/lovelace/editor/header-footer-editor/hui-dialog-create-headerfooter.ts b/src/panels/lovelace/editor/header-footer-editor/hui-dialog-create-headerfooter.ts index 88acc6b90c..f00a4a6f26 100644 --- a/src/panels/lovelace/editor/header-footer-editor/hui-dialog-create-headerfooter.ts +++ b/src/panels/lovelace/editor/header-footer-editor/hui-dialog-create-headerfooter.ts @@ -4,7 +4,7 @@ import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { HassDialog } from "../../../../dialogs/make-dialog-manager"; import { haStyleDialog } from "../../../../resources/styles"; import type { HomeAssistant } from "../../../../types"; @@ -47,7 +47,7 @@ export class HuiCreateDialogHeaderFooter } return html` - - + `; } @@ -139,7 +139,7 @@ export class HuiCreateDialogHeaderFooter return [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 2px 24px 20px 24px; --dialog-z-index: 6; } diff --git a/src/panels/lovelace/editor/hui-dialog-save-config.ts b/src/panels/lovelace/editor/hui-dialog-save-config.ts index db2ac8b894..7b6c716ad6 100644 --- a/src/panels/lovelace/editor/hui-dialog-save-config.ts +++ b/src/panels/lovelace/editor/hui-dialog-save-config.ts @@ -5,7 +5,7 @@ import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../common/dom/fire_event"; import "../../../components/ha-button"; import "../../../components/ha-dialog-footer"; -import "../../../components/ha-wa-dialog"; +import "../../../components/ha-dialog"; import "../../../components/ha-formfield"; import "../../../components/ha-icon-button"; import "../../../components/ha-switch"; @@ -62,7 +62,7 @@ export class HuiSaveConfig extends LitElement implements HassDialog { "ui.panel.lovelace.editor.save_config.header" ); return html` - `} - + `; } @@ -191,11 +191,11 @@ export class HuiSaveConfig extends LitElement implements HassDialog { return [ haStyleDialog, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: 0 24px 24px 24px; } - ha-wa-dialog [slot="headerActionItems"] { + ha-dialog [slot="headerActionItems"] { color: inherit; text-decoration: none; } diff --git a/src/panels/lovelace/editor/section-editor/hui-dialog-edit-section.ts b/src/panels/lovelace/editor/section-editor/hui-dialog-edit-section.ts index 430f6b6d13..1b40b78b11 100644 --- a/src/panels/lovelace/editor/section-editor/hui-dialog-edit-section.ts +++ b/src/panels/lovelace/editor/section-editor/hui-dialog-edit-section.ts @@ -13,7 +13,7 @@ import { stopPropagation } from "../../../../common/dom/stop_propagation"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-header"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-dropdown"; import "../../../../components/ha-dropdown-item"; import "../../../../components/ha-icon-button"; @@ -155,7 +155,7 @@ export class HuiDialogEditSection } return html` - - + `; } @@ -426,10 +426,10 @@ export class HuiDialogEditSection haStyleDialog, haStyleDialogFixedTop, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: var(--ha-space-6); } - ha-wa-dialog.yaml-mode { + ha-dialog.yaml-mode { --dialog-content-padding: 0; } ha-tab-group-tab { diff --git a/src/panels/lovelace/editor/select-dashboard/hui-dialog-select-dashboard.ts b/src/panels/lovelace/editor/select-dashboard/hui-dialog-select-dashboard.ts index 93b3f14e33..6f29e7b386 100644 --- a/src/panels/lovelace/editor/select-dashboard/hui-dialog-select-dashboard.ts +++ b/src/panels/lovelace/editor/select-dashboard/hui-dialog-select-dashboard.ts @@ -6,7 +6,7 @@ import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-select"; import "../../../../components/ha-spinner"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { LovelaceConfig } from "../../../../data/lovelace/config/types"; import type { LovelaceDashboard } from "../../../../data/lovelace/dashboard"; import { fetchDashboards } from "../../../../data/lovelace/dashboard"; @@ -67,7 +67,7 @@ export class HuiDialogSelectDashboard extends LitElement { this.hass.localize("ui.panel.lovelace.editor.select_dashboard.header"); return html` - - + `; } diff --git a/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts b/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts index 9e0d076cb3..8c2fea9100 100644 --- a/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts +++ b/src/panels/lovelace/editor/select-view/hui-dialog-select-view.ts @@ -9,7 +9,7 @@ import "../../../../components/ha-dialog-footer"; import "../../../../components/ha-list"; import "../../../../components/ha-radio-list-item"; import "../../../../components/ha-select"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import type { LovelaceConfig } from "../../../../data/lovelace/config/types"; import { fetchConfig } from "../../../../data/lovelace/config/types"; import { isStrategyView } from "../../../../data/lovelace/config/view"; @@ -71,7 +71,7 @@ export class HuiDialogSelectView extends LitElement { const defaultPanel = getDefaultPanelUrlPath(this.hass); return html` - - + `; } diff --git a/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts b/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts index 639c068e1e..ac601e45b4 100644 --- a/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts +++ b/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts @@ -16,7 +16,7 @@ import "../../../../components/ha-alert"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-header"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-dropdown"; import "../../../../components/ha-dropdown-item"; import "../../../../components/ha-spinner"; @@ -208,7 +208,7 @@ export class HuiDialogEditView extends LitElement { this._config?.sections?.length; return html` - - + `; } @@ -643,10 +643,10 @@ export class HuiDialogEditView extends LitElement { haStyleDialog, haStyleDialogFixedTop, css` - ha-wa-dialog { + ha-dialog { --dialog-content-padding: var(--ha-space-6); } - ha-wa-dialog.yaml-mode { + ha-dialog.yaml-mode { --dialog-content-padding: 0; } h2 { diff --git a/src/panels/lovelace/editor/view-header/hui-dialog-edit-view-header.ts b/src/panels/lovelace/editor/view-header/hui-dialog-edit-view-header.ts index dc7c106769..04256488e9 100644 --- a/src/panels/lovelace/editor/view-header/hui-dialog-edit-view-header.ts +++ b/src/panels/lovelace/editor/view-header/hui-dialog-edit-view-header.ts @@ -7,7 +7,7 @@ import { fireEvent } from "../../../../common/dom/fire_event"; import { deepEqual } from "../../../../common/util/deep-equal"; import "../../../../components/ha-button"; import "../../../../components/ha-dialog-footer"; -import "../../../../components/ha-wa-dialog"; +import "../../../../components/ha-dialog"; import "../../../../components/ha-dropdown"; import "../../../../components/ha-dropdown-item"; import "../../../../components/ha-spinner"; @@ -102,7 +102,7 @@ export class HuiDialogEditViewHeader extends LitElement { ); return html` - - + `; } @@ -198,7 +198,7 @@ export class HuiDialogEditViewHeader extends LitElement { haStyleDialog, haStyleDialogFixedTop, css` - ha-wa-dialog.yaml-mode { + ha-dialog.yaml-mode { --dialog-content-padding: 0; } `, diff --git a/src/panels/media-browser/hui-dialog-web-browser-play-media.ts b/src/panels/media-browser/hui-dialog-web-browser-play-media.ts index 67f3448dfb..523dea1af1 100644 --- a/src/panels/media-browser/hui-dialog-web-browser-play-media.ts +++ b/src/panels/media-browser/hui-dialog-web-browser-play-media.ts @@ -2,7 +2,7 @@ import type { CSSResultGroup } from "lit"; import { css, html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../common/dom/fire_event"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import "../../components/ha-hls-player"; import { haStyleDialog } from "../../resources/styles"; import type { HomeAssistant } from "../../types"; @@ -43,7 +43,7 @@ export class HuiDialogWebBrowserPlayMedia extends LitElement { const mediaType = this._params.sourceType.split("/", 1)[0]; return html` - + `; } diff --git a/src/panels/profile/dialog-ha-mfa-module-setup-flow.ts b/src/panels/profile/dialog-ha-mfa-module-setup-flow.ts index d2e52a8b4f..14f450f12e 100644 --- a/src/panels/profile/dialog-ha-mfa-module-setup-flow.ts +++ b/src/panels/profile/dialog-ha-mfa-module-setup-flow.ts @@ -4,7 +4,7 @@ import { ifDefined } from "lit/directives/if-defined"; import { customElement, property, state } from "lit/decorators"; import "../../components/ha-button"; import "../../components/ha-dialog-footer"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import "../../components/ha-form/ha-form"; import type { HaFormSchema } from "../../components/ha-form/types"; import "../../components/ha-markdown"; @@ -81,7 +81,7 @@ class HaMfaModuleSetupFlow extends LitElement { return nothing; } return html` - ` : nothing} - + `; } diff --git a/src/panels/profile/ha-long-lived-access-token-dialog.ts b/src/panels/profile/ha-long-lived-access-token-dialog.ts index 652530a83b..0746f62ee3 100644 --- a/src/panels/profile/ha-long-lived-access-token-dialog.ts +++ b/src/panels/profile/ha-long-lived-access-token-dialog.ts @@ -10,7 +10,7 @@ import "../../components/ha-textfield"; import "../../components/ha-button"; import "../../components/ha-dialog-footer"; import "../../components/ha-svg-icon"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import type { HomeAssistant } from "../../types"; import type { LongLivedAccessTokenDialogParams } from "./show-long-lived-access-token-dialog"; import { showToast } from "../../util/toast"; @@ -70,7 +70,7 @@ export class HaLongLivedAccessTokenDialog extends LitElement { } return html` - `} - + `; } diff --git a/src/panels/todo/dialog-todo-item-editor.ts b/src/panels/todo/dialog-todo-item-editor.ts index 717b3172ad..1ceaf08063 100644 --- a/src/panels/todo/dialog-todo-item-editor.ts +++ b/src/panels/todo/dialog-todo-item-editor.ts @@ -14,7 +14,7 @@ import "../../components/ha-dialog-footer"; import "../../components/ha-textarea"; import "../../components/ha-textfield"; import "../../components/ha-time-input"; -import "../../components/ha-wa-dialog"; +import "../../components/ha-dialog"; import { TodoItemStatus, TodoListEntityFeature, @@ -117,7 +117,7 @@ class DialogTodoItemEditor extends LitElement { ); return html` - - + `; } diff --git a/src/resources/styles.ts b/src/resources/styles.ts index bb6b7f33af..147783cf15 100644 --- a/src/resources/styles.ts +++ b/src/resources/styles.ts @@ -150,7 +150,6 @@ export const haStyle = css` `; export const haStyleDialog = css` - /* mwc-dialog (ha-dialog) styles */ ha-dialog { --mdc-dialog-min-width: 400px; --mdc-dialog-max-width: 600px; @@ -193,8 +192,7 @@ export const haStyleDialog = css` `; export const haStyleDialogFixedTop = css` - ha-dialog, - ha-wa-dialog { + ha-dialog { /* Pin dialog to top so it doesn't jump when content changes size */ --vertical-align-dialog: flex-start; --dialog-surface-margin-top: var(--ha-space-10); @@ -225,8 +223,7 @@ export const haStyleDialogFixedTop = css` } @media all and (max-width: 450px), all and (max-height: 500px) { - ha-dialog, - ha-wa-dialog { + ha-dialog { /* When in fullscreen, dialog should be attached to top */ --dialog-surface-margin-top: 0px; --mdc-dialog-min-height: 100vh;