Fixed race condition ehen displaying search result metadata

Author: squidfunk

material/assets/javascripts/bundle.39a44d95.min.js renamed to material/assets/javascripts/bundle.bc35569b.min.js

@@ -225,7 +225,7 @@ <h1>{{ page.title | d(config.site_name, true)}}</h1>
       </script>
     {% endblock %}
     {% block scripts %}
-      <script src="{{ 'assets/javascripts/bundle.39a44d95.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.bc35569b.min.js' | url }}"></script>
       {% for path in config["extra_javascript"] %}
         <script src="{{ path | url }}"></script>
       {% endfor %}

material/assets/javascripts/bundle.39a44d95.min.js.map renamed to material/assets/javascripts/bundle.bc35569b.min.js.map

@@ -107,12 +107,8 @@ export function mountSearch(
     tx$
       .pipe(
         filter(isSearchQueryMessage),
-        sample(rx$
-          .pipe(
-            filter(isSearchReadyMessage),
-            take(1)
-          )
-        )
+        sample(rx$.pipe(filter(isSearchReadyMessage))),
+        take(1)
       )
         .subscribe(tx$.next.bind(tx$))
 

material/base.html

@@ -33,6 +33,7 @@ import {
   finalize,
   map,
   observeOn,
+  skipUntil,
   switchMap,
   take,
   tap,
@@ -102,20 +103,18 @@ export function mountSearchResult(
   const list = getElementOrThrow(":scope > :last-child", el)
 
   /* Update search result metadata when ready */
-  rx$
+  const ready$ = rx$
     .pipe(
       filter(isSearchReadyMessage),
       take(1)
     )
-      .subscribe(() => {
-        resetSearchResultMeta(meta)
-      })
 
   /* Update search result metadata */
   internal$
     .pipe(
       observeOn(animationFrameScheduler),
-      withLatestFrom(query$)
+      withLatestFrom(query$),
+      skipUntil(ready$)
     )
       .subscribe(([{ items }, { value }]) => {
         if (value)

src/assets/javascripts/components/search/_/index.ts

@@ -127,10 +127,10 @@ export function setupSearchWorker(
   /* Set up search index */
   from(index)
     .pipe(
-      map<SearchIndex, SearchSetupMessage>(data => ({
+      map(data => ({
         type: SearchMessageType.SETUP,
         data: setupSearchIndex(data)
-      }))
+      } as SearchSetupMessage))
     )
       .subscribe(tx$.next.bind(tx$))