@atlaskit/media-picker 66.2.4 → 66.2.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/media-picker
 
+## 66.2.5
+
+### Patch Changes
+
+- [`b4e36677fdb`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b4e36677fdb) - Batch 255 items for 'addFilesWithSource' due to backend limits
+
 ## 66.2.4
 
 ### Patch Changes

package/dist/cjs/service/uploadServiceImpl.js

@@ -97,17 +97,12 @@ var UploadServiceImpl = /*#__PURE__*/function () {
   }, {
     key: "addFiles",
     value: function addFiles(files) {
-      var maxUploadBatchSize = this.maxUploadBatchSize;
-      var traceContext = generateTraceContext();
-      for (var iterator = 0; iterator < files.length; iterator += maxUploadBatchSize) {
-        var filesArray = files.slice(iterator, iterator + maxUploadBatchSize).map(function (file) {
-          return {
-            file: file,
-            source: _types.LocalFileSource.LocalUpload
-          };
-        });
-        this.addFilesWithSource(filesArray, traceContext);
-      }
+      this.addFilesWithSource(files.map(function (file) {
+        return {
+          file: file,
+          source: _types.LocalFileSource.LocalUpload
+        };
+      }));
     }
   }, {
     key: "addFile",
@@ -122,49 +117,90 @@ var UploadServiceImpl = /*#__PURE__*/function () {
     key: "addFilesWithSource",
     value: function () {
       var _addFilesWithSource = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(files) {
-        var _this2 = this;
         var traceContext,
-          creationDate,
-          userMediaClient,
-          tenantMediaClient,
-          shouldCopyFileToRecents,
-          mediaClient,
-          _this$tenantUploadPar,
-          collectionTentant,
-          expireAfter,
-          collection,
-          touchFileDescriptors,
-          i,
-          _files$i,
-          replaceFileId,
-          file,
-          touchedFiles,
-          caughtError,
-          cancellableFileUploads,
-          filteredCancellableFileUploads,
-          mediaFiles,
+          batches,
+          iterator,
           _args2 = arguments;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               traceContext = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : generateTraceContext();
+              batches = [];
+              for (iterator = 0; iterator < files.length; iterator += this.maxUploadBatchSize) {
+                batches.push(this.addFilesAndUpload(files.slice(iterator, iterator + this.maxUploadBatchSize), traceContext));
+              }
+              _context2.next = 5;
+              return Promise.all(batches);
+            case 5:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function addFilesWithSource(_x4) {
+        return _addFilesWithSource.apply(this, arguments);
+      }
+      return addFilesWithSource;
+    }()
+  }, {
+    key: "isCancellableFileUpload",
+    value: function isCancellableFileUpload(fileUpload) {
+      return fileUpload !== null;
+    }
+  }, {
+    key: "cancel",
+    value: function cancel(id) {
+      var _this2 = this;
+      if (id) {
+        var cancellableFileUpload = this.cancellableFilesUploads[id];
+        if (cancellableFileUpload && cancellableFileUpload.cancel) {
+          cancellableFileUpload.cancel();
+        }
+      } else {
+        Object.keys(this.cancellableFilesUploads).forEach(function (key) {
+          var cancellableFileUpload = _this2.cancellableFilesUploads[key];
+          if (cancellableFileUpload.cancel) {
+            cancellableFileUpload.cancel();
+          }
+        });
+      }
+    }
+  }, {
+    key: "on",
+    value: function on(event, listener) {
+      this.emitter.on(event, listener);
+    }
+  }, {
+    key: "off",
+    value: function off(event, listener) {
+      this.emitter.off(event, listener);
+    }
+  }, {
+    key: "addFilesAndUpload",
+    value: function () {
+      var _addFilesAndUpload = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(files, traceContext) {
+        var _this3 = this;
+        var creationDate, userMediaClient, tenantMediaClient, shouldCopyFileToRecents, mediaClient, _this$tenantUploadPar, collectionTentant, expireAfter, collection, touchFileDescriptors, i, _files$i, replaceFileId, file, touchedFiles, caughtError, cancellableFileUploads, filteredCancellableFileUploads, mediaFiles;
+        return _regenerator.default.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
               if (!(files.length === 0)) {
-                _context2.next = 3;
+                _context3.next = 2;
                 break;
               }
-              return _context2.abrupt("return");
-            case 3:
+              return _context3.abrupt("return");
+            case 2:
               creationDate = Date.now();
               userMediaClient = this.userMediaClient, tenantMediaClient = this.tenantMediaClient, shouldCopyFileToRecents = this.shouldCopyFileToRecents;
               mediaClient = shouldCopyFileToRecents ? tenantMediaClient : userMediaClient;
               _this$tenantUploadPar = this.tenantUploadParams, collectionTentant = _this$tenantUploadPar.collection, expireAfter = _this$tenantUploadPar.expireAfter;
               collection = shouldCopyFileToRecents ? collectionTentant : _constants.RECENTS_COLLECTION;
               if (mediaClient) {
-                _context2.next = 10;
+                _context3.next = 9;
                 break;
               }
-              return _context2.abrupt("return");
-            case 10:
+              return _context3.abrupt("return");
+            case 9:
               touchFileDescriptors = [];
               for (i = 0; i < files.length; i++) {
                 _files$i = files[i], replaceFileId = _files$i.replaceFileId, file = _files$i.file;
@@ -176,18 +212,18 @@ var UploadServiceImpl = /*#__PURE__*/function () {
                   expireAfter: expireAfter
                 });
               }
-              _context2.prev = 12;
-              _context2.next = 15;
+              _context3.prev = 11;
+              _context3.next = 14;
               return mediaClient.file.touchFiles(touchFileDescriptors, collection, traceContext);
-            case 15:
-              touchedFiles = _context2.sent;
-              _context2.next = 21;
+            case 14:
+              touchedFiles = _context3.sent;
+              _context3.next = 20;
               break;
-            case 18:
-              _context2.prev = 18;
-              _context2.t0 = _context2["catch"](12);
-              caughtError = _context2.t0;
-            case 21:
+            case 17:
+              _context3.prev = 17;
+              _context3.t0 = _context3["catch"](11);
+              caughtError = _context3.t0;
+            case 20:
               cancellableFileUploads = files.map(function (_ref2, i) {
                 var _touchedFiles, _touchedFiles$rejecte, _touchedFiles2, _caughtError$metadata;
                 var file = _ref2.file,
@@ -202,8 +238,8 @@ var UploadServiceImpl = /*#__PURE__*/function () {
                   return rejectedFileId === id;
                 });
                 if (rejectedFile) {
-                  if (_this2.fileRejectionHandler) {
-                    _this2.fileRejectionHandler({
+                  if (_this3.fileRejectionHandler) {
+                    _this3.fileRejectionHandler({
                       reason: 'fileSizeLimitExceeded',
                       fileName: file.name,
                       limit: rejectedFile.error.limit
@@ -242,7 +278,7 @@ var UploadServiceImpl = /*#__PURE__*/function () {
                   occurrenceKey: occurrenceKey,
                   deferredUploadId: deferredUploadId
                 };
-                var controller = _this2.createUploadController();
+                var controller = _this3.createUploadController();
                 var sourceFileObservable = mediaClient.file.upload(uploadableFile, controller, uploadableUpfrontIds, traceContext);
                 var mediaFile = {
                   id: id,
@@ -269,18 +305,18 @@ var UploadServiceImpl = /*#__PURE__*/function () {
                           mediaClient.emit('file-added', state);
                           _mediaClient.globalMediaEventEmitter.emit('file-added', state);
                         }
-                        _this2.onFileSuccess(cancellableFileUpload, id, traceContext);
+                        _this3.onFileSuccess(cancellableFileUpload, id, traceContext);
                       }
                       if (state.status === 'error') {
-                        _this2.onFileError(mediaFile, 'upload_fail', state.message || 'no-message', traceContext);
+                        _this3.onFileError(mediaFile, 'upload_fail', state.message || 'no-message', traceContext);
                       }
                     },
                     error: function error(_error) {
-                      _this2.onFileError(mediaFile, 'upload_fail', _error, traceContext);
+                      _this3.onFileError(mediaFile, 'upload_fail', _error, traceContext);
                     }
                   }),
                   unsubscribe = _sourceFileObservable.unsubscribe;
-                _this2.cancellableFilesUploads[id] = cancellableFileUpload;
+                _this3.cancellableFilesUploads[id] = cancellableFileUpload;
                 return cancellableFileUpload;
               });
               filteredCancellableFileUploads = cancellableFileUploads.filter(this.isCancellableFileUpload);
@@ -292,50 +328,17 @@ var UploadServiceImpl = /*#__PURE__*/function () {
                 traceContext: traceContext
               });
               this.emitPreviews(filteredCancellableFileUploads);
-            case 26:
+            case 25:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this, [[12, 18]]);
+        }, _callee3, this, [[11, 17]]);
       }));
