From 99f0a069dd6092e7d9c835a5f2ffc2db42bf14bf Mon Sep 17 00:00:00 2001 From: Mary Kate Date: Sun, 27 Sep 2020 16:32:07 -0500 Subject: [PATCH] pass getClickableArea into autosuggesttextarea as prop --- app/soapbox/components/autosuggest_textarea.js | 8 ++------ app/soapbox/features/compose/components/compose_form.js | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/soapbox/components/autosuggest_textarea.js b/app/soapbox/components/autosuggest_textarea.js index e60661f6b..703aa9797 100644 --- a/app/soapbox/components/autosuggest_textarea.js +++ b/app/soapbox/components/autosuggest_textarea.js @@ -51,6 +51,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent { onFocus: PropTypes.func, onBlur: PropTypes.func, clickableAreaRef: PropTypes.object, + getClickableArea: PropTypes.func.isRequired, }; static defaultProps = { @@ -164,14 +165,9 @@ export default class AutosuggestTextarea extends ImmutablePureComponent { this.textarea.focus(); } - getClickableArea = () => { - const { clickableAreaRef } = this.props; - return clickableAreaRef ? clickableAreaRef.current : this.form; - } - isClickInside = (e) => { return [ - this.getClickableArea(), + this.props.getClickableArea(), document.querySelector('.autosuggest-textarea__textarea'), ].some(element => element && element.contains(e.target)); } diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js index af8ce4263..39647c923 100644 --- a/app/soapbox/features/compose/components/compose_form.js +++ b/app/soapbox/features/compose/components/compose_form.js @@ -286,6 +286,7 @@ class ComposeForm extends ImmutablePureComponent { onSuggestionSelected={this.onSuggestionSelected} onPaste={onPaste} autoFocus={shouldAutoFocus} + getClickableArea={this.getClickableArea} > { !condensed &&