@atlaskit/media-client 14.3.2 → 15.1.0

package/CHANGELOG.md

@@ -1,5 +1,116 @@
 # @atlaskit/media-client
 
+## 15.1.0
+
+### Minor Changes
+
+- [`cb2392f6d33`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cb2392f6d33) - Export `WithMediaClient` type to resolve a deep import path d.ts reference
+
+### Patch Changes
+
+- [`cb2392f6d33`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cb2392f6d33) - Upgrade to TypeScript 4.2.4
+- Updated dependencies
+
+## 15.0.0
+
+### Major Changes
+
+- [`fdc41ee7a0b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fdc41ee7a0b) - Stop exposing observableToPromise from media client API.
+  mediaSubscribableToPromise is used internally.
+- [`118f3af101f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/118f3af101f) - Media Client APIs has been updated to use MediaSubscribable which provides subscription functionality (similar to RxJs observables).
+  It exposes subscribe method that is called with MediaObserver as an argument and returns MediaSubscription.
+  MediaSubscription exposes unsubscribe method.
+
+  getFileState:
+  The returned type of this function has changed from RxJs ReplaySubject to MediaSubscribable.
+
+  ```
+  import { MediaClient, MediaObserver, MediaSubscribable, MediaSubscription } from '@atlaskit/media-client';
+
+  const mediaClient = new MediaClient({ authProvider });
+
+  const fileStateSubscribable: MediaSubscribable<FileState> = mediaClient.file.getFileState(id);
+
+  const mediaObserver: MediaObserver<FileState> = {
+    next: (fileState) => {
+      nextCallback(fileState)
+    },
+    error: (error) => {
+      errorCallback(error)
+    },
+  };
+
+  const subscription: MediaSubscription = fileStateSubscribable.subscribe(mediaObserver);
+
+  subscription.unsubscribe();
+  ```
+
+  upload:
+  The returned type of this function has changed from RxJs ReplaySubject to MediaSubscribable.
+
+  ```
+  import { MediaClient, MediaObserver, MediaSubscribable, MediaSubscription } from '@atlaskit/media-client';
+
+  const mediaClient = new MediaClient({ authProvider });
+
+  const uploadFileSubscribable: MediaSubscribable<FileState> = mediaClient.file.upload(uploadableFile);
+
+  const mediaObserver: MediaObserver<FileState> = {
+    next: (fileState) => {
+      nextCallback(fileState)
+    },
+    error: (error) => {
+      errorCallback(error)
+    },
+  };
+
+  const subscription: MediaSubscription = uploadFileSubscribable.subscribe(mediaObserver);
+
+  subscription.unsubscribe();
+  ```
+
+  getItems:
+  The returned type of this function has changed from RxJs ReplaySubject to MediaSubscribable.
+
+  ```
+  import { MediaClient, MediaObserver, MediaSubscribable, MediaSubscription } from '@atlaskit/media-client';
+
+  const mediaClient = new MediaClient({ authProvider });
+
+  const collectionItemsSubscribable: MediaSubscribable<MediaCollectionItem[]> = mediaClient.collection.getItems(collectionName);
+
+  const mediaObserver: MediaObserver<MediaCollectionItem[]> = {
+    next: (items) => {
+      nextCallback(items)
+    },
+    error: (error) => {
+      errorCallback(error)
+    },
+  };
+
+  const subscription: MediaSubscription = collectionItemsSubscribable.subscribe(mediaObserver);
+
+  subscription.unsubscribe();
+  ```
+
+### Minor Changes
+
+- [`f862d5ae7aa`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f862d5ae7aa) - remove RxJs peer dependency
+
+### Patch Changes
+
+- Updated dependencies
+
+## 14.4.0
+
+### Minor Changes
+
+- [`7d2943a6038`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7d2943a6038) - Created MediaSubscribable wrapper around RxJs Observable
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 14.3.2
 
 ### Patch Changes

package/dist/cjs/client/collection-fetcher.js

