diff options
Diffstat (limited to 'webapp/components/suggestion/suggestion_box.jsx')
-rw-r--r-- | webapp/components/suggestion/suggestion_box.jsx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/webapp/components/suggestion/suggestion_box.jsx b/webapp/components/suggestion/suggestion_box.jsx index c70e8d5ae..1915b22b7 100644 --- a/webapp/components/suggestion/suggestion_box.jsx +++ b/webapp/components/suggestion/suggestion_box.jsx @@ -37,12 +37,10 @@ export default class SuggestionBox extends React.Component { } componentDidMount() { - SuggestionStore.addCompleteWordListener(this.suggestionId, this.handleCompleteWord); SuggestionStore.addPretextChangedListener(this.suggestionId, this.handlePretextChanged); } componentWillUnmount() { - SuggestionStore.removeCompleteWordListener(this.suggestionId, this.handleCompleteWord); SuggestionStore.removePretextChangedListener(this.suggestionId, this.handlePretextChanged); SuggestionStore.unregisterSuggestionBox(this.suggestionId); @@ -161,6 +159,8 @@ export default class SuggestionBox extends React.Component { provider.handleCompleteWord(term, matchedPretext); } } + + GlobalActions.emitCompleteWordSuggestion(this.suggestionId); } handleKeyDown(e) { @@ -172,7 +172,7 @@ export default class SuggestionBox extends React.Component { GlobalActions.emitSelectNextSuggestion(this.suggestionId); e.preventDefault(); } else if (e.which === KeyCodes.ENTER || e.which === KeyCodes.TAB) { - GlobalActions.emitCompleteWordSuggestion(this.suggestionId); + this.handleCompleteWord(SuggestionStore.getSelection(this.suggestionId), SuggestionStore.getSelectedMatchedPretext(this.suggestionId)); this.props.onKeyDown(e); e.preventDefault(); } else if (e.which === KeyCodes.ESCAPE) { @@ -212,6 +212,7 @@ export default class SuggestionBox extends React.Component { // Don't pass props used by SuggestionBox Reflect.deleteProperty(props, 'providers'); + Reflect.deleteProperty(props, 'onChange'); // We use onInput instead of onChange on the actual input Reflect.deleteProperty(props, 'onItemSelected'); const childProps = { @@ -260,6 +261,7 @@ export default class SuggestionBox extends React.Component { suggestionId={this.suggestionId} location={listStyle} renderDividers={renderDividers} + onCompleteWord={this.handleCompleteWord} /> </div> ); |