mirror of
https://github.com/home-assistant/frontend.git
synced 2025-07-23 17:26:42 +00:00
Fix navigate timing when dialogs where opened (#23261)
* Fix navigate timing when dialogs where opened * Revert navigate changes
This commit is contained in:
parent
93947d76a2
commit
7e2217b542
@ -164,7 +164,6 @@ export class HaRelatedItems extends LitElement {
|
|||||||
return html`
|
return html`
|
||||||
<a
|
<a
|
||||||
href=${`/config/integrations/integration/${entry.domain}#config_entry=${entry.entry_id}`}
|
href=${`/config/integrations/integration/${entry.domain}#config_entry=${entry.entry_id}`}
|
||||||
@click=${this._navigateAwayClose}
|
|
||||||
>
|
>
|
||||||
<ha-list-item hasMeta graphic="icon">
|
<ha-list-item hasMeta graphic="icon">
|
||||||
<img
|
<img
|
||||||
@ -191,7 +190,6 @@ export class HaRelatedItems extends LitElement {
|
|||||||
(integration) =>
|
(integration) =>
|
||||||
html`<a
|
html`<a
|
||||||
href=${`/config/integrations/integration/${integration}`}
|
href=${`/config/integrations/integration/${integration}`}
|
||||||
@click=${this._navigateAwayClose}
|
|
||||||
>
|
>
|
||||||
<ha-list-item hasMeta graphic="icon">
|
<ha-list-item hasMeta graphic="icon">
|
||||||
<img
|
<img
|
||||||
@ -223,10 +221,7 @@ export class HaRelatedItems extends LitElement {
|
|||||||
return nothing;
|
return nothing;
|
||||||
}
|
}
|
||||||
return html`
|
return html`
|
||||||
<a
|
<a href="/config/devices/device/${relatedDeviceId}">
|
||||||
href="/config/devices/device/${relatedDeviceId}"
|
|
||||||
@click=${this._navigateAwayClose}
|
|
||||||
>
|
|
||||||
<ha-list-item hasMeta graphic="icon">
|
<ha-list-item hasMeta graphic="icon">
|
||||||
<ha-svg-icon
|
<ha-svg-icon
|
||||||
.path=${mdiDevices}
|
.path=${mdiDevices}
|
||||||
@ -251,10 +246,7 @@ export class HaRelatedItems extends LitElement {
|
|||||||
return nothing;
|
return nothing;
|
||||||
}
|
}
|
||||||
return html`
|
return html`
|
||||||
<a
|
<a href="/config/areas/area/${relatedAreaId}">
|
||||||
href="/config/areas/area/${relatedAreaId}"
|
|
||||||
@click=${this._navigateAwayClose}
|
|
||||||
>
|
|
||||||
<ha-list-item
|
<ha-list-item
|
||||||
hasMeta
|
hasMeta
|
||||||
.graphic=${area.picture ? "avatar" : "icon"}
|
.graphic=${area.picture ? "avatar" : "icon"}
|
||||||
@ -364,10 +356,7 @@ export class HaRelatedItems extends LitElement {
|
|||||||
const blueprintMeta = this._blueprints
|
const blueprintMeta = this._blueprints
|
||||||
? this._blueprints.automation[path]
|
? this._blueprints.automation[path]
|
||||||
: undefined;
|
: undefined;
|
||||||
return html`<a
|
return html`<a href="/config/blueprint/dashboard">
|
||||||
href="/config/blueprint/dashboard"
|
|
||||||
@click=${this._navigateAwayClose}
|
|
||||||
>
|
|
||||||
<ha-list-item hasMeta graphic="icon">
|
<ha-list-item hasMeta graphic="icon">
|
||||||
<ha-svg-icon
|
<ha-svg-icon
|
||||||
.path=${mdiPaletteSwatch}
|
.path=${mdiPaletteSwatch}
|
||||||
@ -421,10 +410,7 @@ export class HaRelatedItems extends LitElement {
|
|||||||
const blueprintMeta = this._blueprints
|
const blueprintMeta = this._blueprints
|
||||||
? this._blueprints.script[path]
|
? this._blueprints.script[path]
|
||||||
: undefined;
|
: undefined;
|
||||||
return html`<a
|
return html`<a href="/config/blueprint/dashboard">
|
||||||
href="/config/blueprint/dashboard"
|
|
||||||
@click=${this._navigateAwayClose}
|
|
||||||
>
|
|
||||||
<ha-list-item hasMeta graphic="icon">
|
<ha-list-item hasMeta graphic="icon">
|
||||||
<ha-svg-icon
|
<ha-svg-icon
|
||||||
.path=${mdiPaletteSwatch}
|
.path=${mdiPaletteSwatch}
|
||||||
@ -468,14 +454,6 @@ export class HaRelatedItems extends LitElement {
|
|||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async _navigateAwayClose() {
|
|
||||||
// allow new page to open before closing dialog
|
|
||||||
await new Promise((resolve) => {
|
|
||||||
setTimeout(resolve, 0);
|
|
||||||
});
|
|
||||||
fireEvent(this, "close-dialog");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async _findRelated() {
|
private async _findRelated() {
|
||||||
this._related = await findRelated(this.hass, this.itemType, this.itemId);
|
this._related = await findRelated(this.hass, this.itemType, this.itemId);
|
||||||
if (this._related.config_entry) {
|
if (this._related.config_entry) {
|
||||||
|
@ -3,7 +3,6 @@ import type { PropertyValues } from "lit";
|
|||||||
import { LitElement, css, html, nothing } from "lit";
|
import { LitElement, css, html, nothing } from "lit";
|
||||||
import { customElement, property, query, state } from "lit/decorators";
|
import { customElement, property, query, state } from "lit/decorators";
|
||||||
import { isComponentLoaded } from "../../common/config/is_component_loaded";
|
import { isComponentLoaded } from "../../common/config/is_component_loaded";
|
||||||
import { fireEvent } from "../../common/dom/fire_event";
|
|
||||||
import { computeDomain } from "../../common/entity/compute_domain";
|
import { computeDomain } from "../../common/entity/compute_domain";
|
||||||
import { createSearchParam } from "../../common/url/search-params";
|
import { createSearchParam } from "../../common/url/search-params";
|
||||||
import type { ChartResizeOptions } from "../../components/chart/ha-chart-base";
|
import type { ChartResizeOptions } from "../../components/chart/ha-chart-base";
|
||||||
@ -77,7 +76,7 @@ export class MoreInfoHistory extends LitElement {
|
|||||||
</div>
|
</div>
|
||||||
${__DEMO__
|
${__DEMO__
|
||||||
? nothing
|
? nothing
|
||||||
: html`<a href=${this._showMoreHref} @click=${this._close}
|
: html`<a href=${this._showMoreHref}
|
||||||
>${this.hass.localize(
|
>${this.hass.localize(
|
||||||
"ui.dialogs.more_info_control.show_more"
|
"ui.dialogs.more_info_control.show_more"
|
||||||
)}</a
|
)}</a
|
||||||
@ -244,10 +243,6 @@ export class MoreInfoHistory extends LitElement {
|
|||||||
this._setRedrawTimer();
|
this._setRedrawTimer();
|
||||||
}
|
}
|
||||||
|
|
||||||
private _close(): void {
|
|
||||||
setTimeout(() => fireEvent(this, "close-dialog"), 500);
|
|
||||||
}
|
|
||||||
|
|
||||||
static styles = css`
|
static styles = css`
|
||||||
.header {
|
.header {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
@ -4,7 +4,6 @@ import { css, html, LitElement, nothing } from "lit";
|
|||||||
import { customElement, property } from "lit/decorators";
|
import { customElement, property } from "lit/decorators";
|
||||||
import memoizeOne from "memoize-one";
|
import memoizeOne from "memoize-one";
|
||||||
import { isComponentLoaded } from "../../common/config/is_component_loaded";
|
import { isComponentLoaded } from "../../common/config/is_component_loaded";
|
||||||
import { fireEvent } from "../../common/dom/fire_event";
|
|
||||||
import { createSearchParam } from "../../common/url/search-params";
|
import { createSearchParam } from "../../common/url/search-params";
|
||||||
import "../../panels/logbook/ha-logbook";
|
import "../../panels/logbook/ha-logbook";
|
||||||
import type { HomeAssistant } from "../../types";
|
import type { HomeAssistant } from "../../types";
|
||||||
@ -36,7 +35,7 @@ export class MoreInfoLogbook extends LitElement {
|
|||||||
<div class="title">
|
<div class="title">
|
||||||
${this.hass.localize("ui.dialogs.more_info_control.logbook")}
|
${this.hass.localize("ui.dialogs.more_info_control.logbook")}
|
||||||
</div>
|
</div>
|
||||||
<a href=${this._showMoreHref} @click=${this._close}
|
<a href=${this._showMoreHref}
|
||||||
>${this.hass.localize("ui.dialogs.more_info_control.show_more")}</a
|
>${this.hass.localize("ui.dialogs.more_info_control.show_more")}</a
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
@ -67,10 +66,6 @@ export class MoreInfoLogbook extends LitElement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private _close(): void {
|
|
||||||
setTimeout(() => fireEvent(this, "close-dialog"), 500);
|
|
||||||
}
|
|
||||||
|
|
||||||
static get styles() {
|
static get styles() {
|
||||||
return [
|
return [
|
||||||
css`
|
css`
|
||||||
|
@ -237,7 +237,6 @@ class HaDomainIntegrations extends LitElement {
|
|||||||
["cloud", "google_assistant", "alexa"].includes(domain) &&
|
["cloud", "google_assistant", "alexa"].includes(domain) &&
|
||||||
isComponentLoaded(this.hass, "cloud")
|
isComponentLoaded(this.hass, "cloud")
|
||||||
) {
|
) {
|
||||||
fireEvent(this, "close-dialog");
|
|
||||||
navigate("/config/cloud");
|
navigate("/config/cloud");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user