@bigbinary/neeto-media-recorder 2.6.4 → 2.6.5

package/index.js

@@ -1054,7 +1054,8 @@ var UploadingInProgress = function UploadingInProgress(_ref) {
     uploadProgress = _ref.uploadProgress,
     uploadStatus = _ref.uploadStatus,
     onDiscard = _ref.onDiscard,
-    onRetryUpload = _ref.onRetryUpload;
+    onRetryUpload = _ref.onRetryUpload,
+    isRetryUpload = _ref.isRetryUpload;
   var _useState = useState(""),
     _useState2 = _slicedToArray(_useState, 2),
     baseURL = _useState2[0],
@@ -1133,8 +1134,9 @@ var UploadingInProgress = function UploadingInProgress(_ref) {
           onClick: handleRecordingBlobDownload
         }), /*#__PURE__*/jsx(Button, {
           "data-cy": "recorder-retry-upload-button",
+          disabled: isRetryUpload,
           icon: Refresh,
-          label: "Retry",
+          label: t("neetoMediaRecorder.record.retry"),
           style: "tertiary",
           onClick: onRetryUpload
         }), /*#__PURE__*/jsx(Button, {
@@ -1432,15 +1434,28 @@ var MediaRecorder = function MediaRecorder(_ref, ref) {
     setUploadProgress(progress);
   };
   var handleReUpload = function handleReUpload() {
+    var _uploaderCallbacks;
     var multipartS3Uploader = getMultipartS3Uploader();
     setIsRetryUpload(true);
     setUploadProgress(0);
     multipartS3Uploader.abortUpload();
 
     // Create a new multipartS3Uploader instance to push the blob
-    getMultipartS3Uploader({
+    var newMultipartS3Uploader = getMultipartS3Uploader({
       initialize: true
-    }).push(screenRecorder.getWebmMediaBlob());
+    });
+    newMultipartS3Uploader.push(screenRecorder.getWebmMediaBlob());
+
+    // Attach callbacks to the new multipartS3Uploader instance
+    var uploaderCallbacks = (_uploaderCallbacks = {}, _defineProperty(_uploaderCallbacks, UPLOAD_EVENT.onComplete, handleUploadComplete), _defineProperty(_uploaderCallbacks, UPLOAD_EVENT.onError, handleUploadError), _defineProperty(_uploaderCallbacks, UPLOAD_EVENT.onProgress, handleUploadProgress), _defineProperty(_uploaderCallbacks, UPLOAD_EVENT.onAbort, function () {
+      Object.keys(uploaderCallbacks).forEach(function (key) {
+        multipartS3Uploader.removeCallback(key, uploaderCallbacks[key]);
+      });
+      multipartS3Uploader.removeCallback(UPLOAD_EVENT.onAbort, uploaderCallbacks[UPLOAD_EVENT.onAbort]);
+    }), _uploaderCallbacks);
+    Object.keys(uploaderCallbacks).forEach(function (key) {
+      newMultipartS3Uploader.addCallback(key, uploaderCallbacks[key]);
+    });
     handleCreateRecording();
   };
   useImperativeHandle(ref, function () {
@@ -1460,7 +1475,7 @@ var MediaRecorder = function MediaRecorder(_ref, ref) {
   useEffect(function () {
     var _cleanupFunction = noop;
     var handleOnScreenRecorderStart = function handleOnScreenRecorderStart() {
-      var _recorderCallbacks, _uploaderCallbacks;
+      var _recorderCallbacks, _uploaderCallbacks2;
       var multipartS3Uploader = getMultipartS3Uploader({
         initialize: true
       });
@@ -1484,7 +1499,7 @@ var MediaRecorder = function MediaRecorder(_ref, ref) {
           }
         }, _callee3);
       }))), _defineProperty(_recorderCallbacks, SCREEN_RECORDER_EVENT.onDiscard, handleDiscardRecording), _defineProperty(_recorderCallbacks, SCREEN_RECORDER_EVENT.onRestart, handleRestartRecording), _recorderCallbacks);
-      var uploaderCallbacks = (_uploaderCallbacks = {}, _defineProperty(_uploaderCallbacks, UPLOAD_EVENT.onComplete, handleUploadComplete), _defineProperty(_uploaderCallbacks, UPLOAD_EVENT.onError, handleUploadError), _defineProperty(_uploaderCallbacks, UPLOAD_EVENT.onProgress, handleUploadProgress), _uploaderCallbacks);
+      var uploaderCallbacks = (_uploaderCallbacks2 = {}, _defineProperty(_uploaderCallbacks2, UPLOAD_EVENT.onComplete, handleUploadComplete), _defineProperty(_uploaderCallbacks2, UPLOAD_EVENT.onError, handleUploadError), _defineProperty(_uploaderCallbacks2, UPLOAD_EVENT.onProgress, handleUploadProgress), _uploaderCallbacks2);
       Object.keys(recorderCallbacks).forEach(function (key) {
         screenRecorder.addCallback(key, recorderCallbacks[key]);
       });
@@ -1545,6 +1560,7 @@ var MediaRecorder = function MediaRecorder(_ref, ref) {
   }
   if (isRetryUpload || isRecorderStatus(SCREEN_RECORDER_STATUS.stopped) && (isCreatingRecording || isBeingUploadedOrHasErrorUploading)) {
     return /*#__PURE__*/jsx(UploadingInProgress, {
+      isRetryUpload: isRetryUpload,
       recording: recording,
       uploadProgress: uploadProgress,
       uploadStatus: uploadStatus,