@atlaskit/media-card 77.1.2 → 77.2.1

package/dist/es2019/card/v2/cardViewV2.js

@@ -1,17 +1,14 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
-import React, { useEffect, useState, useRef, useMemo } from 'react';
+import React, { useEffect, useState, useRef } from 'react';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { MimeTypeIcon } from '@atlaskit/media-ui/mime-type-icon';
 import SpinnerIcon from '@atlaskit/spinner';
 import Tooltip from '@atlaskit/tooltip';
 import { messages } from '@atlaskit/media-ui';
-import { defaultImageCardDimensions } from '../../utils/cardDimensions';
-import { isValidPercentageUnit } from '../../utils/isValidPercentageUnit';
-import { getElementDimension } from '../../utils/getElementDimension';
 import { createAndFireMediaCardEvent } from '../../utils/analytics';
 import { attachDetailsToActions } from '../actions';
-import { cardImageContainerStyles, calcBreakpointSize } from '../ui/styles';
+import { cardImageContainerStyles } from '../ui/styles';
 import { ImageRenderer } from '../ui/imageRenderer/imageRenderer';
 import { TitleBox } from '../ui/titleBox/titleBox';
 import { FailedTitleBox } from '../ui/titleBox/failedTitleBox';
@@ -25,6 +22,7 @@ import { PreviewUnavailable, CreatingPreview, FailedToUpload, PreviewCurrentlyUn
 import { isUploadError, isRateLimitedError, isPollingError } from '../../errors';
 import { Wrapper } from '../ui/wrapper';
 import { fileCardImageViewSelector } from '../classnames';
+import { useBreakpoint } from '../useBreakpoint';
 export const CardViewV2Base = ({
   innerRef,
   onImageLoad,
@@ -54,18 +52,10 @@ export const CardViewV2Base = ({
   error,
   disableAnimation
 }) => {
-  const [elementWidth, setElementWidth] = useState();
   const [didImageRender, setDidImageRender] = useState(false);
   const divRef = useRef(null);
   const prevCardPreviewRef = useRef();
-  const width = (dimensions === null || dimensions === void 0 ? void 0 : dimensions.width) || 0;
-  useEffect(() => {
-    // If the dimensions.width is a percentage, we need to transform it into a pixel value in order to get the right breakpoints applied.
-    if (width && isValidPercentageUnit(width) && !!divRef.current) {
-      const elementWidth = getElementDimension(divRef.current, 'width');
-      setElementWidth(elementWidth);
-    }
-  }, [width]);
+  const breakpoint = useBreakpoint(dimensions === null || dimensions === void 0 ? void 0 : dimensions.width, divRef);
   useEffect(() => {
     innerRef && !!divRef.current && innerRef(divRef.current);
   }, [innerRef]);
@@ -95,10 +85,6 @@ export const CardViewV2Base = ({
     setDidImageRender(false);
     onImageError === null || onImageError === void 0 ? void 0 : onImageError(cardPreview);
   };
-  const breakpoint = useMemo(() => {
-    const width = elementWidth || (dimensions ? dimensions.width : '') || defaultImageCardDimensions.width;
-    return calcBreakpointSize(parseInt(`${width}`, 10));
-  }, [elementWidth, dimensions]);
   const shouldRenderPlayButton = () => {
     const {
       mediaType

package/dist/es2019/card/v2/inlinePlayerLazyV2.js

@@ -0,0 +1,10 @@
+import { lazy } from 'react';
+export const InlinePlayerLazyV2 = /*#__PURE__*/lazy(async () => {
+  const {
+    InlinePlayerV2
+  } = await import( /* webpackChunkName: "@atlaskit-internal_media-card-inlineplayer-v2" */
+  './inlinePlayerV2');
+  return {
+    default: InlinePlayerV2
+  };
+});

package/dist/es2019/card/v2/inlinePlayerV2.js

@@ -0,0 +1,164 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { useRef, useState, useEffect } from 'react';
+import { globalMediaEventEmitter } from '@atlaskit/media-client';
+import { CustomMediaPlayer, InactivityDetector } from '@atlaskit/media-ui';
+import { defaultImageCardDimensions } from '../../utils';
+import { CardLoading } from '../../utils/lightCards/cardLoading';
+import { ProgressBar } from '../ui/progressBar/progressBar';
+import { InlinePlayerWrapper } from '../inlinePlayerWrapper';
+import { useBreakpoint } from '../useBreakpoint';
+import { useFileState, useMediaClient } from '@atlaskit/media-client-react';
+export const getPreferredVideoArtifact = fileState => {
+  if (fileState.status === 'processed' || fileState.status === 'processing') {
+    const {
+      artifacts
+    } = fileState;
+    if (!artifacts) {
+      return undefined;
+    }
+    return artifacts['video_1280.mp4'] ? 'video_1280.mp4' : artifacts['video_640.mp4'] ? 'video_640.mp4' : undefined;
+  }
+  return undefined;
+};
+export const InlinePlayerBaseV2 = ({
+  identifier,
+  onError,
+  onClick,
+  dimensions = defaultImageCardDimensions,
+  originalDimensions,
+  selected,
+  testId,
+  forwardRef,
+  autoplay,
+  cardPreview,
+  onFullscreenChange
+}) => {
+  // === States ===
+  const [fileSrc, setFileSrc] = useState();
+  const [isUploading, setIsUploading] = useState();
+  const [progress, setProgress] = useState();
+
+  // === Refs and Local Variables ===
+  const divRef = useRef(null);
+  const onErrorRef = useRef(onError);
+  onErrorRef.current = onError;
+  const {
+    id,
+    collectionName,
+    occurrenceKey
+  } = identifier;
+  const breakpoint = useBreakpoint(dimensions === null || dimensions === void 0 ? void 0 : dimensions.width, divRef);
+  const mediaClient = useMediaClient();
+  const {
+    fileState
+  } = useFileState(id, {
+    collectionName,
+    occurrenceKey
+  });
+  useEffect(() => {
+    const subscribeFileState = async fileState => {
+      if (fileState.status === 'uploading') {
+        setIsUploading(true);
+        setProgress(fileState.progress);
+      } else {
+        setIsUploading(false);
+      }
+
+      // We reuse the existing fileSrc to prevent re renders, therefore we only perform fileSrc updates when there isn't any
+      if (fileSrc) {
+        return;
+      }
+      if (fileState.status !== 'error' && fileState.preview) {
+        const {
+          value
+        } = await fileState.preview;
+        if (value instanceof Blob && value.type.indexOf('video/') === 0) {
+          const newFileSrc = URL.createObjectURL(value);
+          setFileSrc(newFileSrc);
+          return;
+        }
+      }
+      if (fileState.status === 'processed' || fileState.status === 'processing') {
+        const artifactName = getPreferredVideoArtifact(fileState);
+        const {
+          artifacts
+        } = fileState;
+        if (!artifactName || !artifacts) {
+          // Tries to use the binary artifact to provide something to play while the video is still processing
+          try {
+            const newFileSrc = await mediaClient.file.getFileBinaryURL(id, collectionName);
+            setFileSrc(newFileSrc);
+          } catch (error) {
+            if (onErrorRef.current && error instanceof Error) {
+              onErrorRef.current(error);
+            }
+          }
+          return;
+        }
+        try {
+          const newFileSrc = await mediaClient.file.getArtifactURL(artifacts, artifactName, collectionName);
+          setFileSrc(newFileSrc);
+        } catch (error) {
+          if (onErrorRef.current && error instanceof Error) {
+            onErrorRef.current(error);
+          }
+        }
+      }
+    };
+    if (fileState) {
+      subscribeFileState(fileState);
+    }
+  }, [fileState, collectionName, fileSrc, id, mediaClient]);
+  useEffect(() => {
+    return () => {
+      fileSrc && URL.revokeObjectURL(fileSrc);
+    };
+  }, [fileSrc]);
+
+  // === Render ===
+  return fileSrc ? /*#__PURE__*/React.createElement(InlinePlayerWrapper, {
+    testId: testId || 'media-card-inline-player',
+    selected: {
+      selected
+    },
+    onClick: onClick,
+    innerRef: forwardRef || undefined,
+    dimensions: dimensions
+  }, /*#__PURE__*/React.createElement(InactivityDetector, null, checkMouseMovement => /*#__PURE__*/React.createElement(CustomMediaPlayer, {
+    type: "video",
+    src: fileSrc,
+    onFullscreenChange: onFullscreenChange,
+    fileId: id,
+    isAutoPlay: autoplay,
+    isHDAvailable: false,
+    onDownloadClick: () => {
+      mediaClient.file.downloadBinary(id, undefined, collectionName);
+    },
+    onFirstPlay: () => {
+      globalMediaEventEmitter.emit('media-viewed', {
+        fileId: id,
+        viewingLevel: 'full'
+      });
+    },
+    lastWatchTimeConfig: {
+      contentId: id
+    },
+    originalDimensions: originalDimensions,
+    showControls: checkMouseMovement,
+    poster: cardPreview === null || cardPreview === void 0 ? void 0 : cardPreview.dataURI
+  })), isUploading && /*#__PURE__*/React.createElement(ProgressBar, {
+    progress: progress,
+    breakpoint: breakpoint,
+    positionBottom: true,
+    showOnTop: true
+  })) : /*#__PURE__*/React.createElement(CardLoading, {
+    testId: testId,
+    dimensions: dimensions
+  });
+};
+const InlinePlayerForwardRef = /*#__PURE__*/React.forwardRef((props, ref) => {
+  return /*#__PURE__*/React.createElement(InlinePlayerBaseV2, _extends({}, props, {
+    forwardRef: ref
+  }));
+});
+export const InlinePlayerV2 = InlinePlayerForwardRef;

package/dist/es2019/inline/loader.js

@@ -37,7 +37,7 @@ export default class MediaInlineCardLoader extends React.PureComponent {
     } = this.state;
     const analyticsContext = {
       packageVersion: "@atlaskit/media-card",
-      packageName: "77.1.2",
+      packageName: "77.2.1",
       componentName: 'mediaInlineCard',
       component: 'mediaInlineCard'
     };

package/dist/es2019/utils/ufoExperiences.js

@@ -4,7 +4,7 @@ import { extractErrorInfo, getRenderErrorRequestMetadata } from './analytics';
 import { MediaCardError } from '../errors';
 import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
 const packageName = "@atlaskit/media-card";
-const packageVersion = "77.1.2";
+const packageVersion = "77.2.1";
 let concurrentExperience;
 const getExperience = id => {
   if (!concurrentExperience) {

package/dist/esm/card/card.js

@@ -40,7 +40,7 @@ import { getMediaCardCursor } from '../utils/getMediaCardCursor';
 import { completeUfoExperience, startUfoExperience, abortUfoExperience } from '../utils/ufoExperiences';
 import { generateUniqueId } from '../utils/generateUniqueId';
 var packageName = "@atlaskit/media-card";
-var packageVersion = "77.1.2";
+var packageVersion = "77.2.1";
 export var CardBase = /*#__PURE__*/function (_Component) {
   _inherits(CardBase, _Component);
   var _super = _createSuper(CardBase);

package/dist/esm/card/media-card-analytics-error-boundary.js

@@ -83,7 +83,7 @@ var WrappedMediaCardAnalyticsErrorBoundary = /*#__PURE__*/function (_React$Compo
 }(React.Component);
 _defineProperty(WrappedMediaCardAnalyticsErrorBoundary, "displayName", 'MediaCardAnalyticsErrorBoundary');
 var packageName = "@atlaskit/media-card";
-var packageVersion = "77.1.2";
+var packageVersion = "77.2.1";
 var MediaCardAnalyticsErrorBoundary = withMediaAnalyticsContext({
   packageVersion: packageVersion,
   packageName: packageName,

package/dist/esm/card/useBreakpoint.js

@@ -0,0 +1,24 @@
+import { useMemo } from 'react';
+import { calcBreakpointSize } from './ui/styles';
+import { getElementDimension, isValidPercentageUnit, defaultImageCardDimensions } from '../utils';
+
+// Hook to calculate the breakpoint based on the width of the element
+export var useBreakpoint = function useBreakpoint() {
+  var dimensionWidth = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  var divRef = arguments.length > 1 ? arguments[1] : undefined;
+  var breakpoint = useMemo(function () {
+    var widthToCalculate;
+    if (dimensionWidth) {
+      if (isValidPercentageUnit(dimensionWidth) && divRef.current) {
+        var width = getElementDimension(divRef.current, 'width');
+        widthToCalculate = width || defaultImageCardDimensions.width;
+      } else {
+        widthToCalculate = dimensionWidth;
+      }
+    } else {
+      widthToCalculate = defaultImageCardDimensions.width;
+    }
+    return calcBreakpointSize(parseInt("".concat(widthToCalculate), 10));
+  }, [dimensionWidth, divRef]);
+  return breakpoint;
+};

package/dist/esm/card/v2/cardV2.js

@@ -28,7 +28,7 @@ import { videoIsPlayable } from '../../utils/videoIsPlayable';
 import { getRequestedDimensions } from '../../utils/getDataURIDimension';
 import { getCardPreview, getCardPreviewFromCache, removeCardPreviewFromCache, getFilePreviewFromFileState, shouldResolvePreview, getSSRCardPreview, isLocalPreview, isSSRPreview, isSSRClientPreview, isSSRDataPreview, fetchAndCacheRemotePreview } from '../getCardPreview';
 import { getFileDetails } from '../../utils/metadata';
-import { InlinePlayerLazy } from '../inlinePlayerLazy';
+import { InlinePlayerLazyV2 } from './inlinePlayerLazyV2';
 import { getFileAttributes, extractErrorInfo } from '../../utils/analytics';
 import { isLocalPreviewError, MediaCardError, MediaFileStateError, ensureMediaCardError, ImageLoadError } from '../../errors';
 import { fireOperationalEvent as _fireOperationalEvent, fireCommencedEvent as _fireCommencedEvent, fireCopiedEvent, fireScreenEvent, fireNonCriticalErrorEvent } from '../cardAnalytics';
@@ -41,7 +41,7 @@ import { completeUfoExperience, startUfoExperience, abortUfoExperience } from '.
 import { generateUniqueId } from '../../utils/generateUniqueId';
 import { useFileState } from '@atlaskit/media-client-react';
 var packageName = "@atlaskit/media-card";
-var packageVersion = "77.1.2";
+var packageVersion = "77.2.1";
 export var CardV2Base = /*#__PURE__*/function (_Component) {
   _inherits(CardV2Base, _Component);
   var _super = _createSuper(CardV2Base);
@@ -443,7 +443,6 @@ export var CardV2Base = /*#__PURE__*/function (_Component) {
     _defineProperty(_assertThisInitialized(_this), "renderInlinePlayer", function () {
       var _this$props6 = _this.props,
         identifier = _this$props6.identifier,
-        mediaClient = _this$props6.mediaClient,
         dimensions = _this$props6.dimensions,
         selected = _this$props6.selected,
         testId = _this$props6.testId,
@@ -455,8 +454,7 @@ export var CardV2Base = /*#__PURE__*/function (_Component) {
       var card = _this.renderCard(false, 'loading', false);
       return /*#__PURE__*/React.createElement(Suspense, {
         fallback: card
-      }, /*#__PURE__*/React.createElement(InlinePlayerLazy, {
-        mediaClient: mediaClient,
+      }, /*#__PURE__*/React.createElement(InlinePlayerLazyV2, {
         dimensions: dimensions,
         originalDimensions: originalDimensions,
         identifier: identifier,

package/dist/esm/card/v2/cardV2Loader.js

@@ -30,12 +30,14 @@ var MediaCardErrorBoundary = Loadable({
     return /*#__PURE__*/React.createElement(CardLoadingWithContext, null);
   }
 });
-var MediaCardWithMediaClient = function MediaCardWithMediaClient(props) {
+var CardWithMediaClient = function CardWithMediaClient(props) {
   var dimensions = props.dimensions,
     onClick = props.onClick,
-    useMediaClient = props.useMediaClient,
+    withMediaClient = props.withMediaClient,
     featureFlags = props.featureFlags;
-  var mediaClient = useMediaClient();
+  var Card = React.useMemo(function () {
+    return withMediaClient(MediaV2Card);
+  }, [withMediaClient]);
   var featureFlagsWithMediaCardV2 = React.useMemo(function () {
     return _objectSpread(_objectSpread({}, featureFlags), {}, {
       mediaCardV2: true //used for analytics - internal use only
@@ -44,9 +46,8 @@ var MediaCardWithMediaClient = function MediaCardWithMediaClient(props) {
   return /*#__PURE__*/React.createElement(MediaCardErrorBoundary, {
     dimensions: dimensions,
     onClick: onClick
-  }, /*#__PURE__*/React.createElement(MediaV2Card, _extends({}, props, {
-    featureFlags: featureFlagsWithMediaCardV2,
-    mediaClient: mediaClient
+  }, /*#__PURE__*/React.createElement(Card, _extends({}, props, {
+    featureFlags: featureFlagsWithMediaCardV2
   })));
 };
 var MediaCardWithMediaClientProvider = Loadable({
@@ -57,17 +58,9 @@ var MediaCardWithMediaClientProvider = Loadable({
     return /*#__PURE__*/React.createElement(CardLoadingWithContext, null);
   },
   render: function render(loaded, props) {
-    var mediaCard = /*#__PURE__*/React.createElement(MediaCardWithMediaClient, _extends({}, props, {
-      useMediaClient: loaded.useMediaClient
+    return /*#__PURE__*/React.createElement(CardWithMediaClient, _extends({}, props, {
+      withMediaClient: loaded.withMediaClient
     }));
-    return /*#__PURE__*/React.createElement(loaded.MediaClientContext.Consumer, null, function (value) {
-      return value ? mediaCard :
-      /*#__PURE__*/
-      // TODO - make clientConfig optional
-      React.createElement(loaded.MediaClientProvider, {
-        clientConfig: props.mediaClientConfig
-      }, mediaCard);
-    });
   }
 });
 var CardLoader = function CardLoader(props) {

package/dist/esm/card/v2/cardViewV2.js

@@ -4,18 +4,15 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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) { _defineProperty(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; }
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
-import React, { useEffect, useState, useRef, useMemo } from 'react';
+import React, { useEffect, useState, useRef } from 'react';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { MimeTypeIcon } from '@atlaskit/media-ui/mime-type-icon';
 import SpinnerIcon from '@atlaskit/spinner';
 import Tooltip from '@atlaskit/tooltip';
 import { messages } from '@atlaskit/media-ui';
-import { defaultImageCardDimensions } from '../../utils/cardDimensions';
-import { isValidPercentageUnit } from '../../utils/isValidPercentageUnit';
-import { getElementDimension } from '../../utils/getElementDimension';
 import { createAndFireMediaCardEvent } from '../../utils/analytics';
 import { attachDetailsToActions } from '../actions';
-import { cardImageContainerStyles, calcBreakpointSize } from '../ui/styles';
+import { cardImageContainerStyles } from '../ui/styles';
 import { ImageRenderer } from '../ui/imageRenderer/imageRenderer';
 import { TitleBox } from '../ui/titleBox/titleBox';
 import { FailedTitleBox } from '../ui/titleBox/failedTitleBox';
@@ -29,6 +26,7 @@ import { PreviewUnavailable, CreatingPreview, FailedToUpload, PreviewCurrentlyUn
 import { isUploadError, isRateLimitedError, isPollingError } from '../../errors';
 import { Wrapper } from '../ui/wrapper';
 import { fileCardImageViewSelector } from '../classnames';
+import { useBreakpoint } from '../useBreakpoint';
 export var CardViewV2Base = function CardViewV2Base(_ref) {
   var innerRef = _ref.innerRef,
     onImageLoad = _ref.onImageLoad,
@@ -58,24 +56,13 @@ export var CardViewV2Base = function CardViewV2Base(_ref) {
     titleBoxIcon = _ref.titleBoxIcon,
     error = _ref.error,
     disableAnimation = _ref.disableAnimation;
-  var _useState = useState(),
+  var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
-    elementWidth = _useState2[0],
-    setElementWidth = _useState2[1];
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    didImageRender = _useState4[0],
-    setDidImageRender = _useState4[1];
+    didImageRender = _useState2[0],
+    setDidImageRender = _useState2[1];
   var divRef = useRef(null);
   var prevCardPreviewRef = useRef();
-  var width = (dimensions === null || dimensions === void 0 ? void 0 : dimensions.width) || 0;
-  useEffect(function () {
-    // If the dimensions.width is a percentage, we need to transform it into a pixel value in order to get the right breakpoints applied.
-    if (width && isValidPercentageUnit(width) && !!divRef.current) {
-      var _elementWidth = getElementDimension(divRef.current, 'width');
-      setElementWidth(_elementWidth);
-    }
-  }, [width]);
+  var breakpoint = useBreakpoint(dimensions === null || dimensions === void 0 ? void 0 : dimensions.width, divRef);
   useEffect(function () {
     innerRef && !!divRef.current && innerRef(divRef.current);
   }, [innerRef]);
@@ -105,10 +92,6 @@ export var CardViewV2Base = function CardViewV2Base(_ref) {
     setDidImageRender(false);
     onImageError === null || onImageError === void 0 || onImageError(cardPreview);
   };
-  var breakpoint = useMemo(function () {
-    var width = elementWidth || (dimensions ? dimensions.width : '') || defaultImageCardDimensions.width;
-    return calcBreakpointSize(parseInt("".concat(width), 10));
-  }, [elementWidth, dimensions]);
   var shouldRenderPlayButton = function shouldRenderPlayButton() {
     var _ref2 = metadata || {},
       mediaType = _ref2.mediaType;

package/dist/esm/card/v2/inlinePlayerLazyV2.js

@@ -0,0 +1,23 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { lazy } from 'react';
+export var InlinePlayerLazyV2 = /*#__PURE__*/lazy( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+  var _yield$import, InlinePlayerV2;
+  return _regeneratorRuntime.wrap(function _callee$(_context) {
+    while (1) switch (_context.prev = _context.next) {
+      case 0:
+        _context.next = 2;
+        return import( /* webpackChunkName: "@atlaskit-internal_media-card-inlineplayer-v2" */
+        './inlinePlayerV2');
+      case 2:
+        _yield$import = _context.sent;
+        InlinePlayerV2 = _yield$import.InlinePlayerV2;
+        return _context.abrupt("return", {
+          default: InlinePlayerV2
+        });
+      case 5:
+      case "end":
+        return _context.stop();
+    }
+  }, _callee);
+})));