@atlaskit/renderer 112.7.7 → 112.7.9

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/renderer
 
+## 112.7.9
+
+### Patch Changes
+
+- [#181096](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/181096)
+  [`bb4dfee4e6379`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bb4dfee4e6379) -
+  ED-26079 Fix double renderer validation
+
+## 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/actions/index.js

@@ -38,13 +38,17 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
   //#region private
   return (0, _createClass2.default)(RendererActions, [{
     key: "_privateRegisterRenderer",
-    value: function _privateRegisterRenderer(ref, doc, schema, onAnalyticsEvent, skipValidation) {
+    value: function _privateRegisterRenderer(ref, doc, schema, onAnalyticsEvent) {
       if (!this.initFromContext) {
         return;
       } else if (!this.ref) {
         this.ref = ref;
       } else if (this.ref !== ref) {
-        if (!skipValidation) {
+        if ((0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro')) {
+          if (this.ref.current !== ref.current) {
+            throw new Error("Renderer has already been registered! It's not allowed to re-register with another new Renderer instance.");
+          }
+        } else {
           throw new Error("Renderer has already been registered! It's not allowed to re-register with another new Renderer instance.");
         }
       }

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.9";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',
@@ -400,8 +400,7 @@ var __RendererClassComponent = exports.__RendererClassComponent = /*#__PURE__*/f
         }, enableSsrInlineScripts ? (0, _react2.jsx)(_breakoutSsr.BreakoutSSRInlineScript, null) : null, (0, _react2.jsx)(RendererActionsInternalUpdater, {
           doc: pmDoc,
           schema: schema,
-          onAnalyticsEvent: this.fireAnalyticsEvent,
-          skipValidation: skipValidation
+          onAnalyticsEvent: this.fireAnalyticsEvent
         }, result)))))));
         var rendererResult = truncated ? (0, _react2.jsx)(_truncatedWrapper.TruncatedWrapper, {
           height: maxHeight,
@@ -752,8 +751,7 @@ var RendererFunctionalComponent = function RendererFunctionalComponent(props) {
     }, props.enableSsrInlineScripts ? (0, _react2.jsx)(_breakoutSsr.BreakoutSSRInlineScript, null) : null, (0, _react2.jsx)(RendererActionsInternalUpdater, {
       doc: pmDoc,
       schema: schema,
-      onAnalyticsEvent: _fireAnalyticsEvent,
-      skipValidation: props.skipValidation
+      onAnalyticsEvent: _fireAnalyticsEvent
     }, result)))))));
     var rendererResult = props.truncated ? (0, _react2.jsx)(_truncatedWrapper.TruncatedWrapper, {
       height: props.maxHeight,
@@ -934,8 +932,7 @@ function RendererActionsInternalUpdater(_ref) {
   var children = _ref.children,
     doc = _ref.doc,
     schema = _ref.schema,
-    onAnalyticsEvent = _ref.onAnalyticsEvent,
-    skipValidation = _ref.skipValidation;
+    onAnalyticsEvent = _ref.onAnalyticsEvent;
   var rootRendererContextValue = _react.default.useContext(RootRendererContext);
   var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
   var rendererRef = (0, _react.useRef)(null);
@@ -957,14 +954,14 @@ function RendererActionsInternalUpdater(_ref) {
   }
   (0, _react.useLayoutEffect)(function () {
     if (_doc) {
-      actions._privateRegisterRenderer(rendererRef, _doc, schema, onAnalyticsEvent, skipValidation);
+      actions._privateRegisterRenderer(rendererRef, _doc, schema, onAnalyticsEvent);
     } else {
       actions._privateUnregisterRenderer();
     }
     return function () {
       return actions._privateUnregisterRenderer();
     };
-  }, [actions, schema, _doc, onAnalyticsEvent, skipValidation]);
+  }, [actions, schema, _doc, onAnalyticsEvent]);
   if ((0, _experiments.editorExperiment)('comment_on_bodied_extensions', true)) {
     return (0, _react2.jsx)(RootRendererContext.Provider, {
       value: {

package/dist/es2019/actions/index.js

@@ -22,13 +22,17 @@ export default class RendererActions {
   }
 
   //#region private
-  _privateRegisterRenderer(ref, doc, schema, onAnalyticsEvent, skipValidation) {
+  _privateRegisterRenderer(ref, doc, schema, onAnalyticsEvent) {
     if (!this.initFromContext) {
       return;
     } else if (!this.ref) {
       this.ref = ref;
     } else if (this.ref !== ref) {
-      if (!skipValidation) {
+      if (fg('platform_editor_legacy_content_macro')) {
+        if (this.ref.current !== ref.current) {
+          throw new Error("Renderer has already been registered! It's not allowed to re-register with another new Renderer instance.");
+        }
+      } else {
         throw new Error("Renderer has already been registered! It's not allowed to re-register with another new Renderer instance.");
       }
     }

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.9";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',
@@ -377,8 +377,7 @@ export class __RendererClassComponent extends PureComponent {
       }, enableSsrInlineScripts ? jsx(BreakoutSSRInlineScript, null) : null, jsx(RendererActionsInternalUpdater, {
         doc: pmDoc,
         schema: schema,
-        onAnalyticsEvent: this.fireAnalyticsEvent,
-        skipValidation: skipValidation
+        onAnalyticsEvent: this.fireAnalyticsEvent
       }, result)))))));
       let rendererResult = truncated ? jsx(TruncatedWrapper, {
         height: maxHeight,
@@ -728,8 +727,7 @@ const RendererFunctionalComponent = props => {
     }, props.enableSsrInlineScripts ? jsx(BreakoutSSRInlineScript, null) : null, jsx(RendererActionsInternalUpdater, {
       doc: pmDoc,
       schema: schema,
-      onAnalyticsEvent: fireAnalyticsEvent,
-      skipValidation: props.skipValidation
+      onAnalyticsEvent: fireAnalyticsEvent
     }, result)))))));
     let rendererResult = props.truncated ? jsx(TruncatedWrapper, {
       height: props.maxHeight,
@@ -908,8 +906,7 @@ function RendererActionsInternalUpdater({
   children,
   doc,
   schema,
-  onAnalyticsEvent,
-  skipValidation
+  onAnalyticsEvent
 }) {
   const rootRendererContextValue = React.useContext(RootRendererContext);
   const actions = useContext(ActionsContext);
@@ -932,12 +929,12 @@ function RendererActionsInternalUpdater({
   }
   useLayoutEffect(() => {
     if (_doc) {
-      actions._privateRegisterRenderer(rendererRef, _doc, schema, onAnalyticsEvent, skipValidation);
+      actions._privateRegisterRenderer(rendererRef, _doc, schema, onAnalyticsEvent);
     } else {
       actions._privateUnregisterRenderer();
     }
     return () => actions._privateUnregisterRenderer();
-  }, [actions, schema, _doc, onAnalyticsEvent, skipValidation]);
+  }, [actions, schema, _doc, onAnalyticsEvent]);
   if (editorExperiment('comment_on_bodied_extensions', true)) {
     return jsx(RootRendererContext.Provider, {
       value: {

package/dist/esm/actions/index.js

@@ -31,13 +31,17 @@ var RendererActions = /*#__PURE__*/function () {
   //#region private
   return _createClass(RendererActions, [{
     key: "_privateRegisterRenderer",
-    value: function _privateRegisterRenderer(ref, doc, schema, onAnalyticsEvent, skipValidation) {
+    value: function _privateRegisterRenderer(ref, doc, schema, onAnalyticsEvent) {
       if (!this.initFromContext) {
         return;
       } else if (!this.ref) {
         this.ref = ref;
       } else if (this.ref !== ref) {
-        if (!skipValidation) {
+        if (fg('platform_editor_legacy_content_macro')) {
+          if (this.ref.current !== ref.current) {
+            throw new Error("Renderer has already been registered! It's not allowed to re-register with another new Renderer instance.");
+          }
+        } else {
           throw new Error("Renderer has already been registered! It's not allowed to re-register with another new Renderer instance.");
         }
       }

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.9";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',
@@ -390,8 +390,7 @@ export var __RendererClassComponent = /*#__PURE__*/function (_PureComponent) {
         }, enableSsrInlineScripts ? jsx(BreakoutSSRInlineScript, null) : null, jsx(RendererActionsInternalUpdater, {
           doc: pmDoc,
           schema: schema,
-          onAnalyticsEvent: this.fireAnalyticsEvent,
-          skipValidation: skipValidation
+          onAnalyticsEvent: this.fireAnalyticsEvent
         }, result)))))));
         var rendererResult = truncated ? jsx(TruncatedWrapper, {
           height: maxHeight,
@@ -742,8 +741,7 @@ var RendererFunctionalComponent = function RendererFunctionalComponent(props) {
     }, props.enableSsrInlineScripts ? jsx(BreakoutSSRInlineScript, null) : null, jsx(RendererActionsInternalUpdater, {
       doc: pmDoc,
       schema: schema,
-      onAnalyticsEvent: _fireAnalyticsEvent,
-      skipValidation: props.skipValidation
+      onAnalyticsEvent: _fireAnalyticsEvent
     }, result)))))));
     var rendererResult = props.truncated ? jsx(TruncatedWrapper, {
       height: props.maxHeight,
@@ -924,8 +922,7 @@ function RendererActionsInternalUpdater(_ref) {
   var children = _ref.children,
     doc = _ref.doc,
     schema = _ref.schema,
-    onAnalyticsEvent = _ref.onAnalyticsEvent,
-    skipValidation = _ref.skipValidation;
+    onAnalyticsEvent = _ref.onAnalyticsEvent;
   var rootRendererContextValue = React.useContext(RootRendererContext);
   var actions = useContext(ActionsContext);
   var rendererRef = useRef(null);
@@ -947,14 +944,14 @@ function RendererActionsInternalUpdater(_ref) {
   }
   useLayoutEffect(function () {
     if (_doc) {
-      actions._privateRegisterRenderer(rendererRef, _doc, schema, onAnalyticsEvent, skipValidation);
+      actions._privateRegisterRenderer(rendererRef, _doc, schema, onAnalyticsEvent);
     } else {
       actions._privateUnregisterRenderer();
     }
     return function () {
       return actions._privateUnregisterRenderer();
     };
-  }, [actions, schema, _doc, onAnalyticsEvent, skipValidation]);
+  }, [actions, schema, _doc, onAnalyticsEvent]);
   if (editorExperiment('comment_on_bodied_extensions', true)) {
     return jsx(RootRendererContext.Provider, {
       value: {

package/dist/types/actions/index.d.ts

@@ -39,7 +39,7 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     private ref?;
     private onAnalyticsEvent?;
     constructor(initFromContext?: boolean);
-    _privateRegisterRenderer(ref: React.MutableRefObject<null>, doc: Node, schema: Schema, onAnalyticsEvent?: (event: AnalyticsEventPayload) => void, skipValidation?: boolean): void;
+    _privateRegisterRenderer(ref: React.MutableRefObject<null>, doc: Node, schema: Schema, onAnalyticsEvent?: (event: AnalyticsEventPayload) => void): void;
     _privateUnregisterRenderer(): void;
     /**
      * Validate whether we can create an annotation between two positions

package/dist/types-ts4.5/actions/index.d.ts

@@ -39,7 +39,7 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     private ref?;
     private onAnalyticsEvent?;
     constructor(initFromContext?: boolean);
-    _privateRegisterRenderer(ref: React.MutableRefObject<null>, doc: Node, schema: Schema, onAnalyticsEvent?: (event: AnalyticsEventPayload) => void, skipValidation?: boolean): void;
+    _privateRegisterRenderer(ref: React.MutableRefObject<null>, doc: Node, schema: Schema, onAnalyticsEvent?: (event: AnalyticsEventPayload) => void): void;
     _privateUnregisterRenderer(): void;
     /**
      * Validate whether we can create an annotation between two positions

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "112.7.7",
+	"version": "112.7.9",
 	"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.7.0",
 		"@atlaskit/editor-json-transformer": "^8.21.0",
 		"@atlaskit/editor-palette": "1.6.3",
 		"@atlaskit/editor-prosemirror": "6.2.1",
@@ -46,11 +46,11 @@
 		"@atlaskit/media-ui": "^27.1.0",
 		"@atlaskit/media-viewer": "^49.5.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/smart-card": "^32.7.0",
+		"@atlaskit/smart-card": "^32.8.0",
 		"@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.29.0",
 		"@atlaskit/tokens": "^2.5.0",
 		"@atlaskit/tooltip": "^19.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -167,6 +167,16 @@
 		},
 		"confluence-frontend-comments-panel": {
 			"type": "boolean"
+		},
+		"platform_editor_table_row_span_fix": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
+		"platform_editor_table_col_calculation_fix": {
+			"type": "boolean"
+		},
+		"platform_editor_legacy_content_macro": {
+			"type": "boolean"
 		}
 	},
 	"af:exports": {