stream-chat-react-native-core 5.6.0-beta.0 → 5.6.0-beta.2

package/lib/module/contexts/messageInputContext/MessageInputContext.js

@@ -37,6 +37,8 @@ var _useCooldown2 = require("../../components/MessageInput/hooks/useCooldown");
 
 var _native = require("../../native");
 
+var _removeReservedFields = require("../../utils/removeReservedFields");
+
 var _utils = require("../../utils/utils");
 
 var _AttachmentPickerContext = require("../attachmentPickerContext/AttachmentPickerContext");
@@ -194,28 +196,28 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
       return true;
     }
 
-    for (var _iterator = _createForOfIteratorHelperLoose(imageUploads), _step; !(_step = _iterator()).done;) {
-      var _image = _step.value;
+    var imagesAndFiles = [].concat((0, _toConsumableArray2["default"])(imageUploads), (0, _toConsumableArray2["default"])(fileUploads));
 
-      if ((!_image || _image.state === _utils.FileState.UPLOAD_FAILED) && !enableOfflineSupport) {
-        continue;
-      }
+    if (enableOfflineSupport) {
+      for (var _iterator = _createForOfIteratorHelperLoose(imagesAndFiles), _step; !(_step = _iterator()).done;) {
+        var _file = _step.value;
 
-      if (_image.state === _utils.FileState.UPLOADING) {
-        return false;
+        if (_file.state === _utils.FileState.NOT_SUPPORTED) {
+          return false;
+        }
       }
 
       return true;
     }
 
-    for (var _iterator2 = _createForOfIteratorHelperLoose(fileUploads), _step2; !(_step2 = _iterator2()).done;) {
-      var _file = _step2.value;
+    for (var _iterator2 = _createForOfIteratorHelperLoose(imagesAndFiles), _step2; !(_step2 = _iterator2()).done;) {
+      var _file2 = _step2.value;
 
-      if ((!_file || _file.state === _utils.FileState.UPLOAD_FAILED) && !enableOfflineSupport) {
+      if (!_file2 || _file2.state === _utils.FileState.UPLOAD_FAILED) {
         continue;
       }
 
-      if (_file.state === _utils.FileState.UPLOADING) {
+      if (_file2.state === _utils.FileState.UPLOADING) {
         return false;
       }
 
@@ -374,9 +376,68 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
     setText('');
   };
 
+  var mapImageUploadToAttachment = function mapImageUploadToAttachment(image) {
+    var mime_type = (0, _mimeTypes.lookup)(image.file.filename);
+    return {
+      fallback: image.file.name,
+      image_url: image.url,
+      mime_type: mime_type ? mime_type : undefined,
+      original_height: image.height,
+      original_width: image.width,
+      originalFile: image.file,
+      type: 'image'
+    };
+  };
+
+  var mapFileUploadToAttachment = function mapFileUploadToAttachment(file) {
+    var _file$file$type, _file$file$type2, _file$file$type3;
+
+    var mime_type = (0, _mimeTypes.lookup)(file.file.name);
+
+    if ((_file$file$type = file.file.type) != null && _file$file$type.startsWith('image/')) {
+      return {
+        fallback: file.file.name,
+        image_url: file.url,
+        mime_type: mime_type ? mime_type : undefined,
+        originalFile: file.file,
+        type: 'image'
+      };
+    } else if ((_file$file$type2 = file.file.type) != null && _file$file$type2.startsWith('audio/')) {
+      return {
+        asset_url: file.url || file.file.uri,
+        duration: file.file.duration,
+        file_size: file.file.size,
+        mime_type: file.file.type,
+        originalFile: file.file,
+        title: file.file.name,
+        type: 'audio'
+      };
+    } else if ((_file$file$type3 = file.file.type) != null && _file$file$type3.startsWith('video/')) {
+      return {
+        asset_url: file.url || file.file.uri,
+        duration: file.file.duration,
+        file_size: file.file.size,
+        mime_type: file.file.type,
+        originalFile: file.file,
+        thumb_url: file.thumb_url,
+        title: file.file.name,
+        type: 'video'
+      };
+    } else {
+      return {
+        asset_url: file.url || file.file.uri,
+        file_size: file.file.size,
+        mime_type: file.file.type,
+        originalFile: file.file,
+        title: file.file.name,
+        type: 'file'
+      };
+    }
+  };
+
   var sendMessage = function () {
     var _ref3 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee2() {
-      var prevText, attachments, _loop, _iterator3, _step3, _image2, _ret, _iterator4, _step4, _file2, mime_type, _file2$file$type, _file2$file$type2, _file2$file$type3, updatedMessage, updateMessagePromise;
+      var prevText, attachments, _loop, _iterator3, _step3, _image, _ret, _iterator4, _step4, _file3, updatedMessage, updateMessagePromise;
 
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
@@ -411,15 +472,26 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
 
               attachments = [];
 
-              _loop = function _loop(_image2) {
-                if ((!_image2 || _image2.state === _utils.FileState.UPLOAD_FAILED) && !enableOfflineSupport) {
+              _loop = function _loop(_image) {
+                if (enableOfflineSupport) {
+                  if (_image.state === _utils.FileState.NOT_SUPPORTED) {
+                    return {
+                      v: void 0
+                    };
+                  }
+
+                  attachments.push(mapImageUploadToAttachment(_image));
                   return "continue";
                 }
 
-                if (_image2.state === _utils.FileState.UPLOADING) {
+                if ((!_image || _image.state === _utils.FileState.UPLOAD_FAILED) && !enableOfflineSupport) {
+                  return "continue";
+                }
+
+                if (_image.state === _utils.FileState.UPLOADING) {
                   if (value.sendImageAsync) {
                     setAsyncIds(function (prevAsyncIds) {
-                      return [].concat((0, _toConsumableArray2["default"])(prevAsyncIds), [_image2.id]);
+                      return [].concat((0, _toConsumableArray2["default"])(prevAsyncIds), [_image.id]);
                     });
                   } else {
                     sending.current = false;
@@ -429,18 +501,8 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
                   }
                 }
 
-                var mime_type = (0, _mimeTypes.lookup)(_image2.file.filename);
-
-                if (_image2.state === _utils.FileState.UPLOADED || _image2.state === _utils.FileState.FINISHED || enableOfflineSupport && _image2.state === _utils.FileState.UPLOAD_FAILED) {
-                  attachments.push({
-                    fallback: _image2.file.name,
-                    image_url: _image2.url,
-                    mime_type: mime_type ? mime_type : undefined,
-                    original_height: _image2.height,
-                    original_width: _image2.width,
-                    originalFile: _image2.file,
-                    type: 'image'
-                  });
+                if (_image.state === _utils.FileState.UPLOADED || _image.state === _utils.FileState.FINISHED) {
+                  attachments.push(mapImageUploadToAttachment(_image));
                 }
               };
 
@@ -452,8 +514,8 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
                 break;
               }
 
-              _image2 = _step3.value;
-              _ret = _loop(_image2);
+              _image = _step3.value;
+              _ret = _loop(_image);
 
               if (!(_ret === "continue")) {
                 _context2.next = 18;
@@ -479,87 +541,64 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
 
             case 23:
               if ((_step4 = _iterator4()).done) {
-                _context2.next = 34;
+                _context2.next = 38;
                 break;
               }
 
-              _file2 = _step4.value;
+              _file3 = _step4.value;
 
-              if (!((!_file2 || _file2.state === _utils.FileState.UPLOAD_FAILED) && !enableOfflineSupport)) {
-                _context2.next = 27;
+              if (!enableOfflineSupport) {
+                _context2.next = 30;
                 break;
               }
 
-              return _context2.abrupt("continue", 32);
-
-            case 27:
-              if (!(_file2.state === _utils.FileState.UPLOADING)) {
-                _context2.next = 30;
+              if (!(_file3.state === _utils.FileState.NOT_SUPPORTED)) {
+                _context2.next = 28;
                 break;
               }
 
-              sending.current = false;
               return _context2.abrupt("return");
 
+            case 28:
+              attachments.push(mapFileUploadToAttachment(_file3));
+              return _context2.abrupt("continue", 36);
+
             case 30:
-              mime_type = (0, _mimeTypes.lookup)(_file2.file.name);
-
-              if (_file2.state === _utils.FileState.UPLOADED || _file2.state === _utils.FileState.FINISHED || enableOfflineSupport && _file2.state === _utils.FileState.UPLOAD_FAILED) {
-                if ((_file2$file$type = _file2.file.type) != null && _file2$file$type.startsWith('image/')) {
-                  attachments.push({
-                    fallback: _file2.file.name,
-                    image_url: _file2.url,
-                    mime_type: mime_type ? mime_type : undefined,
-                    originalFile: _file2.file,
-                    type: 'image'
-                  });
-                } else if ((_file2$file$type2 = _file2.file.type) != null && _file2$file$type2.startsWith('audio/')) {
-                  attachments.push({
-                    asset_url: _file2.url || _file2.file.uri,
-                    duration: _file2.file.duration,
-                    file_size: _file2.file.size,
-                    mime_type: _file2.file.type,
-                    originalFile: _file2.file,
-                    title: _file2.file.name,
-                    type: 'audio'
-                  });
-                } else if ((_file2$file$type3 = _file2.file.type) != null && _file2$file$type3.startsWith('video/')) {
-                  attachments.push({
-                    asset_url: _file2.url || _file2.file.uri,
-                    duration: _file2.file.duration,
-                    file_size: _file2.file.size,
-                    mime_type: _file2.file.type,
-                    originalFile: _file2.file,
-                    thumb_url: _file2.thumb_url,
-                    title: _file2.file.name,
-                    type: 'video'
-                  });
-                } else {
-                  attachments.push({
-                    asset_url: _file2.url || _file2.file.uri,
-                    file_size: _file2.file.size,
-                    mime_type: _file2.file.type,
-                    originalFile: _file2.file,
-                    title: _file2.file.name,
-                    type: 'file'
-                  });
-                }
+              if (!(!_file3 || _file3.state === _utils.FileState.UPLOAD_FAILED)) {
+                _context2.next = 32;
+                break;
               }
 
+              return _context2.abrupt("continue", 36);
+
             case 32:
+              if (!(_file3.state === _utils.FileState.UPLOADING)) {
+                _context2.next = 35;
+                break;
+              }
+
+              sending.current = false;
+              return _context2.abrupt("return");
+
+            case 35:
+              if (_file3.state === _utils.FileState.UPLOADED || _file3.state === _utils.FileState.FINISHED) {
+                attachments.push(mapFileUploadToAttachment(_file3));
+              }
+
+            case 36:
               _context2.next = 23;
               break;
 
-            case 34:
+            case 38:
               if (!(!prevText && attachments.length === 0)) {
-                _context2.next = 37;
+                _context2.next = 41;
                 break;
               }
 
               sending.current = false;
               return _context2.abrupt("return");
 
-            case 37:
+            case 41:
               if (value.editing && !(0, _useMessageDetailsForState.isEditingBoolean)(value.editing)) {
                 updatedMessage = (0, _extends2["default"])({}, value.editing, {
                   attachments: attachments,
@@ -568,7 +607,7 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
                   text: prevText
                 });
                 value.clearEditingState();
-                updateMessagePromise = value.editMessage(updatedMessage).then(value.clearEditingState);
+                updateMessagePromise = value.editMessage((0, _removeReservedFields.removeReservedFields)(updatedMessage)).then(value.clearEditingState);
                 resetInput(attachments);
                 (0, _streamChat.logChatPromiseExecution)(updateMessagePromise, 'update message');
                 sending.current = false;
@@ -597,7 +636,7 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
                 }
               }
 
-            case 38:
+            case 42:
             case "end":
               return _context2.stop();
           }
@@ -1192,7 +1231,7 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1162,
+      lineNumber: 1181,
       columnNumber: 5
     }
   }, children);
@@ -1219,7 +1258,7 @@ var withMessageInputContext = function withMessageInputContext(Component) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1202,
+        lineNumber: 1221,
         columnNumber: 12
       }
     }));