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

package/dist/index.umd.js

@@ -10258,6 +10258,7 @@
 	    viewport;
 	    positions = new Map();
 	    currentKey = '';
+	    currentPath = null;
 	    visited = false;
 	    restoring = false;
 	    cancelFrame = null;
@@ -10289,11 +10290,13 @@
 	        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;
@@ -10320,7 +10323,7 @@
 	            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) {
@@ -10333,7 +10336,7 @@
 	        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());
@@ -10425,16 +10428,30 @@
 	        },
 	        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 {
@@ -10471,11 +10488,16 @@
 	                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' }`. */
@@ -12369,7 +12391,7 @@
 	                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 '/';
@@ -12644,7 +12666,7 @@
 	            }
 	            const snapshotOf = (result) => ({
 	                target: result,
-	                chain: result.chain.map(r => this.routingEngine.generatePathString(r.path, result.params) || ''),
+	                chain: this.chainOf(result),
 	                direction,
 	                state: entryState,
 	            });
@@ -12688,7 +12710,7 @@
 	                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,
@@ -12870,6 +12892,9 @@
 	        }
 	        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();
@@ -13067,8 +13092,14 @@
 	                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);
@@ -13253,15 +13284,19 @@
 	            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),
 	    };
 	}