Fixed edge case with anchor links when using instant navigation

squidfunk · May 15, 2024 · 485fa76 · 485fa76
1 parent d68db58
commit 485fa76
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/...assets/javascripts/bundle.5cfa9459.min.js → ...assets/javascripts/bundle.7c1205d0.min.js b/...assets/javascripts/bundle.5cfa9459.min.js → ...assets/javascripts/bundle.7c1205d0.min.js
diff --git a/...ts/javascripts/bundle.5cfa9459.min.js.map → ...ts/javascripts/bundle.7c1205d0.min.js.map b/...ts/javascripts/bundle.5cfa9459.min.js.map → ...ts/javascripts/bundle.7c1205d0.min.js.map
diff --git a/material/templates/base.html b/material/templates/base.html
@@ -249,7 +249,7 @@
       </script>
     {% endblock %}
     {% block scripts %}
-      <script src="{{ 'assets/javascripts/bundle.5cfa9459.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.7c1205d0.min.js' | url }}"></script>
       {% for script in config.extra_javascript %}
         {{ script | script_tag }}
       {% endfor %}

diff --git a/src/templates/assets/javascripts/integrations/instant/index.ts b/src/templates/assets/javascripts/integrations/instant/index.ts
@@ -370,10 +370,11 @@ export function setupInstantNavigation(
     // the scroll restoration to the current page, as we don't need to restore
     // the viewport offset when the user navigates to a different page, as this
     // is already handled by the previous observable.
-    location$.pipe(
+    document$.pipe(
+      switchMap(() => location$),
       distinctUntilKeyChanged("pathname"),
       switchMap(() => location$),
-      distinctUntilKeyChanged("hash"),
+      distinctUntilKeyChanged("hash")
     ),
 
     // Handle instant navigation events that are triggered by the user clicking