@atlaskit/media-client 20.0.1 → 20.0.3

package/dist/esm/utils/shouldFetchRemoteFileStates.js

@@ -3,6 +3,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { from } from 'rxjs/observable/from';
 import { isMimeTypeSupportedByBrowser, isMimeTypeSupportedByServer } from '@atlaskit/media-common/mediaTypeUtils';
 import { getVideoDimensionsFromBlob } from './getVideoDimensionsFromBlob';
+
 /**
  * Async helper determining if we should fetch remote fileStates from the backend:
  * - we poll the backend for all supported documents,
@@ -14,15 +15,12 @@ import { getVideoDimensionsFromBlob } from './getVideoDimensionsFromBlob';
  * Polling is needed for the use cases above to properly render the file in our components.
  *
  */
-
 export function shouldFetchRemoteFileStates(_x, _x2, _x3) {
   return _shouldFetchRemoteFileStates.apply(this, arguments);
 }
-
 function _shouldFetchRemoteFileStates() {
   _shouldFetchRemoteFileStates = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(mediaType, mimeType, preview) {
     var content, _yield$getVideoDimens, width, height;
-
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -31,47 +29,36 @@ function _shouldFetchRemoteFileStates() {
               _context.next = 2;
               break;
             }
-
             return _context.abrupt("return", true);
-
           case 2:
             if (!(mediaType === 'video' && !!preview)) {
               _context.next = 20;
               break;
             }
-
             _context.next = 5;
             return preview;
-
           case 5:
             content = _context.sent.value;
-
             if (content instanceof Blob) {
               _context.next = 8;
               break;
             }
-
             return _context.abrupt("return", false);
-
           case 8:
             _context.prev = 8;
             _context.next = 11;
             return getVideoDimensionsFromBlob(content);
-
           case 11:
             _yield$getVideoDimens = _context.sent;
             width = _yield$getVideoDimens.width;
             height = _yield$getVideoDimens.height;
             return _context.abrupt("return", !width && !height);
-
           case 17:
             _context.prev = 17;
             _context.t0 = _context["catch"](8);
             return _context.abrupt("return", true);
-
           case 20:
             return _context.abrupt("return", false);
-
           case 21:
           case "end":
             return _context.stop();
@@ -81,7 +68,6 @@ function _shouldFetchRemoteFileStates() {
   }));
   return _shouldFetchRemoteFileStates.apply(this, arguments);
 }
-
 export function shouldFetchRemoteFileStatesObservable(mediaType, mimeType, preview) {
   return from(shouldFetchRemoteFileStates(mediaType, mimeType, preview));
 }

package/dist/esm/utils/url.js

@@ -1,40 +1,31 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
 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) { _defineProperty(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';
 export var isMediaBlobUrl = function isMediaBlobUrl(url) {
   return url.indexOf("".concat(mediaBlobUrlIdentifier, "=true")) > -1;
 };
-
 var getNumberFromParams = function getNumberFromParams(params, name) {
   var value = params.get(name);
   return typeof value === 'string' && !isNaN(parseInt(value)) ? parseInt(value) : undefined;
 };
-
 var getStringFromParams = function getStringFromParams(params, name) {
   var value = params.get(name);
-
   if (!value) {
     return;
   }
-
   return decodeURIComponent(value);
 };
-
 export var getAttrsFromUrl = function getAttrsFromUrl(blobUrl) {
   var url = new URL(blobUrl);
   var hash = url.hash.replace('#', '');
   var params = new URLSearchParams(hash);
   var id = params.get('id');
-  var contextId = params.get('contextId'); // check if we have the required params
-
+  var contextId = params.get('contextId');
+  // check if we have the required params
   if (!id || !contextId) {
     return;
   }
-
   return {
     id: id,
     contextId: contextId,
@@ -52,26 +43,21 @@ export var objectToQueryString = function objectToQueryString(json) {
     return typeof json[attrName] !== 'undefined' && json[attrName] !== null;
   }).map(function (key) {
     var value = json[key];
-
     if (typeof value === 'undefined' || value === null) {
       return;
     }
-
     return "".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value.toString()));
   }).join('&');
 };
 export var addFileAttrsToUrl = function addFileAttrsToUrl(url, fileAttrs) {
   var isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
-
   if (isSafari) {
     return url;
   }
-
   var mediaIdentifierAttr = _defineProperty({}, mediaBlobUrlIdentifier, 'true');
-
   var mergedAttrs = _objectSpread(_objectSpread({}, mediaIdentifierAttr), fileAttrs);
+  var queryAttrs = objectToQueryString(mergedAttrs);
 
-  var queryAttrs = objectToQueryString(mergedAttrs); // we can't use '?' separator for blob url params
-
+  // we can't use '?' separator for blob url params
   return "".concat(url, "#").concat(queryAttrs);
 };

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

