@atlaskit/renderer 108.19.0 → 108.20.1

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 (32) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/cjs/react/nodes/media/index.js +3 -1
  3. package/dist/cjs/react/nodes/mediaInline.js +50 -46
  4. package/dist/cjs/ui/MediaCard.js +74 -71
  5. package/dist/cjs/ui/Renderer/index.js +7 -15
  6. package/dist/cjs/ui/Renderer/style.js +1 -1
  7. package/dist/es2019/react/nodes/media/index.js +4 -1
  8. package/dist/es2019/react/nodes/mediaInline.js +23 -37
  9. package/dist/es2019/ui/MediaCard.js +29 -25
  10. package/dist/es2019/ui/Renderer/index.js +10 -17
  11. package/dist/es2019/ui/Renderer/style.js +10 -0
  12. package/dist/esm/react/nodes/media/index.js +5 -2
  13. package/dist/esm/react/nodes/mediaInline.js +51 -47
  14. package/dist/esm/ui/MediaCard.js +74 -71
  15. package/dist/esm/ui/Renderer/index.js +10 -17
  16. package/dist/esm/ui/Renderer/style.js +1 -1
  17. package/dist/types/react/nodes/index.d.ts +1 -1
  18. package/dist/types/react/nodes/media/index.d.ts +3 -2
  19. package/dist/types/react/nodes/mediaInline.d.ts +3 -5
  20. package/dist/types/ui/MediaCard.d.ts +5 -6
  21. package/dist/types/ui/Renderer/index.d.ts +1 -2
  22. package/dist/types-ts4.5/react/nodes/index.d.ts +1 -1
  23. package/dist/types-ts4.5/react/nodes/media/index.d.ts +3 -2
  24. package/dist/types-ts4.5/react/nodes/mediaInline.d.ts +3 -5
  25. package/dist/types-ts4.5/ui/MediaCard.d.ts +5 -6
  26. package/dist/types-ts4.5/ui/Renderer/index.d.ts +1 -2
  27. package/package.json +2 -2
  28. package/dist/cjs/react/utils/EditorMediaClientProvider.js +0 -40
  29. package/dist/es2019/react/utils/EditorMediaClientProvider.js +0 -27
  30. package/dist/esm/react/utils/EditorMediaClientProvider.js +0 -30
  31. package/dist/types/react/utils/EditorMediaClientProvider.d.ts +0 -5
  32. package/dist/types-ts4.5/react/utils/EditorMediaClientProvider.d.ts +0 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 108.20.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [#59485](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/59485) [`724d7b798878`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/724d7b798878) - Accessiblity: Fixes 'Copy link to heading' icon not showing when navigated through keyboard tab
8
+
9
+ ## 108.20.0
10
+
11
+ ### Minor Changes
12
+
13
+ - [#58963](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58963) [`f66aaa97f90e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f66aaa97f90e) - Revert "Merge pull request #58452 in CONFCLOUD/confluence-frontend from ED-20985-use-mediaClientContext-in-renderer-m to master"
14
+
3
15
  ## 108.19.0
4
16
 
5
17
  ### Minor Changes
@@ -43,7 +43,8 @@ var Media = exports.default = /*#__PURE__*/function (_PureComponent) {
43
43
  (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderCard", function () {
44
44
  var _borderMark$attrs$col, _borderMark$attrs$siz;
45
45
  var providers = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
46
- var contextIdentifierProvider = providers.contextIdentifierProvider;
46
+ var mediaProvider = providers.mediaProvider,
47
+ contextIdentifierProvider = providers.contextIdentifierProvider;
47
48
  var _this$props = _this.props,
48
49
  allowAltTextOnImages = _this$props.allowAltTextOnImages,
49
50
  alt = _this$props.alt,
@@ -63,6 +64,7 @@ var Media = exports.default = /*#__PURE__*/function (_PureComponent) {
63
64
  border: !!borderMark
64
65
  })
65
66
  }, (0, _react2.jsx)(_MediaCard.MediaCard, (0, _extends2.default)({
67
+ mediaProvider: mediaProvider,
66
68
  contextIdentifierProvider: contextIdentifierProvider
67
69
  }, _this.props, {
68
70
  shouldOpenMediaViewer: shouldOpenMediaViewer,
@@ -18,7 +18,6 @@ var _providerFactory = require("@atlaskit/editor-common/provider-factory");
18
18
  var _mediaClientReact = require("@atlaskit/media-client-react");
19
19
  var _MediaCard = require("../../ui/MediaCard");
20
20
  var _reactIntlNext = require("react-intl-next");
21
- var _mediaInline = require("@atlaskit/editor-common/media-inline");
22
21
  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); }
23
22
  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; }
24
23
  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; }
@@ -29,22 +28,21 @@ var RenderMediaInline = exports.RenderMediaInline = function RenderMediaInline(_
29
28
  clipboardAttrs = _ref.clipboardAttrs,
30
29
  mediaInlineProviders = _ref.mediaInlineProviders,
31
30
  collectionName = _ref.collection,
31
+ featureFlags = _ref.featureFlags,
32
32
  eventHandlers = _ref.eventHandlers,
33
- identifier = _ref.identifier,
34
- alt = _ref.alt,
35
- width = _ref.width,
36
- height = _ref.height,
37
- _ref$type = _ref.type,
38
- type = _ref$type === void 0 ? '' : _ref$type;
33
+ identifier = _ref.identifier;
39
34
  var _useState = (0, _react.useState)(),
40
35
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
41
36
  contextIdentifierProvider = _useState2[0],
42
37
  setContextIdentifierProvider = _useState2[1];
43
38
  var _useState3 = (0, _react.useState)(),
44
39
  _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
45
- fileState = _useState4[0],
46
- setFileState = _useState4[1];
47
- var mediaClient = _react.default.useContext(_mediaClientReact.MediaClientContext);
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];
48
46
  var updateContext = /*#__PURE__*/function () {
49
47
  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(contextIdentifierProvider) {
50
48
  var resolvedContextID;
@@ -71,40 +69,36 @@ var RenderMediaInline = exports.RenderMediaInline = function RenderMediaInline(_
71
69
  };
72
70
  }();
73
71
  var updateFileState = (0, _react.useCallback)( /*#__PURE__*/function () {
74
- var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(id) {
75
- var options, _fileState;
72
+ var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(id, mediaClientConfig) {
73
+ var mediaClient, options, _fileState;
76
74
  return _regenerator.default.wrap(function _callee2$(_context2) {
77
75
  while (1) switch (_context2.prev = _context2.next) {
78
76
  case 0:
77
+ mediaClient = (0, _mediaClientReact.getMediaClient)(mediaClientConfig);
79
78
  options = {
80
79
  collectionName: collectionName
81
80
  };
82
- _context2.prev = 1;
83
- if (!mediaClient) {
84
- _context2.next = 7;
85
- break;
86
- }
81
+ _context2.prev = 2;
87
82
  _context2.next = 5;
88
83
  return mediaClient.file.getCurrentState(id, options);
89
84
  case 5:
90
85
  _fileState = _context2.sent;
91
86
  setFileState(_fileState);
92
- case 7:
93
87
  _context2.next = 11;
94
88
  break;
95
89
  case 9:
96
90
  _context2.prev = 9;
97
- _context2.t0 = _context2["catch"](1);
91
+ _context2.t0 = _context2["catch"](2);
98
92
  case 11:
99
93
  case "end":
100
94
  return _context2.stop();
101
95
  }
102
- }, _callee2, null, [[1, 9]]);
96
+ }, _callee2, null, [[2, 9]]);
103
97
  }));
104
- return function (_x2) {
98
+ return function (_x2, _x3) {
105
99
  return _ref3.apply(this, arguments);
106
100
  };
107
- }(), [collectionName, mediaClient]);
101
+ }(), [collectionName]);
108
102
  (0, _react.useEffect)(function () {
109
103
  var id = identifier.id;
110
104
  var nodeIsInCache = id && _MediaCard.mediaIdentifierMap.has(id);
@@ -118,17 +112,44 @@ var RenderMediaInline = exports.RenderMediaInline = function RenderMediaInline(_
118
112
  };
119
113
  }, [identifier, collectionName]);
