@atlaskit/renderer 108.1.1 → 108.1.3

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 (33) hide show
  1. package/CHANGELOG.md +15 -0
  2. package/dist/cjs/react/nodes/blockCard.js +9 -1
  3. package/dist/cjs/react/nodes/embedCard.js +8 -1
  4. package/dist/cjs/react/nodes/inlineCard.js +8 -1
  5. package/dist/cjs/react/nodes/mediaInline.js +131 -46
  6. package/dist/cjs/ui/MediaCard.js +2 -1
  7. package/dist/cjs/ui/Renderer/index.js +1 -1
  8. package/dist/cjs/ui/Renderer/style.js +14 -14
  9. package/dist/cjs/version.json +1 -1
  10. package/dist/es2019/react/nodes/blockCard.js +10 -1
  11. package/dist/es2019/react/nodes/embedCard.js +9 -1
  12. package/dist/es2019/react/nodes/inlineCard.js +9 -1
  13. package/dist/es2019/react/nodes/mediaInline.js +85 -39
  14. package/dist/es2019/ui/MediaCard.js +0 -1
  15. package/dist/es2019/ui/Renderer/index.js +1 -1
  16. package/dist/es2019/ui/Renderer/style.js +14 -14
  17. package/dist/es2019/version.json +1 -1
  18. package/dist/esm/react/nodes/blockCard.js +9 -1
  19. package/dist/esm/react/nodes/embedCard.js +8 -1
  20. package/dist/esm/react/nodes/inlineCard.js +8 -1
  21. package/dist/esm/react/nodes/mediaInline.js +132 -47
  22. package/dist/esm/ui/MediaCard.js +0 -1
  23. package/dist/esm/ui/Renderer/index.js +1 -1
  24. package/dist/esm/ui/Renderer/style.js +14 -14
  25. package/dist/esm/version.json +1 -1
  26. package/dist/types/react/nodes/fallback.d.ts +0 -1
  27. package/dist/types/react/nodes/mediaInline.d.ts +15 -5
  28. package/dist/types/ui/MediaCard.d.ts +8 -7
  29. package/dist/types-ts4.5/react/nodes/fallback.d.ts +0 -1
  30. package/dist/types-ts4.5/react/nodes/mediaInline.d.ts +15 -5
  31. package/dist/types-ts4.5/ui/MediaCard.d.ts +8 -7
  32. package/package.json +13 -13
  33. package/report.api.md +2 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,20 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 108.1.3
4
+
5
+ ### Patch Changes
6
+
7
+ - [`077e086c53f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/077e086c53f) - [ux] ED-17971 Changes the color token used for table borders and background of table controls and numbered column.
8
+ - [`65ff31a2ad4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/65ff31a2ad4) - use onError prop on smart card to handle errors
9
+ - Updated dependencies
10
+
11
+ ## 108.1.2
12
+
13
+ ### Patch Changes
14
+
15
+ - [`f0b51f8f06c`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f0b51f8f06c) - Fix copy paste file state for Inline Files
16
+ - Updated dependencies
17
+
3
18
  ## 108.1.1
4
19
 
5
20
  ### Patch Changes
@@ -42,6 +42,12 @@ function BlockCard(props) {
42
42
  // Below is added for the future implementation of Linking Platform namespaced analytic context
43
43
  location: 'renderer'
44
44
  };
45
+ var onError = function onError(_ref2) {
46
+ var err = _ref2.err;
47
+ if (err) {
48
+ throw err;
49
+ }
50
+ };
45
51
  return /*#__PURE__*/_react.default.createElement(_analyticsNext.AnalyticsContext, {
46
52
  data: analyticsData
47
53
  }, /*#__PURE__*/_react.default.createElement("div", {
@@ -56,5 +62,7 @@ function BlockCard(props) {
56
62
  showActions: rendererAppearance !== 'mobile',
57
63
  platform: platform,
58
64
  showServerActions: showServerActions
59
- }, cardProps)))));
65
+ }, cardProps, {
66
+ onError: onError
67
+ })))));
60
68
  }
@@ -115,6 +115,12 @@ function EmbedCard(props) {
115
115
  }
116
116
  var lineLength = isFullWidth ? Math.min(_editorSharedStyles.akEditorFullWidthLayoutWidth, containerWidth - padding) : nonFullWidthSize;
