@atlaskit/renderer 120.1.8 → 120.1.10

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,23 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 120.1.10
4
+
5
+ ### Patch Changes
6
+
7
+ - [#187548](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/187548)
8
+ [`bf0521a222e39`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bf0521a222e39) -
9
+ Clean up `platform_breakout_cls` feature flag that was implemented to eliminate breakout content
10
+ layout shift
11
+ - Updated dependencies
12
+
13
+ ## 120.1.9
14
+
15
+ ### Patch Changes
16
+
17
+ - [#188906](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/188906)
18
+ [`0cf3b0f47d7ca`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0cf3b0f47d7ca) -
19
+ fix SSR styling
20
+
3
21
  ## 120.1.8
4
22
 
5
23
  ### Patch Changes
@@ -498,10 +498,9 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
498
498
  value: function getExtensionProps(node) {
499
499
  var _this$getExtensionHei;
500
500
  var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
501
- var testHeight = (_this$getExtensionHei = this.getExtensionHeight) === null || _this$getExtensionHei === void 0 ? void 0 : _this$getExtensionHei.call(this, node);
502
501
  return _objectSpread(_objectSpread({}, this.getProps(node, path)), {}, {
503
502
  extensionViewportSizes: this.extensionViewportSizes,
504
- nodeHeight: testHeight
503
+ nodeHeight: (_this$getExtensionHei = this.getExtensionHeight) === null || _this$getExtensionHei === void 0 ? void 0 : _this$getExtensionHei.call(this, node)
505
504
  });
506
505
  }
507
506
  }, {
@@ -7,11 +7,8 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.default = Breakout;
8
8
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
9
  var _react = require("@emotion/react");
10
- var _ui = require("@atlaskit/editor-common/ui");
11
- var _utils = require("@atlaskit/editor-common/utils");
12
10
  var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
13
11
  var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
14
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
15
12
  /**
16
13
  * @jsxRuntime classic
17
14
  * @jsx jsx
@@ -45,30 +42,21 @@ var getWidth = function getWidth(width, mode) {
45
42
  * @returns The rendered breakout mark as a React element.
46
43
  */
47
44
  function Breakout(props) {
48
- return (0, _react.jsx)(_ui.WidthConsumer, null, function (_ref) {
49
- var width = _ref.width;
50
- return (0, _react.jsx)("div", (0, _extends2.default)({
51
- css: wrapperStyles,
52
- "data-mode": props.mode
53
- // Ignored via go/ees005
54
- // eslint-disable-next-line react/jsx-props-no-spreading
55
- }, (0, _experiments.editorExperiment)('advanced_layouts', true) && {
56
- 'data-has-width': !!props.width,
57
- 'data-width': props.width
58
- }, {
59
- // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
60
- style: (0, _platformFeatureFlags.fg)('platform_breakout_cls') ? {
61
- width: getWidth('width' in props ? props.width : null, props.mode)
62
- } : {
63
- width: (0, _experiments.editorExperiment)('advanced_layouts', true) ?
64
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
65
- (0, _utils.calcBreakoutWithCustomWidth)(props.mode, 'width' in props ? props.width : null, width) :
66
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
67
- (0, _utils.calcBreakoutWidth)(props.mode, width)
68
- }
69
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
70
- ,
71
- className: "fabric-editor-breakout-mark fabric-editor-block-mark"
72
- }), props.children);
73
- });
45
+ return (0, _react.jsx)("div", (0, _extends2.default)({
46
+ css: wrapperStyles,
47
+ "data-mode": props.mode
48
+ // Ignored via go/ees005
49
+ // eslint-disable-next-line react/jsx-props-no-spreading
50
+ }, (0, _experiments.editorExperiment)('advanced_layouts', true) && {
51
+ 'data-has-width': !!props.width,
52
+ 'data-width': props.width
53
+ }, {
54
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
55
+ style: {
56
+ width: getWidth('width' in props ? props.width : null, props.mode)
57
+ }
58
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
59
+ ,
60
+ className: "fabric-editor-breakout-mark fabric-editor-block-mark"
61
+ }), props.children);
74
62
  }
@@ -64,7 +64,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
64
64
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
65
65
  width: isTopLevel ? (0, _utils.calcBreakoutWidth)(layout, width) : '100%',
66
66
  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
67
- minHeight: extensionHeight
67
+ minHeight: "".concat(extensionHeight, "px")
68
68
  },
69
69
  "data-layout": layout
70
70
  }, /*#__PURE__*/_react.default.createElement("div", {
@@ -1437,7 +1437,7 @@ var RendererStyleContainer = exports.RendererStyleContainer = function RendererS
1437
1437
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning, @atlaskit/platform/ensure-feature-flag-prefix
1438
1438
  (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') &&
1439
1439
  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
1440
- (0, _platformFeatureFlags.fg)('annotations_align_editor_and_renderer_styles') && rendererAnnotationStylesCommentHeightFix, baseOtherStyles, allowNestedHeaderLinks && alignedHeadingAnchorStyle, mediaSingleSharedStyle, tableSharedStyle, tableRendererHeaderStylesForTableCellOnly, (0, _platformFeatureFlags.fg)('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') ? firstNodeWithNotMarginTopWithNestedDnD : firstNodeWithNotMarginTop, rendererTableStyles, (0, _table.isStickyScrollbarEnabled)(appearance) && stickyScrollbarStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && allowNestedHeaderLinks && rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks, (0, _platformFeatureFlags.fg)('platform_editor_tables_numbered_column_correction') ? rendererTableColumnStyles : rendererTableColumnStylesOld, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, _browser.browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && (0, _platformFeatureFlags.fg)('platform_breakout_cls') ? responsiveBreakoutWidth : null, appearance === 'full-width' && (0, _platformFeatureFlags.fg)('platform_breakout_cls') ? responsiveBreakoutWidthFullWidth : null],
1440
+ (0, _platformFeatureFlags.fg)('annotations_align_editor_and_renderer_styles') && rendererAnnotationStylesCommentHeightFix, baseOtherStyles, allowNestedHeaderLinks && alignedHeadingAnchorStyle, mediaSingleSharedStyle, tableSharedStyle, tableRendererHeaderStylesForTableCellOnly, (0, _platformFeatureFlags.fg)('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') ? firstNodeWithNotMarginTopWithNestedDnD : firstNodeWithNotMarginTop, rendererTableStyles, (0, _table.isStickyScrollbarEnabled)(appearance) && stickyScrollbarStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && allowNestedHeaderLinks && rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks, (0, _platformFeatureFlags.fg)('platform_editor_tables_numbered_column_correction') ? rendererTableColumnStyles : rendererTableColumnStylesOld, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, _browser.browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && responsiveBreakoutWidth, appearance === 'full-width' && responsiveBreakoutWidthFullWidth],
1441
1441
  "data-testid": testId
1442
1442
  }, children)
