From 4e9b22640cace676941bb71ed7b862da194a9c09 Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Fri, 12 Jul 2019 12:22:05 -0400
Subject: [PATCH] Updated compose_form to account for if compose modal open

fixes #9
since there are multiple compose_form on the page (on top of timeline = shouldCondense) and within the modal when replying. if isModalOpen and is the compose form that's on top of timeline then dont set the ref so we can set the cursor on the textarea of the compose modal after the existing reply content.
---
 .../gabsocial/features/compose/components/compose_form.js  | 7 +++++--
 .../features/compose/containers/compose_form_container.js  | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/javascript/gabsocial/features/compose/components/compose_form.js b/app/javascript/gabsocial/features/compose/components/compose_form.js
index 6d8625e5..8f595904 100644
--- a/app/javascript/gabsocial/features/compose/components/compose_form.js
+++ b/app/javascript/gabsocial/features/compose/components/compose_form.js
@@ -68,6 +68,7 @@ class ComposeForm extends ImmutablePureComponent {
     anyMedia: PropTypes.bool,
     shouldCondense: PropTypes.bool,
     autoFocus: PropTypes.bool,
+    isModalOpen: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -150,6 +151,8 @@ class ComposeForm extends ImmutablePureComponent {
   }
 
   componentDidUpdate (prevProps) {
+    if (!this.autosuggestTextarea) return;
+
     // This statement does several things:
     // - If we're beginning a reply, and,
     //     - Replying to zero or one users, places the cursor at the end of the textbox.
@@ -203,7 +206,7 @@ class ComposeForm extends ImmutablePureComponent {
   }
 
   render () {
-    const { intl, onPaste, showSearch, anyMedia, shouldCondense, autoFocus } = this.props;
+    const { intl, onPaste, showSearch, anyMedia, shouldCondense, autoFocus, isModalOpen } = this.props;
     const condensed = shouldCondense && !this.props.text && !this.state.composeFocused;
     const disabled = this.props.isSubmitting;
     const text     = [this.props.spoilerText, countableText(this.props.text)].join('');
@@ -252,7 +255,7 @@ class ComposeForm extends ImmutablePureComponent {
         </div>
 
         <AutosuggestTextarea
-          ref={this.setAutosuggestTextarea}
+          ref={(isModalOpen && shouldCondense) ? null : this.setAutosuggestTextarea}
           placeholder={intl.formatMessage(messages.placeholder)}
           disabled={disabled}
           value={this.props.text}
diff --git a/app/javascript/gabsocial/features/compose/containers/compose_form_container.js b/app/javascript/gabsocial/features/compose/containers/compose_form_container.js
index 8395d589..77ce2b48 100644
--- a/app/javascript/gabsocial/features/compose/containers/compose_form_container.js
+++ b/app/javascript/gabsocial/features/compose/containers/compose_form_container.js
@@ -25,6 +25,7 @@ const mapStateToProps = state => ({
   isUploading: state.getIn(['compose', 'is_uploading']),
   showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),
   anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
+  isModalOpen: state.get('modal').modalType === 'COMPOSE',
 });
 
 const mapDispatchToProps = (dispatch) => ({