117
117
  var uiMediaSingleStyles = layout === 'full-width' || layout === 'wide' ? uIMediaSingleLayoutStyles : '';
118
+ var onError = function onError(_ref3) {
119
+ var err = _ref3.err;
120
+ if (err) {
121
+ throw err;
122
+ }
123
+ };
118
124
  return (0, _react.jsx)(_fallback.CardErrorBoundary, (0, _extends2.default)({
119
125
  unsupportedComponent: _ui.UnsupportedBlock
120
126
  }, cardProps), (0, _react.jsx)(_smartCard.EmbedResizeMessageListener, {
@@ -146,7 +152,8 @@ function EmbedCard(props) {
146
152
  }, cardProps, {
147
153
  onResolve: onResolve,
148
154
  inheritDimensions: true,
149
- embedIframeRef: embedIframeRef
155
+ embedIframeRef: embedIframeRef,
156
+ onError: onError
150
157
  })))))));
151
158
  }));
152
159
  }
@@ -50,6 +50,12 @@ var InlineCard = function InlineCard(props) {
50
50
  showServerActions: showServerActions
51
51
  }));
52
52
  }
53
+ var onError = function onError(_ref2) {
54
+ var err = _ref2.err;
55
+ if (err) {
56
+ throw err;
57
+ }
58
+ };
53
59
  return /*#__PURE__*/_react.default.createElement(_analyticsNext.AnalyticsContext, {
54
60
  data: analyticsData
55
61
  }, /*#__PURE__*/_react.default.createElement("span", {
@@ -69,7 +75,8 @@ var InlineCard = function InlineCard(props) {
69
75
  return;
70
76
  }
71
77
  props.smartCardStorage.set(data.url, data.title);
72
- }
78
+ },
79
+ onError: onError
73
80
  })))));
74
81
  };
75
82
  var _default = (0, _SmartCardStorage.withSmartCardStorage)(InlineCard);
@@ -14,43 +14,119 @@ var _react = _interopRequireWildcard(require("react"));
14
14
  var _mediaCard = require("@atlaskit/media-card");
15
15
  var _mediaUi = require("@atlaskit/media-ui");
16
16
  var _providerFactory = require("@atlaskit/editor-common/provider-factory");
17
+ var _mediaClient = require("@atlaskit/media-client");
17
18
  var _MediaCard = require("../../ui/MediaCard");
18
19
  var _reactIntlNext = require("react-intl-next");
19
20
  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); }
20
21
  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; }
