sceyt-chat-react-uikit 1.9.2-beta.4 → 1.9.2-beta.6

package/index.js

@@ -9785,6 +9785,19 @@ function _finallyRethrows(body, finalizer) {
 var CustomUploader;
 var sendAttachmentsAsSeparateMessages = false;
 var pendingUploaders = {};
+var notStartedUploads = new Map();
+var markUploadNotStarted = function markUploadNotStarted(attachmentId) {
+  notStartedUploads.set(attachmentId, {
+    paused: false
+  });
+};
+var isUploadNotStarted = function isUploadNotStarted(attachmentId) {
+  return notStartedUploads.has(attachmentId);
+};
+var isUploadPausedBeforeStart = function isUploadPausedBeforeStart(attachmentId) {
+  var _notStartedUploads$ge;
+  return !!((_notStartedUploads$ge = notStartedUploads.get(attachmentId)) !== null && _notStartedUploads$ge !== void 0 && _notStartedUploads$ge.paused);
+};
 var setCustomUploader = function setCustomUploader(uploader) {
   CustomUploader = uploader;
 };
@@ -9824,7 +9837,12 @@ var customUpload = function customUpload(attachment, progress, messageType, getU
         resume: function resume() {}
       };
       pendingUploaders[attachment.tid] = uploadTask;
+      var pausedBeforeStart = isUploadPausedBeforeStart(attachment.tid);
+      notStartedUploads["delete"](attachment.tid);
       CustomUploader.upload(attachment, uploadTask, messageType);
+      if (pausedBeforeStart) {
+        uploadTask.stop();
+      }
     } else {
       reject(new Error('No Custom uploader'));
     }