@@ -6,25 +6,27 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 var _excluded = ["mediaClientConfig"];
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
-
 import React from 'react';
 import { MediaClient } from '../client/media-client';
+var NO_FLAGS = 'NO_FLAGS';
 var mediaClientsMap = new Map();
 export var getMediaClient = function getMediaClient(mediaClientConfig, featureFlags) {
-  var mediaClient = mediaClientsMap.get(mediaClientConfig);
-
+  var _mediaClientsMap$get;
+  var flagsMapKey = featureFlags || NO_FLAGS;
+  var mediaClient = (_mediaClientsMap$get = mediaClientsMap.get(mediaClientConfig)) === null || _mediaClientsMap$get === void 0 ? void 0 : _mediaClientsMap$get.get(flagsMapKey);
   if (!mediaClient) {
+    var subMap = mediaClientsMap.get(mediaClientConfig);
+    if (!subMap) {
+      subMap = new Map();
+      mediaClientsMap.set(mediaClientConfig, subMap);
+    }
     mediaClient = new MediaClient(mediaClientConfig, featureFlags);
-    mediaClientsMap.set(mediaClientConfig, mediaClient);
+    subMap.set(flagsMapKey, mediaClient);
   }
-
   return mediaClient;
 };
-
 var createEmptyMediaClient = function createEmptyMediaClient(featureFlags) {
   var emptyConfig = {
     authProvider: function authProvider() {
@@ -37,34 +39,27 @@ var createEmptyMediaClient = function createEmptyMediaClient(featureFlags) {
   };
   return new MediaClient(emptyConfig, featureFlags);
 };
-
 export var withMediaClient = function withMediaClient(Component, featureFlags) {
   return /*#__PURE__*/function (_React$Component) {
     _inherits(_class, _React$Component);
-
     var _super = _createSuper(_class);
-
     function _class() {
       _classCallCheck(this, _class);
-
       return _super.apply(this, arguments);
     }
-
     _createClass(_class, [{
       key: "render",
       value: function render() {
         // TODO MPT-315: clean up after we move mediaClientConfig into FileIdentifier
         var _this$props = this.props,
-            mediaClientConfig = _this$props.mediaClientConfig,
-            otherProps = _objectWithoutProperties(_this$props, _excluded);
-
+          mediaClientConfig = _this$props.mediaClientConfig,
+          otherProps = _objectWithoutProperties(_this$props, _excluded);
         var mediaClient = !mediaClientConfig ? createEmptyMediaClient(featureFlags) : getMediaClient(mediaClientConfig, featureFlags);
         return /*#__PURE__*/React.createElement(Component, _extends({}, otherProps, {
           mediaClient: mediaClient
         }));
       }
     }]);
-
     return _class;
   }(React.Component);
 };

package/dist/esm/version.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/media-client",
-  "version": "20.0.1",
+  "version": "20.0.3",
   "description": "Media API Web Client Library",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -39,7 +39,7 @@
     "setimmediate": "^1.0.5",
     "uuid": "^3.1.0",
     "uuid-validate": "^0.0.3",
-    "xstate": "^4.20.0"
+    "xstate": "4.20.0"
   },
   "peerDependencies": {
     "@atlaskit/media-core": "^34.0.1",
@@ -49,11 +49,11 @@
   "devDependencies": {
     "@atlaskit/button": "^16.5.0",
     "@atlaskit/docs": "*",
-    "@atlaskit/media-card": "^74.5.0",
+    "@atlaskit/media-card": "^74.6.0",
     "@atlaskit/media-core": "^34.0.0",
     "@atlaskit/media-test-helpers": "^30.1.0",
     "@atlaskit/ssr": "*",
-    "@atlaskit/tokens": "^0.13.0",
+    "@atlaskit/tokens": "^1.2.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@emotion/react": "^11.7.1",
     "@types/deep-equal": "^1.0.1",
@@ -72,7 +72,9 @@
       ]
     },
     "@repo/internal": {
-      "theming": "tokens"
+      "design-tokens": [
+        "color"
+      ]
     }
   },
   "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.1"