21
- var RenderMediaInline = function RenderMediaInline(props) {
22
- var mediaProvider = props.mediaProvider,
23
- rendererAppearance = props.rendererAppearance;
22
+ var RenderMediaInline = function RenderMediaInline(_ref) {
23
+ var rendererAppearance = _ref.rendererAppearance,
24
+ intl = _ref.intl,
25
+ clipboardAttrs = _ref.clipboardAttrs,
26
+ mediaInlineProviders = _ref.mediaInlineProviders,
27
+ collectionName = _ref.collection,
28
+ featureFlags = _ref.featureFlags,
29
+ eventHandlers = _ref.eventHandlers,
30
+ identifier = _ref.identifier;
24
31
  var _useState = (0, _react.useState)(),
25
32
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
26
- viewMediaClientConfigState = _useState2[0],
27
- setViewMediaClientConfigState = _useState2[1];
33
+ contextIdentifierProvider = _useState2[0],
34
+ setContextIdentifierProvider = _useState2[1];
35
+ var _useState3 = (0, _react.useState)(),
36
+ _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
37
+ viewMediaClientConfigState = _useState4[0],
38
+ setViewMediaClientConfigState = _useState4[1];
39
+ var _useState5 = (0, _react.useState)(),
40
+ _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
41
+ fileState = _useState6[0],
42
+ setFileState = _useState6[1];
43
+ var updateContext = /*#__PURE__*/function () {
44
+ var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(contextIdentifierProvider) {
45
+ var resolvedContextID;
46
+ return _regenerator.default.wrap(function _callee$(_context) {
47
+ while (1) switch (_context.prev = _context.next) {
48
+ case 0:
49
+ if (!contextIdentifierProvider) {
50
+ _context.next = 5;
51
+ break;
52
+ }
53
+ _context.next = 3;
54
+ return contextIdentifierProvider;
55
+ case 3:
56
+ resolvedContextID = _context.sent;
57
+ setContextIdentifierProvider(resolvedContextID);
58
+ case 5:
59
+ case "end":
60
+ return _context.stop();
61
+ }
62
+ }, _callee);
63
+ }));
64
+ return function updateContext(_x) {
65
+ return _ref2.apply(this, arguments);
66
+ };
67
+ }();
68
+ var updateFileState = (0, _react.useCallback)( /*#__PURE__*/function () {
69
+ var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(id, mediaClientConfig) {
70
+ var mediaClient, options, _fileState;
71
+ return _regenerator.default.wrap(function _callee2$(_context2) {
72
+ while (1) switch (_context2.prev = _context2.next) {
73
+ case 0:
74
+ mediaClient = (0, _mediaClient.getMediaClient)(mediaClientConfig, featureFlags);
75
+ options = {
76
+ collectionName: collectionName
77
+ };
78
+ _context2.prev = 2;
79
+ _context2.next = 5;
80
+ return mediaClient.file.getCurrentState(id, options);
81
+ case 5:
82
+ _fileState = _context2.sent;
83
+ setFileState(_fileState);
84
+ _context2.next = 11;
85
+ break;
86
+ case 9:
87
+ _context2.prev = 9;
88
+ _context2.t0 = _context2["catch"](2);
89
+ case 11:
90
+ case "end":
91
+ return _context2.stop();
92
+ }
93
+ }, _callee2, null, [[2, 9]]);
94
+ }));
95
+ return function (_x2, _x3) {
96
+ return _ref3.apply(this, arguments);
97
+ };
98
+ }(), [collectionName, featureFlags]);
28
99
  (0, _react.useEffect)(function () {
100
+ var mediaProvider = mediaInlineProviders.mediaProvider,
101
+ contextIdentifierProvider = mediaInlineProviders.contextIdentifierProvider;
102
+ var id = clipboardAttrs.id;
29
103
  updateViewMediaClientConfigState(mediaProvider);
30
- }, [mediaProvider]);
104
+ updateContext(contextIdentifierProvider);
105
+ id && viewMediaClientConfigState && updateFileState(id, viewMediaClientConfigState);
106
+ }, [mediaInlineProviders, contextIdentifierProvider, clipboardAttrs, viewMediaClientConfigState, updateFileState]);
31
107
  var updateViewMediaClientConfigState = /*#__PURE__*/function () {
32
- var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(mediaProvider) {
108
+ var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(mediaProvider) {
33
109
  var mediaClientConfig;
34
- return _regenerator.default.wrap(function _callee$(_context) {
35
- while (1) switch (_context.prev = _context.next) {
110
+ return _regenerator.default.wrap(function _callee3$(_context3) {
111
+ while (1) switch (_context3.prev = _context3.next) {
36
112
  case 0:
37
113
  if (!mediaProvider) {
38
- _context.next = 5;
114
+ _context3.next = 5;
39
115
  break;
40
116
  }
41
- _context.next = 3;
117
+ _context3.next = 3;
42
118
  return mediaProvider;
43
119
  case 3:
44
- mediaClientConfig = _context.sent;
120
+ mediaClientConfig = _context3.sent;
45
121
  setViewMediaClientConfigState(mediaClientConfig.viewMediaClientConfig);
46
122
  case 5:
47
123
  case "end":
48
- return _context.stop();
124
+ return _context3.stop();
49
125
  }
50
- }, _callee);
126
+ }, _callee3);
51
127
  }));
52
- return function updateViewMediaClientConfigState(_x) {
53
- return _ref.apply(this, arguments);
128
+ return function updateViewMediaClientConfigState(_x4) {
129
+ return _ref4.apply(this, arguments);
54
130
  };
55
131
  }();
56
132
 
@@ -65,60 +141,69 @@ var RenderMediaInline = function RenderMediaInline(props) {
65
141
  });
66
142
  }
