diff --git a/src/onboarding/onboarding-core-config.ts b/src/onboarding/onboarding-core-config.ts
index 4cb79f49ce..d1c23d2615 100644
--- a/src/onboarding/onboarding-core-config.ts
+++ b/src/onboarding/onboarding-core-config.ts
@@ -41,7 +41,7 @@ class OnboardingCoreConfig extends LitElement {
@property() private _unitSystem!: ConfigUpdateValues["unit_system"];
@property() private _timeZone!: string;
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
return html`
${this.onboardingLocalize(
diff --git a/src/onboarding/onboarding-create-user.ts b/src/onboarding/onboarding-create-user.ts
index b5b06b43cb..0f8699e9dd 100644
--- a/src/onboarding/onboarding-create-user.ts
+++ b/src/onboarding/onboarding-create-user.ts
@@ -28,7 +28,7 @@ class OnboardingCreateUser extends LitElement {
@property() private _loading = false;
@property() private _errorMsg?: string = undefined;
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
return html`
${this.localize("ui.panel.page-onboarding.intro")}
diff --git a/src/onboarding/onboarding-integrations.ts b/src/onboarding/onboarding-integrations.ts
index 20fced6d45..816902c625 100644
--- a/src/onboarding/onboarding-integrations.ts
+++ b/src/onboarding/onboarding-integrations.ts
@@ -51,7 +51,7 @@ class OnboardingIntegrations extends LitElement {
}
}
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
if (!this._entries || !this._discovered) {
return html``;
}
diff --git a/src/onboarding/onboarding-loading.ts b/src/onboarding/onboarding-loading.ts
index 96964350fe..75845879c2 100644
--- a/src/onboarding/onboarding-loading.ts
+++ b/src/onboarding/onboarding-loading.ts
@@ -9,7 +9,7 @@ import {
@customElement("onboarding-loading")
class OnboardingLoading extends LitElement {
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
return html`
`;
diff --git a/src/panels/config/areas/dialog-area-registry-detail.ts b/src/panels/config/areas/dialog-area-registry-detail.ts
index eb51add87b..520d676195 100644
--- a/src/panels/config/areas/dialog-area-registry-detail.ts
+++ b/src/panels/config/areas/dialog-area-registry-detail.ts
@@ -32,7 +32,7 @@ class DialogAreaDetail extends LitElement {
await this.updateComplete;
}
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
if (!this._params) {
return html``;
}
diff --git a/src/panels/config/areas/ha-config-areas.ts b/src/panels/config/areas/ha-config-areas.ts
index e5614633a4..348bc6656c 100644
--- a/src/panels/config/areas/ha-config-areas.ts
+++ b/src/panels/config/areas/ha-config-areas.ts
@@ -45,7 +45,7 @@ export class HaConfigAreas extends LitElement {
}
}
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
if (!this.hass || this._areas === undefined) {
return html`
diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts
index 832d9116ea..18214f69ed 100644
--- a/src/panels/config/automation/ha-automation-editor.ts
+++ b/src/panels/config/automation/ha-automation-editor.ts
@@ -45,7 +45,7 @@ export class HaAutomationEditor extends LitElement {
@property() private _dirty?: boolean;
@property() private _errors?: string;
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
return html`
diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts
index 5dca737bb5..d50cc496ad 100644
--- a/src/panels/config/automation/ha-automation-picker.ts
+++ b/src/panels/config/automation/ha-automation-picker.ts
@@ -39,7 +39,7 @@ class HaAutomationPicker extends LitElement {
@property() public isWide!: boolean;
@property() public automations!: AutomationEntity[];
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
return html`
diff --git a/src/panels/config/cloud/google-assistant/cloud-google-assistant.ts b/src/panels/config/cloud/google-assistant/cloud-google-assistant.ts
index fae0cf06a9..bd3e409f9b 100644
--- a/src/panels/config/cloud/google-assistant/cloud-google-assistant.ts
+++ b/src/panels/config/cloud/google-assistant/cloud-google-assistant.ts
@@ -71,7 +71,7 @@ class CloudGoogleAssistant extends LitElement {
)
);
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
if (this._entities === undefined) {
return html`
diff --git a/src/panels/config/core/ha-config-core-form.ts b/src/panels/config/core/ha-config-core-form.ts
index c1081c8bda..1d3fc487af 100644
--- a/src/panels/config/core/ha-config-core-form.ts
+++ b/src/panels/config/core/ha-config-core-form.ts
@@ -33,7 +33,7 @@ class ConfigCoreForm extends LitElement {
@property() private _unitSystem!: ConfigUpdateValues["unit_system"];
@property() private _timeZone!: string;
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
const canEdit = ["storage", "default"].includes(
this.hass.config.config_source
);
diff --git a/src/panels/config/core/ha-config-name-form.ts b/src/panels/config/core/ha-config-name-form.ts
index 32355e575f..63993c5f23 100644
--- a/src/panels/config/core/ha-config-name-form.ts
+++ b/src/panels/config/core/ha-config-name-form.ts
@@ -24,7 +24,7 @@ class ConfigNameForm extends LitElement {
@property() private _name!: ConfigUpdateValues["location_name"];
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
const canEdit = ["storage", "default"].includes(
this.hass.config.config_source
);
diff --git a/src/panels/config/dashboard/ha-config-dashboard.ts b/src/panels/config/dashboard/ha-config-dashboard.ts
index 143c80bb51..95e4256a7b 100644
--- a/src/panels/config/dashboard/ha-config-dashboard.ts
+++ b/src/panels/config/dashboard/ha-config-dashboard.ts
@@ -32,7 +32,7 @@ class HaConfigDashboard extends LitElement {
@property() public cloudStatus?: CloudStatus;
@property() public showAdvanced!: boolean;
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
return html`
diff --git a/src/panels/config/dashboard/ha-config-navigation.ts b/src/panels/config/dashboard/ha-config-navigation.ts
index 1e51953346..0d55475475 100644
--- a/src/panels/config/dashboard/ha-config-navigation.ts
+++ b/src/panels/config/dashboard/ha-config-navigation.ts
@@ -32,7 +32,7 @@ class HaConfigNavigation extends LitElement {
@property() public pages!: ConfigPageNavigation[];
@property() public curPage!: string;
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
return html`
${this.pages.map(({ page, core, advanced, info }) =>
diff --git a/src/panels/config/entities/dialog-entity-registry-detail.ts b/src/panels/config/entities/dialog-entity-registry-detail.ts
index 196c71204d..440d557417 100644
--- a/src/panels/config/entities/dialog-entity-registry-detail.ts
+++ b/src/panels/config/entities/dialog-entity-registry-detail.ts
@@ -46,7 +46,7 @@ export class DialogEntityRegistryDetail extends LitElement {
this._params = undefined;
}
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
if (!this._params) {
return html``;
}
diff --git a/src/panels/config/entities/entity-registry-settings.ts b/src/panels/config/entities/entity-registry-settings.ts
index 24540bb38b..547838c8fb 100644
--- a/src/panels/config/entities/entity-registry-settings.ts
+++ b/src/panels/config/entities/entity-registry-settings.ts
@@ -41,6 +41,7 @@ export class EntityRegistrySettings extends LitElement {
private _origEntityId!: string;
protected updated(changedProperties: PropertyValues) {
+ super.updated(changedProperties);
if (changedProperties.has("entry")) {
this._error = undefined;
this._name = this.entry.name || "";
@@ -50,9 +51,9 @@ export class EntityRegistrySettings extends LitElement {
}
}
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
if (this.entry.entity_id !== this._origEntityId) {
- return;
+ return html``;
}
const stateObj: HassEntity | undefined = this.hass.states[
this.entry.entity_id
diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts
index ae39bd03a2..00a95df4da 100644
--- a/src/panels/config/entities/ha-config-entities.ts
+++ b/src/panels/config/entities/ha-config-entities.ts
@@ -217,7 +217,7 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
dialog.closeDialog();
}
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
if (!this.hass || this._entities === undefined) {
return html`
diff --git a/src/panels/config/integrations/ha-config-entries-dashboard.ts b/src/panels/config/integrations/ha-config-entries-dashboard.ts
index c846648e96..2c55f68544 100644
--- a/src/panels/config/integrations/ha-config-entries-dashboard.ts
+++ b/src/panels/config/integrations/ha-config-entries-dashboard.ts
@@ -334,6 +334,7 @@ export class HaConfigManagerDashboard extends LitElement {
});
return states;
}
+
static get styles(): CSSResult {
return css`
ha-card {
diff --git a/src/panels/config/person/dialog-person-detail.ts b/src/panels/config/person/dialog-person-detail.ts
index 3a382552bf..b6e1f3fac7 100644
--- a/src/panels/config/person/dialog-person-detail.ts
+++ b/src/panels/config/person/dialog-person-detail.ts
@@ -50,7 +50,7 @@ class DialogPersonDetail extends LitElement {
await this.updateComplete;
}
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
if (!this._params) {
return html``;
}
diff --git a/src/panels/config/person/ha-config-person.ts b/src/panels/config/person/ha-config-person.ts
index 51278ab8df..b2b30089b0 100644
--- a/src/panels/config/person/ha-config-person.ts
+++ b/src/panels/config/person/ha-config-person.ts
@@ -36,7 +36,7 @@ class HaConfigPerson extends LitElement {
@property() private _configItems?: Person[];
private _usersLoad?: Promise;
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
if (
!this.hass ||
this._storageItems === undefined ||
diff --git a/src/panels/config/scene/ha-scene-dashboard.ts b/src/panels/config/scene/ha-scene-dashboard.ts
index 2f39e02bc7..cb37d34914 100644
--- a/src/panels/config/scene/ha-scene-dashboard.ts
+++ b/src/panels/config/scene/ha-scene-dashboard.ts
@@ -33,7 +33,7 @@ class HaSceneDashboard extends LitElement {
@property() public isWide!: boolean;
@property() public scenes!: SceneEntity[];
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
return html`
diff --git a/src/panels/config/script/ha-script-picker.ts b/src/panels/config/script/ha-script-picker.ts
index 6077150273..82dbaee3a6 100644
--- a/src/panels/config/script/ha-script-picker.ts
+++ b/src/panels/config/script/ha-script-picker.ts
@@ -32,7 +32,7 @@ class HaScriptPicker extends LitElement {
@property() public scripts!: HassEntity[];
@property() public isWide!: boolean;
- protected render(): TemplateResult | void {
+ protected render(): TemplateResult {
return html`