@atlaskit/renderer 109.8.2 → 109.8.4

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 (8) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/dist/cjs/react/nodes/blockCard.js +10 -3
  3. package/dist/cjs/ui/Renderer/index.js +6 -4
  4. package/dist/es2019/react/nodes/blockCard.js +6 -3
  5. package/dist/es2019/ui/Renderer/index.js +6 -4
  6. package/dist/esm/react/nodes/blockCard.js +10 -3
  7. package/dist/esm/ui/Renderer/index.js +6 -4
  8. package/package.json +6 -6
package/CHANGELOG.md CHANGED
@@ -1,5 +1,18 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 109.8.4
4
+
5
+ ### Patch Changes
6
+
7
+ - [#76893](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/76893) [`8d781cb52f84`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8d781cb52f84) - [ux] Add support for datasource column wrapping controls
8
+ - Updated dependencies
9
+
10
+ ## 109.8.3
11
+
12
+ ### Patch Changes
13
+
14
+ - [#81759](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/81759) [`912bb3a58129`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/912bb3a58129) - fix regression issue of WidthProvider in renderer used when hover template marco inline extension
15
+
3
16
  ## 109.8.2
4
17
 
5
18
  ### Patch Changes
package/dist/cjs/react/nodes/blockCard.js CHANGED
@@ -75,12 +75,13 @@ function BlockCard(props) {
75
75
  });
76
76
  var shouldRenderDatasource = tableView && (0, _utils2.canRenderDatasource)(props.datasource.id);
77
77
  if (shouldRenderDatasource) {
78
- var _tableView$properties, _tableView$properties2;
79
- var visibleColumnKeys = (_tableView$properties = tableView.properties) === null || _tableView$properties === void 0 ? void 0 : _tableView$properties.columns.map(function (_ref3) {
78
+ var _tableView$properties;
79
+ var columns = (_tableView$properties = tableView.properties) === null || _tableView$properties === void 0 ? void 0 : _tableView$properties.columns;
80
+ var visibleColumnKeys = columns === null || columns === void 0 ? void 0 : columns.map(function (_ref3) {
80
81
  var key = _ref3.key;
81
82
  return key;
82
83
  });
83
- var columnCustomSizesEntries = (_tableView$properties2 = tableView.properties) === null || _tableView$properties2 === void 0 ? void 0 : _tableView$properties2.columns.filter(function (c) {
84
+ var columnCustomSizesEntries = columns === null || columns === void 0 ? void 0 : columns.filter(function (c) {
84
85
  return !!c.width;
85
86
  }).map(function (_ref4) {
86
87
  var key = _ref4.key,
@@ -88,6 +89,11 @@ function BlockCard(props) {
88
89
  return [key, width];
89
90
  });
90
91
  var columnCustomSizes = columnCustomSizesEntries !== null && columnCustomSizesEntries !== void 0 && columnCustomSizesEntries.length ? Object.fromEntries(columnCustomSizesEntries) : undefined;
92
+ var wrappedColumnKeys = columns === null || columns === void 0 ? void 0 : columns.filter(function (c) {
93
+ return c.isWrapped;
94
+ }).map(function (c) {
95
+ return c.key;
96
+ });
91
97
  var datasource = props.datasource,
92
98
  layout = props.layout;
93
99
  return (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
@@ -110,6 +116,7 @@ function BlockCard(props) {
110
116
  parameters: datasource.parameters,
111
117
  visibleColumnKeys: visibleColumnKeys,
112
118
  columnCustomSizes: columnCustomSizes,
119
+ wrappedColumnKeys: wrappedColumnKeys && wrappedColumnKeys.length > 0 ? wrappedColumnKeys : undefined,
113
120
  url: url
114
121
  })));
115
122
  })));
package/dist/cjs/ui/Renderer/index.js CHANGED
@@ -55,7 +55,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
55
55
  var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
56
56
  var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
57
57
  var packageName = "@atlaskit/renderer";
58
- var packageVersion = "109.8.2";
58
+ var packageVersion = "109.8.4";
59
59
  var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
60
60
  (0, _inherits2.default)(Renderer, _PureComponent);
61
61
  var _super = _createSuper(Renderer);
@@ -387,7 +387,8 @@ var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
387
387
  innerRef: this.editorRef,
388
388
  onClick: handleWrapperOnClick,
389
389
  onMouseDown: this.onMouseDownEditView,
390
- ssr: media === null || media === void 0 ? void 0 : media.ssr
390
+ ssr: media === null || media === void 0 ? void 0 : media.ssr,
391
+ isInsideOfInlineExtension: this.props.isInsideOfInlineExtension
391
392
  }, enableSsrInlineScripts ? (0, _react2.jsx)(_breakoutSsr.BreakoutSSRInlineScript, null) : null, (0, _react2.jsx)(RendererActionsInternalUpdater, {
392
393
  doc: pmDoc,
393
394
  schema: schema,
@@ -474,7 +475,8 @@ var RendererWrapper = /*#__PURE__*/_react.default.memo(function (props) {
474
475
  onMouseDown = props.onMouseDown,
475
476
  useBlockRenderForCodeBlock = props.useBlockRenderForCodeBlock,
476
477
  addTelepointer = props.addTelepointer,
477
- ssr = props.ssr;
478
+ ssr = props.ssr,
479
+ isInsideOfInlineExtension = props.isInsideOfInlineExtension;
478
480
  var createTelepointer = function createTelepointer() {
479
481
  var telepointer = document.createElement('span');
480
482
  telepointer.textContent = "\u200B";
@@ -529,7 +531,7 @@ var RendererWrapper = /*#__PURE__*/_react.default.memo(function (props) {
529
531
  return (0, _react2.jsx)(_ui.WidthProvider, {
530
532
  className: "ak-renderer-wrapper is-".concat(appearance),
531
533
  "data-appearance": appearance,
532
- shouldCheckExistingValue: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.inline_extension.extended_lcqdn') || false
534
+ shouldCheckExistingValue: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.inline_extension.extended_lcqdn') && isInsideOfInlineExtension
533
535
  }, (0, _react2.jsx)(_ui.BaseTheme, {
534
536
  baseFontSize: appearance && appearance !== 'comment' ? _editorSharedStyles.akEditorFullPageDefaultFontSize : undefined
535
537
  }, (0, _react2.jsx)(_EditorMediaClientProvider.EditorMediaClientProvider, {
package/dist/es2019/react/nodes/blockCard.js CHANGED
@@ -67,15 +67,17 @@ export default function BlockCard(props) {
67
67
  const tableView = views.find(view => view.type === 'table');
68
68
  const shouldRenderDatasource = tableView && canRenderDatasource(props.datasource.id);
69
69
  if (shouldRenderDatasource) {
70
- var _tableView$properties, _tableView$properties2;
71
- const visibleColumnKeys = (_tableView$properties = tableView.properties) === null || _tableView$properties === void 0 ? void 0 : _tableView$properties.columns.map(({
70
+ var _tableView$properties;
71
+ const columns = (_tableView$properties = tableView.properties) === null || _tableView$properties === void 0 ? void 0 : _tableView$properties.columns;
72
+ const visibleColumnKeys = columns === null || columns === void 0 ? void 0 : columns.map(({
72
73
  key
73
74
  }) => key);
74
- const columnCustomSizesEntries = (_tableView$properties2 = tableView.properties) === null || _tableView$properties2 === void 0 ? void 0 : _tableView$properties2.columns.filter(c => !!c.width).map(({
75
+ const columnCustomSizesEntries = columns === null || columns === void 0 ? void 0 : columns.filter(c => !!c.width).map(({
75
76
  key,
76
77
  width
77
78
  }) => [key, width]);
78
79
  const columnCustomSizes = columnCustomSizesEntries !== null && columnCustomSizesEntries !== void 0 && columnCustomSizesEntries.length ? Object.fromEntries(columnCustomSizesEntries) : undefined;
80
+ const wrappedColumnKeys = columns === null || columns === void 0 ? void 0 : columns.filter(c => c.isWrapped).map(c => c.key);
79
81
  const {
80
82
  datasource,
81
83
  layout
@@ -100,6 +102,7 @@ export default function BlockCard(props) {
100
102
  parameters: datasource.parameters,
101
103
  visibleColumnKeys: visibleColumnKeys,
102
104
  columnCustomSizes: columnCustomSizes,
105
+ wrappedColumnKeys: wrappedColumnKeys && wrappedColumnKeys.length > 0 ? wrappedColumnKeys : undefined,
103
106
  url: url
104
107
  }))))));
105
108
  }
package/dist/es2019/ui/Renderer/index.js CHANGED
@@ -36,7 +36,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
36
36
  export const NORMAL_SEVERITY_THRESHOLD = 2000;
37
37
  export const DEGRADED_SEVERITY_THRESHOLD = 3000;
38
38
  const packageName = "@atlaskit/renderer";
39
- const packageVersion = "109.8.2";
39
+ const packageVersion = "109.8.4";
40
40
  export class Renderer extends PureComponent {
41
41
  constructor(props) {
42
42
  super(props);
@@ -363,7 +363,8 @@ export class Renderer extends PureComponent {
363
363
  innerRef: this.editorRef,
364
364
  onClick: handleWrapperOnClick,
365
365
  onMouseDown: this.onMouseDownEditView,
366
- ssr: media === null || media === void 0 ? void 0 : media.ssr
366
+ ssr: media === null || media === void 0 ? void 0 : media.ssr,
367
+ isInsideOfInlineExtension: this.props.isInsideOfInlineExtension
367
368
  }, enableSsrInlineScripts ? jsx(BreakoutSSRInlineScript, null) : null, jsx(RendererActionsInternalUpdater, {
368
369
  doc: pmDoc,
369
370
  schema: schema,
@@ -447,7 +448,8 @@ const RendererWrapper = /*#__PURE__*/React.memo(props => {
447
448
  onMouseDown,
448
449
  useBlockRenderForCodeBlock,
449
450
  addTelepointer,
450
- ssr
451
+ ssr,
452
+ isInsideOfInlineExtension
451
453
  } = props;
452
454
  const createTelepointer = () => {
453
455
  const telepointer = document.createElement('span');
@@ -501,7 +503,7 @@ const RendererWrapper = /*#__PURE__*/React.memo(props => {
501
503
  return jsx(WidthProvider, {
502
504
  className: `ak-renderer-wrapper is-${appearance}`,
503
505
  "data-appearance": appearance,
504
- shouldCheckExistingValue: getBooleanFF('platform.editor.inline_extension.extended_lcqdn') || false
506
+ shouldCheckExistingValue: getBooleanFF('platform.editor.inline_extension.extended_lcqdn') && isInsideOfInlineExtension
505
507
  }, jsx(BaseTheme, {
506
508
  baseFontSize: appearance && appearance !== 'comment' ? akEditorFullPageDefaultFontSize : undefined
507
509
  }, jsx(EditorMediaClientProvider, {
package/dist/esm/react/nodes/blockCard.js CHANGED
@@ -67,12 +67,13 @@ export default function BlockCard(props) {
67
67
  });
68
68
  var shouldRenderDatasource = tableView && canRenderDatasource(props.datasource.id);
69
69
  if (shouldRenderDatasource) {
70
- var _tableView$properties, _tableView$properties2;
71
- var visibleColumnKeys = (_tableView$properties = tableView.properties) === null || _tableView$properties === void 0 ? void 0 : _tableView$properties.columns.map(function (_ref3) {
70
+ var _tableView$properties;
71
+ var columns = (_tableView$properties = tableView.properties) === null || _tableView$properties === void 0 ? void 0 : _tableView$properties.columns;
72
+ var visibleColumnKeys = columns === null || columns === void 0 ? void 0 : columns.map(function (_ref3) {
72
73
  var key = _ref3.key;
73
74
  return key;
74
75
  });
75
- var columnCustomSizesEntries = (_tableView$properties2 = tableView.properties) === null || _tableView$properties2 === void 0 ? void 0 : _tableView$properties2.columns.filter(function (c) {
76
+ var columnCustomSizesEntries = columns === null || columns === void 0 ? void 0 : columns.filter(function (c) {
76
77
  return !!c.width;
77
78
  }).map(function (_ref4) {
78
79
  var key = _ref4.key,
@@ -80,6 +81,11 @@ export default function BlockCard(props) {
80
81
  return [key, width];
81
82
  });
82
83
  var columnCustomSizes = columnCustomSizesEntries !== null && columnCustomSizesEntries !== void 0 && columnCustomSizesEntries.length ? Object.fromEntries(columnCustomSizesEntries) : undefined;
84
+ var wrappedColumnKeys = columns === null || columns === void 0 ? void 0 : columns.filter(function (c) {
85
+ return c.isWrapped;
86
+ }).map(function (c) {
87
+ return c.key;
88
+ });
83
89
  var datasource = props.datasource,
84
90
  layout = props.layout;
85
91
  return jsx(AnalyticsContext, {
@@ -102,6 +108,7 @@ export default function BlockCard(props) {
102
108
  parameters: datasource.parameters,
103
109
  visibleColumnKeys: visibleColumnKeys,
104
110
  columnCustomSizes: columnCustomSizes,
111
+ wrappedColumnKeys: wrappedColumnKeys && wrappedColumnKeys.length > 0 ? wrappedColumnKeys : undefined,
105
112
  url: url
106
113
  })));
107
114
  })));
package/dist/esm/ui/Renderer/index.js CHANGED
@@ -46,7 +46,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
46
46
  export var NORMAL_SEVERITY_THRESHOLD = 2000;
47
47
  export var DEGRADED_SEVERITY_THRESHOLD = 3000;
48
48
  var packageName = "@atlaskit/renderer";
49
- var packageVersion = "109.8.2";
49
+ var packageVersion = "109.8.4";
50
50
  export var Renderer = /*#__PURE__*/function (_PureComponent) {
51
51
  _inherits(Renderer, _PureComponent);
52
52
  var _super = _createSuper(Renderer);
@@ -378,7 +378,8 @@ export var Renderer = /*#__PURE__*/function (_PureComponent) {
378
378
  innerRef: this.editorRef,
379
379
  onClick: handleWrapperOnClick,
380
380
  onMouseDown: this.onMouseDownEditView,
381
- ssr: media === null || media === void 0 ? void 0 : media.ssr
381
+ ssr: media === null || media === void 0 ? void 0 : media.ssr,
382
+ isInsideOfInlineExtension: this.props.isInsideOfInlineExtension
382
383
  }, enableSsrInlineScripts ? jsx(BreakoutSSRInlineScript, null) : null, jsx(RendererActionsInternalUpdater, {
383
384
  doc: pmDoc,
384
385
  schema: schema,
@@ -465,7 +466,8 @@ var RendererWrapper = /*#__PURE__*/React.memo(function (props) {
465
466
  onMouseDown = props.onMouseDown,
466
467
  useBlockRenderForCodeBlock = props.useBlockRenderForCodeBlock,
467
468
  addTelepointer = props.addTelepointer,
468
- ssr = props.ssr;
469
+ ssr = props.ssr,
470
+ isInsideOfInlineExtension = props.isInsideOfInlineExtension;
469
471
  var createTelepointer = function createTelepointer() {
470
472
  var telepointer = document.createElement('span');
471
473
  telepointer.textContent = "\u200B";
@@ -520,7 +522,7 @@ var RendererWrapper = /*#__PURE__*/React.memo(function (props) {
520
522
  return jsx(WidthProvider, {
521
523
  className: "ak-renderer-wrapper is-".concat(appearance),
522
524
  "data-appearance": appearance,
523
- shouldCheckExistingValue: getBooleanFF('platform.editor.inline_extension.extended_lcqdn') || false
525
+ shouldCheckExistingValue: getBooleanFF('platform.editor.inline_extension.extended_lcqdn') && isInsideOfInlineExtension
524
526
  }, jsx(BaseTheme, {
525
527
  baseFontSize: appearance && appearance !== 'comment' ? akEditorFullPageDefaultFontSize : undefined
526
528
  }, jsx(EditorMediaClientProvider, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/renderer",
3
- "version": "109.8.2",
3
+ "version": "109.8.4",
4
4
  "description": "Renderer component",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -31,23 +31,23 @@
31
31
  "@atlaskit/analytics-next": "^9.2.0",
32
32
  "@atlaskit/button": "^17.7.0",
33
33
  "@atlaskit/code": "^15.1.0",
34
- "@atlaskit/editor-common": "^78.13.0",
34
+ "@atlaskit/editor-common": "^78.14.0",
35
35
  "@atlaskit/editor-json-transformer": "^8.10.0",
36
36
  "@atlaskit/editor-palette": "1.5.2",
37
37
  "@atlaskit/editor-prosemirror": "3.0.0",
38
38
  "@atlaskit/editor-shared-styles": "^2.9.0",
39
39
  "@atlaskit/emoji": "^67.6.0",
40
40
  "@atlaskit/icon": "^22.1.0",
41
- "@atlaskit/link-datasource": "^1.23.0",
41
+ "@atlaskit/link-datasource": "^1.24.0",
42
42
  "@atlaskit/media-card": "^77.10.0",
43
43
  "@atlaskit/media-client": "^26.2.0",
44
44
  "@atlaskit/media-client-react": "^2.0.0",
45
- "@atlaskit/media-common": "^11.0.0",
45
+ "@atlaskit/media-common": "^11.1.0",
46
46
  "@atlaskit/media-filmstrip": "^47.0.0",
47
47
  "@atlaskit/media-ui": "^25.4.0",
48
48
  "@atlaskit/media-viewer": "^48.3.0",
49
49
  "@atlaskit/platform-feature-flags": "^0.2.0",
50
- "@atlaskit/smart-card": "^26.49.0",
50
+ "@atlaskit/smart-card": "^26.50.0",
51
51
  "@atlaskit/status": "^1.4.0",
52
52
  "@atlaskit/task-decision": "^17.9.0",
53
53
  "@atlaskit/theme": "^12.6.0",
@@ -75,7 +75,7 @@
75
75
  "@atlaskit/editor-test-helpers": "^18.14.0",
76
76
  "@atlaskit/link-provider": "^1.8.0",
77
77
  "@atlaskit/link-test-helpers": "^6.2.0",
78
- "@atlaskit/linking-common": "^5.4.0",
78
+ "@atlaskit/linking-common": "^5.5.0",
79
79
  "@atlaskit/media-core": "^34.2.0",
80
80
  "@atlaskit/media-integration-test-helpers": "^3.0.0",
81
81
  "@atlaskit/media-test-helpers": "^33.0.0",