summaryrefslogtreecommitdiffstats
path: root/webapp/components/suggestion/suggestion_box.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-05-23 10:17:06 -0400
committerGitHub <noreply@github.com>2017-05-23 10:17:06 -0400
commit69f3f2fdce4ae21a037ca61d753279efcc70f0ec (patch)
treedea69385c8bd3190d7bc2f72563b929ecdf527f2 /webapp/components/suggestion/suggestion_box.jsx
parent52f73c30cafd6afaa11361b05972e25ebc223a81 (diff)
downloadchat-69f3f2fdce4ae21a037ca61d753279efcc70f0ec.tar.gz
chat-69f3f2fdce4ae21a037ca61d753279efcc70f0ec.tar.bz2
chat-69f3f2fdce4ae21a037ca61d753279efcc70f0ec.zip
PLT-6282 Make post list stay visible when post textbox height changes (#6323)
* PLT-6282 Changed post drafts to use an action when being stored * PLT-6282 Triggered post list to update scroll position when post draft changes * PLT-6282 Changed SuggestionBox to complete suggestions without an event
Diffstat (limited to 'webapp/components/suggestion/suggestion_box.jsx')
-rw-r--r--webapp/components/suggestion/suggestion_box.jsx8
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>
);