Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made tweaks to avoid having two queries in the state

pull/2329/head
Laurent Cozic 2020-01-24 10:05:17 +00:00 committed by mic074b
parent d8f91a2ece
commit d1b51b409a
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ElectronClient/app/gui/NoteSearchBar.jsx
View File

@ -7,10 +7,6 @@ class NoteSearchBarComponent extends React.Component {
constructor() {
super();
this.state = {
query: '',
};
this.searchInput_change = this.searchInput_change.bind(this);
this.searchInput_keyDown = this.searchInput_keyDown.bind(this);
this.previousButton_click = this.previousButton_click.bind(this);
@ -65,7 +61,6 @@ class NoteSearchBarComponent extends React.Component {
searchInput_change(event) {
const query = event.currentTarget.value;
this.setState({ query: query });
this.triggerOnChange(query);
}
@ -121,7 +116,9 @@ class NoteSearchBarComponent extends React.Component {
let backgroundColor = theme.backgroundColor;
let buttonEnabled = true;
if (this.props.resultCount === 0 && this.props.resultQuery.length > 0) {
const query = this.props.query ? this.props.query : '';
if (this.props.resultCount === 0 && query.length > 0 && !this.props.searching) {
backgroundColor = theme.warningBackgroundColor;
buttonEnabled = false;
}
@ -136,7 +133,7 @@ class NoteSearchBarComponent extends React.Component {
color: theme.colorFaded,
backgroundColor: theme.backgroundColor,
});
const matchesFoundString = (this.props.resultQuery.length > 0 && this.props.resultCount > 0) ? (
const matchesFoundString = (query.length > 0 && this.props.resultCount > 0) ? (
<div style={textStyle}>
{`${this.props.selectedIndex + 1} / ${this.props.resultCount}`}
</div>
@ -148,7 +145,7 @@ class NoteSearchBarComponent extends React.Component {
{closeButton}
<input
placeholder={_('Search...')}
value={this.state.query}
value={query}
onChange={this.searchInput_change}
onKeyDown={this.searchInput_keyDown}
ref="searchInput"

9
ElectronClient/app/gui/NoteText.jsx
View File

@ -89,8 +89,8 @@ class NoteTextComponent extends React.Component {
this.localSearchDefaultState = {
query: '',
selectedIndex: 0,
resultQuery: '',
resultCount: 0,
searching: false,
};
this.state = {
@ -313,8 +313,8 @@ class NoteTextComponent extends React.Component {
query: query,
selectedIndex: 0,
timestamp: Date.now(),
resultQuery: this.state.localSearch.resultQuery,
resultCount: this.state.localSearch.resultCount,
searching: true,
},
});
};
@ -767,8 +767,8 @@ class NoteTextComponent extends React.Component {
reg.logger().error(s.join(':'));
} else if (msg === 'setMarkerCount') {
const ls = Object.assign({}, this.state.localSearch);
ls.resultQuery = ls.query;
ls.resultCount = arg0;
ls.searching = false;
this.setState({ localSearch: ls });
} else if (msg.indexOf('markForDownload:') === 0) {
const s = msg.split(':');
@ -2154,7 +2154,8 @@ class NoteTextComponent extends React.Component {
width: innerWidth,
borderTop: `1px solid ${theme.dividerColor}`,
}}
resultQuery={this.state.localSearch.resultQuery}
query={this.state.localSearch.query}
searching={this.state.localSearch.searching}
resultCount={this.state.localSearch.resultCount}
selectedIndex={this.state.localSearch.selectedIndex}
onChange={this.noteSearchBar_change}