Non-blocking send message trazyn#65 trazyn#67

PeiJingyu · Jul 25, 2018 · 3fc8f56 · 3fc8f56
1 parent f03b4ea
commit 3fc8f56
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/src/js/components/MessageInput/index.js b/src/js/components/MessageInput/index.js
@@ -24,10 +24,6 @@ export default class MessageInput extends Component {
     canisend() {
         var user = this.props.user;
 
-        if (this.blocking) {
-            return false;
-        }
-
         if (
             true
             && user.length === 1
@@ -40,9 +36,6 @@ export default class MessageInput extends Component {
         return true;
     }
 
-    // Prevent duplicate message
-    blocking = false;
-
     async handleEnter(e) {
         var message = this.refs.input.value.trim();
         var user = this.props.user;
@@ -55,10 +48,8 @@ export default class MessageInput extends Component {
             || e.charCode !== 13
         ) return;
 
-        this.blocking = true;
-
         // You can not send message to yourself
-        await Promise.all(
+        Promise.all(
             user.filter(e => e.UserName !== this.props.me.UserName).map(
                 async e => {
                     let res = await this.props.sendMessage(
@@ -70,8 +61,6 @@ export default class MessageInput extends Component {
                         true
                     );
 
-                    this.refs.input.value = '';
-
                     if (!res) {
                         await this.props.showMessage(batch ? `Send message to ${e.NickName} is failed!` : 'Failed to send message.');
                     }
@@ -80,7 +69,8 @@ export default class MessageInput extends Component {
                 }
             )
         );
-        this.blocking = false;
+
+        this.refs.input.value = '';
     }
 
     state = {