120
114
  (0, _react.useEffect)(function () {
121
- var contextIdentifierProvider = mediaInlineProviders.contextIdentifierProvider;
115
+ var mediaProvider = mediaInlineProviders.mediaProvider,
116
+ contextIdentifierProvider = mediaInlineProviders.contextIdentifierProvider;
122
117
  var id = clipboardAttrs.id;
118
+ updateViewMediaClientConfigState(mediaProvider);
123
119
  updateContext(contextIdentifierProvider);
124
- id && updateFileState(id);
125
- }, [mediaInlineProviders, contextIdentifierProvider, clipboardAttrs, updateFileState]);
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
+ }();
126
147
 
127
148
  /*
128
149
  * Only show the loading view if the media provider is not ready
129
150
  * prevents calling the media API before the provider is ready
130
151
  */
131
- if (!mediaClient) {
152
+ if (!viewMediaClientConfigState) {
132
153
  return /*#__PURE__*/_react.default.createElement(_mediaUi.MediaInlineCardLoadingView, {
133
154
  message: "",
134
155
  isSelected: false
@@ -146,15 +167,6 @@ var RenderMediaInline = exports.RenderMediaInline = function RenderMediaInline(_
146
167
  var mediaProvider = mediaInlineProviders.mediaProvider;
147
168
  var id = clipboardAttrs.id,
148
169
  collection = clipboardAttrs.collection;
149
- if ((0, _mediaInline.shouldShowInlineImage)(type)) {
150
- return /*#__PURE__*/_react.default.createElement(_mediaInline.MediaInlineImageCard, {
151
- mediaClient: mediaClient,
152
- identifier: identifier,
153
- alt: alt,
154
- width: width,
155
- height: height
156
- });
157
- }
158
170
  return /*#__PURE__*/_react.default.createElement("span", (0, _extends2.default)({}, (0, _MediaCard.getClipboardAttrs)({
159
171
  id: id,
160
172
  collection: collection,
@@ -167,7 +179,7 @@ var RenderMediaInline = exports.RenderMediaInline = function RenderMediaInline(_
167
179
  onClick: handleMediaInlineClick,
168
180
  shouldOpenMediaViewer: shouldOpenMediaViewer,
169
181
  shouldDisplayToolTip: shouldDisplayToolTip,
170
- mediaClientConfig: mediaClient.mediaClientConfig,
182
+ mediaClientConfig: viewMediaClientConfigState,
171
183
  mediaViewerItems: Array.from(_MediaCard.mediaIdentifierMap.values())
172
184
  }) : /*#__PURE__*/_react.default.createElement(_mediaUi.MediaInlineCardErroredView, {
173
185
  message: (intl || (0, _reactIntlNext.createIntl)({
@@ -181,11 +193,7 @@ var MediaInline = function MediaInline(props) {
181
193
  providerFactory = props.providers,
182
194
  intl = props.intl,
183
195
  rendererAppearance = props.rendererAppearance,
184
- featureFlags = props.featureFlags,
185
- fileType = props.type,
186
- alt = props.alt,
187
- width = props.width,
188
- height = props.height;
196
+ featureFlags = props.featureFlags;
189
197
  var clipboardAttrs = {
190
198
  id: id,
191
199
  collection: collection
@@ -207,11 +215,7 @@ var MediaInline = function MediaInline(props) {
207
215
  intl: intl,
208
216
  mediaInlineProviders: mediaInlineProviders,
209
217
  collection: collection,
210
- featureFlags: featureFlags,
211
- type: fileType,
212
- alt: alt,
213
- width: width,
214
- height: height
218
+ featureFlags: featureFlags
215
219
  });
216
220
  }
217
221
  });
@@ -5,9 +5,8 @@ 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.MediaCardView = exports.MediaCardInternal = exports.MediaCard = void 0;
8
+ exports.mediaIdentifierMap = exports.getListOfIdentifiersFromDoc = exports.getClipboardAttrs = exports.MediaCardInternal = exports.MediaCard = void 0;
9
9
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
10
- var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
11
10
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
12
11
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
13
12
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -56,32 +55,29 @@ var getListOfIdentifiersFromDoc = exports.getListOfIdentifiersFromDoc = function
56
55
  return identifierList;
57
56
  }, []);
58
57
  };
59
- var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
60
- (0, _inherits2.default)(MediaCardView, _Component);
61
- var _super = _createSuper(MediaCardView);
62
- function MediaCardView() {
58
+ var MediaCardInternal = exports.MediaCardInternal = /*#__PURE__*/function (_Component) {
59
+ (0, _inherits2.default)(MediaCardInternal, _Component);
60
+ var _super = _createSuper(MediaCardInternal);
61
+ function MediaCardInternal() {
63
62
  var _this;
64
- (0, _classCallCheck2.default)(this, MediaCardView);
63
+ (0, _classCallCheck2.default)(this, MediaCardInternal);
65
64
  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
66
65
  args[_key] = arguments[_key];
67
66
  }
68
67
  _this = _super.call.apply(_super, [this].concat(args));
69
68
  (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", {});
70
69
  (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "saveFileState", /*#__PURE__*/function () {
71
- var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(id) {
72
- var _this$props, collectionName, mediaClient, options, fileState;
70
+ var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(id, mediaClientConfig) {
71
+ var collectionName, mediaClient, options, fileState;
73
72
  return _regenerator.default.wrap(function _callee$(_context) {
74
73
  while (1) switch (_context.prev = _context.next) {
75
74
  case 0:
76
- _this$props = _this.props, collectionName = _this$props.collection, mediaClient = _this$props.mediaClient;
75
+ collectionName = _this.props.collection;
76
+ mediaClient = (0, _mediaClientReact.getMediaClient)(mediaClientConfig);
77
77
  options = {
78
78
  collectionName: collectionName
79
79
  };
80
- _context.prev = 2;
81
- if (!mediaClient) {
82
- _context.next = 8;
83
- break;
84
- }
80
+ _context.prev = 3;
85
81
  _context.next = 6;
86
82
  return mediaClient.file.getCurrentState(id, options);
87
83
  case 6:
@@ -89,19 +85,18 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
89
85
  _this.setState({
90
86
  fileState: fileState
91
87
  });
92
- case 8:
93
88
  _context.next = 12;
94
89
  break;
95
90
  case 10:
96
91
  _context.prev = 10;
97
- _context.t0 = _context["catch"](2);
92
+ _context.t0 = _context["catch"](3);
98
93
  case 12:
99
94
  case "end":
100
95
  return _context.stop();
101
96
  }
102
- }, _callee, null, [[2, 10]]);
97
+ }, _callee, null, [[3, 10]]);
103
98
  }));
104
- return function (_x) {
99
+ return function (_x, _x2) {
105
100
  return _ref.apply(this, arguments);
106
101
  };
107
102
  }());
@@ -132,29 +127,40 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
132
127
  });
133
128
  return _this;
134
129
  }
135
- (0, _createClass2.default)(MediaCardView, [{
130
+ (0, _createClass2.default)(MediaCardInternal, [{
136
131
  key: "componentDidMount",
137
132
  value: function () {
138
133
  var _componentDidMount = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
139
- var _this$props2, rendererContext, contextIdentifierProvider, id, url, collectionName, nodeIsInCache;
134
+ var _this$props, rendererContext, mediaProvider, contextIdentifierProvider, id, url, collectionName, mediaProviderObject, mediaClientConfig, nodeIsInCache;
140
135
  return _regenerator.default.wrap(function _callee2$(_context2) {
141
136
  while (1) switch (_context2.prev = _context2.next) {
142
137
  case 0:
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;
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:
144
145
  if (!contextIdentifierProvider) {
145
- _context2.next = 8;
146
+ _context2.next = 10;
146
147
  break;
147
148
  }
148
149
  _context2.t0 = this;
149
- _context2.next = 5;
150
+ _context2.next = 7;
150
151
  return contextIdentifierProvider;
151
- case 5:
152
+ case 7:
152
153
  _context2.t1 = _context2.sent;
153
154
  _context2.t2 = {
154
155
  contextIdentifierProvider: _context2.t1
155
156
  };
156
157
  _context2.t0.setState.call(_context2.t0, _context2.t2);
157
- case 8:
158
+ case 10:
159
+ _context2.next = 12;
160
+ return mediaProvider;
161
+ case 12:
162
+ mediaProviderObject = _context2.sent;
163
+ mediaClientConfig = mediaProviderObject.viewMediaClientConfig;
158
164
  nodeIsInCache = id && mediaIdentifierMap.has(id) || url && mediaIdentifierMap.has(url);
159
165
  if (rendererContext && rendererContext.adDoc && !nodeIsInCache) {
160
166
  getListOfIdentifiersFromDoc(rendererContext.adDoc).forEach(function (identifier) {
@@ -167,10 +173,13 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
167
173
  }
168
174
  });
169
175
  }
176
+ this.setState({
177
+ mediaClientConfig: mediaClientConfig
178
+ });
170
179
  if (id) {
171
- this.saveFileState(id);
180
+ this.saveFileState(id, mediaClientConfig);
172
181
  }
173
- case 11:
182
+ case 18:
174
183
  case "end":
175
184
  return _context2.stop();
176
185
  }
@@ -184,17 +193,18 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
184
193
  }, {
185
194
  key: "UNSAFE_componentWillReceiveProps",
186
195
  value: function UNSAFE_componentWillReceiveProps(newProps) {
196
+ var mediaClientConfig = this.state.mediaClientConfig;
187
197
  var newId = newProps.id;
188
- if (newId && newId !== this.props.id) {
189
- this.saveFileState(newId);
198
+ if (mediaClientConfig && newId && newId !== this.props.id) {
199
+ this.saveFileState(newId, mediaClientConfig);
190
200
  }
191
201
  }
192
202
  }, {
193
203
  key: "componentWillUnmount",
194
204
  value: function componentWillUnmount() {
195
- var _this$props3 = this.props,
196
- id = _this$props3.id,
197
- dataURI = _this$props3.url;
205
+ var _this$props2 = this.props,
206
+ id = _this$props2.id,
207
+ dataURI = _this$props2.url;
198
208
  if (id) {
199
209
  mediaIdentifierMap.delete(id);
200
210
  } else if (dataURI) {
@@ -204,18 +214,18 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
204
214
  }, {
205
215
  key: "renderExternal",
206
216
  value: function renderExternal(shouldOpenMediaViewer) {
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;
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;
219
229
  if (imageStatus === 'loading' || !url) {
220
230
  return this.renderLoadingCard();
221
231
  }
@@ -224,7 +234,6 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
224
234
  name: url,
225
235
  mediaItemType: 'external-image'
226
236
  };
227
- var mediaClientConfig = (_this$props$mediaClie = this.props.mediaClient) === null || _this$props$mediaClie === void 0 ? void 0 : _this$props$mediaClie.mediaClientConfig;
228
237
  return /*#__PURE__*/_react.default.createElement(_mediaCard.Card
229
238
  // TODO MPT-315: clean up after we move mediaClientConfig into FileIdentifier
230
239
  // context is not really used when the type is external and we want to render the component asap
@@ -246,26 +255,26 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
246
255
  }, {
247
256
  key: "render",
248
257
  value: function render() {
249
- var _this$props$mediaClie2;
250
258
  var _this$state = this.state,
251
259
  contextIdentifierProvider = _this$state.contextIdentifierProvider,
260
+ mediaClientConfigInState = _this$state.mediaClientConfig,
252
261
  fileState = _this$state.fileState;
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;
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;
269
278
  var isMobile = rendererAppearance === 'mobile';
270
279
  var shouldPlayInline = useInlinePlayer !== undefined ? useInlinePlayer : true;
271
280
  var isInlinePlayer = isMobile ? false : shouldPlayInline;
@@ -277,7 +286,7 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
277
286
  if (type === 'link') {
278
287
  return null;
279
288
  }
280
- var mediaClientConfig = !!ssr ? ssr.config : (_this$props$mediaClie2 = this.props.mediaClient) === null || _this$props$mediaClie2 === void 0 ? void 0 : _this$props$mediaClie2.mediaClientConfig;
289
+ var mediaClientConfig = !!ssr ? ssr.config : mediaClientConfigInState;
281
290
  if (!mediaClientConfig || !id) {
282
291
  return this.renderLoadingCard();
283
292
  }
@@ -321,7 +330,7 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
321
330
  }));
322
331
  }
323
332
  }]);
324
- return MediaCardView;
333
+ return MediaCardInternal;
325
334
  }(_react.Component);
326
335
  // Needed for copy & paste
327
336
  var getClipboardAttrs = exports.getClipboardAttrs = function getClipboardAttrs(_ref2) {
@@ -356,10 +365,4 @@ var getClipboardAttrs = exports.getClipboardAttrs = function getClipboardAttrs(_
356
365
  'data-alt': alt
357
366
  };
358
367
  };
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
- };
365
368
  var MediaCard = exports.MediaCard = (0, _utils.withImageLoader)(MediaCardInternal);
@@ -44,7 +44,6 @@ var _rendererContext = require("../../renderer-context");
44
44
  var _memoizeOne = _interopRequireDefault(require("memoize-one"));
45
45
  var _ErrorBoundary = require("./ErrorBoundary");
46
46
  var _RenderTracking = require("../../react/utils/performance/RenderTracking");
47
- var _EditorMediaClientProvider = require("../../react/utils/EditorMediaClientProvider");
48
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); }
49
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; }
50
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; }
@@ -54,7 +53,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
54
53
  var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
55
54
  var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
56
55
  var packageName = "@atlaskit/renderer";
57
- var packageVersion = "108.19.0";
56
+ var packageVersion = "108.20.1";
58
57
  var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
59
58
  (0, _inherits2.default)(Renderer, _PureComponent);
60
59
  var _super = _createSuper(Renderer);
@@ -301,8 +300,7 @@ var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
301
300
  allowColumnSorting = _this$props.allowColumnSorting,
302
301
  allowCopyToClipboard = _this$props.allowCopyToClipboard,
303
302
  allowWrapCodeBlock = _this$props.allowWrapCodeBlock,
304
- allowCustomPanels = _this$props.allowCustomPanels,
305
- media = _this$props.media;
303
+ allowCustomPanels = _this$props.allowCustomPanels;
306
304
  var featureFlags = this.featureFlags(this.props.featureFlags);
307
305
  var allowNestedHeaderLinks = (0, _links.isNestedHeaderLinksEnabled)(allowHeadingAnchorLinks);
308
306
  /**
@@ -370,9 +368,7 @@ var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
370
368
  return _this3.fireAnalyticsEvent(event);
371
369
  }
372
370
  }
373
- }, (0, _react2.jsx)(_SmartCardStorage.Provider, null, (0, _react2.jsx)(_providerFactory.ProviderFactoryProvider, {
374
- value: this.providerFactory
375
- }, (0, _react2.jsx)(RendererWrapper, {
371
+ }, (0, _react2.jsx)(_SmartCardStorage.Provider, null, (0, _react2.jsx)(RendererWrapper, {
376
372
  appearance: appearance,
377
373
  allowNestedHeaderLinks: allowNestedHeaderLinks,
378
374
  allowColumnSorting: allowColumnSorting,
@@ -384,13 +380,12 @@ var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
384
380
  addTelepointer: this.props.addTelepointer,
385
381
  innerRef: this.editorRef,
386
382
  onClick: handleWrapperOnClick,
387
- onMouseDown: this.onMouseDownEditView,
388
- ssr: media === null || media === void 0 ? void 0 : media.ssr
383
+ onMouseDown: this.onMouseDownEditView
389
384
  }, enableSsrInlineScripts ? (0, _react2.jsx)(_breakoutSsr.BreakoutSSRInlineScript, null) : null, (0, _react2.jsx)(RendererActionsInternalUpdater, {
390
385
  doc: pmDoc,
391
386
  schema: schema,
392
387
  onAnalyticsEvent: this.fireAnalyticsEvent
393
- }, result)))))));
388
+ }, result))))));
394
389
  var rendererResult = truncated ? (0, _react2.jsx)(_truncatedWrapper.TruncatedWrapper, {
395
390
  height: maxHeight,
396
391
  fadeHeight: fadeOutHeight
@@ -471,8 +466,7 @@ var RendererWrapper = /*#__PURE__*/_react.default.memo(function (props) {
471
466
  onClick = props.onClick,
472
467
  onMouseDown = props.onMouseDown,
473
468
  useBlockRenderForCodeBlock = props.useBlockRenderForCodeBlock,
474
- addTelepointer = props.addTelepointer,
475
- ssr = props.ssr;
469
+ addTelepointer = props.addTelepointer;
476
470
  var createTelepointer = function createTelepointer() {
477
471
  var telepointer = document.createElement('span');
478
472
  telepointer.textContent = "\u200B";
@@ -529,8 +523,6 @@ var RendererWrapper = /*#__PURE__*/_react.default.memo(function (props) {
529
523
  "data-appearance": appearance
530
524
  }, (0, _react2.jsx)(_ui.BaseTheme, {
531
525
  baseFontSize: appearance && appearance !== 'comment' ? _editorSharedStyles.akEditorFullPageDefaultFontSize : undefined
532
- }, (0, _react2.jsx)(_EditorMediaClientProvider.EditorMediaClientProvider, {
533
- ssr: ssr
534
526
  }, (0, _react2.jsx)("div", {
535
527
  ref: innerRef,
536
528
  onClick: onClick,
@@ -541,7 +533,7 @@ var RendererWrapper = /*#__PURE__*/_react.default.memo(function (props) {
541
533
  allowColumnSorting: !!allowColumnSorting,
542
534
  useBlockRenderForCodeBlock: useBlockRenderForCodeBlock
543
535
  })
544
- }, children))));
536
+ }, children)));
545
537
  });
546
538
  function RendererActionsInternalUpdater(_ref) {
547
539
  var children = _ref.children,
@@ -71,7 +71,7 @@ var headingSizes = exports.headingSizes = {
71
71
  };
72
72
  var headingAnchorStyle = function headingAnchorStyle(headingTag) {
73
73
  return (// TODO Delete this comment after verifying space token -> previous value `margin-left: 6px`
74
- (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n /**\n * The copy link button doesn't reserve space in the DOM so that\n * the text alignment isn't impacted by the button/icon's space.\n */\n .", " {\n position: absolute;\n height: ", "em;\n\n margin-left: ", ";\n\n button {\n padding-left: 0;\n padding-right: 0;\n }\n }\n\n /**\n * Applies hover effects to the heading anchor link button\n * to fade in when the user rolls over the heading.\n *\n * The link is persistent on mobile, so we use feature detection\n * to enable hover effects for systems that support it (desktop).\n *\n * @see https://caniuse.com/mdn-css_at-rules_media_hover\n */\n @media (hover: hover) and (pointer: fine) {\n .", " {\n > button {\n opacity: 0;\n transform: translate(-8px, 0px);\n transition: opacity 0.2s ease 0s, transform 0.2s ease 0s;\n }\n }\n\n &:hover {\n .", " > button {\n opacity: 1;\n transform: none !important;\n }\n }\n }\n "])), _headingAnchor.HeadingAnchorWrapperClassName, headingSizes[headingTag].lineHeight, "var(--ds-space-075, 6px)", _headingAnchor.HeadingAnchorWrapperClassName, _headingAnchor.HeadingAnchorWrapperClassName)
74
+ (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n /**\n * The copy link button doesn't reserve space in the DOM so that\n * the text alignment isn't impacted by the button/icon's space.\n */\n .", " {\n position: absolute;\n height: ", "em;\n\n margin-left: ", ";\n\n button {\n padding-left: 0;\n padding-right: 0;\n }\n }\n\n /**\n * Applies hover effects to the heading anchor link button\n * to fade in when the user rolls over the heading.\n *\n * The link is persistent on mobile, so we use feature detection\n * to enable hover effects for systems that support it (desktop).\n *\n * @see https://caniuse.com/mdn-css_at-rules_media_hover\n */\n @media (hover: hover) and (pointer: fine) {\n .", " {\n > button {\n opacity: 0;\n transform: translate(-8px, 0px);\n transition: opacity 0.2s ease 0s, transform 0.2s ease 0s;\n }\n }\n\n &:hover {\n .", " > button {\n opacity: 1;\n transform: none !important;\n }\n }\n }\n\n /**\n * Adds the visibility of the button when in focus through keyboard navigation.\n */\n .", " {\n button:focus {\n opacity: 1;\n transform: none !important;\n }\n }\n "])), _headingAnchor.HeadingAnchorWrapperClassName, headingSizes[headingTag].lineHeight, "var(--ds-space-075, 6px)", _headingAnchor.HeadingAnchorWrapperClassName, _headingAnchor.HeadingAnchorWrapperClassName, _headingAnchor.HeadingAnchorWrapperClassName)
75
75
  );
76
76
  };
77
77
  var alignedHeadingAnchorStyle = function alignedHeadingAnchorStyle(_ref) {
@@ -2,7 +2,8 @@ import _extends from "@babel/runtime/helpers/extends";
2
2
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
3
  /** @jsx jsx */
4
4
 
5
- import React, { PureComponent } from 'react';
5
+ import React from 'react';
6
+ import { PureComponent } from 'react';
6
7
  import { jsx } from '@emotion/react';
7
8
  import { AnalyticsContext } from '@atlaskit/analytics-next';
8
9
  import { MEDIA_CONTEXT } from '@atlaskit/analytics-namespaced-context';
@@ -20,6 +21,7 @@ export default class Media extends PureComponent {
20
21
  _defineProperty(this, "renderCard", (providers = {}) => {
21
22
  var _borderMark$attrs$col, _borderMark$attrs$siz;
22
23
  const {
24
+ mediaProvider,
23
25
  contextIdentifierProvider
24
26
  } = providers;
25
27
  const {
@@ -44,6 +46,7 @@ export default class Media extends PureComponent {
44
46
  }
45
47
  }
46
48
  }, jsx(MediaCard, _extends({
49
+ mediaProvider: mediaProvider,
47
50
  contextIdentifierProvider: contextIdentifierProvider
48
51
  }, this.props, {
49
52
  shouldOpenMediaViewer: shouldOpenMediaViewer,