jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-27 19:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix route changing on every hass change (#2988)

Browse Source
This commit is contained in:
Paulus Schoutsen 2019-03-21 12:22:32 -07:00 committed by GitHub
parent 48aa9a2ad7
commit 06b70e2653
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/layouts/hass-router-page.ts
View File

@ -2,6 +2,7 @@ import { UpdatingElement, property, PropertyValues } from "lit-element";
import "./hass-error-screen"; import "./hass-error-screen";
import { Route } from "../types"; import { Route } from "../types";
import { navigate } from "../common/navigate"; import { navigate } from "../common/navigate";
import memoizeOne from "memoize-one";
const extractPage = (path: string, defaultPage: string) => { const extractPage = (path: string, defaultPage: string) => {
if (path === "") { if (path === "") {
@ -47,6 +48,18 @@ export class HassRouterPage extends UpdatingElement {
private _currentPage = ""; private _currentPage = "";
private _currentLoadProm?: Promise<void>; private _currentLoadProm?: Promise<void>;
private _cache = {}; private _cache = {};
private _computeTail = memoizeOne((route: Route) => {
const dividerPos = route.path.indexOf("/", 1);
return dividerPos === -1
? {
prefix: route.prefix + route.path,
path: "",
}
: {
prefix: route.prefix + route.path.substr(0, dividerPos),
path: route.path.substr(dividerPos),
};
});
protected update(changedProps: PropertyValues) { protected update(changedProps: PropertyValues) {
super.update(changedProps); super.update(changedProps);
@ -192,6 +205,10 @@ export class HassRouterPage extends UpdatingElement {
// default we do nothing // default we do nothing
} }
protected get routeTail(): Route {
return this._computeTail(this.route!);
}
private _createPanel( private _createPanel(
routerOptions: RouterOptions, routerOptions: RouterOptions,
page: string, page: string,
@ -210,18 +227,4 @@ export class HassRouterPage extends UpdatingElement {
this._cache[page] = panelEl; this._cache[page] = panelEl;
} }
} }
protected get routeTail(): Route {
const route = this.route!;
const dividerPos = route.path.indexOf("/", 1);
return dividerPos === -1
? {
prefix: route.prefix + route.path,
path: "",
}
: {
prefix: route.prefix + route.path.substr(0, dividerPos),
path: route.path.substr(dividerPos),
};
}
} }