@atlaskit/renderer 112.7.7 → 112.7.8

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/renderer
 
+## 112.7.8
+
+### Patch Changes
+
+- [#181016](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/181016)
+  [`fb9a503ee55c3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fb9a503ee55c3) -
+  Add new `getColumnWidths` function which will loop through each table row, looking for the max
+  number of table cells to use to render the table correctly when table resizing is enabled.
+
 ## 112.7.7
 
 ### Patch Changes

package/dist/cjs/react/index.js

@@ -22,6 +22,7 @@ var _validator = require("@atlaskit/editor-common/validator");
 var _utils = require("@atlaskit/editor-common/utils");
 var _utils2 = require("../utils");
 var _utils3 = require("@atlaskit/editor-prosemirror/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _rendererNode = require("./renderer-node");
 var _code = require("./marks/code");
 var _segmentText = require("./utils/segment-text");
@@ -367,7 +368,11 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
       var isInsideMultiBodiedExtension = (0, _rendererNode.insideMultiBodiedExtension)(path, node.type.schema);
       return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
         allowColumnSorting: this.allowColumnSorting,
-        columnWidths: (0, _utils.calcTableColumnWidths)(node),
+        columnWidths:
+        // When allowTableResizing is enabled, the number of columns is required to render
+        // the same scaling logic as editor. Some tables can have unequal rows, so the entire
+        // table needs to be scanned.
+        this.allowTableResizing && (0, _platformFeatureFlags.fg)('platform_editor_table_col_calculation_fix') ? (0, _utils.getColumnWidths)(node) : (0, _utils.calcTableColumnWidths)(node),
         tableNode: node,
         stickyHeaders: stickyHeaders,
         isInsideOfBlockNode: isInsideOfBlockNode,

package/dist/cjs/ui/Renderer/index.js

@@ -64,7 +64,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "112.7.7";
+var packageVersion = "112.7.8";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

package/dist/es2019/react/index.js

@@ -8,9 +8,10 @@ import { Doc, DocWithSelectAllTrap, mergeTextNodes, isTextWrapper, isTextNode, t
 import TextWrapperComponent from './nodes/text-wrapper';
 import { toReact as markToReact, isAnnotationMark } from './marks';
 import { getMarksByOrder, isSameMark } from '@atlaskit/editor-common/validator';
-import { calcTableColumnWidths } from '@atlaskit/editor-common/utils';
+import { calcTableColumnWidths, getColumnWidths } from '@atlaskit/editor-common/utils';
 import { getText } from '../utils';
 import { findChildrenByType } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { insideBlockNode, insideBreakoutLayout, insideMultiBodiedExtension } from './renderer-node';
 import { isCodeMark } from './marks/code';
 import { segmentText } from './utils/segment-text';
@@ -329,7 +330,11 @@ export default class ReactSerializer {
     return {
       ...this.getProps(node),
       allowColumnSorting: this.allowColumnSorting,
-      columnWidths: calcTableColumnWidths(node),
+      columnWidths:
+      // When allowTableResizing is enabled, the number of columns is required to render
+      // the same scaling logic as editor. Some tables can have unequal rows, so the entire
+      // table needs to be scanned.
+      this.allowTableResizing && fg('platform_editor_table_col_calculation_fix') ? getColumnWidths(node) : calcTableColumnWidths(node),
       tableNode: node,
       stickyHeaders,
       isInsideOfBlockNode,

package/dist/es2019/ui/Renderer/index.js

@@ -45,7 +45,7 @@ import { TruncatedWrapper } from './truncated-wrapper';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "112.7.7";
+const packageVersion = "112.7.8";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

package/dist/esm/react/index.js

@@ -15,9 +15,10 @@ import { Doc, DocWithSelectAllTrap, mergeTextNodes, isTextWrapper, isTextNode, t
 import TextWrapperComponent from './nodes/text-wrapper';
 import { toReact as markToReact, isAnnotationMark } from './marks';
 import { getMarksByOrder, isSameMark } from '@atlaskit/editor-common/validator';
-import { calcTableColumnWidths } from '@atlaskit/editor-common/utils';
+import { calcTableColumnWidths, getColumnWidths } from '@atlaskit/editor-common/utils';
 import { getText } from '../utils';
 import { findChildrenByType } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { insideBlockNode, insideBreakoutLayout, insideMultiBodiedExtension } from './renderer-node';
 import { isCodeMark } from './marks/code';
 import { segmentText } from './utils/segment-text';
@@ -360,7 +361,11 @@ var ReactSerializer = /*#__PURE__*/function () {
       var isInsideMultiBodiedExtension = insideMultiBodiedExtension(path, node.type.schema);
       return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
         allowColumnSorting: this.allowColumnSorting,
-        columnWidths: calcTableColumnWidths(node),
+        columnWidths:
+        // When allowTableResizing is enabled, the number of columns is required to render
+        // the same scaling logic as editor. Some tables can have unequal rows, so the entire
+        // table needs to be scanned.
+        this.allowTableResizing && fg('platform_editor_table_col_calculation_fix') ? getColumnWidths(node) : calcTableColumnWidths(node),
         tableNode: node,
         stickyHeaders: stickyHeaders,
         isInsideOfBlockNode: isInsideOfBlockNode,

package/dist/esm/ui/Renderer/index.js

@@ -54,7 +54,7 @@ import { TruncatedWrapper } from './truncated-wrapper';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "112.7.7";
+var packageVersion = "112.7.8";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "112.7.7",
+	"version": "112.7.8",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,7 +29,7 @@
 		"@atlaskit/analytics-next": "^10.2.0",
 		"@atlaskit/button": "^20.3.0",
 		"@atlaskit/code": "^15.6.0",
-		"@atlaskit/editor-common": "^96.5.0",
+		"@atlaskit/editor-common": "^96.6.0",
 		"@atlaskit/editor-json-transformer": "^8.21.0",
 		"@atlaskit/editor-palette": "1.6.3",
 		"@atlaskit/editor-prosemirror": "6.2.1",
@@ -50,7 +50,7 @@
 		"@atlaskit/status": "^1.8.0",
 		"@atlaskit/task-decision": "^17.11.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.27.0",
+		"@atlaskit/tmp-editor-statsig": "^2.28.0",
 		"@atlaskit/tokens": "^2.5.0",
 		"@atlaskit/tooltip": "^19.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -167,6 +167,13 @@
 		},
 		"confluence-frontend-comments-panel": {
 			"type": "boolean"
+		},
+		"platform_editor_table_row_span_fix": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
+		"platform_editor_table_col_calculation_fix": {
+			"type": "boolean"
 		}
 	},
 	"af:exports": {