Fixed #2703: search remains at 'Initializing search' on mobile

squidfunk · May 27, 2021 · 409d151 · 409d151
1 parent bcbe242
commit 409d151
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 12 deletions.
diff --git a/...assets/javascripts/bundle.a6b08407.min.js → ...assets/javascripts/bundle.70ffd0a1.min.js b/...assets/javascripts/bundle.a6b08407.min.js → ...assets/javascripts/bundle.70ffd0a1.min.js
diff --git a/...ts/javascripts/bundle.a6b08407.min.js.map → ...ts/javascripts/bundle.70ffd0a1.min.js.map b/...ts/javascripts/bundle.a6b08407.min.js.map → ...ts/javascripts/bundle.70ffd0a1.min.js.map
diff --git a/material/assets/stylesheets/main.10e03543.min.css b/material/assets/stylesheets/main.10e03543.min.css
diff --git a/material/assets/stylesheets/main.10e03543.min.css.map b/material/assets/stylesheets/main.10e03543.min.css.map
diff --git a/material/assets/stylesheets/main.66ec5ba4.min.css b/material/assets/stylesheets/main.66ec5ba4.min.css
diff --git a/material/assets/stylesheets/main.66ec5ba4.min.css.map b/material/assets/stylesheets/main.66ec5ba4.min.css.map
diff --git a/material/base.html b/material/base.html
@@ -39,7 +39,7 @@
       {% endif %}
     {% endblock %}
     {% block styles %}
-      <link rel="stylesheet" href="{{ 'assets/stylesheets/main.10e03543.min.css' | url }}">
+      <link rel="stylesheet" href="{{ 'assets/stylesheets/main.66ec5ba4.min.css' | url }}">
       {% if config.theme.palette %}
         {% set palette = config.theme.palette %}
         <link rel="stylesheet" href="{{ 'assets/stylesheets/palette.f1a3b89f.min.css' | url }}">
@@ -223,7 +223,7 @@ <h1>{{ page.title | d(config.site_name, true)}}</h1>
       </script>
     {% endblock %}
     {% block scripts %}
-      <script src="{{ 'assets/javascripts/bundle.a6b08407.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.70ffd0a1.min.js' | url }}"></script>
       {% for path in config["extra_javascript"] %}
         <script src="{{ path | url }}"></script>
       {% endfor %}

diff --git a/src/assets/javascripts/components/search/result/index.ts b/src/assets/javascripts/components/search/result/index.ts
@@ -35,6 +35,7 @@ import {
   observeOn,
   startWith,
   switchMap,
+  take,
   tap,
   withLatestFrom,
   zipWith
@@ -53,6 +54,7 @@ import {
 import {
   SearchResult as SearchResultData,
   SearchWorker,
+  isSearchReadyMessage,
   isSearchResultMessage
 } from "~/integrations"
 import { renderSearchResult } from "~/templates"
@@ -107,8 +109,21 @@ export function mountSearchResult(
       filter(Boolean)
     )
 
-  /* Update search result metadata */
+  /* Retrieve nested components */
   const meta = getElementOrThrow(":scope > :first-child", el)
+  const list = getElementOrThrow(":scope > :last-child", el)
+
+  /* Update search result metadata when ready */
+  rx$
+    .pipe(
+      filter(isSearchReadyMessage),
+      take(1)
+    )
+      .subscribe(() => {
+        resetSearchResultMeta(meta)
+      })
+
+  /* Update search result metadata */
   internal$
     .pipe(
       observeOn(animationFrameScheduler),
@@ -122,7 +137,6 @@ export function mountSearchResult(
       })
 
   /* Update search result list */
-  const list = getElementOrThrow(":scope > :last-child", el)
   internal$
     .pipe(
       observeOn(animationFrameScheduler),