@frui.ts/screens
Advanced tools
Comparing version 0.16.0-beta.6 to 0.16.0-beta.7
@@ -80,3 +80,2 @@ "use strict"; | ||
UrlNavigationAdapter.prototype.updateUrl = function (screen) { | ||
var _a; | ||
if (this.rootViewModel) { | ||
@@ -86,3 +85,6 @@ var path = screen.getNavigationPath(); | ||
if (window.location.hash !== url) { | ||
if (((_a = this.lastActiveScreen) === null || _a === void 0 ? void 0 : _a.childReplacesNavigationPath) && url.startsWith(window.location.hash)) { | ||
var shouldReplaceUrl = window.location.hash && | ||
url.startsWith(window.location.hash) && | ||
(!this.lastActiveScreen || this.lastActiveScreen.childReplacesNavigationPath); | ||
if (shouldReplaceUrl) { | ||
window.history.replaceState(null, screen.name, url); | ||
@@ -103,2 +105,3 @@ } | ||
case 0: | ||
this.lastActiveScreen = undefined; | ||
hash = window.location.hash; | ||
@@ -105,0 +108,0 @@ if (!(hash && hash.startsWith(navigationConfiguration_1.default.hashPrefix))) return [3, 2]; |
@@ -12,3 +12,3 @@ import ConductorBase from "./conductorBase"; | ||
protected connectChild(child: TChild): void; | ||
protected findNavigationChild(name: string): Promise<TChild | undefined> | TChild | undefined; | ||
protected findNavigationChild(name: string | undefined): Promise<TChild | undefined> | TChild | undefined; | ||
protected deactivateChild(child: TChild, isClosing: boolean): Promise<void>; | ||
@@ -15,0 +15,0 @@ private closeChildCore; |
@@ -12,3 +12,3 @@ import { IObservableArray } from "mobx"; | ||
protected connectChild(child: TChild): void; | ||
protected findNavigationChild(name: string): Promise<TChild | undefined> | TChild | undefined; | ||
protected findNavigationChild(name: string | undefined): Promise<TChild | undefined> | TChild | undefined; | ||
private closeChildCore; | ||
@@ -15,0 +15,0 @@ private determineNextChildToActivate; |
@@ -6,3 +6,3 @@ { | ||
}, | ||
"version": "0.16.0-beta.6", | ||
"version": "0.16.0-beta.7", | ||
"description": "Frui.ts core classes for application structure and navigation", | ||
@@ -38,3 +38,3 @@ "keywords": [ | ||
"dependencies": { | ||
"@frui.ts/helpers": "^0.16.0-beta.6", | ||
"@frui.ts/helpers": "^0.16.0-beta.7", | ||
"query-string": "^6.9.0", | ||
@@ -49,3 +49,3 @@ "route-parser": "^0.0.5" | ||
}, | ||
"gitHead": "041fa41ca3efb6160efdb6b059c07900a8d569d7" | ||
"gitHead": "ec49c1d0d7277b72b0d324e77b7501299aeba2d2" | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
169752
2042