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

package/dist/chunks/{core-SS-LXi1V.cjs → core-CX1Sz73P.cjs}

@@ -9163,6 +9163,7 @@ class ScrollMemory {
     viewport;
     positions = new Map();
     currentKey = '';
+    currentPath = null;
     visited = false;
     restoring = false;
     cancelFrame = null;
@@ -9194,11 +9195,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;
@@ -9225,7 +9228,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) {
@@ -9238,7 +9241,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());
@@ -9330,16 +9333,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 {
@@ -9376,11 +9393,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' }`. */
@@ -11234,7 +11256,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 '/';
@@ -11509,7 +11531,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,
             });
@@ -11553,7 +11575,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,
@@ -11735,6 +11757,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();
@@ -11932,8 +11957,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);
@@ -12118,15 +12149,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),
     };
 }
@@ -12594,4 +12629,4 @@ exports.untracked = untracked;
 exports.useApplication = useApplication;
 exports.useModel = useModel;
 exports.useNavigation = useNavigation;
-//# sourceMappingURL=core-SS-LXi1V.cjs.map
+//# sourceMappingURL=core-CX1Sz73P.cjs.map