-      function addFilesWithSource(_x4) {
-        return _addFilesWithSource.apply(this, arguments);
+      function addFilesAndUpload(_x5, _x6) {
+        return _addFilesAndUpload.apply(this, arguments);
       }
-      return addFilesWithSource;
+      return addFilesAndUpload;
     }()
-  }, {
-    key: "isCancellableFileUpload",
-    value: function isCancellableFileUpload(fileUpload) {
-      return fileUpload !== null;
-    }
-  }, {
-    key: "cancel",
-    value: function cancel(id) {
-      var _this3 = this;
-      if (id) {
-        var cancellableFileUpload = this.cancellableFilesUploads[id];
-        if (cancellableFileUpload && cancellableFileUpload.cancel) {
-          cancellableFileUpload.cancel();
-        }
-      } else {
-        Object.keys(this.cancellableFilesUploads).forEach(function (key) {
-          var cancellableFileUpload = _this3.cancellableFilesUploads[key];
-          if (cancellableFileUpload.cancel) {
-            cancellableFileUpload.cancel();
-          }
-        });
-      }
-    }
-  }, {
-    key: "on",
-    value: function on(event, listener) {
-      this.emitter.on(event, listener);
-    }
-  }, {
-    key: "off",
-    value: function off(event, listener) {
-      this.emitter.off(event, listener);
-    }
   }, {
     key: "emitPreviews",
     value: function emitPreviews(cancellableFileUploads) {

package/dist/cjs/util/analytics.js

@@ -9,7 +9,7 @@ var _mediaClient = require("@atlaskit/media-client");
 // Component name will be prefixed with "media-picker-" in logs. Check ufoExperiences in utils files
 
 var packageName = "@atlaskit/media-picker";
-var packageVersion = "66.2.4";
+var packageVersion = "66.2.5";
 function getPackageAttributes(componentName) {
   return {
     packageName: packageName,

package/dist/cjs/util/ufoExperiences.js

@@ -12,7 +12,7 @@ var _mediaClient = require("@atlaskit/media-client");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var packageName = "@atlaskit/media-picker";
-var packageVersion = "66.2.4";
+var packageVersion = "66.2.5";
 var ufoExperience;
 var initExperience = function initExperience(id, componentName) {
   if (!ufoExperience) {

package/dist/es2019/service/uploadServiceImpl.js

@@ -64,17 +64,10 @@ export class UploadServiceImpl {
     return new UploadController();
   }
   addFiles(files) {
-    const {
-      maxUploadBatchSize
-    } = this;
-    const traceContext = generateTraceContext();
-    for (let iterator = 0; iterator < files.length; iterator += maxUploadBatchSize) {
-      const filesArray = files.slice(iterator, iterator + maxUploadBatchSize).map(file => ({
-        file,
-        source: LocalFileSource.LocalUpload
-      }));
-      this.addFilesWithSource(filesArray, traceContext);
-    }
+    this.addFilesWithSource(files.map(file => ({
+      file,
+      source: LocalFileSource.LocalUpload
+    })));
   }
   addFile(file, replaceFileId) {
     this.addFilesWithSource([{
@@ -84,6 +77,37 @@ export class UploadServiceImpl {
     }]);
   }
   async addFilesWithSource(files, traceContext = generateTraceContext()) {
+    const batches = [];
+    for (let iterator = 0; iterator < files.length; iterator += this.maxUploadBatchSize) {
+      batches.push(this.addFilesAndUpload(files.slice(iterator, iterator + this.maxUploadBatchSize), traceContext));
+    }
+    await Promise.all(batches);
+  }
+  isCancellableFileUpload(fileUpload) {
+    return fileUpload !== null;
+  }
+  cancel(id) {
+    if (id) {
+      const cancellableFileUpload = this.cancellableFilesUploads[id];
+      if (cancellableFileUpload && cancellableFileUpload.cancel) {
+        cancellableFileUpload.cancel();
+      }
+    } else {
+      Object.keys(this.cancellableFilesUploads).forEach(key => {
+        const cancellableFileUpload = this.cancellableFilesUploads[key];
+        if (cancellableFileUpload.cancel) {
+          cancellableFileUpload.cancel();
+        }
+      });
+    }
+  }
+  on(event, listener) {
+    this.emitter.on(event, listener);
+  }
+  off(event, listener) {
+    this.emitter.off(event, listener);
+  }
+  async addFilesAndUpload(files, traceContext) {
     if (files.length === 0) {
       return;
     }
@@ -226,30 +250,6 @@ export class UploadServiceImpl {
     });
     this.emitPreviews(filteredCancellableFileUploads);
   }
-  isCancellableFileUpload(fileUpload) {
-    return fileUpload !== null;
-  }
-  cancel(id) {
-    if (id) {
-      const cancellableFileUpload = this.cancellableFilesUploads[id];
-      if (cancellableFileUpload && cancellableFileUpload.cancel) {
-        cancellableFileUpload.cancel();
-      }
-    } else {
-      Object.keys(this.cancellableFilesUploads).forEach(key => {
-        const cancellableFileUpload = this.cancellableFilesUploads[key];
-        if (cancellableFileUpload.cancel) {
-          cancellableFileUpload.cancel();
-        }
-      });
-    }
-  }
-  on(event, listener) {
-    this.emitter.on(event, listener);
-  }
-  off(event, listener) {
-    this.emitter.off(event, listener);
-  }
   emitPreviews(cancellableFileUploads) {
     cancellableFileUploads.forEach(cancellableFileUpload => {
       const {

package/dist/es2019/util/analytics.js

@@ -3,7 +3,7 @@ import { isRequestError } from '@atlaskit/media-client';
 // Component name will be prefixed with "media-picker-" in logs. Check ufoExperiences in utils files
 
 const packageName = "@atlaskit/media-picker";
-const packageVersion = "66.2.4";
+const packageVersion = "66.2.5";
 export function getPackageAttributes(componentName) {
   return {
     packageName,

package/dist/es2019/util/ufoExperiences.js

@@ -2,7 +2,7 @@ import { ConcurrentExperience, ExperiencePerformanceTypes, ExperienceTypes } fro
 import { getFeatureFlagKeysAllProducts } from '@atlaskit/media-common';
 import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
 const packageName = "@atlaskit/media-picker";
-const packageVersion = "66.2.4";
+const packageVersion = "66.2.5";
 let ufoExperience;
 const initExperience = (id, componentName) => {
   if (!ufoExperience) {

package/dist/esm/service/uploadServiceImpl.js

@@ -90,17 +90,12 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
   }, {
     key: "addFiles",
     value: function addFiles(files) {
-      var maxUploadBatchSize = this.maxUploadBatchSize;
-      var traceContext = generateTraceContext();
-      for (var iterator = 0; iterator < files.length; iterator += maxUploadBatchSize) {
-        var filesArray = files.slice(iterator, iterator + maxUploadBatchSize).map(function (file) {
-          return {
-            file: file,
-            source: LocalFileSource.LocalUpload
-          };
-        });
-        this.addFilesWithSource(filesArray, traceContext);
-      }
+      this.addFilesWithSource(files.map(function (file) {
+        return {
+          file: file,
+          source: LocalFileSource.LocalUpload
+        };
+      }));
     }
   }, {
     key: "addFile",
@@ -115,49 +110,90 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
     key: "addFilesWithSource",
     value: function () {
       var _addFilesWithSource = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(files) {
-        var _this2 = this;
         var traceContext,
-          creationDate,
-          userMediaClient,
-          tenantMediaClient,
-          shouldCopyFileToRecents,
-          mediaClient,
-          _this$tenantUploadPar,
-          collectionTentant,
-          expireAfter,
-          collection,
-          touchFileDescriptors,
-          i,
-          _files$i,
-          replaceFileId,
-          file,
-          touchedFiles,
-          caughtError,
-          cancellableFileUploads,
-          filteredCancellableFileUploads,
-          mediaFiles,
+          batches,
+          iterator,
           _args2 = arguments;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               traceContext = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : generateTraceContext();
+              batches = [];
+              for (iterator = 0; iterator < files.length; iterator += this.maxUploadBatchSize) {
+                batches.push(this.addFilesAndUpload(files.slice(iterator, iterator + this.maxUploadBatchSize), traceContext));
+              }
+              _context2.next = 5;
+              return Promise.all(batches);
+            case 5:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function addFilesWithSource(_x4) {
+        return _addFilesWithSource.apply(this, arguments);
+      }
+      return addFilesWithSource;
+    }()
+  }, {
+    key: "isCancellableFileUpload",
+    value: function isCancellableFileUpload(fileUpload) {
+      return fileUpload !== null;
+    }
+  }, {
+    key: "cancel",
+    value: function cancel(id) {
+      var _this2 = this;
+      if (id) {
+        var cancellableFileUpload = this.cancellableFilesUploads[id];
+        if (cancellableFileUpload && cancellableFileUpload.cancel) {
+          cancellableFileUpload.cancel();
+        }
+      } else {
+        Object.keys(this.cancellableFilesUploads).forEach(function (key) {
+          var cancellableFileUpload = _this2.cancellableFilesUploads[key];
+          if (cancellableFileUpload.cancel) {
+            cancellableFileUpload.cancel();
+          }
+        });
+      }
+    }
+  }, {
+    key: "on",
+    value: function on(event, listener) {
+      this.emitter.on(event, listener);
+    }
+  }, {
+    key: "off",
+    value: function off(event, listener) {
+      this.emitter.off(event, listener);
+    }
+  }, {
+    key: "addFilesAndUpload",
+    value: function () {
+      var _addFilesAndUpload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(files, traceContext) {
+        var _this3 = this;
+        var creationDate, userMediaClient, tenantMediaClient, shouldCopyFileToRecents, mediaClient, _this$tenantUploadPar, collectionTentant, expireAfter, collection, touchFileDescriptors, i, _files$i, replaceFileId, file, touchedFiles, caughtError, cancellableFileUploads, filteredCancellableFileUploads, mediaFiles;
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
               if (!(files.length === 0)) {
-                _context2.next = 3;
+                _context3.next = 2;
                 break;
               }
-              return _context2.abrupt("return");
-            case 3:
+              return _context3.abrupt("return");
+            case 2:
               creationDate = Date.now();
               userMediaClient = this.userMediaClient, tenantMediaClient = this.tenantMediaClient, shouldCopyFileToRecents = this.shouldCopyFileToRecents;
               mediaClient = shouldCopyFileToRecents ? tenantMediaClient : userMediaClient;
               _this$tenantUploadPar = this.tenantUploadParams, collectionTentant = _this$tenantUploadPar.collection, expireAfter = _this$tenantUploadPar.expireAfter;
               collection = shouldCopyFileToRecents ? collectionTentant : RECENTS_COLLECTION;
               if (mediaClient) {
-                _context2.next = 10;
+                _context3.next = 9;
                 break;
               }
-              return _context2.abrupt("return");
-            case 10:
+              return _context3.abrupt("return");
+            case 9:
               touchFileDescriptors = [];
               for (i = 0; i < files.length; i++) {
                 _files$i = files[i], replaceFileId = _files$i.replaceFileId, file = _files$i.file;
@@ -169,18 +205,18 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
                   expireAfter: expireAfter
                 });
               }
-              _context2.prev = 12;
-              _context2.next = 15;
+              _context3.prev = 11;
+              _context3.next = 14;
               return mediaClient.file.touchFiles(touchFileDescriptors, collection, traceContext);
-            case 15:
-              touchedFiles = _context2.sent;
-              _context2.next = 21;
+            case 14:
+              touchedFiles = _context3.sent;
+              _context3.next = 20;
               break;
-            case 18:
-              _context2.prev = 18;
-              _context2.t0 = _context2["catch"](12);
-              caughtError = _context2.t0;
-            case 21:
+            case 17:
+              _context3.prev = 17;
+              _context3.t0 = _context3["catch"](11);
+              caughtError = _context3.t0;
+            case 20:
               cancellableFileUploads = files.map(function (_ref2, i) {
                 var _touchedFiles, _touchedFiles$rejecte, _touchedFiles2, _caughtError$metadata;
                 var file = _ref2.file,
@@ -195,8 +231,8 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
                   return rejectedFileId === id;
                 });
                 if (rejectedFile) {
-                  if (_this2.fileRejectionHandler) {
-                    _this2.fileRejectionHandler({
+                  if (_this3.fileRejectionHandler) {
+                    _this3.fileRejectionHandler({
                       reason: 'fileSizeLimitExceeded',
                       fileName: file.name,
                       limit: rejectedFile.error.limit
@@ -235,7 +271,7 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
                   occurrenceKey: occurrenceKey,
                   deferredUploadId: deferredUploadId
                 };
-                var controller = _this2.createUploadController();
+                var controller = _this3.createUploadController();
                 var sourceFileObservable = mediaClient.file.upload(uploadableFile, controller, uploadableUpfrontIds, traceContext);
                 var mediaFile = {
                   id: id,
@@ -262,18 +298,18 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
                           mediaClient.emit('file-added', state);
                           globalMediaEventEmitter.emit('file-added', state);
                         }
-                        _this2.onFileSuccess(cancellableFileUpload, id, traceContext);
+                        _this3.onFileSuccess(cancellableFileUpload, id, traceContext);
                       }
                       if (state.status === 'error') {
-                        _this2.onFileError(mediaFile, 'upload_fail', state.message || 'no-message', traceContext);
+                        _this3.onFileError(mediaFile, 'upload_fail', state.message || 'no-message', traceContext);
                       }
                     },
                     error: function error(_error) {
-                      _this2.onFileError(mediaFile, 'upload_fail', _error, traceContext);
+                      _this3.onFileError(mediaFile, 'upload_fail', _error, traceContext);
                     }
                   }),
                   unsubscribe = _sourceFileObservable.unsubscribe;
-                _this2.cancellableFilesUploads[id] = cancellableFileUpload;
+                _this3.cancellableFilesUploads[id] = cancellableFileUpload;
                 return cancellableFileUpload;
               });
               filteredCancellableFileUploads = cancellableFileUploads.filter(this.isCancellableFileUpload);
@@ -285,50 +321,17 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
                 traceContext: traceContext
               });
               this.emitPreviews(filteredCancellableFileUploads);
-            case 26:
+            case 25:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this, [[12, 18]]);
+        }, _callee3, this, [[11, 17]]);
       }));
-      function addFilesWithSource(_x4) {
-        return _addFilesWithSource.apply(this, arguments);
+      function addFilesAndUpload(_x5, _x6) {
+        return _addFilesAndUpload.apply(this, arguments);
       }
-      return addFilesWithSource;
+      return addFilesAndUpload;
     }()
-  }, {
-    key: "isCancellableFileUpload",
-    value: function isCancellableFileUpload(fileUpload) {
-      return fileUpload !== null;
-    }
-  }, {
-    key: "cancel",
-    value: function cancel(id) {
-      var _this3 = this;
-      if (id) {
-        var cancellableFileUpload = this.cancellableFilesUploads[id];
-        if (cancellableFileUpload && cancellableFileUpload.cancel) {
-          cancellableFileUpload.cancel();
-        }
-      } else {
-        Object.keys(this.cancellableFilesUploads).forEach(function (key) {
-          var cancellableFileUpload = _this3.cancellableFilesUploads[key];
-          if (cancellableFileUpload.cancel) {
-            cancellableFileUpload.cancel();
-          }
-        });
-      }
-    }
-  }, {
-    key: "on",
-    value: function on(event, listener) {
-      this.emitter.on(event, listener);
-    }
-  }, {
-    key: "off",
-    value: function off(event, listener) {
-      this.emitter.off(event, listener);
-    }
   }, {
     key: "emitPreviews",
     value: function emitPreviews(cancellableFileUploads) {

package/dist/esm/util/analytics.js

@@ -3,7 +3,7 @@ import { isRequestError } from '@atlaskit/media-client';
 // Component name will be prefixed with "media-picker-" in logs. Check ufoExperiences in utils files
 
 var packageName = "@atlaskit/media-picker";
-var packageVersion = "66.2.4";
+var packageVersion = "66.2.5";
 export function getPackageAttributes(componentName) {
   return {
     packageName: packageName,

package/dist/esm/util/ufoExperiences.js

@@ -5,7 +5,7 @@ import { ConcurrentExperience, ExperiencePerformanceTypes, ExperienceTypes } fro
 import { getFeatureFlagKeysAllProducts } from '@atlaskit/media-common';
 import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
 var packageName = "@atlaskit/media-picker";
-var packageVersion = "66.2.4";
+var packageVersion = "66.2.5";
 var ufoExperience;
 var initExperience = function initExperience(id, componentName) {
   if (!ufoExperience) {

package/dist/types/service/uploadServiceImpl.d.ts

@@ -29,6 +29,7 @@ export declare class UploadServiceImpl implements UploadService {
     cancel(id?: string): void;
     on<E extends keyof UploadServiceEventPayloadTypes>(event: E, listener: UploadServiceEventListener<E>): void;
     off<E extends keyof UploadServiceEventPayloadTypes>(event: E, listener: UploadServiceEventListener<E>): void;
+    private addFilesAndUpload;
     private readonly emit;
     private emitPreviews;
     private getMediaTypeFromFile;

package/dist/types-ts4.5/service/uploadServiceImpl.d.ts

@@ -29,6 +29,7 @@ export declare class UploadServiceImpl implements UploadService {
     cancel(id?: string): void;
     on<E extends keyof UploadServiceEventPayloadTypes>(event: E, listener: UploadServiceEventListener<E>): void;
     off<E extends keyof UploadServiceEventPayloadTypes>(event: E, listener: UploadServiceEventListener<E>): void;
+    private addFilesAndUpload;
     private readonly emit;
     private emitPreviews;
     private getMediaTypeFromFile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/media-picker",
-  "version": "66.2.4",
+  "version": "66.2.5",
   "description": "Library for handling file uploads",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -41,7 +41,7 @@
     "@atlaskit/media-common": "^9.0.0",
     "@atlaskit/media-ui": "^25.0.0",
     "@atlaskit/theme": "^12.6.0",
-    "@atlaskit/tokens": "^1.22.0",
+    "@atlaskit/tokens": "^1.25.0",
     "@atlaskit/ufo": "^0.2.0",
     "@babel/runtime": "^7.0.0",
     "eventemitter2": "^4.1.0",
@@ -64,7 +64,7 @@
     "@atlaskit/media-core": "^34.1.0",
     "@atlaskit/media-test-helpers": "^33.0.0",
     "@atlaskit/ssr": "*",
-    "@atlaskit/tokens": "^1.22.0",
+    "@atlaskit/tokens": "^1.25.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@atlassian/ufo": "^0.2.0",
     "@babel/plugin-proposal-numeric-separator": "^7.18.6",