@atlaskit/renderer 118.2.2 → 118.3.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/renderer
 
+## 118.3.0
+
+### Minor Changes
+
+- [#160422](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/160422)
+  [`83606959c73cd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/83606959c73cd) -
+  EDITOR-719 Overrides adf validation of nested tables for nested renderers inside bodied extensions
+  and reverts a previous change to transformNestedTablesIncomingDocument which prevented nested
+  tables inside bodied extensions from being transformed by their parent renderer. This was due to a
+  bug with comment positions of nested tables inside bodied extensions which meant their positions
+  were not being calculated correctly due to not being transformed in the parent renderer.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 118.2.2
 
 ### Patch Changes

package/dist/cjs/react/nodes/bodiedExtension.js

@@ -1,12 +1,13 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _extension = require("./extension");
 var _ErrorBoundary = require("../../ui/Renderer/ErrorBoundary");
@@ -14,6 +15,28 @@ var _ExtensionRenderer = _interopRequireDefault(require("../../ui/ExtensionRende
 var _enums = require("../../analytics/enums");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _annotations = require("../../ui/annotations");
+var _ValidationContext = require("../../ui/Renderer/ValidationContext");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var ValidationContextWrapper = function ValidationContextWrapper(_ref) {
+  var children = _ref.children;
+  // We override validation of nested tables in nested renderers as invalid ADF (but valid Prosemirror)
+  // may have been introduced in the parent renderer's render and subsequent transformations.
+  // For example - nested tables which are transformed from an extension node in ADF
+  // to native Prosemirror nested table nodes in and this is invalid ADF.
+  var validationContextValue = (0, _react.useMemo)(function () {
+    return {
+      allowNestedTables: true
+    };
+  }, []);
+  if (!(0, _platformFeatureFlags.fg)('platform_editor_nested_table_extension_comment_fix')) {
+    return children;
+  }
+  return /*#__PURE__*/_react.default.createElement(_ValidationContext.ValidationContextProvider, {
+    value: validationContextValue
+  }, children);
+};
 var BodiedExtension = function BodiedExtension(props) {
   var children = props.children,
     _props$layout = props.layout,
@@ -41,13 +64,13 @@ var BodiedExtension = function BodiedExtension(props) {
     value: {
       startPos: props.startPos + 1
     }
-  }, /*#__PURE__*/_react.default.createElement(_ExtensionRenderer.default
+  }, /*#__PURE__*/_react.default.createElement(ValidationContextWrapper, null, /*#__PURE__*/_react.default.createElement(_ExtensionRenderer.default
   // Ignored via go/ees005
   // eslint-disable-next-line react/jsx-props-no-spreading
   , (0, _extends2.default)({}, props, {
     type: "bodiedExtension"
-  }), function (_ref) {
-    var result = _ref.result;
+  }), function (_ref2) {
+    var result = _ref2.result;
     try {
       if (result && /*#__PURE__*/_react.default.isValidElement(result)) {
         // Return the content directly if it's a valid JSX.Element
@@ -64,6 +87,6 @@ var BodiedExtension = function BodiedExtension(props) {
     return (0, _extension.renderExtension)(children, layout, {
       isTopLevel: path.length < 1
     }, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes);
-  })));
+  }))));
 };
 var _default = exports.default = BodiedExtension;

package/dist/cjs/render-document.js

@@ -30,7 +30,7 @@ var withStopwatch = function withStopwatch(cb) {
     time: time
   };
 };
-var _validation = function _validation(doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation) {
+var _validation = function _validation(doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation, validationOverrides) {
   var result;
   if (useSpecBasedValidator) {
     // link mark on mediaSingle is deprecated, need to move link mark to child media node
@@ -45,7 +45,7 @@ var _validation = function _validation(doc, schema, adfStage, useSpecBasedValida
         eventType: _analytics.EVENT_TYPE.OPERATIONAL
       });
     }
-    result = skipValidation ? transformedAdf || doc : (0, _utils.validateADFEntity)(schema, transformedAdf || doc, dispatchAnalyticsEvent);
+    result = skipValidation ? transformedAdf || doc : (0, _utils.validateADFEntity)(schema, transformedAdf || doc, dispatchAnalyticsEvent, validationOverrides);
   } else {
     result = (0, _validator.getValidDocument)(doc, schema, adfStage);
   }
@@ -71,7 +71,8 @@ var _validation = function _validation(doc, schema, adfStage, useSpecBasedValida
     // Convert nested-table extensions into nested tables
     try {
       var _transformNestedTable = (0, _transforms.transformNestedTablesIncomingDocument)(result, {
-          environment: 'renderer'
+          environment: 'renderer',
+          disableNestedRendererTreatment: (0, _platformFeatureFlags.fg)('platform_editor_nested_table_extension_comment_fix')
         }),
         _transformedAdf = _transformNestedTable.transformedAdf,
         _isTransformed = _transformNestedTable.isTransformed;
@@ -100,42 +101,46 @@ var _validation = function _validation(doc, schema, adfStage, useSpecBasedValida
 var memoValidation = (0, _memoizeOne.default)(_validation, function (newArgs, lastArgs) {
   var result = false;
   if ((0, _platformFeatureFlags.fg)('cc_complexit_fe_memoValidation_redundant_calls')) {
-    var _newArgs = (0, _slicedToArray2.default)(newArgs, 6),
+    var _newArgs = (0, _slicedToArray2.default)(newArgs, 7),
       newDoc = _newArgs[0],
       newSchema = _newArgs[1],
       newADFStage = _newArgs[2],
       newUseSpecValidator = _newArgs[3],
       // ignoring dispatchAnalyticsEvent
-      newSkipValidation = _newArgs[5];
+      newSkipValidation = _newArgs[5],
+      newValidationOverrides = _newArgs[6];
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    var _lastArgs = (0, _slicedToArray2.default)(lastArgs, 6),
+    var _lastArgs = (0, _slicedToArray2.default)(lastArgs, 7),
       oldDoc = _lastArgs[0],
       oldSchema = _lastArgs[1],
       oldADFStage = _lastArgs[2],
       oldUseSpecValidator = _lastArgs[3],
       // ignoring dispatchAnalyticsEvent
-      oldSkipValidation = _lastArgs[5];
-    result = areDocsEqual(newDoc, oldDoc) && newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && newSkipValidation === oldSkipValidation;
+      oldSkipValidation = _lastArgs[5],
+      oldValidationOverrides = _lastArgs[6];
+    result = areDocsEqual(newDoc, oldDoc) && newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && newSkipValidation === oldSkipValidation && newValidationOverrides === oldValidationOverrides;
   } else {
     // This path has a bug and it will wrongfully assign dispatchAnalyticsEvent to skipValidation/oldSkipValidation
     // instead of ignoring it as it does not skip it when unpacking the array.
-    // This results the fucntion returning false when it should return true
+    // This results the function returning false when it should return true
     // and causing extra re-renders. see https://hello.jira.atlassian.cloud/browse/COMPLEXIT-161.
 
-    var _newArgs2 = (0, _slicedToArray2.default)(newArgs, 5),
+    var _newArgs2 = (0, _slicedToArray2.default)(newArgs, 7),
       _newDoc = _newArgs2[0],
       _newSchema = _newArgs2[1],
       _newADFStage = _newArgs2[2],
       _newUseSpecValidator = _newArgs2[3],
-      _skipValidation = _newArgs2[4];
-    var _lastArgs2 = (0, _slicedToArray2.default)(lastArgs, 5),
+      _skipValidation = _newArgs2[5],
+      _newValidationOverrides = _newArgs2[6];
+    var _lastArgs2 = (0, _slicedToArray2.default)(lastArgs, 7),
       _oldDoc = _lastArgs2[0],
       _oldSchema = _lastArgs2[1],
       _oldADFStage = _lastArgs2[2],
       _oldUseSpecValidator = _lastArgs2[3],
-      _oldSkipValidation = _lastArgs2[4];
-    result = areDocsEqual(_newDoc, _oldDoc) && _newSchema === _oldSchema && _newADFStage === _oldADFStage && _newUseSpecValidator === _oldUseSpecValidator && _skipValidation === _oldSkipValidation;
+      _oldSkipValidation = _lastArgs2[5],
+      _oldValidationOverrides = _lastArgs2[6];
+    result = areDocsEqual(_newDoc, _oldDoc) && _newSchema === _oldSchema && _newADFStage === _oldADFStage && _newUseSpecValidator === _oldUseSpecValidator && _skipValidation === _oldSkipValidation && _newValidationOverrides === _oldValidationOverrides;
   }
   return result;
 });
@@ -209,6 +214,7 @@ var renderDocument = exports.renderDocument = function renderDocument(doc, seria
   var appearance = arguments.length > 8 ? arguments[8] : undefined;
   var includeNodesCountInStats = arguments.length > 9 ? arguments[9] : undefined;
   var skipValidation = arguments.length > 10 ? arguments[10] : undefined;
+  var validationOverrides = arguments.length > 11 ? arguments[11] : undefined;
   var stat = {
     sanitizeTime: 0
   };
@@ -218,7 +224,7 @@ var renderDocument = exports.renderDocument = function renderDocument(doc, seria
     useSpecBasedValidator = true;
   }
   var _withStopwatch = withStopwatch(function () {
-      return memoValidation(doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation);
+      return memoValidation(doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation, validationOverrides);
     }),
     validDoc = _withStopwatch.output,
     sanitizeTime = _withStopwatch.time;

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

@@ -9,6 +9,7 @@ var _react = require("react");
  * The ValidationContext is used to pass down the `skipValidation` flag from the NBMRenderer
  * to any ReactRenderer nested inside a Legacy Content Macro. This allows the nested ReactRenderer
  * to bypass the ADF schema validation when necessary.
+ * It also allows validation overrides to be passed to nested renderers. For example renderers nested inside bodiedExtension
  */
 var ValidationContext = exports.ValidationContext = /*#__PURE__*/(0, _react.createContext)(null);
 var ValidationContextProvider = exports.ValidationContextProvider = ValidationContext.Provider;

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

@@ -63,7 +63,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "118.2.2";
+var packageVersion = "118.3.0";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'
@@ -385,7 +385,7 @@ var RendererFunctionalComponent = exports.RendererFunctionalComponent = function
   try {
     var _rendererContext$feat, _props$media;
     var schema = getSchema(props.schema, props.adfStage);
-    var _renderDocument = (0, _.renderDocument)(props.shouldRemoveEmptySpaceAroundContent ? (0, _rendererHelper.removeEmptySpaceAroundContent)(props.document) : props.document, serializer, schema, props.adfStage, props.useSpecBasedValidator, id, _fireAnalyticsEvent, props.unsupportedContentLevelsTracking, props.appearance, props.includeNodesCountInStats, props.skipValidation),
+    var _renderDocument = (0, _.renderDocument)(props.shouldRemoveEmptySpaceAroundContent ? (0, _rendererHelper.removeEmptySpaceAroundContent)(props.document) : props.document, serializer, schema, props.adfStage, props.useSpecBasedValidator, id, _fireAnalyticsEvent, props.unsupportedContentLevelsTracking, props.appearance, props.includeNodesCountInStats, props.skipValidation, props.validationOverrides),
       result = _renderDocument.result,
       stat = _renderDocument.stat,
       pmDoc = _renderDocument.pmDoc;
@@ -488,7 +488,8 @@ function Renderer(props) {
   var _useRendererContext = (0, _rendererContext.useRendererContext)(),
     isTopLevelRenderer = _useRendererContext.isTopLevelRenderer;
   var _ref = (0, _react.useContext)(_ValidationContext.ValidationContext) || {},
-    skipValidation = _ref.skipValidation;
+    skipValidation = _ref.skipValidation,
+    allowNestedTables = _ref.allowNestedTables;
   var RendererComponent = getRendererComponent(props.nodeComponents);
   return (0, _react2.jsx)(RendererComponent
   // Ignored via go/ees005
@@ -496,7 +497,10 @@ function Renderer(props) {
   , (0, _extends2.default)({}, props, {
     startPos: startPos,
     isTopLevelRenderer: isTopLevelRenderer,
-    skipValidation: skipValidation
+    skipValidation: skipValidation,
+    validationOverrides: {
+      allowNestedTables: allowNestedTables
+    }
   }));
 }
 

package/dist/es2019/react/nodes/bodiedExtension.js

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React from 'react';
+import React, { useMemo } from 'react';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next';
 import { renderExtension } from './extension';
 import { ErrorBoundary } from '../../ui/Renderer/ErrorBoundary';
@@ -7,6 +7,25 @@ import ExtensionRenderer from '../../ui/ExtensionRenderer';
 import { ACTION_SUBJECT } from '../../analytics/enums';
 import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { AnnotationsPositionContext } from '../../ui/annotations';
+import { ValidationContextProvider } from '../../ui/Renderer/ValidationContext';
+import { fg } from '@atlaskit/platform-feature-flags';
+const ValidationContextWrapper = ({
+  children
+}) => {
+  // We override validation of nested tables in nested renderers as invalid ADF (but valid Prosemirror)
+  // may have been introduced in the parent renderer's render and subsequent transformations.
+  // For example - nested tables which are transformed from an extension node in ADF
+  // to native Prosemirror nested table nodes in and this is invalid ADF.
+  const validationContextValue = useMemo(() => ({
+    allowNestedTables: true
+  }), []);
+  if (!fg('platform_editor_nested_table_extension_comment_fix')) {
+    return children;
+  }
+  return /*#__PURE__*/React.createElement(ValidationContextProvider, {
+    value: validationContextValue
+  }, children);
+};
 const BodiedExtension = props => {
   const {
     children,
@@ -33,7 +52,7 @@ const BodiedExtension = props => {
     value: {
       startPos: props.startPos + 1
     }
-  }, /*#__PURE__*/React.createElement(ExtensionRenderer
+  }, /*#__PURE__*/React.createElement(ValidationContextWrapper, null, /*#__PURE__*/React.createElement(ExtensionRenderer
   // Ignored via go/ees005
   // eslint-disable-next-line react/jsx-props-no-spreading
   , _extends({}, props, {
@@ -57,6 +76,6 @@ const BodiedExtension = props => {
     return renderExtension(children, layout, {
       isTopLevel: path.length < 1
     }, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes);
-  })));
+  }))));
 };
 export default BodiedExtension;

package/dist/es2019/render-document.js

@@ -22,7 +22,7 @@ const withStopwatch = cb => {
     time
   };
 };
-const _validation = (doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation) => {
+const _validation = (doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation, validationOverrides) => {
   let result;
   if (useSpecBasedValidator) {
     // link mark on mediaSingle is deprecated, need to move link mark to child media node
@@ -38,7 +38,7 @@ const _validation = (doc, schema, adfStage, useSpecBasedValidator, dispatchAnaly
         eventType: EVENT_TYPE.OPERATIONAL
       });
     }
-    result = skipValidation ? transformedAdf || doc : validateADFEntity(schema, transformedAdf || doc, dispatchAnalyticsEvent);
+    result = skipValidation ? transformedAdf || doc : validateADFEntity(schema, transformedAdf || doc, dispatchAnalyticsEvent, validationOverrides);
   } else {
     result = getValidDocument(doc, schema, adfStage);
   }
@@ -67,7 +67,8 @@ const _validation = (doc, schema, adfStage, useSpecBasedValidator, dispatchAnaly
         transformedAdf,
         isTransformed
       } = transformNestedTablesIncomingDocument(result, {
-        environment: 'renderer'
+        environment: 'renderer',
+        disableNestedRendererTreatment: fg('platform_editor_nested_table_extension_comment_fix')
       });
       if (isTransformed) {
         dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 ? void 0 : dispatchAnalyticsEvent({
@@ -96,22 +97,22 @@ const memoValidation = memoizeOne(_validation, (newArgs, lastArgs) => {
   if (fg('cc_complexit_fe_memoValidation_redundant_calls')) {
     const [newDoc, newSchema, newADFStage, newUseSpecValidator,,
     // ignoring dispatchAnalyticsEvent
-    newSkipValidation] = newArgs;
+    newSkipValidation, newValidationOverrides] = newArgs;
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const [oldDoc, oldSchema, oldADFStage, oldUseSpecValidator,,
     // ignoring dispatchAnalyticsEvent
-    oldSkipValidation] = lastArgs;
-    result = areDocsEqual(newDoc, oldDoc) && newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && newSkipValidation === oldSkipValidation;
+    oldSkipValidation, oldValidationOverrides] = lastArgs;
+    result = areDocsEqual(newDoc, oldDoc) && newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && newSkipValidation === oldSkipValidation && newValidationOverrides === oldValidationOverrides;
   } else {
     // This path has a bug and it will wrongfully assign dispatchAnalyticsEvent to skipValidation/oldSkipValidation
     // instead of ignoring it as it does not skip it when unpacking the array.
-    // This results the fucntion returning false when it should return true
+    // This results the function returning false when it should return true
     // and causing extra re-renders. see https://hello.jira.atlassian.cloud/browse/COMPLEXIT-161.
 
-    const [newDoc, newSchema, newADFStage, newUseSpecValidator, skipValidation] = newArgs;
-    const [oldDoc, oldSchema, oldADFStage, oldUseSpecValidator, oldSkipValidation] = lastArgs;
-    result = areDocsEqual(newDoc, oldDoc) && newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && skipValidation === oldSkipValidation;
+    const [newDoc, newSchema, newADFStage, newUseSpecValidator,, skipValidation, newValidationOverrides] = newArgs;
+    const [oldDoc, oldSchema, oldADFStage, oldUseSpecValidator,, oldSkipValidation, oldValidationOverrides] = lastArgs;
+    result = areDocsEqual(newDoc, oldDoc) && newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && skipValidation === oldSkipValidation && newValidationOverrides === oldValidationOverrides;
   }
   return result;
 });
@@ -167,7 +168,7 @@ const memoCreateNodeAndCheck = memoizeOne(_createNodeAndCheck, (newArgs, lastArg
   const [oldSchema, oldDoc] = lastArgs;
   return newSchema === oldSchema && areDocsEqual(newDoc, oldDoc);
 });
-export const renderDocument = (doc, serializer, schema = defaultSchema, adfStage = 'final', useSpecBasedValidator = false, rendererId = 'noid', dispatchAnalyticsEvent, unsupportedContentLevelsTracking, appearance, includeNodesCountInStats, skipValidation) => {
+export const renderDocument = (doc, serializer, schema = defaultSchema, adfStage = 'final', useSpecBasedValidator = false, rendererId = 'noid', dispatchAnalyticsEvent, unsupportedContentLevelsTracking, appearance, includeNodesCountInStats, skipValidation, validationOverrides) => {
   const stat = {
     sanitizeTime: 0
   };
@@ -180,7 +181,7 @@ export const renderDocument = (doc, serializer, schema = defaultSchema, adfStage
     output: validDoc,
     time: sanitizeTime
   } = withStopwatch(() => {
-    return memoValidation(doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation);
+    return memoValidation(doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation, validationOverrides);
   });
 
   // save sanitize time to stats

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

@@ -3,6 +3,7 @@ import { createContext } from 'react';
  * The ValidationContext is used to pass down the `skipValidation` flag from the NBMRenderer
  * to any ReactRenderer nested inside a Legacy Content Macro. This allows the nested ReactRenderer
  * to bypass the ADF schema validation when necessary.
+ * It also allows validation overrides to be passed to nested renderers. For example renderers nested inside bodiedExtension
  */
 export const ValidationContext = /*#__PURE__*/createContext(null);
 export const ValidationContextProvider = ValidationContext.Provider;

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

@@ -48,7 +48,7 @@ import { PortalContext } from './PortalContext';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "118.2.2";
+const packageVersion = "118.3.0";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'
@@ -376,7 +376,7 @@ export const RendererFunctionalComponent = props => {
       result,
       stat,
       pmDoc
-    } = renderDocument(props.shouldRemoveEmptySpaceAroundContent ? removeEmptySpaceAroundContent(props.document) : props.document, serializer, schema, props.adfStage, props.useSpecBasedValidator, id, fireAnalyticsEvent, props.unsupportedContentLevelsTracking, props.appearance, props.includeNodesCountInStats, props.skipValidation);
+    } = renderDocument(props.shouldRemoveEmptySpaceAroundContent ? removeEmptySpaceAroundContent(props.document) : props.document, serializer, schema, props.adfStage, props.useSpecBasedValidator, id, fireAnalyticsEvent, props.unsupportedContentLevelsTracking, props.appearance, props.includeNodesCountInStats, props.skipValidation, props.validationOverrides);
     if (props.onComplete) {
       props.onComplete(stat);
     }
@@ -474,7 +474,8 @@ export function Renderer(props) {
     isTopLevelRenderer
   } = useRendererContext();
   const {
-    skipValidation
+    skipValidation,
+    allowNestedTables
   } = useContext(ValidationContext) || {};
   const RendererComponent = getRendererComponent(props.nodeComponents);
   return jsx(RendererComponent
@@ -483,7 +484,10 @@ export function Renderer(props) {
   , _extends({}, props, {
     startPos: startPos,
     isTopLevelRenderer: isTopLevelRenderer,
-    skipValidation: skipValidation
+    skipValidation: skipValidation,
+    validationOverrides: {
+      allowNestedTables
+    }
   }));
 }
 

package/dist/esm/react/nodes/bodiedExtension.js

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React from 'react';
+import React, { useMemo } from 'react';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next';
 import { renderExtension } from './extension';
 import { ErrorBoundary } from '../../ui/Renderer/ErrorBoundary';
@@ -7,6 +7,26 @@ import ExtensionRenderer from '../../ui/ExtensionRenderer';
 import { ACTION_SUBJECT } from '../../analytics/enums';
 import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { AnnotationsPositionContext } from '../../ui/annotations';
+import { ValidationContextProvider } from '../../ui/Renderer/ValidationContext';
+import { fg } from '@atlaskit/platform-feature-flags';
+var ValidationContextWrapper = function ValidationContextWrapper(_ref) {
+  var children = _ref.children;
+  // We override validation of nested tables in nested renderers as invalid ADF (but valid Prosemirror)
+  // may have been introduced in the parent renderer's render and subsequent transformations.
+  // For example - nested tables which are transformed from an extension node in ADF
+  // to native Prosemirror nested table nodes in and this is invalid ADF.
+  var validationContextValue = useMemo(function () {
+    return {
+      allowNestedTables: true
+    };
+  }, []);
+  if (!fg('platform_editor_nested_table_extension_comment_fix')) {
+    return children;
+  }
+  return /*#__PURE__*/React.createElement(ValidationContextProvider, {
+    value: validationContextValue
+  }, children);
+};
 var BodiedExtension = function BodiedExtension(props) {
   var children = props.children,
     _props$layout = props.layout,
@@ -34,13 +54,13 @@ var BodiedExtension = function BodiedExtension(props) {
     value: {
       startPos: props.startPos + 1
     }
-  }, /*#__PURE__*/React.createElement(ExtensionRenderer
+  }, /*#__PURE__*/React.createElement(ValidationContextWrapper, null, /*#__PURE__*/React.createElement(ExtensionRenderer
   // Ignored via go/ees005
   // eslint-disable-next-line react/jsx-props-no-spreading
   , _extends({}, props, {
     type: "bodiedExtension"
-  }), function (_ref) {
-    var result = _ref.result;
+  }), function (_ref2) {
+    var result = _ref2.result;
     try {
       if (result && /*#__PURE__*/React.isValidElement(result)) {
         // Return the content directly if it's a valid JSX.Element
@@ -57,6 +77,6 @@ var BodiedExtension = function BodiedExtension(props) {
     return renderExtension(children, layout, {
       isTopLevel: path.length < 1
     }, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes);
-  })));
+  }))));
 };
 export default BodiedExtension;

package/dist/esm/render-document.js

@@ -23,7 +23,7 @@ var withStopwatch = function withStopwatch(cb) {
     time: time
   };
 };
-var _validation = function _validation(doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation) {
+var _validation = function _validation(doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation, validationOverrides) {
   var result;
   if (useSpecBasedValidator) {
     // link mark on mediaSingle is deprecated, need to move link mark to child media node
@@ -38,7 +38,7 @@ var _validation = function _validation(doc, schema, adfStage, useSpecBasedValida
         eventType: EVENT_TYPE.OPERATIONAL
       });
     }
-    result = skipValidation ? transformedAdf || doc : validateADFEntity(schema, transformedAdf || doc, dispatchAnalyticsEvent);
+    result = skipValidation ? transformedAdf || doc : validateADFEntity(schema, transformedAdf || doc, dispatchAnalyticsEvent, validationOverrides);
   } else {
     result = getValidDocument(doc, schema, adfStage);
   }
@@ -64,7 +64,8 @@ var _validation = function _validation(doc, schema, adfStage, useSpecBasedValida
     // Convert nested-table extensions into nested tables
     try {
       var _transformNestedTable = transformNestedTablesIncomingDocument(result, {
-          environment: 'renderer'
+          environment: 'renderer',
+          disableNestedRendererTreatment: fg('platform_editor_nested_table_extension_comment_fix')
         }),
         _transformedAdf = _transformNestedTable.transformedAdf,
         _isTransformed = _transformNestedTable.isTransformed;
@@ -93,42 +94,46 @@ var _validation = function _validation(doc, schema, adfStage, useSpecBasedValida
 var memoValidation = memoizeOne(_validation, function (newArgs, lastArgs) {
   var result = false;
   if (fg('cc_complexit_fe_memoValidation_redundant_calls')) {
-    var _newArgs = _slicedToArray(newArgs, 6),
+    var _newArgs = _slicedToArray(newArgs, 7),
       newDoc = _newArgs[0],
       newSchema = _newArgs[1],
       newADFStage = _newArgs[2],
       newUseSpecValidator = _newArgs[3],
       // ignoring dispatchAnalyticsEvent
-      newSkipValidation = _newArgs[5];
+      newSkipValidation = _newArgs[5],
+      newValidationOverrides = _newArgs[6];
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    var _lastArgs = _slicedToArray(lastArgs, 6),
+    var _lastArgs = _slicedToArray(lastArgs, 7),
       oldDoc = _lastArgs[0],
       oldSchema = _lastArgs[1],
       oldADFStage = _lastArgs[2],
       oldUseSpecValidator = _lastArgs[3],
       // ignoring dispatchAnalyticsEvent
-      oldSkipValidation = _lastArgs[5];
-    result = areDocsEqual(newDoc, oldDoc) && newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && newSkipValidation === oldSkipValidation;
+      oldSkipValidation = _lastArgs[5],
+      oldValidationOverrides = _lastArgs[6];
+    result = areDocsEqual(newDoc, oldDoc) && newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && newSkipValidation === oldSkipValidation && newValidationOverrides === oldValidationOverrides;
   } else {
     // This path has a bug and it will wrongfully assign dispatchAnalyticsEvent to skipValidation/oldSkipValidation
     // instead of ignoring it as it does not skip it when unpacking the array.
-    // This results the fucntion returning false when it should return true
+    // This results the function returning false when it should return true
     // and causing extra re-renders. see https://hello.jira.atlassian.cloud/browse/COMPLEXIT-161.
 
-    var _newArgs2 = _slicedToArray(newArgs, 5),
+    var _newArgs2 = _slicedToArray(newArgs, 7),
       _newDoc = _newArgs2[0],
       _newSchema = _newArgs2[1],
       _newADFStage = _newArgs2[2],
       _newUseSpecValidator = _newArgs2[3],
-      _skipValidation = _newArgs2[4];
-    var _lastArgs2 = _slicedToArray(lastArgs, 5),
+      _skipValidation = _newArgs2[5],
+      _newValidationOverrides = _newArgs2[6];
+    var _lastArgs2 = _slicedToArray(lastArgs, 7),
       _oldDoc = _lastArgs2[0],
       _oldSchema = _lastArgs2[1],
       _oldADFStage = _lastArgs2[2],
       _oldUseSpecValidator = _lastArgs2[3],
-      _oldSkipValidation = _lastArgs2[4];
-    result = areDocsEqual(_newDoc, _oldDoc) && _newSchema === _oldSchema && _newADFStage === _oldADFStage && _newUseSpecValidator === _oldUseSpecValidator && _skipValidation === _oldSkipValidation;
+      _oldSkipValidation = _lastArgs2[5],
+      _oldValidationOverrides = _lastArgs2[6];
+    result = areDocsEqual(_newDoc, _oldDoc) && _newSchema === _oldSchema && _newADFStage === _oldADFStage && _newUseSpecValidator === _oldUseSpecValidator && _skipValidation === _oldSkipValidation && _newValidationOverrides === _oldValidationOverrides;
   }
   return result;
 });
@@ -202,6 +207,7 @@ export var renderDocument = function renderDocument(doc, serializer) {
   var appearance = arguments.length > 8 ? arguments[8] : undefined;
   var includeNodesCountInStats = arguments.length > 9 ? arguments[9] : undefined;
   var skipValidation = arguments.length > 10 ? arguments[10] : undefined;
+  var validationOverrides = arguments.length > 11 ? arguments[11] : undefined;
   var stat = {
     sanitizeTime: 0
   };
@@ -211,7 +217,7 @@ export var renderDocument = function renderDocument(doc, serializer) {
     useSpecBasedValidator = true;
   }
   var _withStopwatch = withStopwatch(function () {
-      return memoValidation(doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation);
+      return memoValidation(doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation, validationOverrides);
     }),
     validDoc = _withStopwatch.output,
     sanitizeTime = _withStopwatch.time;

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

@@ -3,6 +3,7 @@ import { createContext } from 'react';
  * The ValidationContext is used to pass down the `skipValidation` flag from the NBMRenderer
  * to any ReactRenderer nested inside a Legacy Content Macro. This allows the nested ReactRenderer
  * to bypass the ADF schema validation when necessary.
+ * It also allows validation overrides to be passed to nested renderers. For example renderers nested inside bodiedExtension
  */
 export var ValidationContext = /*#__PURE__*/createContext(null);
 export var ValidationContextProvider = ValidationContext.Provider;

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

@@ -53,7 +53,7 @@ import { PortalContext } from './PortalContext';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "118.2.2";
+var packageVersion = "118.3.0";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'
@@ -375,7 +375,7 @@ export var RendererFunctionalComponent = function RendererFunctionalComponent(pr
   try {
     var _rendererContext$feat, _props$media;
     var schema = getSchema(props.schema, props.adfStage);
-    var _renderDocument = renderDocument(props.shouldRemoveEmptySpaceAroundContent ? removeEmptySpaceAroundContent(props.document) : props.document, serializer, schema, props.adfStage, props.useSpecBasedValidator, id, _fireAnalyticsEvent, props.unsupportedContentLevelsTracking, props.appearance, props.includeNodesCountInStats, props.skipValidation),
+    var _renderDocument = renderDocument(props.shouldRemoveEmptySpaceAroundContent ? removeEmptySpaceAroundContent(props.document) : props.document, serializer, schema, props.adfStage, props.useSpecBasedValidator, id, _fireAnalyticsEvent, props.unsupportedContentLevelsTracking, props.appearance, props.includeNodesCountInStats, props.skipValidation, props.validationOverrides),
       result = _renderDocument.result,
       stat = _renderDocument.stat,
       pmDoc = _renderDocument.pmDoc;
@@ -478,7 +478,8 @@ export function Renderer(props) {
   var _useRendererContext = useRendererContext(),
     isTopLevelRenderer = _useRendererContext.isTopLevelRenderer;
   var _ref = useContext(ValidationContext) || {},
-    skipValidation = _ref.skipValidation;
+    skipValidation = _ref.skipValidation,
+    allowNestedTables = _ref.allowNestedTables;
   var RendererComponent = getRendererComponent(props.nodeComponents);
   return jsx(RendererComponent
   // Ignored via go/ees005
@@ -486,7 +487,10 @@ export function Renderer(props) {
   , _extends({}, props, {
     startPos: startPos,
     isTopLevelRenderer: isTopLevelRenderer,
-    skipValidation: skipValidation
+    skipValidation: skipValidation,
+    validationOverrides: {
+      allowNestedTables: allowNestedTables
+    }
   }));
 }
 

package/dist/types/render-document.d.ts

@@ -20,5 +20,7 @@ export interface ResultWithTime<T> {
     time: number;
 }
 type DispatchAnalyticsEvent = (event: AnalyticsEventPayload) => void;
-export declare const renderDocument: <T>(doc: any, serializer: Serializer<T>, schema?: Schema, adfStage?: ADFStage, useSpecBasedValidator?: boolean, rendererId?: string, dispatchAnalyticsEvent?: DispatchAnalyticsEvent, unsupportedContentLevelsTracking?: UnsupportedContentLevelsTracking, appearance?: RendererAppearance, includeNodesCountInStats?: boolean, skipValidation?: boolean) => RenderOutput<T | null>;
+export declare const renderDocument: <T>(doc: any, serializer: Serializer<T>, schema?: Schema, adfStage?: ADFStage, useSpecBasedValidator?: boolean, rendererId?: string, dispatchAnalyticsEvent?: DispatchAnalyticsEvent, unsupportedContentLevelsTracking?: UnsupportedContentLevelsTracking, appearance?: RendererAppearance, includeNodesCountInStats?: boolean, skipValidation?: boolean, validationOverrides?: {
+    allowNestedTables?: boolean;
+}) => RenderOutput<T | null>;
 export {};

package/dist/types/ui/Renderer/ValidationContext.d.ts

@@ -1,11 +1,13 @@
 /// <reference types="react" />
 type ValidationContextType = {
-    skipValidation: boolean;
+    skipValidation?: boolean;
+    allowNestedTables?: boolean;
 } | null;
 /**
  * The ValidationContext is used to pass down the `skipValidation` flag from the NBMRenderer
  * to any ReactRenderer nested inside a Legacy Content Macro. This allows the nested ReactRenderer
  * to bypass the ADF schema validation when necessary.
+ * It also allows validation overrides to be passed to nested renderers. For example renderers nested inside bodiedExtension
  */
 export declare const ValidationContext: import("react").Context<ValidationContextType>;
 export declare const ValidationContextProvider: import("react").Provider<ValidationContextType>;

package/dist/types/ui/Renderer/index.d.ts

@@ -12,6 +12,9 @@ export declare const DEGRADED_SEVERITY_THRESHOLD = 3000;
 export declare const RendererFunctionalComponent: (props: RendererProps & {
     startPos?: number;
     skipValidation?: boolean;
+    validationOverrides?: {
+        allowNestedTables?: boolean;
+    };
 }) => jsx.JSX.Element;
 /**
  *

package/dist/types-ts4.5/render-document.d.ts

@@ -20,5 +20,7 @@ export interface ResultWithTime<T> {
     time: number;
 }
 type DispatchAnalyticsEvent = (event: AnalyticsEventPayload) => void;
-export declare const renderDocument: <T>(doc: any, serializer: Serializer<T>, schema?: Schema, adfStage?: ADFStage, useSpecBasedValidator?: boolean, rendererId?: string, dispatchAnalyticsEvent?: DispatchAnalyticsEvent, unsupportedContentLevelsTracking?: UnsupportedContentLevelsTracking, appearance?: RendererAppearance, includeNodesCountInStats?: boolean, skipValidation?: boolean) => RenderOutput<T | null>;
+export declare const renderDocument: <T>(doc: any, serializer: Serializer<T>, schema?: Schema, adfStage?: ADFStage, useSpecBasedValidator?: boolean, rendererId?: string, dispatchAnalyticsEvent?: DispatchAnalyticsEvent, unsupportedContentLevelsTracking?: UnsupportedContentLevelsTracking, appearance?: RendererAppearance, includeNodesCountInStats?: boolean, skipValidation?: boolean, validationOverrides?: {
+    allowNestedTables?: boolean;
+}) => RenderOutput<T | null>;
 export {};

package/dist/types-ts4.5/ui/Renderer/ValidationContext.d.ts

@@ -1,11 +1,13 @@
 /// <reference types="react" />
 type ValidationContextType = {
-    skipValidation: boolean;
+    skipValidation?: boolean;
+    allowNestedTables?: boolean;
 } | null;
 /**
  * The ValidationContext is used to pass down the `skipValidation` flag from the NBMRenderer
  * to any ReactRenderer nested inside a Legacy Content Macro. This allows the nested ReactRenderer
  * to bypass the ADF schema validation when necessary.
+ * It also allows validation overrides to be passed to nested renderers. For example renderers nested inside bodiedExtension
  */
 export declare const ValidationContext: import("react").Context<ValidationContextType>;
 export declare const ValidationContextProvider: import("react").Provider<ValidationContextType>;

package/dist/types-ts4.5/ui/Renderer/index.d.ts

@@ -12,6 +12,9 @@ export declare const DEGRADED_SEVERITY_THRESHOLD = 3000;
 export declare const RendererFunctionalComponent: (props: RendererProps & {
     startPos?: number;
     skipValidation?: boolean;
+    validationOverrides?: {
+        allowNestedTables?: boolean;
+    };
 }) => jsx.JSX.Element;
 /**
  *

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "118.2.2",
+	"version": "118.3.0",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -25,13 +25,13 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/adf-utils": "^19.19.0",
+		"@atlaskit/adf-utils": "^19.20.0",
 		"@atlaskit/analytics-listeners": "^9.0.0",
 		"@atlaskit/analytics-namespaced-context": "^7.0.0",
 		"@atlaskit/analytics-next": "^11.0.0",
 		"@atlaskit/button": "^23.2.0",
 		"@atlaskit/code": "^17.2.0",
-		"@atlaskit/editor-common": "^105.8.0",
+		"@atlaskit/editor-common": "^105.9.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
@@ -39,7 +39,7 @@
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/emoji": "^69.2.0",
 		"@atlaskit/feature-gate-js-client": "^5.3.0",
-		"@atlaskit/icon": "^26.1.0",
+		"@atlaskit/icon": "^26.2.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/link-datasource": "^4.11.0",
 		"@atlaskit/media-card": "^79.3.0",
@@ -262,6 +262,9 @@
 		"smartcard_avatar_margin_fix": {
 			"type": "boolean"
 		},
+		"platform_editor_nested_table_extension_comment_fix": {
+			"type": "boolean"
+		},
 		"dst-a11y__replace-anchor-with-link__editor": {
 			"type": "boolean"
 		}