@atlaskit/renderer 109.1.4 → 109.1.5

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,12 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 109.1.5
4
+
5
+ ### Patch Changes
6
+
7
+ - [#63612](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/63612) [`ce40b4308ec7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ce40b4308ec7) - Fix an issue with datasource table where rendering inside another component causes it to overflow beyound the parent component.
8
+ - Updated dependencies
9
+
3
10
  ## 109.1.4
4
11
 
5
12
  ### Patch Changes
@@ -219,6 +219,8 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
219
219
  return this.getTaskItemProps(node, path);
220
220
  case 'embedCard':
221
221
  return this.getEmbedCardProps(node, path);
222
+ case 'blockCard':
223
+ return this.getBlockCardProps(node, path);
222
224
  case 'expand':
223
225
  return this.getExpandProps(node, path);
224
226
  case 'unsupportedBlock':
@@ -424,6 +426,14 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
424
426
  isInsideOfBlockNode: isInsideOfBlockNode
425
427
  });
426
428
  }
429
+ }, {
430
+ key: "getBlockCardProps",
431
+ value: function getBlockCardProps(node) {
432
+ var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
433
+ return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
434
+ isNodeNested: path.length > 0
435
+ });
436
+ }
427
437
  }, {
428
438
  key: "getMediaGroupProps",
429
439
  value: function getMediaGroupProps(node) {
@@ -33,7 +33,8 @@ function BlockCard(props) {
33
33
  eventHandlers = props.eventHandlers,
34
34
  portal = props.portal,
35
35
  rendererAppearance = props.rendererAppearance,
36
- smartLinks = props.smartLinks;
36
+ smartLinks = props.smartLinks,
37
+ isNodeNested = props.isNodeNested;
37
38
  var _ref = smartLinks || {},
38
39
  showServerActions = _ref.showServerActions;
39
40
  var onClick = (0, _getCardClickHandler.getCardClickHandler)(eventHandlers, url);
@@ -93,8 +94,9 @@ function BlockCard(props) {
93
94
  var width = _ref5.width;
94
95
  return (0, _react2.jsx)("div", {
95
96
  css: datasourceContainerStyle,
97
+ "data-testid": "renderer-datasource-table",
96
98
  style: {
97
- width: (0, _utils2.calcBreakoutWidth)(layout, width)
99
+ width: isNodeNested ? '100%' : (0, _utils2.calcBreakoutWidth)(layout, width)
98
100
  }
99
101
  }, (0, _react2.jsx)(_linkDatasource.DatasourceTableView, {
100
102
  datasourceId: datasource.id,
@@ -54,7 +54,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
54
54
  var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
55
55
  var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
56
56
  var packageName = "@atlaskit/renderer";
57
- var packageVersion = "109.1.4";
57
+ var packageVersion = "109.1.5";
58
58
  var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
59
59
  (0, _inherits2.default)(Renderer, _PureComponent);
60
60
  var _super = _createSuper(Renderer);
@@ -200,6 +200,8 @@ export default class ReactSerializer {
200
200
  return this.getTaskItemProps(node, path);
201
201
  case 'embedCard':
202
202
  return this.getEmbedCardProps(node, path);
203
+ case 'blockCard':
204
+ return this.getBlockCardProps(node, path);
203
205
  case 'expand':
204
206
  return this.getExpandProps(node, path);
205
207
  case 'unsupportedBlock':
@@ -371,6 +373,12 @@ export default class ReactSerializer {
371
373
  isInsideOfBlockNode
372
374
  };
373
375
  }
376
+ getBlockCardProps(node, path = []) {
377
+ return {
378
+ ...this.getProps(node),
379
+ isNodeNested: path.length > 0
380
+ };
381
+ }
374
382
  getMediaGroupProps(node) {
375
383
  var _this$media2, _this$media3;
376
384
  return {
@@ -27,7 +27,8 @@ export default function BlockCard(props) {
27
27
  eventHandlers,
28
28
  portal,
29
29
  rendererAppearance,
30
- smartLinks
30
+ smartLinks,
31
+ isNodeNested
31
32
  } = props;
32
33
  const {
33
34
  showServerActions
@@ -84,8 +85,9 @@ export default function BlockCard(props) {
84
85
  width
85
86
  }) => jsx("div", {
86
87
  css: datasourceContainerStyle,
88
+ "data-testid": "renderer-datasource-table",
87
89
  style: {
88
- width: calcBreakoutWidth(layout, width)
90
+ width: isNodeNested ? '100%' : calcBreakoutWidth(layout, width)
89
91
  }
90
92
  }, jsx(DatasourceTableView, {
91
93
  datasourceId: datasource.id,
@@ -35,7 +35,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
35
35
  export const NORMAL_SEVERITY_THRESHOLD = 2000;
36
36
  export const DEGRADED_SEVERITY_THRESHOLD = 3000;
37
37
  const packageName = "@atlaskit/renderer";
38
- const packageVersion = "109.1.4";
38
+ const packageVersion = "109.1.5";
39
39
  export class Renderer extends PureComponent {
40
40
  constructor(props) {
41
41
  super(props);
@@ -212,6 +212,8 @@ var ReactSerializer = /*#__PURE__*/function () {
212
212
  return this.getTaskItemProps(node, path);
213
213
  case 'embedCard':
214
214
  return this.getEmbedCardProps(node, path);
215
+ case 'blockCard':
216
+ return this.getBlockCardProps(node, path);
215
217
  case 'expand':
216
218
  return this.getExpandProps(node, path);
217
219
  case 'unsupportedBlock':
@@ -417,6 +419,14 @@ var ReactSerializer = /*#__PURE__*/function () {
417
419
  isInsideOfBlockNode: isInsideOfBlockNode
418
420
  });
419
421
  }
422
+ }, {
423
+ key: "getBlockCardProps",
424
+ value: function getBlockCardProps(node) {
425
+ var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
426
+ return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
427
+ isNodeNested: path.length > 0
428
+ });
429
+ }
420
430
  }, {
421
431
  key: "getMediaGroupProps",
422
432
  value: function getMediaGroupProps(node) {
@@ -26,7 +26,8 @@ export default function BlockCard(props) {
26
26
  eventHandlers = props.eventHandlers,
27
27
  portal = props.portal,
28
28
  rendererAppearance = props.rendererAppearance,
29
- smartLinks = props.smartLinks;
29
+ smartLinks = props.smartLinks,
30
+ isNodeNested = props.isNodeNested;
30
31
  var _ref = smartLinks || {},
31
32
  showServerActions = _ref.showServerActions;
32
33
  var onClick = getCardClickHandler(eventHandlers, url);
@@ -86,8 +87,9 @@ export default function BlockCard(props) {
86
87
  var width = _ref5.width;
87
88
  return jsx("div", {
88
89
  css: datasourceContainerStyle,
90
+ "data-testid": "renderer-datasource-table",
89
91
  style: {
90
- width: calcBreakoutWidth(layout, width)
92
+ width: isNodeNested ? '100%' : calcBreakoutWidth(layout, width)
91
93
  }
92
94
  }, jsx(DatasourceTableView, {
93
95
  datasourceId: datasource.id,
@@ -45,7 +45,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
45
45
  export var NORMAL_SEVERITY_THRESHOLD = 2000;
46
46
  export var DEGRADED_SEVERITY_THRESHOLD = 3000;
47
47
  var packageName = "@atlaskit/renderer";
48
- var packageVersion = "109.1.4";
48
+ var packageVersion = "109.1.5";
49
49
  export var Renderer = /*#__PURE__*/function (_PureComponent) {
50
50
  _inherits(Renderer, _PureComponent);
51
51
  var _super = _createSuper(Renderer);
@@ -101,6 +101,7 @@ export default class ReactSerializer implements Serializer<JSX.Element> {
101
101
  private getMediaProps;
102
102
  private getEmojiProps;
103
103
  private getEmbedCardProps;
104
+ private getBlockCardProps;
104
105
  private getMediaGroupProps;
105
106
  private getMediaInlineProps;
106
107
  private getTaskItemProps;
@@ -12,4 +12,5 @@ export default function BlockCard(props: {
12
12
  rendererAppearance?: RendererAppearance;
13
13
  smartLinks?: SmartLinksOptions;
14
14
  layout?: string;
15
+ isNodeNested?: boolean;
15
16
  }): jsx.JSX.Element;
@@ -61,6 +61,7 @@ declare const BlockCard: React.ComponentType<{
61
61
  rendererAppearance?: import("../../ui/Renderer/types").RendererAppearance;
62
62
  smartLinks?: import("../../types/smartLinksOptions").SmartLinksOptions | undefined;
63
63
  layout?: string | undefined;
64
+ isNodeNested?: boolean | undefined;
64
65
  }> & Loadable.LoadableComponent;
65
66
  declare const Media: React.ComponentType<import("./media").MediaProps> & Loadable.LoadableComponent;
66
67
  declare const MediaGroup: React.ComponentType<import("./mediaGroup").MediaGroupProps> & Loadable.LoadableComponent;
@@ -101,6 +101,7 @@ export default class ReactSerializer implements Serializer<JSX.Element> {
101
101
  private getMediaProps;
102
102
  private getEmojiProps;
103
103
  private getEmbedCardProps;
104
+ private getBlockCardProps;
104
105
  private getMediaGroupProps;
105
106
  private getMediaInlineProps;
106
107
  private getTaskItemProps;
@@ -12,4 +12,5 @@ export default function BlockCard(props: {
12
12
  rendererAppearance?: RendererAppearance;
13
13
  smartLinks?: SmartLinksOptions;
14
14
  layout?: string;
15
+ isNodeNested?: boolean;
15
16
  }): jsx.JSX.Element;
@@ -61,6 +61,7 @@ declare const BlockCard: React.ComponentType<{
61
61
  rendererAppearance?: import("../../ui/Renderer/types").RendererAppearance;
62
62
  smartLinks?: import("../../types/smartLinksOptions").SmartLinksOptions | undefined;
63
63
  layout?: string | undefined;
64
+ isNodeNested?: boolean | undefined;
64
65
  }> & Loadable.LoadableComponent;
65
66
  declare const Media: React.ComponentType<import("./media").MediaProps> & Loadable.LoadableComponent;
66
67
  declare const MediaGroup: React.ComponentType<import("./mediaGroup").MediaGroupProps> & Loadable.LoadableComponent;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/renderer",
3
- "version": "109.1.4",
3
+ "version": "109.1.5",
4
4
  "description": "Renderer component",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -32,7 +32,7 @@
32
32
  "@atlaskit/analytics-next": "^9.1.0",
33
33
  "@atlaskit/button": "^17.1.0",
34
34
  "@atlaskit/code": "^15.1.0",
35
- "@atlaskit/editor-common": "^76.29.0",
35
+ "@atlaskit/editor-common": "^76.31.0",
36
36
  "@atlaskit/editor-json-transformer": "^8.10.0",
37
37
  "@atlaskit/editor-palette": "1.5.2",
38
38
  "@atlaskit/editor-prosemirror": "1.1.0",