67
143
  var handleMediaInlineClick = function handleMediaInlineClick(result) {
68
- var _props$eventHandlers, _props$eventHandlers$;
69
- if ((_props$eventHandlers = props.eventHandlers) !== null && _props$eventHandlers !== void 0 && (_props$eventHandlers$ = _props$eventHandlers.media) !== null && _props$eventHandlers$ !== void 0 && _props$eventHandlers$.onClick) {
70
- var _props$eventHandlers2, _props$eventHandlers3;
71
- (_props$eventHandlers2 = props.eventHandlers) === null || _props$eventHandlers2 === void 0 ? void 0 : (_props$eventHandlers3 = _props$eventHandlers2.media) === null || _props$eventHandlers3 === void 0 ? void 0 : _props$eventHandlers3.onClick(result);
144
+ var _eventHandlers$media;
145
+ if (eventHandlers !== null && eventHandlers !== void 0 && (_eventHandlers$media = eventHandlers.media) !== null && _eventHandlers$media !== void 0 && _eventHandlers$media.onClick) {
146
+ var _eventHandlers$media2;
147
+ eventHandlers === null || eventHandlers === void 0 ? void 0 : (_eventHandlers$media2 = eventHandlers.media) === null || _eventHandlers$media2 === void 0 ? void 0 : _eventHandlers$media2.onClick(result);
72
148
  }
73
149
  };
74
150
  var shouldOpenMediaViewer = rendererAppearance !== 'mobile';
75
151
  var shouldDisplayToolTip = rendererAppearance !== 'mobile';
76
- return /*#__PURE__*/_react.default.createElement(_mediaCard.MediaInlineCard, {
77
- identifier: props.identifier,
152
+ var mediaProvider = mediaInlineProviders.mediaProvider;
153
+ var id = clipboardAttrs.id,
154
+ collection = clipboardAttrs.collection;
155
+ return /*#__PURE__*/_react.default.createElement("span", (0, _extends2.default)({}, (0, _MediaCard.getClipboardAttrs)({
156
+ id: id,
157
+ collection: collection,
158
+ contextIdentifierProvider: contextIdentifierProvider,
159
+ fileState: fileState
160
+ }), {
161
+ "data-node-type": "mediaInline"
162
+ }), mediaProvider ? /*#__PURE__*/_react.default.createElement(_mediaCard.MediaInlineCard, {
163
+ identifier: identifier,
78
164
  onClick: handleMediaInlineClick,
79
165
  shouldOpenMediaViewer: shouldOpenMediaViewer,
80
166
  shouldDisplayToolTip: shouldDisplayToolTip,
81
167
  mediaClientConfig: viewMediaClientConfigState
82
- });
168
+ }) : /*#__PURE__*/_react.default.createElement(_mediaUi.MediaInlineCardErroredView, {
169
+ message: (intl || (0, _reactIntlNext.createIntl)({
170
+ locale: 'en'
171
+ })).formatMessage(_mediaUi.messages.couldnt_load_file)
172
+ }));
83
173
  };
84
174
  exports.RenderMediaInline = RenderMediaInline;
85
175
  var MediaInline = function MediaInline(props) {
86
176
  var collection = props.collection,
87
177
  id = props.id,
88
- providers = props.providers,
178
+ providerFactory = props.providers,
89
179
  intl = props.intl,
90
- rendererAppearance = props.rendererAppearance;
180
+ rendererAppearance = props.rendererAppearance,
181
+ featureFlags = props.featureFlags;
182
+ var clipboardAttrs = {
183
+ id: id,
184
+ collection: collection
185
+ };
91
186
  var identifier = {
92
187
  id: id,
93
188
  mediaItemType: 'file',
94
189
  collectionName: collection
95
190
  };
96
- var defaultIntl = (0, _reactIntlNext.createIntl)({
97
- locale: 'en'
98
- });
99
- return /*#__PURE__*/_react.default.createElement("span", (0, _extends2.default)({}, (0, _MediaCard.getClipboardAttrs)({
100
- id: id,
101
- collection: collection
102
- }), {
103
- "data-node-type": "mediaInline"
104
- }), /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
105
- providers: ['mediaProvider'],
106
- providerFactory: providers,
107
- renderNode: function renderNode(providers) {
108
- var mediaProvider = providers.mediaProvider;
109
- if (!mediaProvider) {
110
- return /*#__PURE__*/_react.default.createElement(_mediaUi.MediaInlineCardErroredView, {
111
- message: (intl || defaultIntl).formatMessage(_mediaUi.messages.couldnt_load_file)
112
- });
113
- }
191
+ return /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
192
+ providers: ['mediaProvider', 'contextIdentifierProvider'],
193
+ providerFactory: providerFactory,
194
+ renderNode: function renderNode(mediaInlineProviders) {
114
195
  return /*#__PURE__*/_react.default.createElement(RenderMediaInline, {
115
196
  identifier: identifier,
116
- mediaProvider: mediaProvider,
197
+ clipboardAttrs: clipboardAttrs,
117
198
  eventHandlers: props.eventHandlers,
118
- rendererAppearance: rendererAppearance
199
+ rendererAppearance: rendererAppearance,
200
+ intl: intl,
201
+ mediaInlineProviders: mediaInlineProviders,
202
+ collection: collection,
203
+ featureFlags: featureFlags
119
204
  });
120
205
  }
121
- }));
206
+ });
122
207
  };
