@atlaskit/media-card 77.4.9 → 77.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (44) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/cjs/card/card.js +1 -1
  3. package/dist/cjs/card/cardLoader.js +3 -47
  4. package/dist/cjs/card/cardWithMediaClient.js +26 -0
  5. package/dist/cjs/card/media-card-analytics-error-boundary.js +1 -1
  6. package/dist/cjs/card/v2/cardV2.js +1 -1
  7. package/dist/cjs/card/v2/cardV2Loader.js +3 -54
  8. package/dist/cjs/card/v2/cardWithMediaClientV2.js +34 -0
  9. package/dist/cjs/card/v2/useFilePreview.js +33 -45
  10. package/dist/cjs/inline/loader.js +1 -1
  11. package/dist/cjs/utils/ufoExperiences.js +1 -1
  12. package/dist/es2019/card/card.js +1 -1
  13. package/dist/es2019/card/cardLoader.js +2 -32
  14. package/dist/es2019/card/cardWithMediaClient.js +21 -0
  15. package/dist/es2019/card/media-card-analytics-error-boundary.js +1 -1
  16. package/dist/es2019/card/v2/cardV2.js +1 -1
  17. package/dist/es2019/card/v2/cardV2Loader.js +2 -35
  18. package/dist/es2019/card/v2/cardWithMediaClientV2.js +25 -0
  19. package/dist/es2019/card/v2/useFilePreview.js +17 -28
  20. package/dist/es2019/inline/loader.js +1 -1
  21. package/dist/es2019/utils/ufoExperiences.js +1 -1
  22. package/dist/esm/card/card.js +1 -1
  23. package/dist/esm/card/cardLoader.js +3 -43
  24. package/dist/esm/card/cardWithMediaClient.js +19 -0
  25. package/dist/esm/card/media-card-analytics-error-boundary.js +1 -1
  26. package/dist/esm/card/v2/cardV2.js +1 -1
  27. package/dist/esm/card/v2/cardV2Loader.js +3 -50
  28. package/dist/esm/card/v2/cardWithMediaClientV2.js +27 -0
  29. package/dist/esm/card/v2/useFilePreview.js +33 -45
  30. package/dist/esm/inline/loader.js +1 -1
  31. package/dist/esm/utils/ufoExperiences.js +1 -1
  32. package/dist/types/card/cardLoader.d.ts +1 -3
  33. package/dist/types/card/cardSwitcher.d.ts +1 -1
  34. package/dist/types/card/cardWithMediaClient.d.ts +3 -0
  35. package/dist/types/card/types.d.ts +3 -0
  36. package/dist/types/card/v2/cardV2Loader.d.ts +1 -1
  37. package/dist/types/card/v2/cardWithMediaClientV2.d.ts +3 -0
  38. package/dist/types-ts4.5/card/cardLoader.d.ts +1 -3
  39. package/dist/types-ts4.5/card/cardSwitcher.d.ts +1 -1
  40. package/dist/types-ts4.5/card/cardWithMediaClient.d.ts +3 -0
  41. package/dist/types-ts4.5/card/types.d.ts +3 -0
  42. package/dist/types-ts4.5/card/v2/cardV2Loader.d.ts +1 -1
  43. package/dist/types-ts4.5/card/v2/cardWithMediaClientV2.d.ts +3 -0
  44. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @atlaskit/media-card
2
2
 
3
+ ## 77.5.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#59081](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/59081) [`ddeb216a6c03`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ddeb216a6c03) - remove extra react loadable breakdown as it is unnecessary
8
+
9
+ ## 77.4.10
10
+
11
+ ### Patch Changes
12
+
13
+ - [#58827](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58827) [`d0041df63a34`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d0041df63a34) - Small code refactor
14
+
3
15
  ## 77.4.9
4
16
 
5
17
  ### Patch Changes
@@ -49,7 +49,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
49
49
  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); }; }
50
50
  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; } }
51
51
  var packageName = "@atlaskit/media-card";
