@atlaskit/renderer 137.2.2 → 137.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,22 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 137.2.4
4
+
5
+ ### Patch Changes
6
+
7
+ - [`38efae8b5d945`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/38efae8b5d945) -
8
+ Scope MultiBodiedExtension active frame styles to the owning frames article to avoid showing
9
+ nested inactive tab bodies.
10
+ - Updated dependencies
11
+
12
+ ## 137.2.3
13
+
14
+ ### Patch Changes
15
+
16
+ - [`9b0887c8cbac4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9b0887c8cbac4) -
17
+ Clean up feature gate `platform_editor_fix_media_in_renderer`
18
+ - Updated dependencies
19
+
3
20
  ## 137.2.2
4
21
 
5
22
  ### Patch Changes
@@ -16,7 +16,6 @@ require("./layoutColumn-compiled.compiled.css");
16
16
  var _runtime = require("@compiled/react/runtime");
17
17
  var _react = _interopRequireDefault(require("react"));
18
18
  var _ui = require("@atlaskit/editor-common/ui");
19
- var _fg = require("@atlaskit/platform-feature-flags/fg");
20
19
  var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
21
20
  // localized styles, was from clearNextSiblingMarginTopStyle in @atlaskit/editor-common/ui
22
21
  var clearNextSiblingMarginTopStyle = null;
@@ -38,7 +37,7 @@ var LayoutSectionCompiled = exports.LayoutSectionCompiled = function LayoutSecti
38
37
  style: {
39
38
  flexBasis: "".concat(props.width, "%")
40
39
  },
41
- className: (0, _runtime.ax)([(isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'middle' && "_1e0c1txw _2lx21bp4 _1bah1h6o", (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'bottom' && "_1e0c1txw _2lx21bp4 _1bahesu3", (0, _fg.fg)('platform_editor_fix_media_in_renderer') && "_1tihidpf _12kpidpf"])
40
+ className: (0, _runtime.ax)([(isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'middle' && "_1e0c1txw _2lx21bp4 _1bah1h6o", (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'bottom' && "_1e0c1txw _2lx21bp4 _1bahesu3", "_1tihidpf _12kpidpf"])
42
41
  }, /*#__PURE__*/_react.default.createElement(_ui.WidthProvider, null, /*#__PURE__*/_react.default.createElement("div", {
43
42
  className: (0, _runtime.ax)(["_1skbgrf3", "_19segrf3 _1ki1grf3 _bmdegrf3 _166hgrf3 _7g1ogrf3 _sk2jgrf3 _hgeogrf3"])
44
43
  }), props.children));
@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
9
9
  var _react = _interopRequireDefault(require("react"));
10
10
  var _react2 = require("@emotion/react");
11
11
  var _ui = require("@atlaskit/editor-common/ui");
12
- var _fg = require("@atlaskit/platform-feature-flags/fg");
13
12
  var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
14
13
  /**
15
14
  * @jsxRuntime classic
@@ -70,7 +69,7 @@ var LayoutSectionEmotion = exports.LayoutSectionEmotion = function LayoutSection
70
69
  },
71
70
  css: [
72
71
  // Keep separate: Compiled crashes on ternary/object lookup here.
73
- (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'middle' && verticalAlignMiddleStyles, (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'bottom' && verticalAlignBottomStyles, (0, _fg.fg)('platform_editor_fix_media_in_renderer') && multipleWrappedImagesStyle]
72
+ (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'middle' && verticalAlignMiddleStyles, (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'bottom' && verticalAlignBottomStyles, multipleWrappedImagesStyle]
74
73
  }, (0, _react2.jsx)(_ui.WidthProvider, null, (0, _react2.jsx)("div", {
75
74
  css: [clearNextSiblingMarginTopStyle, clearNextSiblingBlockMarkMarginTopStyle]
76
75
  }), props.children));
@@ -39,12 +39,30 @@ var containerStyles = (0, _react.css)({
39
39
  marginTop: 0
40
40
  }
41
41
  });
42
+ var getFramesActiveFrameStyles = function getFramesActiveFrameStyles(activeChildIndex) {
43
+ if (!(0, _fg.fg)('platform_editor_nested_mbe_frames')) {
44
+ return undefined;
45
+ }
46
+
47
+ // Apply the active-frame rule on the frames article itself so nested MBEs
48
+ // only target their own direct frames.
49
+ // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
50
+ return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t\t& > [data-extension-frame='true']:nth-of-type(", ") {\n\t\t\tdisplay: block;\n\t\t}\n\t"])), activeChildIndex + 1);
51
+ };
52
+ var getContainerActiveFrameStyles = function getContainerActiveFrameStyles(activeChildIndex) {
53
+ if ((0, _fg.fg)('platform_editor_nested_mbe_frames')) {
54
+ return undefined;
55
+ }
56
+
57
+ // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
58
+ return (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n\t\t& [data-extension-frame='true']:nth-of-type(", ") {\n\t\t\tdisplay: block;\n\t\t}\n\t"])), activeChildIndex + 1);
59
+ };
42
60
  var MultiBodiedExtensionChildrenContainer = function MultiBodiedExtensionChildrenContainer(_ref) {
43
- var children = _ref.children,
44
- frameId = _ref.frameId;
61
+ var activeChildIndex = _ref.activeChildIndex,
62
+ children = _ref.children;
45
63
  return (0, _react.jsx)("article", {
46
- "data-testid": "multiBodiedExtension--frames",
47
- "data-multibodiedextension-frames-id": frameId
64
+ css: getFramesActiveFrameStyles(activeChildIndex),
65
+ "data-testid": "multiBodiedExtension--frames"
48
66
  }, children);
49
67
  };
50
68
  var MultiBodiedExtensionNavigation = function MultiBodiedExtensionNavigation(_ref2) {
@@ -53,11 +71,6 @@ var MultiBodiedExtensionNavigation = function MultiBodiedExtensionNavigation(_re
53
71
  "data-testid": "multiBodiedExtension-navigation"
54
72
  }, children);
55
73
  };
56
- var getContainerActiveFrameStyles = function getContainerActiveFrameStyles(activeChildIndex, frameId) {
57
- return (0, _fg.fg)('platform_editor_nested_mbe_frames') ? // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
58
- (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t&\n\t\t\t\t\t[data-multibodiedextension-frames-id='", "']\n\t\t\t\t\t> [data-extension-frame='true']:nth-of-type(", ") {\n\t\t\t\t\tdisplay: block;\n\t\t\t\t}\n\t\t\t"])), frameId, activeChildIndex + 1) : // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
59
- (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t& [data-extension-frame='true']:nth-of-type(", ") {\n\t\t\t\t\tdisplay: block;\n\t\t\t\t}\n\t\t\t"])), activeChildIndex + 1);
60
- };
61
74
  var MultiBodiedExtensionWrapperLegacy = function MultiBodiedExtensionWrapperLegacy(_ref3) {
62
75
  var width = _ref3.width,
63
76
  path = _ref3.path,
@@ -144,15 +157,11 @@ var MultiBodiedExtension = function MultiBodiedExtension(props) {
144
157
  }),
145
158
  loading = _useMultiBodiedExtens.loading,
146
159
  extensionContext = _useMultiBodiedExtens.extensionContext;
147
- // Used by the gated active-frame styles to scope selection to this MBE instance.
148
- // Renderer frames are direct children of this article, so the id prevents a parent
149
- // MBE selector from reaching into nested MBEs.
150
- var frameId = _react2.default.useId();
151
160
  var actions = (0, _actions.useMultiBodiedExtensionActions)({
152
161
  updateActiveChild: setActiveChildIndex,
153
162
  children: children,
154
163
  childrenContainer: (0, _react.jsx)(MultiBodiedExtensionChildrenContainer, {
155
- frameId: frameId
164
+ activeChildIndex: activeChildIndex
156
165
  }, children),
157
166
  allowBodiedOverride: extensionContext === null || extensionContext === void 0 || (_extensionContext$pri = extensionContext.privateProps) === null || _extensionContext$pri === void 0 ? void 0 : _extensionContext$pri.__allowBodiedOverride,
158
167
  extensionKey: extensionKey,
@@ -188,13 +197,13 @@ var MultiBodiedExtension = function MultiBodiedExtension(props) {
188
197
  node: node,
189
198
  actions: actions
190
199
  })), (0, _react.jsx)(MultiBodiedExtensionChildrenContainer, {
191
- frameId: frameId
200
+ activeChildIndex: activeChildIndex
192
201
  }, children));
193
202
  }
194
- }, [loading, extensionContext, marks, extensionKey, extensionType, parameters, content, getContent, localId, actions, children, frameId]);
203
+ }, [activeChildIndex, loading, extensionContext, marks, extensionKey, extensionType, parameters, content, getContent, localId, actions, children]);
195
204
 
196
205
  // make the frame visible
197
- var containerActiveFrameStyles = getContainerActiveFrameStyles(activeChildIndex, frameId);
206
+ var containerActiveFrameStyles = getContainerActiveFrameStyles(activeChildIndex);
198
207
  if ((0, _expValEquals.expValEquals)('platform_editor_renderer_extension_width_fix', 'isEnabled', true)) {
199
208
  var _isTopLevel = path.length < 1;
200
209
  var _useCenterWrapper = _isTopLevel && ['wide', 'full-width'].includes(layout);
@@ -2307,9 +2307,7 @@ var RendererStyleContainer = exports.RendererStyleContainer = function RendererS
2307
2307
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
2308
2308
  (0, _fg.fg)('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, (0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? baseOtherStyles : baseOtherStylesDuplicateAnchor,
2309
2309
  // this should be placed after baseOtherStyles
2310
- (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,
2311
- // merge firstWrappedMediaStyles with mediaSingleSharedStyle when clean up platform_editor_fix_media_in_renderer
2312
- (0, _fg.fg)('platform_editor_fix_media_in_renderer') && firstWrappedMediaStyles, tableSharedStyle, (0, _expValEquals.expValEquals)('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableOuterBorderOverlayStyles, (0, _expValEquals.expValEquals)('platform_editor_table_q4_loveability', 'isEnabled', true) && !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_q4_patch_7') && roundedTableLegacyClipPathStyles, (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) && tableContentModeNestedTableStyles, tableRendererHeaderStylesForTableCellOnly, (0, _fg.fg)('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, firstNodeWithNotMarginTopWithNestedDnD, rendererTableStyles, isStickyScrollbarOn && stickyScrollbarStyles, isStickyScrollbarOn && (0, _expValEquals.expValEquals)('platform_editor_table_css_overflow_shadow', 'isEnabled', true) && 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],
2310
+ (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) && !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_q4_patch_7') && roundedTableLegacyClipPathStyles, (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) && tableContentModeNestedTableStyles, tableRendererHeaderStylesForTableCellOnly, (0, _fg.fg)('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, firstNodeWithNotMarginTopWithNestedDnD, rendererTableStyles, isStickyScrollbarOn && stickyScrollbarStyles, isStickyScrollbarOn && (0, _expValEquals.expValEquals)('platform_editor_table_css_overflow_shadow', 'isEnabled', true) && 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],
2313
2311
  "data-testid": testId
2314
2312
  }, children);
2315
2313
  };
@@ -9,7 +9,6 @@ exports.calcLineLength = exports.breakoutInlineScriptContext = void 0;
9
9
  exports.createBreakoutInlineScript = createBreakoutInlineScript;
10
10
  var _react = _interopRequireDefault(require("react"));
11
11
  var _utils = require("@atlaskit/editor-common/utils");
12
- var _fg = require("@atlaskit/platform-feature-flags/fg");
13
12
  var _style = require("./style");
14
13
  var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
15
14
  /* eslint-disable jsdoc/require-jsdoc -- SSR inline script helpers */
@@ -52,7 +51,6 @@ function BreakoutSSRInlineScript(_ref) {
52
51
  }
53
52
  function createBreakoutInlineScript(id, shouldSkipScript) {
54
53
  var flags = {
55
- platform_editor_fix_media_in_renderer: (0, _fg.fg)('platform_editor_fix_media_in_renderer'),
56
54
  platform_editor_renderer_extension_width_fix: (0, _expValEquals.expValEquals)('platform_editor_renderer_extension_width_fix', 'isEnabled', true)
57
55
  };
58
56
  return "(function(window){\nif(typeof window !== 'undefined' && window.__RENDERER_BYPASS_BREAKOUT_SSR__) { return; }\n".concat(breakoutInlineScriptContext, ";\n(").concat(applyBreakoutAfterSSR.toString(), ")(\"").concat(id, "\", breakoutConsts, ").concat(JSON.stringify(shouldSkipScript), ", ").concat(JSON.stringify(flags), ");\n})(window);\n");
@@ -115,7 +113,7 @@ function applyBreakoutAfterSSR(id, breakoutConsts, shouldSkipBreakoutScript, fla
115
113
  var isExtension = nodeType === 'extension' || nodeType === 'bodiedExtension';
116
114
  if (!mode || !WIDE_LAYOUT_MODES.includes(mode) ||
117
115
  // skip apply width styling to mediaSingle node with pixel width to avoid image size changing
118
- isMediaSingleWithPixelWidth && flags['platform_editor_fix_media_in_renderer'] || isExtension && flags['platform_editor_renderer_extension_width_fix']) {
116
+ isMediaSingleWithPixelWidth || isExtension && flags['platform_editor_renderer_extension_width_fix']) {
119
117
  return;
120
118
  }
121
119
 
@@ -74,7 +74,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
74
74
  var TABLE_INFO_TIMEOUT = 10000;
75
75
  var RENDER_EVENT_SAMPLE_RATE = 0.1;
76
76
  var packageName = "@atlaskit/renderer";
77
- var packageVersion = "137.2.1";
77
+ var packageVersion = "137.2.3";
78
78
  var setAsQueryContainerStyles = (0, _react2.css)({
79
79
  containerName: 'ak-renderer-wrapper',
80
80
  containerType: 'inline-size'
@@ -9,7 +9,6 @@ import "./layoutColumn-compiled.compiled.css";
9
9
  import { ax, ix } from "@compiled/react/runtime";
10
10
  import React from 'react';
11
11
  import { WidthProvider } from '@atlaskit/editor-common/ui';
12
- import { fg } from '@atlaskit/platform-feature-flags/fg';
13
12
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
14
13
 
15
14
  // localized styles, was from clearNextSiblingMarginTopStyle in @atlaskit/editor-common/ui
@@ -32,7 +31,7 @@ export const LayoutSectionCompiled = props => {
32
31
  style: {
33
32
  flexBasis: `${props.width}%`
34
33
  },
35
- className: ax([(isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'middle' && "_1e0c1txw _2lx21bp4 _1bah1h6o", (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'bottom' && "_1e0c1txw _2lx21bp4 _1bahesu3", fg('platform_editor_fix_media_in_renderer') && "_1tihidpf _12kpidpf"])
34
+ className: ax([(isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'middle' && "_1e0c1txw _2lx21bp4 _1bah1h6o", (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'bottom' && "_1e0c1txw _2lx21bp4 _1bahesu3", "_1tihidpf _12kpidpf"])
36
35
  }, /*#__PURE__*/React.createElement(WidthProvider, null, /*#__PURE__*/React.createElement("div", {
37
36
  className: ax(["_1skbgrf3", "_19segrf3 _1ki1grf3 _bmdegrf3 _166hgrf3 _7g1ogrf3 _sk2jgrf3 _hgeogrf3"])
38
37
  }), props.children));
@@ -13,7 +13,6 @@ import React from 'react';
13
13
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- intentional: emotion fallback for compiled migration
14
14
  import { css, jsx } from '@emotion/react';
15
15
  import { WidthProvider } from '@atlaskit/editor-common/ui';
16
- import { fg } from '@atlaskit/platform-feature-flags/fg';
17
16
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
18
17
 
19
18
  // localized styles, was from clearNextSiblingMarginTopStyle in @atlaskit/editor-common/ui
@@ -72,7 +71,7 @@ export const LayoutSectionEmotion = props => {
72
71
  },
73
72
  css: [
74
73
  // Keep separate: Compiled crashes on ternary/object lookup here.
75
- (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'middle' && verticalAlignMiddleStyles, (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'bottom' && verticalAlignBottomStyles, fg('platform_editor_fix_media_in_renderer') && multipleWrappedImagesStyle]
74
+ (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'middle' && verticalAlignMiddleStyles, (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'bottom' && verticalAlignBottomStyles, multipleWrappedImagesStyle]
76
75
  }, jsx(WidthProvider, null, jsx("div", {
77
76
  css: [clearNextSiblingMarginTopStyle, clearNextSiblingBlockMarkMarginTopStyle]
78
77
  }), props.children));
@@ -28,13 +28,39 @@ const containerStyles = css({
28
28
  marginTop: 0
29
29
  }
30
30
  });
31
+ const getFramesActiveFrameStyles = activeChildIndex => {
32
+ if (!fg('platform_editor_nested_mbe_frames')) {
33
+ return undefined;
34
+ }
35
+
36
+ // Apply the active-frame rule on the frames article itself so nested MBEs
37
+ // only target their own direct frames.
38
+ // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
39
+ return css`
40
+ & > [data-extension-frame='true']:nth-of-type(${activeChildIndex + 1}) {
41
+ display: block;
42
+ }
43
+ `;
44
+ };
45
+ const getContainerActiveFrameStyles = activeChildIndex => {
46
+ if (fg('platform_editor_nested_mbe_frames')) {
47
+ return undefined;
48
+ }
49
+
50
+ // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
51
+ return css`
52
+ & [data-extension-frame='true']:nth-of-type(${activeChildIndex + 1}) {
53
+ display: block;
54
+ }
55
+ `;
56
+ };
31
57
  const MultiBodiedExtensionChildrenContainer = ({
32
- children,
33
- frameId
58
+ activeChildIndex,
59
+ children
34
60
  }) => {
35
61
  return jsx("article", {
36
- "data-testid": "multiBodiedExtension--frames",
37
- "data-multibodiedextension-frames-id": frameId
62
+ css: getFramesActiveFrameStyles(activeChildIndex),
63
+ "data-testid": "multiBodiedExtension--frames"
38
64
  }, children);
39
65
  };
40
66
  const MultiBodiedExtensionNavigation = ({
@@ -44,23 +70,6 @@ const MultiBodiedExtensionNavigation = ({
44
70
  "data-testid": "multiBodiedExtension-navigation"
45
71
  }, children);
46
72
  };
47
- const getContainerActiveFrameStyles = (activeChildIndex, frameId) => {
48
- return fg('platform_editor_nested_mbe_frames') ?
49
- // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
50
- css`
51
- &
52
- [data-multibodiedextension-frames-id='${frameId}']
53
- > [data-extension-frame='true']:nth-of-type(${activeChildIndex + 1}) {
54
- display: block;
55
- }
56
- ` :
57
- // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
58
- css`
59
- & [data-extension-frame='true']:nth-of-type(${activeChildIndex + 1}) {
60
- display: block;
61
- }
62
- `;
63
- };
64
73
  const MultiBodiedExtensionWrapperLegacy = ({
65
74
  width,
66
75
  path,
@@ -148,15 +157,11 @@ const MultiBodiedExtension = props => {
148
157
  extensionType,
149
158
  extensionKey
150
159
  });
151
- // Used by the gated active-frame styles to scope selection to this MBE instance.
152
- // Renderer frames are direct children of this article, so the id prevents a parent
153
- // MBE selector from reaching into nested MBEs.
154
- const frameId = React.useId();
155
160
  const actions = useMultiBodiedExtensionActions({
156
161
  updateActiveChild: setActiveChildIndex,
157
162
  children,
158
163
  childrenContainer: jsx(MultiBodiedExtensionChildrenContainer, {
159
- frameId: frameId
164
+ activeChildIndex: activeChildIndex
160
165
  }, children),
161
166
  allowBodiedOverride: extensionContext === null || extensionContext === void 0 ? void 0 : (_extensionContext$pri = extensionContext.privateProps) === null || _extensionContext$pri === void 0 ? void 0 : _extensionContext$pri.__allowBodiedOverride,
162
167
  extensionKey,
@@ -192,13 +197,13 @@ const MultiBodiedExtension = props => {
192
197
  node: node,
193
198
  actions: actions
194
199
  })), jsx(MultiBodiedExtensionChildrenContainer, {
195
- frameId: frameId
200
+ activeChildIndex: activeChildIndex
196
201
  }, children));
197
202
  }
198
- }, [loading, extensionContext, marks, extensionKey, extensionType, parameters, content, getContent, localId, actions, children, frameId]);
203
+ }, [activeChildIndex, loading, extensionContext, marks, extensionKey, extensionType, parameters, content, getContent, localId, actions, children]);
199
204
 
200
205
  // make the frame visible
201
- const containerActiveFrameStyles = getContainerActiveFrameStyles(activeChildIndex, frameId);
206
+ const containerActiveFrameStyles = getContainerActiveFrameStyles(activeChildIndex);
202
207
  if (expValEquals('platform_editor_renderer_extension_width_fix', 'isEnabled', true)) {
203
208
  const isTopLevel = path.length < 1;
204
209
  const useCenterWrapper = isTopLevel && ['wide', 'full-width'].includes(layout);
@@ -2935,9 +2935,7 @@ export const RendererStyleContainer = props => {
2935
2935
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
2936
2936
  fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? baseOtherStyles : baseOtherStylesDuplicateAnchor,
2937
2937
  // this should be placed after baseOtherStyles
2938
- 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,
2939
- // merge firstWrappedMediaStyles with mediaSingleSharedStyle when clean up platform_editor_fix_media_in_renderer
2940
- fg('platform_editor_fix_media_in_renderer') && firstWrappedMediaStyles, tableSharedStyle, expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableOuterBorderOverlayStyles, expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && !isExperimentEnabled('platform_editor_table_q4_patch_7') && roundedTableLegacyClipPathStyles, 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) && tableContentModeNestedTableStyles, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, firstNodeWithNotMarginTopWithNestedDnD, rendererTableStyles, isStickyScrollbarOn && stickyScrollbarStyles, isStickyScrollbarOn && expValEquals('platform_editor_table_css_overflow_shadow', 'isEnabled', true) && 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],
2938
+ 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) && !isExperimentEnabled('platform_editor_table_q4_patch_7') && roundedTableLegacyClipPathStyles, 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) && tableContentModeNestedTableStyles, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, firstNodeWithNotMarginTopWithNestedDnD, rendererTableStyles, isStickyScrollbarOn && stickyScrollbarStyles, isStickyScrollbarOn && expValEquals('platform_editor_table_css_overflow_shadow', 'isEnabled', true) && 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],
2941
2939
  "data-testid": testId
2942
2940
  }, children);
2943
2941
  };
@@ -1,7 +1,6 @@
1
1
  /* eslint-disable jsdoc/require-jsdoc -- SSR inline script helpers */
2
2
  import React from 'react';
3
3
  import { breakoutConsts } from '@atlaskit/editor-common/utils';
4
- import { fg } from '@atlaskit/platform-feature-flags/fg';
5
4
  import { FullPagePadding } from './style';
6
5
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
7
6
  /**
@@ -43,7 +42,6 @@ export function BreakoutSSRInlineScript({
43
42
  }
44
43
  export function createBreakoutInlineScript(id, shouldSkipScript) {
45
44
  const flags = {
46
- platform_editor_fix_media_in_renderer: fg('platform_editor_fix_media_in_renderer'),
47
45
  platform_editor_renderer_extension_width_fix: expValEquals('platform_editor_renderer_extension_width_fix', 'isEnabled', true)
48
46
  };
49
47
  return `(function(window){
@@ -119,7 +117,7 @@ function applyBreakoutAfterSSR(id, breakoutConsts, shouldSkipBreakoutScript, fla
119
117
  const isExtension = nodeType === 'extension' || nodeType === 'bodiedExtension';
120
118
  if (!mode || !WIDE_LAYOUT_MODES.includes(mode) ||
121
119
  // skip apply width styling to mediaSingle node with pixel width to avoid image size changing
122
- isMediaSingleWithPixelWidth && flags['platform_editor_fix_media_in_renderer'] || isExtension && flags['platform_editor_renderer_extension_width_fix']) {
120
+ isMediaSingleWithPixelWidth || isExtension && flags['platform_editor_renderer_extension_width_fix']) {
123
121
  return;
124
122
  }
125
123
 
@@ -60,7 +60,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
60
60
  const TABLE_INFO_TIMEOUT = 10000;
61
61
  const RENDER_EVENT_SAMPLE_RATE = 0.1;
62
62
  const packageName = "@atlaskit/renderer";
63
- const packageVersion = "137.2.1";
63
+ const packageVersion = "137.2.3";
64
64
  const setAsQueryContainerStyles = css({
65
65
  containerName: 'ak-renderer-wrapper',
66
66
  containerType: 'inline-size'
@@ -9,7 +9,6 @@ import "./layoutColumn-compiled.compiled.css";
9
9
  import { ax, ix } from "@compiled/react/runtime";
10
10
  import React from 'react';
11
11
  import { WidthProvider } from '@atlaskit/editor-common/ui';
12
- import { fg } from '@atlaskit/platform-feature-flags/fg';
13
12
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
14
13
 
15
14
  // localized styles, was from clearNextSiblingMarginTopStyle in @atlaskit/editor-common/ui
@@ -32,7 +31,7 @@ export var LayoutSectionCompiled = function LayoutSectionCompiled(props) {
32
31
  style: {
33
32
  flexBasis: "".concat(props.width, "%")
34
33
  },
35
- className: ax([(isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'middle' && "_1e0c1txw _2lx21bp4 _1bah1h6o", (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'bottom' && "_1e0c1txw _2lx21bp4 _1bahesu3", fg('platform_editor_fix_media_in_renderer') && "_1tihidpf _12kpidpf"])
34
+ className: ax([(isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'middle' && "_1e0c1txw _2lx21bp4 _1bah1h6o", (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'bottom' && "_1e0c1txw _2lx21bp4 _1bahesu3", "_1tihidpf _12kpidpf"])
36
35
  }, /*#__PURE__*/React.createElement(WidthProvider, null, /*#__PURE__*/React.createElement("div", {
37
36
  className: ax(["_1skbgrf3", "_19segrf3 _1ki1grf3 _bmdegrf3 _166hgrf3 _7g1ogrf3 _sk2jgrf3 _hgeogrf3"])
38
37
  }), props.children));
@@ -14,7 +14,6 @@ import React from 'react';
14
14
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- intentional: emotion fallback for compiled migration
15
15
  import { css, jsx } from '@emotion/react';
16
16
  import { WidthProvider } from '@atlaskit/editor-common/ui';
17
- import { fg } from '@atlaskit/platform-feature-flags/fg';
18
17
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
19
18
 
20
19
  // localized styles, was from clearNextSiblingMarginTopStyle in @atlaskit/editor-common/ui
@@ -63,7 +62,7 @@ export var LayoutSectionEmotion = function LayoutSectionEmotion(props) {
63
62
  },
64
63
  css: [
65
64
  // Keep separate: Compiled crashes on ternary/object lookup here.
66
- (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'middle' && verticalAlignMiddleStyles, (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'bottom' && verticalAlignBottomStyles, fg('platform_editor_fix_media_in_renderer') && multipleWrappedImagesStyle]
65
+ (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'middle' && verticalAlignMiddleStyles, (isLayoutColumnValignRenderingEnabled || isLayoutColumnMenuEnabled) && props.valign === 'bottom' && verticalAlignBottomStyles, multipleWrappedImagesStyle]
67
66
  }, jsx(WidthProvider, null, jsx("div", {
68
67
  css: [clearNextSiblingMarginTopStyle, clearNextSiblingBlockMarkMarginTopStyle]
69
68
  }), props.children));
@@ -31,12 +31,30 @@ var containerStyles = css({
31
31
  marginTop: 0
32
32
  }
33
33
  });
34
+ var getFramesActiveFrameStyles = function getFramesActiveFrameStyles(activeChildIndex) {
35
+ if (!fg('platform_editor_nested_mbe_frames')) {
36
+ return undefined;
37
+ }
38
+
39
+ // Apply the active-frame rule on the frames article itself so nested MBEs
40
+ // only target their own direct frames.
41
+ // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
42
+ return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\t\t& > [data-extension-frame='true']:nth-of-type(", ") {\n\t\t\tdisplay: block;\n\t\t}\n\t"])), activeChildIndex + 1);
43
+ };
44
+ var getContainerActiveFrameStyles = function getContainerActiveFrameStyles(activeChildIndex) {
45
+ if (fg('platform_editor_nested_mbe_frames')) {
46
+ return undefined;
47
+ }
48
+
49
+ // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
50
+ return css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n\t\t& [data-extension-frame='true']:nth-of-type(", ") {\n\t\t\tdisplay: block;\n\t\t}\n\t"])), activeChildIndex + 1);
51
+ };
34
52
  var MultiBodiedExtensionChildrenContainer = function MultiBodiedExtensionChildrenContainer(_ref) {
35
- var children = _ref.children,
36
- frameId = _ref.frameId;
53
+ var activeChildIndex = _ref.activeChildIndex,
54
+ children = _ref.children;
37
55
  return jsx("article", {
38
- "data-testid": "multiBodiedExtension--frames",
39
- "data-multibodiedextension-frames-id": frameId
56
+ css: getFramesActiveFrameStyles(activeChildIndex),
57
+ "data-testid": "multiBodiedExtension--frames"
40
58
  }, children);
41
59
  };
42
60
  var MultiBodiedExtensionNavigation = function MultiBodiedExtensionNavigation(_ref2) {
@@ -45,11 +63,6 @@ var MultiBodiedExtensionNavigation = function MultiBodiedExtensionNavigation(_re
45
63
  "data-testid": "multiBodiedExtension-navigation"
46
64
  }, children);
47
65
  };
48
- var getContainerActiveFrameStyles = function getContainerActiveFrameStyles(activeChildIndex, frameId) {
49
- return fg('platform_editor_nested_mbe_frames') ? // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
50
- css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\t\t\t\t&\n\t\t\t\t\t[data-multibodiedextension-frames-id='", "']\n\t\t\t\t\t> [data-extension-frame='true']:nth-of-type(", ") {\n\t\t\t\t\tdisplay: block;\n\t\t\t\t}\n\t\t\t"])), frameId, activeChildIndex + 1) : // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
51
- css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n\t\t\t\t& [data-extension-frame='true']:nth-of-type(", ") {\n\t\t\t\t\tdisplay: block;\n\t\t\t\t}\n\t\t\t"])), activeChildIndex + 1);
52
- };
53
66
  var MultiBodiedExtensionWrapperLegacy = function MultiBodiedExtensionWrapperLegacy(_ref3) {
54
67
  var width = _ref3.width,
55
68
  path = _ref3.path,
@@ -136,15 +149,11 @@ var MultiBodiedExtension = function MultiBodiedExtension(props) {
136
149
  }),
137
150
  loading = _useMultiBodiedExtens.loading,
138
151
  extensionContext = _useMultiBodiedExtens.extensionContext;
139
- // Used by the gated active-frame styles to scope selection to this MBE instance.
140
- // Renderer frames are direct children of this article, so the id prevents a parent
141
- // MBE selector from reaching into nested MBEs.
142
- var frameId = React.useId();
143
152
  var actions = useMultiBodiedExtensionActions({
144
153
  updateActiveChild: setActiveChildIndex,
145
154
  children: children,
146
155
  childrenContainer: jsx(MultiBodiedExtensionChildrenContainer, {
147
- frameId: frameId
156
+ activeChildIndex: activeChildIndex
148
157
  }, children),
149
158
  allowBodiedOverride: extensionContext === null || extensionContext === void 0 || (_extensionContext$pri = extensionContext.privateProps) === null || _extensionContext$pri === void 0 ? void 0 : _extensionContext$pri.__allowBodiedOverride,
150
159
  extensionKey: extensionKey,
@@ -180,13 +189,13 @@ var MultiBodiedExtension = function MultiBodiedExtension(props) {
180
189
  node: node,
181
190
  actions: actions
182
191
  })), jsx(MultiBodiedExtensionChildrenContainer, {
183
- frameId: frameId
192
+ activeChildIndex: activeChildIndex
184
193
  }, children));
185
194
  }
186
- }, [loading, extensionContext, marks, extensionKey, extensionType, parameters, content, getContent, localId, actions, children, frameId]);
195
+ }, [activeChildIndex, loading, extensionContext, marks, extensionKey, extensionType, parameters, content, getContent, localId, actions, children]);
187
196
 
188
197
  // make the frame visible
189
- var containerActiveFrameStyles = getContainerActiveFrameStyles(activeChildIndex, frameId);
198
+ var containerActiveFrameStyles = getContainerActiveFrameStyles(activeChildIndex);
190
199
  if (expValEquals('platform_editor_renderer_extension_width_fix', 'isEnabled', true)) {
191
200
  var _isTopLevel = path.length < 1;
192
201
  var _useCenterWrapper = _isTopLevel && ['wide', 'full-width'].includes(layout);
@@ -2300,9 +2300,7 @@ export var RendererStyleContainer = function RendererStyleContainer(props) {
2300
2300
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
2301
2301
  fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? baseOtherStyles : baseOtherStylesDuplicateAnchor,
2302
2302
  // this should be placed after baseOtherStyles
2303
- 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,
2304
- // merge firstWrappedMediaStyles with mediaSingleSharedStyle when clean up platform_editor_fix_media_in_renderer
2305
- fg('platform_editor_fix_media_in_renderer') && firstWrappedMediaStyles, tableSharedStyle, expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableOuterBorderOverlayStyles, expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && !isExperimentEnabled('platform_editor_table_q4_patch_7') && roundedTableLegacyClipPathStyles, 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) && tableContentModeNestedTableStyles, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, firstNodeWithNotMarginTopWithNestedDnD, rendererTableStyles, isStickyScrollbarOn && stickyScrollbarStyles, isStickyScrollbarOn && expValEquals('platform_editor_table_css_overflow_shadow', 'isEnabled', true) && 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],
2303
+ 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) && !isExperimentEnabled('platform_editor_table_q4_patch_7') && roundedTableLegacyClipPathStyles, 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) && tableContentModeNestedTableStyles, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, firstNodeWithNotMarginTopWithNestedDnD, rendererTableStyles, isStickyScrollbarOn && stickyScrollbarStyles, isStickyScrollbarOn && expValEquals('platform_editor_table_css_overflow_shadow', 'isEnabled', true) && 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],
2306
2304
  "data-testid": testId
