@atlaskit/media-card 72.0.0 → 73.1.1

package/dist/cjs/root/cardView.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CardView = exports.CardViewBase = void 0;
+exports.CardViewBase = exports.CardView = void 0;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
@@ -51,8 +51,6 @@ var _mediaUi = require("@atlaskit/media-ui");
 
 var _styled2 = require("./ui/styled");
 
-var _styledSSR = require("./ui/styledSSR");
-
 var _imageRenderer = require("./ui/imageRenderer/imageRenderer");
 
 var _titleBox = require("./ui/titleBox/titleBox");
@@ -85,9 +83,9 @@ var _cardConstants = require("./card/cardConstants");
 
 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 _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); }; }
 
@@ -178,11 +176,9 @@ var CardViewBase = /*#__PURE__*/function (_React$Component) {
       var shouldUsePointerCursor = status !== 'error' && status !== 'failed-processing';
       var shouldDisplayBackground = !dataURI || !disableOverlay || status === 'error' || status === 'failed-processing';
       var isPlayButtonClickable = !!(_this.shouldRenderPlayButton() && disableOverlay);
-      var isTickBoxSelectable = !disableOverlay && !!selectable && !selected; // Make tooltip optional for media singles - images, videos.
-      // Intention is to show full file name when it's truncate in titlebox,
-      // and to hide it when no titlebox exists.
+      var isTickBoxSelectable = !disableOverlay && !!selectable && !selected; // Disable tooltip for Media Single
 
-      var shouldDisplayTooltip = !!name && !disableOverlay;
+      var shouldDisplayTooltip = !disableOverlay;
       return /*#__PURE__*/_react.default.createElement(_styled2.NewFileExperienceWrapper, {
         className: _cardConstants.newFileExperienceClassName,
         "data-testid": testId || 'media-card-view',
@@ -308,40 +304,29 @@ var CardViewBase = /*#__PURE__*/function (_React$Component) {
           });
 
           var iconMessage;
+          var customTitleMessage;
 
-          if (!!metadata) {
-            if (error) {
-              var secondaryError = error.secondaryError;
-
-              if ((0, _mediaClient.isRateLimitedError)(secondaryError) || secondaryError && (0, _mediaClient.isPollingError)(secondaryError)) {
-                iconMessage = /*#__PURE__*/_react.default.createElement(_iconMessage.PreviewCurrentlyUnavailable, null);
-              }
-            } else if (!isZeroSize) {
-              iconMessage = /*#__PURE__*/_react.default.createElement(_iconMessage.PreviewUnavailable, null);
-            }
-          } else if (!!disableOverlay) {
-            iconMessage = /*#__PURE__*/_react.default.createElement(_iconMessage.FailedToLoad, null);
-          }
-
-          if (error && (0, _errors.isUploadError)(error)) {
-            if (!disableOverlay) {
-              return _objectSpread(_objectSpread({}, baseErrorConfig), {}, {
-                renderFailedTitleBox: true,
-                customTitleMessage: _mediaUi.messages.failed_to_upload
-              });
-            }
+          var _ref4 = error || {},
+              secondaryError = _ref4.secondaryError;
 
-            return _objectSpread(_objectSpread({}, baseErrorConfig), {}, {
-              renderTitleBox: !metadata && !!name,
-              iconMessage: /*#__PURE__*/_react.default.createElement(_iconMessage.FailedToUpload, null)
-            });
+          if ((0, _mediaClient.isRateLimitedError)(secondaryError) || (0, _mediaClient.isPollingError)(secondaryError)) {
+            iconMessage = /*#__PURE__*/_react.default.createElement(_iconMessage.PreviewCurrentlyUnavailable, null);
+          } else if ((0, _errors.isUploadError)(error)) {
+            iconMessage = /*#__PURE__*/_react.default.createElement(_iconMessage.FailedToUpload, null);
+            customTitleMessage = _mediaUi.messages.failed_to_upload;
+          } else if (!metadata) {
+            iconMessage = /*#__PURE__*/_react.default.createElement(_iconMessage.FailedToLoad, null);
+          } else {
+            iconMessage = /*#__PURE__*/_react.default.createElement(_iconMessage.PreviewUnavailable, null);
           }
 
           if (!disableOverlay) {
+            var renderFailedTitleBox = !name || !!customTitleMessage;
             return _objectSpread(_objectSpread({}, baseErrorConfig), {}, {
-              renderTitleBox: !!name,
-              renderFailedTitleBox: !metadata,
-              iconMessage: iconMessage
+              renderTitleBox: !!name && !customTitleMessage,
+              renderFailedTitleBox: renderFailedTitleBox,
+              iconMessage: !renderFailedTitleBox ? iconMessage : undefined,
+              customTitleMessage: customTitleMessage
             });
           }
 
@@ -379,11 +364,11 @@ var CardViewBase = /*#__PURE__*/function (_React$Component) {
           status = _this$props4.status,
           metadata = _this$props4.metadata;
 
-      var _ref4 = metadata || {},
-          name = _ref4.name;
+      var _ref5 = metadata || {},
+          name = _ref5.name;
 
       var hasTitleBox = !!renderTitleBox || !!renderFailedTitleBox;
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styledSSR.CardImageContainer, {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styled2.CardImageContainer, {
         className: "media-file-card-view",
         "data-testid": "media-file-card-view",
         "data-test-media-name": name,
@@ -404,8 +389,8 @@ var CardViewBase = /*#__PURE__*/function (_React$Component) {
     }
   }, {
     key: "componentDidUpdate",
-    value: function componentDidUpdate(_ref5) {
-      var prevDataURI = _ref5.dataURI;
+    value: function componentDidUpdate(_ref6) {
+      var prevDataURI = _ref6.dataURI;
       var dataURI = this.props.dataURI; // We should only switch didImageRender to false
       // when dataURI goes undefined, not when it is updated.
       // as this method could be triggered after onImageLoad callback,
@@ -426,10 +411,10 @@ var CardViewBase = /*#__PURE__*/function (_React$Component) {
         return elementWidth;
       }
 
-      var _ref6 = this.props.dimensions || {
+      var _ref7 = this.props.dimensions || {
         width: undefined
       },
-          width = _ref6.width;
+          width = _ref7.width;
 
       if (!width) {
         return _cardDimensions.defaultImageCardDimensions.width;
@@ -441,7 +426,7 @@ var CardViewBase = /*#__PURE__*/function (_React$Component) {
     key: "breakpoint",
     get: function get() {
       var width = this.state.elementWidth || (this.props.dimensions ? this.props.dimensions.width : '') || _cardDimensions.defaultImageCardDimensions.width;
-      return (0, _styledSSR.calcBreakpointSize)(parseInt("".concat(width), 10));
+      return (0, _styled2.calcBreakpointSize)(parseInt("".concat(width), 10));
     } // If the dimensions.width is a percentage, we need to transform it
     // into a pixel value in order to get the right breakpoints applied.
 
@@ -486,8 +471,8 @@ var CardViewBase = /*#__PURE__*/function (_React$Component) {
           metadata = _this$props6.metadata,
           dataURI = _this$props6.dataURI;
 
-      var _ref7 = metadata || {},
-          mediaType = _ref7.mediaType;
+      var _ref8 = metadata || {},
+          mediaType = _ref8.mediaType;
 
       if (mediaType !== 'video' || !dataURI) {
         return false;
@@ -520,9 +505,9 @@ var CardViewBase = /*#__PURE__*/function (_React$Component) {
           titleBoxBgColor = _this$props7.titleBoxBgColor,
           titleBoxIcon = _this$props7.titleBoxIcon;
 
-      var _ref8 = metadata || {},
-          name = _ref8.name,
-          createdAt = _ref8.createdAt;
+      var _ref9 = metadata || {},
+          name = _ref9.name,
+          createdAt = _ref9.createdAt;
 
       return !!name && /*#__PURE__*/_react.default.createElement(_titleBox.TitleBox, {
         name: name,
@@ -563,17 +548,19 @@ var CardViewBase = /*#__PURE__*/function (_React$Component) {
           alt = _this$props8.alt,
           resizeMode = _this$props8.resizeMode,
           onDisplayImage = _this$props8.onDisplayImage,
-          mediaItemType = _this$props8.mediaItemType;
+          nativeLazyLoad = _this$props8.nativeLazyLoad,
+          forceSyncDisplay = _this$props8.forceSyncDisplay;
       return !!dataURI && /*#__PURE__*/_react.default.createElement(_imageRenderer.ImageRenderer, {
         dataURI: dataURI,
         mediaType: mediaType,
-        mediaItemType: mediaItemType,
         previewOrientation: previewOrientation,
         alt: alt,
         resizeMode: resizeMode,
         onDisplayImage: onDisplayImage,
         onImageLoad: this.onImageLoad,
-        onImageError: this.onImageError
+        onImageError: this.onImageError,
+        nativeLazyLoad: nativeLazyLoad,
+        forceSyncDisplay: forceSyncDisplay
       });
     }
   }, {
@@ -589,10 +576,10 @@ var CardViewBase = /*#__PURE__*/function (_React$Component) {
     value: function renderMediaTypeIcon(hasTitleBox, iconMessage) {
       var metadata = this.props.metadata;
 
-      var _ref9 = metadata || {},
-          mediaType = _ref9.mediaType,
-          mimeType = _ref9.mimeType,
-          name = _ref9.name;
+      var _ref10 = metadata || {},
+          mediaType = _ref10.mediaType,
+          mimeType = _ref10.mimeType,
+          name = _ref10.name;
 
       return /*#__PURE__*/_react.default.createElement(_styled4.IconWrapper, {
         breakpoint: this.breakpoint,

package/dist/cjs/root/inline/loader.js

@@ -56,6 +56,7 @@ var MediaInlineCardLoader = /*#__PURE__*/function (_React$PureComponent) {
     }
 
     _this = _super.call.apply(_super, [this].concat(args));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isMounted", false);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", {
       MediaInlineCard: MediaInlineCardLoader.MediaInlineCard,
       ErrorBoundary: MediaInlineCardLoader.ErrorBoundary
@@ -73,13 +74,15 @@ var MediaInlineCardLoader = /*#__PURE__*/function (_React$PureComponent) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                this.isMounted = true;
+
                 if (this.state.MediaInlineCard) {
-                  _context.next = 16;
+                  _context.next = 17;
                   break;
                 }
 
-                _context.prev = 1;
-                _context.next = 4;
+                _context.prev = 2;
+                _context.next = 5;
                 return Promise.all([Promise.resolve().then(function () {
                   return _interopRequireWildcard(require('@atlaskit/media-client'));
                 }), Promise.resolve().then(function () {
@@ -88,7 +91,7 @@ var MediaInlineCardLoader = /*#__PURE__*/function (_React$PureComponent) {
                   return _interopRequireWildcard(require('../media-card-analytics-error-boundary'));
                 })]);
 
-              case 4:
+              case 5:
                 _yield$Promise$all = _context.sent;
                 _yield$Promise$all2 = (0, _slicedToArray2.default)(_yield$Promise$all, 3);
                 mediaClient = _yield$Promise$all2[0];
@@ -96,23 +99,27 @@ var MediaInlineCardLoader = /*#__PURE__*/function (_React$PureComponent) {
                 mediaCardErrorBoundaryModule = _yield$Promise$all2[2];
                 MediaInlineCardLoader.MediaInlineCard = mediaClient.withMediaClient(cardModule.MediaInlineCard);
                 MediaInlineCardLoader.ErrorBoundary = mediaCardErrorBoundaryModule.default;
-                this.setState({
-                  MediaInlineCard: MediaInlineCardLoader.MediaInlineCard,
-                  ErrorBoundary: MediaInlineCardLoader.ErrorBoundary
-                });
-                _context.next = 16;
+
+                if (this.isMounted) {
+                  this.setState({
+                    MediaInlineCard: MediaInlineCardLoader.MediaInlineCard,
+                    ErrorBoundary: MediaInlineCardLoader.ErrorBoundary
+                  });
+                }
+
+                _context.next = 17;
                 break;
 
-              case 14:
-                _context.prev = 14;
-                _context.t0 = _context["catch"](1);
+              case 15:
+                _context.prev = 15;
+                _context.t0 = _context["catch"](2);
 
-              case 16:
+              case 17:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, this, [[1, 14]]);
+        }, _callee, this, [[2, 15]]);
       }));
 
       function componentDidMount() {
@@ -121,6 +128,30 @@ var MediaInlineCardLoader = /*#__PURE__*/function (_React$PureComponent) {
 
       return componentDidMount;
     }()
+  }, {
+    key: "componentWillUnmount",
+    value: function () {
+      var _componentWillUnmount = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                this.isMounted = false;
+
+              case 1:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function componentWillUnmount() {
+        return _componentWillUnmount.apply(this, arguments);
+      }
+
+      return componentWillUnmount;
+    }()
   }, {
     key: "render",
     value: function render() {

package/dist/cjs/root/inline/mediaInlineCard.js

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.MediaInlineCard = exports.MediaInlineCardInternal = void 0;
+exports.MediaInlineCardInternal = exports.MediaInlineCard = void 0;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
@@ -15,7 +15,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactDom = _interopRequireDefault(require("react-dom"));
 
-var _reactIntl = require("react-intl");
+var _reactIntlNext = require("react-intl-next");
 
 var _mediaUi = require("@atlaskit/media-ui");
 
@@ -87,46 +87,64 @@ var MediaInlineCardInternal = function MediaInlineCardInternal(_ref) {
     return null;
   };
 
+  var renderContent = function renderContent(children) {
+    return intl ? children : /*#__PURE__*/_react.default.createElement(_reactIntlNext.IntlProvider, {
+      locale: "en"
+    }, children);
+  };
+
+  var defaultIntl = (0, _reactIntlNext.createIntl)({
+    locale: 'en'
+  });
   (0, _react.useEffect)(function () {
-    mediaClient.file.getFileState(identifier.id, {
+    var subscription = mediaClient.file.getFileState(identifier.id, {
       collectionName: identifier.collectionName
     }).subscribe({
       next: function next(fileState) {
         setFileState(fileState);
+        setIsErrored(false);
       },
       error: function error() {
         setIsErrored(true);
       }
     });
+    return function () {
+      subscription.unsubscribe();
+    };
   }, [identifier.collectionName, identifier.id, mediaClient.file]);
 
   if (!fileState) {
     return /*#__PURE__*/_react.default.createElement(_mediaUi.MediaInlineCardLoadingView, {
-      message: intl.formatMessage(_mediaUi.messages.loading_file)
+      message: (intl || defaultIntl).formatMessage(_mediaUi.messages.loading_file),
+      isSelected: isSelected
     });
   }
 
   if (isErrored) {
     return /*#__PURE__*/_react.default.createElement(_mediaUi.MediaInlineCardErroredView, {
-      message: intl.formatMessage(_mediaUi.messages.couldnt_load_file)
+      message: (intl || defaultIntl).formatMessage(_mediaUi.messages.couldnt_load_file),
+      isSelected: isSelected
     });
   }
 
   if (fileState.status === 'error') {
     return /*#__PURE__*/_react.default.createElement(_mediaUi.MediaInlineCardErroredView, {
-      message: fileState.message || ''
+      message: fileState.message || '',
+      isSelected: isSelected
     });
   }
 
   if (fileState.status === 'failed-processing') {
     return /*#__PURE__*/_react.default.createElement(_mediaUi.MediaInlineCardErroredView, {
-      message: intl.formatMessage(_mediaUi.messages.couldnt_load_file)
+      message: (intl || defaultIntl).formatMessage(_mediaUi.messages.couldnt_load_file),
+      isSelected: isSelected
     });
   }
 
   if (fileState.status === 'uploading') {
     return /*#__PURE__*/_react.default.createElement(_mediaUi.MediaInlineCardLoadingView, {
-      message: fileState.name
+      message: fileState.name,
+      isSelected: isSelected
     });
   }
 
@@ -152,7 +170,7 @@ var MediaInlineCardInternal = function MediaInlineCardInternal(_ref) {
     formattedDate = (0, _formatDate.formatDate)(fileState.createdAt, locale);
   }
 
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+  return renderContent( /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
     position: "bottom",
     content: formattedDate,
     tag: "span"
@@ -161,9 +179,11 @@ var MediaInlineCardInternal = function MediaInlineCardInternal(_ref) {
     title: name,
     onClick: onMediaInlineCardClick,
     isSelected: isSelected
-  })), mediaViewer);
+  })), mediaViewer));
 };
 
 exports.MediaInlineCardInternal = MediaInlineCardInternal;
-var MediaInlineCard = (0, _reactIntl.injectIntl)(MediaInlineCardInternal);
+var MediaInlineCard = (0, _reactIntlNext.injectIntl)(MediaInlineCardInternal, {
+  enforceContext: false
+});
 exports.MediaInlineCard = MediaInlineCard;

package/dist/cjs/root/inlinePlayer.js

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.InlinePlayer = exports.InlinePlayerBase = exports.getPreferredVideoArtifact = exports.inlinePlayerClassName = void 0;
+exports.inlinePlayerClassName = exports.getPreferredVideoArtifact = exports.InlinePlayerBase = exports.InlinePlayer = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
@@ -41,6 +41,14 @@ var _ = require("..");
 
 var _cardLoading = require("../utils/lightCards/cardLoading");
 
+var _progressBar = require("./ui/progressBar/progressBar");
+
+var _styled2 = require("./ui/styled");
+
+var _isValidPercentageUnit = require("../utils/isValidPercentageUnit");
+
+var _getElementDimension = require("../utils/getElementDimension");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -84,6 +92,7 @@ var InlinePlayerBase = /*#__PURE__*/function (_Component) {
 
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", {});
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "divRef", /*#__PURE__*/_react.default.createRef());
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "setFileSrc", function (fileSrc) {
       _this.setState({
         fileSrc: fileSrc
@@ -153,6 +162,23 @@ var InlinePlayerBase = /*#__PURE__*/function (_Component) {
         viewingLevel: 'full'
       });
     });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "saveElementWidth", function () {
+      var dimensions = _this.props.dimensions;
+
+      if (!dimensions) {
+        return;
+      }
+
+      var width = dimensions.width;
+
+      if (width && (0, _isValidPercentageUnit.isValidPercentageUnit)(width) && !!_this.divRef.current) {
+        var elementWidth = (0, _getElementDimension.getElementDimension)(_this.divRef.current, 'width');
+
+        _this.setState({
+          elementWidth: elementWidth
+        });
+      }
+    });
     return _this;
   }
 
@@ -161,6 +187,7 @@ var InlinePlayerBase = /*#__PURE__*/function (_Component) {
     value: function componentDidMount() {
       var _this2 = this;
 
+      this.saveElementWidth();
       var _this$props3 = this.props,
           mediaClient = _this$props3.mediaClient,
           identifier = _this$props3.identifier;
@@ -179,30 +206,41 @@ var InlinePlayerBase = /*#__PURE__*/function (_Component) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
+                    if (fileState.status === 'uploading') {
+                      _this2.setState({
+                        isUploading: true,
+                        progress: fileState.progress
+                      });
+                    } else {
+                      _this2.setState({
+                        isUploading: false
+                      });
+                    }
+
                     existingFileSrc = _this2.state.fileSrc; // we want to reuse the existing fileSrc to prevent re renders
 
                     if (!existingFileSrc) {
-                      _context2.next = 3;
+                      _context2.next = 4;
                       break;
                     }
 
                     return _context2.abrupt("return");
 
-                  case 3:
+                  case 4:
                     if (!(fileState.status !== 'error' && fileState.preview)) {
-                      _context2.next = 12;
+                      _context2.next = 13;
                       break;
                     }
 
-                    _context2.next = 6;
+                    _context2.next = 7;
                     return fileState.preview;
 
-                  case 6:
+                  case 7:
                     _yield$fileState$prev = _context2.sent;
                     value = _yield$fileState$prev.value;
 
                     if (!(value instanceof Blob && value.type.indexOf('video/') === 0)) {
-                      _context2.next = 12;
+                      _context2.next = 13;
                       break;
                     }
 
@@ -212,9 +250,9 @@ var InlinePlayerBase = /*#__PURE__*/function (_Component) {
 
                     return _context2.abrupt("return");
 
-                  case 12:
+                  case 13:
                     if (!(fileState.status === 'processed' || fileState.status === 'processing')) {
-                      _context2.next = 29;
+                      _context2.next = 30;
                       break;
                     }
 
@@ -222,7 +260,7 @@ var InlinePlayerBase = /*#__PURE__*/function (_Component) {
                     artifacts = fileState.artifacts;
 
                     if (!(!artifactName || !artifacts)) {
-                      _context2.next = 18;
+                      _context2.next = 19;
                       break;
                     }
 
@@ -230,34 +268,34 @@ var InlinePlayerBase = /*#__PURE__*/function (_Component) {
 
                     return _context2.abrupt("return");
 
-                  case 18:
-                    _context2.prev = 18;
-                    _context2.next = 21;
+                  case 19:
+                    _context2.prev = 19;
+                    _context2.next = 22;
                     return mediaClient.file.getArtifactURL(artifacts, artifactName, collectionName);
 
-                  case 21:
+                  case 22:
                     _fileSrc = _context2.sent;
 
                     _this2.setFileSrc(_fileSrc);
 
-                    _context2.next = 29;
+                    _context2.next = 30;
                     break;
 
-                  case 25:
-                    _context2.prev = 25;
-                    _context2.t0 = _context2["catch"](18);
+                  case 26:
+                    _context2.prev = 26;
+                    _context2.t0 = _context2["catch"](19);
                     onError = _this2.props.onError;
 
                     if (onError) {
                       onError(_context2.t0);
                     }
 
-                  case 29:
+                  case 30:
                   case "end":
                     return _context2.stop();
                 }
               }
-            }, _callee2, null, [[18, 25]]);
+            }, _callee2, null, [[19, 26]]);
           }));
 
           function next(_x) {
@@ -274,6 +312,12 @@ var InlinePlayerBase = /*#__PURE__*/function (_Component) {
       this.unsubscribe();
       this.revoke();
     }
+  }, {
+    key: "breakpoint",
+    get: function get() {
+      var width = this.state.elementWidth || (this.props.dimensions ? this.props.dimensions.width : '') || _.defaultImageCardDimensions.width;
+      return (0, _styled2.calcBreakpointSize)(parseInt("".concat(width), 10));
+    }
   }, {
     key: "render",
     value: function render() {
@@ -286,8 +330,12 @@ var InlinePlayerBase = /*#__PURE__*/function (_Component) {
           selected = _this$props4.selected,
           testId = _this$props4.testId,
           identifier = _this$props4.identifier,
-          forwardRef = _this$props4.forwardRef;
-      var fileSrc = this.state.fileSrc;
+          forwardRef = _this$props4.forwardRef,
+          autoplay = _this$props4.autoplay;
+      var _this$state = this.state,
+          fileSrc = _this$state.fileSrc,
+          isUploading = _this$state.isUploading,
+          progress = _this$state.progress;
 
       if (!fileSrc) {
         return /*#__PURE__*/_react.default.createElement(_cardLoading.CardLoading, {
@@ -308,7 +356,7 @@ var InlinePlayerBase = /*#__PURE__*/function (_Component) {
           type: "video",
           src: fileSrc,
           fileId: identifier.id,
-          isAutoPlay: true,
+          isAutoPlay: autoplay,
           isHDAvailable: false,
           onDownloadClick: _this3.onDownloadClick,
           onFirstPlay: _this3.onFirstPlay,
@@ -318,7 +366,12 @@ var InlinePlayerBase = /*#__PURE__*/function (_Component) {
           originalDimensions: originalDimensions,
           showControls: checkMouseMovement
         });
-      }));
+      }), isUploading ? /*#__PURE__*/_react.default.createElement(_progressBar.ProgressBar, {
+        progress: progress,
+        breakpoint: this.breakpoint,
+        positionBottom: true,
+        showOnTop: true
+      }) : null);
     }
   }]);
   return InlinePlayerBase;