52
- var packageVersion = "77.4.9";
52
+ var packageVersion = "77.5.0";
53
53
  var CardBase = exports.CardBase = /*#__PURE__*/function (_Component) {
54
54
  (0, _inherits2.default)(CardBase, _Component);
55
55
  var _super = _createSuper(CardBase);
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.default = void 0;
8
8
  var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
9
- var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
10
9
  var _react = _interopRequireWildcard(require("react"));
11
10
  var _reactLoadable = _interopRequireDefault(require("react-loadable"));
12
11
  var _cardLoading = require("../utils/lightCards/cardLoading");
@@ -17,61 +16,18 @@ var CardLoadingWithContext = function CardLoadingWithContext() {
17
16
  var props = (0, _react.useContext)(MediaCardContext);
18
17
  return /*#__PURE__*/_react.default.createElement(_cardLoading.CardLoading, props);
19
18
  };
20
- var MediaCard = (0, _reactLoadable.default)({
21
- loader: function loader() {
22
- return Promise.resolve().then(function () {
23
- return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_media-card" */'./card'));
24
- }).then(function (mod) {
25
- return mod.Card;
26
- });
27
- },
28
- loading: function loading() {
29
- return /*#__PURE__*/_react.default.createElement(CardLoadingWithContext, null);
30
- }
31
- });
32
- var MediaCardErrorBoundary = (0, _reactLoadable.default)({
33
- loader: function loader() {
34
- return Promise.resolve().then(function () {
35
- return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_media-card-error-boundary" */'./media-card-analytics-error-boundary'));
36
- }).then(function (mod) {
37
- return mod.default;
38
- });
39
- },
40
- loading: function loading() {
41
- return /*#__PURE__*/_react.default.createElement(CardLoadingWithContext, null);
42
- }
43
- });
44
19
  var MediaCardWithMediaClient = (0, _reactLoadable.default)({
45
20
  loader: function loader() {
46
21
  return Promise.resolve().then(function () {
47
- return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_media-client-react" */'@atlaskit/media-client-react'));
22
+ return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_media-card-with-media-client" */'./cardWithMediaClient'));
23
+ }).then(function (mod) {
24
+ return mod.CardWithMediaClient;
48
25
  });
49
26
  },
50
27
  loading: function loading() {
51
28
  return /*#__PURE__*/_react.default.createElement(CardLoadingWithContext, null);
52
- },
53
- render: function render(loaded, props) {
54
- return /*#__PURE__*/_react.default.createElement(CardWithMediaClient, (0, _extends2.default)({}, props, {
55
- withMediaClient: loaded.withMediaClient
56
- }));
57
29
  }
58
30
  });
59
- var CardWithMediaClient = function CardWithMediaClient(props) {
60
- var withMediaClient = props.withMediaClient,
61
- dimensions = props.dimensions,
62
- onClick = props.onClick;
63
- var Card = _react.default.useMemo(function () {
64
- return withMediaClient(MediaCard);
65
- }, [withMediaClient]);
66
- return (
67
- /*#__PURE__*/
68
- // onClick is passed into MediaCardErrorBoundary so MediaGroup items can get the toolbar menu in Editor
69
- _react.default.createElement(MediaCardErrorBoundary, {
70
- dimensions: dimensions,
71
- onClick: onClick
72
- }, /*#__PURE__*/_react.default.createElement(Card, props))
73
- );
74
- };
75
31
  var CardLoader = function CardLoader(props) {
76
32
  return /*#__PURE__*/_react.default.createElement(MediaCardContext.Provider, {
77
33
  value: props
@@ -0,0 +1,26 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ exports.CardWithMediaClient = void 0;
8
+ var _react = _interopRequireDefault(require("react"));
9
+ var _mediaClientReact = require("@atlaskit/media-client-react");
10
+ var _card = require("./card");
11
+ var _mediaCardAnalyticsErrorBoundary = _interopRequireDefault(require("./media-card-analytics-error-boundary"));
12
+ var CardWithMediaClient = exports.CardWithMediaClient = function CardWithMediaClient(props) {
13
+ var dimensions = props.dimensions,
14
+ onClick = props.onClick;
15
+ var Card = _react.default.useMemo(function () {
16
+ return (0, _mediaClientReact.withMediaClient)(_card.Card);
17
+ }, []);
18
+ return (
19
+ /*#__PURE__*/
20
+ // onClick is passed into MediaCardErrorBoundary so MediaGroup items can get the toolbar menu in Editor
21
+ _react.default.createElement(_mediaCardAnalyticsErrorBoundary.default, {
22
+ dimensions: dimensions,
23
+ onClick: onClick
24
+ }, /*#__PURE__*/_react.default.createElement(Card, props))
25
+ );
26
+ };
@@ -90,7 +90,7 @@ var WrappedMediaCardAnalyticsErrorBoundary = /*#__PURE__*/function (_React$Compo
90
90
  }(_react.default.Component);
91
91
  (0, _defineProperty2.default)(WrappedMediaCardAnalyticsErrorBoundary, "displayName", 'MediaCardAnalyticsErrorBoundary');
92
92
  var packageName = "@atlaskit/media-card";
93
- var packageVersion = "77.4.9";
93
+ var packageVersion = "77.5.0";
94
94
  var MediaCardAnalyticsErrorBoundary = (0, _mediaCommon.withMediaAnalyticsContext)({
95
95
  packageVersion: packageVersion,
96
96
  packageName: packageName,
@@ -16,7 +16,7 @@ var _externalImageCard = require("./externalImageCard");
16
16
  var _fileCard = require("./fileCard");
17
17
  var _excluded = ["identifier"];
18
18
  var packageName = "@atlaskit/media-card";
19
- var packageVersion = "77.4.9";
19
+ var packageVersion = "77.5.0";
20
20
  var CardV2Base = exports.CardV2Base = function CardV2Base(_ref) {
21
21
  var identifier = _ref.identifier,
22
22
  otherProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
@@ -6,13 +6,9 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.default = void 0;
8
8
  var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
9
- var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
10
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
11
9
  var _react = _interopRequireWildcard(require("react"));
12
10
  var _reactLoadable = _interopRequireDefault(require("react-loadable"));
13
11
  var _cardLoading = require("../../utils/lightCards/cardLoading");
14
- 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; }
15
- 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; }
16
12
  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); }
17
13
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || (0, _typeof2.default)(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; }
18
14
  var MediaCardContext = /*#__PURE__*/_react.default.createContext({});
@@ -20,63 +16,16 @@ var CardLoadingWithContext = function CardLoadingWithContext() {
20
16
  var props = (0, _react.useContext)(MediaCardContext);
21
17
  return /*#__PURE__*/_react.default.createElement(_cardLoading.CardLoading, props);
22
18
  };
23
- var MediaV2Card = (0, _reactLoadable.default)({
24
- loader: function loader() {
25
- return Promise.resolve().then(function () {
26
- return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_media-card-v2" */'./cardV2'));
27
- }).then(function (mod) {
28
- return mod.CardV2;
29
- });
30
- },
31
- loading: function loading() {
32
- return /*#__PURE__*/_react.default.createElement(CardLoadingWithContext, null);
33
- }
34
- });
35
- var MediaCardErrorBoundary = (0, _reactLoadable.default)({
36
- loader: function loader() {
37
- return Promise.resolve().then(function () {
38
- return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_media-card-error-boundary" */'../media-card-analytics-error-boundary'));
39
- }).then(function (mod) {
40
- return mod.default;
41
- });
42
- },
43
- loading: function loading() {
44
- return /*#__PURE__*/_react.default.createElement(CardLoadingWithContext, null);
45
- }
46
- });
47
- var CardWithMediaClient = function CardWithMediaClient(props) {
48
- var dimensions = props.dimensions,
49
- onClick = props.onClick,
50
- withMediaClient = props.withMediaClient,
51
- featureFlags = props.featureFlags;
52
- var Card = _react.default.useMemo(function () {
53
- return withMediaClient(MediaV2Card);
54
- }, [withMediaClient]);
55
- var featureFlagsWithMediaCardV2 = _react.default.useMemo(function () {
56
- return _objectSpread(_objectSpread({}, featureFlags), {}, {
57
- mediaCardV2: true //used for analytics - internal use only
58
- });
59
- }, [featureFlags]);
60
- return /*#__PURE__*/_react.default.createElement(MediaCardErrorBoundary, {
61
- dimensions: dimensions,
62
- onClick: onClick
63
- }, /*#__PURE__*/_react.default.createElement(Card, (0, _extends2.default)({}, props, {
64
- featureFlags: featureFlagsWithMediaCardV2
65
- })));
66
- };
67
19
  var MediaCardWithMediaClientProvider = (0, _reactLoadable.default)({
68
20
  loader: function loader() {
69
21
  return Promise.resolve().then(function () {
70
- return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_media-client-react" */'@atlaskit/media-client-react'));
22
+ return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_media-card-with-media-client-v2" */'./cardWithMediaClientV2'));
23
+ }).then(function (mod) {
24
+ return mod.CardWithMediaClientV2;
71
25
  });
72
26
  },
73
27
  loading: function loading() {
74
28
  return /*#__PURE__*/_react.default.createElement(CardLoadingWithContext, null);
75
- },
76
- render: function render(loaded, props) {
77
- return /*#__PURE__*/_react.default.createElement(CardWithMediaClient, (0, _extends2.default)({}, props, {
78
- withMediaClient: loaded.withMediaClient
79
- }));
80
29
  }
81
30
  });
82
31
  var CardLoader = function CardLoader(props) {
@@ -0,0 +1,34 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ exports.CardWithMediaClientV2 = void 0;
8
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
10
+ var _react = _interopRequireDefault(require("react"));
11
+ var _mediaClientReact = require("@atlaskit/media-client-react");
12
+ var _mediaCardAnalyticsErrorBoundary = _interopRequireDefault(require("../media-card-analytics-error-boundary"));
13
+ var _cardV = require("./cardV2");
14
+ 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; }
15
+ 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; }
16
+ var CardWithMediaClientV2 = exports.CardWithMediaClientV2 = function CardWithMediaClientV2(props) {
17
+ var dimensions = props.dimensions,
18
+ onClick = props.onClick,
19
+ featureFlags = props.featureFlags;
20
+ var Card = _react.default.useMemo(function () {
21
+ return (0, _mediaClientReact.withMediaClient)(_cardV.CardV2);
22
+ }, []);
23
+ var featureFlagsWithMediaCardV2 = _react.default.useMemo(function () {
24
+ return _objectSpread(_objectSpread({}, featureFlags), {}, {
25
+ mediaCardV2: true //used for analytics - internal use only
26
+ });
27
+ }, [featureFlags]);
28
+ return /*#__PURE__*/_react.default.createElement(_mediaCardAnalyticsErrorBoundary.default, {
29
+ dimensions: dimensions,
30
+ onClick: onClick
31
+ }, /*#__PURE__*/_react.default.createElement(Card, (0, _extends2.default)({}, props, {
32
+ featureFlags: featureFlagsWithMediaCardV2
33
+ })));
34
+ };
@@ -37,31 +37,27 @@ var useFilePreview = exports.useFilePreview = function useFilePreview(_ref) {
37
37
  skipRemote = _ref.skipRemote,
38
38
  mediaBlobUrlAttrs = _ref.mediaBlobUrlAttrs;
39
39
  var mediaClient = (0, _mediaClientReact.useMediaClient)();
40
- var _useState = (0, _react.useState)(),
40
+ var _useState = (0, _react.useState)('loading'),
41
41
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
42
- error = _useState2[0],
43
- setError = _useState2[1];
42
+ status = _useState2[0],
43
+ setStatus = _useState2[1];
44
44
  var _useState3 = (0, _react.useState)(),
45
45
  _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
46
- nonCriticalError = _useState4[0],
47
- setNonCriticalError = _useState4[1];
46
+ error = _useState4[0],
47
+ setError = _useState4[1];
48
+ var _useState5 = (0, _react.useState)(),
49
+ _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
50
+ nonCriticalError = _useState6[0],
51
+ setNonCriticalError = _useState6[1];
52
+ var _useState7 = (0, _react.useState)(false),
53
+ _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
54
+ isBannedLocalPreview = _useState8[0],
55
+ setIsBannedLocalPreview = _useState8[1];
56
+ var wasResolvedUpfrontPreviewRef = (0, _react.useRef)(false);
57
+ var ssrReliabilityRef = (0, _react.useRef)(initialSsrReliability);
48
58
  var requestDimensions = (0, _react.useMemo)(function () {
49
59
  return dimensions ? createRequestDimensions(dimensions) : undefined;
50
60
  }, [dimensions]);
51
-
52
- //----------------------------------------------------------------//
53
- //---------------- State Initializer Functions -------------------//
54
- //----------------------------------------------------------------//
55
-
56
- var ssrDataRef = (0, _react.useRef)();
57
- var ssrReliabilityRef = (0, _react.useRef)({
58
- server: {
59
- status: 'unknown'
60
- },
61
- client: {
62
- status: 'unknown'
63
- }
64
- });
65
61
  var imageURLParams = (0, _react.useMemo)(function () {
66
62
  return _objectSpread(_objectSpread({
67
63
  collection: identifier.collectionName,
@@ -71,14 +67,13 @@ var useFilePreview = exports.useFilePreview = function useFilePreview(_ref) {
71
67
  });
72
68
  }, [requestDimensions, identifier.collectionName, resizeMode]);
73
69
  var getSSRPreview = function getSSRPreview(ssr, identifier, mediaClient) {
74
- var _ssrDataRef$current, _ssrDataRef$current2;
75
- ssrDataRef.current = (0, _globalScope.getSSRData)(identifier);
76
- if ((_ssrDataRef$current = ssrDataRef.current) !== null && _ssrDataRef$current !== void 0 && _ssrDataRef$current.error) {
70
+ var ssrData = (0, _globalScope.getSSRData)(identifier);
71
+ if (ssrData !== null && ssrData !== void 0 && ssrData.error) {
77
72
  ssrReliabilityRef.current.server = _objectSpread({
78
73
  status: 'fail'
79
- }, ssrDataRef.current.error);
74
+ }, ssrData.error);
80
75
  }
81
- if (!((_ssrDataRef$current2 = ssrDataRef.current) !== null && _ssrDataRef$current2 !== void 0 && _ssrDataRef$current2.dataURI)) {
76
+ if (!(ssrData !== null && ssrData !== void 0 && ssrData.dataURI)) {
82
77
  try {
83
78
  return (0, _getCardPreview.getSSRCardPreview)(ssr, mediaClient, identifier.id, imageURLParams, mediaBlobUrlAttrs);
84
79
  } catch (e) {
@@ -87,9 +82,8 @@ var useFilePreview = exports.useFilePreview = function useFilePreview(_ref) {
87
82
  }, (0, _analytics.extractErrorInfo)(e));
88
83
  }
89
84
  } else {
90
- var _ssrDataRef$current3 = ssrDataRef.current,
91
- _dimensions = _ssrDataRef$current3.dimensions,
92
- dataURI = _ssrDataRef$current3.dataURI;
85
+ var _dimensions = ssrData.dimensions,
86
+ dataURI = ssrData.dataURI;
93
87
  return {
94
88
  dataURI: dataURI,
95
89
  dimensions: _dimensions,
@@ -107,33 +101,19 @@ var useFilePreview = exports.useFilePreview = function useFilePreview(_ref) {
107
101
  }
108
102
  return cardPreview;
109
103
  };
110
- var _useState5 = (0, _react.useState)(cardPreviewInitializer),
111
- _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
112
- cardPreview = _useState6[0],
113
- setCardPreview = _useState6[1];
104
+ var _useState9 = (0, _react.useState)(cardPreviewInitializer),
105
+ _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
106
+ cardPreview = _useState10[0],
107
+ setCardPreview = _useState10[1];
114
108
  var _useFileState = (0, _mediaClientReact.useFileState)(identifier.id, {
115
109
  skipRemote: skipRemote,
116
110
  collectionName: identifier.collectionName,
117
111
  occurrenceKey: identifier.occurrenceKey
118
112
  }),
119
113
  fileState = _useFileState.fileState;
120
-
121
- //----------------------------------------------------------------//
122
- //------------ State, Refs & Initial Values ----------------------//
123
- //----------------------------------------------------------------//
124
-
125
- var _useState7 = (0, _react.useState)('loading'),
126
- _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
127
- status = _useState8[0],
128
- setStatus = _useState8[1];
129
114
  (0, _react.useEffect)(function () {
130
115
  setStatus('loading');
131
116
  }, [identifier]);
132
- var _useState9 = (0, _react.useState)(false),
133
- _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
134
- isBannedLocalPreview = _useState10[0],
135
- setIsBannedLocalPreview = _useState10[1];
136
- var wasResolvedUpfrontPreviewRef = (0, _react.useRef)(false);
137
117
 
138
118
  //----------------------------------------------------------------//
139
119
  //---------------------- Helper Functions -----------------------//
@@ -606,4 +586,12 @@ var createRequestDimensions = function createRequestDimensions(dimensions) {
606
586
  result.height = height * retinaFactor;
607
587
  }
608
588
  return result;
589
+ };
590
+ var initialSsrReliability = {
591
+ server: {
592
+ status: 'unknown'
593
+ },
594
+ client: {
595
+ status: 'unknown'
596
+ }
609
597
  };
@@ -119,7 +119,7 @@ var MediaInlineCardLoader = exports.default = /*#__PURE__*/function (_React$Pure
119
119
  ErrorBoundary = _this$state.ErrorBoundary;
120
120
  var analyticsContext = {
121
121
  packageVersion: "@atlaskit/media-card",
122
- packageName: "77.4.9",
122
+ packageName: "77.5.0",
123
123
  componentName: 'mediaInlineCard',
124
124
  component: 'mediaInlineCard'
125
125
  };
@@ -14,7 +14,7 @@ var _mediaClient = require("@atlaskit/media-client");
14
14
  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; }
15
15
  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; }
16
16
  var packageName = "@atlaskit/media-card";
17
- var packageVersion = "77.4.9";
17
+ var packageVersion = "77.5.0";
18
18
  var concurrentExperience;
19
19
  var getExperience = function getExperience(id) {
20
20
  if (!concurrentExperience) {
@@ -27,7 +27,7 @@ import { getMediaCardCursor } from '../utils/getMediaCardCursor';
27
27
  import { completeUfoExperience, startUfoExperience, abortUfoExperience } from '../utils/ufoExperiences';
28
28
  import { generateUniqueId } from '../utils/generateUniqueId';
29
29
  const packageName = "@atlaskit/media-card";
30
- const packageVersion = "77.4.9";
30
+ const packageVersion = "77.5.0";
31
31
  export class CardBase extends Component {
32
32
  constructor(props) {
33
33
  super(props);
@@ -1,4 +1,3 @@
1
- import _extends from "@babel/runtime/helpers/extends";
2
1
  import React, { useContext } from 'react';
3
2
  import Loadable from 'react-loadable';
4
3
  import { CardLoading } from '../utils/lightCards/cardLoading';
@@ -7,39 +6,10 @@ const CardLoadingWithContext = () => {
7
6
  const props = useContext(MediaCardContext);
8
7
  return /*#__PURE__*/React.createElement(CardLoading, props);
9
8
  };
10
- const MediaCard = Loadable({
11
- loader: () => import( /* webpackChunkName: "@atlaskit-internal_media-card" */'./card').then(mod => mod.Card),
12
- loading: () => /*#__PURE__*/React.createElement(CardLoadingWithContext, null)
13
- });
14
- const MediaCardErrorBoundary = Loadable({
15
- loader: () => import( /* webpackChunkName: "@atlaskit-internal_media-card-error-boundary" */'./media-card-analytics-error-boundary').then(mod => mod.default),
16
- loading: () => /*#__PURE__*/React.createElement(CardLoadingWithContext, null)
17
- });
18
9
  const MediaCardWithMediaClient = Loadable({
19
- loader: () => import( /* webpackChunkName: "@atlaskit-internal_media-client-react" */'@atlaskit/media-client-react'),
20
- loading: () => /*#__PURE__*/React.createElement(CardLoadingWithContext, null),
21
- render: (loaded, props) => /*#__PURE__*/React.createElement(CardWithMediaClient, _extends({}, props, {
22
- withMediaClient: loaded.withMediaClient
23
- }))
10
+ loader: () => import( /* webpackChunkName: "@atlaskit-internal_media-card-with-media-client" */'./cardWithMediaClient').then(mod => mod.CardWithMediaClient),
11
+ loading: () => /*#__PURE__*/React.createElement(CardLoadingWithContext, null)
24
12
  });
25
- const CardWithMediaClient = props => {
26
- const {
27
- withMediaClient,
28
- dimensions,
29
- onClick
30
- } = props;
31
- const Card = React.useMemo(() => {
32
- return withMediaClient(MediaCard);
33
- }, [withMediaClient]);
34
- return (
35
- /*#__PURE__*/
36
- // onClick is passed into MediaCardErrorBoundary so MediaGroup items can get the toolbar menu in Editor
37
- React.createElement(MediaCardErrorBoundary, {
38
- dimensions: dimensions,
39
- onClick: onClick
40
- }, /*#__PURE__*/React.createElement(Card, props))
41
- );
42
- };
43
13
  const CardLoader = props => {
44
14
  return /*#__PURE__*/React.createElement(MediaCardContext.Provider, {
45
15
  value: props
@@ -0,0 +1,21 @@
1
+ import React from 'react';
2
+ import { withMediaClient } from '@atlaskit/media-client-react';
3
+ import { Card as MediaCard } from './card';
4
+ import MediaCardAnalyticsErrorBoundary from './media-card-analytics-error-boundary';
5
+ export const CardWithMediaClient = props => {
6
+ const {
7
+ dimensions,
8
+ onClick
9
+ } = props;
10
+ const Card = React.useMemo(() => {
11
+ return withMediaClient(MediaCard);
12
+ }, []);
13
+ return (
14
+ /*#__PURE__*/
15
+ // onClick is passed into MediaCardErrorBoundary so MediaGroup items can get the toolbar menu in Editor
16
+ React.createElement(MediaCardAnalyticsErrorBoundary, {
17
+ dimensions: dimensions,
18
+ onClick: onClick
19
+ }, /*#__PURE__*/React.createElement(Card, props))
20
+ );
21
+ };
@@ -66,7 +66,7 @@ class WrappedMediaCardAnalyticsErrorBoundary extends React.Component {
66
66
  }
67
67
  _defineProperty(WrappedMediaCardAnalyticsErrorBoundary, "displayName", 'MediaCardAnalyticsErrorBoundary');
68
68
  const packageName = "@atlaskit/media-card";
69
- const packageVersion = "77.4.9";
69
+ const packageVersion = "77.5.0";
70
70
  const MediaCardAnalyticsErrorBoundary = withMediaAnalyticsContext({
71
71
  packageVersion,
72
72
  packageName,
@@ -7,7 +7,7 @@ import { IntlProvider, injectIntl } from 'react-intl-next';
7
7
  import { ExternalImageCard } from './externalImageCard';
8
8
  import { FileCard } from './fileCard';
9
9
  const packageName = "@atlaskit/media-card";
10
- const packageVersion = "77.4.9";
10
+ const packageVersion = "77.5.0";
11
11
  export const CardV2Base = ({
12
12
  identifier,
13
13
  ...otherProps
@@ -1,4 +1,3 @@
1
- import _extends from "@babel/runtime/helpers/extends";
2
1
  import React, { useContext } from 'react';
3
2
  import Loadable from 'react-loadable';
4
3
  import { CardLoading } from '../../utils/lightCards/cardLoading';
@@ -7,41 +6,9 @@ const CardLoadingWithContext = () => {
7
6
  const props = useContext(MediaCardContext);
8
7
  return /*#__PURE__*/React.createElement(CardLoading, props);
9
8
  };
10
- const MediaV2Card = Loadable({
11
- loader: () => import( /* webpackChunkName: "@atlaskit-internal_media-card-v2" */'./cardV2').then(mod => mod.CardV2),
12
- loading: () => /*#__PURE__*/React.createElement(CardLoadingWithContext, null)
13
- });
14
- const MediaCardErrorBoundary = Loadable({
15
- loader: () => import( /* webpackChunkName: "@atlaskit-internal_media-card-error-boundary" */'../media-card-analytics-error-boundary').then(mod => mod.default),
16
- loading: () => /*#__PURE__*/React.createElement(CardLoadingWithContext, null)
17
- });
18
- const CardWithMediaClient = props => {
19
- const {
20
- dimensions,
21
- onClick,
22
- withMediaClient,
23
- featureFlags
24
- } = props;
25
- const Card = React.useMemo(() => {
26
- return withMediaClient(MediaV2Card);
27
- }, [withMediaClient]);
28
- const featureFlagsWithMediaCardV2 = React.useMemo(() => ({
29
- ...featureFlags,
30
- mediaCardV2: true //used for analytics - internal use only
31
- }), [featureFlags]);
32
- return /*#__PURE__*/React.createElement(MediaCardErrorBoundary, {
33
- dimensions: dimensions,
34
- onClick: onClick
35
- }, /*#__PURE__*/React.createElement(Card, _extends({}, props, {
36
- featureFlags: featureFlagsWithMediaCardV2
37
- })));
38
- };
39
9
  const MediaCardWithMediaClientProvider = Loadable({
40
- loader: () => import( /* webpackChunkName: "@atlaskit-internal_media-client-react" */'@atlaskit/media-client-react'),
41
- loading: () => /*#__PURE__*/React.createElement(CardLoadingWithContext, null),
42
- render: (loaded, props) => /*#__PURE__*/React.createElement(CardWithMediaClient, _extends({}, props, {
43
- withMediaClient: loaded.withMediaClient
44
- }))
10
+ loader: () => import( /* webpackChunkName: "@atlaskit-internal_media-card-with-media-client-v2" */'./cardWithMediaClientV2').then(mod => mod.CardWithMediaClientV2),
11
+ loading: () => /*#__PURE__*/React.createElement(CardLoadingWithContext, null)
45
12
  });
46
13
  const CardLoader = props => {
47
14
  return /*#__PURE__*/React.createElement(MediaCardContext.Provider, {
@@ -0,0 +1,25 @@
1
+ import _extends from "@babel/runtime/helpers/extends";
2
+ import React from 'react';
3
+ import { withMediaClient } from '@atlaskit/media-client-react';
4
+ import MediaCardAnalyticsErrorBoundary from '../media-card-analytics-error-boundary';
5
+ import { CardV2 } from './cardV2';
6
+ export const CardWithMediaClientV2 = props => {
7
+ const {
8
+ dimensions,
9
+ onClick,
10
+ featureFlags
11
+ } = props;
12
+ const Card = React.useMemo(() => {
13
+ return withMediaClient(CardV2);
14
+ }, []);
15
+ const featureFlagsWithMediaCardV2 = React.useMemo(() => ({
16
+ ...featureFlags,
17
+ mediaCardV2: true //used for analytics - internal use only
18
+ }), [featureFlags]);
19
+ return /*#__PURE__*/React.createElement(MediaCardAnalyticsErrorBoundary, {
20
+ dimensions: dimensions,
21
+ onClick: onClick
22
+ }, /*#__PURE__*/React.createElement(Card, _extends({}, props, {
23
+ featureFlags: featureFlagsWithMediaCardV2
24
+ })));
25
+ };
@@ -24,23 +24,13 @@ export const useFilePreview = ({
24
24
  mediaBlobUrlAttrs
25
25
  }) => {
26
26
  const mediaClient = useMediaClient();
27
+ const [status, setStatus] = useState('loading');
27
28
  const [error, setError] = useState();
28
29
  const [nonCriticalError, setNonCriticalError] = useState();
30
+ const [isBannedLocalPreview, setIsBannedLocalPreview] = useState(false);
31
+ const wasResolvedUpfrontPreviewRef = useRef(false);
32
+ const ssrReliabilityRef = useRef(initialSsrReliability);
29
33
  const requestDimensions = useMemo(() => dimensions ? createRequestDimensions(dimensions) : undefined, [dimensions]);
30
-
31
- //----------------------------------------------------------------//
32
- //---------------- State Initializer Functions -------------------//
33
- //----------------------------------------------------------------//
34
-
35
- const ssrDataRef = useRef();
36
- const ssrReliabilityRef = useRef({
37
- server: {
38
- status: 'unknown'
39
- },
40
- client: {
41
- status: 'unknown'
42
- }
43
- });
44
34
  const imageURLParams = useMemo(() => ({
45
35
  collection: identifier.collectionName,
46
36
  mode: resizeMode === 'stretchy-fit' ? 'full-fit' : resizeMode,
@@ -48,15 +38,14 @@ export const useFilePreview = ({
48
38
  allowAnimated: true
49
39
  }), [requestDimensions, identifier.collectionName, resizeMode]);
50
40
  const getSSRPreview = (ssr, identifier, mediaClient) => {
51
- var _ssrDataRef$current, _ssrDataRef$current2;
52
- ssrDataRef.current = getSSRData(identifier);
53
- if ((_ssrDataRef$current = ssrDataRef.current) !== null && _ssrDataRef$current !== void 0 && _ssrDataRef$current.error) {
41
+ const ssrData = getSSRData(identifier);
42
+ if (ssrData !== null && ssrData !== void 0 && ssrData.error) {
54
43
  ssrReliabilityRef.current.server = {
55
44
  status: 'fail',
56
- ...ssrDataRef.current.error
45
+ ...ssrData.error
57
46
  };
58
47
  }
59
- if (!((_ssrDataRef$current2 = ssrDataRef.current) !== null && _ssrDataRef$current2 !== void 0 && _ssrDataRef$current2.dataURI)) {
48
+ if (!(ssrData !== null && ssrData !== void 0 && ssrData.dataURI)) {
60
49
  try {
61
50
  return getSSRCardPreview(ssr, mediaClient, identifier.id, imageURLParams, mediaBlobUrlAttrs);
62
51
  } catch (e) {
@@ -69,7 +58,7 @@ export const useFilePreview = ({
69
58
  const {
70
59
  dimensions,
71
60
  dataURI
72
- } = ssrDataRef.current;
61
+ } = ssrData;
73
62
  return {
74
63
  dataURI,
75
64
  dimensions,
@@ -97,17 +86,9 @@ export const useFilePreview = ({
97
86
  collectionName: identifier.collectionName,
98
87
  occurrenceKey: identifier.occurrenceKey
99
88
  });
100
-
101
- //----------------------------------------------------------------//
102
- //------------ State, Refs & Initial Values ----------------------//
103
- //----------------------------------------------------------------//
104
-
105
- const [status, setStatus] = useState('loading');
106
89
  useEffect(() => {
107
90
  setStatus('loading');
108
91
  }, [identifier]);
109
- const [isBannedLocalPreview, setIsBannedLocalPreview] = useState(false);
110
- const wasResolvedUpfrontPreviewRef = useRef(false);
111
92
 
112
93
  //----------------------------------------------------------------//
113
94
  //---------------------- Helper Functions -----------------------//
@@ -515,4 +496,12 @@ const createRequestDimensions = dimensions => {
515
496
  result.height = height * retinaFactor;
516
497
  }
517
498
  return result;
499
+ };
500
+ const initialSsrReliability = {
501
+ server: {
502
+ status: 'unknown'
503
+ },
504
+ client: {
505
+ status: 'unknown'
506
+ }
518
507
  };
@@ -37,7 +37,7 @@ export default class MediaInlineCardLoader extends React.PureComponent {
37
37
  } = this.state;
38
38
  const analyticsContext = {
39
39
  packageVersion: "@atlaskit/media-card",
40
- packageName: "77.4.9",
40
+ packageName: "77.5.0",
41
41
  componentName: 'mediaInlineCard',
42
42
  component: 'mediaInlineCard'
43
43
  };
@@ -4,7 +4,7 @@ import { extractErrorInfo, getRenderErrorRequestMetadata } from './analytics';
4
4
  import { MediaCardError } from '../errors';
5
5
  import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
6
6
  const packageName = "@atlaskit/media-card";
7
- const packageVersion = "77.4.9";
7
+ const packageVersion = "77.5.0";
8
8
  let concurrentExperience;
9
9
  const getExperience = id => {
10
10
  if (!concurrentExperience) {
@@ -40,7 +40,7 @@ import { getMediaCardCursor } from '../utils/getMediaCardCursor';
40
40
  import { completeUfoExperience, startUfoExperience, abortUfoExperience } from '../utils/ufoExperiences';
41
41
  import { generateUniqueId } from '../utils/generateUniqueId';
42
42
  var packageName = "@atlaskit/media-card";
43
- var packageVersion = "77.4.9";
43
+ var packageVersion = "77.5.0";
44
44
  export var CardBase = /*#__PURE__*/function (_Component) {
45
45
  _inherits(CardBase, _Component);
46
46
  var _super = _createSuper(CardBase);
@@ -1,4 +1,3 @@
1
- import _extends from "@babel/runtime/helpers/extends";
2
1
  import React, { useContext } from 'react';
3
2
  import Loadable from 'react-loadable';
4
3
  import { CardLoading } from '../utils/lightCards/cardLoading';
@@ -7,55 +6,16 @@ var CardLoadingWithContext = function CardLoadingWithContext() {
7
6
  var props = useContext(MediaCardContext);
8
7
  return /*#__PURE__*/React.createElement(CardLoading, props);
9
8
  };
10
- var MediaCard = Loadable({
11
- loader: function loader() {
12
- return import( /* webpackChunkName: "@atlaskit-internal_media-card" */'./card').then(function (mod) {
13
- return mod.Card;
14
- });
15
- },
16
- loading: function loading() {
17
- return /*#__PURE__*/React.createElement(CardLoadingWithContext, null);
18
- }
19
- });
20
- var MediaCardErrorBoundary = Loadable({
21
- loader: function loader() {
22
- return import( /* webpackChunkName: "@atlaskit-internal_media-card-error-boundary" */'./media-card-analytics-error-boundary').then(function (mod) {
23
- return mod.default;
24
- });
25
- },
26
- loading: function loading() {
27
- return /*#__PURE__*/React.createElement(CardLoadingWithContext, null);
28
- }
29
- });
30
9
  var MediaCardWithMediaClient = Loadable({
31
10
  loader: function loader() {
32
- return import( /* webpackChunkName: "@atlaskit-internal_media-client-react" */'@atlaskit/media-client-react');
11
+ return import( /* webpackChunkName: "@atlaskit-internal_media-card-with-media-client" */'./cardWithMediaClient').then(function (mod) {
12
+ return mod.CardWithMediaClient;
13
+ });
33
14
  },
34
15
  loading: function loading() {
35
16
  return /*#__PURE__*/React.createElement(CardLoadingWithContext, null);
36
- },
37
- render: function render(loaded, props) {
38
- return /*#__PURE__*/React.createElement(CardWithMediaClient, _extends({}, props, {
39
- withMediaClient: loaded.withMediaClient
40
- }));
41
17
  }
42
18
  });
43
- var CardWithMediaClient = function CardWithMediaClient(props) {
44
- var withMediaClient = props.withMediaClient,
45
- dimensions = props.dimensions,
46
- onClick = props.onClick;
47
- var Card = React.useMemo(function () {
48
- return withMediaClient(MediaCard);
49
- }, [withMediaClient]);
50
- return (
51
- /*#__PURE__*/
52
- // onClick is passed into MediaCardErrorBoundary so MediaGroup items can get the toolbar menu in Editor
53
- React.createElement(MediaCardErrorBoundary, {
54
- dimensions: dimensions,
55
- onClick: onClick
56
- }, /*#__PURE__*/React.createElement(Card, props))
57
- );
58
- };
59
19
  var CardLoader = function CardLoader(props) {
60
20
  return /*#__PURE__*/React.createElement(MediaCardContext.Provider, {
61
21
  value: props
@@ -0,0 +1,19 @@
1
+ import React from 'react';
2
+ import { withMediaClient } from '@atlaskit/media-client-react';
3
+ import { Card as MediaCard } from './card';
4
+ import MediaCardAnalyticsErrorBoundary from './media-card-analytics-error-boundary';
5
+ export var CardWithMediaClient = function CardWithMediaClient(props) {
6
+ var dimensions = props.dimensions,
7
+ onClick = props.onClick;
8
+ var Card = React.useMemo(function () {
9
+ return withMediaClient(MediaCard);
10
+ }, []);
11
+ return (
12
+ /*#__PURE__*/
13
+ // onClick is passed into MediaCardErrorBoundary so MediaGroup items can get the toolbar menu in Editor
14
+ React.createElement(MediaCardAnalyticsErrorBoundary, {
15
+ dimensions: dimensions,
16
+ onClick: onClick
17
+ }, /*#__PURE__*/React.createElement(Card, props))
18
+ );
19
+ };
@@ -83,7 +83,7 @@ var WrappedMediaCardAnalyticsErrorBoundary = /*#__PURE__*/function (_React$Compo
83
83
  }(React.Component);
84
84
  _defineProperty(WrappedMediaCardAnalyticsErrorBoundary, "displayName", 'MediaCardAnalyticsErrorBoundary');
85
85
  var packageName = "@atlaskit/media-card";
86
- var packageVersion = "77.4.9";
86
+ var packageVersion = "77.5.0";
87
87
  var MediaCardAnalyticsErrorBoundary = withMediaAnalyticsContext({
88
88
  packageVersion: packageVersion,
89
89
  packageName: packageName,
@@ -9,7 +9,7 @@ import { IntlProvider, injectIntl } from 'react-intl-next';
9
9
  import { ExternalImageCard } from './externalImageCard';
10
10
  import { FileCard } from './fileCard';
11
11
  var packageName = "@atlaskit/media-card";
12
- var packageVersion = "77.4.9";
12
+ var packageVersion = "77.5.0";
13
13
  export var CardV2Base = function CardV2Base(_ref) {
14
14
  var identifier = _ref.identifier,
15
15
  otherProps = _objectWithoutProperties(_ref, _excluded);
@@ -1,7 +1,3 @@
1
- import _extends from "@babel/runtime/helpers/extends";
2
- import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
- 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; }
4
- 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; }
5
1
  import React, { useContext } from 'react';
6
2
  import Loadable from 'react-loadable';
7
3
  import { CardLoading } from '../../utils/lightCards/cardLoading';
@@ -10,57 +6,14 @@ var CardLoadingWithContext = function CardLoadingWithContext() {
10
6
  var props = useContext(MediaCardContext);
11
7
  return /*#__PURE__*/React.createElement(CardLoading, props);
12
8
  };
13
- var MediaV2Card = Loadable({
14
- loader: function loader() {
15
- return import( /* webpackChunkName: "@atlaskit-internal_media-card-v2" */'./cardV2').then(function (mod) {
16
- return mod.CardV2;
17
- });
18
- },
19
- loading: function loading() {
20
- return /*#__PURE__*/React.createElement(CardLoadingWithContext, null);
21
- }
22
- });
23
- var MediaCardErrorBoundary = Loadable({
24
- loader: function loader() {
25
- return import( /* webpackChunkName: "@atlaskit-internal_media-card-error-boundary" */'../media-card-analytics-error-boundary').then(function (mod) {
26
- return mod.default;
27
- });
28
- },
29
- loading: function loading() {
30
- return /*#__PURE__*/React.createElement(CardLoadingWithContext, null);
31
- }
32
- });
33
- var CardWithMediaClient = function CardWithMediaClient(props) {
34
- var dimensions = props.dimensions,
35
- onClick = props.onClick,
36
- withMediaClient = props.withMediaClient,
37
- featureFlags = props.featureFlags;
38
- var Card = React.useMemo(function () {
39
- return withMediaClient(MediaV2Card);
40
- }, [withMediaClient]);
41
- var featureFlagsWithMediaCardV2 = React.useMemo(function () {
42
- return _objectSpread(_objectSpread({}, featureFlags), {}, {
43
- mediaCardV2: true //used for analytics - internal use only
44
- });
45
- }, [featureFlags]);
46
- return /*#__PURE__*/React.createElement(MediaCardErrorBoundary, {
47
- dimensions: dimensions,
48
- onClick: onClick
49
- }, /*#__PURE__*/React.createElement(Card, _extends({}, props, {
50
- featureFlags: featureFlagsWithMediaCardV2
51
- })));
52
- };
53
9
  var MediaCardWithMediaClientProvider = Loadable({
54
10
  loader: function loader() {
55
- return import( /* webpackChunkName: "@atlaskit-internal_media-client-react" */'@atlaskit/media-client-react');
11
+ return import( /* webpackChunkName: "@atlaskit-internal_media-card-with-media-client-v2" */'./cardWithMediaClientV2').then(function (mod) {
12
+ return mod.CardWithMediaClientV2;
13
+ });
56
14
  },
57
15
  loading: function loading() {
58
16
  return /*#__PURE__*/React.createElement(CardLoadingWithContext, null);
59
- },
60
- render: function render(loaded, props) {
61
- return /*#__PURE__*/React.createElement(CardWithMediaClient, _extends({}, props, {
62
- withMediaClient: loaded.withMediaClient
63
- }));
64
17
  }
65
18
  });
66
19
  var CardLoader = function CardLoader(props) {
@@ -0,0 +1,27 @@
1
+ import _extends from "@babel/runtime/helpers/extends";
2
+ import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
+ 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; }
4
+ 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; }
5
+ import React from 'react';
6
+ import { withMediaClient } from '@atlaskit/media-client-react';
7
+ import MediaCardAnalyticsErrorBoundary from '../media-card-analytics-error-boundary';
8
+ import { CardV2 } from './cardV2';
9
+ export var CardWithMediaClientV2 = function CardWithMediaClientV2(props) {
10
+ var dimensions = props.dimensions,
11
+ onClick = props.onClick,
12
+ featureFlags = props.featureFlags;
13
+ var Card = React.useMemo(function () {
14
+ return withMediaClient(CardV2);
15
+ }, []);
16
+ var featureFlagsWithMediaCardV2 = React.useMemo(function () {
17
+ return _objectSpread(_objectSpread({}, featureFlags), {}, {
18
+ mediaCardV2: true //used for analytics - internal use only
19
+ });
20
+ }, [featureFlags]);
21
+ return /*#__PURE__*/React.createElement(MediaCardAnalyticsErrorBoundary, {
22
+ dimensions: dimensions,
23
+ onClick: onClick
24
+ }, /*#__PURE__*/React.createElement(Card, _extends({}, props, {
25
+ featureFlags: featureFlagsWithMediaCardV2
26
+ })));
27
+ };
@@ -30,31 +30,27 @@ export var useFilePreview = function useFilePreview(_ref) {
30
30
  skipRemote = _ref.skipRemote,
31
31
  mediaBlobUrlAttrs = _ref.mediaBlobUrlAttrs;
32
32
  var mediaClient = useMediaClient();
33
- var _useState = useState(),
33
+ var _useState = useState('loading'),
34
34
  _useState2 = _slicedToArray(_useState, 2),
35
- error = _useState2[0],
36
- setError = _useState2[1];
35
+ status = _useState2[0],
36
+ setStatus = _useState2[1];
37
37
  var _useState3 = useState(),
38
38
  _useState4 = _slicedToArray(_useState3, 2),
39
- nonCriticalError = _useState4[0],
40
- setNonCriticalError = _useState4[1];
39
+ error = _useState4[0],
40
+ setError = _useState4[1];
41
+ var _useState5 = useState(),
42
+ _useState6 = _slicedToArray(_useState5, 2),
43
+ nonCriticalError = _useState6[0],
44
+ setNonCriticalError = _useState6[1];
45
+ var _useState7 = useState(false),
46
+ _useState8 = _slicedToArray(_useState7, 2),
47
+ isBannedLocalPreview = _useState8[0],
48
+ setIsBannedLocalPreview = _useState8[1];
49
+ var wasResolvedUpfrontPreviewRef = useRef(false);
50
+ var ssrReliabilityRef = useRef(initialSsrReliability);
41
51
  var requestDimensions = useMemo(function () {
42
52
  return dimensions ? createRequestDimensions(dimensions) : undefined;
43
53
  }, [dimensions]);
44
-
45
- //----------------------------------------------------------------//
46
- //---------------- State Initializer Functions -------------------//
47
- //----------------------------------------------------------------//
48
-
49
- var ssrDataRef = useRef();
50
- var ssrReliabilityRef = useRef({
51
- server: {
52
- status: 'unknown'
53
- },
54
- client: {
55
- status: 'unknown'
56
- }
57
- });
58
54
  var imageURLParams = useMemo(function () {
59
55
  return _objectSpread(_objectSpread({
60
56
  collection: identifier.collectionName,
@@ -64,14 +60,13 @@ export var useFilePreview = function useFilePreview(_ref) {
64
60
  });
65
61
  }, [requestDimensions, identifier.collectionName, resizeMode]);
66
62
  var getSSRPreview = function getSSRPreview(ssr, identifier, mediaClient) {
67
- var _ssrDataRef$current, _ssrDataRef$current2;
68
- ssrDataRef.current = getSSRData(identifier);
69
- if ((_ssrDataRef$current = ssrDataRef.current) !== null && _ssrDataRef$current !== void 0 && _ssrDataRef$current.error) {
63
+ var ssrData = getSSRData(identifier);
64
+ if (ssrData !== null && ssrData !== void 0 && ssrData.error) {
70
65
  ssrReliabilityRef.current.server = _objectSpread({
71
66
  status: 'fail'
72
- }, ssrDataRef.current.error);
67
+ }, ssrData.error);
73
68
  }
74
- if (!((_ssrDataRef$current2 = ssrDataRef.current) !== null && _ssrDataRef$current2 !== void 0 && _ssrDataRef$current2.dataURI)) {
69
+ if (!(ssrData !== null && ssrData !== void 0 && ssrData.dataURI)) {
75
70
  try {
76
71
  return getSSRCardPreview(ssr, mediaClient, identifier.id, imageURLParams, mediaBlobUrlAttrs);
77
72
  } catch (e) {
@@ -80,9 +75,8 @@ export var useFilePreview = function useFilePreview(_ref) {
80
75
  }, extractErrorInfo(e));
81
76
  }
82
77
  } else {
83
- var _ssrDataRef$current3 = ssrDataRef.current,
84
- _dimensions = _ssrDataRef$current3.dimensions,
85
- dataURI = _ssrDataRef$current3.dataURI;
78
+ var _dimensions = ssrData.dimensions,
79
+ dataURI = ssrData.dataURI;
86
80
  return {
87
81
  dataURI: dataURI,
88
82
  dimensions: _dimensions,
@@ -100,33 +94,19 @@ export var useFilePreview = function useFilePreview(_ref) {
100
94
  }
101
95
  return cardPreview;
102
96
  };
103
- var _useState5 = useState(cardPreviewInitializer),
104
- _useState6 = _slicedToArray(_useState5, 2),
105
- cardPreview = _useState6[0],
106
- setCardPreview = _useState6[1];
97
+ var _useState9 = useState(cardPreviewInitializer),
98
+ _useState10 = _slicedToArray(_useState9, 2),
99
+ cardPreview = _useState10[0],
100
+ setCardPreview = _useState10[1];
107
101
  var _useFileState = useFileState(identifier.id, {
108
102
  skipRemote: skipRemote,
109
103
  collectionName: identifier.collectionName,
110
104
  occurrenceKey: identifier.occurrenceKey
111
105
  }),
112
106
  fileState = _useFileState.fileState;
113
-
114
- //----------------------------------------------------------------//
115
- //------------ State, Refs & Initial Values ----------------------//
116
- //----------------------------------------------------------------//
117
-
118
- var _useState7 = useState('loading'),
119
- _useState8 = _slicedToArray(_useState7, 2),
120
- status = _useState8[0],
121
- setStatus = _useState8[1];
122
107
  useEffect(function () {
123
108
  setStatus('loading');
124
109
  }, [identifier]);
125
- var _useState9 = useState(false),
126
- _useState10 = _slicedToArray(_useState9, 2),
127
- isBannedLocalPreview = _useState10[0],
128
- setIsBannedLocalPreview = _useState10[1];
129
- var wasResolvedUpfrontPreviewRef = useRef(false);
130
110
 
131
111
  //----------------------------------------------------------------//
132
112
  //---------------------- Helper Functions -----------------------//
@@ -599,4 +579,12 @@ var createRequestDimensions = function createRequestDimensions(dimensions) {
599
579
  result.height = height * retinaFactor;
600
580
  }
601
581
  return result;
582
+ };
583
+ var initialSsrReliability = {
584
+ server: {
585
+ status: 'unknown'
586
+ },
587
+ client: {
588
+ status: 'unknown'
589
+ }
602
590
  };
@@ -103,7 +103,7 @@ var MediaInlineCardLoader = /*#__PURE__*/function (_React$PureComponent) {
103
103
  ErrorBoundary = _this$state.ErrorBoundary;
104
104
  var analyticsContext = {
105
105
  packageVersion: "@atlaskit/media-card",
106
- packageName: "77.4.9",
106
+ packageName: "77.5.0",
107
107
  componentName: 'mediaInlineCard',
108
108
  component: 'mediaInlineCard'
109
109
  };
@@ -7,7 +7,7 @@ import { extractErrorInfo, getRenderErrorRequestMetadata } from './analytics';
7
7
  import { MediaCardError } from '../errors';
8
8
  import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
9
9
  var packageName = "@atlaskit/media-card";
10
- var packageVersion = "77.4.9";
10
+ var packageVersion = "77.5.0";
11
11
  var concurrentExperience;
12
12
  var getExperience = function getExperience(id) {
13
13
  if (!concurrentExperience) {
@@ -1,6 +1,4 @@
1
1
  import React from 'react';
2
- import type { WithMediaClientConfigProps } from '@atlaskit/media-client-react';
3
- import type { CardBaseProps } from './card';
4
- export type CardWithMediaClientConfigProps = WithMediaClientConfigProps<CardBaseProps>;
2
+ import type { CardWithMediaClientConfigProps } from './types';
5
3
  declare const CardLoader: React.FC<CardWithMediaClientConfigProps>;
6
4
  export default CardLoader;
@@ -1,4 +1,4 @@
1
1
  /// <reference types="react" />
2
- import { CardWithMediaClientConfigProps } from './cardLoader';
2
+ import { CardWithMediaClientConfigProps } from './types';
3
3
  declare function CardSwitcher(props: CardWithMediaClientConfigProps): JSX.Element;
4
4
  export default CardSwitcher;
@@ -0,0 +1,3 @@
1
+ import React from 'react';
2
+ import type { CardWithMediaClientConfigProps } from './types';
3
+ export declare const CardWithMediaClient: React.FC<CardWithMediaClientConfigProps>;
@@ -1,5 +1,7 @@
1
1
  import React, { ReactElement, RefObject } from 'react';
2
2
  import { UIAnalyticsEvent } from '@atlaskit/analytics-next';
3
+ import type { WithMediaClientConfigProps } from '@atlaskit/media-client-react';
4
+ import type { CardBaseProps } from './card';
3
5
  import { CardDimensions } from '../types';
4
6
  export type InlinePlayerWrapperProps = {
5
7
  testId?: string;
@@ -11,3 +13,4 @@ export type InlinePlayerWrapperProps = {
11
13
  innerRef?: RefObject<HTMLDivElement> | ((instance: HTMLDivElement | null) => void) | undefined;
12
14
  children?: JSX.Element[] | ReactElement<any, any> | null | any;
13
15
  };
16
+ export type CardWithMediaClientConfigProps = WithMediaClientConfigProps<CardBaseProps>;
@@ -1,4 +1,4 @@
1
1
  import React from 'react';
2
- import { CardWithMediaClientConfigProps } from '../cardLoader';
2
+ import { CardWithMediaClientConfigProps } from '../types';
3
3
  declare const CardLoader: React.FC<CardWithMediaClientConfigProps>;
4
4
  export default CardLoader;
@@ -0,0 +1,3 @@
1
+ import React from 'react';
2
+ import { CardWithMediaClientConfigProps } from '../types';
3
+ export declare const CardWithMediaClientV2: React.FC<CardWithMediaClientConfigProps>;
@@ -1,6 +1,4 @@
1
1
  import React from 'react';
2
- import type { WithMediaClientConfigProps } from '@atlaskit/media-client-react';
3
- import type { CardBaseProps } from './card';
4
- export type CardWithMediaClientConfigProps = WithMediaClientConfigProps<CardBaseProps>;
2
+ import type { CardWithMediaClientConfigProps } from './types';
5
3
  declare const CardLoader: React.FC<CardWithMediaClientConfigProps>;
6
4
  export default CardLoader;
@@ -1,4 +1,4 @@
1
1
  /// <reference types="react" />
2
- import { CardWithMediaClientConfigProps } from './cardLoader';
2
+ import { CardWithMediaClientConfigProps } from './types';
3
3
  declare function CardSwitcher(props: CardWithMediaClientConfigProps): JSX.Element;
4
4
  export default CardSwitcher;
@@ -0,0 +1,3 @@
1
+ import React from 'react';
2
+ import type { CardWithMediaClientConfigProps } from './types';
3
+ export declare const CardWithMediaClient: React.FC<CardWithMediaClientConfigProps>;
@@ -1,5 +1,7 @@
1
1
  import React, { ReactElement, RefObject } from 'react';
2
2
  import { UIAnalyticsEvent } from '@atlaskit/analytics-next';
3
+ import type { WithMediaClientConfigProps } from '@atlaskit/media-client-react';
4
+ import type { CardBaseProps } from './card';
3
5
  import { CardDimensions } from '../types';
4
6
  export type InlinePlayerWrapperProps = {
5
7
  testId?: string;
@@ -11,3 +13,4 @@ export type InlinePlayerWrapperProps = {
11
13
  innerRef?: RefObject<HTMLDivElement> | ((instance: HTMLDivElement | null) => void) | undefined;
12
14
  children?: JSX.Element[] | ReactElement<any, any> | null | any;
13
15
  };
16
+ export type CardWithMediaClientConfigProps = WithMediaClientConfigProps<CardBaseProps>;
@@ -1,4 +1,4 @@
1
1
  import React from 'react';
2
- import { CardWithMediaClientConfigProps } from '../cardLoader';
2
+ import { CardWithMediaClientConfigProps } from '../types';
3
3
  declare const CardLoader: React.FC<CardWithMediaClientConfigProps>;
4
4
  export default CardLoader;
@@ -0,0 +1,3 @@
1
+ import React from 'react';
2
+ import { CardWithMediaClientConfigProps } from '../types';
3
+ export declare const CardWithMediaClientV2: React.FC<CardWithMediaClientConfigProps>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/media-card",
3
- "version": "77.4.9",
3
+ "version": "77.5.0",
4
4
  "description": "Includes all media card related components, CardView, CardViewSmall, Card...",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"