123
208
  var _default = (0, _reactIntlNext.injectIntl)(MediaInline);
124
209
  exports.default = _default;
@@ -329,8 +329,9 @@ var MediaCardInternal = /*#__PURE__*/function (_Component) {
329
329
  }
330
330
  }]);
331
331
  return MediaCardInternal;
332
- }(_react.Component); // Needed for copy & paste
332
+ }(_react.Component);
333
333
  exports.MediaCardInternal = MediaCardInternal;
334
+ // Needed for copy & paste
334
335
  var getClipboardAttrs = function getClipboardAttrs(_ref2) {
335
336
  var id = _ref2.id,
336
337
  alt = _ref2.alt,
@@ -55,7 +55,7 @@ exports.NORMAL_SEVERITY_THRESHOLD = NORMAL_SEVERITY_THRESHOLD;
55
55
  var DEGRADED_SEVERITY_THRESHOLD = 3000;
56
56
  exports.DEGRADED_SEVERITY_THRESHOLD = DEGRADED_SEVERITY_THRESHOLD;
57
57
  var packageName = "@atlaskit/renderer";
58
- var packageVersion = "108.1.1";
58
+ var packageVersion = "108.1.3";
59
59
  var Renderer = /*#__PURE__*/function (_PureComponent) {
60
60
  (0, _inherits2.default)(Renderer, _PureComponent);
61
61
  var _super = _createSuper(Renderer);
@@ -114,29 +114,29 @@ var rendererStyles = function rendererStyles(wrapperProps) {
114
114
  light: "var(--ds-background-neutral, ".concat(_editorSharedStyles.akEditorTableToolbar, ")"),
115
115
  dark: "var(--ds-background-neutral, ".concat(_editorSharedStyles.akEditorTableToolbarDark, ")")
116
116
  })(themeProps), (0, _components.themed)({
117
- light: "var(--ds-border, ".concat(_editorSharedStyles.akEditorTableBorder, ")"),
118
- dark: "var(--ds-border, ".concat(_editorSharedStyles.akEditorTableBorderDark, ")")
117
+ light: "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorder, ")"),
118
+ dark: "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorderDark, ")")
119
119
  })(themeProps), _editorSharedStyles.akEditorTableNumberColumnWidth, (0, _components.themed)({
120
120
  light: "var(--ds-text-subtlest, ".concat(colors.N200, ")"),
121
121
  dark: "var(--ds-text-subtlest, ".concat(colors.DN400, ")")
122
122
  })(themeProps), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), _consts.RendererCssClassName.NUMBER_COLUMN, _editorSharedStyles.akEditorStickyHeaderZIndex, (0, _components.themed)({
123
- light: "var(--ds-border, ".concat(_editorSharedStyles.akEditorTableBorder, ")"),
124
- dark: "var(--ds-border, ".concat(_editorSharedStyles.akEditorTableBorderDark, ")")
123
+ light: "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorder, ")"),
124
+ dark: "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorderDark, ")")
125
125
  })(themeProps), (0, _components.themed)({
126
- light: "var(--ds-border, ".concat(_editorSharedStyles.akEditorTableBorder, ")"),
127
- dark: "var(--ds-border, ".concat(_editorSharedStyles.akEditorTableBorderDark, ")")
126
+ light: "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorder, ")"),
127
+ dark: "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorderDark, ")")
128
128
  })(themeProps), _editorSharedStyles.akEditorStickyHeaderZIndex, (0, _components.themed)({
129
- light: "var(--ds-border, ".concat(_editorSharedStyles.akEditorTableBorder, ")"),
130
- dark: "var(--ds-border, ".concat(_editorSharedStyles.akEditorTableBorderDark, ")")
129
+ light: "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorder, ")"),
130
+ dark: "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorderDark, ")")
131
131
  })(themeProps), (0, _components.themed)({
132
- light: "var(--ds-border, ".concat(_editorSharedStyles.akEditorTableBorder, ")"),
133
- dark: "var(--ds-border, ".concat(_editorSharedStyles.akEditorTableBorderDark, ")")
132
+ light: "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorder, ")"),
133
+ dark: "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorderDark, ")")
134
134
  })(themeProps), (0, _components.themed)({
135
- light: "var(--ds-border, ".concat(_editorSharedStyles.akEditorTableToolbar, ")"),
136
- dark: "var(--ds-border, ".concat(_editorSharedStyles.akEditorTableToolbarDark, ")")
135
+ light: "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableToolbar, ")"),
136
+ dark: "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableToolbarDark, ")")
137
137
  })(themeProps), (0, _components.themed)({
138
- light: "var(--ds-border, ".concat(_editorSharedStyles.akEditorTableToolbar, ")"),
139
- dark: "var(--ds-border, ".concat(_editorSharedStyles.akEditorTableToolbarDark, ")")
138
+ light: "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableToolbar, ")"),
139
+ dark: "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableToolbarDark, ")")
140
140
  })(themeProps), "var(--ds-radius-100, 3px)", _editorSharedStyles.blockNodesVerticalMargin, useGridRenderForCodeBlock(useBlockRenderForCodeBlock), (0, _lightWeightCodeBlock.getLightWeightCodeBlockStylesForRootRendererStyleSheet)(), _styles.columnLayoutSharedStyle, "var(--ds-space-250, 20px)", "var(--ds-space-400, 32px)", _editorSharedStyles.gridMediumMaxWidth, _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.blockNodesVerticalMargin, _utils.browser.safari ? _styles.codeBlockInListSafariFix : '');
