@motifx/core 1.2.0-rc.0 → 1.2.0-rc.2

package/dist/chunks/{core-vVL0WG0n.esm.js → core-C5z0P3iY.esm.js}

@@ -9161,6 +9161,7 @@ class ScrollMemory {
     viewport;
     positions = new Map();
     currentKey = '';
+    currentPath = null;
     visited = false;
     restoring = false;
     cancelFrame = null;
@@ -9192,11 +9193,13 @@ class ScrollMemory {
         this.remember(this.currentKey, this.viewport.scrollTop());
         this.persist();
     }
-    arrived(uri) {
+    arrived(uri, direction) {
         this.visited = true;
         const { path, hash } = splitUri(uri);
+        const inPage = !!hash && path === this.currentPath && (direction === 'push' || direction === 'replace' || direction === 'traverse');
+        this.currentPath = path;
         this.currentKey = this.keyOf(path);
-        this.restore(this.currentKey, this.options.anchor === false ? '' : hash || (this.locationAnchor ? locationHash() : ''));
+        this.restore(this.currentKey, this.options.anchor === false ? '' : hash || (this.locationAnchor ? locationHash() : ''), inPage);
     }
     saved(key) {
         return this.positions.get(this.keyOf(splitUri(key).path)) ?? 0;
@@ -9223,7 +9226,7 @@ class ScrollMemory {
             this.positions.delete(oldest.value);
         }
     }
-    restore(key, anchor) {
+    restore(key, anchor, follow) {
         this.cancelRestore();
         const target = this.positions.get(key) ?? 0;
         if (!anchor && target <= 0) {
@@ -9236,7 +9239,7 @@ class ScrollMemory {
         const startedAt = Date.now();
         const attempt = () => {
             this.cancelFrame = null;
-            const done = anchor ? this.viewport.scrollToAnchor(anchor) : this.reached(target);
+            const done = anchor ? this.viewport.scrollToAnchor(anchor, follow) : this.reached(target);
             if (done || Date.now() - startedAt >= settleMs) {
                 this.cancelRestore();
                 this.remember(key, this.viewport.scrollTop());
@@ -9328,16 +9331,30 @@ function windowViewport() {
         },
         scrollTo: (top) => {
             try {
-                window.scrollTo(0, top);
+                window.scrollTo({ top, behavior: 'instant' });
+            }
+            catch {
+                try {
+                    window.scrollTo(0, top);
+                }
+                catch { }
             }
-            catch { }
         },
-        scrollToAnchor: (id) => {
+        scrollToAnchor: (id, follow) => {
             try {
                 const node = document.getElementById(id);
                 if (!node)
                     return false;
-                node.scrollIntoView();
+                if (follow)
+                    node.scrollIntoView();
+                else {
+                    try {
+                        node.scrollIntoView({ behavior: 'instant' });
+                    }
+                    catch {
+                        node.scrollIntoView();
+                    }
+                }
                 return true;
             }
             catch {
@@ -9374,11 +9391,16 @@ function containerViewport(container) {
                 return;
             }
             try {
-                el.scrollTop = top;
+                el.scrollTo({ top, behavior: 'instant' });
+            }
+            catch {
+                try {
+                    el.scrollTop = top;
+                }
+                catch { }
             }
-            catch { }
         },
-        scrollToAnchor: (id) => fallback.scrollToAnchor(id),
+        scrollToAnchor: (id, follow) => fallback.scrollToAnchor(id, follow),
     };
 }
 /** `/docs/x#bolum` → `{ path: '/docs/x', hash: 'bolum' }`. */
@@ -11232,7 +11254,7 @@ class UrlRoutingModule {
                 const h = w?.location?.hash || '';
                 return h && h.startsWith('#') ? h.slice(1) || '/' : '/';
             }
-            return (w?.location?.pathname || '/') + (w?.location?.search || '');
+            return (w?.location?.pathname || '/') + (w?.location?.search || '') + (w?.location?.hash || '');
         }
         catch {
             return '/';
@@ -11507,7 +11529,7 @@ class UrlRoutingModule {
             }
             const snapshotOf = (result) => ({
                 target: result,
-                chain: result.chain.map(r => this.routingEngine.generatePathString(r.path, result.params) || ''),
+                chain: this.chainOf(result),
                 direction,
                 state: entryState,
             });
@@ -11551,7 +11573,7 @@ class UrlRoutingModule {
                 this._handleScrollBehavior(navOptions.scroll);
             }
             else {
-                this._scroll?.arrived(this._uriWithHash(appliedPath, uri));
+                this._scroll?.arrived(this._uriWithHash(appliedPath, uri), direction);
             }
             this.application.fire?.('motifjs-router-navigated', {
                 uri: appliedPath,
@@ -11733,6 +11755,9 @@ class UrlRoutingModule {
         }
         return { proceed, uri: urix };
     }
+    chainOf(result) {
+        return result.chain.map(r => this.routingEngine.generatePathString(r.path, result.params) || '');
+    }
     resolve(uri) {
         const candidates = [];
         const pageSearch = this._pageSearch();
@@ -11930,8 +11955,14 @@ class UrlRoutingModule {
                 return;
             }
             if (w?.history && typeof w.history.pushState === 'function') {
-                const current = (w.location.pathname || '/') + (w.location.search || '');
-                if (current !== uri) {
+                const current = (w.location.pathname || '/') + (w.location.search || '') + (w.location.hash || '');
+                let wanted = uri;
+                try {
+                    const url = new URL(uri, w.location.href);
+                    wanted = url.pathname + url.search + url.hash;
+                }
+                catch { }
+                if (current !== wanted) {
                     if (options.replace) {
                         const stamp = this._nextHistoryStamp(false);
                         w.history.replaceState(this._routerState(options.state, stamp), '', uri);
@@ -12116,15 +12147,19 @@ function createRouter(state, module) {
             return module()?.routeInfos() ?? [];
         },
         navigate: async (uri, options) => {
-            await required().navigate(uri, options);
+            return await required().navigate(uri, options);
         },
         navigateByName: async (name, params, options) => {
-            await required().navigateByName(name, params, options);
+            return await required().navigateByName(name, params, options);
         },
         evict: async (route) => {
             await required().evict(route);
         },
-        resolve: (uri) => required().resolve(uri),
+        resolve: (uri) => {
+            const current = required();
+            const result = current.resolve(uri);
+            return { chain: current.chainOf(result), result };
+        },
         href: (name, params) => required().href(name, params),
     };
 }
@@ -12530,4 +12565,4 @@ function useApplication() {
 }
 
 export { useApplication as $, Application as A, ErrorHandler as B, Component as C, Disposable as D, Emitter as E, FNComponent as F, FragmentNode as G, Frame as H, inject as I, LazyComputed as J, LinkedList as K, Lazy as L, MotifError as M, motifCompiled as N, motifComponent as O, motifFragment as P, NodeTypes as Q, reactive as R, RouterView as S, safeCall as T, safeCallAsync as U, safeCallSilent as V, ServiceCollection as W, ServiceProvider as X, setUnexpectedErrorHandler as Y, Signal as Z, toDisposable as _, reportError as a, useModel as a0, useNavigation as a1, debugGetDeps as a2, debugGetDepMap as a3, UrlRoutingModule as a4, RoutingEngine as a5, RouterState as a6, createRouter as a7, Scanner as a8, RouteCollection as a9, ComponentBase as b, contentBlocks as c, autoRegistry as d, effect as e, findAppendableComponent$1 as f, formatMotifMessage as g, ApplicationBuilder as h, asyncTracking as i, clearModel as j, ComponentMotif as k, Computed as l, motifError as m, notifyDeactivated as n, configureReactivityLeakMonitor as o, ControlCollection as p, createComputed as q, reportWarning as r, createLazyComputed as s, createSignal as t, untracked as u, deepClone as v, disposableCore as w, DisposableStore as x, dom as y, errorHandler as z };
-//# sourceMappingURL=core-vVL0WG0n.esm.js.map
+//# sourceMappingURL=core-C5z0P3iY.esm.js.map