fix: scroll to hash

closes #550
roxiness · Apr 7, 2024 · 9d693d5 · 9d693d5
1 parent d1decc0
commit 9d693d5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/lib/runtime/Router/urlReflectors/Address.js b/lib/runtime/Router/urlReflectors/Address.js
@@ -39,7 +39,7 @@ export class AddressReflector extends BaseReflector {
         this._popstateHandler = event =>
             router.url.pop(
                 urlFromBrowser(router),
-                event.state.routify?.router[router.name],
+                event.state?.routify?.router[router.name],
             )
     }
 

diff --git a/lib/runtime/plugins/scroller/ScrollContext.js b/lib/runtime/plugins/scroller/ScrollContext.js
@@ -35,12 +35,11 @@ export class ScrollContext {
 
         this.scrollTarget = anchor || parent
 
-        const hashElem =
-            ctx.route?.hash && globalThis.document?.getElementById(ctx.route?.hash)
-
+        const hash = ctx.route?.sourceUrl.hash.slice(1)
+        const hashElem = hash && globalThis.document?.getElementById(hash)
         this.elem = hashElem || this.scrollTarget
 
-        this.shouldScrollToElem = ctx.isInline || ctx.route?.hash
+        this.shouldScrollToElem = ctx.isInline || hashElem
 
         this.isInstant = ctx.route?.state.dontsmoothscroll || !ctx.wasVisible
 

diff --git a/lib/runtime/plugins/scroller/ScrollDecorator.svelte b/lib/runtime/plugins/scroller/ScrollDecorator.svelte
@@ -9,7 +9,7 @@
     isRoot
 
     const routeHasHashAndWeAreAtTheLeaf = route =>
-        route.hash && route.leaf === context.fragment
+        route.sourceUrl.hash && route.leaf === context.fragment
 
     const contextLineageIsActive = () =>
         getLineage(context).every(ctx => get(ctx.isActive))