141
141
  };
142
142
  };
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/renderer",
3
- "version": "108.1.1",
3
+ "version": "108.1.3",
4
4
  "sideEffects": false
5
5
  }
@@ -33,6 +33,13 @@ export default function BlockCard(props) {
33
33
  // Below is added for the future implementation of Linking Platform namespaced analytic context
34
34
  location: 'renderer'
35
35
  };
36
+ const onError = ({
37
+ err
38
+ }) => {
39
+ if (err) {
40
+ throw err;
41
+ }
42
+ };
36
43
  return /*#__PURE__*/React.createElement(AnalyticsContext, {
37
44
  data: analyticsData
38
45
  }, /*#__PURE__*/React.createElement("div", {
@@ -47,5 +54,7 @@ export default function BlockCard(props) {
47
54
  showActions: rendererAppearance !== 'mobile',
48
55
  platform: platform,
49
56
  showServerActions: showServerActions
50
- }, cardProps)))));
57
+ }, cardProps, {
58
+ onError: onError
59
+ })))));
51
60
  }
@@ -114,6 +114,13 @@ export default function EmbedCard(props) {
114
114
  }
115
115
  const lineLength = isFullWidth ? Math.min(akEditorFullWidthLayoutWidth, containerWidth - padding) : nonFullWidthSize;
116
116
  const uiMediaSingleStyles = layout === 'full-width' || layout === 'wide' ? uIMediaSingleLayoutStyles : '';
117
+ const onError = ({
118
+ err
119
+ }) => {
120
+ if (err) {
121
+ throw err;
122
+ }
123
+ };
117
124
  return jsx(CardErrorBoundary, _extends({
118
125
  unsupportedComponent: UnsupportedBlock
119
126
  }, cardProps), jsx(EmbedResizeMessageListener, {
@@ -145,7 +152,8 @@ export default function EmbedCard(props) {
145
152
  }, cardProps, {
146
153
  onResolve: onResolve,
147
154
  inheritDimensions: true,
148
- embedIframeRef: embedIframeRef
155
+ embedIframeRef: embedIframeRef,
156
+ onError: onError
149
157
  })))))));
150
158
  }));
151
159
  }
@@ -46,6 +46,13 @@ const InlineCard = props => {
46
46
  showServerActions: showServerActions
47
47
  }));
48
48
  }
