@atlaskit/media-card 77.4.7 → 77.4.9

package/dist/cjs/utils/lightCards/styles.js

@@ -8,21 +8,9 @@ exports.wrapperStyles = void 0;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = require("@emotion/react");
 var _mediaUi = require("@atlaskit/media-ui");
-var _components = require("@atlaskit/theme/components");
 var _colors = require("@atlaskit/theme/colors");
 var _templateObject;
 var wrapperStyles = exports.wrapperStyles = function wrapperStyles(_ref) {
-  var dimensions = _ref.dimensions,
-    theme = _ref.theme;
-  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  background: ", ";\n  color: ", ";\n  ", "\n  max-height: 100%;\n  max-width: 100%;\n  width: ", ";\n  height: ", ";\n"])), _mediaUi.center, (0, _components.themed)({
-    light: "var(--ds-background-neutral, ".concat(_colors.N20, ")"),
-    dark: "var(--ds-background-neutral, ".concat(_colors.DN50, ")")
-  })({
-    theme: theme
-  }), (0, _components.themed)({
-    light: "var(--ds-icon, ".concat(_colors.N50, ")"),
-    dark: "var(--ds-icon, ".concat(_colors.DN100, ")")
-  })({
-    theme: theme
-  }), _mediaUi.borderRadius, dimensions.width, dimensions.height);
+  var dimensions = _ref.dimensions;
+  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  background: ", ";\n  color: ", ";\n  ", "\n  max-height: 100%;\n  max-width: 100%;\n  width: ", ";\n  height: ", ";\n"])), _mediaUi.center, "var(--ds-background-neutral, ".concat(_colors.N20, ")"), "var(--ds-icon, ".concat(_colors.N50, ")"), _mediaUi.borderRadius, dimensions.width, dimensions.height);
 };

package/dist/cjs/utils/ufoExperiences.js

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

package/dist/es2019/card/card.js

@@ -27,7 +27,7 @@ import { getMediaCardCursor } from '../utils/getMediaCardCursor';
 import { completeUfoExperience, startUfoExperience, abortUfoExperience } from '../utils/ufoExperiences';
 import { generateUniqueId } from '../utils/generateUniqueId';
 const packageName = "@atlaskit/media-card";
