Migrate todo dialog(s) to wa

src/panels/config/developer-tools/statistics/developer-tools-statistics.ts

@@ -30,6 +30,7 @@ import type {
 import { showDataTableSettingsDialog } from "../../../../components/data-table/show-dialog-data-table-settings";
 import "@home-assistant/webawesome/dist/components/divider/divider";
 import "../../../../components/ha-button";
+import "../../../../components/ha-dialog";
 import "../../../../components/ha-dropdown";
 import "../../../../components/ha-dropdown-item";
 import type { HaMdMenu } from "../../../../components/ha-md-menu";

src/panels/config/developer-tools/statistics/dialog-statistics-adjust-sum.ts

@@ -6,8 +6,7 @@ import memoizeOne from "memoize-one";
 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";
@@ -42,8 +41,6 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
 
   @state() private _params?: DialogStatisticsAdjustSumParams;
 
-  @state() private _open = false;
-
   @state() private _busy = false;
 
   @state() private _moment?: string;
@@ -74,7 +71,6 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
 
   public showDialog(params: DialogStatisticsAdjustSumParams): void {
     this._params = params;
-    this._open = true;
     // moment is in format YYYY-MM-DD HH:mm:ss because of selector
     // Here we create a date with minutes set to %5
     const now = new Date();
@@ -84,11 +80,6 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
   }
 
   public closeDialog(): void {
-    this._open = false;
-  }
-
-  private _dialogClosed(): void {
-    this._open = false;
     this._params = undefined;
     this._moment = undefined;
     this._stats5min = undefined;
@@ -106,59 +97,25 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
     }
 
     let content: TemplateResult;
-    let footer: TemplateResult;
 
     if (!this._chosenStat) {
       content = this._renderPickStatistic();
-      footer = html`
-        <ha-button
-          slot="secondaryAction"
-          appearance="plain"
-          @click=${this._fetchOutliers}
-        >
-          ${this.hass.localize(
-            "ui.panel.config.developer-tools.tabs.statistics.fix_issue.adjust_sum.outliers"
-          )}
-        </ha-button>
-        <ha-button slot="primaryAction" data-dialog="close">
-          ${this.hass.localize("ui.common.close")}
-        </ha-button>
-      `;
     } else {
       content = this._renderAdjustStat();
-      footer = html`
-        <ha-button
-          slot="secondaryAction"
-          .disabled=${this._busy}
-          @click=${this._clearChosenStatistic}
-          appearance="plain"
-        >
-          ${this.hass.localize("ui.common.back")}</ha-button
-        >
-        <ha-button
-          slot="primaryAction"
-          .disabled=${this._busy}
-          @click=${this._fixIssue}
-        >
-          ${this.hass.localize(
-            "ui.panel.config.developer-tools.tabs.statistics.fix_issue.adjust_sum.adjust"
-          )}</ha-button
-        >
-      `;
     }
 
     return html`
-      <ha-wa-dialog
-        .hass=${this.hass}
-        .open=${this._open}
-        header-title=${this.hass.localize(
+      <ha-dialog
+        open
+        scrimClickAction
+        escapeKeyAction
+        @closed=${this.closeDialog}
+        .heading=${this.hass.localize(
           "ui.panel.config.developer-tools.tabs.statistics.fix_issue.adjust_sum.title"
         )}
-        @closed=${this._dialogClosed}
       >
         ${content}
-        <ha-dialog-footer slot="footer">${footer}</ha-dialog-footer>
-      </ha-wa-dialog>
+      </ha-dialog>
     `;
   }
 
@@ -239,6 +196,18 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
         @value-changed=${this._dateTimeSelectorChanged}
       ></ha-selector-datetime>
       <div class="stat-list">${stats}</div>
+      <ha-button
+        appearance="plain"
+        slot="secondaryAction"
+        @click=${this._fetchOutliers}
+      >
+        ${this.hass.localize(
+          "ui.panel.config.developer-tools.tabs.statistics.fix_issue.adjust_sum.outliers"
+        )}
+      </ha-button>
+      <ha-button slot="primaryAction" dialogAction="cancel">
+        ${this.hass.localize("ui.common.close")}
+      </ha-button>
     `;
   }
 
@@ -316,6 +285,24 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
         .disabled=${this._busy}
         @value-changed=${this._amountChanged}
       ></ha-selector-number>
+
+      <ha-button
+        slot="secondaryAction"
+        .disabled=${this._busy}
+        @click=${this._clearChosenStatistic}
+        appearance="plain"
+      >
+        ${this.hass.localize("ui.common.back")}</ha-button
+      >
+      <ha-button
+        slot="primaryAction"
+        .disabled=${this._busy}
+        @click=${this._fixIssue}
+      >
+        ${this.hass.localize(
+          "ui.panel.config.developer-tools.tabs.statistics.fix_issue.adjust_sum.adjust"
+        )}</ha-button
+      >
     `;
   }
 
