self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-23 18:53:36 +02:00
Code Issues Releases Activity

Desktop: Resolves #5893: Expand search field when clicking on search button

Browse Source
This commit is contained in:
Laurent Cozic 2021-12-21 18:29:47 +01:00
parent 1ad5638ade
commit 6b6574e7c9
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/app-desktop/gui/SearchBar/SearchBar.tsx
View File

@ -7,6 +7,7 @@ import BaseModel from '@joplin/lib/BaseModel';
import uuid from '@joplin/lib/uuid';
const { connect } = require('react-redux');
import Note from '@joplin/lib/models/Note';
import { AppState } from '../../app.reducer';
const debounce = require('debounce');
const styled = require('styled-components').default;
@ -21,6 +22,7 @@ interface Props {
notesParentType: string;
dispatch?: Function;
selectedNoteId: string;
isFocused?: boolean;
}
function SearchBar(props: Props) {
@ -116,8 +118,19 @@ function SearchBar(props: Props) {
}, [onExitSearch]);
const onSearchButtonClick = useCallback(() => {
void onExitSearch();
}, [onExitSearch]);
console.info('isFocused', props.isFocused);
if (props.isFocused) {
void onExitSearch();
} else {
setSearchStarted(true);
props.inputRef.current.focus();
props.dispatch({
type: 'FOCUS_SET',
field: 'globalSearch',
});
}
}, [onExitSearch, props.isFocused]);
useEffect(() => {
if (props.notesParentType !== 'Search') {
@ -141,10 +154,11 @@ function SearchBar(props: Props) {
);
}
const mapStateToProps = (state: any) => {
const mapStateToProps = (state: AppState) => {
return {
notesParentType: state.notesParentType,
selectedNoteId: stateUtils.selectedNoteId(state),
isFocused: state.focusedField === 'globalSearch',
};
};