[PLT-5445] Mobile view: Set focus back to message box after uploading a file (#5360)

3 files changed, 19 insertions, 10 deletions

diff --git a/webapp/components/create_comment.jsx b/webapp/components/create_comment.jsx
index d57e61e11..d82eaa3e5 100644
--- a/webapp/components/create_comment.jsx
+++ b/webapp/components/create_comment.jsx
@@ -45,7 +45,7 @@ export default class CreateComment extends React.Component {
         this.handleChange = this.handleChange.bind(this);
         this.handleKeyDown = this.handleKeyDown.bind(this);
         this.handleBlur = this.handleBlur.bind(this);
-        this.handleUploadClick = this.handleUploadClick.bind(this);
+        this.handleFileUploadChange = this.handleFileUploadChange.bind(this);
         this.handleUploadStart = this.handleUploadStart.bind(this);
         this.handleFileUploadComplete = this.handleFileUploadComplete.bind(this);
         this.handleUploadError = this.handleUploadError.bind(this);
@@ -314,8 +314,8 @@ export default class CreateComment extends React.Component {
         }
     }
 
-    handleUploadClick() {
-        this.focusTextbox();
+    handleFileUploadChange() {
+        this.focusTextbox(true);
     }
 
     handleUploadStart(clientIds) {
@@ -400,9 +400,9 @@ export default class CreateComment extends React.Component {
         draft.uploadsInProgress = uploadsInProgress;
         PostStore.storeCommentDraft(this.props.rootId, draft);
 
-        const enableAddButton = this.handleEnableAddButton(this.state.message, fileInfos);
+        this.setState({fileInfos, uploadsInProgress});
 
-        this.setState({fileInfos, uploadsInProgress, enableAddButton});
+        this.handleFileUploadChange();
     }
 
     componentWillReceiveProps(newProps) {
@@ -524,7 +524,7 @@ export default class CreateComment extends React.Component {
                             <FileUpload
                                 ref='fileUpload'
                                 getFileCount={this.getFileCount}
-                                onClick={this.handleUploadClick}
+                                onFileUploadChange={this.handleFileUploadChange}
                                 onUploadStart={this.handleUploadStart}
                                 onFileUpload={this.handleFileUploadComplete}
                                 onUploadError={this.handleUploadError}
diff --git a/webapp/components/create_post.jsx b/webapp/components/create_post.jsx
index 317b05f66..581ed16a0 100644
--- a/webapp/components/create_post.jsx
+++ b/webapp/components/create_post.jsx
@@ -46,7 +46,7 @@ export default class CreatePost extends React.Component {
         this.handleSubmit = this.handleSubmit.bind(this);
         this.postMsgKeyPress = this.postMsgKeyPress.bind(this);
         this.handleChange = this.handleChange.bind(this);
-        this.handleUploadClick = this.handleUploadClick.bind(this);
+        this.handleFileUploadChange = this.handleFileUploadChange.bind(this);
         this.handleUploadStart = this.handleUploadStart.bind(this);
         this.handleFileUploadComplete = this.handleFileUploadComplete.bind(this);
         this.handleUploadError = this.handleUploadError.bind(this);
@@ -244,8 +244,8 @@ export default class CreatePost extends React.Component {
         PostStore.storeCurrentDraft(draft);
     }
 
-    handleUploadClick() {
-        this.focusTextbox();
+    handleFileUploadChange() {
+        this.focusTextbox(true);
     }
 
     handleUploadStart(clientIds, channelId) {
@@ -337,6 +337,8 @@ export default class CreatePost extends React.Component {
         const enableSendButton = this.handleEnableSendButton(this.state.message, fileInfos);
 
         this.setState({fileInfos, uploadsInProgress, enableSendButton});
+
+        this.handleFileUploadChange();
     }
 
     componentWillMount() {
@@ -577,7 +579,7 @@ export default class CreatePost extends React.Component {
                         <FileUpload
                             ref='fileUpload'
                             getFileCount={this.getFileCount}
-                            onClick={this.handleUploadClick}
+                            onFileUploadChange={this.handleFileUploadChange}
                             onUploadStart={this.handleUploadStart}
                             onFileUpload={this.handleFileUploadComplete}
                             onUploadError={this.handleUploadError}
diff --git a/webapp/components/file_upload.jsx b/webapp/components/file_upload.jsx
index a821fedab..5710f2365 100644
--- a/webapp/components/file_upload.jsx
+++ b/webapp/components/file_upload.jsx
@@ -126,6 +126,8 @@ class FileUpload extends React.Component {
 
             Utils.clearFileInput(e.target);
         }
+
+        this.props.onFileUploadChange();
     }
 
     handleDrop(e) {
@@ -190,6 +192,8 @@ class FileUpload extends React.Component {
                 self.handleDrop(e);
             }
         });
+
+        this.props.onFileUploadChange();
     }
 
     componentWillUnmount() {
@@ -289,6 +293,8 @@ class FileUpload extends React.Component {
                 this.props.onUploadStart([clientId], channelId);
             }
         }
+
+        this.props.onFileUploadChange();
     }
 
     keyUpload(e) {
@@ -369,6 +375,7 @@ FileUpload.propTypes = {
     onClick: React.PropTypes.func,
     onFileUpload: React.PropTypes.func,
     onUploadStart: React.PropTypes.func,
+    onFileUploadChange: React.PropTypes.func,
     onTextDrop: React.PropTypes.func,
     channelId: React.PropTypes.string,
     postType: React.PropTypes.string