@atlaskit/renderer 108.17.4 → 108.18.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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 108.18.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#58452](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58452) [`320b83ce7502`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/320b83ce7502) - ED-20985 use mediaClientContext to replace getMediaClient
8
+
3
9
  ## 108.17.4
4
10
 
5
11
  ### Patch Changes
@@ -42,8 +42,7 @@ var Media = exports.default = /*#__PURE__*/function (_PureComponent) {
42
42
  (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderCard", function () {
43
43
  var _borderMark$attrs$col, _borderMark$attrs$siz;
44
44
  var providers = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
45
- var mediaProvider = providers.mediaProvider,
46
- contextIdentifierProvider = providers.contextIdentifierProvider;
45
+ var contextIdentifierProvider = providers.contextIdentifierProvider;
47
46
  var _this$props = _this.props,
48
47
  allowAltTextOnImages = _this$props.allowAltTextOnImages,
49
48
  alt = _this$props.alt,
@@ -63,7 +62,6 @@ var Media = exports.default = /*#__PURE__*/function (_PureComponent) {
63
62
  border: !!borderMark
64
63
  })
65
64
  }, /*#__PURE__*/_react.default.createElement(_MediaCard.MediaCard, (0, _extends2.default)({
66
- mediaProvider: mediaProvider,
67
65
  contextIdentifierProvider: contextIdentifierProvider
68
66
  }, _this.props, {
69
67
  shouldOpenMediaViewer: shouldOpenMediaViewer,
@@ -28,7 +28,6 @@ var RenderMediaInline = exports.RenderMediaInline = function RenderMediaInline(_
28
28
  clipboardAttrs = _ref.clipboardAttrs,
29
29
  mediaInlineProviders = _ref.mediaInlineProviders,
30
30
  collectionName = _ref.collection,
31
- featureFlags = _ref.featureFlags,
32
31
  eventHandlers = _ref.eventHandlers,
33
32
  identifier = _ref.identifier;
34
33
  var _useState = (0, _react.useState)(),
@@ -37,12 +36,9 @@ var RenderMediaInline = exports.RenderMediaInline = function RenderMediaInline(_
37
36
  setContextIdentifierProvider = _useState2[1];
38
37
  var _useState3 = (0, _react.useState)(),
39
38
  _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
40
- viewMediaClientConfigState = _useState4[0],
41
- setViewMediaClientConfigState = _useState4[1];
42
- var _useState5 = (0, _react.useState)(),
43
- _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
44
- fileState = _useState6[0],
45
- setFileState = _useState6[1];
39
+ fileState = _useState4[0],
40
+ setFileState = _useState4[1];
41
+ var mediaClient = _react.default.useContext(_mediaClientReact.MediaClientContext);
46
42
  var updateContext = /*#__PURE__*/function () {
47
43
  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(contextIdentifierProvider) {
48
44
  var resolvedContextID;
@@ -69,36 +65,40 @@ var RenderMediaInline = exports.RenderMediaInline = function RenderMediaInline(_
69
65
  };
70
66
  }();
71
67
  var updateFileState = (0, _react.useCallback)( /*#__PURE__*/function () {
72
- var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(id, mediaClientConfig) {
73
- var mediaClient, options, _fileState;
68
+ var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(id) {
69
+ var options, _fileState;
74
70
  return _regenerator.default.wrap(function _callee2$(_context2) {
75
71
  while (1) switch (_context2.prev = _context2.next) {
76
72
  case 0:
77
- mediaClient = (0, _mediaClientReact.getMediaClient)(mediaClientConfig);
78
73
  options = {
79
74
  collectionName: collectionName
80
75
  };
81
- _context2.prev = 2;
76
+ _context2.prev = 1;
77
+ if (!mediaClient) {
78
+ _context2.next = 7;
79
+ break;
80
+ }
82
81
  _context2.next = 5;
83
82
  return mediaClient.file.getCurrentState(id, options);
84
83
  case 5:
85
84
  _fileState = _context2.sent;
86
85
  setFileState(_fileState);
86
+ case 7:
87
87
  _context2.next = 11;
88
88
  break;
89
89
  case 9:
90
90
  _context2.prev = 9;
91
- _context2.t0 = _context2["catch"](2);
91
+ _context2.t0 = _context2["catch"](1);
92
92
  case 11:
93
93
  case "end":
94
94
  return _context2.stop();
95
95
  }
96
- }, _callee2, null, [[2, 9]]);
96
+ }, _callee2, null, [[1, 9]]);
97
97
  }));
98
- return function (_x2, _x3) {
98
+ return function (_x2) {
99
99
  return _ref3.apply(this, arguments);
100
100
  };
101
- }(), [collectionName]);
101
+ }(), [collectionName, mediaClient]);
102
102
  (0, _react.useEffect)(function () {
103
103
  var id = identifier.id;
104
104
  var nodeIsInCache = id && _MediaCard.mediaIdentifierMap.has(id);
@@ -112,44 +112,17 @@ var RenderMediaInline = exports.RenderMediaInline = function RenderMediaInline(_
112
112
  };
113
113
  }, [identifier, collectionName]);
114
114
  (0, _react.useEffect)(function () {
115
- var mediaProvider = mediaInlineProviders.mediaProvider,
116
- contextIdentifierProvider = mediaInlineProviders.contextIdentifierProvider;
115
+ var contextIdentifierProvider = mediaInlineProviders.contextIdentifierProvider;
117
116
  var id = clipboardAttrs.id;
118
- updateViewMediaClientConfigState(mediaProvider);
119
117
  updateContext(contextIdentifierProvider);
120
- id && viewMediaClientConfigState && updateFileState(id, viewMediaClientConfigState);
121
- }, [mediaInlineProviders, contextIdentifierProvider, clipboardAttrs, viewMediaClientConfigState, updateFileState]);
122
- var updateViewMediaClientConfigState = /*#__PURE__*/function () {
123
- var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(mediaProvider) {
124
- var mediaClientConfig;
125
- return _regenerator.default.wrap(function _callee3$(_context3) {
126
- while (1) switch (_context3.prev = _context3.next) {
127
- case 0:
128
- if (!mediaProvider) {
129
- _context3.next = 5;
130
- break;
131
- }
132
- _context3.next = 3;
133
- return mediaProvider;
134
- case 3:
135
- mediaClientConfig = _context3.sent;
136
- setViewMediaClientConfigState(mediaClientConfig.viewMediaClientConfig);
137
- case 5:
138
- case "end":
139
- return _context3.stop();
140
- }
141
- }, _callee3);
142
- }));
143
- return function updateViewMediaClientConfigState(_x4) {
144
- return _ref4.apply(this, arguments);
145
- };
146
- }();
118
+ id && updateFileState(id);
119
+ }, [mediaInlineProviders, contextIdentifierProvider, clipboardAttrs, updateFileState]);
147
120
 