@@ -9833,6 +9851,11 @@ var customUpload = function customUpload(attachment, progress, messageType, getU
 var pauseUpload = function pauseUpload(attachmentId) {
   if (pendingUploaders[attachmentId]) {
     return pendingUploaders[attachmentId].stop();
+  } else if (notStartedUploads.has(attachmentId)) {
+    notStartedUploads.set(attachmentId, {
+      paused: true
+    });
+    return true;
   } else {
     log.info('Unknown uploading task');
     return false;
@@ -9841,12 +9864,18 @@ var pauseUpload = function pauseUpload(attachmentId) {
 var resumeUpload = function resumeUpload(attachmentId) {
   if (pendingUploaders[attachmentId]) {
     return pendingUploaders[attachmentId].resume();
+  } else if (notStartedUploads.has(attachmentId)) {
+    notStartedUploads.set(attachmentId, {
+      paused: false
+    });
+    return true;
   } else {
     log.info('Unknown uploading task');
     return false;
   }
 };
 var cancelUpload = function cancelUpload(attachmentId) {
+  notStartedUploads["delete"](attachmentId);
   var task = pendingUploaders[attachmentId];
   if (task) {
     delete pendingUploaders[attachmentId];
@@ -18548,10 +18577,13 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
         var fileType = (_attachment$url = attachment.url) === null || _attachment$url === void 0 ? void 0 : (_attachment$url$type = _attachment$url.type) === null || _attachment$url$type === void 0 ? void 0 : _attachment$url$type.split('/')[0];
         var _temp12 = function () {
           if (attachment.type === attachmentTypes.video) {
+            if (!attachment.cachedUrl) {
+              markUploadNotStarted(attachment.tid);
+            }
             return Promise.resolve(prepareAndUploadVideoPreview(attachment, message.type)).then(function (_prepareAndUploadVide) {
               attachment = _prepareAndUploadVide;
               if (!attachment.cachedUrl) {
-                store.dispatch(updateAttachmentUploadingStateAC(UPLOAD_STATE.UPLOADING, attachment.tid));
+                store.dispatch(updateAttachmentUploadingStateAC(isUploadPausedBeforeStart(attachment.tid) ? UPLOAD_STATE.PAUSED : UPLOAD_STATE.UPLOADING, attachment.tid));
               }
             });
           }
@@ -23985,7 +24017,7 @@ function pauseAttachmentUploading(action) {
   }, _marked48, null, [[0, 2]]);
 }
 function resumeAttachmentUploading(action) {
-  var attachmentId, isResumed, _t46;
+  var attachmentId, preparing, isResumed, _t46;
   return _regenerator().w(function (_context58) {
     while (1) switch (_context58.p = _context58.n) {
       case 0:
@@ -23996,13 +24028,14 @@ function resumeAttachmentUploading(action) {
           _context58.n = 1;
           break;
         }
+        preparing = isUploadNotStarted(attachmentId);
         isResumed = resumeUpload(attachmentId);
         if (!isResumed) {
           _context58.n = 1;
           break;
         }
         _context58.n = 1;
-        return effects.put(updateAttachmentUploadingStateAC(UPLOAD_STATE.UPLOADING, attachmentId));
+        return effects.put(updateAttachmentUploadingStateAC(preparing ? UPLOAD_STATE.PREPARING : UPLOAD_STATE.UPLOADING, attachmentId));
       case 1:
         _context58.n = 3;
         break;
@@ -42476,13 +42509,14 @@ var Attachment = function Attachment(_ref) {
       setDownloadIsCancelled(true);
     }
   };
+  var pauseResumeUploadLabel = downloadingFile ? 'Cancel file download' : attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING || attachmentCompilationState[attachment.tid] === UPLOAD_STATE.PREPARING ? 'Stop upload' : 'Resume upload';
   var handlePauseResumeUpload = function handlePauseResumeUpload(e) {
     e.stopPropagation();
     if (downloadingFile) {
       handleStopStartDownloadFile(attachment);
     } else {
       if (attachmentCompilationState[attachment.tid]) {
-        if (attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING) {
+        if (attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING || attachmentCompilationState[attachment.tid] === UPLOAD_STATE.PREPARING) {
           dispatch(pauseAttachmentUploadingAC(attachment.tid));
         } else {
           dispatch(resumeAttachmentUploadingAC(attachment.tid));
@@ -42853,6 +42887,9 @@ var Attachment = function Attachment(_ref) {
   }, [attachment.id, attachment.type, attachment.url, attachment.metadata, attachment.attachmentUrl, isDetailsView, originalVideoUrlFromMap, connectionStatus, dispatch, messageType, attachment.size, videoDownloadRetry, isSharedOriginalVideoCancelled, sharedOriginalVideoDownload.state]);
   var handleResumeOriginalVideoDownload = function handleResumeOriginalVideoDownload(event) {
     event.stopPropagation();
+    restartOriginalVideoDownload();
+  };
+  var restartOriginalVideoDownload = function restartOriginalVideoDownload() {
     if (!attachment.url) return;
     var _getVideoAttachmentCa2 = getVideoAttachmentCacheKeys(attachment.url, attachment.metadata),
       originalVideoCacheKey = _getVideoAttachmentCa2.originalVideo;
@@ -42889,6 +42926,9 @@ var Attachment = function Attachment(_ref) {
   };
   var handleResumeOriginalImageDownload = function handleResumeOriginalImageDownload(event) {
     event.stopPropagation();
+    restartOriginalImageDownload();
+  };
+  var restartOriginalImageDownload = function restartOriginalImageDownload() {
     if (!attachment.url) return;
     var imageDownloadRequest = imageDownloadRequestRef.current + 1;
     imageDownloadRequestRef.current = imageDownloadRequest;
@@ -42932,6 +42972,17 @@ var Attachment = function Attachment(_ref) {
       log.error('Error restarting image attachment download:', error);
     });
   };
+  var previousConnectionStatusRef = React.useRef(connectionStatus);
+  React.useEffect(function () {
+    var reconnected = connectionStatus === CONNECTION_STATUS.CONNECTED && previousConnectionStatusRef.current !== CONNECTION_STATUS.CONNECTED;
+    previousConnectionStatusRef.current = connectionStatus;
+    if (!reconnected) return;
+    if (attachment.type === attachmentTypes.video && isSharedOriginalVideoFailed) {
+      restartOriginalVideoDownload();
+    } else if (attachment.type === attachmentTypes.image && sharedOriginalImageDownload.state === 'failed') {
+      restartOriginalImageDownload();
+    }
+  }, [connectionStatus]);
   var handleCancelOriginalVideoDownload = function handleCancelOriginalVideoDownload(event) {
     event.stopPropagation();
     if (isSharedOriginalVideoDownloading && originalVideoDownloadKey) {
@@ -43201,7 +43252,8 @@ var Attachment = function Attachment(_ref) {
     isDetailsView: isDetailsView,
     backgroundColor: overlayBackground2
   }, isInUploadingState ? (/*#__PURE__*/React__default.createElement(CancelResumeWrapper, {
-    onClick: handlePauseResumeUpload
+    onClick: handlePauseResumeUpload,
+    "aria-label": pauseResumeUploadLabel
   }, attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING ? (/*#__PURE__*/React__default.createElement(SvgCancel, null)) : (/*#__PURE__*/React__default.createElement(SvgUpload, null)))) : !isCached && (/*#__PURE__*/React__default.createElement(CancelResumeWrapper, {
     "aria-label": 'Cancel image download',
     onClick: function onClick(e) {
@@ -43283,7 +43335,8 @@ var Attachment = function Attachment(_ref) {
     isDetailsView: isDetailsView,
     backgroundColor: overlayBackground2
   }, isInUploadingState ? (/*#__PURE__*/React__default.createElement(CancelResumeWrapper, {
-    onClick: handlePauseResumeUpload
+    onClick: handlePauseResumeUpload,
+    "aria-label": pauseResumeUploadLabel
   }, attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING || isPreparingVideo ? (/*#__PURE__*/React__default.createElement(SvgCancel, null)) : (/*#__PURE__*/React__default.createElement(SvgUpload, null)))) : (/*#__PURE__*/React__default.createElement(CancelResumeWrapper, {
     onClick: handleCancelOriginalVideoDownload,
     "aria-label": 'Cancel video download'
@@ -43435,7 +43488,8 @@ var Attachment = function Attachment(_ref) {
     isDetailsView: isDetailsView,
     backgroundColor: overlayBackground2
   }, (isInUploadingState || downloadingFile) && (/*#__PURE__*/React__default.createElement(CancelResumeWrapper, {
-    onClick: handlePauseResumeUpload
+    onClick: handlePauseResumeUpload,
+    "aria-label": pauseResumeUploadLabel
   }, attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING || downloadingFile ? (/*#__PURE__*/React__default.createElement(SvgCancel, null)) : isInUploadingState && /*#__PURE__*/React__default.createElement(SvgUpload, null))), (attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING || downloadingFile) && (/*#__PURE__*/React__default.createElement(ProgressWrapper, null, /*#__PURE__*/React__default.createElement(reactCircularProgressbar.CircularProgressbar, {
     minValue: 0,
     maxValue: 100,

package/index.modern.js

@@ -9766,6 +9766,19 @@ function _finallyRethrows(body, finalizer) {
 var CustomUploader;
 var sendAttachmentsAsSeparateMessages = false;
 var pendingUploaders = {};
+var notStartedUploads = new Map();
+var markUploadNotStarted = function markUploadNotStarted(attachmentId) {
+  notStartedUploads.set(attachmentId, {
+    paused: false
+  });
+};
+var isUploadNotStarted = function isUploadNotStarted(attachmentId) {
+  return notStartedUploads.has(attachmentId);
+};
+var isUploadPausedBeforeStart = function isUploadPausedBeforeStart(attachmentId) {
+  var _notStartedUploads$ge;
+  return !!((_notStartedUploads$ge = notStartedUploads.get(attachmentId)) !== null && _notStartedUploads$ge !== void 0 && _notStartedUploads$ge.paused);
+};
 var setCustomUploader = function setCustomUploader(uploader) {
   CustomUploader = uploader;
 };
@@ -9805,7 +9818,12 @@ var customUpload = function customUpload(attachment, progress, messageType, getU
         resume: function resume() {}
       };
       pendingUploaders[attachment.tid] = uploadTask;
+      var pausedBeforeStart = isUploadPausedBeforeStart(attachment.tid);
+      notStartedUploads["delete"](attachment.tid);
       CustomUploader.upload(attachment, uploadTask, messageType);
+      if (pausedBeforeStart) {
+        uploadTask.stop();
+      }
     } else {
       reject(new Error('No Custom uploader'));
     }
@@ -9814,6 +9832,11 @@ var customUpload = function customUpload(attachment, progress, messageType, getU
 var pauseUpload = function pauseUpload(attachmentId) {
   if (pendingUploaders[attachmentId]) {
     return pendingUploaders[attachmentId].stop();
+  } else if (notStartedUploads.has(attachmentId)) {
+    notStartedUploads.set(attachmentId, {
+      paused: true
+    });
+    return true;
   } else {
     log.info('Unknown uploading task');
     return false;
@@ -9822,12 +9845,18 @@ var pauseUpload = function pauseUpload(attachmentId) {
 var resumeUpload = function resumeUpload(attachmentId) {
   if (pendingUploaders[attachmentId]) {
     return pendingUploaders[attachmentId].resume();
+  } else if (notStartedUploads.has(attachmentId)) {
+    notStartedUploads.set(attachmentId, {
+      paused: false
+    });
+    return true;
   } else {
     log.info('Unknown uploading task');
     return false;
   }
 };
 var cancelUpload = function cancelUpload(attachmentId) {
+  notStartedUploads["delete"](attachmentId);
   var task = pendingUploaders[attachmentId];
   if (task) {
     delete pendingUploaders[attachmentId];
@@ -18529,10 +18558,13 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
         var fileType = (_attachment$url = attachment.url) === null || _attachment$url === void 0 ? void 0 : (_attachment$url$type = _attachment$url.type) === null || _attachment$url$type === void 0 ? void 0 : _attachment$url$type.split('/')[0];
         var _temp12 = function () {
           if (attachment.type === attachmentTypes.video) {
+            if (!attachment.cachedUrl) {
+              markUploadNotStarted(attachment.tid);
+            }
             return Promise.resolve(prepareAndUploadVideoPreview(attachment, message.type)).then(function (_prepareAndUploadVide) {
               attachment = _prepareAndUploadVide;
               if (!attachment.cachedUrl) {
-                store.dispatch(updateAttachmentUploadingStateAC(UPLOAD_STATE.UPLOADING, attachment.tid));
+                store.dispatch(updateAttachmentUploadingStateAC(isUploadPausedBeforeStart(attachment.tid) ? UPLOAD_STATE.PAUSED : UPLOAD_STATE.UPLOADING, attachment.tid));
               }
             });
           }
@@ -23966,7 +23998,7 @@ function pauseAttachmentUploading(action) {
   }, _marked48, null, [[0, 2]]);
 }
 function resumeAttachmentUploading(action) {
-  var attachmentId, isResumed, _t46;
+  var attachmentId, preparing, isResumed, _t46;
   return _regenerator().w(function (_context58) {
     while (1) switch (_context58.p = _context58.n) {
       case 0:
@@ -23977,13 +24009,14 @@ function resumeAttachmentUploading(action) {
           _context58.n = 1;
           break;
         }
+        preparing = isUploadNotStarted(attachmentId);
         isResumed = resumeUpload(attachmentId);
         if (!isResumed) {
           _context58.n = 1;
           break;
         }
         _context58.n = 1;
-        return put(updateAttachmentUploadingStateAC(UPLOAD_STATE.UPLOADING, attachmentId));
+        return put(updateAttachmentUploadingStateAC(preparing ? UPLOAD_STATE.PREPARING : UPLOAD_STATE.UPLOADING, attachmentId));
       case 1:
         _context58.n = 3;
         break;
@@ -42457,13 +42490,14 @@ var Attachment = function Attachment(_ref) {
       setDownloadIsCancelled(true);
     }
   };
+  var pauseResumeUploadLabel = downloadingFile ? 'Cancel file download' : attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING || attachmentCompilationState[attachment.tid] === UPLOAD_STATE.PREPARING ? 'Stop upload' : 'Resume upload';
   var handlePauseResumeUpload = function handlePauseResumeUpload(e) {
     e.stopPropagation();
     if (downloadingFile) {
       handleStopStartDownloadFile(attachment);
     } else {
       if (attachmentCompilationState[attachment.tid]) {
-        if (attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING) {
+        if (attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING || attachmentCompilationState[attachment.tid] === UPLOAD_STATE.PREPARING) {
           dispatch(pauseAttachmentUploadingAC(attachment.tid));
         } else {
           dispatch(resumeAttachmentUploadingAC(attachment.tid));
@@ -42834,6 +42868,9 @@ var Attachment = function Attachment(_ref) {
   }, [attachment.id, attachment.type, attachment.url, attachment.metadata, attachment.attachmentUrl, isDetailsView, originalVideoUrlFromMap, connectionStatus, dispatch, messageType, attachment.size, videoDownloadRetry, isSharedOriginalVideoCancelled, sharedOriginalVideoDownload.state]);
   var handleResumeOriginalVideoDownload = function handleResumeOriginalVideoDownload(event) {
     event.stopPropagation();
+    restartOriginalVideoDownload();
+  };
+  var restartOriginalVideoDownload = function restartOriginalVideoDownload() {
     if (!attachment.url) return;
     var _getVideoAttachmentCa2 = getVideoAttachmentCacheKeys(attachment.url, attachment.metadata),
       originalVideoCacheKey = _getVideoAttachmentCa2.originalVideo;
@@ -42870,6 +42907,9 @@ var Attachment = function Attachment(_ref) {
   };
   var handleResumeOriginalImageDownload = function handleResumeOriginalImageDownload(event) {
     event.stopPropagation();
+    restartOriginalImageDownload();
+  };
+  var restartOriginalImageDownload = function restartOriginalImageDownload() {
     if (!attachment.url) return;
     var imageDownloadRequest = imageDownloadRequestRef.current + 1;
     imageDownloadRequestRef.current = imageDownloadRequest;
@@ -42913,6 +42953,17 @@ var Attachment = function Attachment(_ref) {
       log.error('Error restarting image attachment download:', error);
     });
   };
+  var previousConnectionStatusRef = useRef(connectionStatus);
+  useEffect(function () {
+    var reconnected = connectionStatus === CONNECTION_STATUS.CONNECTED && previousConnectionStatusRef.current !== CONNECTION_STATUS.CONNECTED;
+    previousConnectionStatusRef.current = connectionStatus;
+    if (!reconnected) return;
+    if (attachment.type === attachmentTypes.video && isSharedOriginalVideoFailed) {
+      restartOriginalVideoDownload();
+    } else if (attachment.type === attachmentTypes.image && sharedOriginalImageDownload.state === 'failed') {
+      restartOriginalImageDownload();
+    }
+  }, [connectionStatus]);
   var handleCancelOriginalVideoDownload = function handleCancelOriginalVideoDownload(event) {
     event.stopPropagation();
     if (isSharedOriginalVideoDownloading && originalVideoDownloadKey) {
@@ -43182,7 +43233,8 @@ var Attachment = function Attachment(_ref) {
     isDetailsView: isDetailsView,
     backgroundColor: overlayBackground2
   }, isInUploadingState ? (/*#__PURE__*/React__default.createElement(CancelResumeWrapper, {
-    onClick: handlePauseResumeUpload
+    onClick: handlePauseResumeUpload,
+    "aria-label": pauseResumeUploadLabel
   }, attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING ? (/*#__PURE__*/React__default.createElement(SvgCancel, null)) : (/*#__PURE__*/React__default.createElement(SvgUpload, null)))) : !isCached && (/*#__PURE__*/React__default.createElement(CancelResumeWrapper, {
     "aria-label": 'Cancel image download',
     onClick: function onClick(e) {
@@ -43264,7 +43316,8 @@ var Attachment = function Attachment(_ref) {
     isDetailsView: isDetailsView,
     backgroundColor: overlayBackground2
   }, isInUploadingState ? (/*#__PURE__*/React__default.createElement(CancelResumeWrapper, {
-    onClick: handlePauseResumeUpload
+    onClick: handlePauseResumeUpload,
+    "aria-label": pauseResumeUploadLabel
   }, attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING || isPreparingVideo ? (/*#__PURE__*/React__default.createElement(SvgCancel, null)) : (/*#__PURE__*/React__default.createElement(SvgUpload, null)))) : (/*#__PURE__*/React__default.createElement(CancelResumeWrapper, {
     onClick: handleCancelOriginalVideoDownload,
     "aria-label": 'Cancel video download'
@@ -43416,7 +43469,8 @@ var Attachment = function Attachment(_ref) {
     isDetailsView: isDetailsView,
     backgroundColor: overlayBackground2
   }, (isInUploadingState || downloadingFile) && (/*#__PURE__*/React__default.createElement(CancelResumeWrapper, {
-    onClick: handlePauseResumeUpload
+    onClick: handlePauseResumeUpload,
+    "aria-label": pauseResumeUploadLabel
   }, attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING || downloadingFile ? (/*#__PURE__*/React__default.createElement(SvgCancel, null)) : isInUploadingState && /*#__PURE__*/React__default.createElement(SvgUpload, null))), (attachmentCompilationState[attachment.tid] === UPLOAD_STATE.UPLOADING || downloadingFile) && (/*#__PURE__*/React__default.createElement(ProgressWrapper, null, /*#__PURE__*/React__default.createElement(CircularProgressbar, {
     minValue: 0,
     maxValue: 100,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sceyt-chat-react-uikit",
-  "version": "1.9.2-beta.4",
+  "version": "1.9.2-beta.6",
   "description": "Interactive React UI Components for Sceyt Chat.",
   "author": "Sceyt",
   "license": "MIT",