Fixed closing of search results on anchor jump

squidfunk · Mar 12, 2020 · c0abaf5 · c0abaf5
1 parent 566b136
commit c0abaf5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 21 deletions.
diff --git a/...assets/javascripts/bundle.63b8430f.min.js → ...assets/javascripts/bundle.21a66646.min.js b/...assets/javascripts/bundle.63b8430f.min.js → ...assets/javascripts/bundle.21a66646.min.js
diff --git a/material/assets/javascripts/bundle.21a66646.min.js.map b/material/assets/javascripts/bundle.21a66646.min.js.map
diff --git a/material/assets/javascripts/bundle.63b8430f.min.js.map b/material/assets/javascripts/bundle.63b8430f.min.js.map
diff --git a/material/assets/manifest.json b/material/assets/manifest.json
@@ -1,6 +1,6 @@
 {
-  "assets/javascripts/bundle.js": "assets/javascripts/bundle.63b8430f.min.js",
-  "assets/javascripts/bundle.js.map": "assets/javascripts/bundle.63b8430f.min.js.map",
+  "assets/javascripts/bundle.js": "assets/javascripts/bundle.21a66646.min.js",
+  "assets/javascripts/bundle.js.map": "assets/javascripts/bundle.21a66646.min.js.map",
   "assets/javascripts/vendor.js": "assets/javascripts/vendor.b0b43276.min.js",
   "assets/javascripts/vendor.js.map": "assets/javascripts/vendor.b0b43276.min.js.map",
   "assets/javascripts/worker/search.js": "assets/javascripts/worker/search.784c5235.min.js",

diff --git a/material/base.html b/material/base.html
@@ -178,7 +178,7 @@ <h1>{{ page.title | default(config.site_name, true)}}</h1>
     {% endblock %}
     {% block scripts %}
       <script src="{{ 'assets/javascripts/vendor.b0b43276.min.js' | url }}"></script>
-      <script src="{{ 'assets/javascripts/bundle.63b8430f.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.21a66646.min.js' | url }}"></script>
       {%- set translations = {} -%}
       {%- for key in [
         "clipboard.copy",

diff --git a/src/assets/javascripts/index.ts b/src/assets/javascripts/index.ts
@@ -57,7 +57,8 @@ import {
   watchLocationHash,
   watchViewport,
   isLocationInternal,
-  isLocationAnchor
+  isLocationAnchor,
+  setLocationHash
 } from "./browser"
 import { setupSearchWorker } from "./workers"
 
@@ -270,20 +271,12 @@ export function initialize(config: unknown) {
   /* ----------------------------------------------------------------------- */
 
   // // put into search...
-  // hash$
-  //   .pipe(
-  //     switchMap(hash => useToggle("search")
-  //       .pipe(
-  //         filter(x => x.checked), // only active
-  //         tap(toggle => setToggle(toggle, false)),
-  //         delay(125), // ensure that it runs after the body scroll reset...
-  //         mapTo(hash)
-  //       )
-  //     )
-  //   )
-  //     .subscribe(hash => {
-  //       getElement(`[id="${hash}"]`)!.scrollIntoView()
-  //     })
+  hash$
+    .pipe(
+      tap(() => setToggle("search", false)),
+      delay(125), // ensure that it runs after the body scroll reset...
+    )
+      .subscribe(hash => setLocationHash(`#${hash}`)) // TODO: must be unified
 
   // Scroll lock // document -> document$ => { body } !?
   // put into search...