summaryrefslogtreecommitdiffstats
path: root/webapp/components/suggestion
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-11-04 19:11:40 -0400
committerGitHub <noreply@github.com>2016-11-04 19:11:40 -0400
commit428444d1852f3949ece0a9f6b73843f46c4a0fb7 (patch)
tree0bfa55e9e74bbf32849954ced5b263f1035d2799 /webapp/components/suggestion
parent18745b2d5c1899bc279696548cb3ebecf7c6b90f (diff)
downloadchat-428444d1852f3949ece0a9f6b73843f46c4a0fb7.tar.gz
chat-428444d1852f3949ece0a9f6b73843f46c4a0fb7.tar.bz2
chat-428444d1852f3949ece0a9f6b73843f46c4a0fb7.zip
PLT-4459 Fixed not being able to scroll on mobile after autocomplete is shown (#4464)
* Fixed not being able to scroll on mobile after autocomplete is shown * Fixed SuggestionLists not being scrollable on iOS
Diffstat (limited to 'webapp/components/suggestion')
-rw-r--r--webapp/components/suggestion/suggestion_box.jsx16
-rw-r--r--webapp/components/suggestion/suggestion_list.jsx1
2 files changed, 8 insertions, 9 deletions
diff --git a/webapp/components/suggestion/suggestion_box.jsx b/webapp/components/suggestion/suggestion_box.jsx
index 21bfd3dc3..464e57ef2 100644
--- a/webapp/components/suggestion/suggestion_box.jsx
+++ b/webapp/components/suggestion/suggestion_box.jsx
@@ -31,7 +31,7 @@ export default class SuggestionBox extends React.Component {
}
componentDidMount() {
- $(document).on('click touchstart', this.handleDocumentClick);
+ $(document).on('click', this.handleDocumentClick);
SuggestionStore.addCompleteWordListener(this.suggestionId, this.handleCompleteWord);
SuggestionStore.addPretextChangedListener(this.suggestionId, this.handlePretextChanged);
@@ -42,7 +42,7 @@ export default class SuggestionBox extends React.Component {
SuggestionStore.removePretextChangedListener(this.suggestionId, this.handlePretextChanged);
SuggestionStore.unregisterSuggestionBox(this.suggestionId);
- $(document).off('click touchstart', this.handleDocumentClick);
+ $(document).off('click', this.handleDocumentClick);
}
getTextbox() {
@@ -60,14 +60,14 @@ export default class SuggestionBox extends React.Component {
}
handleDocumentClick(e) {
- const container = $(ReactDOM.findDOMNode(this));
- if ($('.suggestion-list__content').length) {
- if (!($(e.target).hasClass('suggestion-list__content') || $(e.target).parents().hasClass('suggestion-list__content'))) {
- $('body').removeClass('modal-open');
- }
+ if (!SuggestionStore.hasSuggestions(this.suggestionId)) {
+ return;
}
+
+ const container = $(ReactDOM.findDOMNode(this));
+
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
+ // We can't just use blur for this because it fires and hides the children before
// their click handlers can be called
GlobalActions.emitClearSuggestions(this.suggestionId);
}
diff --git a/webapp/components/suggestion/suggestion_list.jsx b/webapp/components/suggestion/suggestion_list.jsx
index 65311a582..0c2dbf784 100644
--- a/webapp/components/suggestion/suggestion_list.jsx
+++ b/webapp/components/suggestion/suggestion_list.jsx
@@ -52,7 +52,6 @@ export default class SuggestionList extends React.Component {
}
getContent() {
- $('body').addClass('modal-open');
return $(ReactDOM.findDOMNode(this.refs.content));
}