From 6c4c72497a5722870e4432ef41dd4c9ec36a8928 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 1 Sep 2023 15:13:27 +0200
Subject: [PATCH] Fix search popout including full-text search instructions
when full-text search is disabled (#26755)
---
.../features/compose/components/search.jsx | 22 +++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/app/javascript/mastodon/features/compose/components/search.jsx b/app/javascript/mastodon/features/compose/components/search.jsx
index 1c629bcbb4..848b812632 100644
--- a/app/javascript/mastodon/features/compose/components/search.jsx
+++ b/app/javascript/mastodon/features/compose/components/search.jsx
@@ -80,7 +80,7 @@ class Search extends PureComponent {
handleKeyDown = (e) => {
const { selectedOption } = this.state;
- const options = this._getOptions().concat(this.defaultOptions);
+ const options = searchEnabled ? this._getOptions().concat(this.defaultOptions) : this._getOptions();
switch(e.key) {
case 'Escape':
@@ -353,15 +353,19 @@ class Search extends PureComponent {
</>
)}
- <h4><FormattedMessage id='search_popout.options' defaultMessage='Search options' /></h4>
+ {searchEnabled && (
+ <>
+ <h4><FormattedMessage id='search_popout.options' defaultMessage='Search options' /></h4>
- <div className='search__popout__menu'>
- {this.defaultOptions.map(({ key, label, action }, i) => (
- <button key={key} onMouseDown={action} className={classNames('search__popout__menu__item', { selected: selectedOption === (options.length + i) })}>
- {label}
- </button>
- ))}
- </div>
+ <div className='search__popout__menu'>
+ {this.defaultOptions.map(({ key, label, action }, i) => (
+ <button key={key} onMouseDown={action} className={classNames('search__popout__menu__item', { selected: selectedOption === (options.length + i) })}>
+ {label}
+ </button>
+ ))}
+ </div>
+ </>
+ )}
</div>
</div>
);
--
GitLab