@@ -505,6 +492,27 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
       haStyle,
       haStyleDialog,
       css`
+        @media all and (max-width: 450px), all and (max-height: 500px) {
+          /* overrule the ha-style-dialog max-height on small screens */
+          ha-dialog {
+            --mdc-dialog-max-height: 100%;
+            height: 100%;
+          }
+        }
+
+        @media all and (min-width: 850px) {
+          ha-dialog {
+            --mdc-dialog-max-height: 80%;
+            --mdc-dialog-max-height: 80%;
+          }
+        }
+
+        @media all and (min-width: 451px) and (min-height: 501px) {
+          ha-dialog {
+            --mdc-dialog-max-width: 480px;
+          }
+        }
+
         .text-content,
         ha-selector-datetime,
         ha-selector-number {

src/panels/config/developer-tools/statistics/dialog-statistics-fix-units-changed.ts

@@ -2,8 +2,7 @@ import type { CSSResultGroup } from "lit";
 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";
@@ -22,24 +21,20 @@ export class DialogStatisticsFixUnitsChanged extends LitElement {
 
   @state() private _params?: DialogStatisticsUnitsChangedParams;
 
-  @state() private _open = false;
-
   @state() private _action?: "update" | "clear" | "change";
 
   public showDialog(params: DialogStatisticsUnitsChangedParams): void {
     this._params = params;
     this._action = "update";
-    this._open = true;
   }
 
   public closeDialog(): void {
-    this._open = false;
+    this._cancel();
   }
 
-  private _dialogClosed(): void {
+  private _closeDialog(): void {
     this._params = undefined;
     this._action = undefined;
-    this._open = false;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
@@ -49,13 +44,14 @@ export class DialogStatisticsFixUnitsChanged extends LitElement {
     }
 
     return html`