49
+ const onError = ({
50
+ err
51
+ }) => {
52
+ if (err) {
53
+ throw err;
54
+ }
55
+ };
49
56
  return /*#__PURE__*/React.createElement(AnalyticsContext, {
50
57
  data: analyticsData
51
58
  }, /*#__PURE__*/React.createElement("span", {
@@ -65,7 +72,8 @@ const InlineCard = props => {
65
72
  return;
66
73
  }
67
74
  props.smartCardStorage.set(data.url, data.title);
68
- }
75
+ },
76
+ onError: onError
69
77
  })))));
70
78
  };
71
79
  export default withSmartCardStorage(InlineCard);
@@ -1,19 +1,54 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
- import React, { useEffect, useState } from 'react';
2
+ import React, { useEffect, useState, useCallback } from 'react';
3
3
  import { MediaInlineCard } from '@atlaskit/media-card';
4
4
  import { MediaInlineCardErroredView, MediaInlineCardLoadingView, messages } from '@atlaskit/media-ui';
5
5
  import { WithProviders } from '@atlaskit/editor-common/provider-factory';
6
+ import { getMediaClient } from '@atlaskit/media-client';
6
7
  import { getClipboardAttrs } from '../../ui/MediaCard';
7
8
  import { createIntl, injectIntl } from 'react-intl-next';
8
- export const RenderMediaInline = props => {
9
- const {
10
- mediaProvider,
11
- rendererAppearance
12
- } = props;
9
+ export const RenderMediaInline = ({
10
+ rendererAppearance,
11
+ intl,
12
+ clipboardAttrs,
13
+ mediaInlineProviders,
14
+ collection: collectionName,
15
+ featureFlags,
16
+ eventHandlers,
17
+ identifier
18
+ }) => {
19
+ const [contextIdentifierProvider, setContextIdentifierProvider] = useState();
13
20
  const [viewMediaClientConfigState, setViewMediaClientConfigState] = useState();
21
+ const [fileState, setFileState] = useState();
22
+ const updateContext = async contextIdentifierProvider => {
23
+ if (contextIdentifierProvider) {
24
+ const resolvedContextID = await contextIdentifierProvider;
25
+ setContextIdentifierProvider(resolvedContextID);
26
+ }
27
+ };
28
+ const updateFileState = useCallback(async (id, mediaClientConfig) => {
29
+ const mediaClient = getMediaClient(mediaClientConfig, featureFlags);
30
+ const options = {
31
+ collectionName
32
+ };
33
+ try {
34
+ const fileState = await mediaClient.file.getCurrentState(id, options);
35
+ setFileState(fileState);
36
+ } catch (error) {
37
+ // do not set state on error
38
+ }
39
+ }, [collectionName, featureFlags]);
14
40
  useEffect(() => {
41
+ const {
42
+ mediaProvider,
43
+ contextIdentifierProvider
44
+ } = mediaInlineProviders;
45
+ const {
46
+ id
47
+ } = clipboardAttrs;
15
48
  updateViewMediaClientConfigState(mediaProvider);
16
- }, [mediaProvider]);
49
+ updateContext(contextIdentifierProvider);
50
+ id && viewMediaClientConfigState && updateFileState(id, viewMediaClientConfigState);
51
+ }, [mediaInlineProviders, contextIdentifierProvider, clipboardAttrs, viewMediaClientConfigState, updateFileState]);
17
52
  const updateViewMediaClientConfigState = async mediaProvider => {
18
53
  if (mediaProvider) {
19
54
  const mediaClientConfig = await mediaProvider;
@@ -32,62 +67,73 @@ export const RenderMediaInline = props => {
32
67
  });
33
68
  }
