stream-chat-react-native-core 5.21.0 → 5.22.0-beta.10

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

@@ -19,6 +19,7 @@ var _useCreateMessageInputContext = require("./hooks/useCreateMessageInputContex
 var _useMessageDetailsForState = require("./hooks/useMessageDetailsForState");
 var _useCooldown2 = require("../../components/MessageInput/hooks/useCooldown");
 var _native = require("../../native");
+var _compressImage = require("../../utils/compressImage");
 var _removeReservedFields = require("../../utils/removeReservedFields");
 var _utils = require("../../utils/utils");
 var _AttachmentPickerContext = require("../attachmentPickerContext/AttachmentPickerContext");
@@ -76,7 +77,8 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
   var channelCapabities = (0, _OwnCapabilitiesContext.useOwnCapabilitiesContext)();
   var _useChannelContext = (0, _ChannelContext.useChannelContext)(),
     channel = _useChannelContext.channel,
-    giphyEnabled = _useChannelContext.giphyEnabled;
+    giphyEnabled = _useChannelContext.giphyEnabled,
+    uploadAbortControllerRef = _useChannelContext.uploadAbortControllerRef;
   var _useThreadContext = (0, _ThreadContext.useThreadContext)(),
     thread = _useThreadContext.thread;
   var _useTranslationContex = (0, _TranslationContext.useTranslationContext)(),
@@ -297,14 +299,15 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
     setText('');
   };
   var mapImageUploadToAttachment = function mapImageUploadToAttachment(image) {
-    var mime_type = (0, _mimeTypes.lookup)(image.file.filename);
+    var mime_type = (0, _mimeTypes.lookup)(image.file.name);
+    var name = image.file.name;
     return {
-      fallback: image.file.name,
+      fallback: name,
       image_url: image.url,
       mime_type: mime_type ? mime_type : undefined,
       original_height: image.height,
       original_width: image.width,
-      originalFile: image.file,
+      originalImage: image.file,
       type: 'image'
     };
   };
@@ -697,34 +700,43 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
             return value.doDocUploadRequest(file, channel);
           case 8:
             response = _context5.sent;
-            _context5.next = 15;
+            _context5.next = 17;
             break;
           case 11:
             if (!(channel && file.uri)) {
-              _context5.next = 15;
+              _context5.next = 17;
               break;
             }
-            _context5.next = 14;
+            uploadAbortControllerRef.current.set(file.name, client.createAbortControllerForNextRequest());
+            _context5.next = 15;
             return channel.sendFile(file.uri, file.name, file.mimeType);
-          case 14:
-            response = _context5.sent;
           case 15:
+            response = _context5.sent;
+            uploadAbortControllerRef.current["delete"](file.name);
+          case 17:
             extraData = {
               thumb_url: response.thumb_url,
               url: response.file
             };
             setFileUploads(getUploadSetStateAction(id, _utils.FileState.UPLOADED, extraData));
-            _context5.next = 22;
+            _context5.next = 27;
             break;
-          case 19:
-            _context5.prev = 19;
+          case 21:
+            _context5.prev = 21;
             _context5.t0 = _context5["catch"](4);
+            if (!(_context5.t0 instanceof Error && (_context5.t0.name === 'AbortError' || _context5.t0.name === 'CanceledError'))) {
+              _context5.next = 26;
+              break;
+            }
+            uploadAbortControllerRef.current["delete"](file.name);
+            return _context5.abrupt("return");
+          case 26:
             handleFileOrImageUploadError(_context5.t0, false, id);
-          case 22:
+          case 27:
           case "end":
             return _context5.stop();
         }