-      <ha-wa-dialog
-        .hass=${this.hass}
-        .open=${this._open}
-        header-title=${this.hass.localize(
+      <ha-dialog
+        open
+        scrimClickAction
+        escapeKeyAction
+        @closed=${this._closeDialog}
+        .heading=${this.hass.localize(
           "ui.panel.config.developer-tools.tabs.statistics.fix_issue.units_changed.title"
         )}
-        @closed=${this._dialogClosed}
       >
         <p>
           ${this.hass.localize(
@@ -95,7 +91,7 @@ export class DialogStatisticsFixUnitsChanged extends LitElement {
             name="action"
             .checked=${this._action === "update"}
             @change=${this._handleActionChanged}
-            autofocus
+            dialogInitialFocus
           ></ha-radio>
         </ha-formfield>
         <ha-formfield
@@ -111,21 +107,19 @@ export class DialogStatisticsFixUnitsChanged extends LitElement {
           ></ha-radio>
         </ha-formfield>
 
-        <ha-dialog-footer slot="footer">
-          <ha-button
-            appearance="plain"
-            slot="secondaryAction"
-            @click=${this._cancel}
-          >
-            ${this.hass.localize("ui.common.close")}
-          </ha-button>
-          <ha-button slot="primaryAction" @click=${this._fixIssue}>
-            ${this.hass.localize(
-              "ui.panel.config.developer-tools.tabs.statistics.fix_issue.fix"
-            )}
-          </ha-button>
-        </ha-dialog-footer>
-      </ha-wa-dialog>
+        <ha-button
+          appearance="plain"
+          slot="primaryAction"
+          @click=${this._cancel}
+        >
+          ${this.hass.localize("ui.common.close")}
+        </ha-button>
+        <ha-button slot="primaryAction" @click=${this._fixIssue}>
+          ${this.hass.localize(
+            "ui.panel.config.developer-tools.tabs.statistics.fix_issue.fix"
+          )}
+        </ha-button>
+      </ha-dialog>
     `;
   }
 
@@ -135,7 +129,7 @@ export class DialogStatisticsFixUnitsChanged extends LitElement {
 
   private _cancel(): void {
     this._params?.cancelCallback!();
-    this.closeDialog();
+    this._closeDialog();
   }
 
   private async _fixIssue(): Promise<void> {
@@ -150,7 +144,7 @@ export class DialogStatisticsFixUnitsChanged extends LitElement {
       );
     }
     this._params?.fixedCallback!();
-    this.closeDialog();
+    this._closeDialog();
   }
 
   static get styles(): CSSResultGroup {

src/panels/config/developer-tools/statistics/dialog-statistics-fix.ts

@@ -3,8 +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-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";
@@ -19,23 +18,19 @@ export class DialogStatisticsFix extends LitElement {
 
   @state() private _params?: DialogStatisticsFixParams;
 
-  @state() private _open = false;
-
   @state() private _clearing = false;
 
   public showDialog(params: DialogStatisticsFixParams): void {
     this._params = params;
-    this._open = true;
   }
 
   public closeDialog(): void {
-    this._open = false;
+    this._cancel();
   }
 
-  private _dialogClosed(): void {
+  private _closeDialog(): void {
     this._params = undefined;
     this._clearing = false;
-    this._open = false;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
@@ -47,13 +42,14 @@ export class DialogStatisticsFix extends LitElement {
     const issue = this._params.issue;
 
     return html`
-      <ha-wa-dialog
-        .hass=${this.hass}
-        .open=${this._open}
-        header-title=${this.hass.localize(
+      <ha-dialog
+        open
+        scrimClickAction
+        escapeKeyAction
+        @closed=${this._closeDialog}
+        .heading=${this.hass.localize(
           `ui.panel.config.developer-tools.tabs.statistics.fix_issue.${issue.type}.title`
         )}
-        @closed=${this._dialogClosed}
       >
         <p>
           ${this.hass.localize(
@@ -151,36 +147,33 @@ export class DialogStatisticsFix extends LitElement {
                   : nothing}
         </p>
 
-        <ha-dialog-footer slot="footer">
-          ${issue.type !== "entity_not_recorded"
-            ? html`<ha-button
-                  appearance="plain"
-                  slot="secondaryAction"
-                  @click=${this._cancel}
-                >
-                  ${this.hass.localize("ui.common.close")}
-                </ha-button>
-                <ha-button
-                  slot="primaryAction"
-                  appearance="filled"
-                  @click=${this._clearStatistics}
-                  variants="danger"
-                  .disabled=${this._clearing}
-                  .loading=${this._clearing}
-                >
-                  ${this.hass.localize("ui.common.delete")}
-                </ha-button>`
-            : html`<ha-button slot="primaryAction" @click=${this._cancel}>
-                ${this.hass.localize("ui.common.ok")}
-              </ha-button>`}
-        </ha-dialog-footer>
-      </ha-wa-dialog>
+        ${issue.type !== "entity_not_recorded"
+          ? html`<ha-button
+                appearance="plain"
+                slot="primaryAction"
+                @click=${this._cancel}
+              >
+                ${this.hass.localize("ui.common.close")}
+              </ha-button>
+              <ha-button
+                slot="primaryAction"
+                @click=${this._clearStatistics}
+                variants="danger"
+                .disabled=${this._clearing}
+                .loading=${this._clearing}
+              >
+                ${this.hass.localize("ui.common.delete")}
+              </ha-button>`
+          : html`<ha-button slot="primaryAction" @click=${this._cancel}>
+              ${this.hass.localize("ui.common.ok")}
+            </ha-button>`}
+      </ha-dialog>
     `;
   }
 
   private _cancel(): void {
     this._params?.cancelCallback!();
-    this.closeDialog();
+    this._closeDialog();
   }
 
   private async _clearStatistics(): Promise<void> {
@@ -207,7 +200,7 @@ export class DialogStatisticsFix extends LitElement {
     } finally {
       this._clearing = false;
       this._params?.fixedCallback!();
-      this.closeDialog();
+      this._closeDialog();
     }
   }
 

src/panels/todo/dialog-todo-item-editor.ts

@@ -10,10 +10,11 @@ import "../../components/ha-alert";
 import "../../components/ha-button";
 import "../../components/ha-checkbox";
 import "../../components/ha-date-input";
-import { createCloseHeading } from "../../components/ha-dialog";
+import "../../components/ha-dialog-footer";
 import "../../components/ha-textarea";
 import "../../components/ha-textfield";
 import "../../components/ha-time-input";
+import "../../components/ha-wa-dialog";
 import {
   TodoItemStatus,
   TodoListEntityFeature,
@@ -50,6 +51,8 @@ class DialogTodoItemEditor extends LitElement {
 
   @state() private _submitting = false;
 
+  @state() private _open = false;
+
   // Dates are manipulated and displayed in the browser timezone
   // which may be different from the Home Assistant timezone. When
   // events are persisted, they are relative to the Home Assistant
@@ -59,6 +62,7 @@ class DialogTodoItemEditor extends LitElement {
   public showDialog(params: TodoItemEditDialogParams): void {
     this._error = undefined;
     this._params = params;
+    this._open = true;
     this._timeZone = resolveTimeZone(
       this.hass.locale.time_zone,
       this.hass.config.time_zone
@@ -86,6 +90,11 @@ class DialogTodoItemEditor extends LitElement {
     if (!this._params) {
       return;
     }
+    this._open = false;
+  }
+
+  private _dialogClosed(): void {
+    this._open = false;
     this._error = undefined;
     this._params = undefined;
     this._due = undefined;
@@ -108,16 +117,14 @@ class DialogTodoItemEditor extends LitElement {
     );
 
     return html`
-      <ha-dialog
-        open
-        @closed=${this.closeDialog}
-        scrimClickAction
-        .heading=${createCloseHeading(
-          this.hass,
-          this.hass.localize(
-            `ui.components.todo.item.${isCreate ? "add" : "edit"}`
-          )
+      <ha-wa-dialog
+        .hass=${this.hass}
+        .open=${this._open}
+        header-title=${this.hass.localize(
+          `ui.components.todo.item.${isCreate ? "add" : "edit"}`
         )}
+        width="medium"
+        @closed=${this._dialogClosed}
       >
         <div class="content">
           ${this._error
@@ -136,11 +143,11 @@ class DialogTodoItemEditor extends LitElement {
               .label=${this.hass.localize("ui.components.todo.item.summary")}
               .value=${this._summary}
               required
+              autofocus
               @input=${this._handleSummaryChanged}
               .validationMessage=${this.hass.localize(
                 "ui.common.error_required"
               )}
-              dialogInitialFocus
               .disabled=${!canUpdate}
             ></ha-textfield>
           </div>
@@ -203,41 +210,43 @@ class DialogTodoItemEditor extends LitElement {
               </div>`
             : nothing}
         </div>
-        ${isCreate
-          ? html`
-              <ha-button
-                slot="primaryAction"
-                @click=${this._createItem}
-                .disabled=${this._submitting}
-              >
-                ${this.hass.localize("ui.components.todo.item.add")}
-              </ha-button>
-            `
-          : html`
-              <ha-button
-                slot="primaryAction"
-                @click=${this._saveItem}
-                .disabled=${!canUpdate || this._submitting}
-              >
-                ${this.hass.localize("ui.components.todo.item.save")}
-              </ha-button>
-              ${this._todoListSupportsFeature(
-                TodoListEntityFeature.DELETE_TODO_ITEM
-              )
-                ? html`
-                    <ha-button
-                      slot="secondaryAction"
-                      variant="danger"
-                      appearance="plain"
-                      @click=${this._deleteItem}
-                      .disabled=${this._submitting}
-                    >
-                      ${this.hass.localize("ui.components.todo.item.delete")}
-                    </ha-button>
-                  `
-                : ""}
-            `}
-      </ha-dialog>
+        <ha-dialog-footer slot="footer">
+          ${isCreate
+            ? html`
+                <ha-button
+                  slot="primaryAction"
+                  @click=${this._createItem}
+                  .disabled=${this._submitting}
+                >
+                  ${this.hass.localize("ui.components.todo.item.add")}
+                </ha-button>
+              `
+            : html`
+                <ha-button
+                  slot="primaryAction"
+                  @click=${this._saveItem}
+                  .disabled=${!canUpdate || this._submitting}
+                >
+                  ${this.hass.localize("ui.components.todo.item.save")}
+                </ha-button>
+                ${this._todoListSupportsFeature(
+                  TodoListEntityFeature.DELETE_TODO_ITEM
+                )
+                  ? html`
+                      <ha-button
+                        slot="secondaryAction"
+                        variant="danger"
+                        appearance="plain"
+                        @click=${this._deleteItem}
+                        .disabled=${this._submitting}
+                      >
+                        ${this.hass.localize("ui.components.todo.item.delete")}
+                      </ha-button>
+                    `
+                  : ""}
+              `}
+        </ha-dialog-footer>
+      </ha-wa-dialog>
     `;
   }
 
@@ -415,12 +424,6 @@ class DialogTodoItemEditor extends LitElement {
     return [
       haStyleDialog,
       css`
-        @media all and (min-width: 450px) and (min-height: 500px) {
-          ha-dialog {
-            --mdc-dialog-min-width: min(600px, 95vw);
-            --mdc-dialog-max-width: min(600px, 95vw);
-          }
-        }
         ha-alert {
           display: block;
           margin-bottom: 16px;