@atlaskit/renderer 109.30.2 → 109.31.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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 109.31.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [#107304](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/107304)
8
+ [`1ced2f2b9b2d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1ced2f2b9b2d) -
9
+ Add display mode and layout to table node to support copy paste from renderer to editor
10
+
11
+ ## 109.31.0
12
+
13
+ ### Minor Changes
14
+
15
+ - [#104585](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/104585)
16
+ [`901f576c6ea3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/901f576c6ea3) -
17
+ [ux] Insert Excerpt should not be showing comment badge with FF
18
+
3
19
  ## 109.30.2
4
20
 
5
21
  ### Patch Changes
@@ -223,7 +223,8 @@ var Media = /*#__PURE__*/function (_PureComponent) {
223
223
  var eventHandlers = linkHref ? undefined : _this.props.eventHandlers;
224
224
  var shouldOpenMediaViewer = !linkHref && allowMediaViewer;
225
225
  var isInPageInclude = mediaSingleElement === null || mediaSingleElement === void 0 ? void 0 : mediaSingleElement.closest('[data-node-type="include"]');
226
- var showCommentBadge = !!annotationMarks && (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMedia) && (!(featureFlags !== null && featureFlags !== void 0 && featureFlags.commentsOnMediaIncludePage) || !isInPageInclude);
226
+ var isIncludeExcerpt = !!(mediaSingleElement !== null && mediaSingleElement !== void 0 && mediaSingleElement.closest('.ak-excerpt-include'));
227
+ var showCommentBadge = !!annotationMarks && (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMedia) && (!(featureFlags !== null && featureFlags !== void 0 && featureFlags.commentsOnMediaIncludePage) || !isInPageInclude) && (!(featureFlags !== null && featureFlags !== void 0 && featureFlags.commentsOnMediaInsertExcerpt) || !isIncludeExcerpt);
227
228
  return (0, _react2.jsx)(MediaLink, {
228
229
  mark: linkMark,
229
230
  onClick: _this.handleMediaLinkClickFn
@@ -21,10 +21,14 @@ var Table = exports.Table = /*#__PURE__*/_react.default.memo(function (_ref) {
21
21
  isInsideOfBlockNode = _ref.isInsideOfBlockNode,
22
22
  isinsideMultiBodiedExtension = _ref.isinsideMultiBodiedExtension;
23
23
  var tableWidth = tableNode ? (0, _nodeWidth.getTableContainerWidth)(tableNode) : _editorSharedStyles.akEditorDefaultLayoutWidth;
24
+ var tableLayout = tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.layout;
25
+ var tableDisplayMode = tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.displayMode;
24
26
  return /*#__PURE__*/_react.default.createElement("table", {
25
27
  "data-testid": "renderer-table",
26
28
  "data-number-column": isNumberColumnEnabled,
27
29
  "data-table-width": tableWidth,
30
+ "data-layout": tableLayout,
31
+ "data-table-display-mode": tableDisplayMode,
28
32
  ref: innerRef
29
33
  }, /*#__PURE__*/_react.default.createElement(_colgroup.Colgroup, {
30
34
  columnWidths: columnWidths,
@@ -56,7 +56,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
56
56
  var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
57
57
  var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
58
58
  var packageName = "@atlaskit/renderer";
59
- var packageVersion = "109.30.2";
59
+ var packageVersion = "109.31.1";
60
60
  var defaultNodeComponents = exports.defaultNodeComponents = _nodes.nodeToReact;
61
61
  var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
62
62
  (0, _inherits2.default)(Renderer, _PureComponent);
@@ -201,7 +201,8 @@ class Media extends PureComponent {
201
201
  const eventHandlers = linkHref ? undefined : this.props.eventHandlers;
202
202
  const shouldOpenMediaViewer = !linkHref && allowMediaViewer;
203
203
  const isInPageInclude = mediaSingleElement === null || mediaSingleElement === void 0 ? void 0 : mediaSingleElement.closest('[data-node-type="include"]');
204
- const showCommentBadge = !!annotationMarks && (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMedia) && (!(featureFlags !== null && featureFlags !== void 0 && featureFlags.commentsOnMediaIncludePage) || !isInPageInclude);
204
+ const isIncludeExcerpt = !!(mediaSingleElement !== null && mediaSingleElement !== void 0 && mediaSingleElement.closest('.ak-excerpt-include'));
205
+ const showCommentBadge = !!annotationMarks && (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMedia) && (!(featureFlags !== null && featureFlags !== void 0 && featureFlags.commentsOnMediaIncludePage) || !isInPageInclude) && (!(featureFlags !== null && featureFlags !== void 0 && featureFlags.commentsOnMediaInsertExcerpt) || !isIncludeExcerpt);
205
206
  return jsx(MediaLink, {
206
207
  mark: linkMark,
207
208
  onClick: this.handleMediaLinkClickFn
@@ -15,10 +15,14 @@ export const Table = /*#__PURE__*/React.memo(({
15
15
  isinsideMultiBodiedExtension
16
16
  }) => {
17
17
  const tableWidth = tableNode ? getTableContainerWidth(tableNode) : akEditorDefaultLayoutWidth;
18
+ const tableLayout = tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.layout;
19
+ const tableDisplayMode = tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.displayMode;
18
20
  return /*#__PURE__*/React.createElement("table", {
19
21
  "data-testid": "renderer-table",
20
22
  "data-number-column": isNumberColumnEnabled,
21
23
  "data-table-width": tableWidth,
24
+ "data-layout": tableLayout,
25
+ "data-table-display-mode": tableDisplayMode,
22
26
  ref: innerRef
23
27
  }, /*#__PURE__*/React.createElement(Colgroup, {
24
28
  columnWidths: columnWidths,
@@ -37,7 +37,7 @@ import { nodeToReact } from '../../react/nodes';
37
37
  export const NORMAL_SEVERITY_THRESHOLD = 2000;
38
38
  export const DEGRADED_SEVERITY_THRESHOLD = 3000;
39
39
  const packageName = "@atlaskit/renderer";
40
- const packageVersion = "109.30.2";
40
+ const packageVersion = "109.31.1";
41
41
  export const defaultNodeComponents = nodeToReact;
42
42
  export class Renderer extends PureComponent {
43
43
  constructor(props) {
@@ -214,7 +214,8 @@ var Media = /*#__PURE__*/function (_PureComponent) {
214
214
  var eventHandlers = linkHref ? undefined : _this.props.eventHandlers;
215
215
  var shouldOpenMediaViewer = !linkHref && allowMediaViewer;
216
216
  var isInPageInclude = mediaSingleElement === null || mediaSingleElement === void 0 ? void 0 : mediaSingleElement.closest('[data-node-type="include"]');
217
- var showCommentBadge = !!annotationMarks && (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMedia) && (!(featureFlags !== null && featureFlags !== void 0 && featureFlags.commentsOnMediaIncludePage) || !isInPageInclude);
217
+ var isIncludeExcerpt = !!(mediaSingleElement !== null && mediaSingleElement !== void 0 && mediaSingleElement.closest('.ak-excerpt-include'));
218
+ var showCommentBadge = !!annotationMarks && (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMedia) && (!(featureFlags !== null && featureFlags !== void 0 && featureFlags.commentsOnMediaIncludePage) || !isInPageInclude) && (!(featureFlags !== null && featureFlags !== void 0 && featureFlags.commentsOnMediaInsertExcerpt) || !isIncludeExcerpt);
218
219
  return jsx(MediaLink, {
219
220
  mark: linkMark,
220
221
  onClick: _this.handleMediaLinkClickFn
@@ -14,10 +14,14 @@ export var Table = /*#__PURE__*/React.memo(function (_ref) {
14
14
  isInsideOfBlockNode = _ref.isInsideOfBlockNode,
15
15
  isinsideMultiBodiedExtension = _ref.isinsideMultiBodiedExtension;
16
16
  var tableWidth = tableNode ? getTableContainerWidth(tableNode) : akEditorDefaultLayoutWidth;
17
+ var tableLayout = tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.layout;
18
+ var tableDisplayMode = tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.displayMode;
17
19
  return /*#__PURE__*/React.createElement("table", {
18
20
  "data-testid": "renderer-table",
19
21
  "data-number-column": isNumberColumnEnabled,
20
22
  "data-table-width": tableWidth,
23
+ "data-layout": tableLayout,
24
+ "data-table-display-mode": tableDisplayMode,
21
25
  ref: innerRef
22
26
  }, /*#__PURE__*/React.createElement(Colgroup, {
23
27
  columnWidths: columnWidths,
@@ -47,7 +47,7 @@ import { nodeToReact } from '../../react/nodes';
47
47
  export var NORMAL_SEVERITY_THRESHOLD = 2000;
48
48
  export var DEGRADED_SEVERITY_THRESHOLD = 3000;
49
49
  var packageName = "@atlaskit/renderer";
50
- var packageVersion = "109.30.2";
50
+ var packageVersion = "109.31.1";
51
51
  export var defaultNodeComponents = nodeToReact;
52
52
  export var Renderer = /*#__PURE__*/function (_PureComponent) {
53
53
  _inherits(Renderer, _PureComponent);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/renderer",
3
- "version": "109.30.2",
3
+ "version": "109.31.1",
4
4
  "description": "Renderer component",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"