@atlaskit/media-card 74.6.0 → 74.6.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/media-card
 
+## 74.6.1
+
+### Patch Changes
+
+- [`489f7b32ff6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/489f7b32ff6) - Fixed broken SSR error handling logic when the preview url fails to load
+
 ## 74.6.0
 
 ### Minor Changes

package/dist/cjs/card/card.js

@@ -47,7 +47,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 = "74.6.0";
+var packageVersion = "74.6.1";
 var CardBase = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(CardBase, _Component);
   var _super = _createSuper(CardBase);
@@ -767,7 +767,8 @@ var CardBase = /*#__PURE__*/function (_Component) {
       var prevMediaClient = prevProps.mediaClient,
         prevIdentifier = prevProps.identifier,
         prevDimensions = prevProps.dimensions;
-      var prevIsCardVisible = prevState.isCardVisible;
+      var prevIsCardVisible = prevState.isCardVisible,
+        prevCardPreview = prevState.cardPreview;
       var _this$props12 = this.props,
         mediaClient = _this$props12.mediaClient,
         identifier = _this$props12.identifier,
@@ -775,7 +776,8 @@ var CardBase = /*#__PURE__*/function (_Component) {
         featureFlags = _this$props12.featureFlags,
         useInlinePlayer = _this$props12.useInlinePlayer,
         disableOverlay = _this$props12.disableOverlay,
-        resizeMode = _this$props12.resizeMode;
+        resizeMode = _this$props12.resizeMode,
+        ssr = _this$props12.ssr;
       var _this$state4 = this.state,
         isCardVisible = _this$state4.isCardVisible,
         cardPreview = _this$state4.cardPreview,
@@ -799,6 +801,7 @@ var CardBase = /*#__PURE__*/function (_Component) {
        * ----------------------------------------------------
        */
       var turnedVisible = !prevIsCardVisible && isCardVisible;
+      var hadSSRCardPreview = !!prevCardPreview && (0, _getCardPreview.isSSRClientPreview)(prevCardPreview) && !cardPreview;
       var isNewMediaClient = prevMediaClient !== mediaClient;
       var fileImageMode = (0, _mediaClient2.imageResizeModeToFileImageMode)(resizeMode);
       this.updateFileStateFlag(fileState);
@@ -824,8 +827,10 @@ var CardBase = /*#__PURE__*/function (_Component) {
           this.fireScreenEvent();
         }
       }
-      if ((0, _mediaClient2.isFileIdentifier)(identifier) && turnedVisible && !cardPreview && !wasResolvedUpfrontPreview) {
-        // This is a one-off call, only meant to happen when turnedVisible = true (only once in the component's lifecycle)
+      if ((0, _mediaClient2.isFileIdentifier)(identifier) && (turnedVisible || ssr === 'client' && hadSSRCardPreview) && !cardPreview && !wasResolvedUpfrontPreview) {
+        // This is a one-off call, only meant to happen once in the component's lifecycle. Mainly when either:
+        // - turnedVisible = true
+        // - ssr = client and has no preview (the dataURI failed to load in the previous state, most likely because of an initial auth issue)
         this.resolveUpfrontPreview(identifier);
       } else if ((0, _mediaClient2.isFileIdentifier)(identifier) && fileState && (0, _getCardPreview.shouldResolvePreview)({
         status: status,

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 = "74.6.0";
+var packageVersion = "74.6.1";
 var MediaCardAnalyticsErrorBoundary = (0, _mediaCommon.withMediaAnalyticsContext)({
   packageVersion: packageVersion,
   packageName: packageName,

package/dist/cjs/inline/mediaInlineAnalyticsErrorBoundary.js

@@ -77,7 +77,7 @@ var WrappedMediaInlineAnalyticsErrorBoundary = /*#__PURE__*/function (_React$Com
 }(_react.default.Component);
 (0, _defineProperty2.default)(WrappedMediaInlineAnalyticsErrorBoundary, "displayName", 'MediaInlineAnalyticsErrorBoundary');
 var packageName = "@atlaskit/media-card";
-var packageVersion = "74.6.0";
+var packageVersion = "74.6.1";
 var MediaInlineAnalyticsErrorBoundary = (0, _mediaCommon.withMediaAnalyticsContext)({
   packageVersion: packageVersion,
   packageName: packageName,

package/dist/cjs/utils/ufoExperiences.js

@@ -13,7 +13,7 @@ var _mediaClient = require("@atlaskit/media-client");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (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; }
 var packageName = "@atlaskit/media-card";
-var packageVersion = "74.6.0";
+var packageVersion = "74.6.1";
 var concurrentExperience;
 var getExperience = function getExperience(id) {
   if (!concurrentExperience) {

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-card",
-	"version": "74.6.0",
+	"version": "74.6.1",
 	"sideEffects": false
 }

package/dist/es2019/card/card.js

@@ -26,7 +26,7 @@ import { getMediaCardCursor } from '../utils/getMediaCardCursor';
 import { completeUfoExperience, startUfoExperience } from '../utils/ufoExperiences';
 import { generateUniqueId } from '../utils/generateUniqueId';
 const packageName = "@atlaskit/media-card";
-const packageVersion = "74.6.0";
+const packageVersion = "74.6.1";
 export class CardBase extends Component {
   // An internalOccurrenceKey is a randomly generated value to differentiate various instances
   // of Cards regardless of whether it shares the same file (either internal or external)
@@ -736,7 +736,8 @@ export class CardBase extends Component {
       dimensions: prevDimensions
     } = prevProps;
     const {
-      isCardVisible: prevIsCardVisible
+      isCardVisible: prevIsCardVisible,
+      cardPreview: prevCardPreview
     } = prevState;
     const {
       mediaClient,
@@ -745,7 +746,8 @@ export class CardBase extends Component {
       featureFlags,
       useInlinePlayer,
       disableOverlay,
-      resizeMode
+      resizeMode,
+      ssr
     } = this.props;
     const {
       isCardVisible,
@@ -771,6 +773,7 @@ export class CardBase extends Component {
      * ----------------------------------------------------
      */
     const turnedVisible = !prevIsCardVisible && isCardVisible;
+    const hadSSRCardPreview = !!prevCardPreview && isSSRClientPreview(prevCardPreview) && !cardPreview;
     const isNewMediaClient = prevMediaClient !== mediaClient;
     const fileImageMode = imageResizeModeToFileImageMode(resizeMode);
     this.updateFileStateFlag(fileState);
@@ -798,8 +801,10 @@ export class CardBase extends Component {
         this.fireScreenEvent();
       }
     }
-    if (isFileIdentifier(identifier) && turnedVisible && !cardPreview && !wasResolvedUpfrontPreview) {
-      // This is a one-off call, only meant to happen when turnedVisible = true (only once in the component's lifecycle)
+    if (isFileIdentifier(identifier) && (turnedVisible || ssr === 'client' && hadSSRCardPreview) && !cardPreview && !wasResolvedUpfrontPreview) {
+      // This is a one-off call, only meant to happen once in the component's lifecycle. Mainly when either:
+      // - turnedVisible = true
+      // - ssr = client and has no preview (the dataURI failed to load in the previous state, most likely because of an initial auth issue)
       this.resolveUpfrontPreview(identifier);
     } else if (isFileIdentifier(identifier) && fileState && shouldResolvePreview({
       status,

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

package/dist/es2019/inline/mediaInlineAnalyticsErrorBoundary.js

@@ -54,7 +54,7 @@ class WrappedMediaInlineAnalyticsErrorBoundary extends React.Component {
 }
 _defineProperty(WrappedMediaInlineAnalyticsErrorBoundary, "displayName", 'MediaInlineAnalyticsErrorBoundary');
 const packageName = "@atlaskit/media-card";
-const packageVersion = "74.6.0";
+const packageVersion = "74.6.1";
 const MediaInlineAnalyticsErrorBoundary = withMediaAnalyticsContext({
   packageVersion,
   packageName,

package/dist/es2019/utils/ufoExperiences.js

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

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-card",
-	"version": "74.6.0",
+	"version": "74.6.1",
 	"sideEffects": false
 }

package/dist/esm/card/card.js

@@ -39,7 +39,7 @@ import { getMediaCardCursor } from '../utils/getMediaCardCursor';
 import { completeUfoExperience, startUfoExperience } from '../utils/ufoExperiences';
 import { generateUniqueId } from '../utils/generateUniqueId';
 var packageName = "@atlaskit/media-card";
-var packageVersion = "74.6.0";
+var packageVersion = "74.6.1";
 export var CardBase = /*#__PURE__*/function (_Component) {
   _inherits(CardBase, _Component);
   var _super = _createSuper(CardBase);
@@ -759,7 +759,8 @@ export var CardBase = /*#__PURE__*/function (_Component) {
       var prevMediaClient = prevProps.mediaClient,
         prevIdentifier = prevProps.identifier,
         prevDimensions = prevProps.dimensions;
-      var prevIsCardVisible = prevState.isCardVisible;
+      var prevIsCardVisible = prevState.isCardVisible,
+        prevCardPreview = prevState.cardPreview;
       var _this$props12 = this.props,
         mediaClient = _this$props12.mediaClient,
         identifier = _this$props12.identifier,
@@ -767,7 +768,8 @@ export var CardBase = /*#__PURE__*/function (_Component) {
         featureFlags = _this$props12.featureFlags,
         useInlinePlayer = _this$props12.useInlinePlayer,
         disableOverlay = _this$props12.disableOverlay,
-        resizeMode = _this$props12.resizeMode;
+        resizeMode = _this$props12.resizeMode,
+        ssr = _this$props12.ssr;
       var _this$state4 = this.state,
         isCardVisible = _this$state4.isCardVisible,
         cardPreview = _this$state4.cardPreview,
@@ -791,6 +793,7 @@ export var CardBase = /*#__PURE__*/function (_Component) {
        * ----------------------------------------------------
        */
       var turnedVisible = !prevIsCardVisible && isCardVisible;
+      var hadSSRCardPreview = !!prevCardPreview && isSSRClientPreview(prevCardPreview) && !cardPreview;
       var isNewMediaClient = prevMediaClient !== mediaClient;
       var fileImageMode = imageResizeModeToFileImageMode(resizeMode);
       this.updateFileStateFlag(fileState);
@@ -816,8 +819,10 @@ export var CardBase = /*#__PURE__*/function (_Component) {
           this.fireScreenEvent();
         }
       }
-      if (isFileIdentifier(identifier) && turnedVisible && !cardPreview && !wasResolvedUpfrontPreview) {
-        // This is a one-off call, only meant to happen when turnedVisible = true (only once in the component's lifecycle)
+      if (isFileIdentifier(identifier) && (turnedVisible || ssr === 'client' && hadSSRCardPreview) && !cardPreview && !wasResolvedUpfrontPreview) {
+        // This is a one-off call, only meant to happen once in the component's lifecycle. Mainly when either:
+        // - turnedVisible = true
+        // - ssr = client and has no preview (the dataURI failed to load in the previous state, most likely because of an initial auth issue)
         this.resolveUpfrontPreview(identifier);
       } else if (isFileIdentifier(identifier) && fileState && shouldResolvePreview({
         status: status,

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 = "74.6.0";
+var packageVersion = "74.6.1";
 var MediaCardAnalyticsErrorBoundary = withMediaAnalyticsContext({
   packageVersion: packageVersion,
   packageName: packageName,

package/dist/esm/inline/mediaInlineAnalyticsErrorBoundary.js

@@ -70,7 +70,7 @@ var WrappedMediaInlineAnalyticsErrorBoundary = /*#__PURE__*/function (_React$Com
 }(React.Component);
 _defineProperty(WrappedMediaInlineAnalyticsErrorBoundary, "displayName", 'MediaInlineAnalyticsErrorBoundary');
 var packageName = "@atlaskit/media-card";
-var packageVersion = "74.6.0";
+var packageVersion = "74.6.1";
 var MediaInlineAnalyticsErrorBoundary = withMediaAnalyticsContext({
   packageVersion: packageVersion,
   packageName: packageName,

package/dist/esm/utils/ufoExperiences.js

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

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-card",
-	"version": "74.6.0",
+	"version": "74.6.1",
 	"sideEffects": false
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/media-card",
-  "version": "74.6.0",
+  "version": "74.6.1",
   "description": "Includes all media card related components, CardView, CardViewSmall, Card...",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@atlaskit/analytics-next": "^9.0.0",
-    "@atlaskit/dropdown-menu": "^11.5.0",
+    "@atlaskit/dropdown-menu": "^11.6.0",
     "@atlaskit/editor-shared-styles": "^2.3.0",
     "@atlaskit/icon": "^21.11.0",
     "@atlaskit/media-client": "^20.0.0",