-const packageVersion = "77.4.7";
+const packageVersion = "77.4.9";
 export class CardBase extends Component {
   constructor(props) {
     super(props);

package/dist/es2019/card/cardView.js

@@ -26,6 +26,7 @@ import { PreviewUnavailable, CreatingPreview, FailedToUpload, PreviewCurrentlyUn
 import { isUploadError, isRateLimitedError, isPollingError } from '../errors';
 import { Wrapper } from './ui/wrapper';
 import { fileCardImageViewSelector } from './classnames';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 /**
  * This is classic vanilla CardView class. To create an instance of class one would need to supply
  * `createAnalyticsEvent` prop to satisfy it's Analytics Events needs.
@@ -320,10 +321,14 @@ export class CardViewBase extends React.Component {
       nativeLazyLoad,
       forceSyncDisplay
     } = this.props;
+    const {
+      name
+    } = this.props.metadata || {};
+    const altText = getBooleanFF('platform.editor.a11y-media_er96o') ? alt || name : alt;
     return !!cardPreview && jsx(ImageRenderer, {
       cardPreview: cardPreview,
       mediaType: mediaType,
-      alt: alt,
+      alt: altText,
       resizeMode: resizeMode,
       onDisplayImage: onDisplayImage,
       onImageLoad: this.onImageLoad,

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

@@ -66,7 +66,7 @@ class WrappedMediaCardAnalyticsErrorBoundary extends React.Component {
 }
 _defineProperty(WrappedMediaCardAnalyticsErrorBoundary, "displayName", 'MediaCardAnalyticsErrorBoundary');
 const packageName = "@atlaskit/media-card";
-const packageVersion = "77.4.7";
+const packageVersion = "77.4.9";
 const MediaCardAnalyticsErrorBoundary = withMediaAnalyticsContext({
   packageVersion,
   packageName,

package/dist/es2019/card/ui/titleBox/styles.js

@@ -2,7 +2,6 @@ import { css } from '@emotion/react';
 import { responsiveSettings, getTitleBoxHeight, Breakpoint } from '../common';
 import { N0, N800 } from '@atlaskit/theme/colors';
 import { rgba } from '../styles';
-import { themed } from '@atlaskit/theme/components';
 const generateResponsiveStyles = (breakpoint = Breakpoint.SMALL) => {
   const setting = responsiveSettings[breakpoint];
   const verticalPadding = setting.titleBox.verticalPadding;
@@ -12,30 +11,15 @@ const generateResponsiveStyles = (breakpoint = Breakpoint.SMALL) => {
     padding: ${verticalPadding}px ${horizontalPadding}px;`;
 };
 const HEX_REGEX = /^#[0-9A-F]{6}$/i;
-const BACKGROUND_COLOR_DARK = '#161a1d';
-const TEXT_COLOR_DARK = '#C7D1DB';
 export const titleBoxWrapperStyles = ({
   breakpoint,
-  titleBoxBgColor,
-  theme
+  titleBoxBgColor
 }) => css`
   position: absolute;
   bottom: 0;
   width: 100%;
-  background-color: ${themed({
-  light: `var(--ds-surface, ${rgba(titleBoxBgColor && HEX_REGEX.test(titleBoxBgColor) ? titleBoxBgColor : N0, 1)})`,
-  dark: `var(--ds-surface, ${rgba(
-  // theme does not contain this color, use constant instead
-  titleBoxBgColor && HEX_REGEX.test(titleBoxBgColor) ? titleBoxBgColor : BACKGROUND_COLOR_DARK, 1)})`
-})({
-  theme
-})};
-  color: ${themed({
-  light: `var(--ds-text, ${N800})`,
-  dark: `var(--ds-text, ${TEXT_COLOR_DARK})`
-})({
-  theme
-})};
+  background-color: ${`var(--ds-surface, ${rgba(titleBoxBgColor && HEX_REGEX.test(titleBoxBgColor) ? titleBoxBgColor : N0, 1)})`};
+  color: ${`var(--ds-text, ${N800})`};
   cursor: inherit;
   pointer-events: none;
   display: flex;

package/dist/es2019/card/ui/titleBox/titleBoxComponents.js

@@ -1,20 +1,17 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
 import { errorMessageWrapperStyles, titleBoxFooterStyles, titleBoxHeaderStyles, titleBoxIconStyles, titleBoxWrapperStyles } from './styles';
-import { useGlobalTheme } from '@atlaskit/theme/components';
 export const TitleBoxWrapper = props => {
   const {
     breakpoint,
     titleBoxBgColor
   } = props;
-  const theme = useGlobalTheme();
   return jsx("div", {
     id: "titleBoxWrapper",
     "data-testid": "media-title-box",
     css: titleBoxWrapperStyles({
       breakpoint: breakpoint,
-      titleBoxBgColor: titleBoxBgColor,
-      theme
+      titleBoxBgColor: titleBoxBgColor
     })
   }, props.children);
 };

package/dist/es2019/card/ui/wrapper/styles.js

@@ -3,12 +3,10 @@ import { fontFamily } from '@atlaskit/theme/constants';
 import { borderRadius } from '@atlaskit/media-ui';
 import { N20 } from '@atlaskit/theme/colors';
 import { hideNativeBrowserTextSelectionStyles } from '@atlaskit/editor-shared-styles/selection';
-import { themed } from '@atlaskit/theme/components';
 import { transition } from '../styles';
 import { fixedBlanketStyles, blanketClassName } from '../blanket/styles';
 import { fixedActionBarStyles, actionsBarClassName } from '../actionsBar/styles';
 import { generateResponsiveStyles, getClickablePlayButtonStyles, getCursorStyle, getSelectableTickBoxStyles, getWrapperDimensions, getWrapperShadow } from '../styles';
-const BACKGROUND_COLOR_DARK = '#22272C';
 export const wrapperStyles = ({
   breakpoint,
   dimensions,
@@ -19,8 +17,7 @@ export const wrapperStyles = ({
   isPlayButtonClickable,
   isTickBoxSelectable,
   shouldDisplayTooltip,
-  mediaCardCursor,
-  theme
+  mediaCardCursor
 }) => css`
   ${transition()}
   box-sizing: border-box;
@@ -30,12 +27,7 @@ export const wrapperStyles = ({
   position: relative;
   font-family: ${fontFamily()};
   ${getWrapperDimensions(dimensions, appearance)}
-  ${displayBackground && `background: ${themed({
-  light: `var(--ds-background-neutral, ${N20})`,
-  dark: `var(--ds-background-neutral, ${BACKGROUND_COLOR_DARK})`
-})({
-  theme
-})};`}
+  ${displayBackground && `background: ${`var(--ds-background-neutral, ${N20})`};`}
   ${borderRadius}
   ${getCursorStyle(mediaCardCursor)}
   ${getWrapperShadow(disableOverlay, selected)}

package/dist/es2019/card/ui/wrapper/wrapper.js

@@ -2,7 +2,6 @@
 import { jsx } from '@emotion/react';
 import { newFileExperienceClassName } from '../../cardConstants';
 import { wrapperStyles } from './styles';
-import { useGlobalTheme } from '@atlaskit/theme/components';
 export const Wrapper = props => {
   const {
     testId,
@@ -20,7 +19,6 @@ export const Wrapper = props => {
     isTickBoxSelectable,
     shouldDisplayTooltip
   } = props;
-  const theme = useGlobalTheme();
   return jsx("div", {
     id: "newFileExperienceWrapper",
     className: newFileExperienceClassName,
@@ -35,8 +33,7 @@ export const Wrapper = props => {
       isPlayButtonClickable,
       isTickBoxSelectable,
       shouldDisplayTooltip,
-      mediaCardCursor,
-      theme
+      mediaCardCursor
     }),
     ref: innerRef,
     onClick: onClick,

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

@@ -7,7 +7,7 @@ import { IntlProvider, injectIntl } from 'react-intl-next';
 import { ExternalImageCard } from './externalImageCard';
 import { FileCard } from './fileCard';
 const packageName = "@atlaskit/media-card";
-const packageVersion = "77.4.7";
+const packageVersion = "77.4.9";
 export const CardV2Base = ({
   identifier,
   ...otherProps

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

@@ -28,7 +28,6 @@ export const CardViewV2Base = ({
   onImageLoad,
   onImageError,
   dimensions,
-  appearance = 'auto',
   onClick,
   onMouseEnter,
   testId,
@@ -258,7 +257,6 @@ export const CardViewV2Base = ({
   return jsx(Wrapper, {
     testId: testId || 'media-card-view',
     dimensions: dimensions,
-    appearance: appearance,
     onClick: onClick,
     onMouseEnter: onMouseEnter,
     innerRef: divRef,

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

@@ -9,6 +9,7 @@ import { generateUniqueId } from '../../utils/generateUniqueId';
 import { getMediaCardCursor } from '../../utils/getMediaCardCursor';
 import { abortUfoExperience, completeUfoExperience, startUfoExperience } from '../../utils/ufoExperiences';
 import { useCurrentValueRef } from '../../utils/useCurrentValueRef';
+import { getDefaultCardDimensions } from '../../utils/cardDimensions';
 import { usePrevious } from '../../utils/usePrevious';
 import { fireCommencedEvent, fireCopiedEvent, fireOperationalEvent, fireScreenEvent } from '../cardAnalytics';
 import { CardViewV2 } from './cardViewV2';
@@ -36,6 +37,7 @@ export const ExternalImageCard = ({
   onMouseEnter,
   createAnalyticsEvent
 }) => {
+  const cardDimensions = dimensions || getDefaultCardDimensions(appearance);
   const internalOccurrenceKey = useMemo(() => generateUniqueId(), []);
   const timeElapsedTillCommenced = useMemo(() => performance.now(), []);
 
@@ -194,9 +196,8 @@ export const ExternalImageCard = ({
     metadata: metadata,
     cardPreview: cardPreview,
     alt: alt,
-    appearance: appearance,
     resizeMode: resizeMode,
-    dimensions: dimensions,
+    dimensions: cardDimensions,
     actions: actions,
     selectable: selectable,
     selected: selected,
@@ -235,7 +236,6 @@ export const ExternalImageCard = ({
     },
     innerRef: setCardElement,
     testId: testId,
-    featureFlags: featureFlags,
     titleBoxBgColor: titleBoxBgColor,
     titleBoxIcon: titleBoxIcon,
     onImageError: newCardPreview => {

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

@@ -1,6 +1,6 @@
 import DownloadIcon from '@atlaskit/icon/glyph/download';
 import { globalMediaEventEmitter, isImageRepresentationReady, RECENTS_COLLECTION } from '@atlaskit/media-client';
-import { MediaFileStateError, useFileState } from '@atlaskit/media-client-react';
+import { MediaFileStateError, useFileState, useMediaClient } from '@atlaskit/media-client-react';
 import { getRandomHex, isMimeTypeSupportedByBrowser } from '@atlaskit/media-common';
 import { MediaViewer } from '@atlaskit/media-viewer';
 import React, { Suspense, useEffect, useMemo, useRef, useState } from 'react';
@@ -8,7 +8,7 @@ import ReactDOM from 'react-dom';
 import { MediaCardError } from '../../errors';
 import getDocument from '../../utils/document';
 import { generateUniqueId } from '../../utils/generateUniqueId';
-import { getRequestedDimensions } from '../../utils/getDataURIDimension';
+import { resolveCardPreviewDimensions } from '../../utils/getDataURIDimension';
 import { getMediaCardCursor } from '../../utils/getMediaCardCursor';
 import { getFileDetails } from '../../utils/metadata';
 import { abortUfoExperience, completeUfoExperience, startUfoExperience } from '../../utils/ufoExperiences';
@@ -16,6 +16,7 @@ import { useCurrentValueRef } from '../../utils/useCurrentValueRef';
 import { usePrevious } from '../../utils/usePrevious';
 import { videoIsPlayable } from '../../utils/videoIsPlayable';
 import { ViewportDetector } from '../../utils/viewportDetector';
+import { getDefaultCardDimensions } from '../../utils/cardDimensions';
 import { fireCommencedEvent, fireCopiedEvent, fireNonCriticalErrorEvent, fireOperationalEvent, fireScreenEvent } from '../cardAnalytics';
 import { isSSRPreview } from '../getCardPreview';
 import { CardViewV2 } from './cardViewV2';
@@ -30,7 +31,6 @@ export const FileCard = ({
   featureFlags = {},
   identifier,
   ssr,
-  mediaClient,
   dimensions,
   originalDimensions,
   contextId,
@@ -55,13 +55,18 @@ export const FileCard = ({
   //------------ State, Refs & Initial Values ----------------------//
   //----------------------------------------------------------------//
 
+  const mediaClient = useMediaClient();
   const [cardElement, setCardElement] = useState(null);
-  const requestedDimensions = useMemo(() =>
-  // requested dimensions is eventually an expensive operation if the dimensions are a percentage
-  getRequestedDimensions({
-    dimensions,
+  const cardDimensions = dimensions || getDefaultCardDimensions(appearance);
+
+  // Calculate the preview dimensions if card dimensions are "percentage" based
+  const previewDimensions = useMemo(() =>
+  // resolving dimensions is eventually an expensive operation if the dimensions are a percentage
+  // thus needs to be memoized
+  resolveCardPreviewDimensions({
+    dimensions: cardDimensions,
     element: cardElement
-  }), [dimensions, cardElement]);
+  }), [cardDimensions, cardElement]);
   const [isCardVisible, setIsCardVisible] = useState(!isLazy);
   const {
     fileState
@@ -120,10 +125,10 @@ export const FileCard = ({
       mimeType,
       name,
       size,
-      ...(originalDimensions || requestedDimensions),
+      ...(originalDimensions || previewDimensions),
       alt
     } : undefined;
-  }, [alt, requestedDimensions, contextId, fileStateValue, identifier, originalDimensions]);
+  }, [alt, previewDimensions, contextId, fileStateValue, identifier, originalDimensions]);
   const {
     cardPreview,
     error: previewError,
@@ -137,9 +142,7 @@ export const FileCard = ({
     resizeMode,
     identifier,
     ssr,
-    mediaClient,
-    dimensions,
-    requestedDimensions,
+    dimensions: previewDimensions,
     traceContext,
     previewDidRender,
     skipRemote: !isCardVisible
@@ -472,9 +475,8 @@ export const FileCard = ({
       metadata: metadata,
       cardPreview: cardPreview,
       alt: alt,
-      appearance: appearance,
       resizeMode: resizeMode,
-      dimensions: dimensions,
+      dimensions: cardDimensions,
       actions: computedActions,
       selectable: selectable,
       selected: selected,
@@ -499,7 +501,6 @@ export const FileCard = ({
       } : undefined,
       innerRef: setCardElement,
       testId: testId,
-      featureFlags: featureFlags,
       titleBoxBgColor: titleBoxBgColor,
       titleBoxIcon: titleBoxIcon,
       onImageError: withCallbacks ? onImageError : undefined,
@@ -526,7 +527,7 @@ export const FileCard = ({
   return /*#__PURE__*/React.createElement(React.Fragment, null, isPlayingFile ? /*#__PURE__*/React.createElement(Suspense, {
     fallback: inlinePlayerFallback
   }, /*#__PURE__*/React.createElement(InlinePlayerLazyV2, {
-    dimensions: dimensions,
+    dimensions: cardDimensions,
     originalDimensions: originalDimensions,
     identifier: identifier,
     autoplay: !!shouldAutoplay,

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

@@ -1,11 +1,12 @@
 import { addFileAttrsToUrl, imageResizeModeToFileImageMode, isImageRepresentationReady } from '@atlaskit/media-client';
-import { MediaFileStateError, useFileState } from '@atlaskit/media-client-react';
+import { MediaFileStateError, useFileState, useMediaClient } from '@atlaskit/media-client-react';
 import { getMediaTypeFromMimeType, isMimeTypeSupportedByBrowser } from '@atlaskit/media-common';
 import { getOrientation } from '@atlaskit/media-ui';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { ensureMediaCardError, ImageLoadError, isLocalPreviewError, isUnsupportedLocalPreviewError, LocalPreviewError, MediaCardError } from '../../errors';
 import { extractErrorInfo } from '../../utils/analytics';
 import { isBigger } from '../../utils/dimensionComparer';
+import { isRetina } from '../../utils/isRetina';
 import { generateScriptProps, getSSRData } from '../../utils/globalScope';
 import { useCurrentValueRef } from '../../utils/useCurrentValueRef';
 import { usePrevious } from '../../utils/usePrevious';
@@ -16,16 +17,17 @@ export const useFilePreview = ({
   resizeMode = 'crop',
   identifier,
   ssr,
-  mediaClient,
   dimensions,
-  requestedDimensions,
   traceContext,
   previewDidRender,
   skipRemote,
   mediaBlobUrlAttrs
 }) => {
+  const mediaClient = useMediaClient();
   const [error, setError] = useState();
   const [nonCriticalError, setNonCriticalError] = useState();
+  const requestDimensions = useMemo(() => dimensions ? createRequestDimensions(dimensions) : undefined, [dimensions]);
+
   //----------------------------------------------------------------//
   //---------------- State Initializer Functions -------------------//
   //----------------------------------------------------------------//
@@ -42,9 +44,9 @@ export const useFilePreview = ({
   const imageURLParams = useMemo(() => ({
     collection: identifier.collectionName,
     mode: resizeMode === 'stretchy-fit' ? 'full-fit' : resizeMode,
-    ...requestedDimensions,
+    ...requestDimensions,
     allowAnimated: true
-  }), [requestedDimensions, identifier.collectionName, resizeMode]);
+  }), [requestDimensions, identifier.collectionName, resizeMode]);
   const getSSRPreview = (ssr, identifier, mediaClient) => {
     var _ssrDataRef$current, _ssrDataRef$current2;
     ssrDataRef.current = getSSRData(identifier);
@@ -64,8 +66,13 @@ export const useFilePreview = ({
         };
       }
     } else {
+      const {
+        dimensions,
+        dataURI
+      } = ssrDataRef.current;
       return {
-        dataURI: ssrDataRef.current.dataURI,
+        dataURI,
+        dimensions,
         source: 'ssr-data'
       };
     }
@@ -107,7 +114,7 @@ export const useFilePreview = ({
   //----------------------------------------------------------------//
 
   const fetchRemotePreviewRef = useCurrentValueRef(identifier => {
-    return fetchAndCacheRemotePreview(mediaClient, identifier.id, dimensions !== null && dimensions !== void 0 ? dimensions : {}, imageURLParams, mediaBlobUrlAttrs);
+    return fetchAndCacheRemotePreview(mediaClient, identifier.id, requestDimensions || {}, imageURLParams, mediaBlobUrlAttrs, traceContext);
   });
   const resolvePreviewRef = useCurrentValueRef(async (identifier, fileState) => {
     const filePreview = isBannedLocalPreview ? undefined : fileState.status !== 'error' && 'mimeType' in fileState && isMimeTypeSupportedByBrowser(fileState.mimeType) ? fileState.preview : undefined;
@@ -115,7 +122,7 @@ export const useFilePreview = ({
     try {
       const mode = imageURLParams.mode;
       const cachedPreview = cardPreviewCache.get(identifier.id, mode);
-      const dimensionsAreBigger = isBigger(cachedPreview === null || cachedPreview === void 0 ? void 0 : cachedPreview.dimensions, dimensions);
+      const dimensionsAreBigger = isBigger(cachedPreview === null || cachedPreview === void 0 ? void 0 : cachedPreview.dimensions, requestDimensions);
       if (cachedPreview && !dimensionsAreBigger) {
         return cachedPreview;
       }
@@ -174,7 +181,7 @@ export const useFilePreview = ({
           }
           const preview = {
             ...localPreview,
-            dimensions
+            dimensions: requestDimensions
           };
           let source;
           switch (preview.source) {
@@ -239,7 +246,7 @@ export const useFilePreview = ({
          */
         throw new MediaCardError('remote-preview-not-ready');
       }
-      const remotePreview = await fetchAndCacheRemotePreview(mediaClient, identifier.id, dimensions !== null && dimensions !== void 0 ? dimensions : {}, imageURLParams, mediaBlobUrlAttrs, traceContext);
+      const remotePreview = await fetchRemotePreviewRef.current(identifier);
       setCardPreview(remotePreview);
       return;
     } catch (e) {
@@ -264,7 +271,7 @@ export const useFilePreview = ({
   //------------ resolveUpfrontPreview useEffect -------------------//
   //----------------------------------------------------------------//
   const prevCardPreview = usePrevious(cardPreview);
-  const dimensionsRef = useCurrentValueRef(dimensions);
+  const requestDimensionsRef = useCurrentValueRef(requestDimensions);
   useEffect(() => {
     const resolveUpfrontPreview = async identifier => {
       // We block any possible future call to this method regardless of the outcome (success or fail)
@@ -272,10 +279,10 @@ export const useFilePreview = ({
       wasResolvedUpfrontPreviewRef.current = true;
       try {
         const fetchedDimensions = {
-          ...dimensions
+          ...requestDimensions
         };
         const newCardPreview = await fetchRemotePreviewRef.current(identifier);
-        const areValidFetchedDimensions = !isBigger(fetchedDimensions, dimensionsRef.current);
+        const areValidFetchedDimensions = !isBigger(fetchedDimensions, requestDimensionsRef.current);
 
         // If there are new and bigger dimensions in the props, and the upfront preview is still resolving,
         // the fetched preview is no longer valid, and thus, we dismiss it
@@ -292,16 +299,16 @@ export const useFilePreview = ({
     if (!wasResolvedUpfrontPreviewRef.current && (!skipRemote || hadSSRCardPreview) && !cardPreview) {
       resolveUpfrontPreview(identifier);
     }
-  }, [cardPreview, dimensions, dimensionsRef, fetchRemotePreviewRef, identifier, skipRemote, prevCardPreview, ssr]);
+  }, [cardPreview, requestDimensions, requestDimensionsRef, fetchRemotePreviewRef, identifier, skipRemote, prevCardPreview, ssr]);
 
   //----------------------------------------------------------------//
   //---------------- fetch and resolve card preview ----------------//
   //----------------------------------------------------------------//
 
-  const prevDimensions = usePrevious(dimensions);
+  const prevRequestDimensions = usePrevious(requestDimensions);
   useEffect(() => {
-    var _ssrDataRef$current3;
-    if (cardPreview && !skipRemote && isSSRDataPreview(cardPreview) && isBigger((_ssrDataRef$current3 = ssrDataRef.current) === null || _ssrDataRef$current3 === void 0 ? void 0 : _ssrDataRef$current3.dimensions, dimensions)) {
+    // CXP-2813 TODO: This is called too many times if the refetch failed. Should be called only once
+    if (cardPreview && !skipRemote && isSSRDataPreview(cardPreview) && isBigger(cardPreview.dimensions, requestDimensions)) {
       // refetchSRRPreview: If dimensions from Server have changed and are bigger,
       // we need to refetch
       fetchRemotePreviewRef.current(identifier).then(setCardPreview).catch(e => {
@@ -316,8 +323,8 @@ export const useFilePreview = ({
     if (fileState && shouldResolvePreview({
       status,
       fileState: fileState,
-      prevDimensions,
-      dimensions,
+      prevDimensions: prevRequestDimensions,
+      dimensions: requestDimensions,
       hasCardPreview: !!cardPreview,
       isBannedLocalPreview,
       wasResolvedUpfrontPreview: wasResolvedUpfrontPreviewRef.current
@@ -334,7 +341,7 @@ export const useFilePreview = ({
         // https://product-fabric.atlassian.net/browse/MEX-1071
       });
     }
-  }, [cardPreview, dimensions, fetchRemotePreviewRef, fileState, identifier, isBannedLocalPreview, prevDimensions, resolvePreviewRef, skipRemote, ssr, status]);
+  }, [cardPreview, requestDimensions, fetchRemotePreviewRef, fileState, identifier, isBannedLocalPreview, prevRequestDimensions, resolvePreviewRef, skipRemote, ssr, status]);
 
   //----------------------------------------------------------------//
   //----------------- set complete status --------------------------//
@@ -476,7 +483,7 @@ export const useFilePreview = ({
   // FOR SSR
   const getScriptProps = () => {
     var _ssrReliabilityRef$cu;
-    return generateScriptProps(identifier, cardPreview === null || cardPreview === void 0 ? void 0 : cardPreview.dataURI, requestedDimensions, ((_ssrReliabilityRef$cu = ssrReliabilityRef.current.server) === null || _ssrReliabilityRef$cu === void 0 ? void 0 : _ssrReliabilityRef$cu.status) === 'fail' ? ssrReliabilityRef.current.server : undefined);
+    return generateScriptProps(identifier, cardPreview === null || cardPreview === void 0 ? void 0 : cardPreview.dataURI, requestDimensions, ((_ssrReliabilityRef$cu = ssrReliabilityRef.current.server) === null || _ssrReliabilityRef$cu === void 0 ? void 0 : _ssrReliabilityRef$cu.status) === 'fail' ? ssrReliabilityRef.current.server : undefined);
   };
 
   // CXP-2723 TODO: should consider simplifying our analytics, and how
@@ -490,4 +497,22 @@ export const useFilePreview = ({
     onImageLoad,
     getScriptProps
   };
+};
+const createRequestDimensions = dimensions => {
+  if (!dimensions) {
+    return;
+  }
+  const retinaFactor = isRetina() ? 2 : 1;
+  const {
+    width,
+    height
+  } = dimensions;
+  const result = {};
+  if (width) {
+    result.width = width * retinaFactor;
+  }
+  if (height) {
+    result.height = height * retinaFactor;
+  }
+  return result;
 };

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.4.7",
+      packageName: "77.4.9",
       componentName: 'mediaInlineCard',
       component: 'mediaInlineCard'
     };

package/dist/es2019/utils/getDataURIDimension.js

@@ -3,6 +3,13 @@ import { getElementDimension } from './getElementDimension';
 import { defaultImageCardDimensions } from './cardDimensions';
 import { isValidPercentageUnit } from './isValidPercentageUnit';
 import { containsPixelUnit } from './containsPixelUnit';
+
+/**
+ * ************************************************
+ * For Card v1
+ * ************************************************
+ */
+
 export const getDataURIDimension = (dimension, options) => {
   const retinaFactor = isRetina() ? 2 : 1;
   const dimensionValue = options.dimensions && options.dimensions[dimension] || '';
@@ -24,4 +31,36 @@ export const getRequestedDimensions = options => {
     width,
     height
   };
+};
+
+/**
+ * ************************************************
+ * For Card v2
+ * ************************************************
+ */
+
+// Same as getDataURIDimension but without Retina factor
+export const resolveCardPreviewDimension = (dimensionName, {
+  dimensions,
+  element
+}) => {
+  const dimensionValue = (dimensions === null || dimensions === void 0 ? void 0 : dimensions[dimensionName]) || '';
+  if (isValidPercentageUnit(dimensionValue) && element) {
+    return getElementDimension(element, dimensionName);
+  }
+  if (typeof dimensionValue === 'number') {
+    return dimensionValue;
+  }
+  if (containsPixelUnit(`${dimensionValue}`)) {
+    return parseInt(`${dimensionValue}`, 10);
+  }
+  return defaultImageCardDimensions[dimensionName];
+};
+export const resolveCardPreviewDimensions = options => {
+  const width = resolveCardPreviewDimension('width', options);
+  const height = resolveCardPreviewDimension('height', options);
+  return {
+    width,
+    height
+  };
 };

package/dist/es2019/utils/lightCards/lightCardWrappers.js

@@ -2,13 +2,10 @@ import _extends from "@babel/runtime/helpers/extends";
 /**@jsx jsx */
 import { jsx } from '@emotion/react';
 import { wrapperStyles } from './styles';
-import { useGlobalTheme } from '@atlaskit/theme/components';
 export const Wrapper = props => {
-  const theme = useGlobalTheme();
   return jsx("div", _extends({
     css: wrapperStyles({
-      dimensions: props.dimensions,
-      theme: theme
+      dimensions: props.dimensions
     })
   }, props), props.children);
 };