uicore-ts 1.1.387 → 1.1.388
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -182,6 +182,7 @@ const _UIRoute = class extends Array {
|
|
|
182
182
|
targetHistoryPosition2 = targetHistoryPosition2 + 1;
|
|
183
183
|
}
|
|
184
184
|
_UIRoute._recordPresentedRouteAtHistoryPosition(targetRoute, targetHistoryPosition2);
|
|
185
|
+
reapplyCurrentRoute();
|
|
185
186
|
return;
|
|
186
187
|
}
|
|
187
188
|
const targetHistoryPosition = _UIRoute._historyPositionFromCurrentEntry();
|
|
@@ -191,10 +192,12 @@ const _UIRoute = class extends Array {
|
|
|
191
192
|
untaggedHistoryPosition = untaggedHistoryPosition + 1;
|
|
192
193
|
}
|
|
193
194
|
_UIRoute._recordPresentedRouteAtHistoryPosition(targetRoute, untaggedHistoryPosition);
|
|
195
|
+
reapplyCurrentRoute();
|
|
194
196
|
return;
|
|
195
197
|
}
|
|
196
198
|
if (targetHistoryPosition === _UIRoute._presentedHistoryPosition) {
|
|
197
199
|
_UIRoute._recordPresentedRouteAtHistoryPosition(targetRoute, targetHistoryPosition);
|
|
200
|
+
reapplyCurrentRoute();
|
|
198
201
|
return;
|
|
199
202
|
}
|
|
200
203
|
event.stopImmediatePropagation();
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../scripts/UIRoute.ts"],
|
|
4
|
-
"sourcesContent": ["import { IS_NIL, IS_NOT, NO, ValueOf, YES } from \"./UIObject\"\nimport { UIViewController } from \"./UIViewController\"\n\n\nexport type PropType<TObj, TProp extends keyof TObj> = TObj[TProp];\n\nexport type UIRouteParameters<T = any> = {\n \n [key: string]: string;\n \n} | T;\n\n\nexport interface UIRouteComponent<T = any> {\n \n name: string;\n parameters: UIRouteParameters<T>;\n \n}\n\n\nexport interface UIRouteChangeDescriptor {\n \n currentRoute: UIRoute;\n targetRoute: UIRoute;\n forcefully: boolean;\n replacesCurrentRouteInHistory: boolean;\n \n}\n\n\nexport type UIRouteShouldApplyRouteChangeCallbackFunction = (\n routeChangeDescriptor: UIRouteChangeDescriptor\n) => boolean | Promise<boolean>;\n\n\nconst historyPositionStateKey = \"uiRouteHistoryPosition\"\n\n\nexport class UIRoute extends Array<UIRouteComponent> {\n \n static shouldApplyRouteChange?: UIRouteShouldApplyRouteChangeCallbackFunction\n \n // Native Back/Forward navigation fires `hashchange` directly, bypassing\n // `apply()` and therefore `shouldApplyRouteChange` - the fields and\n // methods below (installed via `_installNativeHistoryNavigationGuard`)\n // close that gap by tagging every history entry with a running position,\n // so a native traversal can be told apart from this class's own hash\n // mutations and, when declined, undone with `history.go(...)`.\n static _presentedRoute: UIRoute = new UIRoute()\n static _presentedHistoryPosition = 0\n static _recordedHistoryLength = 0\n static _selfInitiatedRouteChange?: UIRouteChangeDescriptor\n static _nativeHistoryNavigationGeneration = 0\n \n constructor(hash?: string) {\n \n super()\n \n if (!hash || !hash.startsWith) {\n \n return\n \n }\n \n if (hash.startsWith(\"#\")) {\n hash = hash.slice(1)\n }\n \n hash = decodeURIComponent(hash)\n \n const components = hash.split(\"]\")\n components.forEach(component => {\n \n const componentName = component.split(\"[\")[0]\n const parameters: Record<string, string> = {}\n \n if (!componentName) {\n return\n }\n \n const parametersString = component.split(\"[\")[1] || \"\"\n const parameterPairStrings = parametersString.split(\",\") || []\n \n parameterPairStrings.forEach(pairString => {\n \n const keyAndValueArray = pairString.split(\":\")\n const key = decodeURIComponent(keyAndValueArray[0])\n const value = decodeURIComponent(keyAndValueArray[1])\n \n if (key) {\n parameters[key] = value\n }\n \n })\n \n \n this.push({\n name: componentName,\n parameters: parameters\n })\n \n })\n \n \n }\n \n \n static get currentRoute() {\n\n return new UIRoute(window.location.hash)\n\n }\n\n\n /**\n * @param forcefully When `true`, applies the route even if its string\n * representation is identical to the current URL hash, causing the browser\n * to fire a `hashchange` event and re-run the full `handleRoute` flow.\n * Use this only when you explicitly need re-entrant navigation (e.g. the\n * \"tap the already-active tab to reset to root\" feature in TopBarView).\n * Defaults to `false`.\n */\n apply(forcefully = NO): boolean | Promise<boolean> {\n \n return this._applyRouteAfterRouteChangeApproval(forcefully, NO)\n \n }\n \n \n /**\n * Applies this route without consulting `UIRoute.shouldApplyRouteChange`.\n * Use this only for route changes that are internal bookkeeping or that already\n * passed a higher-level confirmation flow.\n */\n applyWithoutRouteChangeApproval(forcefully = NO): boolean {\n \n return this._applyRouteWithoutRouteChangeApproval(forcefully, NO)\n \n }\n \n \n /**\n * @param forcefully When `true`, replaces the current history entry with\n * this route even when the route is identical to the current URL hash.\n * Defaults to `false`.\n */\n applyByReplacingCurrentRouteInHistory(forcefully = NO): boolean | Promise<boolean> {\n \n return this._applyRouteAfterRouteChangeApproval(forcefully, YES)\n \n }\n \n \n /**\n * Replaces the current history entry without consulting\n * `UIRoute.shouldApplyRouteChange`.\n */\n applyByReplacingCurrentRouteInHistoryWithoutRouteChangeApproval(forcefully = NO): boolean {\n \n return this._applyRouteWithoutRouteChangeApproval(forcefully, YES)\n \n }\n \n \n _applyRouteAfterRouteChangeApproval(\n forcefully: boolean,\n replacesCurrentRouteInHistory: boolean\n ): boolean | Promise<boolean> {\n \n if (!this._needsRouteChange(forcefully)) {\n return NO\n }\n \n const shouldApplyRouteChange = UIRoute.shouldApplyRouteChange\n if (!shouldApplyRouteChange) {\n return this._applyRouteWithoutRouteChangeApproval(forcefully, replacesCurrentRouteInHistory)\n }\n \n const shouldProceed = shouldApplyRouteChange(\n this._routeChangeDescriptor(forcefully, replacesCurrentRouteInHistory)\n )\n \n if (shouldProceed instanceof Promise) {\n return shouldProceed.then(isRouteChangeApproved => {\n return this._applyRouteIfAllowed(\n isRouteChangeApproved,\n forcefully,\n replacesCurrentRouteInHistory\n )\n })\n }\n \n return this._applyRouteIfAllowed(shouldProceed, forcefully, replacesCurrentRouteInHistory)\n \n }\n \n \n _applyRouteIfAllowed(\n isRouteChangeApproved: boolean,\n forcefully: boolean,\n replacesCurrentRouteInHistory: boolean\n ): boolean {\n \n if (!isRouteChangeApproved) {\n return NO\n }\n \n return this._applyRouteWithoutRouteChangeApproval(forcefully, replacesCurrentRouteInHistory)\n \n }\n \n \n _applyRouteWithoutRouteChangeApproval(\n forcefully: boolean,\n replacesCurrentRouteInHistory: boolean\n ): boolean {\n \n if (!this._needsRouteChange(forcefully)) {\n return NO\n }\n\n // Tags the hashchange this is about to cause as this class's own\n // doing, so `_hashDidChange` can tell it apart from a native\n // Back/Forward traversal instead of falling back to guessing from\n // `window.history.length`.\n UIRoute._selfInitiatedRouteChange = this._routeChangeDescriptor(forcefully, replacesCurrentRouteInHistory)\n\n if (replacesCurrentRouteInHistory) {\n window.location.replace(this.linkRepresentation)\n }\n else {\n window.location.hash = this.stringRepresentation\n }\n\n return YES\n\n }\n \n \n _needsRouteChange(forcefully: boolean): boolean {\n \n if (!forcefully && new UIRoute(window.location.hash).stringRepresentation == this.stringRepresentation) {\n return NO\n }\n \n return YES\n \n }\n \n \n _routeChangeDescriptor(forcefully: boolean, replacesCurrentRouteInHistory: boolean): UIRouteChangeDescriptor {\n \n return {\n currentRoute: UIRoute.currentRoute,\n targetRoute: this.copy(),\n forcefully: forcefully,\n replacesCurrentRouteInHistory: replacesCurrentRouteInHistory\n }\n\n }\n\n\n /**\n * Installs handling so that native browser Back/Forward navigation\n * consults `shouldApplyRouteChange` the same way `apply()` does, instead\n * of silently bypassing it. Call exactly once, from `UICore`'s\n * constructor.\n *\n * @param reapplyCurrentRoute Re-runs route handling for `UIRoute.currentRoute`.\n * Called once a native navigation is allowed to proceed (or is self-initiated),\n * so its effect actually appears on screen.\n */\n static _installNativeHistoryNavigationGuard(reapplyCurrentRoute: () => void | Promise<void>) {\n\n UIRoute._recordPresentedRouteAtHistoryPosition(\n UIRoute.currentRoute,\n UIRoute._historyPositionFromCurrentEntry() ?? 0\n )\n\n window.addEventListener(\"hashchange\", event =>\n UIRoute._hashDidChange(event, reapplyCurrentRoute)\n )\n\n }\n\n\n static _historyPositionFromCurrentEntry(): number | undefined {\n\n const historyPosition = (window.history.state as Record<string, unknown> | null)?.[historyPositionStateKey]\n if (typeof historyPosition !== \"number\") {\n return undefined\n }\n return historyPosition\n\n }\n\n\n static _recordPresentedRouteAtHistoryPosition(route: UIRoute, historyPosition: number) {\n\n const historyState = Object.assign({}, window.history.state)\n historyState[historyPositionStateKey] = historyPosition\n window.history.replaceState(historyState, \"\")\n\n UIRoute._presentedRoute = route.copy()\n UIRoute._presentedHistoryPosition = historyPosition\n UIRoute._recordedHistoryLength = window.history.length\n\n }\n\n\n /**\n * The single listener installed for every `hashchange` - self-initiated,\n * native Back/Forward, or an untagged bypass (see the class-level comment\n * above `_presentedRoute`) - and the point where those three cases are\n * told apart.\n *\n * @param event The native event. Only used to call\n * `stopImmediatePropagation()` when a native traversal needs to be held\n * back pending `shouldApplyRouteChange`, so `UICore`'s own route handling\n * doesn't run before that check settles.\n * @param reapplyCurrentRoute Forwarded to `_applyHistoryNavigationToRouteAtPositionIfAllowed`\n * - see its own doc comment.\n */\n static _hashDidChange(event: HashChangeEvent, reapplyCurrentRoute: () => void | Promise<void>) {\n\n const targetRoute = UIRoute.currentRoute\n const selfInitiatedRouteChange = UIRoute._selfInitiatedRouteChange\n UIRoute._selfInitiatedRouteChange = undefined\n\n if (\n selfInitiatedRouteChange &&\n selfInitiatedRouteChange.targetRoute.stringRepresentation === targetRoute.stringRepresentation\n ) {\n\n let targetHistoryPosition = UIRoute._presentedHistoryPosition\n if (!selfInitiatedRouteChange.replacesCurrentRouteInHistory) {\n targetHistoryPosition = targetHistoryPosition + 1\n }\n UIRoute._recordPresentedRouteAtHistoryPosition(targetRoute, targetHistoryPosition)\n return\n\n }\n\n const targetHistoryPosition = UIRoute._historyPositionFromCurrentEntry()\n if (targetHistoryPosition === undefined) {\n\n // A hash mutation that bypassed this class entirely (e.g. a\n // direct `window.location.hash = ...` assignment) produces an\n // untagged entry. A larger native history length means it was\n // pushed; an unchanged length means the current entry was\n // replaced. Preserve both established escape hatches while\n // bringing the entry into this sequence.\n let untaggedHistoryPosition = UIRoute._presentedHistoryPosition\n if (window.history.length > UIRoute._recordedHistoryLength) {\n untaggedHistoryPosition = untaggedHistoryPosition + 1\n }\n UIRoute._recordPresentedRouteAtHistoryPosition(targetRoute, untaggedHistoryPosition)\n return\n\n }\n if (targetHistoryPosition === UIRoute._presentedHistoryPosition) {\n UIRoute._recordPresentedRouteAtHistoryPosition(targetRoute, targetHistoryPosition)\n return\n }\n\n event.stopImmediatePropagation()\n const navigationGeneration = ++UIRoute._nativeHistoryNavigationGeneration\n UIRoute._applyHistoryNavigationToRouteAtPositionIfAllowed(\n targetRoute,\n targetHistoryPosition,\n navigationGeneration,\n reapplyCurrentRoute\n ).catch(error => {\n console.error(\"UIRoute: native history navigation check failed\", error)\n })\n\n }\n\n\n /**\n * Consults `shouldApplyRouteChange` for a native Back/Forward traversal,\n * exactly like `apply()` does for a programmatic one, then either lets it\n * through or reverts it with `history.go(...)`.\n *\n * @param targetRoute The route the native traversal is asking to move to.\n * @param targetHistoryPosition That route's tagged position, used both to\n * revert (`history.go`) and to detect a newer navigation arriving mid-check.\n * @param navigationGeneration A token captured by the caller at dispatch\n * time. If it no longer matches `_nativeHistoryNavigationGeneration` by\n * the time `shouldApplyRouteChange` resolves, a newer navigation has\n * superseded this one and this check's result is discarded.\n * @param reapplyCurrentRoute Called once the navigation is approved, so\n * `UIRoute.currentRoute`'s new value actually takes effect on screen.\n */\n static async _applyHistoryNavigationToRouteAtPositionIfAllowed(\n targetRoute: UIRoute,\n targetHistoryPosition: number,\n navigationGeneration: number,\n reapplyCurrentRoute: () => void | Promise<void>\n ) {\n\n const shouldApplyRouteChange = UIRoute.shouldApplyRouteChange\n const isRouteChangeApproved = shouldApplyRouteChange\n ? await shouldApplyRouteChange({\n currentRoute: UIRoute._presentedRoute.copy(),\n targetRoute: targetRoute.copy(),\n forcefully: NO,\n replacesCurrentRouteInHistory: NO\n })\n : YES\n\n if (navigationGeneration !== UIRoute._nativeHistoryNavigationGeneration) {\n return\n }\n if (\n UIRoute.currentRoute.stringRepresentation !== targetRoute.stringRepresentation ||\n UIRoute._historyPositionFromCurrentEntry() !== targetHistoryPosition\n ) {\n return\n }\n\n if (isRouteChangeApproved) {\n UIRoute._recordPresentedRouteAtHistoryPosition(targetRoute, targetHistoryPosition)\n await reapplyCurrentRoute()\n return\n }\n\n const historyDelta = UIRoute._presentedHistoryPosition - targetHistoryPosition\n if (historyDelta !== 0) {\n window.history.go(historyDelta)\n }\n\n }\n\n\n override copy() {\n const result = new UIRoute(this.stringRepresentation)\n return result\n }\n \n \n routeByRemovingComponentsOtherThanOnesNamed(componentNames: string[]) {\n const result = this.copy()\n const indexesToRemove: number[] = []\n result.forEach(function (component, index, array) {\n if (!componentNames.contains(component.name)) {\n indexesToRemove.push(index)\n }\n })\n indexesToRemove.forEach(function (indexToRemove, index, array) {\n result.removeElementAtIndex(indexToRemove)\n })\n return result\n }\n \n \n routeByRemovingComponentNamed(componentName: string) {\n const result = this.copy()\n const componentIndex = result.findIndex(function (component, index) {\n return (component.name == componentName)\n })\n if (componentIndex != -1) {\n result.splice(componentIndex, 1)\n }\n return result\n }\n \n \n routeByRemovingParameterInComponent(componentName: string, parameterName: string, removeComponentIfEmpty = NO) {\n let result = this.copy()\n let parameters = result.componentWithName(componentName)?.parameters ?? {}\n delete parameters[parameterName]\n result = result.routeWithComponent(componentName, parameters)\n if (removeComponentIfEmpty && Object.keys(parameters).length == 0) {\n result = result.routeByRemovingComponentNamed(componentName)\n }\n return result\n }\n \n routeBySettingParameterInComponent(componentName: string, parameterName: string, valueToSet: string) {\n let result = this.copy()\n if (IS_NIL(valueToSet) || IS_NIL(parameterName)) {\n return result\n }\n let parameters = result.componentWithName(componentName)?.parameters\n if (IS_NOT(parameters)) {\n parameters = {}\n }\n parameters[parameterName] = valueToSet\n result = result.routeWithComponent(componentName, parameters)\n return result\n }\n \n \n routeWithViewControllerComponent<T extends typeof UIViewController>(\n viewController: T,\n parameters: UIRouteParameters<{ [P in keyof T[\"ParameterIdentifierName\"]]: string }>,\n extendParameters: boolean = NO\n ) {\n \n return this.routeWithComponent(viewController.routeComponentName, parameters, extendParameters)\n \n }\n \n routeWithComponent(name: string, parameters: UIRouteParameters, extendParameters: boolean = NO) {\n \n const result = this.copy()\n let component = result.componentWithName(name)\n if (IS_NOT(component)) {\n component = {\n name: name,\n parameters: {}\n }\n result.push(component)\n }\n \n if (IS_NOT(parameters)) {\n \n parameters = {}\n \n }\n \n if (extendParameters) {\n component.parameters = Object.assign(component.parameters, parameters)\n }\n else {\n component.parameters = parameters\n }\n \n return result\n \n }\n \n navigateBySettingComponent(name: string, parameters: UIRouteParameters, extendParameters: boolean = NO) {\n \n return this.routeWithComponent(name, parameters, extendParameters).apply()\n \n }\n \n \n componentWithViewController<T extends typeof UIViewController>(viewController: T): UIRouteComponent<{ [P in ValueOf<T[\"ParameterIdentifierName\"]>]: string }> | undefined {\n \n return this.componentWithName(viewController.routeComponentName)\n \n }\n \n componentWithName(name: string): UIRouteComponent | undefined {\n let result\n this.forEach(function (component, index, self) {\n if (component.name == name) {\n result = component\n }\n })\n return result\n }\n \n \n get linkRepresentation() {\n return \"#\" + this.stringRepresentation\n }\n \n \n get stringRepresentation() {\n \n let result = \"\"\n this.forEach(function (component, index, self) {\n result = result + component.name\n const parameters = component.parameters\n result = result + \"[\"\n Object.keys(parameters).forEach(function (key, index, keys) {\n if (index) {\n result = result + \",\"\n }\n result = result + encodeURIComponent(key) + \":\" + encodeURIComponent(parameters[key])\n })\n result = result + \"]\"\n })\n \n return result\n \n }\n \n \n}\n"],
|
|
5
|
-
"mappings": "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
|
|
4
|
+
"sourcesContent": ["import { IS_NIL, IS_NOT, NO, ValueOf, YES } from \"./UIObject\"\nimport { UIViewController } from \"./UIViewController\"\n\n\nexport type PropType<TObj, TProp extends keyof TObj> = TObj[TProp];\n\nexport type UIRouteParameters<T = any> = {\n \n [key: string]: string;\n \n} | T;\n\n\nexport interface UIRouteComponent<T = any> {\n \n name: string;\n parameters: UIRouteParameters<T>;\n \n}\n\n\nexport interface UIRouteChangeDescriptor {\n \n currentRoute: UIRoute;\n targetRoute: UIRoute;\n forcefully: boolean;\n replacesCurrentRouteInHistory: boolean;\n \n}\n\n\nexport type UIRouteShouldApplyRouteChangeCallbackFunction = (\n routeChangeDescriptor: UIRouteChangeDescriptor\n) => boolean | Promise<boolean>;\n\n\nconst historyPositionStateKey = \"uiRouteHistoryPosition\"\n\n\nexport class UIRoute extends Array<UIRouteComponent> {\n \n static shouldApplyRouteChange?: UIRouteShouldApplyRouteChangeCallbackFunction\n \n // Native Back/Forward navigation fires `hashchange` directly, bypassing\n // `apply()` and therefore `shouldApplyRouteChange` - the fields and\n // methods below (installed via `_installNativeHistoryNavigationGuard`)\n // close that gap by tagging every history entry with a running position,\n // so a native traversal can be told apart from this class's own hash\n // mutations and, when declined, undone with `history.go(...)`.\n static _presentedRoute: UIRoute = new UIRoute()\n static _presentedHistoryPosition = 0\n static _recordedHistoryLength = 0\n static _selfInitiatedRouteChange?: UIRouteChangeDescriptor\n static _nativeHistoryNavigationGeneration = 0\n \n constructor(hash?: string) {\n \n super()\n \n if (!hash || !hash.startsWith) {\n \n return\n \n }\n \n if (hash.startsWith(\"#\")) {\n hash = hash.slice(1)\n }\n \n hash = decodeURIComponent(hash)\n \n const components = hash.split(\"]\")\n components.forEach(component => {\n \n const componentName = component.split(\"[\")[0]\n const parameters: Record<string, string> = {}\n \n if (!componentName) {\n return\n }\n \n const parametersString = component.split(\"[\")[1] || \"\"\n const parameterPairStrings = parametersString.split(\",\") || []\n \n parameterPairStrings.forEach(pairString => {\n \n const keyAndValueArray = pairString.split(\":\")\n const key = decodeURIComponent(keyAndValueArray[0])\n const value = decodeURIComponent(keyAndValueArray[1])\n \n if (key) {\n parameters[key] = value\n }\n \n })\n \n \n this.push({\n name: componentName,\n parameters: parameters\n })\n \n })\n \n \n }\n \n \n static get currentRoute() {\n\n return new UIRoute(window.location.hash)\n\n }\n\n\n /**\n * @param forcefully When `true`, applies the route even if its string\n * representation is identical to the current URL hash, causing the browser\n * to fire a `hashchange` event and re-run the full `handleRoute` flow.\n * Use this only when you explicitly need re-entrant navigation (e.g. the\n * \"tap the already-active tab to reset to root\" feature in TopBarView).\n * Defaults to `false`.\n */\n apply(forcefully = NO): boolean | Promise<boolean> {\n \n return this._applyRouteAfterRouteChangeApproval(forcefully, NO)\n \n }\n \n \n /**\n * Applies this route without consulting `UIRoute.shouldApplyRouteChange`.\n * Use this only for route changes that are internal bookkeeping or that already\n * passed a higher-level confirmation flow.\n */\n applyWithoutRouteChangeApproval(forcefully = NO): boolean {\n \n return this._applyRouteWithoutRouteChangeApproval(forcefully, NO)\n \n }\n \n \n /**\n * @param forcefully When `true`, replaces the current history entry with\n * this route even when the route is identical to the current URL hash.\n * Defaults to `false`.\n */\n applyByReplacingCurrentRouteInHistory(forcefully = NO): boolean | Promise<boolean> {\n \n return this._applyRouteAfterRouteChangeApproval(forcefully, YES)\n \n }\n \n \n /**\n * Replaces the current history entry without consulting\n * `UIRoute.shouldApplyRouteChange`.\n */\n applyByReplacingCurrentRouteInHistoryWithoutRouteChangeApproval(forcefully = NO): boolean {\n \n return this._applyRouteWithoutRouteChangeApproval(forcefully, YES)\n \n }\n \n \n _applyRouteAfterRouteChangeApproval(\n forcefully: boolean,\n replacesCurrentRouteInHistory: boolean\n ): boolean | Promise<boolean> {\n \n if (!this._needsRouteChange(forcefully)) {\n return NO\n }\n \n const shouldApplyRouteChange = UIRoute.shouldApplyRouteChange\n if (!shouldApplyRouteChange) {\n return this._applyRouteWithoutRouteChangeApproval(forcefully, replacesCurrentRouteInHistory)\n }\n \n const shouldProceed = shouldApplyRouteChange(\n this._routeChangeDescriptor(forcefully, replacesCurrentRouteInHistory)\n )\n \n if (shouldProceed instanceof Promise) {\n return shouldProceed.then(isRouteChangeApproved => {\n return this._applyRouteIfAllowed(\n isRouteChangeApproved,\n forcefully,\n replacesCurrentRouteInHistory\n )\n })\n }\n \n return this._applyRouteIfAllowed(shouldProceed, forcefully, replacesCurrentRouteInHistory)\n \n }\n \n \n _applyRouteIfAllowed(\n isRouteChangeApproved: boolean,\n forcefully: boolean,\n replacesCurrentRouteInHistory: boolean\n ): boolean {\n \n if (!isRouteChangeApproved) {\n return NO\n }\n \n return this._applyRouteWithoutRouteChangeApproval(forcefully, replacesCurrentRouteInHistory)\n \n }\n \n \n _applyRouteWithoutRouteChangeApproval(\n forcefully: boolean,\n replacesCurrentRouteInHistory: boolean\n ): boolean {\n \n if (!this._needsRouteChange(forcefully)) {\n return NO\n }\n\n // Tags the hashchange this is about to cause as this class's own\n // doing, so `_hashDidChange` can tell it apart from a native\n // Back/Forward traversal instead of falling back to guessing from\n // `window.history.length`.\n UIRoute._selfInitiatedRouteChange = this._routeChangeDescriptor(forcefully, replacesCurrentRouteInHistory)\n\n if (replacesCurrentRouteInHistory) {\n window.location.replace(this.linkRepresentation)\n }\n else {\n window.location.hash = this.stringRepresentation\n }\n\n return YES\n\n }\n \n \n _needsRouteChange(forcefully: boolean): boolean {\n \n if (!forcefully && new UIRoute(window.location.hash).stringRepresentation == this.stringRepresentation) {\n return NO\n }\n \n return YES\n \n }\n \n \n _routeChangeDescriptor(forcefully: boolean, replacesCurrentRouteInHistory: boolean): UIRouteChangeDescriptor {\n \n return {\n currentRoute: UIRoute.currentRoute,\n targetRoute: this.copy(),\n forcefully: forcefully,\n replacesCurrentRouteInHistory: replacesCurrentRouteInHistory\n }\n\n }\n\n\n /**\n * Installs handling so that native browser Back/Forward navigation\n * consults `shouldApplyRouteChange` the same way `apply()` does, instead\n * of silently bypassing it. Call exactly once, from `UICore`'s\n * constructor.\n *\n * @param reapplyCurrentRoute Re-runs route handling for `UIRoute.currentRoute`.\n * Called once a native navigation is allowed to proceed (or is self-initiated),\n * so its effect actually appears on screen.\n */\n static _installNativeHistoryNavigationGuard(reapplyCurrentRoute: () => void | Promise<void>) {\n\n UIRoute._recordPresentedRouteAtHistoryPosition(\n UIRoute.currentRoute,\n UIRoute._historyPositionFromCurrentEntry() ?? 0\n )\n\n window.addEventListener(\"hashchange\", event =>\n UIRoute._hashDidChange(event, reapplyCurrentRoute)\n )\n\n }\n\n\n static _historyPositionFromCurrentEntry(): number | undefined {\n\n const historyPosition = (window.history.state as Record<string, unknown> | null)?.[historyPositionStateKey]\n if (typeof historyPosition !== \"number\") {\n return undefined\n }\n return historyPosition\n\n }\n\n\n static _recordPresentedRouteAtHistoryPosition(route: UIRoute, historyPosition: number) {\n\n const historyState = Object.assign({}, window.history.state)\n historyState[historyPositionStateKey] = historyPosition\n window.history.replaceState(historyState, \"\")\n\n UIRoute._presentedRoute = route.copy()\n UIRoute._presentedHistoryPosition = historyPosition\n UIRoute._recordedHistoryLength = window.history.length\n\n }\n\n\n /**\n * The single listener installed for every `hashchange` - self-initiated,\n * native Back/Forward, or an untagged bypass (see the class-level comment\n * above `_presentedRoute`) - and the point where those three cases are\n * told apart.\n *\n * @param event The native event. Only used to call\n * `stopImmediatePropagation()` when a native traversal needs to be held\n * back pending `shouldApplyRouteChange`, so `UICore`'s own route handling\n * doesn't run before that check settles.\n * @param reapplyCurrentRoute Forwarded to `_applyHistoryNavigationToRouteAtPositionIfAllowed`\n * - see its own doc comment.\n */\n static _hashDidChange(event: HashChangeEvent, reapplyCurrentRoute: () => void | Promise<void>) {\n\n const targetRoute = UIRoute.currentRoute\n const selfInitiatedRouteChange = UIRoute._selfInitiatedRouteChange\n UIRoute._selfInitiatedRouteChange = undefined\n\n if (\n selfInitiatedRouteChange &&\n selfInitiatedRouteChange.targetRoute.stringRepresentation === targetRoute.stringRepresentation\n ) {\n\n let targetHistoryPosition = UIRoute._presentedHistoryPosition\n if (!selfInitiatedRouteChange.replacesCurrentRouteInHistory) {\n targetHistoryPosition = targetHistoryPosition + 1\n }\n UIRoute._recordPresentedRouteAtHistoryPosition(targetRoute, targetHistoryPosition)\n reapplyCurrentRoute()\n return\n\n }\n\n const targetHistoryPosition = UIRoute._historyPositionFromCurrentEntry()\n if (targetHistoryPosition === undefined) {\n\n // A hash mutation that bypassed this class entirely (e.g. a\n // direct `window.location.hash = ...` assignment) produces an\n // untagged entry. A larger native history length means it was\n // pushed; an unchanged length means the current entry was\n // replaced. Preserve both established escape hatches while\n // bringing the entry into this sequence.\n let untaggedHistoryPosition = UIRoute._presentedHistoryPosition\n if (window.history.length > UIRoute._recordedHistoryLength) {\n untaggedHistoryPosition = untaggedHistoryPosition + 1\n }\n UIRoute._recordPresentedRouteAtHistoryPosition(targetRoute, untaggedHistoryPosition)\n reapplyCurrentRoute()\n return\n\n }\n if (targetHistoryPosition === UIRoute._presentedHistoryPosition) {\n UIRoute._recordPresentedRouteAtHistoryPosition(targetRoute, targetHistoryPosition)\n reapplyCurrentRoute()\n return\n }\n\n event.stopImmediatePropagation()\n const navigationGeneration = ++UIRoute._nativeHistoryNavigationGeneration\n UIRoute._applyHistoryNavigationToRouteAtPositionIfAllowed(\n targetRoute,\n targetHistoryPosition,\n navigationGeneration,\n reapplyCurrentRoute\n ).catch(error => {\n console.error(\"UIRoute: native history navigation check failed\", error)\n })\n\n }\n\n\n /**\n * Consults `shouldApplyRouteChange` for a native Back/Forward traversal,\n * exactly like `apply()` does for a programmatic one, then either lets it\n * through or reverts it with `history.go(...)`.\n *\n * @param targetRoute The route the native traversal is asking to move to.\n * @param targetHistoryPosition That route's tagged position, used both to\n * revert (`history.go`) and to detect a newer navigation arriving mid-check.\n * @param navigationGeneration A token captured by the caller at dispatch\n * time. If it no longer matches `_nativeHistoryNavigationGeneration` by\n * the time `shouldApplyRouteChange` resolves, a newer navigation has\n * superseded this one and this check's result is discarded.\n * @param reapplyCurrentRoute Called once the navigation is approved, so\n * `UIRoute.currentRoute`'s new value actually takes effect on screen.\n */\n static async _applyHistoryNavigationToRouteAtPositionIfAllowed(\n targetRoute: UIRoute,\n targetHistoryPosition: number,\n navigationGeneration: number,\n reapplyCurrentRoute: () => void | Promise<void>\n ) {\n\n const shouldApplyRouteChange = UIRoute.shouldApplyRouteChange\n const isRouteChangeApproved = shouldApplyRouteChange\n ? await shouldApplyRouteChange({\n currentRoute: UIRoute._presentedRoute.copy(),\n targetRoute: targetRoute.copy(),\n forcefully: NO,\n replacesCurrentRouteInHistory: NO\n })\n : YES\n\n if (navigationGeneration !== UIRoute._nativeHistoryNavigationGeneration) {\n return\n }\n if (\n UIRoute.currentRoute.stringRepresentation !== targetRoute.stringRepresentation ||\n UIRoute._historyPositionFromCurrentEntry() !== targetHistoryPosition\n ) {\n return\n }\n\n if (isRouteChangeApproved) {\n UIRoute._recordPresentedRouteAtHistoryPosition(targetRoute, targetHistoryPosition)\n await reapplyCurrentRoute()\n return\n }\n\n const historyDelta = UIRoute._presentedHistoryPosition - targetHistoryPosition\n if (historyDelta !== 0) {\n window.history.go(historyDelta)\n }\n\n }\n\n\n override copy() {\n const result = new UIRoute(this.stringRepresentation)\n return result\n }\n \n \n routeByRemovingComponentsOtherThanOnesNamed(componentNames: string[]) {\n const result = this.copy()\n const indexesToRemove: number[] = []\n result.forEach(function (component, index, array) {\n if (!componentNames.contains(component.name)) {\n indexesToRemove.push(index)\n }\n })\n indexesToRemove.forEach(function (indexToRemove, index, array) {\n result.removeElementAtIndex(indexToRemove)\n })\n return result\n }\n \n \n routeByRemovingComponentNamed(componentName: string) {\n const result = this.copy()\n const componentIndex = result.findIndex(function (component, index) {\n return (component.name == componentName)\n })\n if (componentIndex != -1) {\n result.splice(componentIndex, 1)\n }\n return result\n }\n \n \n routeByRemovingParameterInComponent(componentName: string, parameterName: string, removeComponentIfEmpty = NO) {\n let result = this.copy()\n let parameters = result.componentWithName(componentName)?.parameters ?? {}\n delete parameters[parameterName]\n result = result.routeWithComponent(componentName, parameters)\n if (removeComponentIfEmpty && Object.keys(parameters).length == 0) {\n result = result.routeByRemovingComponentNamed(componentName)\n }\n return result\n }\n \n routeBySettingParameterInComponent(componentName: string, parameterName: string, valueToSet: string) {\n let result = this.copy()\n if (IS_NIL(valueToSet) || IS_NIL(parameterName)) {\n return result\n }\n let parameters = result.componentWithName(componentName)?.parameters\n if (IS_NOT(parameters)) {\n parameters = {}\n }\n parameters[parameterName] = valueToSet\n result = result.routeWithComponent(componentName, parameters)\n return result\n }\n \n \n routeWithViewControllerComponent<T extends typeof UIViewController>(\n viewController: T,\n parameters: UIRouteParameters<{ [P in keyof T[\"ParameterIdentifierName\"]]: string }>,\n extendParameters: boolean = NO\n ) {\n \n return this.routeWithComponent(viewController.routeComponentName, parameters, extendParameters)\n \n }\n \n routeWithComponent(name: string, parameters: UIRouteParameters, extendParameters: boolean = NO) {\n \n const result = this.copy()\n let component = result.componentWithName(name)\n if (IS_NOT(component)) {\n component = {\n name: name,\n parameters: {}\n }\n result.push(component)\n }\n \n if (IS_NOT(parameters)) {\n \n parameters = {}\n \n }\n \n if (extendParameters) {\n component.parameters = Object.assign(component.parameters, parameters)\n }\n else {\n component.parameters = parameters\n }\n \n return result\n \n }\n \n navigateBySettingComponent(name: string, parameters: UIRouteParameters, extendParameters: boolean = NO) {\n \n return this.routeWithComponent(name, parameters, extendParameters).apply()\n \n }\n \n \n componentWithViewController<T extends typeof UIViewController>(viewController: T): UIRouteComponent<{ [P in ValueOf<T[\"ParameterIdentifierName\"]>]: string }> | undefined {\n \n return this.componentWithName(viewController.routeComponentName)\n \n }\n \n componentWithName(name: string): UIRouteComponent | undefined {\n let result\n this.forEach(function (component, index, self) {\n if (component.name == name) {\n result = component\n }\n })\n return result\n }\n \n \n get linkRepresentation() {\n return \"#\" + this.stringRepresentation\n }\n \n \n get stringRepresentation() {\n \n let result = \"\"\n this.forEach(function (component, index, self) {\n result = result + component.name\n const parameters = component.parameters\n result = result + \"[\"\n Object.keys(parameters).forEach(function (key, index, keys) {\n if (index) {\n result = result + \",\"\n }\n result = result + encodeURIComponent(key) + \":\" + encodeURIComponent(parameters[key])\n })\n result = result + \"]\"\n })\n \n return result\n \n }\n \n \n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["targetHistoryPosition", "index"]
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "uicore-ts",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.388",
|
|
4
4
|
"description": "UICore is a library to build native-like user interfaces using pure Typescript. No HTML is needed at all. Components are described as TS classes and all user interactions are handled explicitly. This library is strongly inspired by the UIKit framework that is used in IOS. In addition, UICore has tools to handle URL based routing, array sorting and filtering and adds a number of other utilities for convenience.",
|
|
5
5
|
"main": "compiledScripts/index.js",
|
|
6
6
|
"types": "compiledScripts/index.d.ts",
|
package/scripts/UIRoute.ts
CHANGED
|
@@ -338,6 +338,7 @@ export class UIRoute extends Array<UIRouteComponent> {
|
|
|
338
338
|
targetHistoryPosition = targetHistoryPosition + 1
|
|
339
339
|
}
|
|
340
340
|
UIRoute._recordPresentedRouteAtHistoryPosition(targetRoute, targetHistoryPosition)
|
|
341
|
+
reapplyCurrentRoute()
|
|
341
342
|
return
|
|
342
343
|
|
|
343
344
|
}
|
|
@@ -356,11 +357,13 @@ export class UIRoute extends Array<UIRouteComponent> {
|
|
|
356
357
|
untaggedHistoryPosition = untaggedHistoryPosition + 1
|
|
357
358
|
}
|
|
358
359
|
UIRoute._recordPresentedRouteAtHistoryPosition(targetRoute, untaggedHistoryPosition)
|
|
360
|
+
reapplyCurrentRoute()
|
|
359
361
|
return
|
|
360
362
|
|
|
361
363
|
}
|
|
362
364
|
if (targetHistoryPosition === UIRoute._presentedHistoryPosition) {
|
|
363
365
|
UIRoute._recordPresentedRouteAtHistoryPosition(targetRoute, targetHistoryPosition)
|
|
366
|
+
reapplyCurrentRoute()
|
|
364
367
|
return
|
|
365
368
|
}
|
|
366
369
|
|