Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Force-hide autocomplete after sending message. #489

Merged
merged 2 commits into from
Sep 22, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/components/views/rooms/Autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ export default class Autocomplete extends React.Component {
super(props);

this.completionPromise = null;
this.onConfirm = this.onConfirm.bind(this);
this.hide = this.hide.bind(this);
this.onCompletionClicked = this.onCompletionClicked.bind(this);

this.state = {
// list of completionResults, each containing completions
Expand Down Expand Up @@ -137,6 +138,10 @@ export default class Autocomplete extends React.Component {
e.preventDefault();

// selectionOffset = 0, so we don't end up completing when autocomplete is hidden
this.hide();
}

hide() {
this.setState({hide: true, selectionOffset: 0});
}

Expand All @@ -152,16 +157,13 @@ export default class Autocomplete extends React.Component {
return done.promise;
}

/** called from MessageComposerInput
* @returns {boolean} whether confirmation was handled
*/
onConfirm(): boolean {
onCompletionClicked(): boolean {
if (this.countCompletions() === 0 || this.state.selectionOffset === COMPOSER_SELECTED) {
return false;
}

let selectedCompletion = this.state.completionList[this.state.selectionOffset - 1];
this.props.onConfirm(selectedCompletion.range, selectedCompletion.completion);
this.props.onConfirm(this.state.completionList[this.state.selectionOffset - 1]);
this.hide();

return true;
}
Expand Down Expand Up @@ -199,7 +201,7 @@ export default class Autocomplete extends React.Component {
let onMouseOver = () => this.setSelection(componentPosition);
let onClick = () => {
this.setSelection(componentPosition);
this.onConfirm();
this.onCompletionClicked();
};

return React.cloneElement(completion.component, {
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/rooms/MessageComposer.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export default class MessageComposer extends React.Component {

_tryComplete(): boolean {
if (this.refs.autocomplete) {
return this.refs.autocomplete.onConfirm();
return this.refs.autocomplete.onCompletionClicked();
}
return false;
}
Expand Down
2 changes: 2 additions & 0 deletions src/components/views/rooms/MessageComposerInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,8 @@ export default class MessageComposerInput extends React.Component {
editorState: this.createEditorState(),
});

this.autocomplete.hide();

return true;
}

Expand Down