@atlaskit/renderer 138.1.4 → 138.1.6

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/renderer
 
+## 138.1.6
+
+### Patch Changes
+
+- [`bbd1404101645`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bbd1404101645) -
+  Clean up the `platform_editor_adf_validator_perf` experiment, keeping the enabled behaviour: the
+  validator caches allowed content per node type, `renderDocument` compares `validationOverrides` by
+  value and ProseMirror nodes with `Node.eq`, and `Renderer` passes a stable `validationOverrides`
+  reference across re-renders.
+- [`60a282ed26282`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/60a282ed26282) -
+  Behind `platform_forge_inline_bodied_macro`, allow text adjacent to migrated inline-bodied macros
+  to wrap naturally without applying native Forge nested-renderer styling.
+- Updated dependencies
+
+## 138.1.5
+
+### Patch Changes
+
+- [`9f200fd3beece`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9f200fd3beece) -
+  Cleanup experiment `platform_editor_table_fit_to_content_patch_1`. Make extension containment
+  styles permanent in editor tables and preserve renderer container styles outside tables.
+- Updated dependencies
+
 ## 138.1.4
 
 ### Patch Changes

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

@@ -125,7 +125,8 @@ var renderExtension = exports.renderExtension = function renderExtension(content
    * per render, and the cheap checks stay in front of it so anything ineligible short-circuits
    * without firing an exposure it can never act on.
    */
-  var isForgeInlineBodiedEnabled = Boolean((node === null || node === void 0 ? void 0 : node.extensionType) === FORGE_EXTENSION_TYPE && (node === null || node === void 0 ? void 0 : node.content) && (node === null || node === void 0 || (_node$parameters = node.parameters) === null || _node$parameters === void 0 || (_node$parameters = _node$parameters.guestParams) === null || _node$parameters === void 0 ? void 0 : _node$parameters[FORGE_INLINE_BODIED_PARAM]) === 'true' && (0, _fg.fg)('platform_forge_inline_bodied_macro'));
+  var hasForgeInlineBodiedMarker = Boolean((node === null || node === void 0 ? void 0 : node.extensionType) === FORGE_EXTENSION_TYPE && (node === null || node === void 0 ? void 0 : node.content) && (node === null || node === void 0 || (_node$parameters = node.parameters) === null || _node$parameters === void 0 || (_node$parameters = _node$parameters.guestParams) === null || _node$parameters === void 0 ? void 0 : _node$parameters[FORGE_INLINE_BODIED_PARAM]) === 'true');
+  var isForgeInlineBodiedEnabled = hasForgeInlineBodiedMarker && (0, _fg.fg)('platform_forge_inline_bodied_macro');
   /**
    * The pass that marks the sibling textblocks around an inline extension resolves their
    * positions without a depth term, so it only ever matches at the top level. Inlining a nested
@@ -143,6 +144,12 @@ var renderExtension = exports.renderExtension = function renderExtension(content
    * nested document's block spacing be collapsed too.
    */
   var isNativeForgeInline = Boolean(isInline && isForgeInlineBodiedEnabled);
+  /**
+   * Migrated inline-bodied macros intentionally do not receive the native Forge marker. Mark the
+   * rendered wrapper instead so the stylesheet can fix only the surrounding text flow without
+   * applying the native nested-renderer, overflow or sizing rules to migrated content.
+   */
+  var isMigratedInlineBodied = Boolean(isInline && (node === null || node === void 0 ? void 0 : node.content) && !hasForgeInlineBodiedMarker && (0, _fg.fg)('platform_forge_inline_bodied_macro'));
   var asInlineAnalytics = isInline && fireAnalyticsEvent && node ? (0, _react.jsx)(FireExtensionAsInlineAnalytics, {
     fireAnalyticsEvent: fireAnalyticsEvent,
     node: node
@@ -165,13 +172,14 @@ var renderExtension = exports.renderExtension = function renderExtension(content
       "data-testid": "extension--wrapper",
       "data-node-type": "extension",
       "data-top-level": isTopLevel || undefined,
-      "data-forge-inline": isNativeForgeInline || undefined
+      "data-forge-inline": isNativeForgeInline || undefined,
+      "data-migrated-inline": isMigratedInlineBodied || undefined
     }, (0, _react.jsx)("div", {
       tabIndex: options.tabIndex
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: "".concat(_consts.RendererCssClassName.EXTENSION_INNER_WRAPPER, " ").concat(overflowContainerClass),
-      css: [!(isInsideOfTable && !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_fit_to_content_patch_2') && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_fit_to_content_patch_1')) && !isInsideOfInlineExtension && (0, _fg.fg)('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [(!isInsideOfTable || (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && (0, _fg.fg)('platform_fix_macro_renders_in_layouts') && containerStyle]
     }, asInlineAnalytics, content));
     return centerAlignClass ? (0, _react.jsx)("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
@@ -196,13 +204,14 @@ var renderExtension = exports.renderExtension = function renderExtension(content
       "data-layout": layout,
       "data-local-id": localId,
       "data-top-level": isTopLevel || undefined,
-      "data-forge-inline": isNativeForgeInline || undefined
+      "data-forge-inline": isNativeForgeInline || undefined,
+      "data-migrated-inline": isMigratedInlineBodied || undefined
     }, (0, _react.jsx)("div", {
       tabIndex: options.tabIndex
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: "".concat(_consts.RendererCssClassName.EXTENSION_INNER_WRAPPER, " ").concat(overflowContainerClass),
-      css: [!(isInsideOfTable && !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_fit_to_content_patch_2') && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_fit_to_content_patch_1')) && !isInsideOfInlineExtension && (0, _fg.fg)('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [(!isInsideOfTable || (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && (0, _fg.fg)('platform_fix_macro_renders_in_layouts') && containerStyle]
     }, asInlineAnalytics, content));
     return centerAlignClass ? (0, _react.jsx)("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop

package/dist/cjs/render-document.js

@@ -11,7 +11,6 @@ var _transforms = require("@atlaskit/adf-utils/transforms");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("@atlaskit/editor-common/utils");
 var _validator = require("@atlaskit/editor-common/validator");
-var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
@@ -165,13 +164,9 @@ var memoValidation = (0, _memoizeOne.default)(_validation, function (newArgs, la
     /* ignoring dispatchAnalyticsEvent */oldSkipValidation = _lastArgs[5],
     oldValidationOverrides = _lastArgs[6];
 
-  // Reference-compared before, which never matched — see `areValidationOverridesEqual`.
-  var validationOverridesAreEqual = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_adf_validator_perf') ? areValidationOverridesEqual(newValidationOverrides, oldValidationOverrides) : newValidationOverrides === oldValidationOverrides;
-
-  // `areDocsEqual` stringifies the whole document, so it goes last and only runs once everything
-  // cheaper has matched. Pure predicates, so ordering cannot change the result; the experiment is
-  // resolved above regardless, so exposure does not depend on reaching it.
-  return newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && newSkipValidation === oldSkipValidation && validationOverridesAreEqual && areDocsEqual(newDoc, oldDoc);
+  // `areDocsEqual` may stringify the whole document, so it goes last and only runs once everything
+  // cheaper has matched.
+  return newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && newSkipValidation === oldSkipValidation && areValidationOverridesEqual(newValidationOverrides, oldValidationOverrides) && areDocsEqual(newDoc, oldDoc);
 });
 
 // Ignored via go/ees005
@@ -186,10 +181,9 @@ var areDocsEqual = function areDocsEqual(docA, docB) {
 
   // PMNode
   if (docA.type && docA.toJSON && docB.type && docB.toJSON) {
-    // `Node.eq` compares markup and content directly. The stringify path builds two JSON trees via
-    // `toJSON`, then two strings from them, and discards all four — ~14x slower on a 5k-node
-    // document. Same result either way; `Node.eq` is the comparison ProseMirror intends for this.
-    if (typeof docA.eq === 'function' && typeof docB.eq === 'function' && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_adf_validator_perf')) {
+    // `Node.eq` compares markup and content directly; stringifying both `toJSON` trees gives the
+    // same answer ~14x slower on a 5k-node document.
+    if (typeof docA.eq === 'function' && typeof docB.eq === 'function') {
       return docA.eq(docB);
     }
     return JSON.stringify(docA.toJSON()) === JSON.stringify(docB.toJSON());

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

@@ -868,6 +868,9 @@ var extensionAsInlineStyle = (0, _react.css)((0, _defineProperty2.default)((0, _
 }), ".".concat(_consts.RendererCssClassName.EXTENSION_AS_INLINE, " .").concat(_consts.RendererCssClassName.EXTENSION_INNER_WRAPPER), {
   display: 'inline-block'
 }));
+var migratedInlineBodiedFlowStyle = (0, _react.css)((0, _defineProperty2.default)({}, [".".concat(_consts.RendererCssClassName.DOCUMENT, " [data-migrated-inline] + [data-as-inline=\"on\"]"), ".".concat(_consts.RendererCssClassName.DOCUMENT, " [data-as-inline=\"on\"]:has(+ [data-migrated-inline])")].join(', '), {
+  display: 'inline'
+}));
 var forgeInlineBodiedSpacingStyle = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(_consts.RendererCssClassName.DOCUMENT, " .").concat(_consts.RendererCssClassName.EXTENSION_AS_INLINE, "[data-forge-inline]"), {
   marginBottom: 0,
   verticalAlign: 'baseline',
@@ -2288,7 +2291,7 @@ var RendererStyleContainer = exports.RendererStyleContainer = function RendererS
     // eslint-disable-next-line @atlaskit/platform/no-preconditioning
     (0, _fg.fg)('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, (0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? baseOtherStyles : baseOtherStylesDuplicateAnchor,
     // this should be placed after baseOtherStyles
-    (0, _expValEquals.expValEquals)('platform_editor_render_bodied_extension_as_inline', 'isEnabled', true) && ((0, _expValEquals.expValEquals)('platform_editor_remove_important_in_render_ext', 'isEnabled', true) ? extensionAsInlineStyle : oldExtensionAsInlineStyle), forgeInlineBodiedSpacingStyle, inlineExtensionRendererMarginFix, allowNestedHeaderLinks && ((0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? alignedHeadingAnchorStyle : alignedHeadingAnchorStyleDuplicateAnchor), mediaSingleSharedStyle, firstWrappedMediaStyles, tableSharedStyle, (0, _expValEquals.expValEquals)('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableOuterBorderOverlayStyles, (0, _expValEquals.expValEquals)('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableRemixBlockHighlightStyles, (0, _expValEquals.expValEquals)('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && tableContentModeScopedStyles, (0, _expValEquals.expValEquals)('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_fit_to_content_patch_2') && tableContentModeExtensionContainmentStyles, (0, _expValEquals.expValEquals)('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && tableContentModeNestedTableStyles, tableRendererHeaderStylesForTableCellOnly, (0, _fg.fg)('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, firstNodeWithNotMarginTopWithNestedDnD, rendererTableStyles, isStickyScrollbarOn && stickyScrollbarStyles, isStickyScrollbarOn && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_css_overflow_shadow') && stickyScrollbarOverflowShadowFixStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_table_menu_updates', 'isEnabled', true) && rendererTableSortableColumnValignStyles, allowColumnSorting && allowNestedHeaderLinks && ((0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks : rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinksDuplicateAnchor), rendererTableColumnStyles, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && responsiveBreakoutWidth, appearance === 'full-page' && isPreviewPanelResponsivenessOn && responsiveBreakoutWidthWithReducedPadding, (appearance === 'full-width' || appearance === 'max' && ((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true))) && responsiveBreakoutWidthFullWidth, (0, _expValEquals.expValEquals)('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? contentMode === 'compact' ? scaledDenseEmojiStyles : scaledEmojiStyles : contentMode === 'compact' ? denseStyles : undefined, contentMode === 'compact' ? scaledDenseUnicodeEmojiStylesNew : scaledUnicodeEmojiStylesNew, syncBlockStyles, centerWrapperStyles, isInsideSyncBlock ? syncBlockRendererStyles : null, isInsideSyncBlock && tableFakeBorderStyles, isInsideSyncBlock && (0, _expValEquals.expValEquals)('platform_editor_table_q4_loveability', 'isEnabled', true) ? roundedTableFakeBorderOverlayStyles : null, (0, _expValEquals.expValEquals)('platform_editor_hide_extension_renderer_support', 'isEnabled', true) && hideExtensionStyles],
+    (0, _expValEquals.expValEquals)('platform_editor_render_bodied_extension_as_inline', 'isEnabled', true) && ((0, _expValEquals.expValEquals)('platform_editor_remove_important_in_render_ext', 'isEnabled', true) ? extensionAsInlineStyle : oldExtensionAsInlineStyle), (0, _fg.fg)('platform_forge_inline_bodied_macro') && [migratedInlineBodiedFlowStyle, forgeInlineBodiedSpacingStyle], inlineExtensionRendererMarginFix, allowNestedHeaderLinks && ((0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? alignedHeadingAnchorStyle : alignedHeadingAnchorStyleDuplicateAnchor), mediaSingleSharedStyle, firstWrappedMediaStyles, tableSharedStyle, (0, _expValEquals.expValEquals)('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableOuterBorderOverlayStyles, (0, _expValEquals.expValEquals)('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableRemixBlockHighlightStyles, (0, _expValEquals.expValEquals)('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && tableContentModeScopedStyles, (0, _expValEquals.expValEquals)('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_fit_to_content_patch_2') && tableContentModeExtensionContainmentStyles, (0, _expValEquals.expValEquals)('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && tableContentModeNestedTableStyles, tableRendererHeaderStylesForTableCellOnly, (0, _fg.fg)('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, firstNodeWithNotMarginTopWithNestedDnD, rendererTableStyles, isStickyScrollbarOn && stickyScrollbarStyles, isStickyScrollbarOn && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_css_overflow_shadow') && stickyScrollbarOverflowShadowFixStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_table_menu_updates', 'isEnabled', true) && rendererTableSortableColumnValignStyles, allowColumnSorting && allowNestedHeaderLinks && ((0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks : rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinksDuplicateAnchor), rendererTableColumnStyles, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && responsiveBreakoutWidth, appearance === 'full-page' && isPreviewPanelResponsivenessOn && responsiveBreakoutWidthWithReducedPadding, (appearance === 'full-width' || appearance === 'max' && ((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true))) && responsiveBreakoutWidthFullWidth, (0, _expValEquals.expValEquals)('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? contentMode === 'compact' ? scaledDenseEmojiStyles : scaledEmojiStyles : contentMode === 'compact' ? denseStyles : undefined, contentMode === 'compact' ? scaledDenseUnicodeEmojiStylesNew : scaledUnicodeEmojiStylesNew, syncBlockStyles, centerWrapperStyles, isInsideSyncBlock ? syncBlockRendererStyles : null, isInsideSyncBlock && tableFakeBorderStyles, isInsideSyncBlock && (0, _expValEquals.expValEquals)('platform_editor_table_q4_loveability', 'isEnabled', true) ? roundedTableFakeBorderOverlayStyles : null, (0, _expValEquals.expValEquals)('platform_editor_hide_extension_renderer_support', 'isEnabled', true) && hideExtensionStyles],
     "data-testid": testId
   }, children);
 };

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

@@ -73,7 +73,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var TABLE_INFO_TIMEOUT = 10000;
 var RENDER_EVENT_SAMPLE_RATE = 0.1;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "138.1.3";
+var packageVersion = "138.1.5";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'
@@ -472,7 +472,8 @@ var RendererFunctionalComponent = exports.RendererFunctionalComponent = function
   var isCollapsibleHeadingsEnabled = props.allowCollapsibleHeadings === true && ['full-page', 'full-width', 'max'].includes(props.appearance || '') && rendererContext.isTopLevelRenderer && (0, _isExperimentEnabled.isExperimentEnabled)('platform_renderer_collapsible_headings');
   (0, _useScrollToBlock.useScrollToBlock)(editorRef, props.document, props.scrollToBlock);
   var allowNestedTables = props.allowNestedTables;
-  var stableValidationOverrides = (0, _react.useMemo)(function () {
+  // Memoised so `renderDocument`'s validation memo can match by reference across re-renders.
+  var validationOverrides = (0, _react.useMemo)(function () {
     var schema = getSchema(props.schema, props.adfStage);
     return (0, _nesting.isPanelNestingTableSupported)(schema) ? {
       allowNestedTables: allowNestedTables,
@@ -482,11 +483,6 @@ var RendererFunctionalComponent = exports.RendererFunctionalComponent = function
     };
   }, [allowNestedTables, getSchema, props.schema, props.adfStage]);
 
-  // Gate read only on the table-in-panel path, the one that used to build a new object every
-  // render; elsewhere both arms are already identical. Control keeps the copy-per-render
-  // behaviour, which is what makes `renderDocument`'s validation memo miss.
-  var validationOverrides = stableValidationOverrides.allowTableInPanel && !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_adf_validator_perf') ? _objectSpread({}, stableValidationOverrides) : stableValidationOverrides;
-
   // Invoking `onComplete` during render lets consumers set state on other components mid-render,
   // so the stat is parked here and delivered once the rendered document has been committed.
   // No dependency array: `renderDocument` produces a new stat on every render, so the callback

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

@@ -104,7 +104,8 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
    * per render, and the cheap checks stay in front of it so anything ineligible short-circuits
    * without firing an exposure it can never act on.
    */
-  const isForgeInlineBodiedEnabled = Boolean((node === null || node === void 0 ? void 0 : node.extensionType) === FORGE_EXTENSION_TYPE && (node === null || node === void 0 ? void 0 : node.content) && (node === null || node === void 0 ? void 0 : (_node$parameters = node.parameters) === null || _node$parameters === void 0 ? void 0 : (_node$parameters$gues = _node$parameters.guestParams) === null || _node$parameters$gues === void 0 ? void 0 : _node$parameters$gues[FORGE_INLINE_BODIED_PARAM]) === 'true' && fg('platform_forge_inline_bodied_macro'));
+  const hasForgeInlineBodiedMarker = Boolean((node === null || node === void 0 ? void 0 : node.extensionType) === FORGE_EXTENSION_TYPE && (node === null || node === void 0 ? void 0 : node.content) && (node === null || node === void 0 ? void 0 : (_node$parameters = node.parameters) === null || _node$parameters === void 0 ? void 0 : (_node$parameters$gues = _node$parameters.guestParams) === null || _node$parameters$gues === void 0 ? void 0 : _node$parameters$gues[FORGE_INLINE_BODIED_PARAM]) === 'true');
+  const isForgeInlineBodiedEnabled = hasForgeInlineBodiedMarker && fg('platform_forge_inline_bodied_macro');
   /**
    * The pass that marks the sibling textblocks around an inline extension resolves their
    * positions without a depth term, so it only ever matches at the top level. Inlining a nested
@@ -122,6 +123,12 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
    * nested document's block spacing be collapsed too.
    */
   const isNativeForgeInline = Boolean(isInline && isForgeInlineBodiedEnabled);
+  /**
+   * Migrated inline-bodied macros intentionally do not receive the native Forge marker. Mark the
+   * rendered wrapper instead so the stylesheet can fix only the surrounding text flow without
+   * applying the native nested-renderer, overflow or sizing rules to migrated content.
+   */
+  const isMigratedInlineBodied = Boolean(isInline && (node === null || node === void 0 ? void 0 : node.content) && !hasForgeInlineBodiedMarker && fg('platform_forge_inline_bodied_macro'));
   const asInlineAnalytics = isInline && fireAnalyticsEvent && node ? jsx(FireExtensionAsInlineAnalytics, {
     fireAnalyticsEvent: fireAnalyticsEvent,
     node: node
@@ -144,13 +151,14 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
       "data-testid": "extension--wrapper",
       "data-node-type": "extension",
       "data-top-level": isTopLevel || undefined,
-      "data-forge-inline": isNativeForgeInline || undefined
+      "data-forge-inline": isNativeForgeInline || undefined,
+      "data-migrated-inline": isMigratedInlineBodied || undefined
     }, jsx("div", {
       tabIndex: options.tabIndex
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: `${RendererCssClassName.EXTENSION_INNER_WRAPPER} ${overflowContainerClass}`,
-      css: [!(isInsideOfTable && !isExperimentEnabled('platform_editor_table_fit_to_content_patch_2') && isExperimentEnabled('platform_editor_table_fit_to_content_patch_1')) && !isInsideOfInlineExtension && fg('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [(!isInsideOfTable || isExperimentEnabled('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && fg('platform_fix_macro_renders_in_layouts') && containerStyle]
     }, asInlineAnalytics, content));
     return centerAlignClass ? jsx("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
@@ -176,13 +184,14 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
       "data-layout": layout,
       "data-local-id": localId,
       "data-top-level": isTopLevel || undefined,
-      "data-forge-inline": isNativeForgeInline || undefined
+      "data-forge-inline": isNativeForgeInline || undefined,
+      "data-migrated-inline": isMigratedInlineBodied || undefined
     }, jsx("div", {
       tabIndex: options.tabIndex
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: `${RendererCssClassName.EXTENSION_INNER_WRAPPER} ${overflowContainerClass}`,
-      css: [!(isInsideOfTable && !isExperimentEnabled('platform_editor_table_fit_to_content_patch_2') && isExperimentEnabled('platform_editor_table_fit_to_content_patch_1')) && !isInsideOfInlineExtension && fg('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [(!isInsideOfTable || isExperimentEnabled('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && fg('platform_fix_macro_renders_in_layouts') && containerStyle]
     }, asInlineAnalytics, content));
     return centerAlignClass ? jsx("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop

package/dist/es2019/render-document.js

@@ -6,7 +6,6 @@ import { nativeEmbedsFallbackTransform, transformContainerNodes, transformMediaL
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { findAndTrackUnsupportedContentNodes, validateADFEntity } from '@atlaskit/editor-common/utils';
 import { getValidDocument } from '@atlaskit/editor-common/validator';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import memoizeOne from 'memoize-one';
@@ -149,13 +148,9 @@ const memoValidation = memoizeOne(_validation, (newArgs, lastArgs) => {
   const [newDoc, newSchema, newADFStage, newUseSpecValidator,, /* ignoring dispatchAnalyticsEvent */newSkipValidation, newValidationOverrides] = newArgs;
   const [oldDoc, oldSchema, oldADFStage, oldUseSpecValidator,, /* ignoring dispatchAnalyticsEvent */oldSkipValidation, oldValidationOverrides] = lastArgs;
 
-  // Reference-compared before, which never matched — see `areValidationOverridesEqual`.
-  const validationOverridesAreEqual = isExperimentEnabled('platform_editor_adf_validator_perf') ? areValidationOverridesEqual(newValidationOverrides, oldValidationOverrides) : newValidationOverrides === oldValidationOverrides;
-
-  // `areDocsEqual` stringifies the whole document, so it goes last and only runs once everything
-  // cheaper has matched. Pure predicates, so ordering cannot change the result; the experiment is
-  // resolved above regardless, so exposure does not depend on reaching it.
-  return newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && newSkipValidation === oldSkipValidation && validationOverridesAreEqual && areDocsEqual(newDoc, oldDoc);
+  // `areDocsEqual` may stringify the whole document, so it goes last and only runs once everything
+  // cheaper has matched.
+  return newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && newSkipValidation === oldSkipValidation && areValidationOverridesEqual(newValidationOverrides, oldValidationOverrides) && areDocsEqual(newDoc, oldDoc);
 });
 
 // Ignored via go/ees005
@@ -170,10 +165,9 @@ const areDocsEqual = (docA, docB) => {
 
   // PMNode
   if (docA.type && docA.toJSON && docB.type && docB.toJSON) {
-    // `Node.eq` compares markup and content directly. The stringify path builds two JSON trees via
-    // `toJSON`, then two strings from them, and discards all four — ~14x slower on a 5k-node
-    // document. Same result either way; `Node.eq` is the comparison ProseMirror intends for this.
-    if (typeof docA.eq === 'function' && typeof docB.eq === 'function' && isExperimentEnabled('platform_editor_adf_validator_perf')) {
+    // `Node.eq` compares markup and content directly; stringifying both `toJSON` trees gives the
+    // same answer ~14x slower on a 5k-node document.
+    if (typeof docA.eq === 'function' && typeof docB.eq === 'function') {
       return docA.eq(docB);
     }
     return JSON.stringify(docA.toJSON()) === JSON.stringify(docB.toJSON());

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

@@ -1028,6 +1028,11 @@ const extensionAsInlineStyle = css({
     display: 'inline-block'
   }
 });
+const migratedInlineBodiedFlowStyle = css({
+  [[`.${RendererCssClassName.DOCUMENT} [data-migrated-inline] + [data-as-inline="on"]`, `.${RendererCssClassName.DOCUMENT} [data-as-inline="on"]:has(+ [data-migrated-inline])`].join(', ')]: {
+    display: 'inline'
+  }
+});
 const forgeInlineBodiedSpacingStyle = css({
   [`.${RendererCssClassName.DOCUMENT} .${RendererCssClassName.EXTENSION_AS_INLINE}[data-forge-inline]`]: {
     marginBottom: 0,
@@ -2916,7 +2921,7 @@ export const RendererStyleContainer = props => {
     // eslint-disable-next-line @atlaskit/platform/no-preconditioning
     fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? baseOtherStyles : baseOtherStylesDuplicateAnchor,
     // this should be placed after baseOtherStyles
-    expValEquals('platform_editor_render_bodied_extension_as_inline', 'isEnabled', true) && (expValEquals('platform_editor_remove_important_in_render_ext', 'isEnabled', true) ? extensionAsInlineStyle : oldExtensionAsInlineStyle), forgeInlineBodiedSpacingStyle, inlineExtensionRendererMarginFix, allowNestedHeaderLinks && (expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? alignedHeadingAnchorStyle : alignedHeadingAnchorStyleDuplicateAnchor), mediaSingleSharedStyle, firstWrappedMediaStyles, tableSharedStyle, expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableOuterBorderOverlayStyles, expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableRemixBlockHighlightStyles, expValEquals('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && tableContentModeScopedStyles, expValEquals('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && isExperimentEnabled('platform_editor_table_fit_to_content_patch_2') && tableContentModeExtensionContainmentStyles, expValEquals('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && tableContentModeNestedTableStyles, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, firstNodeWithNotMarginTopWithNestedDnD, rendererTableStyles, isStickyScrollbarOn && stickyScrollbarStyles, isStickyScrollbarOn && isExperimentEnabled('platform_editor_table_css_overflow_shadow') && stickyScrollbarOverflowShadowFixStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && expValEqualsNoExposure('platform_editor_table_menu_updates', 'isEnabled', true) && rendererTableSortableColumnValignStyles, allowColumnSorting && allowNestedHeaderLinks && (expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks : rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinksDuplicateAnchor), rendererTableColumnStyles, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && responsiveBreakoutWidth, appearance === 'full-page' && isPreviewPanelResponsivenessOn && responsiveBreakoutWidthWithReducedPadding, (appearance === 'full-width' || appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true))) && responsiveBreakoutWidthFullWidth, expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? contentMode === 'compact' ? scaledDenseEmojiStyles : scaledEmojiStyles : contentMode === 'compact' ? denseStyles : undefined, contentMode === 'compact' ? scaledDenseUnicodeEmojiStylesNew : scaledUnicodeEmojiStylesNew, syncBlockStyles, centerWrapperStyles, isInsideSyncBlock ? syncBlockRendererStyles : null, isInsideSyncBlock && tableFakeBorderStyles, isInsideSyncBlock && expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) ? roundedTableFakeBorderOverlayStyles : null, expValEquals('platform_editor_hide_extension_renderer_support', 'isEnabled', true) && hideExtensionStyles],
+    expValEquals('platform_editor_render_bodied_extension_as_inline', 'isEnabled', true) && (expValEquals('platform_editor_remove_important_in_render_ext', 'isEnabled', true) ? extensionAsInlineStyle : oldExtensionAsInlineStyle), fg('platform_forge_inline_bodied_macro') && [migratedInlineBodiedFlowStyle, forgeInlineBodiedSpacingStyle], inlineExtensionRendererMarginFix, allowNestedHeaderLinks && (expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? alignedHeadingAnchorStyle : alignedHeadingAnchorStyleDuplicateAnchor), mediaSingleSharedStyle, firstWrappedMediaStyles, tableSharedStyle, expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableOuterBorderOverlayStyles, expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableRemixBlockHighlightStyles, expValEquals('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && tableContentModeScopedStyles, expValEquals('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && isExperimentEnabled('platform_editor_table_fit_to_content_patch_2') && tableContentModeExtensionContainmentStyles, expValEquals('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && tableContentModeNestedTableStyles, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, firstNodeWithNotMarginTopWithNestedDnD, rendererTableStyles, isStickyScrollbarOn && stickyScrollbarStyles, isStickyScrollbarOn && isExperimentEnabled('platform_editor_table_css_overflow_shadow') && stickyScrollbarOverflowShadowFixStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && expValEqualsNoExposure('platform_editor_table_menu_updates', 'isEnabled', true) && rendererTableSortableColumnValignStyles, allowColumnSorting && allowNestedHeaderLinks && (expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks : rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinksDuplicateAnchor), rendererTableColumnStyles, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && responsiveBreakoutWidth, appearance === 'full-page' && isPreviewPanelResponsivenessOn && responsiveBreakoutWidthWithReducedPadding, (appearance === 'full-width' || appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true))) && responsiveBreakoutWidthFullWidth, expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? contentMode === 'compact' ? scaledDenseEmojiStyles : scaledEmojiStyles : contentMode === 'compact' ? denseStyles : undefined, contentMode === 'compact' ? scaledDenseUnicodeEmojiStylesNew : scaledUnicodeEmojiStylesNew, syncBlockStyles, centerWrapperStyles, isInsideSyncBlock ? syncBlockRendererStyles : null, isInsideSyncBlock && tableFakeBorderStyles, isInsideSyncBlock && expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) ? roundedTableFakeBorderOverlayStyles : null, expValEquals('platform_editor_hide_extension_renderer_support', 'isEnabled', true) && hideExtensionStyles],
     "data-testid": testId
   }, children);
 };

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

@@ -59,7 +59,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const TABLE_INFO_TIMEOUT = 10000;
 const RENDER_EVENT_SAMPLE_RATE = 0.1;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "138.1.3";
+const packageVersion = "138.1.5";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'
@@ -463,7 +463,8 @@ export const RendererFunctionalComponent = props => {
   const {
     allowNestedTables
   } = props;
-  const stableValidationOverrides = useMemo(() => {
+  // Memoised so `renderDocument`'s validation memo can match by reference across re-renders.
+  const validationOverrides = useMemo(() => {
     const schema = getSchema(props.schema, props.adfStage);
     return isPanelNestingTableSupported(schema) ? {
       allowNestedTables,
@@ -473,13 +474,6 @@ export const RendererFunctionalComponent = props => {
     };
   }, [allowNestedTables, getSchema, props.schema, props.adfStage]);
 
-  // Gate read only on the table-in-panel path, the one that used to build a new object every
-  // render; elsewhere both arms are already identical. Control keeps the copy-per-render
-  // behaviour, which is what makes `renderDocument`'s validation memo miss.
-  const validationOverrides = stableValidationOverrides.allowTableInPanel && !isExperimentEnabled('platform_editor_adf_validator_perf') ? {
-    ...stableValidationOverrides
-  } : stableValidationOverrides;
-
   // Invoking `onComplete` during render lets consumers set state on other components mid-render,
   // so the stat is parked here and delivered once the rendered document has been committed.
   // No dependency array: `renderDocument` produces a new stat on every render, so the callback

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

@@ -115,7 +115,8 @@ export var renderExtension = function renderExtension(content, layout) {
    * per render, and the cheap checks stay in front of it so anything ineligible short-circuits
    * without firing an exposure it can never act on.
    */
-  var isForgeInlineBodiedEnabled = Boolean((node === null || node === void 0 ? void 0 : node.extensionType) === FORGE_EXTENSION_TYPE && (node === null || node === void 0 ? void 0 : node.content) && (node === null || node === void 0 || (_node$parameters = node.parameters) === null || _node$parameters === void 0 || (_node$parameters = _node$parameters.guestParams) === null || _node$parameters === void 0 ? void 0 : _node$parameters[FORGE_INLINE_BODIED_PARAM]) === 'true' && fg('platform_forge_inline_bodied_macro'));
+  var hasForgeInlineBodiedMarker = Boolean((node === null || node === void 0 ? void 0 : node.extensionType) === FORGE_EXTENSION_TYPE && (node === null || node === void 0 ? void 0 : node.content) && (node === null || node === void 0 || (_node$parameters = node.parameters) === null || _node$parameters === void 0 || (_node$parameters = _node$parameters.guestParams) === null || _node$parameters === void 0 ? void 0 : _node$parameters[FORGE_INLINE_BODIED_PARAM]) === 'true');
+  var isForgeInlineBodiedEnabled = hasForgeInlineBodiedMarker && fg('platform_forge_inline_bodied_macro');
   /**
    * The pass that marks the sibling textblocks around an inline extension resolves their
    * positions without a depth term, so it only ever matches at the top level. Inlining a nested
@@ -133,6 +134,12 @@ export var renderExtension = function renderExtension(content, layout) {
    * nested document's block spacing be collapsed too.
    */
   var isNativeForgeInline = Boolean(isInline && isForgeInlineBodiedEnabled);
+  /**
+   * Migrated inline-bodied macros intentionally do not receive the native Forge marker. Mark the
+   * rendered wrapper instead so the stylesheet can fix only the surrounding text flow without
+   * applying the native nested-renderer, overflow or sizing rules to migrated content.
+   */
+  var isMigratedInlineBodied = Boolean(isInline && (node === null || node === void 0 ? void 0 : node.content) && !hasForgeInlineBodiedMarker && fg('platform_forge_inline_bodied_macro'));
   var asInlineAnalytics = isInline && fireAnalyticsEvent && node ? jsx(FireExtensionAsInlineAnalytics, {
     fireAnalyticsEvent: fireAnalyticsEvent,
     node: node
@@ -155,13 +162,14 @@ export var renderExtension = function renderExtension(content, layout) {
       "data-testid": "extension--wrapper",
       "data-node-type": "extension",
       "data-top-level": isTopLevel || undefined,
-      "data-forge-inline": isNativeForgeInline || undefined
+      "data-forge-inline": isNativeForgeInline || undefined,
+      "data-migrated-inline": isMigratedInlineBodied || undefined
     }, jsx("div", {
       tabIndex: options.tabIndex
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: "".concat(RendererCssClassName.EXTENSION_INNER_WRAPPER, " ").concat(overflowContainerClass),
-      css: [!(isInsideOfTable && !isExperimentEnabled('platform_editor_table_fit_to_content_patch_2') && isExperimentEnabled('platform_editor_table_fit_to_content_patch_1')) && !isInsideOfInlineExtension && fg('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [(!isInsideOfTable || isExperimentEnabled('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && fg('platform_fix_macro_renders_in_layouts') && containerStyle]
     }, asInlineAnalytics, content));
     return centerAlignClass ? jsx("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
@@ -186,13 +194,14 @@ export var renderExtension = function renderExtension(content, layout) {
       "data-layout": layout,
       "data-local-id": localId,
       "data-top-level": isTopLevel || undefined,
-      "data-forge-inline": isNativeForgeInline || undefined
+      "data-forge-inline": isNativeForgeInline || undefined,
+      "data-migrated-inline": isMigratedInlineBodied || undefined
     }, jsx("div", {
       tabIndex: options.tabIndex
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
       ,
       className: "".concat(RendererCssClassName.EXTENSION_INNER_WRAPPER, " ").concat(overflowContainerClass),
-      css: [!(isInsideOfTable && !isExperimentEnabled('platform_editor_table_fit_to_content_patch_2') && isExperimentEnabled('platform_editor_table_fit_to_content_patch_1')) && !isInsideOfInlineExtension && fg('platform_fix_macro_renders_in_layouts') && containerStyle]
+      css: [(!isInsideOfTable || isExperimentEnabled('platform_editor_table_fit_to_content_patch_2')) && !isInsideOfInlineExtension && fg('platform_fix_macro_renders_in_layouts') && containerStyle]
     }, asInlineAnalytics, content));
     return centerAlignClass ? jsx("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop

package/dist/esm/render-document.js

@@ -7,7 +7,6 @@ import { nativeEmbedsFallbackTransform, transformContainerNodes, transformMediaL
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { findAndTrackUnsupportedContentNodes, validateADFEntity } from '@atlaskit/editor-common/utils';
 import { getValidDocument } from '@atlaskit/editor-common/validator';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import memoizeOne from 'memoize-one';
@@ -158,13 +157,9 @@ var memoValidation = memoizeOne(_validation, function (newArgs, lastArgs) {
     /* ignoring dispatchAnalyticsEvent */oldSkipValidation = _lastArgs[5],
     oldValidationOverrides = _lastArgs[6];
 
-  // Reference-compared before, which never matched — see `areValidationOverridesEqual`.
-  var validationOverridesAreEqual = isExperimentEnabled('platform_editor_adf_validator_perf') ? areValidationOverridesEqual(newValidationOverrides, oldValidationOverrides) : newValidationOverrides === oldValidationOverrides;
-
-  // `areDocsEqual` stringifies the whole document, so it goes last and only runs once everything
-  // cheaper has matched. Pure predicates, so ordering cannot change the result; the experiment is
-  // resolved above regardless, so exposure does not depend on reaching it.
-  return newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && newSkipValidation === oldSkipValidation && validationOverridesAreEqual && areDocsEqual(newDoc, oldDoc);
+  // `areDocsEqual` may stringify the whole document, so it goes last and only runs once everything
+  // cheaper has matched.
+  return newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && newSkipValidation === oldSkipValidation && areValidationOverridesEqual(newValidationOverrides, oldValidationOverrides) && areDocsEqual(newDoc, oldDoc);
 });
 
 // Ignored via go/ees005
@@ -179,10 +174,9 @@ var areDocsEqual = function areDocsEqual(docA, docB) {
 
   // PMNode
   if (docA.type && docA.toJSON && docB.type && docB.toJSON) {
-    // `Node.eq` compares markup and content directly. The stringify path builds two JSON trees via
-    // `toJSON`, then two strings from them, and discards all four — ~14x slower on a 5k-node
-    // document. Same result either way; `Node.eq` is the comparison ProseMirror intends for this.
-    if (typeof docA.eq === 'function' && typeof docB.eq === 'function' && isExperimentEnabled('platform_editor_adf_validator_perf')) {
+    // `Node.eq` compares markup and content directly; stringifying both `toJSON` trees gives the
+    // same answer ~14x slower on a 5k-node document.
+    if (typeof docA.eq === 'function' && typeof docB.eq === 'function') {
       return docA.eq(docB);
     }
     return JSON.stringify(docA.toJSON()) === JSON.stringify(docB.toJSON());

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

@@ -861,6 +861,9 @@ var extensionAsInlineStyle = css(_defineProperty(_defineProperty(_defineProperty
 }), ".".concat(RendererCssClassName.EXTENSION_AS_INLINE, " .").concat(RendererCssClassName.EXTENSION_INNER_WRAPPER), {
   display: 'inline-block'
 }));
+var migratedInlineBodiedFlowStyle = css(_defineProperty({}, [".".concat(RendererCssClassName.DOCUMENT, " [data-migrated-inline] + [data-as-inline=\"on\"]"), ".".concat(RendererCssClassName.DOCUMENT, " [data-as-inline=\"on\"]:has(+ [data-migrated-inline])")].join(', '), {
+  display: 'inline'
+}));
 var forgeInlineBodiedSpacingStyle = css(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ".".concat(RendererCssClassName.DOCUMENT, " .").concat(RendererCssClassName.EXTENSION_AS_INLINE, "[data-forge-inline]"), {
   marginBottom: 0,
   verticalAlign: 'baseline',
@@ -2281,7 +2284,7 @@ export var RendererStyleContainer = function RendererStyleContainer(props) {
     // eslint-disable-next-line @atlaskit/platform/no-preconditioning
     fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? baseOtherStyles : baseOtherStylesDuplicateAnchor,
     // this should be placed after baseOtherStyles
-    expValEquals('platform_editor_render_bodied_extension_as_inline', 'isEnabled', true) && (expValEquals('platform_editor_remove_important_in_render_ext', 'isEnabled', true) ? extensionAsInlineStyle : oldExtensionAsInlineStyle), forgeInlineBodiedSpacingStyle, inlineExtensionRendererMarginFix, allowNestedHeaderLinks && (expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? alignedHeadingAnchorStyle : alignedHeadingAnchorStyleDuplicateAnchor), mediaSingleSharedStyle, firstWrappedMediaStyles, tableSharedStyle, expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableOuterBorderOverlayStyles, expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableRemixBlockHighlightStyles, expValEquals('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && tableContentModeScopedStyles, expValEquals('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && isExperimentEnabled('platform_editor_table_fit_to_content_patch_2') && tableContentModeExtensionContainmentStyles, expValEquals('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && tableContentModeNestedTableStyles, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, firstNodeWithNotMarginTopWithNestedDnD, rendererTableStyles, isStickyScrollbarOn && stickyScrollbarStyles, isStickyScrollbarOn && isExperimentEnabled('platform_editor_table_css_overflow_shadow') && stickyScrollbarOverflowShadowFixStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && expValEqualsNoExposure('platform_editor_table_menu_updates', 'isEnabled', true) && rendererTableSortableColumnValignStyles, allowColumnSorting && allowNestedHeaderLinks && (expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks : rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinksDuplicateAnchor), rendererTableColumnStyles, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && responsiveBreakoutWidth, appearance === 'full-page' && isPreviewPanelResponsivenessOn && responsiveBreakoutWidthWithReducedPadding, (appearance === 'full-width' || appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true))) && responsiveBreakoutWidthFullWidth, expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? contentMode === 'compact' ? scaledDenseEmojiStyles : scaledEmojiStyles : contentMode === 'compact' ? denseStyles : undefined, contentMode === 'compact' ? scaledDenseUnicodeEmojiStylesNew : scaledUnicodeEmojiStylesNew, syncBlockStyles, centerWrapperStyles, isInsideSyncBlock ? syncBlockRendererStyles : null, isInsideSyncBlock && tableFakeBorderStyles, isInsideSyncBlock && expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) ? roundedTableFakeBorderOverlayStyles : null, expValEquals('platform_editor_hide_extension_renderer_support', 'isEnabled', true) && hideExtensionStyles],
+    expValEquals('platform_editor_render_bodied_extension_as_inline', 'isEnabled', true) && (expValEquals('platform_editor_remove_important_in_render_ext', 'isEnabled', true) ? extensionAsInlineStyle : oldExtensionAsInlineStyle), fg('platform_forge_inline_bodied_macro') && [migratedInlineBodiedFlowStyle, forgeInlineBodiedSpacingStyle], inlineExtensionRendererMarginFix, allowNestedHeaderLinks && (expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? alignedHeadingAnchorStyle : alignedHeadingAnchorStyleDuplicateAnchor), mediaSingleSharedStyle, firstWrappedMediaStyles, tableSharedStyle, expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableOuterBorderOverlayStyles, expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableRemixBlockHighlightStyles, expValEquals('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && tableContentModeScopedStyles, expValEquals('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && isExperimentEnabled('platform_editor_table_fit_to_content_patch_2') && tableContentModeExtensionContainmentStyles, expValEquals('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && tableContentModeNestedTableStyles, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, firstNodeWithNotMarginTopWithNestedDnD, rendererTableStyles, isStickyScrollbarOn && stickyScrollbarStyles, isStickyScrollbarOn && isExperimentEnabled('platform_editor_table_css_overflow_shadow') && stickyScrollbarOverflowShadowFixStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && expValEqualsNoExposure('platform_editor_table_menu_updates', 'isEnabled', true) && rendererTableSortableColumnValignStyles, allowColumnSorting && allowNestedHeaderLinks && (expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks : rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinksDuplicateAnchor), rendererTableColumnStyles, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && responsiveBreakoutWidth, appearance === 'full-page' && isPreviewPanelResponsivenessOn && responsiveBreakoutWidthWithReducedPadding, (appearance === 'full-width' || appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true))) && responsiveBreakoutWidthFullWidth, expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? contentMode === 'compact' ? scaledDenseEmojiStyles : scaledEmojiStyles : contentMode === 'compact' ? denseStyles : undefined, contentMode === 'compact' ? scaledDenseUnicodeEmojiStylesNew : scaledUnicodeEmojiStylesNew, syncBlockStyles, centerWrapperStyles, isInsideSyncBlock ? syncBlockRendererStyles : null, isInsideSyncBlock && tableFakeBorderStyles, isInsideSyncBlock && expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) ? roundedTableFakeBorderOverlayStyles : null, expValEquals('platform_editor_hide_extension_renderer_support', 'isEnabled', true) && hideExtensionStyles],
     "data-testid": testId
   }, children);
 };

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

@@ -64,7 +64,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var TABLE_INFO_TIMEOUT = 10000;
 var RENDER_EVENT_SAMPLE_RATE = 0.1;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "138.1.3";
+var packageVersion = "138.1.5";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'
@@ -463,7 +463,8 @@ export var RendererFunctionalComponent = function RendererFunctionalComponent(pr
   var isCollapsibleHeadingsEnabled = props.allowCollapsibleHeadings === true && ['full-page', 'full-width', 'max'].includes(props.appearance || '') && rendererContext.isTopLevelRenderer && isExperimentEnabled('platform_renderer_collapsible_headings');
   useScrollToBlock(editorRef, props.document, props.scrollToBlock);
   var allowNestedTables = props.allowNestedTables;
-  var stableValidationOverrides = useMemo(function () {
+  // Memoised so `renderDocument`'s validation memo can match by reference across re-renders.
+  var validationOverrides = useMemo(function () {
     var schema = getSchema(props.schema, props.adfStage);
     return isPanelNestingTableSupported(schema) ? {
       allowNestedTables: allowNestedTables,
@@ -473,11 +474,6 @@ export var RendererFunctionalComponent = function RendererFunctionalComponent(pr
     };
   }, [allowNestedTables, getSchema, props.schema, props.adfStage]);
 
-  // Gate read only on the table-in-panel path, the one that used to build a new object every
-  // render; elsewhere both arms are already identical. Control keeps the copy-per-render
-  // behaviour, which is what makes `renderDocument`'s validation memo miss.
-  var validationOverrides = stableValidationOverrides.allowTableInPanel && !isExperimentEnabled('platform_editor_adf_validator_perf') ? _objectSpread({}, stableValidationOverrides) : stableValidationOverrides;
-
   // Invoking `onComplete` during render lets consumers set state on other components mid-render,
   // so the stat is parked here and delivered once the rendered document has been committed.
   // No dependency array: `renderDocument` produces a new stat on every render, so the callback

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "138.1.4",
+	"version": "138.1.6",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -70,7 +70,7 @@
 		"@atlaskit/status": "^5.9.0",
 		"@atlaskit/task-decision": "^21.9.0",
 		"@atlaskit/theme": "^28.2.0",
-		"@atlaskit/tmp-editor-statsig": "^183.0.0",
+		"@atlaskit/tmp-editor-statsig": "^184.0.0",
 		"@atlaskit/tokens": "^16.11.0",
 		"@atlaskit/tooltip": "^24.3.0",
 		"@atlaskit/visually-hidden": "^4.4.0",
@@ -124,6 +124,7 @@
 		"@atlassian/feature-flags-test-utils": "^1.3.0",
 		"@atlassian/structured-docs-types": "workspace:^",
 		"@atlassian/testing-library": "^0.11.0",
+		"@atlassian/workbench": "workspace:*",
 		"@testing-library/react": "^16.3.0",
 		"@testing-library/user-event": "^14.4.3",
 		"@types/react-loadable": "^5.4.1",

package/afm-cc/tsconfig.json

@@ -1,164 +0,0 @@
-{
-	"extends": "../../../../tsconfig.local-consumption.json",
-	"compilerOptions": {
-		"outDir": "../../../../../confluence/tsDist/@atlaskit__renderer",
-		"rootDir": "../",
-		"composite": true,
-		"noCheck": true
-	},
-	"include": [
-		"../src/**/*.ts",
-		"../src/**/*.tsx"
-	],
-	"exclude": [
-		"../src/**/__tests__/*",
-		"../src/**/*.test.*",
-		"../src/**/test.*",
-		"../src/**/examples.*",
-		"../src/**/examples/*",
-		"../src/**/examples/**/*",
-		"../src/**/*.stories.*",
-		"../src/**/stories/*",
-		"../src/**/stories/**/*"
-	],
-	"references": [
-		{
-			"path": "../../adf-schema/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../adf-utils/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../analytics/analytics-listeners/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../analytics/analytics-namespaced-context/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../analytics/analytics-next/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../helpers/browser-apis/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/button/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/code/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/css/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../editor-card-provider/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../editor-json-transformer/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../editor-palette/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../editor-prosemirror/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../editor-shared-styles/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../editor-smart-link-draggable/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../elements/emoji/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../measurement/feature-gate-js-client/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/icon/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/link/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../linking-platform/link-datasource/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../linking-platform/link-extractors/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../linking-platform/linking-common/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../media/media-card/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../media/media-client/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../media/media-client-react/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../media/media-common/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../media/media-filmstrip/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../media/media-ui/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../media/media-viewer/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../platform/feature-experiments/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../platform/feature-flags/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../platform/feature-flags-react/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../pragmatic-drag-and-drop/core/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../react-compiler/react-compiler-gating/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../react-ufo/atlaskit/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../linking-platform/smart-card/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../elements/status/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../elements/task-decision/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/theme/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../tmp-editor-statsig/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/tokens/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/tooltip/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../design-system/visually-hidden/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../editor-common/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../linking-platform/link-provider/afm-cc/tsconfig.json"
-		},
-		{
-			"path": "../../../media/media-core/afm-cc/tsconfig.json"
-		}
-	]
-}