From 0a3fa034fc66246dbf9dfb4627a983e0903042d4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 6 May 2021 02:11:43 +0200
Subject: [PATCH] Fix "You might be interested in" flashing while searching in
web UI (#16162)
---
app/javascript/mastodon/actions/search.js | 1 +
.../features/compose/components/search_results.js | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/app/javascript/mastodon/actions/search.js b/app/javascript/mastodon/actions/search.js
index a178faeadd..37560a74cb 100644
--- a/app/javascript/mastodon/actions/search.js
+++ b/app/javascript/mastodon/actions/search.js
@@ -32,6 +32,7 @@ export function submitSearch() {
const value = getState().getIn(['search', 'value']);
if (value.length === 0) {
+ dispatch(fetchSearchSuccess({ accounts: [], statuses: [], hashtags: [] }, ''));
return;
}
diff --git a/app/javascript/mastodon/features/compose/components/search_results.js b/app/javascript/mastodon/features/compose/components/search_results.js
index a8b31b677b..958a65286b 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.js
+++ b/app/javascript/mastodon/features/compose/components/search_results.js
@@ -33,6 +33,12 @@ class SearchResults extends ImmutablePureComponent {
}
}
+ componentDidUpdate () {
+ if (this.props.searchTerm === '') {
+ this.props.fetchSuggestions();
+ }
+ }
+
handleLoadMoreAccounts = () => this.props.expandSearch('accounts');
handleLoadMoreStatuses = () => this.props.expandSearch('statuses');
@@ -42,7 +48,7 @@ class SearchResults extends ImmutablePureComponent {
render () {
const { intl, results, suggestions, dismissSuggestion, searchTerm } = this.props;
- if (results.isEmpty() && !suggestions.isEmpty()) {
+ if (searchTerm === '' && !suggestions.isEmpty()) {
return (
<div className='search-results'>
<div className='trends'>