@atlaskit/media-card 77.7.1 → 77.7.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/media-card
 
+## 77.7.3
+
+### Patch Changes
+
+- [#69372](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/69372) [`c5868970426f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c5868970426f) - Simplified status set in Card v2
+- Updated dependencies
+
+## 77.7.2
+
+### Patch Changes
+
+- [#65817](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65817) [`3be0ec786219`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3be0ec786219) - Added data test preview source
+- Updated dependencies
+
 ## 77.7.1
 
 ### Patch Changes

package/dist/cjs/card/card.js

@@ -50,7 +50,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var packageName = "@atlaskit/media-card";
-var packageVersion = "77.7.1";
+var packageVersion = "77.7.3";
 var CardBase = exports.CardBase = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(CardBase, _Component);
   var _super = _createSuper(CardBase);

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

@@ -90,7 +90,7 @@ var WrappedMediaCardAnalyticsErrorBoundary = /*#__PURE__*/function (_React$Compo
 }(_react.default.Component);
 (0, _defineProperty2.default)(WrappedMediaCardAnalyticsErrorBoundary, "displayName", 'MediaCardAnalyticsErrorBoundary');
 var packageName = "@atlaskit/media-card";
-var packageVersion = "77.7.1";
+var packageVersion = "77.7.3";
 var MediaCardAnalyticsErrorBoundary = (0, _mediaCommon.withMediaAnalyticsContext)({
   packageVersion: packageVersion,
   packageName: packageName,

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

@@ -16,7 +16,7 @@ var _externalImageCard = require("./externalImageCard");
 var _fileCard = require("./fileCard");
 var _excluded = ["identifier"];
 var packageName = "@atlaskit/media-card";
-var packageVersion = "77.7.1";
+var packageVersion = "77.7.3";
 var CardV2Base = exports.CardV2Base = function CardV2Base(_ref) {
   var identifier = _ref.identifier,
     otherProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);

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

@@ -212,7 +212,8 @@ var CardViewV2Base = exports.CardViewV2Base = function CardViewV2Base(_ref) {
     "data-test-media-name": name,
     "data-test-status": status,
     "data-test-progress": progress,
-    "data-test-selected": selected
+    "data-test-selected": selected,
+    "data-test-source": cardPreview === null || cardPreview === void 0 ? void 0 : cardPreview.source
   }, renderTypeIcon && (0, _react.jsx)(_iconWrapper.IconWrapper, {
     breakpoint: breakpoint,
     hasTitleBox: hasTitleBox

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

@@ -178,10 +178,10 @@ var FileCard = exports.FileCard = function FileCard(_ref) {
       ssr: ssr,
       dimensions: previewDimensions,
       traceContext: traceContext,
-      previewDidRender: previewDidRender,
       skipRemote: !isCardVisible
     }),
     preview = _useFilePreview.preview,
+    previewStatus = _useFilePreview.status,
     previewError = _useFilePreview.error,
     nonCriticalError = _useFilePreview.nonCriticalError,
     ssrReliabilityRef = _useFilePreview.ssrReliabilityRef,
@@ -459,15 +459,6 @@ var FileCard = exports.FileCard = function FileCard(_ref) {
         return;
       }
       if (fileState.status !== 'error') {
-        var mediaType = 'mediaType' in fileState ? fileState.mediaType : undefined;
-        var isPreviewable = !!mediaType && ['audio', 'video', 'image', 'doc'].indexOf(mediaType) > -1;
-        var isPreviewableFileState = !!fileState.preview;
-        var isSupportedLocalPreview = mediaType === 'image' || mediaType === 'video';
-        var hasLocalPreview = isPreviewableFileState &&
-        // CXP-2723 TODO: isPreviewableFileState is most likely redundant
-        isSupportedLocalPreview && !!fileState.mimeType && (0, _mediaCommon.isMimeTypeSupportedByBrowser)(fileState.mimeType);
-        var hasRemotePreview = (0, _mediaClient.isImageRepresentationReady)(fileState);
-        var hasPreview = hasLocalPreview || hasRemotePreview;
         var newStatus;
         switch (fileState.status) {
           case 'uploading':
@@ -476,7 +467,8 @@ var FileCard = exports.FileCard = function FileCard(_ref) {
             newStatus = fileState.status;
             break;
           case 'processed':
-            if (!isPreviewable || !hasPreview) {
+            // Set complete if processing is done and there is no preview
+            if (!preview && previewStatus === 'complete') {
               newStatus = 'complete';
               break;
             }
@@ -498,7 +490,7 @@ var FileCard = exports.FileCard = function FileCard(_ref) {
   });
   (0, _react.useEffect)(function () {
     updateFileStateRef.current();
-  }, [fileState, updateFileStateRef]);
+  }, [fileState, preview, previewStatus, updateFileStateRef]);
 
   //----------------------------------------------------------------//
   //---------------------- Render Card Function --------------------//

package/dist/cjs/inline/loader.js

@@ -119,7 +119,7 @@ var MediaInlineCardLoader = exports.default = /*#__PURE__*/function (_React$Pure
         ErrorBoundary = _this$state.ErrorBoundary;
       var analyticsContext = {
         packageVersion: "@atlaskit/media-card",
-        packageName: "77.7.1",
+        packageName: "77.7.3",
         componentName: 'mediaInlineCard',
         component: 'mediaInlineCard'
       };

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.7.1";
+var packageVersion = "77.7.3";
 var concurrentExperience;
 var getExperience = function getExperience(id) {
   if (!concurrentExperience) {

package/dist/es2019/card/card.js

@@ -28,7 +28,7 @@ import { completeUfoExperience, startUfoExperience, abortUfoExperience } from '.
 import { generateUniqueId } from '../utils/generateUniqueId';
 import { DateOverrideContext } from '../dateOverrideContext';
 const packageName = "@atlaskit/media-card";
-const packageVersion = "77.7.1";
+const packageVersion = "77.7.3";
 export class CardBase extends Component {
   constructor(props) {
     super(props);

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.7.1";
+const packageVersion = "77.7.3";
 const MediaCardAnalyticsErrorBoundary = withMediaAnalyticsContext({
   packageVersion,
   packageName,

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.7.1";
+const packageVersion = "77.7.3";
 export const CardV2Base = ({
   identifier,
   ...otherProps

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

@@ -208,7 +208,8 @@ export const CardViewV2Base = ({
     "data-test-media-name": name,
     "data-test-status": status,
     "data-test-progress": progress,
-    "data-test-selected": selected
+    "data-test-selected": selected,
+    "data-test-source": cardPreview === null || cardPreview === void 0 ? void 0 : cardPreview.source
   }, renderTypeIcon && jsx(IconWrapper, {
     breakpoint: breakpoint,
     hasTitleBox: hasTitleBox

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

@@ -1,6 +1,6 @@
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import DownloadIcon from '@atlaskit/icon/glyph/download';
-import { globalMediaEventEmitter, isImageRepresentationReady, RECENTS_COLLECTION, imageResizeModeToFileImageMode, isProcessedFileState } from '@atlaskit/media-client';
+import { globalMediaEventEmitter, RECENTS_COLLECTION, imageResizeModeToFileImageMode, isProcessedFileState } from '@atlaskit/media-client';
 import { MediaFileStateError, useFileState, useMediaClient } from '@atlaskit/media-client-react';
 import { getRandomHex, isMimeTypeSupportedByBrowser, isVideoMimeTypeSupportedByBrowser } from '@atlaskit/media-common';
 import { MediaViewer } from '@atlaskit/media-viewer';
@@ -132,6 +132,7 @@ export const FileCard = ({
   }, [alt, previewDimensions, contextId, fileStateValue, identifier, originalDimensions]);
   const {
     preview,
+    status: previewStatus,
     error: previewError,
     nonCriticalError,
     ssrReliabilityRef,
@@ -145,7 +146,6 @@ export const FileCard = ({
     ssr,
     dimensions: previewDimensions,
     traceContext,
-    previewDidRender,
     skipRemote: !isCardVisible
   });
   const [error, setError] = useState();
@@ -412,15 +412,6 @@ export const FileCard = ({
         return;
       }
       if (fileState.status !== 'error') {
-        const mediaType = 'mediaType' in fileState ? fileState.mediaType : undefined;
-        const isPreviewable = !!mediaType && ['audio', 'video', 'image', 'doc'].indexOf(mediaType) > -1;
-        const isPreviewableFileState = !!fileState.preview;
-        const isSupportedLocalPreview = mediaType === 'image' || mediaType === 'video';
-        const hasLocalPreview = isPreviewableFileState &&
-        // CXP-2723 TODO: isPreviewableFileState is most likely redundant
-        isSupportedLocalPreview && !!fileState.mimeType && isMimeTypeSupportedByBrowser(fileState.mimeType);
-        const hasRemotePreview = isImageRepresentationReady(fileState);
-        const hasPreview = hasLocalPreview || hasRemotePreview;
         let newStatus;
         switch (fileState.status) {
           case 'uploading':
@@ -429,7 +420,8 @@ export const FileCard = ({
             newStatus = fileState.status;
             break;
           case 'processed':
-            if (!isPreviewable || !hasPreview) {
+            // Set complete if processing is done and there is no preview
+            if (!preview && previewStatus === 'complete') {
               newStatus = 'complete';
               break;
             }
@@ -451,7 +443,7 @@ export const FileCard = ({
   });
   useEffect(() => {
     updateFileStateRef.current();
-  }, [fileState, updateFileStateRef]);
+  }, [fileState, preview, previewStatus, updateFileStateRef]);
 
   //----------------------------------------------------------------//
   //---------------------- Render Card Function --------------------//

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.7.1",
+      packageName: "77.7.3",
       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.7.1";
+const packageVersion = "77.7.3";
 let concurrentExperience;
 const getExperience = id => {
   if (!concurrentExperience) {

package/dist/esm/card/card.js

@@ -41,7 +41,7 @@ import { completeUfoExperience, startUfoExperience, abortUfoExperience } from '.
 import { generateUniqueId } from '../utils/generateUniqueId';
 import { DateOverrideContext } from '../dateOverrideContext';
 var packageName = "@atlaskit/media-card";
-var packageVersion = "77.7.1";
+var packageVersion = "77.7.3";
 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.7.1";
+var packageVersion = "77.7.3";
 var MediaCardAnalyticsErrorBoundary = withMediaAnalyticsContext({
   packageVersion: packageVersion,
   packageName: packageName,

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

@@ -9,7 +9,7 @@ import { IntlProvider, injectIntl } from 'react-intl-next';
 import { ExternalImageCard } from './externalImageCard';
 import { FileCard } from './fileCard';
 var packageName = "@atlaskit/media-card";
-var packageVersion = "77.7.1";
+var packageVersion = "77.7.3";
 export var CardV2Base = function CardV2Base(_ref) {
   var identifier = _ref.identifier,
     otherProps = _objectWithoutProperties(_ref, _excluded);

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

@@ -203,7 +203,8 @@ export var CardViewV2Base = function CardViewV2Base(_ref) {
     "data-test-media-name": name,
     "data-test-status": status,
     "data-test-progress": progress,
-    "data-test-selected": selected
+    "data-test-selected": selected,
+    "data-test-source": cardPreview === null || cardPreview === void 0 ? void 0 : cardPreview.source
   }, renderTypeIcon && jsx(IconWrapper, {
     breakpoint: breakpoint,
     hasTitleBox: hasTitleBox

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

@@ -5,7 +5,7 @@ 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; }
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import DownloadIcon from '@atlaskit/icon/glyph/download';
-import { globalMediaEventEmitter, isImageRepresentationReady, RECENTS_COLLECTION, imageResizeModeToFileImageMode, isProcessedFileState } from '@atlaskit/media-client';
+import { globalMediaEventEmitter, RECENTS_COLLECTION, imageResizeModeToFileImageMode, isProcessedFileState } from '@atlaskit/media-client';
 import { MediaFileStateError, useFileState, useMediaClient } from '@atlaskit/media-client-react';
 import { getRandomHex, isMimeTypeSupportedByBrowser, isVideoMimeTypeSupportedByBrowser } from '@atlaskit/media-common';
 import { MediaViewer } from '@atlaskit/media-viewer';
@@ -168,10 +168,10 @@ export var FileCard = function FileCard(_ref) {
       ssr: ssr,
       dimensions: previewDimensions,
       traceContext: traceContext,
-      previewDidRender: previewDidRender,
       skipRemote: !isCardVisible
     }),
     preview = _useFilePreview.preview,
+    previewStatus = _useFilePreview.status,
     previewError = _useFilePreview.error,
     nonCriticalError = _useFilePreview.nonCriticalError,
     ssrReliabilityRef = _useFilePreview.ssrReliabilityRef,
@@ -449,15 +449,6 @@ export var FileCard = function FileCard(_ref) {
         return;
       }
       if (fileState.status !== 'error') {
-        var mediaType = 'mediaType' in fileState ? fileState.mediaType : undefined;
-        var isPreviewable = !!mediaType && ['audio', 'video', 'image', 'doc'].indexOf(mediaType) > -1;
-        var isPreviewableFileState = !!fileState.preview;
-        var isSupportedLocalPreview = mediaType === 'image' || mediaType === 'video';
-        var hasLocalPreview = isPreviewableFileState &&
-        // CXP-2723 TODO: isPreviewableFileState is most likely redundant
-        isSupportedLocalPreview && !!fileState.mimeType && isMimeTypeSupportedByBrowser(fileState.mimeType);
-        var hasRemotePreview = isImageRepresentationReady(fileState);
-        var hasPreview = hasLocalPreview || hasRemotePreview;
         var newStatus;
         switch (fileState.status) {
           case 'uploading':
@@ -466,7 +457,8 @@ export var FileCard = function FileCard(_ref) {
             newStatus = fileState.status;
             break;
           case 'processed':
-            if (!isPreviewable || !hasPreview) {
+            // Set complete if processing is done and there is no preview
+            if (!preview && previewStatus === 'complete') {
               newStatus = 'complete';
               break;
             }
@@ -488,7 +480,7 @@ export var FileCard = function FileCard(_ref) {
   });
   useEffect(function () {
     updateFileStateRef.current();
-  }, [fileState, updateFileStateRef]);
+  }, [fileState, preview, previewStatus, updateFileStateRef]);
 
   //----------------------------------------------------------------//
   //---------------------- Render Card Function --------------------//

package/dist/esm/inline/loader.js

@@ -103,7 +103,7 @@ var MediaInlineCardLoader = /*#__PURE__*/function (_React$PureComponent) {
         ErrorBoundary = _this$state.ErrorBoundary;
       var analyticsContext = {
         packageVersion: "@atlaskit/media-card",
-        packageName: "77.7.1",
+        packageName: "77.7.3",
         componentName: 'mediaInlineCard',
         component: 'mediaInlineCard'
       };

package/dist/esm/utils/ufoExperiences.js

@@ -7,7 +7,7 @@ import { extractErrorInfo, getRenderErrorRequestMetadata } from './analytics';
 import { MediaCardError } from '../errors';
 import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
 var packageName = "@atlaskit/media-card";
-var packageVersion = "77.7.1";
+var packageVersion = "77.7.3";
 var concurrentExperience;
 var getExperience = function getExperience(id) {
   if (!concurrentExperience) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/media-card",
-  "version": "77.7.1",
+  "version": "77.7.3",
   "description": "Includes all media card related components, CardView, CardViewSmall, Card...",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -37,19 +37,19 @@
   },
   "dependencies": {
     "@atlaskit/analytics-next": "^9.1.0",
-    "@atlaskit/dropdown-menu": "^12.1.0",
+    "@atlaskit/dropdown-menu": "^12.2.0",
     "@atlaskit/editor-shared-styles": "^2.9.0",
     "@atlaskit/icon": "^22.0.0",
     "@atlaskit/media-client": "^26.1.0",
     "@atlaskit/media-client-react": "^2.0.0",
     "@atlaskit/media-common": "^11.0.0",
-    "@atlaskit/media-file-preview": "^0.1.0",
+    "@atlaskit/media-file-preview": "^0.2.0",
     "@atlaskit/media-ui": "^25.0.0",
     "@atlaskit/media-viewer": "^48.2.0",
     "@atlaskit/platform-feature-flags": "^0.2.2",
     "@atlaskit/spinner": "^16.0.0",
     "@atlaskit/theme": "^12.6.0",
-    "@atlaskit/tokens": "^1.34.0",
+    "@atlaskit/tokens": "^1.35.0",
     "@atlaskit/tooltip": "^18.1.0",
     "@atlaskit/ufo": "^0.2.0",
     "@babel/runtime": "^7.0.0",