summaryrefslogtreecommitdiffstats
path: root/webapp/components/suggestion
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-11-10 17:00:14 -0500
committerGitHub <noreply@github.com>2016-11-10 17:00:14 -0500
commit03e3ac60c20bfc93752f9e57cdd5dec1cf397fa5 (patch)
treecff36ef60da9596059f3a94b7a7d5cdd09665727 /webapp/components/suggestion
parent2fdb33042a118831de60d96e7138209e973e0d65 (diff)
downloadchat-03e3ac60c20bfc93752f9e57cdd5dec1cf397fa5.tar.gz
chat-03e3ac60c20bfc93752f9e57cdd5dec1cf397fa5.tar.bz2
chat-03e3ac60c20bfc93752f9e57cdd5dec1cf397fa5.zip
PLT-4600 Properly clear autocomplete suggestions when suggestions are out of date (#4529)
* PLT-4600 Better clear autocomplete suggestions when suggestions are out of date * Fixed react warnings and removed an eslint ignore
Diffstat (limited to 'webapp/components/suggestion')
-rw-r--r--webapp/components/suggestion/suggestion_box.jsx13
1 files changed, 9 insertions, 4 deletions
diff --git a/webapp/components/suggestion/suggestion_box.jsx b/webapp/components/suggestion/suggestion_box.jsx
index 464e57ef2..eeae5ba28 100644
--- a/webapp/components/suggestion/suggestion_box.jsx
+++ b/webapp/components/suggestion/suggestion_box.jsx
@@ -2,7 +2,6 @@
// See License.txt for license information.
import $ from 'jquery';
-import ReactDOM from 'react-dom';
import Constants from 'utils/constants.jsx';
import * as GlobalActions from 'actions/global_actions.jsx';
@@ -37,6 +36,13 @@ export default class SuggestionBox extends React.Component {
SuggestionStore.addPretextChangedListener(this.suggestionId, this.handlePretextChanged);
}
+ componentWillReceiveProps(nextProps) {
+ // Clear any suggestions when the SuggestionBox is cleared
+ if (nextProps.value === '' && this.props.value !== nextProps.value) {
+ GlobalActions.emitClearSuggestions(this.suggestionId);
+ }
+ }
+
componentWillUnmount() {
SuggestionStore.removeCompleteWordListener(this.suggestionId, this.handleCompleteWord);
SuggestionStore.removePretextChangedListener(this.suggestionId, this.handlePretextChanged);
@@ -64,7 +70,7 @@ export default class SuggestionBox extends React.Component {
return;
}
- const container = $(ReactDOM.findDOMNode(this));
+ const container = $(this.refs.container);
if (!(container.is(e.target) || container.has(e.target).length > 0)) {
// We can't just use blur for this because it fires and hides the children before
@@ -198,7 +204,7 @@ export default class SuggestionBox extends React.Component {
const SuggestionListComponent = listComponent;
return (
- <div>
+ <div ref='container'>
{textbox}
<SuggestionListComponent
suggestionId={this.suggestionId}
@@ -239,6 +245,5 @@ SuggestionBox.propTypes = {
// explicitly name any input event handlers we override and need to manually call
onChange: React.PropTypes.func,
- onBlur: React.PropTypes.func,
onKeyDown: React.PropTypes.func
};