Skip to content

Commit 409d151

Browse files
committed
Fixed #2703: search remains at 'Initializing search' on mobile
1 parent bcbe242 commit 409d151

File tree

8 files changed

+26
-12
lines changed

8 files changed

+26
-12
lines changed

material/assets/javascripts/bundle.a6b08407.min.js renamed to material/assets/javascripts/bundle.70ffd0a1.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/assets/javascripts/bundle.a6b08407.min.js.map renamed to material/assets/javascripts/bundle.70ffd0a1.min.js.map

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/assets/stylesheets/main.10e03543.min.css

-2
This file was deleted.

material/assets/stylesheets/main.10e03543.min.css.map

-1
This file was deleted.

material/assets/stylesheets/main.66ec5ba4.min.css

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/assets/stylesheets/main.66ec5ba4.min.css.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/base.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
{% endif %}
4040
{% endblock %}
4141
{% block styles %}
42-
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.10e03543.min.css' | url }}">
42+
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.66ec5ba4.min.css' | url }}">
4343
{% if config.theme.palette %}
4444
{% set palette = config.theme.palette %}
4545
<link rel="stylesheet" href="{{ 'assets/stylesheets/palette.f1a3b89f.min.css' | url }}">
@@ -223,7 +223,7 @@ <h1>{{ page.title | d(config.site_name, true)}}</h1>
223223
</script>
224224
{% endblock %}
225225
{% block scripts %}
226-
<script src="{{ 'assets/javascripts/bundle.a6b08407.min.js' | url }}"></script>
226+
<script src="{{ 'assets/javascripts/bundle.70ffd0a1.min.js' | url }}"></script>
227227
{% for path in config["extra_javascript"] %}
228228
<script src="{{ path | url }}"></script>
229229
{% endfor %}

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

+16-2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import {
3535
observeOn,
3636
startWith,
3737
switchMap,
38+
take,
3839
tap,
3940
withLatestFrom,
4041
zipWith
@@ -53,6 +54,7 @@ import {
5354
import {
5455
SearchResult as SearchResultData,
5556
SearchWorker,
57+
isSearchReadyMessage,
5658
isSearchResultMessage
5759
} from "~/integrations"
5860
import { renderSearchResult } from "~/templates"
@@ -107,8 +109,21 @@ export function mountSearchResult(
107109
filter(Boolean)
108110
)
109111

110-
/* Update search result metadata */
112+
/* Retrieve nested components */
111113
const meta = getElementOrThrow(":scope > :first-child", el)
114+
const list = getElementOrThrow(":scope > :last-child", el)
115+
116+
/* Update search result metadata when ready */
117+
rx$
118+
.pipe(
119+
filter(isSearchReadyMessage),
120+
take(1)
121+
)
122+
.subscribe(() => {
123+
resetSearchResultMeta(meta)
124+
})
125+
126+
/* Update search result metadata */
112127
internal$
113128
.pipe(
114129
observeOn(animationFrameScheduler),
@@ -122,7 +137,6 @@ export function mountSearchResult(
122137
})
123138

124139
/* Update search result list */
125-
const list = getElementOrThrow(":scope > :last-child", el)
126140
internal$
127141
.pipe(
128142
observeOn(animationFrameScheduler),

0 commit comments

Comments
 (0)