148
121
  /*
149
122
  * Only show the loading view if the media provider is not ready
150
123
  * prevents calling the media API before the provider is ready
151
124
  */
152
- if (!viewMediaClientConfigState) {
125
+ if (!mediaClient) {
153
126
  return /*#__PURE__*/_react.default.createElement(_mediaUi.MediaInlineCardLoadingView, {
154
127
  message: "",
155
128
  isSelected: false
@@ -179,7 +152,7 @@ var RenderMediaInline = exports.RenderMediaInline = function RenderMediaInline(_
179
152
  onClick: handleMediaInlineClick,
180
153
  shouldOpenMediaViewer: shouldOpenMediaViewer,
181
154
  shouldDisplayToolTip: shouldDisplayToolTip,
182
- mediaClientConfig: viewMediaClientConfigState,
155
+ mediaClientConfig: mediaClient.mediaClientConfig,
183
156
  mediaViewerItems: Array.from(_MediaCard.mediaIdentifierMap.values())
184
157
  }) : /*#__PURE__*/_react.default.createElement(_mediaUi.MediaInlineCardErroredView, {
185
158
  message: (intl || (0, _reactIntlNext.createIntl)({
@@ -0,0 +1,40 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+ var _typeof = require("@babel/runtime/helpers/typeof");
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports.EditorMediaClientProvider = void 0;
9
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
10
+ var _react = _interopRequireWildcard(require("react"));
11
+ var _mediaClientReact = require("@atlaskit/media-client-react");
12
+ var _providerFactory = require("@atlaskit/editor-common/provider-factory");
13
+ 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); }
14
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(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; }
15
+ var EditorMediaClientProvider = exports.EditorMediaClientProvider = function EditorMediaClientProvider(_ref) {
16
+ var children = _ref.children,
17
+ ssr = _ref.ssr;
18
+ var _useState = (0, _react.useState)(),
19
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
20
+ mediaClientConfig = _useState2[0],
21
+ setMediaClientConfig = _useState2[1];
22
+ var mediaProvider = (0, _providerFactory.useProvider)('mediaProvider');
23
+
24
+ // Consumers can override the mediaClient for renderer,
25
+ // by not providing ssr config and mediaProvider,
26
+ // and provide a top level mediaClient context
27
+ // This is useful for testing and creating examples.
28
+ (0, _react.useEffect)(function () {
29
+ if (ssr && ssr.mode === 'server' && ssr.config) {
30
+ setMediaClientConfig(ssr.config);
31
+ } else if (mediaProvider) {
32
+ mediaProvider.then(function (provider) {
33
+ setMediaClientConfig(provider.viewMediaClientConfig);
34
+ });
35
+ }
36
+ }, [mediaProvider, ssr]);
37
+ return mediaClientConfig ? /*#__PURE__*/_react.default.createElement(_mediaClientReact.MediaClientProvider, {
38
+ clientConfig: mediaClientConfig
39
+ }, children) : children;
40
+ };
@@ -5,8 +5,9 @@ var _typeof = require("@babel/runtime/helpers/typeof");
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.mediaIdentifierMap = exports.getListOfIdentifiersFromDoc = exports.getClipboardAttrs = exports.MediaCardInternal = exports.MediaCard = void 0;
8
+ exports.mediaIdentifierMap = exports.getListOfIdentifiersFromDoc = exports.getClipboardAttrs = exports.MediaCardView = exports.MediaCardInternal = exports.MediaCard = void 0;
9
9
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
10
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
10
11
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
11
12
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
12
13
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -55,29 +56,32 @@ var getListOfIdentifiersFromDoc = exports.getListOfIdentifiersFromDoc = function
55
56
  return identifierList;
56
57
  }, []);
57
58
  };
58
- var MediaCardInternal = exports.MediaCardInternal = /*#__PURE__*/function (_Component) {
59
- (0, _inherits2.default)(MediaCardInternal, _Component);
60
- var _super = _createSuper(MediaCardInternal);
61
- function MediaCardInternal() {
59
+ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
60
+ (0, _inherits2.default)(MediaCardView, _Component);
61
+ var _super = _createSuper(MediaCardView);
62
+ function MediaCardView() {
62
63
  var _this;
63
- (0, _classCallCheck2.default)(this, MediaCardInternal);
64
+ (0, _classCallCheck2.default)(this, MediaCardView);
64
65
  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
65
66
  args[_key] = arguments[_key];
66
67
  }
67
68
  _this = _super.call.apply(_super, [this].concat(args));
68
69
  (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", {});
69
70
  (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "saveFileState", /*#__PURE__*/function () {
70
- var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(id, mediaClientConfig) {
71
- var collectionName, mediaClient, options, fileState;
71
+ var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(id) {
72
+ var _this$props, collectionName, mediaClient, options, fileState;
72
73
  return _regenerator.default.wrap(function _callee$(_context) {
73
74
  while (1) switch (_context.prev = _context.next) {
74
75
  case 0:
75
- collectionName = _this.props.collection;
76
- mediaClient = (0, _mediaClientReact.getMediaClient)(mediaClientConfig);
76
+ _this$props = _this.props, collectionName = _this$props.collection, mediaClient = _this$props.mediaClient;
77
77
  options = {
78
78
  collectionName: collectionName
79
79
  };
80
- _context.prev = 3;
80
+ _context.prev = 2;
81
+ if (!mediaClient) {
82
+ _context.next = 8;
83
+ break;
84
+ }
81
85
  _context.next = 6;
82
86
  return mediaClient.file.getCurrentState(id, options);
83
87
  case 6:
@@ -85,18 +89,19 @@ var MediaCardInternal = exports.MediaCardInternal = /*#__PURE__*/function (_Comp
85
89
  _this.setState({
86
90
  fileState: fileState
87
91
  });
92
+ case 8:
88
93
  _context.next = 12;
89
94
  break;
90
95
  case 10:
91
96
  _context.prev = 10;
92
- _context.t0 = _context["catch"](3);
97
+ _context.t0 = _context["catch"](2);
93
98
  case 12:
94
99
  case "end":
95
100
  return _context.stop();
96
101
  }
97
- }, _callee, null, [[3, 10]]);
102
+ }, _callee, null, [[2, 10]]);
98
103
  }));
99
- return function (_x, _x2) {
104
+ return function (_x) {
100
105
  return _ref.apply(this, arguments);
101
106
  };
102
107
  }());
@@ -127,40 +132,29 @@ var MediaCardInternal = exports.MediaCardInternal = /*#__PURE__*/function (_Comp
127
132
  });
128
133
  return _this;
129
134
  }
130
- (0, _createClass2.default)(MediaCardInternal, [{
135
+ (0, _createClass2.default)(MediaCardView, [{
131
136
  key: "componentDidMount",
132
137
  value: function () {
133
138
  var _componentDidMount = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
134
- var _this$props, rendererContext, mediaProvider, contextIdentifierProvider, id, url, collectionName, mediaProviderObject, mediaClientConfig, nodeIsInCache;
139
+ var _this$props2, rendererContext, contextIdentifierProvider, id, url, collectionName, nodeIsInCache;
135
140
  return _regenerator.default.wrap(function _callee2$(_context2) {
136
141
  while (1) switch (_context2.prev = _context2.next) {
137
142
  case 0:
138
- _this$props = this.props, rendererContext = _this$props.rendererContext, mediaProvider = _this$props.mediaProvider, contextIdentifierProvider = _this$props.contextIdentifierProvider, id = _this$props.id, url = _this$props.url, collectionName = _this$props.collection;
139
- if (mediaProvider) {
140
- _context2.next = 3;
141
- break;
142
- }
143
- return _context2.abrupt("return");
144
- case 3:
143
+ _this$props2 = this.props, rendererContext = _this$props2.rendererContext, contextIdentifierProvider = _this$props2.contextIdentifierProvider, id = _this$props2.id, url = _this$props2.url, collectionName = _this$props2.collection;
145
144
  if (!contextIdentifierProvider) {
146
- _context2.next = 10;
145
+ _context2.next = 8;
147
146
  break;
148
147
  }
149
148
  _context2.t0 = this;
150
- _context2.next = 7;
149
+ _context2.next = 5;
151
150
  return contextIdentifierProvider;
152
- case 7:
151
+ case 5:
153
152
  _context2.t1 = _context2.sent;
154
153
  _context2.t2 = {
155
154
  contextIdentifierProvider: _context2.t1
156
155
  };
157
156
  _context2.t0.setState.call(_context2.t0, _context2.t2);
158
- case 10:
159
- _context2.next = 12;
160
- return mediaProvider;
161
- case 12:
162
- mediaProviderObject = _context2.sent;
163
- mediaClientConfig = mediaProviderObject.viewMediaClientConfig;
157
+ case 8:
164
158
  nodeIsInCache = id && mediaIdentifierMap.has(id) || url && mediaIdentifierMap.has(url);
165
159
  if (rendererContext && rendererContext.adDoc && !nodeIsInCache) {
166
160
  getListOfIdentifiersFromDoc(rendererContext.adDoc).forEach(function (identifier) {
@@ -173,13 +167,10 @@ var MediaCardInternal = exports.MediaCardInternal = /*#__PURE__*/function (_Comp
173
167
  }
174
168
  });
175
169
  }
176
- this.setState({
177
- mediaClientConfig: mediaClientConfig
178
- });
179
170
  if (id) {
180
- this.saveFileState(id, mediaClientConfig);
171
+ this.saveFileState(id);
181
172
  }
182
- case 18:
173
+ case 11:
183
174
  case "end":
184
175
  return _context2.stop();
185
176
  }
@@ -193,18 +184,17 @@ var MediaCardInternal = exports.MediaCardInternal = /*#__PURE__*/function (_Comp
193
184
  }, {
194
185
  key: "UNSAFE_componentWillReceiveProps",
195
186
  value: function UNSAFE_componentWillReceiveProps(newProps) {
196
- var mediaClientConfig = this.state.mediaClientConfig;
197
187
  var newId = newProps.id;
198
- if (mediaClientConfig && newId && newId !== this.props.id) {
199
- this.saveFileState(newId, mediaClientConfig);
188
+ if (newId && newId !== this.props.id) {
189
+ this.saveFileState(newId);
200
190
  }
201
191
  }
202
192
  }, {
203
193
  key: "componentWillUnmount",
204
194
  value: function componentWillUnmount() {
205
- var _this$props2 = this.props,
206
- id = _this$props2.id,
207
- dataURI = _this$props2.url;
195
+ var _this$props3 = this.props,
196
+ id = _this$props3.id,
197
+ dataURI = _this$props3.url;
208
198
  if (id) {
209
199
  mediaIdentifierMap.delete(id);
210
200
  } else if (dataURI) {
@@ -214,18 +204,18 @@ var MediaCardInternal = exports.MediaCardInternal = /*#__PURE__*/function (_Comp
214
204
  }, {
215
205
  key: "renderExternal",
216
206
  value: function renderExternal(shouldOpenMediaViewer) {
217
- var mediaClientConfig = this.state.mediaClientConfig;
218
- var _this$props3 = this.props,
219
- cardDimensions = _this$props3.cardDimensions,
220
- resizeMode = _this$props3.resizeMode,
221
- appearance = _this$props3.appearance,
222
- url = _this$props3.url,
223
- imageStatus = _this$props3.imageStatus,
224
- disableOverlay = _this$props3.disableOverlay,
225
- alt = _this$props3.alt,
226
- featureFlags = _this$props3.featureFlags,
227
- ssr = _this$props3.ssr,
228
- rendererAppearance = _this$props3.rendererAppearance;
207
+ var _this$props$mediaClie;
208
+ var _this$props4 = this.props,
209
+ cardDimensions = _this$props4.cardDimensions,
210
+ resizeMode = _this$props4.resizeMode,
211
+ appearance = _this$props4.appearance,
212
+ url = _this$props4.url,
213
+ imageStatus = _this$props4.imageStatus,
214
+ disableOverlay = _this$props4.disableOverlay,
215
+ alt = _this$props4.alt,
216
+ featureFlags = _this$props4.featureFlags,
217
+ ssr = _this$props4.ssr,
218
+ rendererAppearance = _this$props4.rendererAppearance;
229
219
  if (imageStatus === 'loading' || !url) {
230
220
  return this.renderLoadingCard();
231
221
  }
@@ -234,6 +224,7 @@ var MediaCardInternal = exports.MediaCardInternal = /*#__PURE__*/function (_Comp
234
224
  name: url,
235
225
  mediaItemType: 'external-image'
236
226
  };
227
+ var mediaClientConfig = (_this$props$mediaClie = this.props.mediaClient) === null || _this$props$mediaClie === void 0 ? void 0 : _this$props$mediaClie.mediaClientConfig;
237
228
  return /*#__PURE__*/_react.default.createElement(_mediaCard.Card
238
229
  // TODO MPT-315: clean up after we move mediaClientConfig into FileIdentifier
239
230
  // context is not really used when the type is external and we want to render the component asap
@@ -255,26 +246,26 @@ var MediaCardInternal = exports.MediaCardInternal = /*#__PURE__*/function (_Comp
255
246
  }, {
256
247
  key: "render",
257
248
  value: function render() {
249
+ var _this$props$mediaClie2;
258
250
  var _this$state = this.state,
259
251
  contextIdentifierProvider = _this$state.contextIdentifierProvider,
260
- mediaClientConfigInState = _this$state.mediaClientConfig,
261
252
  fileState = _this$state.fileState;
262
- var _this$props4 = this.props,
263
- id = _this$props4.id,
264
- alt = _this$props4.alt,
265
- type = _this$props4.type,
266
- collection = _this$props4.collection,
267
- occurrenceKey = _this$props4.occurrenceKey,
268
- cardDimensions = _this$props4.cardDimensions,
269
- resizeMode = _this$props4.resizeMode,
270
- rendererAppearance = _this$props4.rendererAppearance,
271
- disableOverlay = _this$props4.disableOverlay,
272
- useInlinePlayer = _this$props4.useInlinePlayer,
273
- originalDimensions = _this$props4.originalDimensions,
274
- forceOpenMediaViewer = _this$props4.shouldOpenMediaViewer,
275
- featureFlags = _this$props4.featureFlags,
276
- shouldEnableDownloadButton = _this$props4.shouldEnableDownloadButton,
277
- ssr = _this$props4.ssr;
253
+ var _this$props5 = this.props,
254
+ id = _this$props5.id,
255
+ alt = _this$props5.alt,
256
+ type = _this$props5.type,
257
+ collection = _this$props5.collection,
258
+ occurrenceKey = _this$props5.occurrenceKey,
259
+ cardDimensions = _this$props5.cardDimensions,
260
+ resizeMode = _this$props5.resizeMode,
261
+ rendererAppearance = _this$props5.rendererAppearance,
262
+ disableOverlay = _this$props5.disableOverlay,
263
+ useInlinePlayer = _this$props5.useInlinePlayer,
264
+ originalDimensions = _this$props5.originalDimensions,
265
+ forceOpenMediaViewer = _this$props5.shouldOpenMediaViewer,
266
+ featureFlags = _this$props5.featureFlags,
267
+ shouldEnableDownloadButton = _this$props5.shouldEnableDownloadButton,
268
+ ssr = _this$props5.ssr;
278
269
  var isMobile = rendererAppearance === 'mobile';
279
270
  var shouldPlayInline = useInlinePlayer !== undefined ? useInlinePlayer : true;
280
271
  var isInlinePlayer = isMobile ? false : shouldPlayInline;
@@ -286,7 +277,7 @@ var MediaCardInternal = exports.MediaCardInternal = /*#__PURE__*/function (_Comp
286
277
  if (type === 'link') {
287
278
  return null;
288
279
  }
289
- var mediaClientConfig = !!ssr ? ssr.config : mediaClientConfigInState;
280
+ var mediaClientConfig = !!ssr ? ssr.config : (_this$props$mediaClie2 = this.props.mediaClient) === null || _this$props$mediaClie2 === void 0 ? void 0 : _this$props$mediaClie2.mediaClientConfig;
290
281
  if (!mediaClientConfig || !id) {
291
282
  return this.renderLoadingCard();
292
283
  }
@@ -330,7 +321,7 @@ var MediaCardInternal = exports.MediaCardInternal = /*#__PURE__*/function (_Comp
330
321
  }));
331
322
  }
332
323
  }]);
333
- return MediaCardInternal;
324
+ return MediaCardView;
334
325
  }(_react.Component);
335
326
  // Needed for copy & paste
336
327
  var getClipboardAttrs = exports.getClipboardAttrs = function getClipboardAttrs(_ref2) {
@@ -365,4 +356,10 @@ var getClipboardAttrs = exports.getClipboardAttrs = function getClipboardAttrs(_
365
356
  'data-alt': alt
366
357
  };
367
358
  };
359
+ var MediaCardInternal = exports.MediaCardInternal = function MediaCardInternal(props) {
360
+ var mediaClient = _react.default.useContext(_mediaClientReact.MediaClientContext);
361
+ return /*#__PURE__*/_react.default.createElement(MediaCardView, (0, _extends2.default)({}, props, {
362
+ mediaClient: mediaClient
363
+ }));
364
+ };
368
365
  var MediaCard = exports.MediaCard = (0, _utils.withImageLoader)(MediaCardInternal);
@@ -43,6 +43,7 @@ var _rendererContext = require("../../renderer-context");
43
43
  var _memoizeOne = _interopRequireDefault(require("memoize-one"));
44
44
  var _ErrorBoundary = require("./ErrorBoundary");
45
45
  var _RenderTracking = require("../../react/utils/performance/RenderTracking");
46
+ var _EditorMediaClientProvider = require("../../react/utils/EditorMediaClientProvider");
46
47
  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); }
47
48
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(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; }
48
49
  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; }
@@ -52,7 +53,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
52
53
  var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
53
54
  var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
54
55
  var packageName = "@atlaskit/renderer";
55
- var packageVersion = "108.17.4";
56
+ var packageVersion = "108.18.0";
56
57
  var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
57
58
  (0, _inherits2.default)(Renderer, _PureComponent);
58
59
  var _super = _createSuper(Renderer);
@@ -299,7 +300,8 @@ var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
299
300
  allowColumnSorting = _this$props.allowColumnSorting,
300
301
  allowCopyToClipboard = _this$props.allowCopyToClipboard,
301
302
  allowWrapCodeBlock = _this$props.allowWrapCodeBlock,
302
- allowCustomPanels = _this$props.allowCustomPanels;
303
+ allowCustomPanels = _this$props.allowCustomPanels,
304
+ media = _this$props.media;
303
305
  var featureFlags = this.featureFlags(this.props.featureFlags);
304
306
  var allowNestedHeaderLinks = (0, _links.isNestedHeaderLinksEnabled)(allowHeadingAnchorLinks);
305
307
  /**
@@ -367,7 +369,9 @@ var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
367
369
  return _this3.fireAnalyticsEvent(event);
368
370
  }
369
371
  }
370
- }, /*#__PURE__*/_react.default.createElement(_SmartCardStorage.Provider, null, /*#__PURE__*/_react.default.createElement(RendererWrapper, {
372
+ }, /*#__PURE__*/_react.default.createElement(_SmartCardStorage.Provider, null, /*#__PURE__*/_react.default.createElement(_providerFactory.ProviderFactoryProvider, {
373
+ value: this.providerFactory
374
+ }, /*#__PURE__*/_react.default.createElement(RendererWrapper, {
371
375
  appearance: appearance,
372
376
  allowNestedHeaderLinks: allowNestedHeaderLinks,
373
377
  allowColumnSorting: allowColumnSorting,
@@ -379,12 +383,13 @@ var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
379
383
  addTelepointer: this.props.addTelepointer,
380
384
  innerRef: this.editorRef,
381
385
  onClick: handleWrapperOnClick,
382
- onMouseDown: this.onMouseDownEditView
386
+ onMouseDown: this.onMouseDownEditView,
387
+ ssr: media === null || media === void 0 ? void 0 : media.ssr
383
388
  }, enableSsrInlineScripts ? /*#__PURE__*/_react.default.createElement(_breakoutSsr.BreakoutSSRInlineScript, null) : null, /*#__PURE__*/_react.default.createElement(RendererActionsInternalUpdater, {
384
389
  doc: pmDoc,
385
390
  schema: schema,
386
391
  onAnalyticsEvent: this.fireAnalyticsEvent
387
- }, result))))));
392
+ }, result)))))));
388
393
  var rendererResult = truncated ? /*#__PURE__*/_react.default.createElement(_truncatedWrapper.TruncatedWrapper, {
389
394
  height: maxHeight,
390
395
  fadeHeight: fadeOutHeight
@@ -465,7 +470,8 @@ var RendererWrapper = /*#__PURE__*/_react.default.memo(function (props) {
465
470
  onClick = props.onClick,
466
471
  onMouseDown = props.onMouseDown,
467
472
  useBlockRenderForCodeBlock = props.useBlockRenderForCodeBlock,
468
- addTelepointer = props.addTelepointer;
473
+ addTelepointer = props.addTelepointer,
474
+ ssr = props.ssr;
469
475
  var createTelepointer = function createTelepointer() {
470
476
  var telepointer = document.createElement('span');
471
477
  telepointer.textContent = "\u200B";
@@ -522,6 +528,8 @@ var RendererWrapper = /*#__PURE__*/_react.default.memo(function (props) {
522
528
  "data-appearance": appearance
523
529
  }, /*#__PURE__*/_react.default.createElement(_ui.BaseTheme, {
524
530
  baseFontSize: appearance && appearance !== 'comment' ? _editorSharedStyles.akEditorFullPageDefaultFontSize : undefined
531
+ }, /*#__PURE__*/_react.default.createElement(_EditorMediaClientProvider.EditorMediaClientProvider, {
532
+ ssr: ssr
525
533
  }, /*#__PURE__*/_react.default.createElement("div", {
526
534
  ref: innerRef,
527
535
  onClick: onClick,
@@ -532,7 +540,7 @@ var RendererWrapper = /*#__PURE__*/_react.default.memo(function (props) {
532
540
  allowColumnSorting: !!allowColumnSorting,
533
541
  useBlockRenderForCodeBlock: useBlockRenderForCodeBlock
534
542
  })
535
- }, children)));
543
+ }, children))));
536
544
  });
537
545
  function RendererActionsInternalUpdater(_ref) {
538
546
  var children = _ref.children,
@@ -1,7 +1,6 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
2
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
- import React from 'react';
4
- import { PureComponent } from 'react';
3
+ import React, { PureComponent } from 'react';
5
4
  import { AnalyticsContext } from '@atlaskit/analytics-next';
6
5
  import { MEDIA_CONTEXT } from '@atlaskit/analytics-namespaced-context';
7
6
  import { WithProviders } from '@atlaskit/editor-common/provider-factory';
@@ -18,7 +17,6 @@ export default class Media extends PureComponent {
18
17
  _defineProperty(this, "renderCard", (providers = {}) => {
19
18
  var _borderMark$attrs$col, _borderMark$attrs$siz;
20
19
  const {
21
- mediaProvider,
22
20
  contextIdentifierProvider
23
21
  } = providers;
24
22
  const {
@@ -43,7 +41,6 @@ export default class Media extends PureComponent {
43
41
  }
44
42
  }
45
43
  }, /*#__PURE__*/React.createElement(MediaCard, _extends({
46
- mediaProvider: mediaProvider,
47
44
  contextIdentifierProvider: contextIdentifierProvider
48
45
  }, this.props, {
49
46
  shouldOpenMediaViewer: shouldOpenMediaViewer,