treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix search popout including full-text search instructions when full-text search is disabled (#26755)

lolsob-rspec
Claire 2023-09-01 15:13:27 +02:00 committed by GitHub
parent 5cf3e206bb
commit 20913b52bb
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/mastodon/features/compose/components/search.jsx
View File

@ -80,7 +80,7 @@ class Search extends PureComponent {
handleKeyDown = (e) => { handleKeyDown = (e) => {
const { selectedOption } = this.state; const { selectedOption } = this.state;
const options = this._getOptions().concat(this.defaultOptions); const options = searchEnabled ? this._getOptions().concat(this.defaultOptions) : this._getOptions();
switch(e.key) { switch(e.key) {
case 'Escape': case 'Escape':
@ -353,6 +353,8 @@ class Search extends PureComponent {
</> </>
)} )}
{searchEnabled && (
<>
<h4><FormattedMessage id='search_popout.options' defaultMessage='Search options' /></h4> <h4><FormattedMessage id='search_popout.options' defaultMessage='Search options' /></h4>
<div className='search__popout__menu'> <div className='search__popout__menu'>
@ -362,6 +364,8 @@ class Search extends PureComponent {
</button> </button>
))} ))}
</div> </div>
</>
)}
</div> </div>
</div> </div>
); );