Fix TS cast and formatting in dialog-energy-grid-settings

Co-authored-by: timmo001 <28114703+timmo001@users.noreply.github.com>

.agents/skills/ha-frontend-lit/SKILL.md

@@ -1,39 +0,0 @@
----
-name: ha-frontend-lit
-description: Home Assistant frontend Lit conventions. Use when working with reactive properties, internal state, DOM queries, lifecycle methods, or render-derived state.
----
-
-# HA Frontend Lit
-
-Use this skill when implementing or reviewing Lit component state, DOM access, lifecycle methods, or rendering behavior. Cross-load `ha-frontend-types` for Home Assistant data contracts, assertions, and lifecycle parameter types.
-
-## Reactive Fields
-
-This project currently uses Lit's TypeScript experimental decorators with `useDefineForClassFields: false`. Match existing declarations and do not introduce standard-decorator `accessor` syntax unless the project changes decorator mode.
-
-- Use `@property()` for public reactive API and `@state()` for private reactive state.
-- Prefer inferred types for initialized reactive fields when inference preserves the intended type; annotate when widening or an external contract requires it.
-
-## DOM Queries
-
-Prefer Lit's `@query()` or `@queryAll()` decorators for fixed selectors in the component's render root.
-
-- Type the decorated field with the narrowest useful DOM or component interface.
-- Keep the field optional when it may be absent at the point of access, including conditional rendering or pre-render lifecycle access.
-- Use a definite assignment assertion only when every call site runs after the node is guaranteed to exist.
-- The optional second argument to `@query()`, as in `@query("#target", true)`, caches the first query result. Use it only when later renders cannot replace the queried node.
-- Use a direct query when the selector is dynamic or the target is outside the component's render root. Before querying a child, consider whether the required value belongs in parent state or data flow.
-
-## Render-Derived State
-
-- Prefer render-local values for inexpensive structures used only by that render.
-- Assign a render-local value once when repeated evaluation is non-trivial or a local name improves clarity.
-- Keep purely presentational derivations in `render()`. Use stored state or `willUpdate()` when the value must participate in lifecycle work, reflection, CSS, or non-render consumers.
-- Use `memoizeOne` for pure, argument-derived transforms when stable input identity avoids meaningful repeated work. Keep inputs explicit and limited, and do not add caching without a credible benefit over computing the value directly.
-
-## References
-
-- [Reactive properties](https://lit.dev/docs/components/properties/)
-- [Decorators](https://lit.dev/docs/components/decorators/)
-- [Shadow DOM queries](https://lit.dev/docs/components/shadow-dom/#query)
-- [Reactive update cycle](https://lit.dev/docs/components/lifecycle/)

.agents/skills/ha-frontend-types/SKILL.md

@@ -1,44 +0,0 @@
----
-name: ha-frontend-types
-description: Home Assistant frontend TypeScript conventions. Use when defining or reviewing backend data contracts, optional schemas, shared types, assertions, or Lit lifecycle types.
----
-
-# HA Frontend Types
-
-Use this skill for Home Assistant-specific TypeScript contracts and type choices.
-
-## Home Assistant Data Contracts
-
-Verify data contracts against the source that owns them, such as Home Assistant Core, Supervisor, a WebSocket handler, or an exported component type. Do not shape a type around assumptions made by its current frontend consumers.
-
-- Match required, optional, nullable, and defaulted fields to the producer and runtime contract. Preserve optional configuration fields when omission is supported and has defined behavior.
-- Use distinct request and response types when their wire shapes differ.
-- When changing a shared contract, check affected consumers, tests, fixtures, and mocks.
-
-## Reuse Home Assistant Contracts
-
-- Reuse the canonical Home Assistant type when one exists. Define shared contract types in the data or API module that owns them.
-- Reuse types exported by components and helpers rather than reconstructing their payloads. For event types, follow `ha-frontend-events`.
-- When one domain contract is used across modules, define and export it from the module that owns that contract.
-
-Prefer an existing owning contract. Introduce a frontend-specific type when the frontend shape or boundary genuinely differs.
-
-## Assertions
-
-Prefer accurate types and runtime narrowing. Use assertions or TypeScript suppressions at boundaries where the runtime invariant is understood but cannot be expressed cleanly; keep them narrow and explain non-obvious invariants.
-
-## Lit Lifecycle Types
-
-For Lit lifecycle methods that receive changed properties, use `PropertyValues<this>` when the method only needs public reactive properties:
-
-```ts
-protected willUpdate(changedProperties: PropertyValues<this>) {
-  // ...
-}
-```
-
-Use unparameterized `PropertyValues` when the method inspects private or protected reactive properties, which are not keys of `this`. Do not add assertions solely to retain `PropertyValues<this>`.
-
-## Enforced Baseline
-
-Use `import type` for type-only imports. This is enforced by the repository ESLint configuration.

.nvmrc

@@ -1 +1 @@
-24.19.0
+24.18.1

AGENTS.md

@@ -41,8 +41,6 @@ Detailed guidance lives in project skills under `.agents/skills/`. Load the matc
 - `ha-frontend-contexts`: Lit contexts, `hass` migration, and rerender-sensitive state access.
 - `ha-frontend-components`: dialogs, forms, alerts, shortcuts, tooltips, panels, and Lovelace cards.
 - `ha-frontend-events`: event handler typing, custom event dispatch, and event-map declarations.
-- `ha-frontend-types`: backend data contracts, optional schemas, shared types, assertions, and lifecycle types.
-- `ha-frontend-lit`: reactive fields, DOM queries, lifecycle behavior, and render-derived state.
 - `ha-frontend-styling`: theme variables, spacing tokens, responsive layout, RTL, and view transitions.
 - `ha-frontend-testing`: lint, typecheck, Vitest, Playwright e2e dev servers, and benchmarks.
 - `ha-frontend-user-facing-text`: localization, terminology, sentence case, and Home Assistant text style.

gallery/src/pages/components/ha-progress-button.ts

@@ -23,7 +23,7 @@ export class DemoHaProgressButton extends LitElement {
                 <ha-progress-button @click=${this._clickedFail}>
                   Fail
                 </ha-progress-button>
-                <ha-progress-button size="s" @click=${this._clickedSuccess}>
+                <ha-progress-button size="small" @click=${this._clickedSuccess}>
                   small
                 </ha-progress-button>
                 <ha-progress-button

package.json

@@ -108,7 +108,7 @@
     "home-assistant-js-websocket": "9.6.0",
     "idb-keyval": "6.3.0",
     "intl-messageformat": "11.2.13",
-    "js-yaml": "5.2.3",
+    "js-yaml": "5.2.2",
     "leaflet": "1.9.4",
     "leaflet-draw": "patch:leaflet-draw@npm%3A1.0.4#./.yarn/patches/leaflet-draw-npm-1.0.4-0ca0ebcf65.patch",
     "leaflet.markercluster": "1.5.3",
@@ -160,7 +160,7 @@
     "@types/color-name": "2.0.0",
     "@types/culori": "4.0.1",
     "@types/html-minifier-terser": "7.0.2",
-    "@types/leaflet": "1.9.22",
+    "@types/leaflet": "1.9.21",
     "@types/leaflet-draw": "1.0.13",
     "@types/leaflet.markercluster": "1.5.6",
     "@types/lodash.merge": "4.6.9",
@@ -196,7 +196,7 @@
     "jsdom": "30.0.1",
     "jszip": "3.10.1",
     "license-checker-rseidelsohn": "5.0.1",
-    "lint-staged": "17.3.0",
+    "lint-staged": "17.2.0",
     "lit-analyzer": "2.0.3",
     "lodash.merge": "4.6.2",
     "lodash.template": "4.18.1",
@@ -230,6 +230,6 @@
   },
   "packageManager": "yarn@4.18.0",
   "volta": {
-    "node": "24.19.0"
+    "node": "24.18.1"
   }
 }

renovate.json

@@ -8,10 +8,10 @@
     ":prConcurrentLimit10",
     ":semanticCommitsDisabled",
     "group:monorepos",
-    "group:recommended"
+    "group:recommended",
+    "security:minimumReleaseAgeNpm"
   ],
   "enabledManagers": ["npm", "nvm", "custom.regex"],
-  "minimumReleaseAge": "3 days",
   "postUpdateOptions": ["yarnDedupeHighest"],
   "lockFileMaintenance": {
     "description": ["Run after patch releases but before next beta"],

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

@@ -18,8 +18,6 @@ export class HaProgressButton extends LitElement {
 
   @property() appearance: Appearance = "accent";
 
-  @property() size: "xs" | "s" | "m" | "l" | "xl" = "m";
-
   @property({ attribute: false }) public iconPath?: string;
 
   @property() variant: "brand" | "danger" | "neutral" | "warning" | "success" =
@@ -34,7 +32,6 @@ export class HaProgressButton extends LitElement {
     return html`
       <ha-button
         .appearance=${appearance}
-        .size=${this.size}
         .disabled=${this.disabled}
         .loading=${this.progress}
         .variant=${
@@ -121,12 +118,6 @@ export class HaProgressButton extends LitElement {
       width: 100%;
     }
 
-    /* The icon lives in this shadow root, so callers cannot size it themselves. */
-    ha-button[size="xs"] ha-svg-icon[slot="start"],
-    ha-button[size="s"] ha-svg-icon[slot="start"] {
-      --mdc-icon-size: 16px;
-    }
-
     /* Fade the content out rather than hiding it, so the button keeps its
        accessible name while the result icon covers it. */
     ha-button.result::part(start),

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

@@ -26,10 +26,7 @@ import { styleMap } from "lit/directives/style-map";
 import { ensureArray } from "../../common/array/ensure-array";
 import { getAllGraphColors } from "../../common/color/colors";
 import { transform } from "../../common/decorators/transform";
-import type {
-  HASSDomCurrentTargetEvent,
-  HASSDomEvent,
-} from "../../common/dom/fire_event";
+import type { HASSDomEvent } from "../../common/dom/fire_event";
 import { fireEvent } from "../../common/dom/fire_event";
 import { listenMediaQuery } from "../../common/dom/media_query";
 import { afterNextRender } from "../../common/util/render-status";
@@ -1219,9 +1216,7 @@ export class HaChartBase extends LitElement {
   }
 
   // Long-press to solo on touch/pen devices (500ms, consistent with action-handler-directive)
-  private _legendPointerDown(
-    ev: PointerEvent & HASSDomCurrentTargetEvent<HTMLElement>
-  ) {
+  private _legendPointerDown(ev: PointerEvent) {
     // Mouse uses Ctrl/Cmd+click instead
     if (ev.pointerType === "mouse") {
       return;
@@ -1251,9 +1246,7 @@ export class HaChartBase extends LitElement {
     }
   }
 
-  private _toggleDataset(
-    ev: MouseEvent & HASSDomCurrentTargetEvent<HTMLElement>
-  ) {
+  private _toggleDataset(ev: MouseEvent) {
     ev.stopPropagation();
     if (!this.chart) {
       return;
@@ -1275,7 +1268,7 @@ export class HaChartBase extends LitElement {
     this._handleDatasetToggle(id);
   }
 
-  private _labelClick(ev: MouseEvent & HASSDomCurrentTargetEvent<HTMLElement>) {
+  private _labelClick(ev: MouseEvent) {
     ev.stopPropagation();
     if (!this.chart) {
       return;

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

@@ -2,10 +2,13 @@ import { customElement, property, state } from "lit/decorators";
 import { LitElement, html, css } from "lit";
 import type { EChartsType } from "echarts/core";
 import type { SankeySeriesOption } from "echarts/types/dist/echarts";
-import type { CallbackDataParams } from "echarts/types/src/util/types";
+import type {
+  CallbackDataParams,
+  ECElementEvent,
+} from "echarts/types/src/util/types";
 import memoizeOne from "memoize-one";
 import { ResizeController } from "@lit-labs/observers/resize-controller";
-import { fireEvent, type HASSDomEvent } from "../../common/dom/fire_event";
+import { fireEvent } from "../../common/dom/fire_event";
 import SankeyChart from "../../resources/echarts/components/sankey/install";
 import type { HomeAssistant } from "../../types";
 import type { HaECOption } from "../../resources/echarts/echarts";
@@ -118,15 +121,11 @@ export class HaSankeyChart extends LitElement {
     return null;
   };
 
-  private _handleChartSankeyRoam = (
-    ev: HASSDomEvent<HASSDomEvents["chart-sankeyroam"]>
-  ) => {
+  private _handleChartSankeyRoam = (ev: CustomEvent) => {
     this._currentZoom = ev.detail.zoom;
   };
 
-  private _handleChartClick = (
-    ev: HASSDomEvent<HASSDomEvents["chart-click"]>
-  ) => {
+  private _handleChartClick = (ev: CustomEvent<ECElementEvent>) => {
     const detail = ev.detail;
     // Only handle node clicks (not links)
     if (detail.dataType !== "node") {

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

@@ -216,13 +216,11 @@ export class StateHistoryChartLine extends LitElement {
     })}`;
   };
 
-  private _datasetHidden(ev: HASSDomEvent<HASSDomEvents["dataset-hidden"]>) {
+  private _datasetHidden(ev: CustomEvent) {
     this._hiddenStats.add(ev.detail.id);
   }
 
-  private _datasetUnhidden(
-    ev: HASSDomEvent<HASSDomEvents["dataset-unhidden"]>
-  ) {
+  private _datasetUnhidden(ev: CustomEvent) {
     this._hiddenStats.delete(ev.detail.id);
   }
 
@@ -231,7 +229,7 @@ export class StateHistoryChartLine extends LitElement {
     chartBase.zoom(start, end, true);
   }
 
-  private _handleDataZoom(ev: HASSDomEvent<HASSDomEvents["chart-zoom"]>) {
+  private _handleDataZoom(ev: CustomEvent) {
     fireEvent(this, "chart-zoom-with-index", {
       start: ev.detail.start ?? 0,
       end: ev.detail.end ?? 100,

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

@@ -4,6 +4,7 @@ import { customElement, property, state } from "lit/decorators";
 import type {
   CustomSeriesOption,
   CustomSeriesRenderItem,
+  ECElementEvent,
   TooltipPositionCallbackParams,
 } from "echarts/types/dist/shared";
 import { formatDateTimeWithSeconds } from "../../common/datetime/format_date_time";
@@ -20,7 +21,7 @@ import echarts from "../../resources/echarts/echarts";
 import { luminosity } from "../../common/color/rgb";
 import { hex2rgb } from "../../common/color/convert-color";
 import { measureTextWidth } from "../../util/text";
-import { fireEvent, type HASSDomEvent } from "../../common/dom/fire_event";
+import { fireEvent } from "../../common/dom/fire_event";
 
 @customElement("state-history-chart-timeline")
 export class StateHistoryChartTimeline extends LitElement {
@@ -270,7 +271,7 @@ export class StateHistoryChartTimeline extends LitElement {
     chartBase.zoom(start, end, true);
   }
 
-  private _handleDataZoom(ev: HASSDomEvent<HASSDomEvents["chart-zoom"]>) {
+  private _handleDataZoom(ev: CustomEvent) {
     fireEvent(this, "chart-zoom-with-index", {
       start: ev.detail.start ?? 0,
       end: ev.detail.end ?? 100,
@@ -384,9 +385,7 @@ export class StateHistoryChartTimeline extends LitElement {
     this._chartData = datasets;
   }
 
-  private _handleChartClick(
-    e: HASSDomEvent<HASSDomEvents["chart-click"]>
-  ): void {
+  private _handleChartClick(e: CustomEvent<ECElementEvent>): void {
     if (e.detail.targetType === "axisLabel") {
       const dataset = this._chartData[e.detail.dataIndex];
       if (dataset) {

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

@@ -11,10 +11,6 @@ import {
 } from "lit/decorators";
 import { isComponentLoaded } from "../../common/config/is_component_loaded";
 import { restoreScroll } from "../../common/decorators/restore-scroll";
-import type {
-  HASSDomEvent,
-  HASSDomTargetEvent,
-} from "../../common/dom/fire_event";
 import type {
   HistoryResult,
   LineChartUnit,
@@ -320,13 +316,13 @@ export class StateHistoryCharts extends LitElement {
     }
   }
 
-  private _yWidthChanged(e: HASSDomEvent<HASSDomEvents["y-width-changed"]>) {
+  private _yWidthChanged(e: CustomEvent<HASSDomEvents["y-width-changed"]>) {
     this._childYWidths[e.detail.chartIndex] = e.detail.value;
     this._maxYWidth = Math.max(...Object.values(this._childYWidths), 0);
   }
 
   private _handleTimelineSync(
-    e: HASSDomEvent<HASSDomEvents["chart-zoom-with-index"]>
+    e: CustomEvent<HASSDomEvents["chart-zoom-with-index"]>
   ) {
     if (!this.syncCharts || this._isSyncing) {
       return;
@@ -388,7 +384,7 @@ export class StateHistoryCharts extends LitElement {
   }
 
   @eventOptions({ passive: true })
-  private _saveScrollPos(e: HASSDomTargetEvent<HTMLDivElement>) {
+  private _saveScrollPos(e: Event) {
     this._savedScrollPos = (e.target as HTMLDivElement).scrollTop;
   }
 

src/components/chart/statistics-chart.ts

@@ -204,14 +204,12 @@ export class StatisticsChart extends LitElement {
     `;
   }
 
-  private _datasetHidden(ev: HASSDomEvent<HASSDomEvents["dataset-hidden"]>) {
+  private _datasetHidden(ev: CustomEvent) {
     this._hiddenStats.add(ev.detail.id);
     this.requestUpdate("_hiddenStats");
   }
 
-  private _datasetUnhidden(
-    ev: HASSDomEvent<HASSDomEvents["dataset-unhidden"]>
-  ) {
+  private _datasetUnhidden(ev: CustomEvent) {
     this._hiddenStats.delete(ev.detail.id);
     this.requestUpdate("_hiddenStats");
   }

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

@@ -15,10 +15,6 @@ import {
 } from "../../common/datetime/format_date";
 import { transform } from "../../common/decorators/transform";
 import { fireEvent } from "../../common/dom/fire_event";
-import type {
-  HASSDomEvent,
-  HASSDomTargetEvent,
-} from "../../common/dom/fire_event";
 import { configContext, internationalizationContext } from "../../data/context";
 import { TimeZone } from "../../data/translation";
 import { MobileAwareMixin } from "../../mixins/mobile-aware-mixin";
@@ -311,7 +307,7 @@ export class DateRangePicker extends MobileAwareMixin(LitElement) {
     });
   }
 
-  private _focusChanged(ev: HASSDomEvent<Date>) {
+  private _focusChanged(ev: CustomEvent<Date>) {
     const date = ev.detail;
     this._pickerMonth = formatDateMonth(
       date,
@@ -326,19 +322,13 @@ export class DateRangePicker extends MobileAwareMixin(LitElement) {
     this._focusDate = undefined;
   }
 
-  private _handleChange(
-    ev: HASSDomTargetEvent<HTMLElementTagNameMap["calendar-range"]>
-  ) {
+  private _handleChange(ev: CustomEvent) {
     const dateElement = ev.target as HTMLElementTagNameMap["calendar-range"];
     this._dateValue = dateElement.value;
     this._focusDate = undefined;
   }
 
-  private _clickDateRangeChip(
-    ev: HASSDomTargetEvent<
-      HaFilterChip & { index: number; range: [Date, Date] }
-    >
-  ) {
+  private _clickDateRangeChip(ev: Event) {
     const chip = ev.target as HaFilterChip & {
       index: number;
       range: [Date, Date];
@@ -346,7 +336,7 @@ export class DateRangePicker extends MobileAwareMixin(LitElement) {
     this._saveDateRangePreset(chip.range, chip.index);
   }
 
-  private _setDateRange(ev: HASSDomEvent<ActionDetail>) {
+  private _setDateRange(ev: CustomEvent<ActionDetail>) {
     const dateRange: [Date, Date] = Object.values(this.ranges!)[
       ev.detail.index
     ];
@@ -365,9 +355,7 @@ export class DateRangePicker extends MobileAwareMixin(LitElement) {
     });
   }
 
-  private _handleChangeTime(
-    ev: ValueChangedEvent<string> & HASSDomTargetEvent<HaBaseTimeInput>
-  ) {
+  private _handleChangeTime(ev: ValueChangedEvent<string>) {
     ev.stopPropagation();
     const time = ev.detail.value;
     const target = ev.target as HaBaseTimeInput;

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

@@ -13,10 +13,6 @@ import {
 } from "../../common/datetime/format_date";
 import { valueToDate } from "../../common/datetime/value_to_date";
 import { transform } from "../../common/decorators/transform";
-import type {
-  HASSDomEvent,
-  HASSDomTargetEvent,
-} from "../../common/dom/fire_event";
 import { configContext, internationalizationContext } from "../../data/context";
 import { DialogMixin } from "../../dialogs/dialog-mixin";
 import type { HomeAssistantConfig } from "../../types";
@@ -171,7 +167,7 @@ export class HaDialogDatePicker extends DialogMixin<DatePickerDialogParams>(
     </ha-adaptive-popover>`;
   }
 
-  private _valueChanged(ev: HASSDomTargetEvent<CalendarDate>) {
+  private _valueChanged(ev: Event) {
     const dateElement = ev.target as CalendarDate;
     if (dateElement.value) {
       this._updateValue(dateElement.value);
@@ -202,7 +198,7 @@ export class HaDialogDatePicker extends DialogMixin<DatePickerDialogParams>(
     }
   }
 
-  private _focusChanged(ev: HASSDomEvent<Date>) {
+  private _focusChanged(ev: CustomEvent<Date>) {
     const date = ev.detail;
     this._pickerMonth = formatDateMonth(
       date,

src/components/ha-areas-floors-display-editor.ts

@@ -7,10 +7,6 @@ import { repeat } from "lit/directives/repeat";
 import memoizeOne from "memoize-one";
 import { consumeLocalize } from "../common/decorators/consume-context-entry";
 import { fireEvent } from "../common/dom/fire_event";
-import type {
-  HASSDomCurrentTargetEvent,
-  HASSDomEvent,
-} from "../common/dom/fire_event";
 import { computeFloorName } from "../common/entity/compute_floor_name";
 import { getAreaContext } from "../common/entity/context/get_area_context";
 import type { LocalizeFunc } from "../common/translations/localize";
@@ -195,7 +191,7 @@ export class HaAreasFloorsDisplayEditor extends LitElement {
     }
   );
 
-  private _floorMoved(ev: HASSDomEvent<HASSDomEvents["item-moved"]>) {
+  private _floorMoved(ev: CustomEvent<HASSDomEvents["item-moved"]>) {
     ev.stopPropagation();
     const newIndex = ev.detail.newIndex;
     const oldIndex = ev.detail.oldIndex;
@@ -219,12 +215,7 @@ export class HaAreasFloorsDisplayEditor extends LitElement {
     fireEvent(this, "value-changed", { value: newValue });
   }
 
-  private async _areaDisplayChanged(
-    ev: ValueChangedEvent<DisplayValue> &
-      HASSDomCurrentTargetEvent<
-        HTMLElementTagNameMap["ha-items-display-editor"] & { floorId?: string }
-      >
-  ) {
+  private async _areaDisplayChanged(ev: ValueChangedEvent<DisplayValue>) {
     ev.stopPropagation();
     const value = ev.detail.value;
     const currentFloorId = (ev.currentTarget as any).floorId;

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

@@ -2,7 +2,6 @@ import type { TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
-import type { HASSDomTargetEvent } from "../../common/dom/fire_event";
 import "../ha-checkbox";
 import type { HaCheckbox } from "../ha-checkbox";
 import type {
@@ -44,7 +43,7 @@ export class HaFormBoolean extends LitElement implements HaFormElement {
     `;
   }
 
-  private _valueChanged(ev: HASSDomTargetEvent<HaCheckbox>) {
+  private _valueChanged(ev: Event) {
     fireEvent(this, "value-changed", {
       value: (ev.target as HaCheckbox).checked,
     });

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

@@ -2,7 +2,6 @@ import type { PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
-import type { HASSDomTargetEvent } from "../../common/dom/fire_event";
 import type { LocalizeFunc } from "../../common/translations/localize";
 import "../input/ha-input";
 import type { HaInput } from "../input/ha-input";
@@ -71,7 +70,7 @@ export class HaFormFloat extends LitElement implements HaFormElement {
     }
   }
 
-  private _handleInput(ev: InputEvent & HASSDomTargetEvent<HaInput>) {
+  private _handleInput(ev: InputEvent) {
     const source = ev.target as HaInput;
     const rawValue = (source.value ?? "").replace(",", ".");
 

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

@@ -2,7 +2,6 @@ import type { PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
-import type { HASSDomTargetEvent } from "../../common/dom/fire_event";
 import type { LocalizeFunc } from "../../common/translations/localize";
 import "../ha-checkbox";
 import type { HaCheckbox } from "../ha-checkbox";
@@ -154,7 +153,7 @@ export class HaFormInteger extends LitElement implements HaFormElement {
     );
   }
 
-  private _handleCheckboxChange(ev: HASSDomTargetEvent<HaCheckbox>) {
+  private _handleCheckboxChange(ev: Event) {
     const checked = (ev.target as HaCheckbox).checked;
     let value: HaFormIntegerData | undefined;
     if (checked) {
@@ -179,9 +178,7 @@ export class HaFormInteger extends LitElement implements HaFormElement {
     });
   }
 
-  private _valueChanged(
-    ev: InputEvent & HASSDomTargetEvent<HaInput | HTMLInputElement>
-  ) {
+  private _valueChanged(ev: InputEvent) {
     const source = ev.target as HaInput | HTMLInputElement;
     const rawValue = source.value;
 

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

@@ -2,7 +2,6 @@ import type { PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
-import type { HASSDomTargetEvent } from "../../common/dom/fire_event";
 import "../ha-check-list-item";
 import "../ha-checkbox";
 import type { HaCheckbox } from "../ha-checkbox";
@@ -141,7 +140,7 @@ export class HaFormMultiSelect extends LitElement implements HaFormElement {
     }
   }
 
-  private _valueChanged(ev: HASSDomTargetEvent<HaCheckbox>): void {
+  private _valueChanged(ev: CustomEvent): void {
     const { value, checked } = ev.target as HaCheckbox;
     this._handleValueChanged(value, checked);
   }

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

@@ -4,7 +4,7 @@ import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
 import type { SelectSelector } from "../../data/selector";
-import type { HomeAssistant, ValueChangedEvent } from "../../types";
+import type { HomeAssistant } from "../../types";
 import "../ha-selector/ha-selector-select";
 import type {
   HaFormElement,
@@ -78,7 +78,7 @@ export class HaFormSelect extends LitElement implements HaFormElement {
     `;
   }
 
-  private _valueChanged(ev: ValueChangedEvent<string>) {
+  private _valueChanged(ev: CustomEvent) {
     ev.stopPropagation();
     let value: HaFormSelectData | undefined = ev.detail.value;
 

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

@@ -2,7 +2,6 @@ import type { PropertyValues, TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
-import type { HASSDomTargetEvent } from "../../common/dom/fire_event";
 import type { LocalizeFunc } from "../../common/translations/localize";
 import "../ha-icon-button";
 import "../input/ha-input";
@@ -80,7 +79,7 @@ export class HaFormString extends LitElement implements HaFormElement {
     }
   }
 
-  protected _valueChanged(ev: HASSDomTargetEvent<HaInput>): void {
+  protected _valueChanged(ev: Event): void {
     let value: string | undefined = (ev.target as HaInput).value;
     if (this.data === value) {
       return;

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

@@ -3,19 +3,11 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { dynamicElement } from "../../common/dom/dynamic-element-directive";
 import { fireEvent } from "../../common/dom/fire_event";
-import type { HomeAssistant, ValueChangedEvent } from "../../types";
+import type { HomeAssistant } from "../../types";
 import "../ha-alert";
 import "../ha-selector/ha-selector";
 import { getHiddenFields } from "./conditions";
-import type {
-  HaFormData,
-  HaFormDataContainer,
-  HaFormElement,
-  HaFormSchema,
-} from "./types";
-
-type HaFormDataChangedEvent = ValueChangedEvent<HaFormData>;
-type HaFormDataContainerChangedEvent = ValueChangedEvent<HaFormDataContainer>;
+import type { HaFormDataContainer, HaFormElement, HaFormSchema } from "./types";
 
 const LOAD_ELEMENTS = {
   boolean: () => import("./ha-form-boolean"),
@@ -269,18 +261,16 @@ export class HaForm extends LitElement implements HaFormElement {
   }
 
   protected addValueChangedListener(element: Element | ShadowRoot) {
-    element.addEventListener("value-changed", (ev: Event) => {
+    element.addEventListener("value-changed", (ev) => {
       ev.stopPropagation();
       const schema = (ev.target as HaFormElement).schema as HaFormSchema;
 
       if (ev.target === this) return;
 
-      const changeEv = ev as
-        HaFormDataChangedEvent | HaFormDataContainerChangedEvent;
       const newValue =
         !schema.name || ("flatten" in schema && schema.flatten)
-          ? (changeEv.detail.value as HaFormDataContainer)
-          : { [schema.name]: changeEv.detail.value as HaFormData };
+          ? ev.detail.value
+          : { [schema.name]: ev.detail.value };
 
       this.data = {
         ...this.data,

src/components/ha-network.ts

@@ -3,7 +3,6 @@ import type { CSSResultGroup, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
-import type { HASSDomCurrentTargetEvent } from "../common/dom/fire_event";
 import type {
   Adapter,
   IPv4ConfiguredAddress,
@@ -102,9 +101,7 @@ export class HaNetwork extends LitElement {
     `;
   }
 
-  private _handleAutoConfigureCheckboxClick(
-    ev: HASSDomCurrentTargetEvent<HaCheckbox>
-  ) {
+  private _handleAutoConfigureCheckboxClick(ev: Event) {
     const checkbox = ev.currentTarget as HaCheckbox;
     if (this.networkConfig === undefined) {
       return;
@@ -130,9 +127,7 @@ export class HaNetwork extends LitElement {
     });
   }
 
-  private _handleAdapterCheckboxClick(
-    ev: HASSDomCurrentTargetEvent<HaCheckbox>
-  ) {
+  private _handleAdapterCheckboxClick(ev: Event) {
     const checkbox = ev.currentTarget as HaCheckbox;
     const adapter_name = checkbox.id;
     if (this.networkConfig === undefined) {

src/components/ha-push-notifications-toggle.ts

@@ -5,7 +5,7 @@ import { getAppKey } from "../data/notify_html5";
 import { showPromptDialog } from "../dialogs/generic/show-dialog-box";
 import type { HaSwitch } from "./ha-switch";
 import type { HomeAssistant } from "../types";
-import { fireEvent, type HASSDomTargetEvent } from "../common/dom/fire_event";
+import { fireEvent } from "../common/dom/fire_event";
 import "./ha-switch";
 
 export const pushSupported =
@@ -55,7 +55,7 @@ class HaPushNotificationsToggle extends LitElement {
     }
   }
 
-  private _handlePushChange(ev: HASSDomTargetEvent<HaSwitch>) {
+  private _handlePushChange(ev: Event) {
     // Somehow this is triggered on Safari on page load causing
     // it to get into a loop and crash the page.
     if (!pushSupported) return;

src/components/ha-segmented-bar.ts

@@ -4,7 +4,6 @@ import { customElement, property } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { styleMap } from "lit/directives/style-map";
 import { fireEvent } from "../common/dom/fire_event";
-import type { HASSDomCurrentTargetEvent } from "../common/dom/fire_event";
 import "./ha-tooltip";
 
 export interface Segment {
@@ -121,9 +120,7 @@ class HaSegmentedBar extends LitElement {
     `;
   }
 
-  private _handleSegmentClick(
-    ev: HASSDomCurrentTargetEvent<HTMLElement>
-  ): void {
+  private _handleSegmentClick(ev: Event): void {
     const target = ev.currentTarget as HTMLElement;
     const index = Number(target.dataset.index);
     const segment = this.segments[index];
@@ -132,7 +129,7 @@ class HaSegmentedBar extends LitElement {
     }
   }
 
-  private _handleLegendClick(ev: HASSDomCurrentTargetEvent<HTMLElement>): void {
+  private _handleLegendClick(ev: Event): void {
     const target = ev.currentTarget as HTMLElement;
     const index = Number(target.dataset.index);
     const segment = this.segments[index];

src/components/ha-select.ts

@@ -4,7 +4,6 @@ import { ifDefined } from "lit/directives/if-defined";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
 import "./ha-dropdown";
-import type { HaDropdownSelectEvent } from "./ha-dropdown";
 import "./ha-dropdown-item";
 import "./ha-input-helper-text";
 import "./ha-picker-field";
@@ -170,7 +169,7 @@ export class HaSelect extends LitElement {
       : nothing;
   }
 
-  private _handleSelect(ev: HaDropdownSelectEvent<string | number>) {
+  private _handleSelect(ev: CustomEvent<{ item: { value: string | number } }>) {
     ev.stopPropagation();
     const value = ev.detail.item.value;
     if (value === this.value) {

src/components/ha-sidebar.ts

@@ -17,7 +17,7 @@ import { stringCompare } from "../common/string/compare";
 import { computeRTL } from "../common/util/compute_rtl";
 import { throttle } from "../common/util/throttle";
 import { subscribeFrontendUserData } from "../data/frontend";
-import type { ActionHandlerEvent } from "../data/lovelace/action_handler";
+import type { ActionHandlerDetail } from "../data/lovelace/action_handler";
 import {
   FIXED_PANELS,
   getDefaultPanelUrlPath,
@@ -634,7 +634,7 @@ class HaSidebar extends SubscribeMixin(ScrollableFadeMixin(LitElement)) {
     });
   }
 
-  private _handleAction(ev: ActionHandlerEvent) {
+  private _handleAction(ev: CustomEvent<ActionHandlerDetail>) {
     if (ev.detail.action !== "hold") {
       return;
     }
@@ -646,7 +646,7 @@ class HaSidebar extends SubscribeMixin(ScrollableFadeMixin(LitElement)) {
     fireEvent(this, "hass-show-notifications");
   }
 
-  private _toggleSidebar(ev: ActionHandlerEvent) {
+  private _toggleSidebar(ev: CustomEvent) {
     if (ev.detail.action !== "tap") {
       return;
     }

src/components/ha-top-app-bar-fixed.ts

@@ -2,7 +2,6 @@ import type { CSSResultGroup, PropertyValues } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
-import type { HASSDomCurrentTargetEvent } from "../common/dom/fire_event";
 import { goBack } from "../common/navigate";
 import { haStyleScrollbar } from "../resources/styles";
 import "./ha-icon-button-arrow-prev";
@@ -325,9 +324,7 @@ export class HaTopAppBarFixed extends LitElement {
     this._subRowResizeObserver = undefined;
   }
 
-  private _subRowSlotChanged = (
-    ev: HASSDomCurrentTargetEvent<HTMLSlotElement>
-  ) => {
+  private _subRowSlotChanged = (ev: Event) => {
     const slot = ev.currentTarget as HTMLSlotElement;
     this._hasSubRow = slot
       .assignedNodes({ flatten: true })

src/components/input/ha-input-copy.ts

@@ -2,7 +2,6 @@ import { consume, type ContextType } from "@lit/context";
 import { mdiContentCopy, mdiEye, mdiEyeOff } from "@mdi/js";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
-import type { HASSDomCurrentTargetEvent } from "../../common/dom/fire_event";
 import { copyToClipboard } from "../../common/util/copy-clipboard";
 import { internationalizationContext } from "../../data/context";
 import { showToast } from "../../util/toast";
@@ -112,7 +111,7 @@ export class HaInputCopy extends LitElement {
     `;
   }
 
-  private _focusInput(ev: HASSDomCurrentTargetEvent<HaInput>) {
+  private _focusInput(ev: Event) {
     const inputElement = ev.currentTarget as HaInput;
     inputElement.select();
   }

src/components/item/ha-row-item.ts

@@ -2,7 +2,6 @@ import { HasSlotController } from "@home-assistant/webawesome/dist/internal/slot
 import type { CSSResultGroup, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import type { HASSDomTargetEvent } from "../../common/dom/fire_event";
 
 /**
  * @element ha-row-item
@@ -57,7 +56,7 @@ export class HaRowItem extends LitElement {
   @state() private _hasEnd = false;
 
   private _onSlotChange(name: "start" | "end") {
-    return (ev: HASSDomTargetEvent<HTMLSlotElement>) => {
+    return (ev: Event) => {
       const slot = ev.target as HTMLSlotElement;
       const hasContent = slot
         .assignedNodes({ flatten: true })

src/components/map/ha-map.ts

@@ -175,8 +175,6 @@ export class HaMap extends ReactiveElement {
 
   private _pauseAutoFit = false;
 
-  private _pendingFit?: () => void;
-
   public connectedCallback(): void {
     this._pauseAutoFit = false;
     document.addEventListener("visibilitychange", this._handleVisibilityChange);
@@ -206,7 +204,6 @@ export class HaMap extends ReactiveElement {
       this.Leaflet = undefined;
     }
 
-    this._pendingFit = undefined;
     this._loaded = false;
 
     if (this._resizeObserver) {
@@ -350,10 +347,6 @@ export class HaMap extends ReactiveElement {
       return;
     }
 
-    if (this._deferIfUnsized(() => this.fitMap(options))) {
-      return;
-    }
-
     if (
       !this._mapFocusItems.length &&
       !this._mapFocusZones.length &&
@@ -394,40 +387,6 @@ export class HaMap extends ReactiveElement {
     }, PROGRAMMITIC_FIT_DELAY);
   }
 
-  // Leaflet derives the zoom level that fits given bounds from the current
-  // size of the map container. When the container has not been laid out yet,
-  // that size is 0x0 and the computed zoom collapses to the minimum, leaving
-  // the map zoomed out to the world even after the container gets its size.
-  // Defer fitting until the resize observer reports a usable size.
-  private _deferIfUnsized(fit: () => void): boolean {
-    const size = this.leafletMap!.getSize();
-    if (size.x > 0 && size.y > 0) {
-      this._pendingFit = undefined;
-      return false;
-    }
-    const container = this.leafletMap!.getContainer();
-    if (container.clientWidth > 0 && container.clientHeight > 0) {
-      // The container was laid out since Leaflet last measured it.
-      this.leafletMap!.invalidateSize(false);
-      this._pendingFit = undefined;
-      return false;
-    }
-    this._pendingFit = fit;
-    return true;
-  }
-
-  private _runPendingFit(): void {
-    if (!this._pendingFit || !this.leafletMap) {
-      return;
-    }
-    const size = this.leafletMap.getSize();
-    if (size.x > 0 && size.y > 0) {
-      const pendingFit = this._pendingFit;
-      this._pendingFit = undefined;
-      pendingFit();
-    }
-  }
-
   public fitBounds(
     boundingbox: LatLngExpression[],
     options?: { zoom?: number; pad?: number }
@@ -435,9 +394,6 @@ export class HaMap extends ReactiveElement {
     if (!this.leafletMap || !this.Leaflet) {
       return;
     }
-    if (this._deferIfUnsized(() => this.fitBounds(boundingbox, options))) {
-      return;
-    }
     const bounds = this.Leaflet.latLngBounds(boundingbox).pad(
       options?.pad ?? 0.5
     );
@@ -817,7 +773,6 @@ export class HaMap extends ReactiveElement {
     if (!this._resizeObserver) {
       this._resizeObserver = new ResizeObserver(() => {
         this.leafletMap?.invalidateSize({ debounceMoveend: true });
-        this._runPendingFit();
       });
     }
     this._resizeObserver.observe(this);

src/components/trace/hat-graph-branch.ts

@@ -1,7 +1,6 @@
 import { css, html, LitElement, nothing, svg } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
-import type { HASSDomTargetEvent } from "../../common/dom/fire_event";
 import { BRANCH_HEIGHT, SPACING } from "./hat-graph-const";
 
 interface BranchConfig {
@@ -32,7 +31,7 @@ export class HatGraphBranch extends LitElement {
 
   private _maxHeight = 0;
 
-  private _updateBranches(ev: HASSDomTargetEvent<HTMLSlotElement>) {
+  private _updateBranches(ev: Event) {
     let total_width = 0;
     const heights: number[] = [];
     const branches: BranchConfig[] = [];

src/data/connection-status.ts

@@ -14,7 +14,7 @@ declare global {
   }
 
   interface GlobalEventHandlersEventMap {
-    "connection-status": HASSDomEvent<HASSDomEvents["connection-status"]>;
+    "connection-status": HASSDomEvent<ConnectionStatus>;
   }
 }
 

src/data/context/index.ts

@@ -207,7 +207,7 @@ declare global {
     "hass-related-context": RelatedContextItem | undefined;
   }
   interface HTMLElementEventMap {
-    "hass-related-context": HASSDomEvent<HASSDomEvents["hass-related-context"]>;
+    "hass-related-context": HASSDomEvent<RelatedContextItem | undefined>;
   }
 }
 

src/data/energy.ts

@@ -793,17 +793,6 @@ const findEnergyDataCollection = (
   return (hass.connection as any)[key];
 };
 
-// The last-picked preset is remembered per energy collection, so each dashboard
-// reopens on its own default period. Derived from the connection key so the read
-// and write sides cannot drift apart.
-export const getEnergyDefaultPeriodStorageKey = (
-  hass: HomeAssistant,
-  collectionKey?: string
-): string => {
-  const [key] = convertCollectionKeyToConnection(hass, collectionKey);
-  return `energy-default-period-${key}`;
-};
-
 // When does the collection's day period need to roll over to the next day?
 // With `midnightRollover` (the real-time "Now" view) it rolls over right at
 // midnight. Otherwise it waits an hour, until the new day's first hourly
@@ -903,9 +892,8 @@ export const getEnergyDataCollection = (
   // The real-time "Now" view always tracks today; it shows live data even
   // before today's first statistic exists, so it never falls back to yesterday.
   const preferredPeriod =
-    (localStorage.getItem(
-      getEnergyDefaultPeriodStorageKey(hass, options.key)
-    ) as DateRange) || "today";
+    (localStorage.getItem(`energy-default-period-${key}`) as DateRange) ||
+    "today";
   const period =
     preferredPeriod === "today" && hour === "0" && !midnightRollover
       ? "yesterday"

src/data/haptics.ts

@@ -24,7 +24,7 @@ declare global {
   }
 
   interface GlobalEventHandlersEventMap {
-    haptic: HASSDomEvent<HASSDomEvents["haptic"]>;
+    haptic: HASSDomEvent<HapticType>;
   }
 }
 

src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts

@@ -2,7 +2,6 @@ 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 type { HASSDomTargetEvent } from "../../common/dom/fire_event";
 import "../../components/ha-dialog";
 import "../../components/ha-dialog-footer";
 import "../../components/ha-formfield";
@@ -162,18 +161,18 @@ class DialogConfigEntrySystemOptions extends DirtyStateProviderMixin<SystemOptio
     `;
   }
 
-  private _disableNewEntitiesChanged(ev: HASSDomTargetEvent<HaSwitch>): void {
+  private _disableNewEntitiesChanged(ev: Event): void {
     this._error = undefined;
-    this._disableNewEntities = !ev.target.checked;
+    this._disableNewEntities = !(ev.target as HaSwitch).checked;
     this._updateDirtyState({
       disableNewEntities: this._disableNewEntities,
       disablePolling: this._disablePolling,
     });
   }
 
-  private _disablePollingChanged(ev: HASSDomTargetEvent<HaSwitch>): void {
+  private _disablePollingChanged(ev: Event): void {
     this._error = undefined;
-    this._disablePolling = !ev.target.checked;
+    this._disablePolling = !(ev.target as HaSwitch).checked;
     this._updateDirtyState({
       disableNewEntities: this._disableNewEntities,
       disablePolling: this._disablePolling,

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

@@ -70,10 +70,8 @@ declare global {
   }
   // for add event listener
   interface HTMLElementEventMap {
-    "flow-update": HASSDomEvent<HASSDomEvents["flow-update"]>;
-    "flow-step-footer-state-changed": HASSDomEvent<
-      HASSDomEvents["flow-step-footer-state-changed"]
-    >;
+    "flow-update": HASSDomEvent<FlowUpdateEvent>;
+    "flow-step-footer-state-changed": HASSDomEvent<FlowStepFooterStateChangedEvent>;
   }
 }
 
@@ -743,7 +741,7 @@ class DataEntryFlowDialog extends DirtyStateProviderMixin<
   };
 
   private _handleFooterStateChanged = (
-    ev: HASSDomEvent<HASSDomEvents["flow-step-footer-state-changed"]>
+    ev: HASSDomEvent<FlowStepFooterStateChangedEvent>
   ) => {
     if (ev.detail.loading !== undefined) {
       this._formStepLoading = ev.detail.loading;

src/dialogs/config-flow/step-flow-form.ts

@@ -5,7 +5,7 @@ import { customElement, property, state } from "lit/decorators";
 import { createRef, ref } from "lit/directives/ref";
 import memoizeOne from "memoize-one";
 import { dynamicElement } from "../../common/dom/dynamic-element-directive";
-import { fireEvent, type HASSDomEvent } from "../../common/dom/fire_event";
+import { fireEvent } from "../../common/dom/fire_event";
 import { isNavigationClick } from "../../common/dom/is-navigation-click";
 import "../../components/ha-alert";
 import { computeInitialHaFormData } from "../../components/ha-form/compute-initial-ha-form-data";
@@ -153,7 +153,7 @@ class StepFlowForm extends LitElement {
     `;
   }
 
-  private _setError(ev: HASSDomEvent<DataEntryFlowStepForm["errors"]>) {
+  private _setError(ev: CustomEvent) {
     this._previewErrors = ev.detail;
   }
 

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

@@ -2,11 +2,9 @@ import { consume } from "@lit/context";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { consumeLocalize } from "../../../common/decorators/consume-context-entry";
-import type { HASSDomCurrentTargetEvent } from "../../../common/dom/fire_event";
 import { slugify } from "../../../common/string/slugify";
 import type { LocalizeFunc } from "../../../common/translations/localize";
 import "../../../components/buttons/ha-progress-button";
-import type { HaProgressButton } from "../../../components/buttons/ha-progress-button";
 import "../../../components/ha-camera-stream";
 import type { CameraEntity } from "../../../data/camera";
 import { apiContext } from "../../../data/context";
@@ -68,10 +66,8 @@ class MoreInfoCamera extends LitElement {
     `;
   }
 
-  private async _downloadSnapshot(
-    ev: HASSDomCurrentTargetEvent<HaProgressButton>
-  ) {
-    const button = ev.currentTarget;
+  private async _downloadSnapshot(ev: CustomEvent) {
+    const button = ev.currentTarget as any;
     this._waiting = true;
 
     try {

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

@@ -3,10 +3,8 @@ import type { HassEntity } from "home-assistant-js-websocket";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { consumeLocalize } from "../../../common/decorators/consume-context-entry";
-import type { HASSDomCurrentTargetEvent } from "../../../common/dom/fire_event";
 import type { LocalizeFunc } from "../../../common/translations/localize";
 import "../../../components/ha-button";
-import type { HaButton } from "../../../components/ha-button";
 import { apiContext } from "../../../data/context";
 import { UNAVAILABLE } from "../../../data/entity/entity";
 import type { HomeAssistantApi } from "../../../types";
@@ -69,10 +67,8 @@ class MoreInfoCounter extends LitElement {
     `;
   }
 
-  private _handleActionClick(
-    e: MouseEvent & HASSDomCurrentTargetEvent<HaButton & { action: string }>
-  ): void {
-    const action = e.currentTarget.action;
+  private _handleActionClick(e: MouseEvent): void {
+    const action = (e.currentTarget as any).action;
     this._api.callService("counter", action, {
       entity_id: this.stateObj!.entity_id,
     });

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

@@ -17,7 +17,6 @@ import { classMap } from "lit/directives/class-map";
 import { ifDefined } from "lit/directives/if-defined";
 import { consumeLocalize } from "../../../common/decorators/consume-context-entry";
 import { fireEvent } from "../../../common/dom/fire_event";
-import type { HASSDomTargetEvent } from "../../../common/dom/fire_event";
 import { stateActive } from "../../../common/entity/state_active";
 import { supportsFeature } from "../../../common/entity/supports-feature";
 import type { LocalizeFunc } from "../../../common/translations/localize";
@@ -873,14 +872,12 @@ class MoreInfoMediaPlayer extends LitElement {
     });
   }
 
-  private async _handleMediaSeekChanged(
-    e: HASSDomTargetEvent<HaSlider>
-  ): Promise<void> {
+  private async _handleMediaSeekChanged(e: Event): Promise<void> {
     if (!this.stateObj) {
       return;
     }
 
-    const newValue = e.target.value;
+    const newValue = (e.target as any).value;
     this._api.callService("media_player", "media_seek", {
       entity_id: this.stateObj.entity_id,
       seek_position: newValue,

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

@@ -19,7 +19,7 @@ import {
   hasRequiredScriptFields,
   requiredScriptFieldsFilled,
 } from "../../../data/script";
-import type { HomeAssistant, ValueChangedEvent } from "../../../types";
+import type { HomeAssistant } from "../../../types";
 import "../components/ha-more-info-state-header";
 
 @customElement("more-info-script")
@@ -209,9 +209,7 @@ class MoreInfoScript extends LitElement {
     });
   }
 
-  private _scriptDataChanged(
-    ev: ValueChangedEvent<Record<string, unknown>>
-  ): void {
+  private _scriptDataChanged(ev: CustomEvent): void {
     this._scriptData = { ...this._scriptData, ...ev.detail.value };
   }
 

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

@@ -3,10 +3,8 @@ import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { consumeLocalize } from "../../../common/decorators/consume-context-entry";
-import type { HASSDomCurrentTargetEvent } from "../../../common/dom/fire_event";
 import type { LocalizeFunc } from "../../../common/translations/localize";
 import "../../../components/ha-button";
-import type { HaButton } from "../../../components/ha-button";
 import "../../../components/ha-duration-input";
 import type { HaDurationData } from "../../../components/ha-duration-input";
 import { apiContext } from "../../../data/context";
@@ -139,10 +137,8 @@ class MoreInfoTimer extends LitElement {
     });
   }
 
-  private _handleActionClick(
-    e: MouseEvent & HASSDomCurrentTargetEvent<HaButton & { action: string }>
-  ): void {
-    const action = e.currentTarget.action;
+  private _handleActionClick(e: MouseEvent): void {
+    const action = (e.currentTarget as any).action;
     this._api.callService("timer", action, {
       entity_id: this.stateObj!.entity_id,
     });

src/dialogs/restart/dialog-restart.ts

@@ -10,7 +10,6 @@ import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { isComponentLoaded } from "../../common/config/is_component_loaded";
 import { fireEvent } from "../../common/dom/fire_event";
-import type { HASSDomCurrentTargetEvent } from "../../common/dom/fire_event";
 import "../../components/animation/ha-fade-in";
 import "../../components/ha-adaptive-dialog";
 import "../../components/ha-alert";
@@ -335,18 +334,13 @@ class DialogRestart extends LitElement {
       }
     };
 
-  private async _handleAction(
-    ev: HASSDomCurrentTargetEvent<
-      HaListItemButton & {
-        action: "restart" | "reboot" | "shutdown" | "restart-safe-mode";
-      }
-    >
-  ) {
+  private async _handleAction(ev: Event) {
     if (this._loadingBackupInfo) {
       return;
     }
     this._loadingBackupInfo = true;
-    const action = ev.currentTarget.action;
+    const action = (ev.currentTarget as HaListItemButton & { action: string })
+      .action as "restart" | "reboot" | "shutdown" | "restart-safe-mode";
 
     const backupState = await this._loadBackupState();
 
@@ -375,7 +369,7 @@ class DialogRestart extends LitElement {
 
     this._dialogOpen = false;
 
-    let actionFunc: () => Promise<void>;
+    let actionFunc;
 
     if (["restart", "restart-safe-mode"].includes(action)) {
       const serviceData =

src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts

@@ -3,7 +3,7 @@ import type { CSSResultGroup, PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
-import { fireEvent, type HASSDomEvent } from "../../common/dom/fire_event";
+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";
@@ -18,7 +18,7 @@ import { getLanguageScores } from "../../data/conversation";
 import { UNAVAILABLE } from "../../data/entity/entity";
 import type { EntityRegistryDisplayEntry } from "../../data/entity/entity_registry";
 import { haStyleDialog } from "../../resources/styles";
-import type { HomeAssistant, ValueChangedEvent } from "../../types";
+import type { HomeAssistant } from "../../types";
 import type { VoiceAssistantSetupDialogParams } from "./show-voice-assistant-setup-dialog";
 import "./voice-assistant-setup-step-area";
 import "./voice-assistant-setup-step-change-wake-word";
@@ -337,7 +337,7 @@ export class HaVoiceAssistantSetupDialog extends LitElement {
     this._language = ev.detail.item.value;
   }
 
-  private _languageChanged(ev: ValueChangedEvent<string | undefined>) {
+  private _languageChanged(ev: CustomEvent) {
     if (!ev.detail.value) {
       return;
     }
@@ -351,7 +351,7 @@ export class HaVoiceAssistantSetupDialog extends LitElement {
     this._step = this._previousSteps.pop()!;
   }
 
-  private async _goToNextStep(ev?: HASSDomEvent<HASSDomEvents["next-step"]>) {
+  private async _goToNextStep(ev?: CustomEvent) {
     if (ev?.detail?.updateConfig) {
       await this._fetchAssistConfiguration();
     }

src/dialogs/voice-assistant-setup/voice-assistant-setup-step-change-wake-word.ts

@@ -1,7 +1,6 @@
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
-import type { HASSDomCurrentTargetEvent } from "../../common/dom/fire_event";
 import "../../components/item/ha-list-item-button";
 import type { HaListItemButton } from "../../components/item/ha-list-item-button";
 import "../../components/list/ha-list-base";
@@ -51,14 +50,14 @@ export class HaVoiceAssistantSetupStepChangeWakeWord extends LitElement {
       </ha-list-base>`;
   }
 
-  private async _wakeWordPicked(
-    ev: HASSDomCurrentTargetEvent<HaListItemButton & { value: string }>
-  ) {
+  private async _wakeWordPicked(ev: Event) {
     if (!this.assistEntityId) {
       return;
     }
 
-    const wakeWordId = ev.currentTarget.value;
+    const wakeWordId = (
+      ev.currentTarget as HaListItemButton & { value: string }
+    ).value;
 
     await setWakeWords(this.hass, this.assistEntityId, [wakeWordId]);
     this._nextStep();

src/dialogs/voice-assistant-setup/voice-assistant-setup-step-pipeline.ts

@@ -19,7 +19,7 @@ import type { LanguageScore, LanguageScores } from "../../data/conversation";
 import { getLanguageScores, listAgents } from "../../data/conversation";
 import { listSTTEngines } from "../../data/stt";
 import { listTTSEngines, listTTSVoices } from "../../data/tts";
-import type { HomeAssistant, ValueChangedEvent } from "../../types";
+import type { HomeAssistant } from "../../types";
 import { documentationUrl } from "../../util/documentation-url";
 import { AssistantSetupStyles } from "./styles";
 import { STEP } from "./voice-assistant-setup-dialog";
@@ -265,8 +265,8 @@ export class HaVoiceAssistantSetupStepPipeline extends LitElement {
   }
 
   private async _createCloudPipeline(useLanguage: boolean): Promise<boolean> {
-    let cloudTtsEntityId: string | undefined;
-    let cloudSttEntityId: string | undefined;
+    let cloudTtsEntityId;
+    let cloudSttEntityId;
     for (const entity of Object.values(this.hass.entities)) {
       if (entity.platform === "cloud") {
         const domain = computeDomain(entity.entity_id);
@@ -327,7 +327,7 @@ export class HaVoiceAssistantSetupStepPipeline extends LitElement {
 
         const ttsVoices = await listTTSVoices(
           this.hass,
-          cloudTtsEntityId!,
+          cloudTtsEntityId,
           ttsEngine.supported_languages[0]
         );
 
@@ -357,9 +357,9 @@ export class HaVoiceAssistantSetupStepPipeline extends LitElement {
           language: (this.language || this.hass.config.language).split("-")[0],
           conversation_engine: "conversation.home_assistant",
           conversation_language: agent.supported_languages[0],
-          stt_engine: cloudSttEntityId!,
+          stt_engine: cloudSttEntityId,
           stt_language: sttEngine.supported_languages[0],
-          tts_engine: cloudTtsEntityId!,
+          tts_engine: cloudTtsEntityId,
           tts_language: ttsEngine.supported_languages[0],
           tts_voice: ttsVoices.voices![0].voice_id,
           wake_word_entity: null,
@@ -380,9 +380,7 @@ export class HaVoiceAssistantSetupStepPipeline extends LitElement {
     }
   }
 
-  private _valueChanged(
-    ev: ValueChangedEvent<(typeof OPTIONS)[number] | undefined>
-  ) {
+  private _valueChanged(ev: CustomEvent) {
     this._value = ev.detail.value;
   }
 
@@ -412,7 +410,7 @@ export class HaVoiceAssistantSetupStepPipeline extends LitElement {
     fireEvent(this, "next-step", { step: STEP.LOCAL, option: this._value });
   }
 
-  private _languageChanged(ev: ValueChangedEvent<string | undefined>) {
+  private _languageChanged(ev: CustomEvent) {
     if (!ev.detail.value) {
       return;
     }

src/entrypoints/custom-panel.ts

@@ -1,4 +1,3 @@
-import type { Connection } from "home-assistant-js-websocket";
 import type { CSSResult } from "lit";
 import { fireEvent } from "../common/dom/fire_event";
 import { isNavigationClick } from "../common/dom/is-navigation-click";
@@ -8,7 +7,6 @@ import { navigate } from "../common/navigate";
 import type { CustomPanelInfo } from "../data/panel_custom";
 import { baseEntrypointStyles } from "../resources/styles";
 import { createCustomPanelElement } from "../util/custom-panel/create-custom-panel-element";
-import { dropRealmCollections } from "../util/custom-panel/drop-realm-collections";
 import { loadCustomPanel } from "../util/custom-panel/load-custom-panel";
 import { setCustomPanelProperties } from "../util/custom-panel/set-custom-panel-properties";
 
@@ -31,14 +29,8 @@ window.loadES5Adapter = () => {
 
 let panelEl: HTMLElement | undefined;
 let initialized = false;
-// Kept so we can clean up after ourselves on pagehide without depending on
-// `window.parent.customPanel`, which `_cleanupPanel()` may already have deleted.
-let connection: Connection | undefined;
 
 function setProperties(properties) {
-  if (properties.hass?.connection) {
-    connection = properties.hass.connection;
-  }
   if (!panelEl) {
     return;
   }
@@ -158,9 +150,4 @@ window.addEventListener("pagehide", () => {
   while (document.body.lastChild) {
     document.body.removeChild(document.body.lastChild);
   }
-  // The connection is owned by the main window and outlives this realm, so any
-  // collection we created on it has to go with us.
-  if (connection) {
-    dropRealmCollections(connection);
-  }
 });

src/external_app/external_app_entrypoint.ts

@@ -121,14 +121,6 @@ declare global {
   }
 
   interface GlobalEventHandlersEventMap {
-    "improv-discovered-device": HASSDomEvent<
-      HASSDomEvents["improv-discovered-device"]
-    >;
-    "improv-device-setup-done": HASSDomEvent<
-      HASSDomEvents["improv-device-setup-done"]
-    >;
-    "matter-commission-finish": HASSDomEvent<
-      HASSDomEvents["matter-commission-finish"]
-    >;
+    "matter-commission-finish": HASSDomEvent<MatterCommissionFinish>;
   }
 }

src/layouts/hass-subpage.ts

@@ -3,7 +3,6 @@ import { css, html, LitElement } from "lit";
 import { customElement, eventOptions, property } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { restoreScroll } from "../common/decorators/restore-scroll";
-import type { HASSDomTargetEvent } from "../common/dom/fire_event";
 import { goBack } from "../common/navigate";
 import { sanitizeNavigationPath } from "../common/url/sanitize-navigation-path";
 import "../components/ha-icon-button-arrow-prev";
@@ -75,7 +74,7 @@ class HassSubpage extends LitElement {
   }
 
   @eventOptions({ passive: true })
-  private _saveScrollPos(e: HASSDomTargetEvent<HTMLDivElement>) {
+  private _saveScrollPos(e: Event) {
     this._savedScrollPos = (e.target as HTMLDivElement).scrollTop;
   }
 

src/layouts/hass-tabs-subpage-data-table.ts

@@ -17,7 +17,7 @@ import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { canShowPage } from "../common/config/can_show_page";
-import { fireEvent, type HASSDomTargetEvent } from "../common/dom/fire_event";
+import { fireEvent } from "../common/dom/fire_event";
 import type { LocalizeFunc } from "../common/translations/localize";
 import "../components/chips/ha-assist-chip";
 import "../components/data-table/ha-data-table";
@@ -740,9 +740,7 @@ export class HaTabsSubpageDataTable extends KeyboardShortcutMixin(LitElement) {
     this._dataTable.clearSelection();
   };
 
-  private _handleSearchChange(
-    ev: InputEvent & HASSDomTargetEvent<HaInputSearch>
-  ) {
+  private _handleSearchChange(ev: InputEvent) {
     const target = ev.target as HaInputSearch;
     if (this.filter === target.value) {
       return;

src/layouts/hass-tabs-subpage.ts

@@ -12,7 +12,6 @@ import { classMap } from "lit/directives/class-map";
 import memoizeOne from "memoize-one";
 import { canShowPage } from "../common/config/can_show_page";
 import { restoreScroll } from "../common/decorators/restore-scroll";
-import type { HASSDomTargetEvent } from "../common/dom/fire_event";
 import { isNavigationClick } from "../common/dom/is-navigation-click";
 import { goBack, navigate } from "../common/navigate";
 import type { LocalizeFunc } from "../common/translations/localize";
@@ -233,7 +232,7 @@ export class HassTabsSubpage extends LitElement {
   }
 
   @eventOptions({ passive: true })
-  private _saveScrollPos(e: HASSDomTargetEvent<HTMLDivElement>) {
+  private _saveScrollPos(e: Event) {
     this._savedScrollPos = (e.target as HTMLDivElement).scrollTop;
   }
 

src/mixins/prevent-unsaved-mixin.ts

@@ -36,7 +36,7 @@ export const PreventUnsavedMixin = <T extends Constructor<LitElement>>(
     protected willUpdate(changedProperties: PropertyValues<this>): void {
       super.willUpdate(changedProperties);
 
-      if (this.isDirtyState && this.isConnected) {
+      if (this.isDirtyState) {
         window.addEventListener("click", this._handleClick, true);
         window.addEventListener("beforeunload", this._handleUnload);
       } else {

src/onboarding/ha-onboarding.ts

@@ -37,7 +37,7 @@ import { subscribeUser } from "../data/ws-user";
 import { makeDialogManager } from "../dialogs/make-dialog-manager";
 import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
 import { HassElement } from "../state/hass-element";
-import type { HomeAssistant, ValueChangedEvent } from "../types";
+import type { HomeAssistant } from "../types";
 import { storeState } from "../util/ha-pref-storage";
 import { registerServiceWorker } from "../util/register-service-worker";
 import "../components/progress/ha-progress-bar";
@@ -80,8 +80,8 @@ declare global {
   }
 
   interface GlobalEventHandlersEventMap {
-    "onboarding-step": HASSDomEvent<HASSDomEvents["onboarding-step"]>;
-    "onboarding-progress": HASSDomEvent<HASSDomEvents["onboarding-progress"]>;
+    "onboarding-step": HASSDomEvent<OnboardingEvent>;
+    "onboarding-progress": HASSDomEvent<OnboardingProgressEvent>;
   }
 }
 
@@ -332,9 +332,7 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) {
     }
   }
 
-  private _handleProgress(
-    ev: HASSDomEvent<HASSDomEvents["onboarding-progress"]>
-  ) {
+  private _handleProgress(ev: HASSDomEvent<OnboardingProgressEvent>) {
     const stepSize = 100 / this._steps!.length;
     if (ev.detail.increase) {
       this._progress += ev.detail.increase * stepSize;
@@ -347,9 +345,7 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) {
     }
   }
 
-  private async _handleStepDone(
-    ev: HASSDomEvent<HASSDomEvents["onboarding-step"]>
-  ) {
+  private async _handleStepDone(ev: HASSDomEvent<OnboardingEvent>) {
     const stepResult = ev.detail;
     this._steps = this._steps!.map((step) =>
       step.step === stepResult.type ? { ...step, done: true } : step
@@ -483,7 +479,7 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) {
     });
   }
 
-  private _languageChanged(ev: ValueChangedEvent<string>) {
+  private _languageChanged(ev: CustomEvent) {
     const language = ev.detail.value;
     this.language = language;
     if (this.hass) {

src/onboarding/onboarding-analytics.ts

@@ -2,7 +2,7 @@ import { mdiOpenInNew } from "@mdi/js";
 import type { CSSResultGroup, TemplateResult, PropertyValues } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { fireEvent, type HASSDomEvent } from "../common/dom/fire_event";
+import { fireEvent } from "../common/dom/fire_event";
 import type { LocalizeFunc } from "../common/translations/localize";
 import "../components/ha-analytics";
 import "../components/ha-button";
@@ -65,9 +65,7 @@ class OnboardingAnalytics extends LitElement {
     });
   }
 
-  private _preferencesChanged(
-    event: HASSDomEvent<HASSDomEvents["analytics-preferences-changed"]>
-  ): void {
+  private _preferencesChanged(event: CustomEvent): void {
     this._analyticsDetails = {
       ...this._analyticsDetails!,
       preferences: event.detail.preferences,

src/onboarding/onboarding-core-config.ts

@@ -19,7 +19,7 @@ import type { ConfigUpdateValues } from "../data/core";
 import { saveCoreConfig } from "../data/core";
 import { countryCurrency } from "../data/currency";
 import { onboardCoreConfigStep } from "../data/onboarding";
-import type { HomeAssistant, ValueChangedEvent } from "../types";
+import type { HomeAssistant } from "../types";
 import { getLocalLanguage } from "../util/common-translation";
 import "./onboarding-location";
 
@@ -132,9 +132,7 @@ class OnboardingCoreConfig extends LitElement {
     });
   }
 
-  private _handleFormChanged(
-    ev: ValueChangedEvent<{ country?: string; time_zone?: string }>
-  ) {
+  private _handleFormChanged(ev: CustomEvent) {
     const value = ev.detail.value as { country?: string; time_zone?: string };
     this._country = value.country || undefined;
     if (value.time_zone) {

src/onboarding/onboarding-restore-backup.ts

@@ -2,7 +2,6 @@ import type { TemplateResult, PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { storage } from "../common/decorators/storage";
-import type { HASSDomEvent } from "../common/dom/fire_event";
 import { navigate } from "../common/navigate";
 import type { LocalizeFunc } from "../common/translations/localize";
 import { removeSearchParam } from "../common/url/search-params";
@@ -281,9 +280,7 @@ class OnboardingRestoreBackup extends LitElement {
     setTimeout(() => this._loadBackupInfo(), delay);
   }
 
-  private async _backupUploaded(
-    ev: HASSDomEvent<HASSDomEvents["backup-uploaded"]>
-  ) {
+  private async _backupUploaded(ev: CustomEvent) {
     this._backupId = ev.detail.backupId;
     await this._loadBackupInfo();
   }

src/onboarding/restore-backup/onboarding-restore-backup-restore.ts

@@ -2,10 +2,6 @@ import { css, html, LitElement, nothing, type CSSResultGroup } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { formatDateTimeWithBrowserDefaults } from "../../common/datetime/format_date_time";
 import { fireEvent } from "../../common/dom/fire_event";
-import type {
-  HASSDomCurrentTargetEvent,
-  HASSDomTargetEvent,
-} from "../../common/dom/fire_event";
 import type { LocalizeFunc } from "../../common/translations/localize";
 import "../../components/buttons/ha-progress-button";
 import type { HaProgressButton } from "../../components/buttons/ha-progress-button";
@@ -13,7 +9,6 @@ import "../../components/ha-alert";
 import "../../components/ha-button";
 import "../../components/ha-icon-button-arrow-prev";
 import "../../components/input/ha-input";
-import type { HaInput } from "../../components/input/ha-input";
 import "../../components/item/ha-row-item";
 import {
   getPreferredAgentForDownload,
@@ -24,7 +19,6 @@ import { restoreOnboardingBackup } from "../../data/backup_onboarding";
 import "../../panels/config/backup/components/ha-backup-data-picker";
 import "../../panels/config/backup/components/ha-backup-formfield-label";
 import { onBoardingStyles } from "../styles";
-import type { ValueChangedEvent } from "../../types";
 
 @customElement("onboarding-restore-backup-restore")
 class OnboardingRestoreBackupRestore extends LitElement {
@@ -253,20 +247,16 @@ class OnboardingRestoreBackupRestore extends LitElement {
     fireEvent(this, "sign-out");
   }
 
-  private _selectedBackupChanged(ev: ValueChangedEvent<BackupData>) {
+  private _selectedBackupChanged(ev: CustomEvent) {
     ev.stopPropagation();
     this._selectedData = ev.detail.value;
   }
 
-  private _encryptionKeyChanged(
-    ev: HASSDomTargetEvent<Omit<HaInput, "value"> & { value: string }>
-  ): void {
+  private _encryptionKeyChanged(ev): void {
     this._encryptionKey = ev.target.value;
   }
 
-  private async _startRestore(
-    ev: HASSDomCurrentTargetEvent<HaProgressButton>
-  ): Promise<void> {
+  private async _startRestore(ev: CustomEvent): Promise<void> {
     const agentId = Object.keys(this.backup.agents)[0];
     const backupProtected = this.backup.agents[agentId].protected;
 
@@ -280,7 +270,7 @@ class OnboardingRestoreBackupRestore extends LitElement {
     }
 
     this._loading = true;
-    const button = ev.currentTarget;
+    const button = ev.currentTarget as HaProgressButton;
     this._error = undefined;
     this._encryptionKeyWrong = false;
 

src/panels/calendar/ha-recurrence-rule-editor.ts

@@ -6,20 +6,14 @@ import type { ByWeekday, Options, WeekdayStr } from "rrule";
 import { RRule, Weekday } from "rrule";
 import { formatDate, formatTime } from "../../common/datetime/calc_date";
 import { firstWeekdayIndex } from "../../common/datetime/first_weekday";
-import type {
-  HASSDomCurrentTargetEvent,
-  HASSDomTargetEvent,
-} from "../../common/dom/fire_event";
 import type { LocalizeKeys } from "../../common/translations/localize";
 import "../../components/chips/ha-chip-set";
 import "../../components/chips/ha-filter-chip";
-import type { HaFilterChip } from "../../components/chips/ha-filter-chip";
 import "../../components/ha-date-input";
 import "../../components/ha-select";
 import type { HaSelectSelectEvent } from "../../components/ha-select";
 import "../../components/input/ha-input";
-import type { HaInput } from "../../components/input/ha-input";
-import type { HomeAssistant, ValueChangedEvent } from "../../types";
+import type { HomeAssistant } from "../../types";
 import type {
   MonthlyRepeatItem,
   RepeatEnd,
@@ -327,8 +321,8 @@ export class RecurrenceRuleEditor extends LitElement {
     `;
   }
 
-  private _onIntervalChange(e: HASSDomTargetEvent<HaInput>) {
-    this._interval = Number(e.target.value);
+  private _onIntervalChange(e: Event) {
+    this._interval = (e.target! as any).value;
   }
 
   private _onRepeatSelected(e: HaSelectSelectEvent<RepeatFrequency>) {
@@ -357,12 +351,9 @@ export class RecurrenceRuleEditor extends LitElement {
     this._monthday = selectedItem.bymonthday;
   }
 
-  private _onWeekdayToggle(
-    e: MouseEvent &
-      HASSDomCurrentTargetEvent<HaFilterChip & { value: WeekdayStr }>
-  ) {
-    const target = e.currentTarget;
-    const value = target.value;
+  private _onWeekdayToggle(e: MouseEvent) {
+    const target = e.currentTarget as any;
+    const value = target.value as WeekdayStr;
     if (this._weekday.has(value)) {
       this._weekday.delete(value);
     } else {
@@ -394,11 +385,11 @@ export class RecurrenceRuleEditor extends LitElement {
     e.stopPropagation();
   }
 
-  private _onCountChange(e: HASSDomTargetEvent<HaInput>) {
-    this._count = Number(e.target.value);
+  private _onCountChange(e: Event) {
+    this._count = (e.target! as any).value;
   }
 
-  private _onUntilChange(e: ValueChangedEvent<string>) {
+  private _onUntilChange(e: CustomEvent) {
     e.stopPropagation();
     this._untilDay = new Date(
       new TZDate(e.detail.value + "T00:00:00", this.timezone).getTime()
@@ -445,7 +436,7 @@ export class RecurrenceRuleEditor extends LitElement {
       );
       // rrule.js can't compute some UNTIL variations so we compute that ourself. Must be
       // in the same format as dtstart.
-      let newUntilValue: string;
+      let newUntilValue;
       if (this.allDay) {
         // For all-day events, only use the date part
         newUntilValue = until.toISOString().split("T")[0].replace(/-/g, "");

src/panels/config/areas/dialog-area-registry-detail.ts

@@ -3,6 +3,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 type { HASSDomTargetEvent } from "../../../common/dom/fire_event";
 import { DirtyStateProviderMixin } from "../../../mixins/dirty-state-provider-mixin";
 import "../../../components/entity/ha-entity-picker";
 import type { HaEntityPicker } from "../../../components/entity/ha-entity-picker";
@@ -455,7 +456,7 @@ class DialogAreaDetail
     return deviceReg && deviceReg.area_id === areaId;
   };
 
-  private _nameChanged(ev: InputEvent) {
+  private _nameChanged(ev: InputEvent & HASSDomTargetEvent<HaInput>) {
     this._error = undefined;
     this._name = (ev.target as HaInput).value ?? "";
     this._updateDirtyState(this._currentState());
@@ -479,7 +480,9 @@ class DialogAreaDetail
     this._updateDirtyState(this._currentState());
   }
 
-  private _pictureChanged(ev: ValueChangedEvent<string | null>) {
+  private _pictureChanged(
+    ev: ValueChangedEvent<string | null> & HASSDomTargetEvent<HaPictureUpload>
+  ) {
     this._error = undefined;
     this._picture = (ev.target as HaPictureUpload).value;
     this._updateDirtyState(this._currentState());
@@ -490,7 +493,9 @@ class DialogAreaDetail
     this._updateDirtyState(this._currentState());
   }
 
-  private _sensorChanged(ev: CustomEvent): void {
+  private _sensorChanged(
+    ev: ValueChangedEvent<string> & HASSDomTargetEvent<HaEntityPicker>
+  ): void {
     const deviceClass = (ev.target as HaEntityPicker).includeDeviceClasses![0];
     const key = `_${deviceClass}Entity`;
     this[key] = ev.detail.value || null;

src/panels/config/areas/dialog-floor-registry-detail.ts

@@ -5,6 +5,7 @@ import { customElement, property, state } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../common/dom/fire_event";
+import type { HASSDomTargetEvent } from "../../../common/dom/fire_event";
 import "../../../components/chips/ha-chip-set";
 import "../../../components/chips/ha-input-chip";
 import "../../../components/ha-alert";
@@ -336,13 +337,13 @@ class DialogFloorDetail extends DirtyStateProviderMixin<FloorFormState>()(
     this._updateDirtyState(this._currentState());
   }
 
-  private _nameChanged(ev: InputEvent) {
+  private _nameChanged(ev: InputEvent & HASSDomTargetEvent<HaInput>) {
     this._error = undefined;
     this._name = (ev.target as HaInput).value ?? "";
     this._updateDirtyState(this._currentState());
   }
 
-  private _levelChanged(ev: InputEvent) {
+  private _levelChanged(ev: InputEvent & HASSDomTargetEvent<HaInput>) {
     this._error = undefined;
     this._level =
       (ev.target as HaInput).value === ""

src/panels/config/automation/manual-automation-editor.ts

@@ -51,8 +51,6 @@ const baseConfigStruct = object({
   mode: optional(string()),
   max_exceeded: optional(string()),
   id: optional(string()),
-  variables: optional(object()),
-  trigger_variables: optional(object()),
 });
 
 const automationConfigStruct = union([
@@ -259,27 +257,6 @@ export class HaManualAutomationEditor extends ManualEditorMixin<ManualAutomation
       }
     }
 
-    // If an object can be ambiguously an action or an automation, check for
-    // toplevel automation keywords to disqualify it
-    function isQualifiedAction(cfg): boolean {
-      const type = getActionType(cfg);
-      if (type === "variables") {
-        if (
-          [
-            "trigger",
-            "triggers",
-            "condition",
-            "conditions",
-            "action",
-            "actions",
-          ].some((key) => key in cfg)
-        ) {
-          return false;
-        }
-      }
-      return type !== "unknown";
-    }
-
     if (Array.isArray(config)) {
       if (config.length === 1) {
         config = config[0];
@@ -299,7 +276,7 @@ export class HaManualAutomationEditor extends ManualEditorMixin<ManualAutomation
             found = true;
             (newConfig.conditions as Condition[]).push(cfg);
           }
-          if (isQualifiedAction(cfg)) {
+          if (getActionType(cfg) !== "unknown") {
             found = true;
             (newConfig.actions as Action[]).push(cfg);
           }
@@ -316,7 +293,7 @@ export class HaManualAutomationEditor extends ManualEditorMixin<ManualAutomation
     if (isCondition(config)) {
       config = { conditions: [config] };
     }
-    if (isQualifiedAction(config)) {
+    if (getActionType(config) !== "unknown") {
       config = { actions: [config] };
     }
 
@@ -398,11 +375,6 @@ export class HaManualAutomationEditor extends ManualEditorMixin<ManualAutomation
     if (!workingCopy) {
       return;
     }
-    ["variables", "trigger_variables"].forEach((key) => {
-      if (key in config) {
-        workingCopy[key] = { ...workingCopy[key], ...config[key] };
-      }
-    });
 
     if ("triggers" in config) {
       workingCopy.triggers = ensureArray(workingCopy.triggers || []).concat(

src/panels/config/blueprint/dialog-import-blueprint.ts

@@ -2,6 +2,7 @@ import { mdiClose, mdiOpenInNew } from "@mdi/js";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent } from "../../../common/dom/fire_event";
+import type { HASSDomTargetEvent } from "../../../common/dom/fire_event";
 import { withViewTransition } from "../../../common/util/view-transition";
 import "../../../components/ha-alert";
 import "../../../components/ha-button";
@@ -279,7 +280,7 @@ class DialogImportBlueprint extends DirtyStateProviderMixin<BlueprintImportState
     });
   }
 
-  private _inputChanged(ev: Event) {
+  private _inputChanged(ev: HASSDomTargetEvent<HaInput>) {
     this._updateDirtyState({
       value: (ev.target as HaInput).value ?? "",
       hasResult: !!this._result,

src/panels/config/blueprint/ha-blueprint-overview.ts

@@ -13,7 +13,10 @@ import { LitElement, html } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { storage } from "../../../common/decorators/storage";
-import type { HASSDomEvent } from "../../../common/dom/fire_event";
+import type {
+  HASSDomCurrentTargetEvent,
+  HASSDomEvent,
+} from "../../../common/dom/fire_event";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { computeStateName } from "../../../common/entity/compute_state_name";
 import { navigate } from "../../../common/navigate";
@@ -483,7 +486,7 @@ class HaBlueprintOverview extends LitElement {
     this._createNew(blueprint);
   }
 
-  private _handleUsageClick = (ev: Event) => {
+  private _handleUsageClick = (ev: HASSDomCurrentTargetEvent<HTMLElement>) => {
     ev.stopPropagation();
     ev.preventDefault();
     const target = ev.currentTarget as HTMLElement | null;

src/panels/config/energy/dialogs/dialog-energy-battery-settings.ts

@@ -2,6 +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 type { HASSDomEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/entity/ha-statistic-picker";
 import "../../../../components/ha-button";
 import "../../../../components/ha-dialog";
@@ -340,7 +341,7 @@ export class DialogEnergyBatterySettings
   }
 
   private _handlePowerConfigChanged(
-    ev: CustomEvent<{ powerType: PowerType; powerConfig: PowerConfig }>
+    ev: HASSDomEvent<HASSDomEvents["power-config-changed"]>
   ) {
     this._powerType = ev.detail.powerType;
     this._powerConfig = ev.detail.powerConfig;

src/panels/config/energy/dialogs/dialog-energy-customise.ts

@@ -3,6 +3,7 @@ import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, state } from "lit/decorators";
 import { fireEvent } from "../../../../common/dom/fire_event";
+import type { HASSDomCurrentTargetEvent } from "../../../../common/dom/fire_event";
 import type { LocalizeKeys } from "../../../../common/translations/localize";
 import "../../../../components/ha-alert";
 import "../../../../components/ha-button";
@@ -214,7 +215,7 @@ export class DialogEnergyCustomise
     `;
   }
 
-  private _toggleCard = (ev: Event): void => {
+  private _toggleCard = (ev: HASSDomCurrentTargetEvent<HaSwitch>): void => {
     const target = ev.currentTarget as HaSwitch;
     const cardKey = target.dataset.cardKey;
     if (!cardKey) {

src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts

@@ -2,6 +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 type { HASSDomCurrentTargetEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/entity/ha-entity-picker";
 import "../../../../components/entity/ha-statistic-picker";
 import "../../../../components/ha-button";
@@ -353,7 +354,7 @@ export class DialogEnergyGasSettings
     `;
   }
 
-  private _handleCostChanged(ev: Event) {
+  private _handleCostChanged(ev: HASSDomCurrentTargetEvent<HaRadioGroup>) {
     this._costs = (ev.currentTarget as HaRadioGroup).value as CostType;
     this._updateFormDirtyState();
   }

src/panels/config/energy/dialogs/dialog-energy-grid-settings.ts

@@ -2,6 +2,10 @@ 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 type {
+  HASSDomCurrentTargetEvent,
+  HASSDomEvent,
+} from "../../../../common/dom/fire_event";
 import "../../../../components/entity/ha-entity-picker";
 import "../../../../components/entity/ha-statistic-picker";
 import "../../../../components/ha-button";
@@ -593,7 +597,9 @@ export class DialogEnergyGridSettings
     this._updateFormDirtyState();
   }
 
-  private _handleImportCostTypeChanged(ev: Event) {
+  private _handleImportCostTypeChanged(
+    ev: HASSDomCurrentTargetEvent<HaRadioGroup>
+  ) {
     this._importCostType = (ev.currentTarget as HaRadioGroup).value as CostType;
     // Clear other cost fields when switching types
     this._source = {
@@ -605,7 +611,9 @@ export class DialogEnergyGridSettings
     this._updateFormDirtyState();
   }
 
-  private _handleExportCostTypeChanged(ev: Event) {
+  private _handleExportCostTypeChanged(
+    ev: HASSDomCurrentTargetEvent<HaRadioGroup>
+  ) {
     this._exportCostType = (ev.currentTarget as HaRadioGroup).value as CostType;
     // Clear other cost fields when switching types
     this._source = {
@@ -630,9 +638,10 @@ export class DialogEnergyGridSettings
     this._updateFormDirtyState();
   }
 
-  private _numberCostChanged(ev: Event) {
-    const input = ev.currentTarget as HTMLInputElement;
-    const value = input.value ? parseFloat(input.value) : null;
+  private _numberCostChanged(ev: HASSDomCurrentTargetEvent<HaInput>) {
+    const value = ev.currentTarget.value
+      ? parseFloat(ev.currentTarget.value)
+      : null;
     this._source = { ...this._source!, number_energy_price: value };
     this._updateFormDirtyState();
   }
@@ -653,15 +662,16 @@ export class DialogEnergyGridSettings
     this._updateFormDirtyState();
   }
 
-  private _numberCompensationChanged(ev: Event) {
-    const input = ev.currentTarget as HTMLInputElement;
-    const value = input.value ? parseFloat(input.value) : null;
+  private _numberCompensationChanged(ev: HASSDomCurrentTargetEvent<HaInput>) {
+    const value = ev.currentTarget.value
+      ? parseFloat(ev.currentTarget.value)
+      : null;
     this._source = { ...this._source!, number_energy_price_export: value };
     this._updateFormDirtyState();
   }
 
   private _handlePowerConfigChanged(
-    ev: CustomEvent<{ powerType: PowerType; powerConfig: PowerConfig }>
+    ev: HASSDomEvent<HASSDomEvents["power-config-changed"]>
   ) {
     this._powerType = ev.detail.powerType;
     this._powerConfig = ev.detail.powerConfig;

src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts

@@ -3,6 +3,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 type { HASSDomCurrentTargetEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/entity/ha-statistic-picker";
 import "../../../../components/ha-button";
 import "../../../../components/ha-checkbox";
@@ -290,7 +291,7 @@ export class DialogEnergySolarSettings
             );
   }
 
-  private _handleForecastChanged(ev: Event) {
+  private _handleForecastChanged(ev: HASSDomCurrentTargetEvent<HaRadioGroup>) {
     this._forecast = (ev.currentTarget as HaRadioGroup).value === "true";
     this._updateFormDirtyState();
   }

src/panels/config/energy/dialogs/dialog-energy-water-settings.ts

@@ -2,6 +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 type { HASSDomCurrentTargetEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/entity/ha-entity-picker";
 import "../../../../components/entity/ha-statistic-picker";
 import "../../../../components/ha-button";
@@ -289,7 +290,7 @@ export class DialogEnergyWaterSettings
     `;
   }
 
-  private _handleCostChanged(ev: Event) {
+  private _handleCostChanged(ev: HASSDomCurrentTargetEvent<HaRadioGroup>) {
     this._costs = (ev.currentTarget as HaRadioGroup).value as CostType;
     this._updateFormDirtyState();
   }

src/panels/config/energy/dialogs/ha-energy-power-config.ts

@@ -3,6 +3,7 @@ import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../common/dom/fire_event";
+import type { HASSDomCurrentTargetEvent } from "../../../../common/dom/fire_event";
 import { stopPropagation } from "../../../../common/dom/stop_propagation";
 import type { LocalizeKeys } from "../../../../common/translations/localize";
 import "../../../../components/entity/ha-statistic-picker";
@@ -234,7 +235,7 @@ export class HaEnergyPowerConfig extends LitElement {
     fireEvent(this, "hass-more-info", { entityId: this.helperEntityId! });
   }
 
-  private _handlePowerTypeChanged(ev: Event) {
+  private _handlePowerTypeChanged(ev: HASSDomCurrentTargetEvent<HaRadioGroup>) {
     const newPowerType = (ev.currentTarget as HaRadioGroup).value as PowerType;
     // Clear power config when switching types
     fireEvent(this, "power-config-changed", {

src/panels/config/ha-panel-config.ts

@@ -106,7 +106,6 @@ class HaPanelConfig extends HassRouterPage {
       integrations: {
         tag: "ha-config-integrations",
         load: () => import("./integrations/ha-config-integrations"),
-        waitForReady: true,
       },
       labels: {
         tag: "ha-config-labels",

src/panels/config/integrations/ha-config-integrations-dashboard.ts

@@ -1,5 +1,4 @@
 import { mdiFilterVariant, mdiPlus } from "@mdi/js";
-import { consume } from "@lit/context";
 import type { IFuseOptions } from "fuse.js";
 import Fuse from "fuse.js";
 import type { UnsubscribeFunc } from "home-assistant-js-websocket";
@@ -55,10 +54,6 @@ import type { ImprovDiscoveredDevice } from "../../../external_app/external_mess
 import "../../../layouts/hass-loading-screen";
 import "../../../layouts/hass-tabs-subpage";
 import type { HassTabsSubpage } from "../../../layouts/hass-tabs-subpage";
-import {
-  childPanelReadyContext,
-  type RegisterChildPanelReady,
-} from "../../../layouts/panel-ready";
 import { KeyboardShortcutMixin } from "../../../mixins/keyboard-shortcut-mixin";
 import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
 import { haStyle } from "../../../resources/styles";
@@ -173,17 +168,6 @@ class HaConfigIntegrationsDashboard extends KeyboardShortcutMixin(
 
   @query("hass-tabs-subpage") private _tabsSubpage?: HassTabsSubpage;
 
-  private _resolveInitialRender?: () => void;
-
-  private _initialRenderComplete = new Promise<void>((resolve) => {
-    this._resolveInitialRender = resolve;
-  });
-
-  private _childReadyRegistered = false;
-
-  @consume({ context: childPanelReadyContext, subscribe: true })
-  private _registerChildPanelReady?: RegisterChildPanelReady;
-
   public disconnectedCallback(): void {
     super.disconnectedCallback();
     window.removeEventListener(
@@ -404,10 +388,6 @@ class HaConfigIntegrationsDashboard extends KeyboardShortcutMixin(
 
   protected updated(changed: PropertyValues<this>) {
     super.updated(changed);
-    if (!this._childReadyRegistered && this._registerChildPanelReady) {
-      this._registerChildPanelReady(this._initialRenderComplete);
-      this._childReadyRegistered = true;
-    }
     if (changed.has("route")) {
       this._handleRouteChanged();
     }
@@ -435,9 +415,6 @@ class HaConfigIntegrationsDashboard extends KeyboardShortcutMixin(
     }
 
     if (this.configEntries && this.configEntriesInProgress) {
-      this._resolveInitialRender?.();
-      this._resolveInitialRender = undefined;
-
       const activeElement = deepActiveElement();
 
       if (

src/panels/config/integrations/ha-config-integrations.ts

@@ -11,7 +11,6 @@ import {
 import type { DataEntryFlowProgress } from "../../../data/data_entry_flow";
 import { domainToName } from "../../../data/integration";
 import "../../../layouts/hass-loading-screen";
-import { ChildPanelReady } from "../../../layouts/panel-ready";
 import type { RouterOptions } from "../../../layouts/hass-router-page";
 import { HassRouterPage } from "../../../layouts/hass-router-page";
 import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
@@ -71,11 +70,6 @@ class HaConfigIntegrations extends SubscribeMixin(HassRouterPage) {
 
   private _loadTranslationsPromise?: Promise<LocalizeFunc>;
 
-  public constructor() {
-    super();
-    new ChildPanelReady(this);
-  }
-
   public hassSubscribe() {
     return [
       subscribeConfigEntries(

src/panels/config/integrations/integration-panels/bluetooth/bluetooth-adapter-info-page.ts

@@ -3,6 +3,7 @@ import type { CSSResultGroup, TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
+import type { HASSDomCurrentTargetEvent } from "../../../../../common/dom/fire_event";
 import { computeDeviceName } from "../../../../../common/entity/compute_device_name";
 import "../../../../../components/ha-alert";
 import "../../../../../components/ha-button";
@@ -451,7 +452,9 @@ export class BluetoothAdapterInfoPage extends LitElement {
     return this._formatModeLabel(scannerState.current_mode);
   }
 
-  private async _handleEnable(ev: Event) {
+  private async _handleEnable(
+    ev: HASSDomCurrentTargetEvent<HTMLElement & { entry: ConfigEntry }>
+  ) {
     const button = ev.currentTarget as HTMLElement & { entry: ConfigEntry };
     const entryId = button.entry.entry_id;
     try {
@@ -474,7 +477,9 @@ export class BluetoothAdapterInfoPage extends LitElement {
     }
   }
 
-  private _openOptionFlow(ev: Event) {
+  private _openOptionFlow(
+    ev: HASSDomCurrentTargetEvent<HTMLElement & { entry: ConfigEntry }>
+  ) {
     ev.preventDefault();
     ev.stopPropagation();
     const button = ev.currentTarget as HTMLElement & { entry: ConfigEntry };

src/panels/config/integrations/integration-panels/matter/dialog-matter-lock-manage.ts

@@ -3,6 +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 type { HASSDomCurrentTargetEvent } from "../../../../../common/dom/fire_event";
 import "../../../../../components/ha-alert";
 import "../../../../../components/ha-button";
 import "../../../../../components/ha-dialog-footer";
@@ -211,7 +212,9 @@ class DialogMatterLockManage extends LitElement {
     `;
   }
 
-  private _handleUserClick(ev: Event): void {
+  private _handleUserClick(
+    ev: HASSDomCurrentTargetEvent<HTMLElement & { user: MatterLockUser }>
+  ): void {
     // Ignore clicks that originated from the delete button
     const path = ev.composedPath();
     if (path.some((el) => (el as HTMLElement).tagName === "HA-ICON-BUTTON")) {
@@ -221,7 +224,9 @@ class DialogMatterLockManage extends LitElement {
     this._editUser(user);
   }
 
-  private _handleDeleteUserClick(ev: Event): void {
+  private _handleDeleteUserClick(
+    ev: HASSDomCurrentTargetEvent<HTMLElement & { user: MatterLockUser }>
+  ): void {
     ev.preventDefault();
     ev.stopPropagation();
     const user = (ev.currentTarget as any).user as MatterLockUser;

src/panels/config/integrations/integration-panels/zha/zha-add-group-page.ts

@@ -11,10 +11,7 @@ import { addGroup, fetchGroupableDevices } from "../../../../../data/zha";
 import "../../../../../layouts/hass-subpage";
 import type { HomeAssistant } from "../../../../../types";
 import "./zha-device-endpoint-list";
-import type {
-  DeviceEndpointSelectionChangedEvent,
-  ZHADeviceEndpointList,
-} from "./zha-device-endpoint-list";
+import type { ZHADeviceEndpointList } from "./zha-device-endpoint-list";
 
 @customElement("zha-add-group-page")
 export class ZHAAddGroupPage extends LitElement {
@@ -131,7 +128,7 @@ export class ZHAAddGroupPage extends LitElement {
   }
 
   private _handleAddSelectionChanged(
-    ev: HASSDomEvent<DeviceEndpointSelectionChangedEvent>
+    ev: HASSDomEvent<HASSDomEvents["selection-changed"]>
   ): void {
     this._selectedDevicesToAdd = ev.detail.value;
   }

src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts

@@ -14,14 +14,11 @@ import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { isComponentLoaded } from "../../../../../common/config/is_component_loaded";
-import type { HASSDomCurrentTargetEvent } from "../../../../../common/dom/fire_event";
 import { navigate } from "../../../../../common/navigate";
 import { animationStyles } from "../../../../../resources/theme/animations.globals";
 import "../../../../../components/ha-alert";
 import "../../../../../components/ha-button";
 import "../../../../../components/ha-card";
-import "../../../../../components/buttons/ha-progress-button";
-import type { HaProgressButton } from "../../../../../components/buttons/ha-progress-button";
 
 import "../../../../../components/ha-icon-next";
 import "../../../../../components/ha-md-list";
@@ -70,8 +67,6 @@ class ZHAConfigDashboard extends LitElement {
 
   @state() private _error?: string;
 
-  @state() private _generatingBackup = false;
-
   protected firstUpdated(changedProperties: PropertyValues<this>) {
     super.firstUpdated(changedProperties);
     if (!this.hass) {
@@ -360,18 +355,17 @@ class ZHAConfigDashboard extends LitElement {
                   "ui.panel.config.zha.configuration_page.download_backup_description"
                 )}
               </span>
-              <ha-progress-button
+              <ha-button
                 appearance="plain"
                 slot="end"
                 size="s"
-                .iconPath=${mdiDownload}
-                .progress=${this._generatingBackup}
                 @click=${this._createAndDownloadBackup}
               >
+                <ha-svg-icon .path=${mdiDownload} slot="start"></ha-svg-icon>
                 ${this.hass.localize(
                   "ui.panel.config.zha.configuration_page.download_backup_action"
                 )}
-              </ha-progress-button>
+              </ha-button>
             </ha-md-list-item>
             <ha-md-list-item>
               <span slot="headline">
@@ -414,32 +408,30 @@ class ZHAConfigDashboard extends LitElement {
     this._configuration = await fetchZHAConfiguration(this.hass!);
   }
 
-  private async _createAndDownloadBackup(
-    ev: HASSDomCurrentTargetEvent<HaProgressButton>
-  ): Promise<void> {
-    // Captured up front: currentTarget is null once the first await resolves.
-    const button = ev.currentTarget;
+  private async _createAndDownloadBackup(): Promise<void> {
     let backup_and_metadata: ZHANetworkBackupAndMetadata;
 
-    // Reading the backup from the coordinator can take 5-30 seconds.
-    this._generatingBackup = true;
-
     try {
       backup_and_metadata = await createZHANetworkBackup(this.hass!);
     } catch (err: any) {
-      button.actionError();
       showAlertDialog(this, {
-        title: this.hass.localize(
-          "ui.panel.config.zha.configuration_page.backup_failed"
-        ),
+        title: "Failed to create backup",
         text: err.message,
         warning: true,
       });
       return;
-    } finally {
-      this._generatingBackup = false;
     }
 
+    if (!backup_and_metadata.is_complete) {
+      await showAlertDialog(this, {
+        title: "Backup is incomplete",
+        text: "A backup has been created but it is incomplete and cannot be restored. This is a coordinator firmware limitation.",
+      });
+    }
+
+    const backupJSON: string =
+      "data:text/plain;charset=utf-8," +
+      encodeURIComponent(JSON.stringify(backup_and_metadata.backup, null, 4));
     const backupTime: Date = new Date(
       Date.parse(backup_and_metadata.backup.backup_time)
     );
@@ -449,23 +441,7 @@ class ZHAConfigDashboard extends LitElement {
       basename = `Incomplete ${basename}`;
     }
 
-    const blob = new Blob(
-      [JSON.stringify(backup_and_metadata.backup, null, 4)],
-      { type: "application/json" }
-    );
-    fileDownload(URL.createObjectURL(blob), `${basename}.json`);
-    button.actionSuccess();
-
-    if (!backup_and_metadata.is_complete) {
-      showAlertDialog(this, {
-        title: this.hass.localize(
-          "ui.panel.config.zha.configuration_page.backup_incomplete_title"
-        ),
-        text: this.hass.localize(
-          "ui.panel.config.zha.configuration_page.backup_incomplete_text"
-        ),
-      });
-    }
+    fileDownload(backupJSON, `${basename}.json`);
   }
 
   private _openOptionFlow() {
@@ -541,6 +517,10 @@ class ZHAConfigDashboard extends LitElement {
           --md-item-overflow: visible;
         }
 
+        ha-button[size="s"] ha-svg-icon {
+          --mdc-icon-size: 16px;
+        }
+
         .network-status div.heading {
           display: flex;
           align-items: center;

src/panels/config/integrations/integration-panels/zha/zha-device-endpoint-list.ts

@@ -4,10 +4,15 @@ import type { CSSResultGroup, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
+import type {
+  HASSDomCurrentTargetEvent,
+  HASSDomEvent,
+} from "../../../../../common/dom/fire_event";
 import "../../../../../components/ha-card";
 import "../../../../../components/ha-icon-button";
 import "../../../../../components/ha-list";
 import "../../../../../components/input/ha-input-search";
+import type { HaInputSearch } from "../../../../../components/input/ha-input-search";
 import "../../../../../components/item/ha-list-item-base";
 import "../../../../../components/item/ha-list-item-option";
 import type { HaListItemOption } from "../../../../../components/item/ha-list-item-option";
@@ -269,11 +274,16 @@ export class ZHADeviceEndpointList extends LitElement {
       .join(" · ");
   }
 
-  private _handleFilterChanged(ev: Event): void {
-    this._filter = (ev.currentTarget as HTMLInputElement).value;
+  private _handleFilterChanged(
+    ev: HASSDomCurrentTargetEvent<HaInputSearch>
+  ): void {
+    this._filter = ev.currentTarget.value ?? "";
   }
 
-  private _handleItemSelected(ev: CustomEvent<number>): void {
+  private _handleItemSelected(
+    ev: HASSDomEvent<HASSDomEvents["ha-list-item-selected"]> &
+      HASSDomCurrentTargetEvent<HaListSelectable>
+  ): void {
     const list = ev.currentTarget as HaListSelectable;
     let selectedDeviceIds = this._selectedDeviceIds;
 
@@ -290,7 +300,10 @@ export class ZHADeviceEndpointList extends LitElement {
     }
   }
 
-  private _handleItemDeselected(ev: CustomEvent<number>): void {
+  private _handleItemDeselected(
+    ev: HASSDomEvent<HASSDomEvents["ha-list-item-deselected"]> &
+      HASSDomCurrentTargetEvent<HaListSelectable>
+  ): void {
     const list = ev.currentTarget as HaListSelectable;
     let selectedDeviceIds = this._selectedDeviceIds;
 

src/panels/config/integrations/integration-panels/zha/zha-group-page.ts

@@ -19,10 +19,7 @@ import "../../../../../layouts/hass-subpage";
 import type { HomeAssistant } from "../../../../../types";
 import { formatAsPaddedHex } from "./functions";
 import "./zha-device-endpoint-list";
-import type {
-  DeviceEndpointSelectionChangedEvent,
-  ZHADeviceEndpointList,
-} from "./zha-device-endpoint-list";
+import type { ZHADeviceEndpointList } from "./zha-device-endpoint-list";
 import { showZHAAddGroupMembersDialog } from "./show-dialog-zha-add-group-members";
 
 @customElement("zha-group-page")
@@ -202,7 +199,7 @@ export class ZHAGroupPage extends LitElement {
   }
 
   private _handleRemoveSelectionChanged(
-    ev: HASSDomEvent<DeviceEndpointSelectionChangedEvent>
+    ev: HASSDomEvent<HASSDomEvents["selection-changed"]>
   ): void {
     this._selectedDevicesToRemove = ev.detail.value;
   }

src/panels/config/integrations/integration-panels/zha/zha-options-page.ts

@@ -1,13 +1,16 @@
 import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import type { HASSDomCurrentTargetEvent } from "../../../../../common/dom/fire_event";
 import "../../../../../components/buttons/ha-progress-button";
 import "../../../../../components/ha-card";
 import "../../../../../components/ha-md-list";
 import "../../../../../components/ha-md-list-item";
 import "../../../../../components/ha-select";
 import "../../../../../components/input/ha-input";
+import type { HaInput } from "../../../../../components/input/ha-input";
 import "../../../../../components/ha-switch";
+import type { HaSwitch } from "../../../../../components/ha-switch";
 import type { ZHAConfiguration } from "../../../../../data/zha";
 import {
   fetchZHAConfiguration,
@@ -18,6 +21,8 @@ import { haStyle } from "../../../../../resources/styles";
 import type { HomeAssistant, Route } from "../../../../../types";
 
 const PREDEFINED_TIMEOUTS = [1800, 3600, 7200, 21600, 43200, 86400];
+type ZHASwitchChangeEvent = HASSDomCurrentTargetEvent<HaSwitch>;
+type ZHAInputChangeEvent = HASSDomCurrentTargetEvent<HaInput>;
 
 @customElement("zha-options-page")
 class ZHAOptionsPage extends LitElement {
@@ -345,53 +350,54 @@ class ZHAOptionsPage extends LitElement {
     `;
   }
 
-  private _enableIdentifyOnJoinChanged(ev: Event): void {
-    const checked = (ev.target as HTMLInputElement).checked;
-    this._configuration!.data.zha_options.enable_identify_on_join = checked;
+  private _enableIdentifyOnJoinChanged(ev: ZHASwitchChangeEvent): void {
+    this._configuration!.data.zha_options.enable_identify_on_join =
+      ev.currentTarget.checked;
     this.requestUpdate();
   }
 
-  private _enhancedLightTransitionChanged(ev: Event): void {
-    const checked = (ev.target as HTMLInputElement).checked;
-    this._configuration!.data.zha_options.enhanced_light_transition = checked;
+  private _enhancedLightTransitionChanged(ev: ZHASwitchChangeEvent): void {
+    this._configuration!.data.zha_options.enhanced_light_transition =
+      ev.currentTarget.checked;
     this.requestUpdate();
   }
 
-  private _lightTransitioningFlagChanged(ev: Event): void {
-    const checked = (ev.target as HTMLInputElement).checked;
-    this._configuration!.data.zha_options.light_transitioning_flag = checked;
+  private _lightTransitioningFlagChanged(ev: ZHASwitchChangeEvent): void {
+    this._configuration!.data.zha_options.light_transitioning_flag =
+      ev.currentTarget.checked;
     this.requestUpdate();
   }
 
-  private _groupMembersAssumeStateChanged(ev: Event): void {
-    const checked = (ev.target as HTMLInputElement).checked;
-    this._configuration!.data.zha_options.group_members_assume_state = checked;
+  private _groupMembersAssumeStateChanged(ev: ZHASwitchChangeEvent): void {
+    this._configuration!.data.zha_options.group_members_assume_state =
+      ev.currentTarget.checked;
     this.requestUpdate();
   }
 
-  private _enableMainsStartupPollingChanged(ev: Event): void {
-    const checked = (ev.target as HTMLInputElement).checked;
+  private _enableMainsStartupPollingChanged(ev: ZHASwitchChangeEvent): void {
     this._configuration!.data.zha_options.enable_mains_startup_polling =
-      checked;
+      ev.currentTarget.checked;
     this.requestUpdate();
   }
 
-  private _defaultLightTransitionChanged(ev: Event): void {
-    const value = Number((ev.target as HTMLInputElement).value);
-    this._configuration!.data.zha_options.default_light_transition = value;
+  private _defaultLightTransitionChanged(ev: ZHAInputChangeEvent): void {
+    this._configuration!.data.zha_options.default_light_transition = Number(
+      ev.currentTarget.value
+    );
     this.requestUpdate();
   }
 
-  private _customMainsSecondsChanged(ev: Event): void {
-    const seconds = Number((ev.target as HTMLInputElement).value);
-    this._configuration!.data.zha_options.consider_unavailable_mains = seconds;
+  private _customMainsSecondsChanged(ev: ZHAInputChangeEvent): void {
+    this._configuration!.data.zha_options.consider_unavailable_mains = Number(
+      ev.currentTarget.value
+    );
     this.requestUpdate();
   }
 
-  private _customBatterySecondsChanged(ev: Event): void {
-    const seconds = Number((ev.target as HTMLInputElement).value);
-    this._configuration!.data.zha_options.consider_unavailable_battery =
-      seconds;
+  private _customBatterySecondsChanged(ev: ZHAInputChangeEvent): void {
+    this._configuration!.data.zha_options.consider_unavailable_battery = Number(
+      ev.currentTarget.value
+    );
     this.requestUpdate();
   }
 
@@ -419,7 +425,15 @@ class ZHAOptionsPage extends LitElement {
     this.requestUpdate();
   }
 
-  private async _updateConfiguration(ev: Event): Promise<void> {
+  private async _updateConfiguration(
+    ev: HASSDomCurrentTargetEvent<
+      HTMLElement & {
+        progress: boolean;
+        actionSuccess: () => void;
+        actionError: () => void;
+      }
+    >
+  ): Promise<void> {
     const button = ev.currentTarget as HTMLElement & {
       progress: boolean;
       actionSuccess: () => void;

src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-credential-user-edit.ts

@@ -2,6 +2,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 type { HASSDomCurrentTargetEvent } from "../../../../../common/dom/fire_event";
 import type { LocalizeKeys } from "../../../../../common/translations/localize";
 import "../../../../../components/ha-alert";
 import "../../../../../components/ha-button";
@@ -478,7 +479,9 @@ class DialogZwaveCredentialUserEdit extends DirtyStateProviderMixin<CredentialFo
     }
   }
 
-  private _handleCredentialTypeChanged(ev: Event): void {
+  private _handleCredentialTypeChanged(
+    ev: HASSDomCurrentTargetEvent<HaRadioGroup>
+  ): void {
     this._credentialType = (ev.currentTarget as HaRadioGroup)
       .value as ZwaveCredentialType;
     // Switching types invalidates any data tied to the previous type's

src/panels/config/integrations/integration-panels/zwave_js/zwave_js-custom-param.ts

@@ -2,11 +2,13 @@ import { mdiCloseCircle } from "@mdi/js";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../../common/dom/fire_event";
+import type { HASSDomCurrentTargetEvent } from "../../../../../common/dom/fire_event";
 import "../../../../../components/ha-button";
 import "../../../../../components/ha-select";
 import type { HaSelectSelectEvent } from "../../../../../components/ha-select";
 import "../../../../../components/ha-spinner";
 import "../../../../../components/input/ha-input";
+import type { HaInput } from "../../../../../components/input/ha-input";
 import {
   getZwaveNodeRawConfigParameter,
   setZwaveNodeRawConfigParameter,
@@ -129,9 +131,9 @@ class ZWaveJSCustomParam extends LitElement {
     return parsed;
   }
 
-  private _customParamNumberChanged(ev: Event) {
+  private _customParamNumberChanged(ev: HASSDomCurrentTargetEvent<HaInput>) {
     this._customParamNumber = this._tryParseNumber(
-      (ev.target as HTMLInputElement).value
+      ev.currentTarget.value ?? ""
     );
   }
 
@@ -139,8 +141,8 @@ class ZWaveJSCustomParam extends LitElement {
     this._valueSize = this._tryParseNumber(ev.detail.value) ?? 1;
   }
 
-  private _customValueChanged(ev: Event) {
-    this._value = this._tryParseNumber((ev.target as HTMLInputElement).value);
+  private _customValueChanged(ev: HASSDomCurrentTargetEvent<HaInput>) {
+    this._value = this._tryParseNumber(ev.currentTarget.value ?? "");
   }
 
   private _customValueFormatChanged(ev: HaSelectSelectEvent) {

src/panels/config/logs/system-log-card.ts

@@ -4,6 +4,7 @@ import { css, 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 type { HASSDomCurrentTargetEvent } from "../../../common/dom/fire_event";
 import type { LocalizeFunc } from "../../../common/translations/localize";
 import "../../../components/buttons/ha-call-service-button";
 import "../../../components/ha-alert";
@@ -283,7 +284,9 @@ export class SystemLogCard extends LitElement {
     fileDownload(signedUrl.path, logFileName);
   }
 
-  private _openLog(ev: Event): void {
+  private _openLog(
+    ev: HASSDomCurrentTargetEvent<HTMLElement & { logItem: LoggedError }>
+  ): void {
     const item = (ev.currentTarget as any).logItem;
     showSystemLogDetailDialog(this, { item });
   }

src/panels/config/network/ha-config-url-form.ts

@@ -2,6 +2,7 @@ import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
+import type { HASSDomCurrentTargetEvent } from "../../../common/dom/fire_event";
 import { isIPAddress } from "../../../common/string/is_ip_address";
 import "../../../components/ha-alert";
 import "../../../components/ha-button";
@@ -363,12 +364,12 @@ class ConfigUrlForm extends SubscribeMixin(LitElement) {
     );
   }
 
-  private _toggleCloud(ev: Event) {
+  private _toggleCloud(ev: HASSDomCurrentTargetEvent<HaSwitch>) {
     this._cloudChecked = (ev.currentTarget as HaSwitch).checked;
     this._showCustomExternalUrl = !this._cloudChecked;
   }
 
-  private _toggleInternalAutomatic(ev: Event) {
+  private _toggleInternalAutomatic(ev: HASSDomCurrentTargetEvent<HaSwitch>) {
     this._showCustomInternalUrl = !(ev.currentTarget as HaSwitch).checked;
   }
 

src/panels/config/network/supervisor-network.ts

@@ -2,6 +2,10 @@ import { mdiDeleteOutline, mdiMenuDown, mdiPlus, mdiWifi } from "@mdi/js";
 import { css, type CSSResultGroup, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { cache } from "lit/directives/cache";
+import type {
+  HASSDomCurrentTargetEvent,
+  HASSDomTargetEvent,
+} from "../../../common/dom/fire_event";
 import "../../../components/ha-alert";
 import "../../../components/ha-button";
 import "../../../components/ha-card";
@@ -630,7 +634,9 @@ export class HassioNetwork extends LitElement {
     this._interface = { ...this._interfaces[this._curTabIndex] };
   }
 
-  private _handleRadioValueChanged(ev: Event): void {
+  private _handleRadioValueChanged(
+    ev: HASSDomCurrentTargetEvent<HaRadioGroup & { version: "ipv4" | "ipv6" }>
+  ): void {
     const source = ev.currentTarget as HaRadioGroup;
     const value = source.value as "disabled" | "auto" | "static";
     const version = (source as any).version as "ipv4" | "ipv6";
@@ -645,7 +651,9 @@ export class HassioNetwork extends LitElement {
     this.requestUpdate("_interface");
   }
 
-  private _handleRadioValueChangedAp(ev: Event): void {
+  private _handleRadioValueChangedAp(
+    ev: HASSDomCurrentTargetEvent<HaRadioGroup>
+  ): void {
     const source = ev.currentTarget as HaRadioGroup;
     const value = source.value as "open" | "wep" | "wpa-psk";
     this._wifiConfiguration!.auth = value;
@@ -653,7 +661,11 @@ export class HassioNetwork extends LitElement {
     this.requestUpdate("_wifiConfiguration");
   }
 
-  private _handleInputValueChanged(ev: Event): void {
+  private _handleInputValueChanged(
+    ev: HASSDomTargetEvent<
+      HaInput & { version: "ipv4" | "ipv6"; index: number }
+    >
+  ): void {
     const source = ev.target as HaInput;
     const value = source.value;
     const version = (ev.target as any).version as "ipv4" | "ipv6";
@@ -691,7 +703,7 @@ export class HassioNetwork extends LitElement {
     }
   }
 
-  private _handleInputValueChangedWifi(ev: Event): void {
+  private _handleInputValueChangedWifi(ev: HASSDomTargetEvent<HaInput>): void {
     const source = ev.target as HaInput;
     const value = source.value;
     const id = source.id;
@@ -708,7 +720,9 @@ export class HassioNetwork extends LitElement {
     this._wifiConfiguration![id] = value;
   }
 
-  private _addAddress(ev: Event): void {
+  private _addAddress(
+    ev: HASSDomTargetEvent<HTMLElement & { version: "ipv4" | "ipv6" }>
+  ): void {
     const version = (ev.target as any).version as "ipv4" | "ipv6";
     this._interface![version]!.address!.push(
       version === "ipv4" ? "0.0.0.0/24" : "::/64"
@@ -717,7 +731,11 @@ export class HassioNetwork extends LitElement {
     this.requestUpdate("_interface");
   }
 
-  private _removeAddress(ev: Event): void {
+  private _removeAddress(
+    ev: HASSDomTargetEvent<
+      HTMLElement & { index: number; version: "ipv4" | "ipv6" }
+    >
+  ): void {
     const source = ev.target as any;
     const index = source.index as number;
     const version = source.version as "ipv4" | "ipv6";
@@ -752,7 +770,11 @@ export class HassioNetwork extends LitElement {
     this.requestUpdate("_interface");
   }
 
-  private _removeNameserver(ev: Event): void {
+  private _removeNameserver(
+    ev: HASSDomTargetEvent<
+      HTMLElement & { index: number; version: "ipv4" | "ipv6" }
+    >
+  ): void {
     const source = ev.target as any;
     const index = source.index as number;
     const version = source.version as "ipv4" | "ipv6";

src/panels/config/script/manual-script-editor.ts

@@ -47,7 +47,6 @@ const scriptConfigStruct = object({
   mode: optional(enums([typeof MODES])),
   max: optional(number()),
   fields: optional(object()),
-  variables: optional(object()),
 });
 
 @customElement("manual-script-editor")
@@ -233,9 +232,8 @@ export class HaManualScriptEditor extends ManualEditorMixin<ScriptConfig>(
 
     const actionType = getActionType(config);
     if (
-      !["sequence", "variables", "unknown"].includes(actionType) ||
-      (actionType === "sequence" && "metadata" in config) ||
-      (actionType === "variables" && !("sequence" in config))
+      !["sequence", "unknown"].includes(actionType) ||
+      (actionType === "sequence" && "metadata" in config)
     ) {
       config = { sequence: [config] };
     }
@@ -314,14 +312,12 @@ export class HaManualScriptEditor extends ManualEditorMixin<ScriptConfig>(
       return;
     }
 
-    ["fields", "variables"].forEach((key) => {
-      if (key in config) {
-        workingCopy[key] = {
-          ...workingCopy[key],
-          ...config[key],
-        };
-      }
-    });
+    if ("fields" in config) {
+      workingCopy.fields = {
+        ...workingCopy.fields,
+        ...config.fields,
+      };
+    }
     if ("sequence" in config) {
       workingCopy.sequence = ensureArray(workingCopy.sequence || []).concat(
         ensureArray(config.sequence)

src/panels/config/tools/state/tools-state-renderer.ts

@@ -11,6 +11,7 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { fireEvent } from "../../../../common/dom/fire_event";
+import type { HASSDomCurrentTargetEvent } from "../../../../common/dom/fire_event";
 import { computeAreaName } from "../../../../common/entity/compute_area_name";
 import { computeDeviceName } from "../../../../common/entity/compute_device_name";
 import { computeEntityEntryName } from "../../../../common/entity/compute_entity_name";
@@ -260,7 +261,9 @@ class HaPanelDevStateRenderer extends LitElement {
     return output;
   }
 
-  private _copyEntity = async (ev: Event) => {
+  private _copyEntity = async (
+    ev: HASSDomCurrentTargetEvent<HTMLElement & { entity: HassEntity }>
+  ) => {
     ev.preventDefault();
     const entity = (ev.currentTarget as HTMLElement & { entity: HassEntity })
       .entity;
@@ -270,14 +273,18 @@ class HaPanelDevStateRenderer extends LitElement {
     });
   };
 
-  private _entityMoreInfo(ev: Event) {
+  private _entityMoreInfo(
+    ev: HASSDomCurrentTargetEvent<HTMLElement & { entity: HassEntity }>
+  ) {
     ev.preventDefault();
     const entity = (ev.currentTarget as HTMLElement & { entity: HassEntity })
       .entity;
     fireEvent(this, "hass-more-info", { entityId: entity.entity_id });
   }
 
-  private _entitySelected(ev: Event) {
+  private _entitySelected(
+    ev: HASSDomCurrentTargetEvent<HTMLElement & { entity: HassEntity }>
+  ) {
     ev.preventDefault();
     const entity = (ev.currentTarget as HTMLElement & { entity: HassEntity })
       .entity;

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

@@ -16,7 +16,11 @@ import { consume, type ContextType } from "@lit/context";
 import { css, type CSSResultGroup, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
-import type { HASSDomEvent } from "../../../../common/dom/fire_event";
+import type {
+  HASSDomCurrentTargetEvent,
+  HASSDomEvent,
+  HASSDomTargetEvent,
+} from "../../../../common/dom/fire_event";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { computeAreaName } from "../../../../common/entity/compute_area_name";
 import {
@@ -596,7 +600,9 @@ class HaPanelDevStatistics extends KeyboardShortcutMixin(LitElement) {
     `;
   }
 
-  private _handleSearchChange(ev: InputEvent) {
+  private _handleSearchChange(
+    ev: InputEvent & HASSDomTargetEvent<HaInputSearch>
+  ) {
     if (this.filter === (ev.target as HaInputSearch).value) {
       return;
     }
@@ -706,7 +712,9 @@ class HaPanelDevStatistics extends KeyboardShortcutMixin(LitElement) {
     );
   }
 
-  private _showStatisticsAdjustSumDialog(ev: Event) {
+  private _showStatisticsAdjustSumDialog(
+    ev: HASSDomCurrentTargetEvent<HTMLElement & { statistic: StatisticData }>
+  ) {
     ev.stopPropagation();
     showStatisticsAdjustSumDialog(this, {
       statistic: (
@@ -782,7 +790,11 @@ class HaPanelDevStatistics extends KeyboardShortcutMixin(LitElement) {
     });
   };
 
-  private _fixIssue = async (ev: Event) => {
+  private _fixIssue = async (
+    ev: HASSDomCurrentTargetEvent<
+      HTMLElement & { data: StatisticsValidationResult[] }
+    >
+  ) => {
     const issues = (
       ev.currentTarget as HTMLElement & { data: StatisticsValidationResult[] }
     ).data.sort(

src/panels/config/tools/template/tools-template.ts

@@ -9,6 +9,7 @@ import type { UnsubscribeFunc } from "home-assistant-js-websocket";
 import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import type { HASSDomTargetEvent } from "../../../../common/dom/fire_event";
 import { stopPropagation } from "../../../../common/dom/stop_propagation";
 import type { LocalizeKeys } from "../../../../common/translations/localize";
 import { debounce } from "../../../../common/util/debounce";
@@ -419,7 +420,7 @@ ${
     `;
   }
 
-  private _splitRepositioned(ev: Event) {
+  private _splitRepositioned(ev: HASSDomTargetEvent<HaSplitPanel>) {
     this._splitPosition = (ev.target as HaSplitPanel).position;
     this._storeSplitPosition();
   }

src/panels/lovelace/cards/hui-statistics-graph-card.ts

@@ -296,10 +296,6 @@ export class HuiStatisticsGraphCard extends LitElement implements LovelaceCard {
       await this._getStatisticsMetaData(this._entityIds);
     }
     await this._getStatistics();
-    if (!this.isConnected) {
-      this._interval = undefined;
-      return;
-    }
     // statistics are created every hour
     if (!this._config?.energy_date_selection) {
       this._interval = window.setInterval(

src/panels/lovelace/cards/hui-tile-card.ts

@@ -147,7 +147,7 @@ export class HuiTileCard extends LitElement implements LovelaceCard {
     handleAction(this, this.hass!, this._config!, ev.detail.action!);
   }
 
-  private _handleIconAction(ev: ActionHandlerEvent) {
+  private _handleIconAction(ev: CustomEvent) {
     ev.stopPropagation();
     const config = {
       entity: this._config!.entity,

src/panels/lovelace/components/hui-energy-period-selector.ts

@@ -64,7 +64,6 @@ import {
   CompareMode,
   downloadEnergyData,
   getEnergyDataCollection,
-  getEnergyDefaultPeriodStorageKey,
 } from "../../../data/energy";
 import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
 import type { HomeAssistant } from "../../../types";
@@ -545,7 +544,7 @@ export class HuiEnergyPeriodSelector extends SubscribeMixin(LitElement) {
 
   private _presetSelected(ev) {
     localStorage.setItem(
-      getEnergyDefaultPeriodStorageKey(this.hass, this.collectionKey),
+      `energy-default-period-_${this.collectionKey || "energy"}`,
       RANGE_KEYS[ev.detail.index]
     );
   }

src/panels/lovelace/components/hui-image.ts

@@ -4,10 +4,6 @@ import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { styleMap } from "lit/directives/style-map";
 import { STATES_OFF } from "../../../common/const";
-import type {
-  HASSDomCurrentTargetEvent,
-  HASSDomTargetEvent,
-} from "../../../common/dom/fire_event";
 import { computeDomain } from "../../../common/entity/compute_domain";
 import parseAspectRatio from "../../../common/util/parse-aspect-ratio";
 import "../../../components/ha-camera-stream";
@@ -382,11 +378,9 @@ export class HuiImage extends LitElement {
     this._loadState = LoadState.Error;
   }
 
-  private async _onImageLoad(
-    ev: HASSDomTargetEvent<HTMLImageElement>
-  ): Promise<void> {
+  private async _onImageLoad(ev: Event): Promise<void> {
     this._loadState = LoadState.Loaded;
-    const imgEl = ev.target;
+    const imgEl = ev.target as HTMLImageElement;
     if (this._ratio && this._ratio.w > 0 && this._ratio.h > 0) {
       this._loadedImageSrc = imgEl.src;
     }
@@ -394,11 +388,9 @@ export class HuiImage extends LitElement {
     this._lastImageHeight = imgEl.offsetHeight;
   }
 
-  private async _onVideoLoad(
-    ev: HASSDomCurrentTargetEvent<HaCameraStream>
-  ): Promise<void> {
+  private async _onVideoLoad(ev: Event): Promise<void> {
     this._loadState = LoadState.Loaded;
-    const videoEl = ev.currentTarget;
+    const videoEl = ev.currentTarget as HaCameraStream;
     await this.updateComplete;
     this._lastImageHeight = videoEl.offsetHeight;
   }

src/panels/lovelace/editor/config-elements/elements/hui-image-element-editor.ts

@@ -15,7 +15,7 @@ import type { LocalizeFunc } from "../../../../../common/translations/localize";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import "../../../../../components/ha-form/ha-form";
 import type { SchemaUnion } from "../../../../../components/ha-form/types";
-import type { HomeAssistant, ValueChangedEvent } from "../../../../../types";
+import type { HomeAssistant } from "../../../../../types";
 import type { ImageElementConfig } from "../../../elements/types";
 import type { LovelacePictureElementEditor } from "../../../types";
 import { ACTION_RELATED_CONTEXT } from "../../../components/hui-action-editor";
@@ -159,7 +159,7 @@ export class HuiImageElementEditor
       : {}),
   }));
 
-  private _valueChanged(ev: ValueChangedEvent<ImageElementConfig>): void {
+  private _valueChanged(ev: CustomEvent): void {
     fireEvent(this, "config-changed", { config: ev.detail.value });
   }
 

src/panels/lovelace/editor/config-elements/hui-picture-elements-card-editor.ts

@@ -20,7 +20,7 @@ import "../../../../components/ha-card";
 import "../../../../components/ha-form/ha-form";
 import "../../../../components/ha-icon";
 import "../../../../components/ha-switch";
-import type { HomeAssistant, ValueChangedEvent } from "../../../../types";
+import type { HomeAssistant } from "../../../../types";
 import {
   PREVIEW_CLICK_CALLBACK,
   type PictureElementsCardConfig,
@@ -29,7 +29,6 @@ import type { LovelaceCardEditor } from "../../types";
 import "../hui-sub-element-editor";
 import { baseLovelaceCardConfig } from "../structs/base-card-struct";
 import type { EditDetailElementEvent, SubElementEditorConfig } from "../types";
-import type { UIConfigChangedEvent } from "../hui-element-editor";
 import { configElementStyle } from "./config-elements-style";
 import "../hui-picture-elements-card-row-editor";
 import type { LovelaceElementConfig } from "../../elements/types";
@@ -229,7 +228,7 @@ export class HuiPictureElementsCardEditor
       : {}),
   }));
 
-  private _formChanged(ev: ValueChangedEvent<PictureElementsCardConfig>): void {
+  private _formChanged(ev: CustomEvent): void {
     ev.stopPropagation();
     if (!this._config || !this.hass) {
       return;
@@ -262,9 +261,7 @@ export class HuiPictureElementsCardEditor
     }
   }
 
-  private _handleSubElementChanged(
-    ev: UIConfigChangedEvent<LovelaceElementConfig>
-  ): void {
+  private _handleSubElementChanged(ev: CustomEvent): void {
     ev.stopPropagation();
     if (!this._config || !this.hass) {
       return;

src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts

@@ -500,20 +500,13 @@ export class HuiStatisticsGraphCardEditor
 
     // update card config with updated entity config
     const index = this._subElementEditorConfig!.index!;
-    const oldEntityConfig = this._config!.entities[index];
-    const oldEntityId =
-      typeof oldEntityConfig === "string"
-        ? oldEntityConfig
-        : oldEntityConfig?.entity;
     const newEntities = [...this._config!.entities];
     newEntities[index] = newEntityConfig;
     let config = this._config!;
     config = { ...config, entities: newEntities };
 
-    // only a different statistic can invalidate the stat options
-    if (newEntityConfig.entity !== oldEntityId) {
-      config = await this._cleanConfig(config);
-    }
+    // remove inappropriate stat options dependently on entities
+    config = await this._cleanConfig(config);
     // normalize a generated yaml code
     config = this._orderProperties(config);
     this._config = config;