-      }, _callee5, null, [[4, 19]]);
+      }, _callee5, null, [[4, 21]]);
     }));
     return function uploadFile(_x) {
       return _ref6.apply(this, arguments);
@@ -732,7 +744,8 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
   }();
   var uploadImage = function () {
     var _ref8 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee6(_ref7) {
-      var newImage, _ref9, file, id, response, _file$filename, uri, compressedUri, filename, contentType, newImageUploads;
+      var _file$name;
+      var newImage, _ref9, file, id, response, uri, filename, compressedUri, contentType, newImageUploads;
       return _regenerator["default"].wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -745,18 +758,13 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
             return _context6.abrupt("return");
           case 4:
             response = {};
-            _context6.prev = 5;
             uri = file.uri || '';
-            _context6.next = 9;
-            return file.source === 'camera' || !file.height || !file.width || typeof value.compressImageQuality !== 'number' || value.compressImageQuality === 1 ? uri : (0, _native.compressImage)({
-              compressImageQuality: value.compressImageQuality,
-              height: file.height,
-              uri: uri,
-              width: file.width
-            });
-          case 9:
+            filename = (_file$name = file.name) != null ? _file$name : uri.replace(/^(file:\/\/|content:\/\/)/, '');
+            _context6.prev = 7;
+            _context6.next = 10;
+            return (0, _compressImage.compressedImageURI)(file, value.compressImageQuality);
+          case 10:
             compressedUri = _context6.sent;
-            filename = (_file$filename = file.filename) != null ? _file$filename : uri.replace(/^(file:\/\/|content:\/\/)/, '');
             contentType = (0, _mimeTypes.lookup)(filename) || 'multipart/form-data';
             if (!value.doImageUploadRequest) {
               _context6.next = 18;
@@ -766,18 +774,20 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
             return value.doImageUploadRequest(file, channel);
           case 15:
             response = _context6.sent;
-            _context6.next = 26;
+            _context6.next = 29;
             break;
           case 18:
             if (!(compressedUri && channel)) {
-              _context6.next = 26;
+              _context6.next = 29;
               break;
             }
             if (!value.sendImageAsync) {
-              _context6.next = 23;
+              _context6.next = 24;
               break;
             }
+            uploadAbortControllerRef.current.set(filename, client.createAbortControllerForNextRequest());
             channel.sendImage(compressedUri, filename, contentType).then(function (res) {
+              uploadAbortControllerRef.current["delete"](filename);
               if (asyncIds.includes(id)) {
                 setAsyncUploads(function (prevAsyncUploads) {
                   prevAsyncUploads[id] = (0, _extends2["default"])({}, prevAsyncUploads[id], {
@@ -792,15 +802,19 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
                 });
                 setImageUploads(newImageUploads);
               }
+            }, function () {
+              uploadAbortControllerRef.current["delete"](filename);
             });
-            _context6.next = 26;
+            _context6.next = 29;
             break;
-          case 23:
-            _context6.next = 25;
+          case 24:
+            uploadAbortControllerRef.current.set(filename, client.createAbortControllerForNextRequest());
+            _context6.next = 27;
             return channel.sendImage(compressedUri, filename, contentType);
-          case 25:
+          case 27:
             response = _context6.sent;
-          case 26:
+            uploadAbortControllerRef.current["delete"](filename);
+          case 29:
             if (Object.keys(response).length) {
               newImageUploads = getUploadSetStateAction(id, _utils.FileState.UPLOADED, {
                 height: file.height,
@@ -809,17 +823,24 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
               });
               setImageUploads(newImageUploads);
             }
-            _context6.next = 32;
+            _context6.next = 38;
             break;
-          case 29:
-            _context6.prev = 29;
-            _context6.t0 = _context6["catch"](5);
-            handleFileOrImageUploadError(_context6.t0, true, id);
           case 32:
+            _context6.prev = 32;
+            _context6.t0 = _context6["catch"](7);
+            if (!(_context6.t0 instanceof Error && (_context6.t0.name === 'AbortError' || _context6.t0.name === 'CanceledError'))) {
+              _context6.next = 37;
+              break;
+            }
+            uploadAbortControllerRef.current["delete"](filename);
+            return _context6.abrupt("return");
+          case 37:
+            handleFileOrImageUploadError(_context6.t0, true, id);
+          case 38:
           case "end":
             return _context6.stop();
         }
-      }, _callee6, null, [[5, 29]]);
+      }, _callee6, null, [[7, 32]]);
     }));
     return function uploadImage(_x2) {
       return _ref8.apply(this, arguments);
@@ -833,12 +854,12 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
           case 0:
             id = (0, _utils.generateRandomId)();
             isBlockedFileExtension = blockedFileExtensionTypes == null ? void 0 : blockedFileExtensionTypes.some(function (fileExtensionType) {
-              var _file$name;
-              return (_file$name = file.name) == null ? void 0 : _file$name.includes(fileExtensionType);
+              var _file$name2;
+              return (_file$name2 = file.name) == null ? void 0 : _file$name2.includes(fileExtensionType);
             });
             isBlockedFileMimeType = blockedFileMimeTypes == null ? void 0 : blockedFileMimeTypes.some(function (mimeType) {
-              var _file$name2;
-              return (_file$name2 = file.name) == null ? void 0 : _file$name2.includes(mimeType);
+              var _file$name3;
+              return (_file$name3 = file.name) == null ? void 0 : _file$name3.includes(mimeType);
             });
             fileState = isBlockedFileExtension || isBlockedFileMimeType ? _utils.FileState.NOT_SUPPORTED : _utils.FileState.UPLOADING;
             newFile = {
@@ -973,7 +994,7 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1173,
+      lineNumber: 1185,
       columnNumber: 5
     }
   }, children);
@@ -994,7 +1015,7 @@ var withMessageInputContext = function withMessageInputContext(Component) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1213,
+        lineNumber: 1225,
         columnNumber: 12
       }
     }));