@atlaskit/renderer 140.2.5 → 140.2.6

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/renderer
 
+## 140.2.6
+
+### Patch Changes
+
+- [`5adb85a596691`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5adb85a596691) -
+  [ux] Replace native Forge outputType: inline with layout: inline-bodied. Consumers must use the
+  new layout declaration; stored nodes remain bodiedExtension with rich content. Preserve legacy
+  Connect parameters, native markers, and every existing feature gate, including
+  platform_forge_inline_bodied_macro. Align quick insertion, auto-conversion, configuration saves,
+  and view rendering with the new contract.
+
+  Persist Custom UI inline-bodied presentation in parameters.layout, separately from app
+  configuration, and use it for outer page composition behind
+  platform_forge_inline_bodied_layout_switch. Preserve Connect migration behaviour, keep unsupported
+  nested macros as blocks, and cover gate-off rendering.
+
 ## 140.2.5
 
 ### Patch Changes

package/dist/cjs/react/index.js

@@ -317,7 +317,7 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
       if (key === 'root-0') {
         this.resetState();
       }
-      return this.renderNode(target, props, key, (0, _expandBody.mergeExpandBodyText)(this.getChildNodes(fragment).map(function (node, index) {
+      return this.renderNode(target, props, key, (0, _expandBody.mergeExpandBodyText)(this.getChildNodes(fragment, !(parentInfo !== null && parentInfo !== void 0 && parentInfo.path.length)).map(function (node, index) {
         if ((0, _nodes.isTextWrapper)(node)) {
           return _this2.serializeTextWrapper(node.content, {
             index: index,
@@ -796,6 +796,7 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
     key: "getChildNodes",
     value: function getChildNodes(fragment) {
       var _this8 = this;
+      var isTopLevel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       var children = [];
       fragment.forEach(function (node) {
         children.push(node);
@@ -809,6 +810,7 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
             _this8.inlinePositions.add(pos);
           },
           parentPos: this.startPos,
+          isTopLevel: isTopLevel,
           shouldDisplayExtensionAsInline: this.shouldDisplayExtensionAsInline
         });
       }

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

@@ -80,7 +80,7 @@ var FireExtensionAsInlineAnalytics = function FireExtensionAsInlineAnalytics(_re
   return null;
 };
 var renderExtension = exports.renderExtension = function renderExtension(content, layout) {
-  var _node$parameters;
+  var _node$parameters, _node$parameters2;
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var removeOverflow = arguments.length > 3 ? arguments[3] : undefined;
   var extensionId = arguments.length > 4 ? arguments[4] : undefined;
@@ -114,7 +114,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
   var viewportSize = getViewportSize(extensionId, extensionViewportSizes);
   var extensionHeight = nodeHeight || viewportSize;
   /**
-   * Scoped to nodes inserted by an app declaring `outputType: inline`, which is what writes
+   * Scoped to nodes inserted by an app declaring `layout: inline-bodied`, which is what writes
    * `atlassianForgeInlineBodied`. The output-type marker alone would also match migrated Connect
    * content — it carries the same marker, and after an upgrade plus a storage round trip in the
    * same shape — so keying on it would change how existing content renders. The renderer only
@@ -127,6 +127,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
    */
   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');
+  var isInlineBodiedLayoutEnabled = (node === null || node === void 0 ? void 0 : node.extensionType) === FORGE_EXTENSION_TYPE && (node === null || node === void 0 ? void 0 : node.type) === 'bodiedExtension' && (node === null || node === void 0 || (_node$parameters2 = node.parameters) === null || _node$parameters2 === void 0 ? void 0 : _node$parameters2.layout) === 'inline-bodied' && (0, _fg.fg)('platform_forge_inline_bodied_layout_switch') && (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
@@ -134,7 +135,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
    * which is worse than leaving it a block — so keep nested inline-bodied Forge macros as
    * blocks until the sibling marking works at depth.
    */
-  var isNestedForgeInlineBodied = !isTopLevel && isForgeInlineBodiedEnabled;
+  var isNestedForgeInlineBodied = !isTopLevel && (isForgeInlineBodiedEnabled || isInlineBodiedLayoutEnabled);
   var isInline = (shouldDisplayExtensionAsInline === null || shouldDisplayExtensionAsInline === void 0 ? void 0 : shouldDisplayExtensionAsInline(node)) && (0, _expValEquals.expValEquals)('platform_editor_render_bodied_extension_as_inline', 'isEnabled', true) && !isNestedForgeInlineBodied;
   var inlineClassName = isInline ? _consts.RendererCssClassName.EXTENSION_AS_INLINE : '';
   /**
@@ -148,6 +149,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
    * 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.
+   * Custom UI also uses this outer text-flow treatment, without styling inside its iframe.
    */
   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, {

package/dist/cjs/react/utils/markBlockAsInline.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.markBlockAsInline = markBlockAsInline;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -13,19 +14,24 @@ function markBlockAsInline(_ref) {
   var nodes = _ref.nodes,
     onMark = _ref.onMark,
     parentPos = _ref.parentPos,
-    shouldDisplayExtensionAsInline = _ref.shouldDisplayExtensionAsInline;
+    shouldDisplayExtensionAsInline = _ref.shouldDisplayExtensionAsInline,
+    _ref$isTopLevel = _ref.isTopLevel,
+    isTopLevel = _ref$isTopLevel === void 0 ? true : _ref$isTopLevel;
   if (!nodes || nodes.length === 0 || nodes[0].isInline) {
     return;
   }
   function isInlineBodiedExtension(node) {
-    var _node$attrs, _node$attrs2, _node$attrs3, _node$attrs4;
+    var _node$attrs, _node$attrs2, _node$attrs3, _node$attrs4, _node$attrs5, _node$attrs6;
+    if (!isTopLevel && (node === null || node === void 0 ? void 0 : node.type.name) === 'bodiedExtension' && ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.extensionType) === 'com.atlassian.ecosystem' && ((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 || (_node$attrs2 = _node$attrs2.parameters) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.layout) === 'inline-bodied' && (0, _fg.fg)('platform_forge_inline_bodied_layout_switch') && (0, _fg.fg)('platform_forge_inline_bodied_macro')) {
+      return false;
+    }
     return Boolean((node === null || node === void 0 ? void 0 : node.type.name) === 'bodiedExtension' && shouldDisplayExtensionAsInline({
       type: node.type.name,
-      extensionKey: (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.extensionKey,
-      extensionType: (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.extensionType,
-      parameters: (_node$attrs3 = node.attrs) === null || _node$attrs3 === void 0 ? void 0 : _node$attrs3.parameters,
+      extensionKey: (_node$attrs3 = node.attrs) === null || _node$attrs3 === void 0 ? void 0 : _node$attrs3.extensionKey,
+      extensionType: (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.extensionType,
+      parameters: (_node$attrs5 = node.attrs) === null || _node$attrs5 === void 0 ? void 0 : _node$attrs5.parameters,
       content: node.content,
-      localId: (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.localId
+      localId: (_node$attrs6 = node.attrs) === null || _node$attrs6 === void 0 ? void 0 : _node$attrs6.localId
     }));
   }
   try {

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 = "140.2.4";
+var packageVersion = "140.2.5";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/es2019/react/index.js

@@ -299,7 +299,7 @@ export default class ReactSerializer {
     if (key === 'root-0') {
       this.resetState();
     }
-    return this.renderNode(target, props, key, mergeExpandBodyText(this.getChildNodes(fragment).map((node, index) => {
+    return this.renderNode(target, props, key, mergeExpandBodyText(this.getChildNodes(fragment, !(parentInfo !== null && parentInfo !== void 0 && parentInfo.path.length)).map((node, index) => {
       if (isTextWrapper(node)) {
         return this.serializeTextWrapper(node.content, {
           index,
@@ -704,7 +704,7 @@ export default class ReactSerializer {
     }
     return this.getUniqueHeadingId(baseId, headingIds, ++counter);
   }
-  getChildNodes(fragment) {
+  getChildNodes(fragment, isTopLevel = true) {
     let children = [];
     fragment.forEach(node => {
       children.push(node);
@@ -719,6 +719,7 @@ export default class ReactSerializer {
           this.inlinePositions.add(pos);
         },
         parentPos: this.startPos,
+        isTopLevel,
         shouldDisplayExtensionAsInline: this.shouldDisplayExtensionAsInline
       });
     }

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

@@ -69,7 +69,7 @@ const FireExtensionAsInlineAnalytics = ({
   return null;
 };
 export const renderExtension = (content, layout, options = {}, removeOverflow, extensionId, extensionViewportSizes, nodeHeight, localId, shouldDisplayExtensionAsInline, node, isInsideOfInlineExtension) => {
-  var _node$parameters, _node$parameters$gues;
+  var _node$parameters, _node$parameters$gues, _node$parameters2;
   const overflowContainerClass = !removeOverflow ? RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER : '';
 
   // by default, we assume the extension is at top level, (direct child of doc node)
@@ -93,7 +93,7 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
   const viewportSize = getViewportSize(extensionId, extensionViewportSizes);
   const extensionHeight = nodeHeight || viewportSize;
   /**
-   * Scoped to nodes inserted by an app declaring `outputType: inline`, which is what writes
+   * Scoped to nodes inserted by an app declaring `layout: inline-bodied`, which is what writes
    * `atlassianForgeInlineBodied`. The output-type marker alone would also match migrated Connect
    * content — it carries the same marker, and after an upgrade plus a storage round trip in the
    * same shape — so keying on it would change how existing content renders. The renderer only
@@ -106,6 +106,7 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
    */
   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');
+  const isInlineBodiedLayoutEnabled = (node === null || node === void 0 ? void 0 : node.extensionType) === FORGE_EXTENSION_TYPE && (node === null || node === void 0 ? void 0 : node.type) === 'bodiedExtension' && (node === null || node === void 0 ? void 0 : (_node$parameters2 = node.parameters) === null || _node$parameters2 === void 0 ? void 0 : _node$parameters2.layout) === 'inline-bodied' && fg('platform_forge_inline_bodied_layout_switch') && 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
@@ -113,7 +114,7 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
    * which is worse than leaving it a block — so keep nested inline-bodied Forge macros as
    * blocks until the sibling marking works at depth.
    */
-  const isNestedForgeInlineBodied = !isTopLevel && isForgeInlineBodiedEnabled;
+  const isNestedForgeInlineBodied = !isTopLevel && (isForgeInlineBodiedEnabled || isInlineBodiedLayoutEnabled);
   const isInline = (shouldDisplayExtensionAsInline === null || shouldDisplayExtensionAsInline === void 0 ? void 0 : shouldDisplayExtensionAsInline(node)) && expValEquals('platform_editor_render_bodied_extension_as_inline', 'isEnabled', true) && !isNestedForgeInlineBodied;
   const inlineClassName = isInline ? RendererCssClassName.EXTENSION_AS_INLINE : '';
   /**
@@ -127,6 +128,7 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
    * 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.
+   * Custom UI also uses this outer text-flow treatment, without styling inside its iframe.
    */
   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, {

package/dist/es2019/react/utils/markBlockAsInline.js

@@ -1,21 +1,26 @@
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 export function markBlockAsInline({
   nodes,
   onMark,
   parentPos,
-  shouldDisplayExtensionAsInline
+  shouldDisplayExtensionAsInline,
+  isTopLevel = true
 }) {
   if (!nodes || nodes.length === 0 || nodes[0].isInline) {
     return;
   }
   function isInlineBodiedExtension(node) {
-    var _node$attrs, _node$attrs2, _node$attrs3, _node$attrs4;
+    var _node$attrs, _node$attrs2, _node$attrs2$paramete, _node$attrs3, _node$attrs4, _node$attrs5, _node$attrs6;
+    if (!isTopLevel && (node === null || node === void 0 ? void 0 : node.type.name) === 'bodiedExtension' && ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.extensionType) === 'com.atlassian.ecosystem' && ((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : (_node$attrs2$paramete = _node$attrs2.parameters) === null || _node$attrs2$paramete === void 0 ? void 0 : _node$attrs2$paramete.layout) === 'inline-bodied' && fg('platform_forge_inline_bodied_layout_switch') && fg('platform_forge_inline_bodied_macro')) {
+      return false;
+    }
     return Boolean((node === null || node === void 0 ? void 0 : node.type.name) === 'bodiedExtension' && shouldDisplayExtensionAsInline({
       type: node.type.name,
-      extensionKey: (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.extensionKey,
-      extensionType: (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.extensionType,
-      parameters: (_node$attrs3 = node.attrs) === null || _node$attrs3 === void 0 ? void 0 : _node$attrs3.parameters,
+      extensionKey: (_node$attrs3 = node.attrs) === null || _node$attrs3 === void 0 ? void 0 : _node$attrs3.extensionKey,
+      extensionType: (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.extensionType,
+      parameters: (_node$attrs5 = node.attrs) === null || _node$attrs5 === void 0 ? void 0 : _node$attrs5.parameters,
       content: node.content,
-      localId: (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.localId
+      localId: (_node$attrs6 = node.attrs) === null || _node$attrs6 === void 0 ? void 0 : _node$attrs6.localId
     }));
   }
   try {

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 = "140.2.4";
+const packageVersion = "140.2.5";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/esm/react/index.js

@@ -310,7 +310,7 @@ var ReactSerializer = /*#__PURE__*/function () {
       if (key === 'root-0') {
         this.resetState();
       }
-      return this.renderNode(target, props, key, mergeExpandBodyText(this.getChildNodes(fragment).map(function (node, index) {
+      return this.renderNode(target, props, key, mergeExpandBodyText(this.getChildNodes(fragment, !(parentInfo !== null && parentInfo !== void 0 && parentInfo.path.length)).map(function (node, index) {
         if (isTextWrapper(node)) {
           return _this2.serializeTextWrapper(node.content, {
             index: index,
@@ -789,6 +789,7 @@ var ReactSerializer = /*#__PURE__*/function () {
     key: "getChildNodes",
     value: function getChildNodes(fragment) {
       var _this8 = this;
+      var isTopLevel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       var children = [];
       fragment.forEach(function (node) {
         children.push(node);
@@ -802,6 +803,7 @@ var ReactSerializer = /*#__PURE__*/function () {
             _this8.inlinePositions.add(pos);
           },
           parentPos: this.startPos,
+          isTopLevel: isTopLevel,
           shouldDisplayExtensionAsInline: this.shouldDisplayExtensionAsInline
         });
       }

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

@@ -70,7 +70,7 @@ var FireExtensionAsInlineAnalytics = function FireExtensionAsInlineAnalytics(_re
   return null;
 };
 export var renderExtension = function renderExtension(content, layout) {
-  var _node$parameters;
+  var _node$parameters, _node$parameters2;
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var removeOverflow = arguments.length > 3 ? arguments[3] : undefined;
   var extensionId = arguments.length > 4 ? arguments[4] : undefined;
@@ -104,7 +104,7 @@ export var renderExtension = function renderExtension(content, layout) {
   var viewportSize = getViewportSize(extensionId, extensionViewportSizes);
   var extensionHeight = nodeHeight || viewportSize;
   /**
-   * Scoped to nodes inserted by an app declaring `outputType: inline`, which is what writes
+   * Scoped to nodes inserted by an app declaring `layout: inline-bodied`, which is what writes
    * `atlassianForgeInlineBodied`. The output-type marker alone would also match migrated Connect
    * content — it carries the same marker, and after an upgrade plus a storage round trip in the
    * same shape — so keying on it would change how existing content renders. The renderer only
@@ -117,6 +117,7 @@ export var renderExtension = function renderExtension(content, layout) {
    */
   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');
+  var isInlineBodiedLayoutEnabled = (node === null || node === void 0 ? void 0 : node.extensionType) === FORGE_EXTENSION_TYPE && (node === null || node === void 0 ? void 0 : node.type) === 'bodiedExtension' && (node === null || node === void 0 || (_node$parameters2 = node.parameters) === null || _node$parameters2 === void 0 ? void 0 : _node$parameters2.layout) === 'inline-bodied' && fg('platform_forge_inline_bodied_layout_switch') && 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
@@ -124,7 +125,7 @@ export var renderExtension = function renderExtension(content, layout) {
    * which is worse than leaving it a block — so keep nested inline-bodied Forge macros as
    * blocks until the sibling marking works at depth.
    */
-  var isNestedForgeInlineBodied = !isTopLevel && isForgeInlineBodiedEnabled;
+  var isNestedForgeInlineBodied = !isTopLevel && (isForgeInlineBodiedEnabled || isInlineBodiedLayoutEnabled);
   var isInline = (shouldDisplayExtensionAsInline === null || shouldDisplayExtensionAsInline === void 0 ? void 0 : shouldDisplayExtensionAsInline(node)) && expValEquals('platform_editor_render_bodied_extension_as_inline', 'isEnabled', true) && !isNestedForgeInlineBodied;
   var inlineClassName = isInline ? RendererCssClassName.EXTENSION_AS_INLINE : '';
   /**
@@ -138,6 +139,7 @@ export var renderExtension = function renderExtension(content, layout) {
    * 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.
+   * Custom UI also uses this outer text-flow treatment, without styling inside its iframe.
    */
   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, {

package/dist/esm/react/utils/markBlockAsInline.js

@@ -2,23 +2,29 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 export function markBlockAsInline(_ref) {
   var nodes = _ref.nodes,
     onMark = _ref.onMark,
     parentPos = _ref.parentPos,
-    shouldDisplayExtensionAsInline = _ref.shouldDisplayExtensionAsInline;
+    shouldDisplayExtensionAsInline = _ref.shouldDisplayExtensionAsInline,
+    _ref$isTopLevel = _ref.isTopLevel,
+    isTopLevel = _ref$isTopLevel === void 0 ? true : _ref$isTopLevel;
   if (!nodes || nodes.length === 0 || nodes[0].isInline) {
     return;
   }
   function isInlineBodiedExtension(node) {
-    var _node$attrs, _node$attrs2, _node$attrs3, _node$attrs4;
+    var _node$attrs, _node$attrs2, _node$attrs3, _node$attrs4, _node$attrs5, _node$attrs6;
+    if (!isTopLevel && (node === null || node === void 0 ? void 0 : node.type.name) === 'bodiedExtension' && ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.extensionType) === 'com.atlassian.ecosystem' && ((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 || (_node$attrs2 = _node$attrs2.parameters) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.layout) === 'inline-bodied' && fg('platform_forge_inline_bodied_layout_switch') && fg('platform_forge_inline_bodied_macro')) {
+      return false;
+    }
     return Boolean((node === null || node === void 0 ? void 0 : node.type.name) === 'bodiedExtension' && shouldDisplayExtensionAsInline({
       type: node.type.name,
-      extensionKey: (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.extensionKey,
-      extensionType: (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.extensionType,
-      parameters: (_node$attrs3 = node.attrs) === null || _node$attrs3 === void 0 ? void 0 : _node$attrs3.parameters,
+      extensionKey: (_node$attrs3 = node.attrs) === null || _node$attrs3 === void 0 ? void 0 : _node$attrs3.extensionKey,
+      extensionType: (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.extensionType,
+      parameters: (_node$attrs5 = node.attrs) === null || _node$attrs5 === void 0 ? void 0 : _node$attrs5.parameters,
       content: node.content,
-      localId: (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.localId
+      localId: (_node$attrs6 = node.attrs) === null || _node$attrs6 === void 0 ? void 0 : _node$attrs6.localId
     }));
   }
   try {

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 = "140.2.4";
+var packageVersion = "140.2.5";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/types/react/utils/markBlockAsInline.d.ts

@@ -1,6 +1,7 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { ExtensionParams, Parameters } from '@atlaskit/editor-common/extensions';
-export declare function markBlockAsInline({ nodes, onMark, parentPos, shouldDisplayExtensionAsInline, }: {
+export declare function markBlockAsInline({ nodes, onMark, parentPos, shouldDisplayExtensionAsInline, isTopLevel, }: {
+    isTopLevel?: boolean;
     nodes: PMNode[];
     onMark: ({ pos }: {
         pos: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "140.2.5",
+	"version": "140.2.6",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -248,6 +248,10 @@
 		"platform_forge_inline_bodied_macro": {
 			"type": "boolean",
 			"referenceOnly": true
+		},
+		"platform_forge_inline_bodied_layout_switch": {
+			"type": "boolean",
+			"referenceOnly": true
 		}
 	}
 }