34
69
  const handleMediaInlineClick = result => {
35
- var _props$eventHandlers, _props$eventHandlers$;
36
- if ((_props$eventHandlers = props.eventHandlers) !== null && _props$eventHandlers !== void 0 && (_props$eventHandlers$ = _props$eventHandlers.media) !== null && _props$eventHandlers$ !== void 0 && _props$eventHandlers$.onClick) {
37
- var _props$eventHandlers2, _props$eventHandlers3;
38
- (_props$eventHandlers2 = props.eventHandlers) === null || _props$eventHandlers2 === void 0 ? void 0 : (_props$eventHandlers3 = _props$eventHandlers2.media) === null || _props$eventHandlers3 === void 0 ? void 0 : _props$eventHandlers3.onClick(result);
70
+ var _eventHandlers$media;
71
+ if (eventHandlers !== null && eventHandlers !== void 0 && (_eventHandlers$media = eventHandlers.media) !== null && _eventHandlers$media !== void 0 && _eventHandlers$media.onClick) {
72
+ var _eventHandlers$media2;
73
+ eventHandlers === null || eventHandlers === void 0 ? void 0 : (_eventHandlers$media2 = eventHandlers.media) === null || _eventHandlers$media2 === void 0 ? void 0 : _eventHandlers$media2.onClick(result);
39
74
  }
40
75
  };
41
76
  const shouldOpenMediaViewer = rendererAppearance !== 'mobile';
42
77
  const shouldDisplayToolTip = rendererAppearance !== 'mobile';
43
- return /*#__PURE__*/React.createElement(MediaInlineCard, {
44
- identifier: props.identifier,
78
+ const {
79
+ mediaProvider
80
+ } = mediaInlineProviders;
81
+ const {
82
+ id,
83
+ collection
84
+ } = clipboardAttrs;
85
+ return /*#__PURE__*/React.createElement("span", _extends({}, getClipboardAttrs({
86
+ id,
87
+ collection,
88
+ contextIdentifierProvider,
89
+ fileState
90
+ }), {
91
+ "data-node-type": "mediaInline"
92
+ }), mediaProvider ? /*#__PURE__*/React.createElement(MediaInlineCard, {
93
+ identifier: identifier,
45
94
  onClick: handleMediaInlineClick,
46
95
  shouldOpenMediaViewer: shouldOpenMediaViewer,
47
96
  shouldDisplayToolTip: shouldDisplayToolTip,
48
97
  mediaClientConfig: viewMediaClientConfigState
49
- });
98
+ }) : /*#__PURE__*/React.createElement(MediaInlineCardErroredView, {
99
+ message: (intl || createIntl({
100
+ locale: 'en'
101
+ })).formatMessage(messages.couldnt_load_file)
102
+ }));
50
103
  };
51
104
  const MediaInline = props => {
52
105
  const {
53
106
  collection,
54
107
  id,
55
- providers,
108
+ providers: providerFactory,
56
109
  intl,
57
- rendererAppearance
110
+ rendererAppearance,
111
+ featureFlags
58
112
  } = props;
113
+ const clipboardAttrs = {
114
+ id,
115
+ collection
116
+ };
59
117
  const identifier = {
60
118
  id,
61
119
  mediaItemType: 'file',
62
120
  collectionName: collection
63
121
  };
64
- const defaultIntl = createIntl({
65
- locale: 'en'
66
- });
67
- return /*#__PURE__*/React.createElement("span", _extends({}, getClipboardAttrs({
68
- id,
69
- collection
70
- }), {
71
- "data-node-type": "mediaInline"
72
- }), /*#__PURE__*/React.createElement(WithProviders, {
73
- providers: ['mediaProvider'],
74
- providerFactory: providers,
75
- renderNode: providers => {
76
- const {
77
- mediaProvider
78
- } = providers;
79
- if (!mediaProvider) {
80
- return /*#__PURE__*/React.createElement(MediaInlineCardErroredView, {
81
- message: (intl || defaultIntl).formatMessage(messages.couldnt_load_file)
82
- });
83
- }
122
+ return /*#__PURE__*/React.createElement(WithProviders, {
123
+ providers: ['mediaProvider', 'contextIdentifierProvider'],
124
+ providerFactory: providerFactory,
125
+ renderNode: mediaInlineProviders => {
84
126
  return /*#__PURE__*/React.createElement(RenderMediaInline, {
85
127
  identifier: identifier,
86
- mediaProvider: mediaProvider,
128
+ clipboardAttrs: clipboardAttrs,
87
129
  eventHandlers: props.eventHandlers,
88
- rendererAppearance: rendererAppearance
130
+ rendererAppearance: rendererAppearance,
131
+ intl: intl,
132
+ mediaInlineProviders: mediaInlineProviders,
133
+ collection: collection,
134
+ featureFlags: featureFlags
89
135
  });
90
136
  }
91
- }));
137
+ });
92
138
  };
93
139
  export default injectIntl(MediaInline);
@@ -262,7 +262,6 @@ export class MediaCardInternal extends Component {
262
262
  }));
263
263
  }
264
264
  }
265
-
266
265
  // Needed for copy & paste
267
266
  export const getClipboardAttrs = ({
268
267
  id,