1443
1443
  );
@@ -34,8 +34,7 @@ function BreakoutSSRInlineScript(_ref) {
34
34
  }
35
35
  var id = Math.floor(Math.random() * (9999999999 - 9999 + 1)) + 9999;
36
36
  var shouldSkipScript = {
37
- table: (0, _platformFeatureFlags.fg)('platform-ssr-table-resize'),
38
- breakout: (0, _platformFeatureFlags.fg)('platform_breakout_cls')
37
+ table: (0, _platformFeatureFlags.fg)('platform-ssr-table-resize')
39
38
  };
40
39
  return /*#__PURE__*/_react.default.createElement("script", {
41
40
  "data-breakout-script-id": id
@@ -51,7 +50,7 @@ function BreakoutSSRInlineScript(_ref) {
51
50
  function createBreakoutInlineScript(id, shouldSkipScript) {
52
51
  return "\n\t (function(window){\n\t\tif(typeof window !== 'undefined' && window.__RENDERER_BYPASS_BREAKOUT_SSR__) {\n\t\t\treturn;\n\t\t}\n ".concat(breakoutInlineScriptContext, ";\n (").concat(applyBreakoutAfterSSR.toString(), ")(\"").concat(id, "\", breakoutConsts, ").concat(JSON.stringify(shouldSkipScript), ");\n })(window);\n");
53
52
  }
54
- var breakoutInlineScriptContext = exports.breakoutInlineScriptContext = "\n var breakoutConsts = ".concat(JSON.stringify(_utils.breakoutConsts), ";\n breakoutConsts.mapBreakpointToLayoutMaxWidth = ").concat(_utils.breakoutConsts.mapBreakpointToLayoutMaxWidth.toString(), ";\n breakoutConsts.getBreakpoint = ").concat(_utils.breakoutConsts.getBreakpoint.toString(), ";\n breakoutConsts.calcBreakoutWidth = ").concat(_utils.breakoutConsts.calcBreakoutWidth.toString(), ";\n breakoutConsts.calcBreakoutWithCustomWidth = ").concat(_utils.breakoutConsts.calcBreakoutWithCustomWidth.toString(), ";\n breakoutConsts.calcLineLength = ").concat(_utils.breakoutConsts.calcLineLength.toString(), ";\n breakoutConsts.calcWideWidth = ").concat(_utils.breakoutConsts.calcWideWidth.toString(), ";\n breakoutConsts.FullPagePadding = ").concat(_style.FullPagePadding.toString(), ";\n");
53
+ var breakoutInlineScriptContext = exports.breakoutInlineScriptContext = "\n var breakoutConsts = ".concat(JSON.stringify(_utils.breakoutConsts), ";\n breakoutConsts.mapBreakpointToLayoutMaxWidth = ").concat(_utils.breakoutConsts.mapBreakpointToLayoutMaxWidth.toString(), ";\n breakoutConsts.getBreakpoint = ").concat(_utils.breakoutConsts.getBreakpoint.toString(), ";\n breakoutConsts.calcBreakoutWidth = ").concat(_utils.breakoutConsts.calcBreakoutWidth.toString(), ";\n breakoutConsts.calcLineLength = ").concat(_utils.breakoutConsts.calcLineLength.toString(), ";\n breakoutConsts.calcWideWidth = ").concat(_utils.breakoutConsts.calcWideWidth.toString(), ";\n breakoutConsts.FullPagePadding = ").concat(_style.FullPagePadding.toString(), ";\n");
55
54
 
56
55
  // Ignored via go/ees005
57
56
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -96,7 +95,6 @@ function applyBreakoutAfterSSR(id, breakoutConsts, shouldSkipBreakoutScript) {
96
95
  // eslint-disable-next-line @atlaskit/editor/no-as-casting
97
96
  var node = maybeNode;
98
97
  var mode = node.dataset.mode || node.dataset.layout || '';
99
- var resizedBreakout = node.dataset.hasWidth === 'true';
100
98
  if (!mode || !WIDE_LAYOUT_MODES.includes(mode)) {
101
99
  return;
102
100
  }
@@ -105,7 +103,7 @@ function applyBreakoutAfterSSR(id, breakoutConsts, shouldSkipBreakoutScript) {
105
103
  if (shouldSkipBreakoutScript.table && node.classList.contains('pm-table-container')) {
106
104
  return;
107
105
  }
108
- if (shouldSkipBreakoutScript.breakout && node.classList.contains('fabric-editor-breakout-mark')) {
106
+ if (node.classList.contains('fabric-editor-breakout-mark')) {
109
107
  return;
110
108
  }
111
109
 
@@ -116,11 +114,6 @@ function applyBreakoutAfterSSR(id, breakoutConsts, shouldSkipBreakoutScript) {
116
114
  var rendererWidth = renderer.offsetWidth;
117
115
  var effectiveWidth = rendererWidth - breakoutConsts.padding;
118
116
  width = "".concat(Math.min(parseInt(node.style.width), effectiveWidth), "px");
119
- } else if (resizedBreakout) {
120
- width = breakoutConsts.calcBreakoutWithCustomWidth(breakoutConsts)(mode, Number(node.dataset.width) || null,
121
- // Ignored via go/ees005
122
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
123
- renderer.offsetWidth);
124
117
  } else {
125
118
  // Ignored via go/ees005
126
119
  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -62,7 +62,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
62
62
  var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
63
63
  var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
64
64
  var packageName = "@atlaskit/renderer";
65
- var packageVersion = "120.1.7";
65
+ var packageVersion = "120.1.9";
66
66
  var setAsQueryContainerStyles = (0, _react2.css)({
67
67
  containerName: 'ak-renderer-wrapper',
68
68
  containerType: 'inline-size'
@@ -449,11 +449,10 @@ export default class ReactSerializer {
449
449
  }
450
450
  getExtensionProps(node, path = []) {
451
451
  var _this$getExtensionHei;
452
- const testHeight = (_this$getExtensionHei = this.getExtensionHeight) === null || _this$getExtensionHei === void 0 ? void 0 : _this$getExtensionHei.call(this, node);
453
452
  return {
454
453
  ...this.getProps(node, path),
455
454
  extensionViewportSizes: this.extensionViewportSizes,
456
- nodeHeight: testHeight
455
+ nodeHeight: (_this$getExtensionHei = this.getExtensionHeight) === null || _this$getExtensionHei === void 0 ? void 0 : _this$getExtensionHei.call(this, node)
457
456
  };
458
457
  }
459
458
  getEmojiProps(node) {
@@ -5,11 +5,8 @@ import _extends from "@babel/runtime/helpers/extends";
5
5
  */
6
6
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
7
7
  import { css, jsx } from '@emotion/react';
8
- import { WidthConsumer } from '@atlaskit/editor-common/ui';
9
- import { calcBreakoutWithCustomWidth, calcBreakoutWidth } from '@atlaskit/editor-common/utils';
10
8
  import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, blockNodesVerticalMargin } from '@atlaskit/editor-shared-styles';
11
9
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
12
- import { fg } from '@atlaskit/platform-feature-flags';
13
10
  const wrapperStyles = css({
14
11
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
15
12
  margin: `${blockNodesVerticalMargin} 0`,
@@ -37,9 +34,7 @@ const getWidth = (width, mode) => {
37
34
  * @returns The rendered breakout mark as a React element.
38
35
  */
39
36
  export default function Breakout(props) {
40
- return jsx(WidthConsumer, null, ({
41
- width
42
- }) => jsx("div", _extends({
37
+ return jsx("div", _extends({
43
38
  css: wrapperStyles,
44
39
  "data-mode": props.mode
45
40
  // Ignored via go/ees005
@@ -49,17 +44,11 @@ export default function Breakout(props) {
49
44
  'data-width': props.width
50
45
  }, {
51
46
  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
52
- style: fg('platform_breakout_cls') ? {
47
+ style: {
53
48
  width: getWidth('width' in props ? props.width : null, props.mode)
54
- } : {
55
- width: editorExperiment('advanced_layouts', true) ?
56
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
57
- calcBreakoutWithCustomWidth(props.mode, 'width' in props ? props.width : null, width) :
58
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
59
- calcBreakoutWidth(props.mode, width)
60
49
  }
61
50
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
62
51
  ,
63
52
  className: "fabric-editor-breakout-mark fabric-editor-block-mark"
64
- }), props.children));
53
+ }), props.children);
65
54
  }
@@ -50,7 +50,7 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
50
50
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
51
51
  width: isTopLevel ? calcBreakoutWidth(layout, width) : '100%',
52
52
  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
53
- minHeight: extensionHeight
53
+ minHeight: `${extensionHeight}px`
54
54
  },
55
55
  "data-layout": layout
56
56
  }, /*#__PURE__*/React.createElement("div", {
@@ -1833,7 +1833,7 @@ export const RendererStyleContainer = props => {
1833
1833
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning, @atlaskit/platform/ensure-feature-flag-prefix
1834
1834
  fg('editor_inline_comments_on_inline_nodes') &&
1835
1835
  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
1836
- fg('annotations_align_editor_and_renderer_styles') && rendererAnnotationStylesCommentHeightFix, baseOtherStyles, allowNestedHeaderLinks && alignedHeadingAnchorStyle, mediaSingleSharedStyle, tableSharedStyle, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, fg('platform_editor_nested_dnd_styles_changes') ? firstNodeWithNotMarginTopWithNestedDnD : firstNodeWithNotMarginTop, rendererTableStyles, isStickyScrollbarEnabled(appearance) && stickyScrollbarStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && allowNestedHeaderLinks && rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks, fg('platform_editor_tables_numbered_column_correction') ? rendererTableColumnStyles : rendererTableColumnStylesOld, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && fg('platform_breakout_cls') ? responsiveBreakoutWidth : null, appearance === 'full-width' && fg('platform_breakout_cls') ? responsiveBreakoutWidthFullWidth : null],
1836
+ fg('annotations_align_editor_and_renderer_styles') && rendererAnnotationStylesCommentHeightFix, baseOtherStyles, allowNestedHeaderLinks && alignedHeadingAnchorStyle, mediaSingleSharedStyle, tableSharedStyle, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, fg('platform_editor_nested_dnd_styles_changes') ? firstNodeWithNotMarginTopWithNestedDnD : firstNodeWithNotMarginTop, rendererTableStyles, isStickyScrollbarEnabled(appearance) && stickyScrollbarStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && allowNestedHeaderLinks && rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks, fg('platform_editor_tables_numbered_column_correction') ? rendererTableColumnStyles : rendererTableColumnStylesOld, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && responsiveBreakoutWidth, appearance === 'full-width' && responsiveBreakoutWidthFullWidth],
1837
1837
  "data-testid": testId
1838
1838
  }, children)
1839
1839
  );
@@ -26,8 +26,7 @@ export function BreakoutSSRInlineScript({
26
26
  }
27
27
  const id = Math.floor(Math.random() * (9999999999 - 9999 + 1)) + 9999;
28
28
  const shouldSkipScript = {
29
- table: fg('platform-ssr-table-resize'),
30
- breakout: fg('platform_breakout_cls')
29
+ table: fg('platform-ssr-table-resize')
31
30
  };
32
31
  return /*#__PURE__*/React.createElement("script", {
33
32
  "data-breakout-script-id": id
@@ -56,7 +55,6 @@ export const breakoutInlineScriptContext = `
56
55
  breakoutConsts.mapBreakpointToLayoutMaxWidth = ${breakoutConsts.mapBreakpointToLayoutMaxWidth.toString()};
57
56
  breakoutConsts.getBreakpoint = ${breakoutConsts.getBreakpoint.toString()};
58
57
  breakoutConsts.calcBreakoutWidth = ${breakoutConsts.calcBreakoutWidth.toString()};
59
- breakoutConsts.calcBreakoutWithCustomWidth = ${breakoutConsts.calcBreakoutWithCustomWidth.toString()};
60
58
  breakoutConsts.calcLineLength = ${breakoutConsts.calcLineLength.toString()};
61
59
  breakoutConsts.calcWideWidth = ${breakoutConsts.calcWideWidth.toString()};
62
60
  breakoutConsts.FullPagePadding = ${FullPagePadding.toString()};
@@ -105,7 +103,6 @@ function applyBreakoutAfterSSR(id, breakoutConsts, shouldSkipBreakoutScript) {
105
103
  // eslint-disable-next-line @atlaskit/editor/no-as-casting
106
104
  const node = maybeNode;
107
105
  const mode = node.dataset.mode || node.dataset.layout || '';
108
- const resizedBreakout = node.dataset.hasWidth === 'true';
109
106
  if (!mode || !WIDE_LAYOUT_MODES.includes(mode)) {
110
107
  return;
111
108
  }
@@ -114,7 +111,7 @@ function applyBreakoutAfterSSR(id, breakoutConsts, shouldSkipBreakoutScript) {
114
111
  if (shouldSkipBreakoutScript.table && node.classList.contains('pm-table-container')) {
115
112
  return;
116
113
  }
117
- if (shouldSkipBreakoutScript.breakout && node.classList.contains('fabric-editor-breakout-mark')) {
114
+ if (node.classList.contains('fabric-editor-breakout-mark')) {
118
115
  return;
119
116
  }
120
117
 
@@ -125,11 +122,6 @@ function applyBreakoutAfterSSR(id, breakoutConsts, shouldSkipBreakoutScript) {
125
122
  const rendererWidth = renderer.offsetWidth;
126
123
  const effectiveWidth = rendererWidth - breakoutConsts.padding;
127
124
  width = `${Math.min(parseInt(node.style.width), effectiveWidth)}px`;
128
- } else if (resizedBreakout) {
129
- width = breakoutConsts.calcBreakoutWithCustomWidth(breakoutConsts)(mode, Number(node.dataset.width) || null,
130
- // Ignored via go/ees005
131
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
132
- renderer.offsetWidth);
133
125
  } else {
134
126
  // Ignored via go/ees005
135
127
  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -48,7 +48,7 @@ import { PortalContext } from './PortalContext';
48
48
  export const NORMAL_SEVERITY_THRESHOLD = 2000;
49
49
  export const DEGRADED_SEVERITY_THRESHOLD = 3000;
50
50
  const packageName = "@atlaskit/renderer";
51
- const packageVersion = "120.1.7";
51
+ const packageVersion = "120.1.9";
52
52
  const setAsQueryContainerStyles = css({
53
53
  containerName: 'ak-renderer-wrapper',
54
54
  containerType: 'inline-size'
@@ -491,10 +491,9 @@ var ReactSerializer = /*#__PURE__*/function () {
491
491
  value: function getExtensionProps(node) {
492
492
  var _this$getExtensionHei;
493
493
  var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
494
- var testHeight = (_this$getExtensionHei = this.getExtensionHeight) === null || _this$getExtensionHei === void 0 ? void 0 : _this$getExtensionHei.call(this, node);
495
494
  return _objectSpread(_objectSpread({}, this.getProps(node, path)), {}, {
496
495
  extensionViewportSizes: this.extensionViewportSizes,
497
- nodeHeight: testHeight
496
+ nodeHeight: (_this$getExtensionHei = this.getExtensionHeight) === null || _this$getExtensionHei === void 0 ? void 0 : _this$getExtensionHei.call(this, node)
498
497
  });
499
498
  }
500
499
  }, {
@@ -5,11 +5,8 @@ import _extends from "@babel/runtime/helpers/extends";
5
5
  */
6
6
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
7
7
  import { css, jsx } from '@emotion/react';
8
- import { WidthConsumer } from '@atlaskit/editor-common/ui';
9
- import { calcBreakoutWithCustomWidth, calcBreakoutWidth } from '@atlaskit/editor-common/utils';
10
8
  import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, blockNodesVerticalMargin } from '@atlaskit/editor-shared-styles';
11
9
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
12
- import { fg } from '@atlaskit/platform-feature-flags';
13
10
  var wrapperStyles = css({
14
11
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
15
12
  margin: "".concat(blockNodesVerticalMargin, " 0"),
@@ -37,30 +34,21 @@ var getWidth = function getWidth(width, mode) {
37
34
  * @returns The rendered breakout mark as a React element.
38
35
  */
39
36
  export default function Breakout(props) {
40
- return jsx(WidthConsumer, null, function (_ref) {
41
- var width = _ref.width;
42
- return jsx("div", _extends({
43
- css: wrapperStyles,
44
- "data-mode": props.mode
45
- // Ignored via go/ees005
46
- // eslint-disable-next-line react/jsx-props-no-spreading
47
- }, editorExperiment('advanced_layouts', true) && {
48
- 'data-has-width': !!props.width,
49
- 'data-width': props.width
50
- }, {
51
- // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
52
- style: fg('platform_breakout_cls') ? {
53
- width: getWidth('width' in props ? props.width : null, props.mode)
54
- } : {
55
- width: editorExperiment('advanced_layouts', true) ?
56
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
57
- calcBreakoutWithCustomWidth(props.mode, 'width' in props ? props.width : null, width) :
58
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
59
- calcBreakoutWidth(props.mode, width)
60
- }
61
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
62
- ,
63
- className: "fabric-editor-breakout-mark fabric-editor-block-mark"
64
- }), props.children);
65
- });
37
+ return jsx("div", _extends({
38
+ css: wrapperStyles,
39
+ "data-mode": props.mode
40
+ // Ignored via go/ees005
41
+ // eslint-disable-next-line react/jsx-props-no-spreading
42
+ }, editorExperiment('advanced_layouts', true) && {
43
+ 'data-has-width': !!props.width,
44
+ 'data-width': props.width
45
+ }, {
46
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
47
+ style: {
48
+ width: getWidth('width' in props ? props.width : null, props.mode)
49
+ }
50
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
51
+ ,
52
+ className: "fabric-editor-breakout-mark fabric-editor-block-mark"
53
+ }), props.children);
66
54
  }
@@ -57,7 +57,7 @@ export var renderExtension = function renderExtension(content, layout) {
57
57
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
58
58
  width: isTopLevel ? calcBreakoutWidth(layout, width) : '100%',
59
59
  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
60
- minHeight: extensionHeight
60
+ minHeight: "".concat(extensionHeight, "px")
61
61
  },
62
62
  "data-layout": layout
63
63
  }, /*#__PURE__*/React.createElement("div", {
@@ -1430,7 +1430,7 @@ export var RendererStyleContainer = function RendererStyleContainer(props) {
1430
1430
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning, @atlaskit/platform/ensure-feature-flag-prefix
1431
1431
  fg('editor_inline_comments_on_inline_nodes') &&
1432
1432
  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
1433
- fg('annotations_align_editor_and_renderer_styles') && rendererAnnotationStylesCommentHeightFix, baseOtherStyles, allowNestedHeaderLinks && alignedHeadingAnchorStyle, mediaSingleSharedStyle, tableSharedStyle, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, fg('platform_editor_nested_dnd_styles_changes') ? firstNodeWithNotMarginTopWithNestedDnD : firstNodeWithNotMarginTop, rendererTableStyles, isStickyScrollbarEnabled(appearance) && stickyScrollbarStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && allowNestedHeaderLinks && rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks, fg('platform_editor_tables_numbered_column_correction') ? rendererTableColumnStyles : rendererTableColumnStylesOld, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && fg('platform_breakout_cls') ? responsiveBreakoutWidth : null, appearance === 'full-width' && fg('platform_breakout_cls') ? responsiveBreakoutWidthFullWidth : null],
1433
+ fg('annotations_align_editor_and_renderer_styles') && rendererAnnotationStylesCommentHeightFix, baseOtherStyles, allowNestedHeaderLinks && alignedHeadingAnchorStyle, mediaSingleSharedStyle, tableSharedStyle, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, fg('platform_editor_nested_dnd_styles_changes') ? firstNodeWithNotMarginTopWithNestedDnD : firstNodeWithNotMarginTop, rendererTableStyles, isStickyScrollbarEnabled(appearance) && stickyScrollbarStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && allowNestedHeaderLinks && rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks, fg('platform_editor_tables_numbered_column_correction') ? rendererTableColumnStyles : rendererTableColumnStylesOld, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && responsiveBreakoutWidth, appearance === 'full-width' && responsiveBreakoutWidthFullWidth],
1434
1434
  "data-testid": testId
1435
1435
  }, children)
1436
1436
  );
@@ -25,8 +25,7 @@ export function BreakoutSSRInlineScript(_ref) {
25
25
  }
26
26
  var id = Math.floor(Math.random() * (9999999999 - 9999 + 1)) + 9999;
27
27
  var shouldSkipScript = {
28
- table: fg('platform-ssr-table-resize'),
29
- breakout: fg('platform_breakout_cls')
28
+ table: fg('platform-ssr-table-resize')
30
29
  };
31
30
  return /*#__PURE__*/React.createElement("script", {
32
31
  "data-breakout-script-id": id
@@ -42,7 +41,7 @@ export function BreakoutSSRInlineScript(_ref) {
42
41
  export function createBreakoutInlineScript(id, shouldSkipScript) {
43
42
  return "\n\t (function(window){\n\t\tif(typeof window !== 'undefined' && window.__RENDERER_BYPASS_BREAKOUT_SSR__) {\n\t\t\treturn;\n\t\t}\n ".concat(breakoutInlineScriptContext, ";\n (").concat(applyBreakoutAfterSSR.toString(), ")(\"").concat(id, "\", breakoutConsts, ").concat(JSON.stringify(shouldSkipScript), ");\n })(window);\n");
44
43
  }
45
- export var breakoutInlineScriptContext = "\n var breakoutConsts = ".concat(JSON.stringify(breakoutConsts), ";\n breakoutConsts.mapBreakpointToLayoutMaxWidth = ").concat(breakoutConsts.mapBreakpointToLayoutMaxWidth.toString(), ";\n breakoutConsts.getBreakpoint = ").concat(breakoutConsts.getBreakpoint.toString(), ";\n breakoutConsts.calcBreakoutWidth = ").concat(breakoutConsts.calcBreakoutWidth.toString(), ";\n breakoutConsts.calcBreakoutWithCustomWidth = ").concat(breakoutConsts.calcBreakoutWithCustomWidth.toString(), ";\n breakoutConsts.calcLineLength = ").concat(breakoutConsts.calcLineLength.toString(), ";\n breakoutConsts.calcWideWidth = ").concat(breakoutConsts.calcWideWidth.toString(), ";\n breakoutConsts.FullPagePadding = ").concat(FullPagePadding.toString(), ";\n");
44
+ export var breakoutInlineScriptContext = "\n var breakoutConsts = ".concat(JSON.stringify(breakoutConsts), ";\n breakoutConsts.mapBreakpointToLayoutMaxWidth = ").concat(breakoutConsts.mapBreakpointToLayoutMaxWidth.toString(), ";\n breakoutConsts.getBreakpoint = ").concat(breakoutConsts.getBreakpoint.toString(), ";\n breakoutConsts.calcBreakoutWidth = ").concat(breakoutConsts.calcBreakoutWidth.toString(), ";\n breakoutConsts.calcLineLength = ").concat(breakoutConsts.calcLineLength.toString(), ";\n breakoutConsts.calcWideWidth = ").concat(breakoutConsts.calcWideWidth.toString(), ";\n breakoutConsts.FullPagePadding = ").concat(FullPagePadding.toString(), ";\n");
46
45
 
47
46
  // Ignored via go/ees005
48
47
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -87,7 +86,6 @@ function applyBreakoutAfterSSR(id, breakoutConsts, shouldSkipBreakoutScript) {
87
86
  // eslint-disable-next-line @atlaskit/editor/no-as-casting
88
87
  var node = maybeNode;
89
88
  var mode = node.dataset.mode || node.dataset.layout || '';
90
- var resizedBreakout = node.dataset.hasWidth === 'true';
91
89
  if (!mode || !WIDE_LAYOUT_MODES.includes(mode)) {
92
90
  return;
93
91
  }
@@ -96,7 +94,7 @@ function applyBreakoutAfterSSR(id, breakoutConsts, shouldSkipBreakoutScript) {
96
94
  if (shouldSkipBreakoutScript.table && node.classList.contains('pm-table-container')) {
97
95
  return;
98
96
  }
99
- if (shouldSkipBreakoutScript.breakout && node.classList.contains('fabric-editor-breakout-mark')) {
97
+ if (node.classList.contains('fabric-editor-breakout-mark')) {
100
98
  return;
101
99
  }
102
100
 
@@ -107,11 +105,6 @@ function applyBreakoutAfterSSR(id, breakoutConsts, shouldSkipBreakoutScript) {
107
105
  var rendererWidth = renderer.offsetWidth;
108
106
  var effectiveWidth = rendererWidth - breakoutConsts.padding;
109
107
  width = "".concat(Math.min(parseInt(node.style.width), effectiveWidth), "px");
110
- } else if (resizedBreakout) {
111
- width = breakoutConsts.calcBreakoutWithCustomWidth(breakoutConsts)(mode, Number(node.dataset.width) || null,
112
- // Ignored via go/ees005
113
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
114
- renderer.offsetWidth);
115
108
  } else {
116
109
  // Ignored via go/ees005
117
110
  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -53,7 +53,7 @@ import { PortalContext } from './PortalContext';
53
53
  export var NORMAL_SEVERITY_THRESHOLD = 2000;
54
54
  export var DEGRADED_SEVERITY_THRESHOLD = 3000;
55
55
  var packageName = "@atlaskit/renderer";
56
- var packageVersion = "120.1.7";
56
+ var packageVersion = "120.1.9";
57
57
  var setAsQueryContainerStyles = css({
58
58
  containerName: 'ak-renderer-wrapper',
59
59
  containerType: 'inline-size'
@@ -14,7 +14,6 @@ export declare function BreakoutSSRInlineScript({ noOpSSRInlineScript }: {
14
14
  }): React.JSX.Element | null;
15
15
  export declare function createBreakoutInlineScript(id: number, shouldSkipScript: {
16
16
  table: boolean;
17
- breakout: boolean;
18
17
  }): string;
19
18
  export declare const breakoutInlineScriptContext: string;
20
19
  export declare const calcLineLength: () => number;
@@ -14,7 +14,6 @@ export declare function BreakoutSSRInlineScript({ noOpSSRInlineScript }: {
14
14
  }): React.JSX.Element | null;
15
15
  export declare function createBreakoutInlineScript(id: number, shouldSkipScript: {
16
16
  table: boolean;
17
- breakout: boolean;
18
17
  }): string;
19
18
  export declare const breakoutInlineScriptContext: string;
20
19
  export declare const calcLineLength: () => number;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/renderer",
3
- "version": "120.1.8",
3
+ "version": "120.1.10",
4
4
  "description": "Renderer component",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -124,9 +124,6 @@
124
124
  }
125
125
  },
126
126
  "platform-feature-flags": {
127
- "platform_breakout_cls": {
128
- "type": "boolean"
129
- },
130
127
  "confluence_frontend_table_scrollbar_ttvc_fix": {
131
128
  "type": "boolean"
132
129
  },