stream-chat-react-native-core 5.4.2-beta.1 → 5.4.2-beta.2

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

@@ -260,9 +260,8 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
     if (hasImagePicker) {
       _reactNative.Keyboard.dismiss();
 
-      openPicker();
       setSelectedPicker('images');
-      setTimeout(openPicker, 600);
+      openPicker();
     } else if (hasFilePicker) {
       pickFile();
     }
@@ -652,15 +651,29 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
     }
   };
 
-  var triggerSettings = channel ? value.autoCompleteTriggerSettings ? value.autoCompleteTriggerSettings({
-    channel: channel,
-    client: client,
-    onMentionSelectItem: onSelectItem
-  }) : (0, _utils.ACITriggerSettings)({
-    channel: channel,
-    client: client,
-    onMentionSelectItem: onSelectItem
-  }) : {};
+  var getTriggerSettings = function getTriggerSettings() {
+    var triggerSettings = {};
+
+    if (channel) {
+      if (value.autoCompleteTriggerSettings) {
+        triggerSettings = value.autoCompleteTriggerSettings({
+          channel: channel,
+          client: client,
+          onMentionSelectItem: onSelectItem
+        });
+      } else {
+        triggerSettings = (0, _utils.ACITriggerSettings)({
+          channel: channel,
+          client: client,
+          onMentionSelectItem: onSelectItem
+        });
+      }
+    }
+
+    return triggerSettings;
+  };
+
+  var triggerSettings = getTriggerSettings();
 
   var updateMessage = function () {
     var _ref4 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee3() {
@@ -819,64 +832,100 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
   }();
 
   var uploadImage = function () {
-    var _ref8 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee5(_ref7) {
-      var newImage, _ref9, file, id, response, _file$uri, localUri, uri, compressedUri, filename, contentType, newImageUploads;
+    var _ref8 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee6(_ref7) {
+      var newImage, _ref9, file, id, response, getLocalUri, uri, compressedUri, filename, contentType, newImageUploads;
 
-      return _regenerator["default"].wrap(function _callee5$(_context5) {
+      return _regenerator["default"].wrap(function _callee6$(_context6) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context6.prev = _context6.next) {
             case 0:
               newImage = _ref7.newImage;
               _ref9 = newImage || {}, file = _ref9.file, id = _ref9.id;
 
               if (file) {
-                _context5.next = 4;
+                _context6.next = 4;
                 break;
               }
 
-              return _context5.abrupt("return");
+              return _context6.abrupt("return");
 
             case 4:
               response = {};
-              _context5.prev = 5;
-
-              if (!file.id) {
-                _context5.next = 12;
+              _context6.prev = 5;
+
+              getLocalUri = function () {
+                var _ref10 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee5() {
+                  var _file$uri;
+
+                  return _regenerator["default"].wrap(function _callee5$(_context5) {
+                    while (1) {
+                      switch (_context5.prev = _context5.next) {
+                        case 0:
+                          if (!file.id) {
+                            _context5.next = 6;
+                            break;
+                          }
+
+                          _context5.next = 3;
+                          return (0, _native.getLocalAssetUri)(file.id);
+
+                        case 3:
+                          return _context5.abrupt("return", _context5.sent);
+
+                        case 6:
+                          if (!((_file$uri = file.uri) != null && _file$uri.match(/assets-library/))) {
+                            _context5.next = 10;
+                            break;
+                          }
+
+                          _context5.next = 9;
+                          return (0, _native.getLocalAssetUri)(file.uri);
+
+                        case 9:
+                          return _context5.abrupt("return", _context5.sent);
+
+                        case 10:
+                          return _context5.abrupt("return", file.uri);
+
+                        case 11:
+                        case "end":
+                          return _context5.stop();
+                      }
+                    }
+                  }, _callee5);
+                }));
+
+                return function getLocalUri() {
+                  return _ref10.apply(this, arguments);
+                };
+              }();
+
+              _context6.t1 = file.name;
+
+              if (_context6.t1) {
+                _context6.next = 12;
                 break;
               }
 
-              _context5.next = 9;
-              return (0, _native.getLocalAssetUri)(file.id);
+              _context6.next = 11;
+              return getLocalUri();
 
-            case 9:
-              _context5.t0 = _context5.sent;
-              _context5.next = 20;
-              break;
+            case 11:
+              _context6.t1 = _context6.sent;
 
             case 12:
-              if (!((_file$uri = file.uri) != null && _file$uri.match(/assets-library/))) {
-                _context5.next = 18;
+              _context6.t0 = _context6.t1;
+
+              if (_context6.t0) {
+                _context6.next = 15;
                 break;
               }
 
-              _context5.next = 15;
-              return (0, _native.getLocalAssetUri)(file.uri);
+              _context6.t0 = '';
 
             case 15:
-              _context5.t1 = _context5.sent;
-              _context5.next = 19;
-              break;
-
-            case 18:
-              _context5.t1 = file.uri;
-
-            case 19:
-              _context5.t0 = _context5.t1;
-
-            case 20:
-              localUri = _context5.t0;
-              uri = file.name || localUri || '';
-              _context5.next = 24;
+              uri = _context6.t0;
+              _context6.next = 18;
               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,
@@ -884,32 +933,32 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
                 width: file.width
               });
 
-            case 24:
-              compressedUri = _context5.sent;
+            case 18:
+              compressedUri = _context6.sent;
               filename = uri.replace(/^(file:\/\/|content:\/\/|assets-library:\/\/)/, '');
               contentType = (0, _mimeTypes.lookup)(filename) || 'multipart/form-data';
 
               if (!value.doImageUploadRequest) {
-                _context5.next = 33;
+                _context6.next = 27;
                 break;
               }
 
-              _context5.next = 30;
+              _context6.next = 24;
               return value.doImageUploadRequest(file, channel);
 
-            case 30:
-              response = _context5.sent;
-              _context5.next = 41;
+            case 24:
+              response = _context6.sent;
+              _context6.next = 35;
               break;
 
-            case 33:
+            case 27:
               if (!(compressedUri && channel)) {
-                _context5.next = 41;
+                _context6.next = 35;
                 break;
               }
 
               if (!value.sendImageAsync) {
-                _context5.next = 38;
+                _context6.next = 32;
                 break;
               }
 
@@ -929,17 +978,17 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
                   setImageUploads(newImageUploads);
                 }
               });
-              _context5.next = 41;
+              _context6.next = 35;
               break;
 
-            case 38:
-              _context5.next = 40;
+            case 32:
+              _context6.next = 34;
               return channel.sendImage(compressedUri, file.filename, contentType);
 
-            case 40:
-              response = _context5.sent;
+            case 34:
+              response = _context6.sent;
 
-            case 41:
+            case 35:
               if (Object.keys(response).length) {
                 newImageUploads = getUploadSetStateAction(id, _utils.FileState.UPLOADED, {
                   height: file.height,
@@ -949,20 +998,20 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
                 setImageUploads(newImageUploads);
               }
 
-              _context5.next = 47;
+              _context6.next = 41;
               break;
 
-            case 44:
-              _context5.prev = 44;
-              _context5.t2 = _context5["catch"](5);
-              handleFileOrImageUploadError(_context5.t2, true, id);
+            case 38:
+              _context6.prev = 38;
+              _context6.t2 = _context6["catch"](5);
+              handleFileOrImageUploadError(_context6.t2, true, id);
 
-            case 47:
+            case 41:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
         }
-      }, _callee5, null, [[5, 44]]);
+      }, _callee6, null, [[5, 38]]);
     }));
 
     return function uploadImage(_x2) {
@@ -971,11 +1020,11 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
   }();
 
   var uploadNewFile = function () {
-    var _ref10 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee6(file) {
+    var _ref11 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee7(file) {
       var id, mimeType, isBlockedFileExtension, isBlockedFileMimeType, fileState, newFile;
-      return _regenerator["default"].wrap(function _callee6$(_context6) {
+      return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context6.prev = _context6.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
               id = (0, _utils.generateRandomId)();
               mimeType = (0, _mimeTypes.lookup)(file.name);
@@ -1000,7 +1049,7 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
                 progress: 0,
                 state: fileState
               };
-              _context6.next = 8;
+              _context7.next = 8;
               return Promise.all([setFileUploads(function (prevFileUploads) {
                 return prevFileUploads.concat([newFile]);
               }), setNumberOfUploads(function (prevNumberOfUploads) {
@@ -1016,23 +1065,23 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
 
             case 9:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
         }
-      }, _callee6);
+      }, _callee7);
     }));
 
     return function uploadNewFile(_x3) {
-      return _ref10.apply(this, arguments);
+      return _ref11.apply(this, arguments);
     };
   }();
 
   var uploadNewImage = function () {
-    var _ref11 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee7(image) {
+    var _ref12 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee8(image) {
       var id, isBlockedImageMimeType, isBlockedImageExtension, imageState, newImage;
-      return _regenerator["default"].wrap(function _callee7$(_context7) {
+      return _regenerator["default"].wrap(function _callee8$(_context8) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context8.prev = _context8.next) {
             case 0:
               id = (0, _utils.generateRandomId)();
               isBlockedImageMimeType = blockedImageMimeTypes == null ? void 0 : blockedImageMimeTypes.some(function (mimeType) {
@@ -1051,7 +1100,7 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
                 id: id,
                 state: imageState
               };
-              _context7.next = 7;
+              _context8.next = 7;
               return Promise.all([setImageUploads(function (prevImageUploads) {
                 return prevImageUploads.concat([newImage]);
               }), setNumberOfUploads(function (prevNumberOfUploads) {
@@ -1067,14 +1116,14 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
 
             case 8:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
         }
-      }, _callee7);
+      }, _callee8);
     }));
 
     return function uploadNewImage(_x4) {
-      return _ref11.apply(this, arguments);
+      return _ref12.apply(this, arguments);
     };
   }();
 
@@ -1134,7 +1183,7 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1141,
+      lineNumber: 1143,
       columnNumber: 5
     }
   }, children);
@@ -1161,7 +1210,7 @@ var withMessageInputContext = function withMessageInputContext(Component) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1181,
+        lineNumber: 1183,
         columnNumber: 12
       }
     }));