2307
2305
  }, children);
2308
2306
  };
@@ -1,7 +1,6 @@
1
1
  /* eslint-disable jsdoc/require-jsdoc -- SSR inline script helpers */
2
2
  import React from 'react';
3
3
  import { breakoutConsts } from '@atlaskit/editor-common/utils';
4
- import { fg } from '@atlaskit/platform-feature-flags/fg';
5
4
  import { FullPagePadding } from './style';
6
5
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
7
6
  /**
@@ -42,7 +41,6 @@ export function BreakoutSSRInlineScript(_ref) {
42
41
  }
43
42
  export function createBreakoutInlineScript(id, shouldSkipScript) {
44
43
  var flags = {
45
- platform_editor_fix_media_in_renderer: fg('platform_editor_fix_media_in_renderer'),
46
44
  platform_editor_renderer_extension_width_fix: expValEquals('platform_editor_renderer_extension_width_fix', 'isEnabled', true)
47
45
  };
48
46
  return "(function(window){\nif(typeof window !== 'undefined' && window.__RENDERER_BYPASS_BREAKOUT_SSR__) { return; }\n".concat(breakoutInlineScriptContext, ";\n(").concat(applyBreakoutAfterSSR.toString(), ")(\"").concat(id, "\", breakoutConsts, ").concat(JSON.stringify(shouldSkipScript), ", ").concat(JSON.stringify(flags), ");\n})(window);\n");
@@ -105,7 +103,7 @@ function applyBreakoutAfterSSR(id, breakoutConsts, shouldSkipBreakoutScript, fla
105
103
  var isExtension = nodeType === 'extension' || nodeType === 'bodiedExtension';
106
104
  if (!mode || !WIDE_LAYOUT_MODES.includes(mode) ||
107
105
  // skip apply width styling to mediaSingle node with pixel width to avoid image size changing
108
- isMediaSingleWithPixelWidth && flags['platform_editor_fix_media_in_renderer'] || isExtension && flags['platform_editor_renderer_extension_width_fix']) {
106
+ isMediaSingleWithPixelWidth || isExtension && flags['platform_editor_renderer_extension_width_fix']) {
109
107
  return;
110
108
  }
111
109
 
@@ -65,7 +65,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
65
65
  var TABLE_INFO_TIMEOUT = 10000;
66
66
  var RENDER_EVENT_SAMPLE_RATE = 0.1;
67
67
  var packageName = "@atlaskit/renderer";
68
- var packageVersion = "137.2.1";
68
+ var packageVersion = "137.2.3";
69
69
  var setAsQueryContainerStyles = css({
70
70
  containerName: 'ak-renderer-wrapper',
71
71
  containerType: 'inline-size'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/renderer",
3
- "version": "137.2.2",
3
+ "version": "137.2.4",
4
4
  "description": "Renderer component",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -70,7 +70,7 @@
70
70
  "@atlaskit/status": "^5.9.0",
71
71
  "@atlaskit/task-decision": "^21.9.0",
72
72
  "@atlaskit/theme": "^28.2.0",
73
- "@atlaskit/tmp-editor-statsig": "^170.0.0",
73
+ "@atlaskit/tmp-editor-statsig": "^171.0.0",
74
74
  "@atlaskit/tokens": "^16.11.0",
75
75
  "@atlaskit/tooltip": "^24.3.0",
76
76
  "@atlaskit/visually-hidden": "^4.4.0",
@@ -177,9 +177,6 @@
177
177
  "platform_editor_nested_mbe_frames": {
178
178
  "type": "boolean"
179
179
  },
180
- "platform_editor_fix_media_in_renderer": {
181
- "type": "boolean"
182
- },
183
180
  "platform_editor_content_mode_button_mvp": {
184
181
  "type": "boolean"
185
182
  },