@@ -25,9 +25,11 @@ var _fileStreamsCache = require("../file-streams-cache");
 
 var _fileState = require("../models/file-state");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+var _toMediaSubscribable = require("../utils/toMediaSubscribable");
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var collectionCache = {};
 exports.collectionCache = collectionCache;
@@ -114,7 +116,7 @@ var CollectionFetcher = /*#__PURE__*/function () {
       }).catch(function (error) {
         return subject.error(error);
       });
-      return subject;
+      return (0, _toMediaSubscribable.toMediaSubscribable)(subject);
     }
   }, {
     key: "removeFile",

package/dist/cjs/client/file-fetcher/index.js

@@ -69,11 +69,11 @@ var _overrideMediaTypeIfUnknown = require("../../utils/overrideMediaTypeIfUnknow
 
 var _convertBase64ToBlob = require("../../utils/convertBase64ToBlob");
 
-var _observableToPromise = require("../../utils/observableToPromise");
+var _mediaSubscribableToPromise = require("../../utils/mediaSubscribableToPromise");
 
 var _getDimensionsFromBlob = require("../../utils/getDimensionsFromBlob");
 
-var _createFileStateSubject = require("../../utils/createFileStateSubject");
+var _createMediaSubject = require("../../utils/createMediaSubject");
 
 var _mediaTypeUtils = require("@atlaskit/media-common/mediaTypeUtils");
 
@@ -83,9 +83,11 @@ var _polling = require("../../utils/polling");
 
 var _detectEmptyFile = require("../../utils/detectEmptyFile");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+var _toMediaSubscribable = require("../../utils/toMediaSubscribable");
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var FileFetcherImpl = /*#__PURE__*/function () {
   function FileFetcherImpl(mediaStore) {
@@ -93,7 +95,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
 
     (0, _classCallCheck2.default)(this, FileFetcherImpl);
     (0, _defineProperty2.default)(this, "createDownloadFileStream", function (id, collectionName, occurrenceKey) {
-      var subject = (0, _createFileStateSubject.createFileStateSubject)();
+      var subject = (0, _createMediaSubject.createMediaSubject)();
       var poll = new _polling.PollingFunction(); // ensure subject errors if polling exceeds max iterations or uncaught exception in executor
 
       poll.onError = function (error) {
@@ -175,22 +177,22 @@ var FileFetcherImpl = /*#__PURE__*/function () {
           occurrenceKey = options.occurrenceKey;
 
       if (!(0, _uuidValidate.default)(id)) {
-        var subject = (0, _createFileStateSubject.createFileStateSubject)();
+        var subject = (0, _createMediaSubject.createMediaSubject)();
         subject.error(new _error.FileFetcherError('invalidFileId', id, {
           collectionName: collectionName,
           occurrenceKey: occurrenceKey
         }));
-        return subject;
+        return (0, _toMediaSubscribable.toMediaSubscribable)(subject);
       }
 
-      return (0, _fileStreamsCache.getFileStreamsCache)().getOrInsert(id, function () {
+      return (0, _toMediaSubscribable.toMediaSubscribable)((0, _fileStreamsCache.getFileStreamsCache)().getOrInsert(id, function () {
         return _this2.createDownloadFileStream(id, collectionName);
-      });
+      }));
     }
   }, {
     key: "getCurrentState",
     value: function getCurrentState(id, options) {
-      return (0, _observableToPromise.observableToPromise)(this.getFileState(id, options));
+      return (0, _mediaSubscribableToPromise.mediaSubscribableToPromise)(this.getFileState(id, options));
     }
   }, {
     key: "getArtifactURL",
@@ -246,7 +248,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
               case 0:
                 uploadableFileUpfrontIds = this.generateUploadableFileUpfrontIds(collection);
                 id = uploadableFileUpfrontIds.id, occurrenceKey = uploadableFileUpfrontIds.occurrenceKey;
-                subject = (0, _createFileStateSubject.createFileStateSubject)();
+                subject = (0, _createMediaSubject.createMediaSubject)();
                 deferredBlob = fetch(url).then(function (response) {
                   return response.blob();
                 }).catch(function () {
@@ -408,7 +410,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
       var preview; // TODO [MSW-796]: get file size for base64
 
       var mediaType = (0, _getMediaTypeFromUploadableFile.getMediaTypeFromUploadableFile)(file);
-      var subject = (0, _createFileStateSubject.createFileStateSubject)();
+      var subject = (0, _createMediaSubject.createMediaSubject)();
       var processingSubscription = new _Subscription.Subscription();
 
       if (content instanceof Blob) {
@@ -480,7 +482,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
         });
       }
 
-      return subject;
+      return (0, _toMediaSubscribable.toMediaSubscribable)(subject);
     }
   }, {
     key: "downloadBinary",
@@ -610,7 +612,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
                   data: copiedFileWithMimeType
                 });
                 fileCache = cache.get(copiedId);
-                subject = fileCache || (0, _createFileStateSubject.createFileStateSubject)(); // if we were passed a "preview", we propagate it into the copiedFileState
+                subject = fileCache || (0, _createMediaSubject.createMediaSubject)(); // if we were passed a "preview", we propagate it into the copiedFileState
 
                 previewOverride = !(0, _fileState.isErrorFileState)(copiedFileState) && !!preview ? {
                   preview: preview
@@ -678,7 +680,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
                     _fileCache.error(_context6.t3);
                   } else {
                     // Create a new subject with the error state for new subscriptions
-                    cache.set(id, (0, _createFileStateSubject.createFileStateSubject)(_context6.t3));
+                    cache.set(id, (0, _createMediaSubject.createMediaSubject)(_context6.t3));
                   }
                 }
 

package/dist/cjs/client/media-store/index.js

@@ -41,9 +41,9 @@ var _resolveAuth = require("./resolveAuth");
 
 var _error = require("./error");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var defaultImageOptions = {
   'max-age': _constants.FILE_CACHE_MAX_AGE,

package/dist/cjs/index.js

@@ -99,10 +99,16 @@ Object.defineProperty(exports, "checkWebpSupport", {
     return _checkWebpSupport.checkWebpSupport;
   }
 });
-Object.defineProperty(exports, "createFileStateSubject", {
+Object.defineProperty(exports, "createMediaSubject", {
   enumerable: true,
   get: function get() {
-    return _createFileStateSubject.createFileStateSubject;
+    return _createMediaSubject.createMediaSubject;
+  }
+});
+Object.defineProperty(exports, "createMediaSubscribable", {
+  enumerable: true,
+  get: function get() {
+    return _toMediaSubscribable.createMediaSubscribable;
   }
 });
 Object.defineProperty(exports, "createUrl", {
@@ -328,12 +334,6 @@ Object.defineProperty(exports, "objectToQueryString", {
     return _url.objectToQueryString;
   }
 });
-Object.defineProperty(exports, "observableToPromise", {
-  enumerable: true,
-  get: function get() {
-    return _observableToPromise.observableToPromise;
-  }
-});
 Object.defineProperty(exports, "request", {
   enumerable: true,
   get: function get() {
@@ -397,11 +397,9 @@ var _isImageRemote = require("./utils/isImageRemote");
 
 var _checkWebpSupport = require("./utils/checkWebpSupport");
 
-var _observableToPromise = require("./utils/observableToPromise");
-
 var _getDimensionsFromBlob = require("./utils/getDimensionsFromBlob");
 
-var _createFileStateSubject = require("./utils/createFileStateSubject");
+var _createMediaSubject = require("./utils/createMediaSubject");
 
 var _safeUnsubscribe = require("./utils/safeUnsubscribe");
 
@@ -413,10 +411,13 @@ var _globalMediaEventEmitter = require("./globalMediaEventEmitter");
 
 var _url = require("./utils/url");
 
+var _toMediaSubscribable = require("./utils/toMediaSubscribable");
+
 var _constants = require("./constants");
 
 var _mediaTypeUtils = require("@atlaskit/media-common/mediaTypeUtils");
 
+// TODO: remove access to media file stream cache https://product-fabric.atlassian.net/browse/MEX-1417
 // TODO MEX-659 Remove these exports when all the usages from media-client are replaced with media-common.
 
 /**

package/dist/cjs/models/errors/index.js

@@ -19,6 +19,8 @@ Object.defineProperty(exports, "isMediaClientError", {
   }
 });
 
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
@@ -61,7 +63,7 @@ var BaseMediaClientError = /*#__PURE__*/function (_Error) {
     return _this;
   }
 
-  return BaseMediaClientError;
+  return (0, _createClass2.default)(BaseMediaClientError);
 }( /*#__PURE__*/(0, _wrapNativeSuper2.default)(Error));
 
 exports.BaseMediaClientError = BaseMediaClientError;

package/dist/cjs/models/file-state.js

@@ -9,9 +9,9 @@ exports.mapMediaItemToFileState = exports.mapMediaFileToFileState = exports.isUp
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var isUploadingFileState = function isUploadingFileState(fileState) {
   return fileState.status === 'uploading';

package/dist/cjs/models/media-subscribable.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/utils/{createFileStateSubject.js → createMediaSubject.js}

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createFileStateSubject = void 0;
+exports.createMediaSubject = createMediaSubject;
 
 var _ReplaySubject = require("rxjs/ReplaySubject");
 
-var createFileStateSubject = function createFileStateSubject(initialState) {
+function createMediaSubject(initialState) {
   var subject = new _ReplaySubject.ReplaySubject(1);
 
   if (initialState instanceof Error) {
@@ -17,6 +17,4 @@ var createFileStateSubject = function createFileStateSubject(initialState) {
   }
 
   return subject;
-};
-
-exports.createFileStateSubject = createFileStateSubject;
+}

package/dist/cjs/utils/{observableToPromise.js → mediaSubscribableToPromise.js}

@@ -3,21 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.observableToPromise = void 0;
+exports.mediaSubscribableToPromise = void 0;
 
 var _Subscription = require("rxjs/Subscription");
 
 /**
- * We're using this custom helper in place of ".toPromise()" to transform the first value emitted by an Observable or Subject into a Promise.
- * Note that in RxJS 7 ".toPromise()" is deprecated and replaced by "firstValueFrom()/.lastValueFrom()"
+ * This is a helper to transform the first value emitted by an MediaSubscribable into a Promise.
  *
- * @param observable a given Observable<T> or Subject<T>
+ * @param mediaSubscribable a given MediaSubscribable<MediaSubscribableItem>
  * @param subscription a default Subscription (this parameter exists for testing purpose)
  */
-var observableToPromise = function observableToPromise(observable) {
+var mediaSubscribableToPromise = function mediaSubscribableToPromise(mediaSubscribable) {
   var subscription = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new _Subscription.Subscription();
   return new Promise(function (resolve, reject) {
-    return subscription.add(observable.subscribe({
+    return subscription.add(mediaSubscribable.subscribe({
       next: function next(state) {
         resolve(state);
         subscription.unsubscribe();
@@ -30,4 +29,4 @@ var observableToPromise = function observableToPromise(observable) {
   });
 };
 
-exports.observableToPromise = observableToPromise;
+exports.mediaSubscribableToPromise = mediaSubscribableToPromise;

package/dist/cjs/utils/mobileUpload/helpers.js

@@ -19,7 +19,7 @@ var _map = require("rxjs/operators/map");
 
 var _fileState = require("../../models/file-state");
 
-var _createFileStateSubject = require("../createFileStateSubject");
+var _createMediaSubject = require("../createMediaSubject");
 
 var _detectEmptyFile = require("../detectEmptyFile");
 
@@ -38,7 +38,7 @@ var createMobileFileStateSubject = function createMobileFileStateSubject(service
 exports.createMobileFileStateSubject = createMobileFileStateSubject;
 
 var createMobileDownloadFileStream = function createMobileDownloadFileStream(dataloader, id, collectionName, occurrenceKey) {
-  var subject = (0, _createFileStateSubject.createFileStateSubject)();
+  var subject = (0, _createMediaSubject.createMediaSubject)();
   var poll = new _polling.PollingFunction(); // ensure subject errors if polling exceeds max iterations or uncaught exception in executor
 
   poll.onError = function (error) {

package/dist/cjs/utils/mobileUpload/stateMachine/states/uploading.js

@@ -13,9 +13,9 @@ var _xstate = require("xstate");
 
 var _fileState = require("../../../../models/file-state");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var machineUploadingState = {
   // Events

package/dist/cjs/utils/polling/index.js

@@ -19,9 +19,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _errors = require("./errors");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 // default polling options without using feature flags
 var defaultPollingOptions = {

package/dist/cjs/utils/request/helpers.js

@@ -40,9 +40,9 @@ var _authQueryParameters = require("../../models/auth-query-parameters");
 
 var _errors = require("./errors");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function clientTimeoutPromise(timeout) {
   return new Promise(function (resolve, reject) {

package/dist/cjs/utils/toMediaSubscribable.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createMediaSubscribable = createMediaSubscribable;
+exports.toMediaSubscribable = toMediaSubscribable;
+
+var _createMediaSubject = require("./createMediaSubject");
+
+function toMediaSubscribable(observable) {
+  return {
+    subscribe: function subscribe(observer) {
+      var subscription = // This is needed to handle "subscribe" function overload.
+      // It allows accepting a single "next" callback function as an argument.
+      observer instanceof Function ? observable.subscribe(observer) : observable.subscribe(observer);
+      return {
+        unsubscribe: function unsubscribe() {
+          subscription.unsubscribe();
+        }
+      };
+    }
+  };
+}
+
+function createMediaSubscribable(mediaSubscribableItem) {
+  return toMediaSubscribable((0, _createMediaSubject.createMediaSubject)(mediaSubscribableItem));
+}

package/dist/cjs/utils/url.js

@@ -9,9 +9,9 @@ exports.objectToQueryString = exports.isMediaBlobUrl = exports.getAttrsFromUrl =
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var mediaBlobUrlIdentifier = 'media-blob-url';
 

package/dist/cjs/utils/with-media-client-hoc.js

@@ -25,6 +25,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _mediaClient = require("../client/media-client");
 
+var _excluded = ["mediaClientConfig"];
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -74,7 +76,7 @@ var withMediaClient = function withMediaClient(Component, featureFlags) {
         // TODO MPT-315: clean up after we move mediaClientConfig into FileIdentifier
         var _this$props = this.props,
             mediaClientConfig = _this$props.mediaClientConfig,
-            otherProps = (0, _objectWithoutProperties2.default)(_this$props, ["mediaClientConfig"]);
+            otherProps = (0, _objectWithoutProperties2.default)(_this$props, _excluded);
         var mediaClient = !mediaClientConfig ? createEmptyMediaClient(featureFlags) : getMediaClient(mediaClientConfig, featureFlags);
         return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, otherProps, {
           mediaClient: mediaClient

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "14.3.2",
+	"version": "15.1.0",
 	"sideEffects": false
 }

package/dist/es2019/client/collection-fetcher.js

@@ -1,6 +1,7 @@
 import { ReplaySubject } from 'rxjs/ReplaySubject';
 import { getFileStreamsCache } from '../file-streams-cache';
 import { mapMediaFileToFileState } from '../models/file-state';
+import { toMediaSubscribable } from '../utils/toMediaSubscribable';
 export const collectionCache = {};
 
 const createCacheEntry = () => ({
@@ -66,7 +67,7 @@ export class CollectionFetcher {
       collection.nextInclusiveStartKey = nextInclusiveStartKey;
       subject.next(collection.items);
     }).catch(error => subject.error(error));
-    return subject;
+    return toMediaSubscribable(subject);
   }
 
   async removeFile(id, collectionName, occurrenceKey) {