Progress

app/javascript/gabsocial/features/compose/components/compose_form/compose_form.js

@@ -193,8 +193,8 @@ class ComposeForm extends ImmutablePureComponent {
         selectionStart = selectionEnd;
       }
 
-      this.autosuggestTextarea.textbox.setSelectionRange(selectionStart, selectionEnd);
-      this.autosuggestTextarea.textbox.focus();
+      // this.autosuggestTextarea.textbox.setSelectionRange(selectionStart, selectionEnd);
+    // this.autosuggestTextarea.textbox.focus();
     }
   }
 
@@ -332,6 +332,14 @@ class ComposeForm extends ImmutablePureComponent {
               </div>
             }
 
+            { /*
+              (isUploading || hasGif) &&
+              <div className={[_s.default, _s.px15].join(' ')}>
+                <UploadForm replyToId={replyToId} />
+              </div>
+             */
+            }
+
             {
               !edit && hasPoll &&
               <div className={[_s.default, _s.px15].join(' ')}>

app/javascript/gabsocial/features/compose/components/gif_form.js

@@ -0,0 +1,39 @@
+import ImmutablePropTypes from 'react-immutable-proptypes'
+import ImmutablePureComponent from 'react-immutable-pure-component'
+import ProgressBar from '../../../../components/progress_bar'
+import Upload from '../media_upload_item'
+import SensitiveMediaButton from '../sensitive_media_button'
+
+const mapStateToProps = (state) => ({
+  mediaIds: state.getIn(['compose', 'media_attachments']).map(item => item.get('id')),
+  isUploading: state.getIn(['compose', 'is_uploading']),
+  uploadProgress: state.getIn(['compose', 'progress']),
+});
+
+export default
+@connect(mapStateToProps)
+class GifForm extends ImmutablePureComponent {
+
+  static propTypes = {
+    mediaIds: ImmutablePropTypes.list.isRequired,
+    isUploading: PropTypes.bool,
+    uploadProgress: PropTypes.number,
+  };
+
+  render () {
+    const {
+      mediaIds,
+      isUploading,
+      uploadProgress,
+    } = this.props
+
+    return (
+      <div className={_s.default}>
+        <div className={[_s.default, _s.flexRow, _s.flexWrap].join(' ')}>
+          <Upload id={id} key={id} />
+        </div>
+      </div>
+    )
+  }
+
+}

app/javascript/gabsocial/features/compose/components/upload_form.js

@@ -1,8 +1,8 @@
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
-import ProgressBar from '../../../../components/progress_bar'
-import Upload from '../media_upload_item'
-import SensitiveMediaButton from '../sensitive_media_button'
+import ProgressBar from '../../../components/progress_bar'
+import Upload from './media_upload_item'
+import SensitiveMediaButton from './sensitive_media_button'
 
 const mapStateToProps = (state) => ({
   mediaIds: state.getIn(['compose', 'media_attachments']).map(item => item.get('id')),

app/javascript/gabsocial/features/compose/components/upload_form/index.js

@@ -1 +0,0 @@
-export { default } from './upload_form'

app/javascript/gabsocial/features/compose/components/upload_form/upload_form.scss

@@ -1,10 +0,0 @@
-.compose-form-upload-wrapper {
-  overflow: hidden;
-}
-
-.compose-form-uploads-wrapper {
-  display: flex;
-  flex-direction: row;
-  padding: 5px;
-  flex-wrap: wrap;
-}