@atlaskit/editor-core 202.4.1 → 202.5.1

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.
Files changed (20) hide show
  1. package/CHANGELOG.md +21 -0
  2. package/dist/cjs/ui/Appearance/Comment/Comment.js +3 -1
  3. package/dist/cjs/ui/Appearance/FullPage/FullPageToolbar.js +3 -3
  4. package/dist/cjs/ui/ContentStyles/layout.js +2 -2
  5. package/dist/cjs/version-wrapper.js +1 -1
  6. package/dist/es2019/ui/Appearance/Comment/Comment.js +3 -1
  7. package/dist/es2019/ui/Appearance/FullPage/FullPageToolbar.js +3 -3
  8. package/dist/es2019/ui/ContentStyles/layout.js +11 -6
  9. package/dist/es2019/version-wrapper.js +1 -1
  10. package/dist/esm/ui/Appearance/Comment/Comment.js +3 -1
  11. package/dist/esm/ui/Appearance/FullPage/FullPageToolbar.js +3 -3
  12. package/dist/esm/ui/ContentStyles/layout.js +2 -2
  13. package/dist/esm/version-wrapper.js +1 -1
  14. package/dist/types/create-editor/create-universal-preset.d.ts +103 -9
  15. package/dist/types/presets/universal.d.ts +103 -9
  16. package/dist/types/presets/useUniversalPreset.d.ts +103 -9
  17. package/dist/types-ts4.5/create-editor/create-universal-preset.d.ts +121 -9
  18. package/dist/types-ts4.5/presets/universal.d.ts +121 -9
  19. package/dist/types-ts4.5/presets/useUniversalPreset.d.ts +121 -9
  20. package/package.json +13 -13
package/CHANGELOG.md CHANGED
@@ -1,5 +1,26 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 202.5.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [#170673](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/170673)
8
+ [`09f6aa8666f9b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/09f6aa8666f9b) -
9
+ [ux] [ED-25899] Update layout breakpoint to 630px in renderer and corresponding breakpoints in
10
+ editor
11
+ - [#168302](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/168302)
12
+ [`8f6860829c29a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8f6860829c29a) -
13
+ [ux] ED-25729: Hide separator when drop indicators are visible
14
+ - Updated dependencies
15
+
16
+ ## 202.5.0
17
+
18
+ ### Minor Changes
19
+
20
+ - [#169227](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/169227)
21
+ [`498a7599c27ae`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/498a7599c27ae) -
22
+ Remove twoLineEditorToolbar evaluations in toolbar components
23
+
3
24
  ## 202.4.1
4
25
 
5
26
  ### Patch Changes
package/dist/cjs/ui/Appearance/Comment/Comment.js CHANGED
@@ -147,7 +147,9 @@ var CommentEditorWithIntl = exports.CommentEditorWithIntl = function CommentEdit
147
147
  //Alt + F9 to reach first element in this main toolbar
148
148
  return event.altKey && (event.key === 'F9' || event.keyCode === 120);
149
149
  }, []);
150
- var isTwoLineToolbarEnabled = !!customPrimaryToolbarComponents && !!(featureFlags !== null && featureFlags !== void 0 && featureFlags.twoLineEditorToolbar);
150
+
151
+ // When primary toolbar components is undefined, do not show two line editor toolbar
152
+ var isTwoLineToolbarEnabled = !!customPrimaryToolbarComponents;
151
153
  var handleEscape = (0, _react.useCallback)(function (event) {
152
154
  if (!(editorView !== null && editorView !== void 0 && editorView.hasFocus())) {
153
155
  editorView === null || editorView === void 0 || editorView.focus();
package/dist/cjs/ui/Appearance/FullPage/FullPageToolbar.js CHANGED
@@ -26,7 +26,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
26
26
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
27
27
 
28
28
  var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(function (props) {
29
- var _props$featureFlags, _props$customPrimaryT;
29
+ var _props$customPrimaryT;
30
30
  var _useState = (0, _react.useState)(false),
31
31
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
32
32
  shouldSplitToolbar = _useState2[0],
@@ -34,7 +34,7 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
34
34
  var editorAPI = props.editorAPI;
35
35
 
36
36
  // When primary toolbar components is undefined, do not show two line editor toolbar
37
- var twoLineEditorToolbar = !!props.customPrimaryToolbarComponents && !!((_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.twoLineEditorToolbar);
37
+ var twoLineEditorToolbar = !!props.customPrimaryToolbarComponents;
38
38
  var nonCustomToolbar =
39
39
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
40
40
  (0, _react2.jsx)("div", {
@@ -61,7 +61,7 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
61
61
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
62
62
  (0, _react2.jsx)("div", {
63
63
  css: _MainToolbar.customToolbarWrapperStyle
64
- }, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? (0, _react2.jsx)(_BeforeWrapper.BeforePrimaryToolbarWrapper, {
64
+ }, !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? (0, _react2.jsx)(_BeforeWrapper.BeforePrimaryToolbarWrapper, {
65
65
  beforePrimaryToolbarComponents: (_props$customPrimaryT = props.customPrimaryToolbarComponents) === null || _props$customPrimaryT === void 0 ? void 0 : _props$customPrimaryT.before
66
66
  }) : null, editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.findReplace.actions.getToolbarButton({
67
67
  popupsBoundariesElement: props.popupsBoundariesElement,
package/dist/cjs/ui/ContentStyles/layout.js CHANGED
@@ -72,11 +72,11 @@ var layoutWithSeparatorBorderStyles = function layoutWithSeparatorBorderStyles(v
72
72
  };
73
73
  var layoutResponsiveStyles = function layoutResponsiveStyles(viewMode) {
74
74
  return (// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
75
- (0, _react.css)(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2.default)(["\n\t\t/* chosen breakpoints in container queries are to make sure layout responsiveness in editor aligns with renderer */\n\t\t/* not resized layout in full-width editor */\n\t\t.fabric-editor--full-width-mode .ProseMirror {\n\t\t\t> .layoutSectionView-content-wrap {\n\t\t\t\t[data-layout-section] {\n\t\t\t\t\t@container editor-area (max-width:854px) {\n\t\t\t\t\t\tflex-direction: column;\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\n\t\t/* not resized layout in fixed-width editor */\n\t\t.ak-editor-content-area:not(.fabric-editor--full-width-mode) .ProseMirror {\n\t\t\t> .layoutSectionView-content-wrap {\n\t\t\t\t[data-layout-section] {\n\t\t\t\t\t@container editor-area (max-width:918px) {\n\t\t\t\t\t\tflex-direction: column;\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\n\t\t/* resized layout in full/fixed-width editor */\n\t\t.ProseMirror .fabric-editor-breakout-mark {\n\t\t\t.layoutSectionView-content-wrap {\n\t\t\t\t[data-layout-section] {\n\t\t\t\t\t@container editor-area (max-width:950px) {\n\t\t\t\t\t\tflex-direction: column;\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\t"])), layoutWithSeparatorBorderResponsiveStyles(854, viewMode), layoutWithSeparatorBorderResponsiveStyles(918, viewMode), layoutWithSeparatorBorderResponsiveStyles(950, viewMode))
75
+ (0, _react.css)(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2.default)(["\n\t\t/* chosen breakpoints in container queries are to make sure layout responsiveness in editor aligns with renderer */\n\t\t/* not resized layout in full-width editor */\n\t\t.fabric-editor--full-width-mode .ProseMirror {\n\t\t\t> .layoutSectionView-content-wrap {\n\t\t\t\t[data-layout-section] {\n\t\t\t\t\t@container editor-area (max-width:724px) {\n\t\t\t\t\t\tflex-direction: column;\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\n\t\t/* not resized layout in fixed-width editor */\n\t\t.ak-editor-content-area:not(.fabric-editor--full-width-mode) .ProseMirror {\n\t\t\t> .layoutSectionView-content-wrap {\n\t\t\t\t[data-layout-section] {\n\t\t\t\t\t@container editor-area (max-width:788px) {\n\t\t\t\t\t\tflex-direction: column;\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\n\t\t/* resized layout in full/fixed-width editor */\n\t\t.ProseMirror .fabric-editor-breakout-mark {\n\t\t\t.layoutSectionView-content-wrap {\n\t\t\t\t[data-layout-section] {\n\t\t\t\t\t@container editor-area (max-width:820px) {\n\t\t\t\t\t\tflex-direction: column;\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\t"])), layoutWithSeparatorBorderResponsiveStyles(724, viewMode), layoutWithSeparatorBorderResponsiveStyles(788, viewMode), layoutWithSeparatorBorderResponsiveStyles(820, viewMode))
76
76
  );
77
77
  };
78
78
 
79
79
  // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Needs manual remediation
80
80
  var layoutStyles = exports.layoutStyles = function layoutStyles(viewMode) {
81
- return (0, _react.css)(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteral2.default)(["\n\t.ProseMirror {\n\t\t", "\n\t\t[data-layout-section] {\n\t\t\t// TODO: Migrate away from gridSize\n\t\t\t// Recommendation: Replace directly with 7px\n\t\t\tmargin: ", " -", "px 0;\n\t\t\ttransition: border-color 0.3s ", ";\n\t\t\tcursor: ", ";\n\n\t\t\t/* Inner cursor located 26px from left */\n\t\t\t[data-layout-column] {\n\t\t\t\tflex: 1;\n\t\t\t\t", "\n\n\t\t\t\tmin-width: 0;\n\t\t\t\t/* disable 4 borders when in view mode and advanced layouts is on */\n\t\t\t\tborder: ", "px\n\t\t\t\t\tsolid ", ";\n\t\t\t\tborder-radius: 4px;\n\t\t\t\tpadding: ", "px\n\t\t\t\t\t", "px;\n\t\t\t\tbox-sizing: border-box;\n\n\t\t\t\t> div {\n\t\t\t\t\t", "\n\n\t\t\t\t\t> .embedCardView-content-wrap:first-of-type .rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .mediaSingleView-content-wrap:first-of-type .rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .ProseMirror-gapcursor.-right:first-child\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> style:first-child\n\t\t\t\t\t\t+ .ProseMirror-gapcursor.-right\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> .ProseMirror-gapcursor.-right:first-of-type\n\t\t\t\t\t\t+ .embedCardView-content-wrap\n\t\t\t\t\t\t.rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .ProseMirror-gapcursor:first-child\n\t\t\t\t\t\t+ span\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> style:first-child\n\t\t\t\t\t\t+ .ProseMirror-gapcursor\n\t\t\t\t\t\t+ span\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t/* Prevent first DecisionWrapper's margin-top: 8px from shifting decisions down\n and shrinking layout's node selectable area (leniency margin) */\n\t\t\t\t\t> [data-node-type='decisionList'] {\n\t\t\t\t\t\tli:first-of-type [data-decision-wrapper] {\n\t\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t/* Make the 'content' fill the entire height of the layout column to allow click\n handler of layout section nodeview to target only data-layout-column */\n\t\t\t\t[data-layout-content] {\n\t\t\t\t\theight: 100%;\n\t\t\t\t\tcursor: text;\n\t\t\t\t\t.mediaGroupView-content-wrap {\n\t\t\t\t\t\tclear: both;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t", "\n\t\t}\n\n\t\t// styles to support borders for layout\n\t\t[data-layout-section],\n\t\t.layoutSectionView-content-wrap {\n\t\t\t", "\n\t\t}\n\t}\n\n\t", "\n\n\t.fabric-editor--full-width-mode .ProseMirror {\n\t\t[data-layout-section] {\n\t\t\t.", " {\n\t\t\t\tmargin: 0 ", "px;\n\t\t\t}\n\t\t}\n\t}\n\n\t", "\n"])), layoutSectionStyles(), "var(--ds-space-100, 8px)", _editorSharedStyles.akLayoutGutterOffset, _editorSharedStyles.akEditorSwoopCubicBezier, viewMode === 'view' ? 'default' : 'pointer', (0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2') ? 'position: relative;' : '', viewMode === 'view' || (0, _experiments.editorExperiment)('advanced_layouts', true) ? 0 : _editorSharedStyles.akEditorSelectedBorderSize, "var(--ds-border, #091E4224)", _styles.LAYOUT_COLUMN_PADDING, _styles.LAYOUT_COLUMN_PADDING + ((0, _experiments.editorExperiment)('nested-dnd', true) ? 8 : 0), firstNodeWithNotMarginTop(), layoutColumnStyles(), (0, _experiments.editorExperiment)('advanced_layouts', true) ? layoutWithSeparatorBorderStyles(viewMode) : layoutBorderStyles(viewMode), (0, _experiments.editorExperiment)('advanced_layouts', true) && layoutResponsiveStyles(viewMode), _types.TableCssClassName.TABLE_CONTAINER, _consts.tableMarginFullWidthMode, (0, _experiments.editorExperiment)('nested-dnd', true) && !(0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_breakout_resizing') && ".ak-editor-content-area.appearance-full-page .ProseMirror [data-layout-section] {\n\t\t\t\tmargin: ".concat("var(--ds-space-100, 8px)", " -", _editorSharedStyles.akLayoutGutterOffset + 8, "px 0;\n\t\t\t\t}"));
81
+ return (0, _react.css)(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteral2.default)(["\n\t.ProseMirror {\n\t\t", "\n\t\t[data-layout-section] {\n\t\t\t// TODO: Migrate away from gridSize\n\t\t\t// Recommendation: Replace directly with 7px\n\t\t\tmargin: ", " -", "px 0;\n\t\t\ttransition: border-color 0.3s ", ";\n\t\t\tcursor: ", ";\n\n\t\t\t/* Inner cursor located 26px from left */\n\t\t\t[data-layout-column] {\n\t\t\t\tflex: 1;\n\t\t\t\t", "\n\n\t\t\t\tmin-width: 0;\n\t\t\t\t/* disable 4 borders when in view mode and advanced layouts is on */\n\t\t\t\tborder: ", "px\n\t\t\t\t\tsolid ", ";\n\t\t\t\tborder-radius: 4px;\n\t\t\t\tpadding: ", "px\n\t\t\t\t\t", "px;\n\t\t\t\tbox-sizing: border-box;\n\n\t\t\t\t> div {\n\t\t\t\t\t", "\n\n\t\t\t\t\t> .embedCardView-content-wrap:first-of-type .rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .mediaSingleView-content-wrap:first-of-type .rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .ProseMirror-gapcursor.-right:first-child\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> style:first-child\n\t\t\t\t\t\t+ .ProseMirror-gapcursor.-right\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> .ProseMirror-gapcursor.-right:first-of-type\n\t\t\t\t\t\t+ .embedCardView-content-wrap\n\t\t\t\t\t\t.rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .ProseMirror-gapcursor:first-child\n\t\t\t\t\t\t+ span\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> style:first-child\n\t\t\t\t\t\t+ .ProseMirror-gapcursor\n\t\t\t\t\t\t+ span\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t/* Prevent first DecisionWrapper's margin-top: 8px from shifting decisions down\n and shrinking layout's node selectable area (leniency margin) */\n\t\t\t\t\t> [data-node-type='decisionList'] {\n\t\t\t\t\t\tli:first-of-type [data-decision-wrapper] {\n\t\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t/* Make the 'content' fill the entire height of the layout column to allow click\n handler of layout section nodeview to target only data-layout-column */\n\t\t\t\t[data-layout-content] {\n\t\t\t\t\theight: 100%;\n\t\t\t\t\tcursor: text;\n\t\t\t\t\t.mediaGroupView-content-wrap {\n\t\t\t\t\t\tclear: both;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t", "\n\t\t}\n\n\t\t// styles to support borders for layout\n\t\t[data-layout-section],\n\t\t.layoutSectionView-content-wrap {\n\t\t\t", "\n\t\t}\n\t}\n\n\t", "\n\n\t// hide separator when element is dragging on top of a layout column\n\t[data-blocks-drop-target-container] ~ [data-layout-column] > [data-layout-content]::before {\n\t\tdisplay: none;\n\t}\n\n\t.fabric-editor--full-width-mode .ProseMirror {\n\t\t[data-layout-section] {\n\t\t\t.", " {\n\t\t\t\tmargin: 0 ", "px;\n\t\t\t}\n\t\t}\n\t}\n\n\t", "\n"])), layoutSectionStyles(), "var(--ds-space-100, 8px)", _editorSharedStyles.akLayoutGutterOffset, _editorSharedStyles.akEditorSwoopCubicBezier, viewMode === 'view' ? 'default' : 'pointer', (0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2') ? 'position: relative;' : '', viewMode === 'view' || (0, _experiments.editorExperiment)('advanced_layouts', true) ? 0 : _editorSharedStyles.akEditorSelectedBorderSize, "var(--ds-border, #091E4224)", _styles.LAYOUT_COLUMN_PADDING, _styles.LAYOUT_COLUMN_PADDING + ((0, _experiments.editorExperiment)('nested-dnd', true) ? 8 : 0), firstNodeWithNotMarginTop(), layoutColumnStyles(), (0, _experiments.editorExperiment)('advanced_layouts', true) ? layoutWithSeparatorBorderStyles(viewMode) : layoutBorderStyles(viewMode), (0, _experiments.editorExperiment)('advanced_layouts', true) && layoutResponsiveStyles(viewMode), _types.TableCssClassName.TABLE_CONTAINER, _consts.tableMarginFullWidthMode, (0, _experiments.editorExperiment)('nested-dnd', true) && !(0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_breakout_resizing') && ".ak-editor-content-area.appearance-full-page .ProseMirror [data-layout-section] {\n\t\t\t\tmargin: ".concat("var(--ds-space-100, 8px)", " -", _editorSharedStyles.akLayoutGutterOffset + 8, "px 0;\n\t\t\t\t}"));
82
82
  };
package/dist/cjs/version-wrapper.js CHANGED
@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.version = exports.name = void 0;
7
7
  var name = exports.name = "@atlaskit/editor-core";
8
- var version = exports.version = "202.4.1";
8
+ var version = exports.version = "202.5.1";
package/dist/es2019/ui/Appearance/Comment/Comment.js CHANGED
@@ -132,7 +132,9 @@ export const CommentEditorWithIntl = props => {
132
132
  //Alt + F9 to reach first element in this main toolbar
133
133
  return event.altKey && (event.key === 'F9' || event.keyCode === 120);
134
134
  }, []);
135
- const isTwoLineToolbarEnabled = !!customPrimaryToolbarComponents && !!(featureFlags !== null && featureFlags !== void 0 && featureFlags.twoLineEditorToolbar);
135
+
136
+ // When primary toolbar components is undefined, do not show two line editor toolbar
137
+ const isTwoLineToolbarEnabled = !!customPrimaryToolbarComponents;
136
138
  const handleEscape = useCallback(event => {
137
139
  if (!(editorView !== null && editorView !== void 0 && editorView.hasFocus())) {
138
140
  editorView === null || editorView === void 0 ? void 0 : editorView.focus();
package/dist/es2019/ui/Appearance/FullPage/FullPageToolbar.js CHANGED
@@ -15,14 +15,14 @@ import Toolbar from '../../Toolbar';
15
15
  import { BeforePrimaryToolbarWrapper } from './BeforeWrapper';
16
16
  import { customToolbarWrapperStyle, mainToolbarFirstChildStyle, mainToolbarIconBeforeStyle, mainToolbarSecondChildStyle, mainToolbarStyle, MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, nonCustomToolbarWrapperStyle } from './MainToolbar';
17
17
  export const EditorToolbar = /*#__PURE__*/React.memo(props => {
18
- var _props$featureFlags, _props$customPrimaryT;
18
+ var _props$customPrimaryT;
19
19
  const [shouldSplitToolbar, setShouldSplitToolbar] = useState(false);
20
20
  const {
21
21
  editorAPI
22
22
  } = props;
23
23
 
24
24
  // When primary toolbar components is undefined, do not show two line editor toolbar
25
- const twoLineEditorToolbar = !!props.customPrimaryToolbarComponents && !!((_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.twoLineEditorToolbar);
25
+ const twoLineEditorToolbar = !!props.customPrimaryToolbarComponents;
26
26
  const nonCustomToolbar =
27
27
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
28
28
  jsx("div", {
@@ -49,7 +49,7 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
49
49
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
50
50
  jsx("div", {
51
51
  css: customToolbarWrapperStyle
52
- }, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? jsx(BeforePrimaryToolbarWrapper, {
52
+ }, !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? jsx(BeforePrimaryToolbarWrapper, {
53
53
  beforePrimaryToolbarComponents: (_props$customPrimaryT = props.customPrimaryToolbarComponents) === null || _props$customPrimaryT === void 0 ? void 0 : _props$customPrimaryT.before
54
54
  }) : null, editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.findReplace.actions.getToolbarButton({
55
55
  popupsBoundariesElement: props.popupsBoundariesElement,
package/dist/es2019/ui/ContentStyles/layout.js CHANGED
@@ -227,12 +227,12 @@ css`
227
227
  .fabric-editor--full-width-mode .ProseMirror {
228
228
  > .layoutSectionView-content-wrap {
229
229
  [data-layout-section] {
230
- @container editor-area (max-width:854px) {
230
+ @container editor-area (max-width:724px) {
231
231
  flex-direction: column;
232
232
  }
233
233
  }
234
234
 
235
- ${layoutWithSeparatorBorderResponsiveStyles(854, viewMode)}
235
+ ${layoutWithSeparatorBorderResponsiveStyles(724, viewMode)}
236
236
  }
237
237
  }
238
238
 
@@ -240,12 +240,12 @@ css`
240
240
  .ak-editor-content-area:not(.fabric-editor--full-width-mode) .ProseMirror {
241
241
  > .layoutSectionView-content-wrap {
242
242
  [data-layout-section] {
243
- @container editor-area (max-width:918px) {
243
+ @container editor-area (max-width:788px) {
244
244
  flex-direction: column;
245
245
  }
246
246
  }
247
247
 
248
- ${layoutWithSeparatorBorderResponsiveStyles(918, viewMode)}
248
+ ${layoutWithSeparatorBorderResponsiveStyles(788, viewMode)}
249
249
  }
250
250
  }
251
251
 
@@ -253,12 +253,12 @@ css`
253
253
  .ProseMirror .fabric-editor-breakout-mark {
254
254
  .layoutSectionView-content-wrap {
255
255
  [data-layout-section] {
256
- @container editor-area (max-width:950px) {
256
+ @container editor-area (max-width:820px) {
257
257
  flex-direction: column;
258
258
  }
259
259
  }
260
260
 
261
- ${layoutWithSeparatorBorderResponsiveStyles(950, viewMode)}
261
+ ${layoutWithSeparatorBorderResponsiveStyles(820, viewMode)}
262
262
  }
263
263
  }
264
264
  `;
@@ -356,6 +356,11 @@ export const layoutStyles = viewMode => css`
356
356
 
357
357
  ${editorExperiment('advanced_layouts', true) && layoutResponsiveStyles(viewMode)}
358
358
 
359
+ // hide separator when element is dragging on top of a layout column
360
+ [data-blocks-drop-target-container] ~ [data-layout-column] > [data-layout-content]::before {
361
+ display: none;
362
+ }
363
+
359
364
  .fabric-editor--full-width-mode .ProseMirror {
360
365
  [data-layout-section] {
361
366
  .${TableCssClassName.TABLE_CONTAINER} {
package/dist/es2019/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "202.4.1";
2
+ export const version = "202.5.1";
package/dist/esm/ui/Appearance/Comment/Comment.js CHANGED
@@ -136,7 +136,9 @@ export var CommentEditorWithIntl = function CommentEditorWithIntl(props) {
136
136
  //Alt + F9 to reach first element in this main toolbar
137
137
  return event.altKey && (event.key === 'F9' || event.keyCode === 120);
138
138
  }, []);
139
- var isTwoLineToolbarEnabled = !!customPrimaryToolbarComponents && !!(featureFlags !== null && featureFlags !== void 0 && featureFlags.twoLineEditorToolbar);
139
+
140
+ // When primary toolbar components is undefined, do not show two line editor toolbar
141
+ var isTwoLineToolbarEnabled = !!customPrimaryToolbarComponents;
140
142
  var handleEscape = useCallback(function (event) {
141
143
  if (!(editorView !== null && editorView !== void 0 && editorView.hasFocus())) {
142
144
  editorView === null || editorView === void 0 || editorView.focus();
package/dist/esm/ui/Appearance/FullPage/FullPageToolbar.js CHANGED
@@ -16,7 +16,7 @@ import Toolbar from '../../Toolbar';
16
16
  import { BeforePrimaryToolbarWrapper } from './BeforeWrapper';
17
17
  import { customToolbarWrapperStyle, mainToolbarFirstChildStyle, mainToolbarIconBeforeStyle, mainToolbarSecondChildStyle, mainToolbarStyle, MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, nonCustomToolbarWrapperStyle } from './MainToolbar';
18
18
  export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
19
- var _props$featureFlags, _props$customPrimaryT;
19
+ var _props$customPrimaryT;
20
20
  var _useState = useState(false),
21
21
  _useState2 = _slicedToArray(_useState, 2),
22
22
  shouldSplitToolbar = _useState2[0],
@@ -24,7 +24,7 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
24
24
  var editorAPI = props.editorAPI;
25
25
 
26
26
  // When primary toolbar components is undefined, do not show two line editor toolbar
27
- var twoLineEditorToolbar = !!props.customPrimaryToolbarComponents && !!((_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.twoLineEditorToolbar);
27
+ var twoLineEditorToolbar = !!props.customPrimaryToolbarComponents;
28
28
  var nonCustomToolbar =
29
29
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
30
30
  jsx("div", {
@@ -51,7 +51,7 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
51
51
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
52
52
  jsx("div", {
53
53
  css: customToolbarWrapperStyle
54
- }, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? jsx(BeforePrimaryToolbarWrapper, {
54
+ }, !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? jsx(BeforePrimaryToolbarWrapper, {
55
55
  beforePrimaryToolbarComponents: (_props$customPrimaryT = props.customPrimaryToolbarComponents) === null || _props$customPrimaryT === void 0 ? void 0 : _props$customPrimaryT.before
56
56
  }) : null, editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.findReplace.actions.getToolbarButton({
57
57
  popupsBoundariesElement: props.popupsBoundariesElement,
package/dist/esm/ui/ContentStyles/layout.js CHANGED
@@ -55,11 +55,11 @@ var layoutWithSeparatorBorderStyles = function layoutWithSeparatorBorderStyles(v
55
55
  };
56
56
  var layoutResponsiveStyles = function layoutResponsiveStyles(viewMode) {
57
57
  return (// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
58
- css(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n\t\t/* chosen breakpoints in container queries are to make sure layout responsiveness in editor aligns with renderer */\n\t\t/* not resized layout in full-width editor */\n\t\t.fabric-editor--full-width-mode .ProseMirror {\n\t\t\t> .layoutSectionView-content-wrap {\n\t\t\t\t[data-layout-section] {\n\t\t\t\t\t@container editor-area (max-width:854px) {\n\t\t\t\t\t\tflex-direction: column;\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\n\t\t/* not resized layout in fixed-width editor */\n\t\t.ak-editor-content-area:not(.fabric-editor--full-width-mode) .ProseMirror {\n\t\t\t> .layoutSectionView-content-wrap {\n\t\t\t\t[data-layout-section] {\n\t\t\t\t\t@container editor-area (max-width:918px) {\n\t\t\t\t\t\tflex-direction: column;\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\n\t\t/* resized layout in full/fixed-width editor */\n\t\t.ProseMirror .fabric-editor-breakout-mark {\n\t\t\t.layoutSectionView-content-wrap {\n\t\t\t\t[data-layout-section] {\n\t\t\t\t\t@container editor-area (max-width:950px) {\n\t\t\t\t\t\tflex-direction: column;\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\t"])), layoutWithSeparatorBorderResponsiveStyles(854, viewMode), layoutWithSeparatorBorderResponsiveStyles(918, viewMode), layoutWithSeparatorBorderResponsiveStyles(950, viewMode))
58
+ css(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n\t\t/* chosen breakpoints in container queries are to make sure layout responsiveness in editor aligns with renderer */\n\t\t/* not resized layout in full-width editor */\n\t\t.fabric-editor--full-width-mode .ProseMirror {\n\t\t\t> .layoutSectionView-content-wrap {\n\t\t\t\t[data-layout-section] {\n\t\t\t\t\t@container editor-area (max-width:724px) {\n\t\t\t\t\t\tflex-direction: column;\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\n\t\t/* not resized layout in fixed-width editor */\n\t\t.ak-editor-content-area:not(.fabric-editor--full-width-mode) .ProseMirror {\n\t\t\t> .layoutSectionView-content-wrap {\n\t\t\t\t[data-layout-section] {\n\t\t\t\t\t@container editor-area (max-width:788px) {\n\t\t\t\t\t\tflex-direction: column;\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\n\t\t/* resized layout in full/fixed-width editor */\n\t\t.ProseMirror .fabric-editor-breakout-mark {\n\t\t\t.layoutSectionView-content-wrap {\n\t\t\t\t[data-layout-section] {\n\t\t\t\t\t@container editor-area (max-width:820px) {\n\t\t\t\t\t\tflex-direction: column;\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\t"])), layoutWithSeparatorBorderResponsiveStyles(724, viewMode), layoutWithSeparatorBorderResponsiveStyles(788, viewMode), layoutWithSeparatorBorderResponsiveStyles(820, viewMode))
59
59
  );
60
60
  };
61
61
 
62
62
  // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Needs manual remediation
63
63
  export var layoutStyles = function layoutStyles(viewMode) {
64
- return css(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n\t.ProseMirror {\n\t\t", "\n\t\t[data-layout-section] {\n\t\t\t// TODO: Migrate away from gridSize\n\t\t\t// Recommendation: Replace directly with 7px\n\t\t\tmargin: ", " -", "px 0;\n\t\t\ttransition: border-color 0.3s ", ";\n\t\t\tcursor: ", ";\n\n\t\t\t/* Inner cursor located 26px from left */\n\t\t\t[data-layout-column] {\n\t\t\t\tflex: 1;\n\t\t\t\t", "\n\n\t\t\t\tmin-width: 0;\n\t\t\t\t/* disable 4 borders when in view mode and advanced layouts is on */\n\t\t\t\tborder: ", "px\n\t\t\t\t\tsolid ", ";\n\t\t\t\tborder-radius: 4px;\n\t\t\t\tpadding: ", "px\n\t\t\t\t\t", "px;\n\t\t\t\tbox-sizing: border-box;\n\n\t\t\t\t> div {\n\t\t\t\t\t", "\n\n\t\t\t\t\t> .embedCardView-content-wrap:first-of-type .rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .mediaSingleView-content-wrap:first-of-type .rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .ProseMirror-gapcursor.-right:first-child\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> style:first-child\n\t\t\t\t\t\t+ .ProseMirror-gapcursor.-right\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> .ProseMirror-gapcursor.-right:first-of-type\n\t\t\t\t\t\t+ .embedCardView-content-wrap\n\t\t\t\t\t\t.rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .ProseMirror-gapcursor:first-child\n\t\t\t\t\t\t+ span\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> style:first-child\n\t\t\t\t\t\t+ .ProseMirror-gapcursor\n\t\t\t\t\t\t+ span\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t/* Prevent first DecisionWrapper's margin-top: 8px from shifting decisions down\n and shrinking layout's node selectable area (leniency margin) */\n\t\t\t\t\t> [data-node-type='decisionList'] {\n\t\t\t\t\t\tli:first-of-type [data-decision-wrapper] {\n\t\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t/* Make the 'content' fill the entire height of the layout column to allow click\n handler of layout section nodeview to target only data-layout-column */\n\t\t\t\t[data-layout-content] {\n\t\t\t\t\theight: 100%;\n\t\t\t\t\tcursor: text;\n\t\t\t\t\t.mediaGroupView-content-wrap {\n\t\t\t\t\t\tclear: both;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t", "\n\t\t}\n\n\t\t// styles to support borders for layout\n\t\t[data-layout-section],\n\t\t.layoutSectionView-content-wrap {\n\t\t\t", "\n\t\t}\n\t}\n\n\t", "\n\n\t.fabric-editor--full-width-mode .ProseMirror {\n\t\t[data-layout-section] {\n\t\t\t.", " {\n\t\t\t\tmargin: 0 ", "px;\n\t\t\t}\n\t\t}\n\t}\n\n\t", "\n"])), layoutSectionStyles(), "var(--ds-space-100, 8px)", akLayoutGutterOffset, akEditorSwoopCubicBezier, viewMode === 'view' ? 'default' : 'pointer', fg('platform_editor_drag_and_drop_target_v2') ? 'position: relative;' : '', viewMode === 'view' || editorExperiment('advanced_layouts', true) ? 0 : akEditorSelectedBorderSize, "var(--ds-border, #091E4224)", LAYOUT_COLUMN_PADDING, LAYOUT_COLUMN_PADDING + (editorExperiment('nested-dnd', true) ? 8 : 0), firstNodeWithNotMarginTop(), layoutColumnStyles(), editorExperiment('advanced_layouts', true) ? layoutWithSeparatorBorderStyles(viewMode) : layoutBorderStyles(viewMode), editorExperiment('advanced_layouts', true) && layoutResponsiveStyles(viewMode), TableCssClassName.TABLE_CONTAINER, tableMarginFullWidthMode, editorExperiment('nested-dnd', true) && !fg('platform_editor_advanced_layouts_breakout_resizing') && ".ak-editor-content-area.appearance-full-page .ProseMirror [data-layout-section] {\n\t\t\t\tmargin: ".concat("var(--ds-space-100, 8px)", " -", akLayoutGutterOffset + 8, "px 0;\n\t\t\t\t}"));
64
+ return css(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n\t.ProseMirror {\n\t\t", "\n\t\t[data-layout-section] {\n\t\t\t// TODO: Migrate away from gridSize\n\t\t\t// Recommendation: Replace directly with 7px\n\t\t\tmargin: ", " -", "px 0;\n\t\t\ttransition: border-color 0.3s ", ";\n\t\t\tcursor: ", ";\n\n\t\t\t/* Inner cursor located 26px from left */\n\t\t\t[data-layout-column] {\n\t\t\t\tflex: 1;\n\t\t\t\t", "\n\n\t\t\t\tmin-width: 0;\n\t\t\t\t/* disable 4 borders when in view mode and advanced layouts is on */\n\t\t\t\tborder: ", "px\n\t\t\t\t\tsolid ", ";\n\t\t\t\tborder-radius: 4px;\n\t\t\t\tpadding: ", "px\n\t\t\t\t\t", "px;\n\t\t\t\tbox-sizing: border-box;\n\n\t\t\t\t> div {\n\t\t\t\t\t", "\n\n\t\t\t\t\t> .embedCardView-content-wrap:first-of-type .rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .mediaSingleView-content-wrap:first-of-type .rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .ProseMirror-gapcursor.-right:first-child\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> style:first-child\n\t\t\t\t\t\t+ .ProseMirror-gapcursor.-right\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> .ProseMirror-gapcursor.-right:first-of-type\n\t\t\t\t\t\t+ .embedCardView-content-wrap\n\t\t\t\t\t\t.rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .ProseMirror-gapcursor:first-child\n\t\t\t\t\t\t+ span\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> style:first-child\n\t\t\t\t\t\t+ .ProseMirror-gapcursor\n\t\t\t\t\t\t+ span\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t/* Prevent first DecisionWrapper's margin-top: 8px from shifting decisions down\n and shrinking layout's node selectable area (leniency margin) */\n\t\t\t\t\t> [data-node-type='decisionList'] {\n\t\t\t\t\t\tli:first-of-type [data-decision-wrapper] {\n\t\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t/* Make the 'content' fill the entire height of the layout column to allow click\n handler of layout section nodeview to target only data-layout-column */\n\t\t\t\t[data-layout-content] {\n\t\t\t\t\theight: 100%;\n\t\t\t\t\tcursor: text;\n\t\t\t\t\t.mediaGroupView-content-wrap {\n\t\t\t\t\t\tclear: both;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t", "\n\t\t}\n\n\t\t// styles to support borders for layout\n\t\t[data-layout-section],\n\t\t.layoutSectionView-content-wrap {\n\t\t\t", "\n\t\t}\n\t}\n\n\t", "\n\n\t// hide separator when element is dragging on top of a layout column\n\t[data-blocks-drop-target-container] ~ [data-layout-column] > [data-layout-content]::before {\n\t\tdisplay: none;\n\t}\n\n\t.fabric-editor--full-width-mode .ProseMirror {\n\t\t[data-layout-section] {\n\t\t\t.", " {\n\t\t\t\tmargin: 0 ", "px;\n\t\t\t}\n\t\t}\n\t}\n\n\t", "\n"])), layoutSectionStyles(), "var(--ds-space-100, 8px)", akLayoutGutterOffset, akEditorSwoopCubicBezier, viewMode === 'view' ? 'default' : 'pointer', fg('platform_editor_drag_and_drop_target_v2') ? 'position: relative;' : '', viewMode === 'view' || editorExperiment('advanced_layouts', true) ? 0 : akEditorSelectedBorderSize, "var(--ds-border, #091E4224)", LAYOUT_COLUMN_PADDING, LAYOUT_COLUMN_PADDING + (editorExperiment('nested-dnd', true) ? 8 : 0), firstNodeWithNotMarginTop(), layoutColumnStyles(), editorExperiment('advanced_layouts', true) ? layoutWithSeparatorBorderStyles(viewMode) : layoutBorderStyles(viewMode), editorExperiment('advanced_layouts', true) && layoutResponsiveStyles(viewMode), TableCssClassName.TABLE_CONTAINER, tableMarginFullWidthMode, editorExperiment('nested-dnd', true) && !fg('platform_editor_advanced_layouts_breakout_resizing') && ".ak-editor-content-area.appearance-full-page .ProseMirror [data-layout-section] {\n\t\t\t\tmargin: ".concat("var(--ds-space-100, 8px)", " -", akLayoutGutterOffset + 8, "px 0;\n\t\t\t\t}"));
65
65
  };
package/dist/esm/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "202.4.1";
2
+ export var version = "202.5.1";
package/dist/types/create-editor/create-universal-preset.d.ts CHANGED
@@ -1397,8 +1397,8 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
1397
1397
  } | undefined>>];
1398
1398
  actions: {
1399
1399
  insertTaskDecision: (listType: import("@atlaskit/editor-plugin-tasks-and-decisions").TaskDecisionListType, inputMethod?: import("@atlaskit/editor-common/analytics").INPUT_METHOD.FORMATTING | import("@atlaskit/editor-common/analytics").INPUT_METHOD.QUICK_INSERT | import("@atlaskit/editor-common/types").TOOLBAR_MENU_TYPE | undefined, addItem?: import("@atlaskit/editor-plugin-tasks-and-decisions").AddItemTransactionCreator | undefined, listLocalId?: string | undefined, itemLocalId?: string | undefined) => import("@atlaskit/editor-common/types").Command;
1400
- indentTaskList: (inputMethod?: (import("@atlaskit/editor-common/analytics").INPUT_METHOD.KEYBOARD | import("@atlaskit/editor-common/analytics").INPUT_METHOD.TOOLBAR) | undefined) => import("@atlaskit/editor-common/types").Command;
1401
- outdentTaskList: (inputMethod?: (import("@atlaskit/editor-common/analytics").INPUT_METHOD.KEYBOARD | import("@atlaskit/editor-common/analytics").INPUT_METHOD.TOOLBAR) | undefined) => import("@atlaskit/editor-common/types").Command;
1400
+ indentTaskList: (inputMethod?: (import("@atlaskit/editor-common/analytics").INPUT_METHOD.FLOATING_TB | import("@atlaskit/editor-common/analytics").INPUT_METHOD.KEYBOARD | import("@atlaskit/editor-common/analytics").INPUT_METHOD.TOOLBAR) | undefined) => import("@atlaskit/editor-common/types").Command;
1401
+ outdentTaskList: (inputMethod?: (import("@atlaskit/editor-common/analytics").INPUT_METHOD.FLOATING_TB | import("@atlaskit/editor-common/analytics").INPUT_METHOD.KEYBOARD | import("@atlaskit/editor-common/analytics").INPUT_METHOD.TOOLBAR) | undefined) => import("@atlaskit/editor-common/types").Command;
1402
1402
  setProvider: (provider: Promise<import("@atlaskit/task-decision").TaskDecisionProvider>) => Promise<boolean>;
1403
1403
  };
1404
1404
  commands: {
@@ -1840,10 +1840,7 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
1840
1840
  sharedState: import("@atlaskit/editor-plugin-editor-disabled").EditorDisabledPluginState;
1841
1841
  }, undefined>>];
1842
1842
  actions: {
1843
- insertLayoutColumns: (inputMethod: import("@atlaskit/editor-common/types").TOOLBAR_MENU_TYPE, formatMessage?: {
1844
- (descriptor: import("react-intl-next").MessageDescriptor, values?: Record<string, import("intl-messageformat").PrimitiveType | import("intl-messageformat").FormatXMLElementFn<string, string>> | undefined, opts?: import("intl-messageformat").Options | undefined): string;
1845
- (descriptor: import("react-intl-next").MessageDescriptor, values?: Record<string, string | number | boolean | {} | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNodeArray | import("react").ReactPortal | Date | import("intl-messageformat").FormatXMLElementFn<import("react").ReactNode, import("react").ReactNode> | null | undefined> | undefined, opts?: import("intl-messageformat").Options | undefined): import("react").ReactNode;
1846
- } | undefined) => import("@atlaskit/editor-common/types").Command;
1843
+ insertLayoutColumns: (inputMethod: import("@atlaskit/editor-common/types").TOOLBAR_MENU_TYPE) => import("@atlaskit/editor-common/types").Command;
1847
1844
  };
1848
1845
  }, import("@atlaskit/editor-plugin-layout").LayoutPluginOptions | undefined> | undefined, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"placeholderText", {
1849
1846
  dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
@@ -2902,8 +2899,8 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
2902
2899
  } | undefined>>];
2903
2900
  actions: {
2904
2901
  insertTaskDecision: (listType: import("@atlaskit/editor-plugin-tasks-and-decisions").TaskDecisionListType, inputMethod?: import("@atlaskit/editor-common/analytics").INPUT_METHOD.FORMATTING | import("@atlaskit/editor-common/analytics").INPUT_METHOD.QUICK_INSERT | import("@atlaskit/editor-common/types").TOOLBAR_MENU_TYPE | undefined, addItem?: import("@atlaskit/editor-plugin-tasks-and-decisions").AddItemTransactionCreator | undefined, listLocalId?: string | undefined, itemLocalId?: string | undefined) => import("@atlaskit/editor-common/types").Command;
2905
- indentTaskList: (inputMethod?: (import("@atlaskit/editor-common/analytics").INPUT_METHOD.KEYBOARD | import("@atlaskit/editor-common/analytics").INPUT_METHOD.TOOLBAR) | undefined) => import("@atlaskit/editor-common/types").Command;
2906
- outdentTaskList: (inputMethod?: (import("@atlaskit/editor-common/analytics").INPUT_METHOD.KEYBOARD | import("@atlaskit/editor-common/analytics").INPUT_METHOD.TOOLBAR) | undefined) => import("@atlaskit/editor-common/types").Command;
2902
+ indentTaskList: (inputMethod?: (import("@atlaskit/editor-common/analytics").INPUT_METHOD.FLOATING_TB | import("@atlaskit/editor-common/analytics").INPUT_METHOD.KEYBOARD | import("@atlaskit/editor-common/analytics").INPUT_METHOD.TOOLBAR) | undefined) => import("@atlaskit/editor-common/types").Command;
2903
+ outdentTaskList: (inputMethod?: (import("@atlaskit/editor-common/analytics").INPUT_METHOD.FLOATING_TB | import("@atlaskit/editor-common/analytics").INPUT_METHOD.KEYBOARD | import("@atlaskit/editor-common/analytics").INPUT_METHOD.TOOLBAR) | undefined) => import("@atlaskit/editor-common/types").Command;
2907
2904
  setProvider: (provider: Promise<import("@atlaskit/task-decision").TaskDecisionProvider>) => Promise<boolean>;
2908
2905
  };
2909
2906
  commands: {
@@ -4409,7 +4406,7 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
4409
4406
  };
4410
4407
  }, undefined>>];
4411
4408
  actions: {
4412
- changeColor: (color: string) => import("@atlaskit/editor-common/types").Command;
4409
+ changeColor: (color: string, inputMethod?: import("@atlaskit/editor-plugin-text-color").TextColorInputMethod | undefined) => import("@atlaskit/editor-common/types").Command;
4413
4410
  };
4414
4411
  sharedState: import("@atlaskit/editor-plugin-text-color").TextColorPluginState | undefined;
4415
4412
  }, (boolean | import("@atlaskit/editor-plugin-text-color").TextColorPluginConfig) | undefined> | undefined, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"alignment", {
@@ -4440,6 +4437,103 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
4440
4437
  mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
4441
4438
  } | undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
4442
4439
  sharedState: import("@atlaskit/editor-plugin-editor-disabled").EditorDisabledPluginState;
4440
+ }, undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"blockControls", {
4441
+ dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
4442
+ sharedState: import("@atlaskit/editor-plugin-editor-disabled").EditorDisabledPluginState;
4443
+ }, undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"width", {
4444
+ sharedState: import("@atlaskit/editor-common/types").EditorContainerWidth | undefined;
4445
+ }, undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
4446
+ pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
4447
+ sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
4448
+ }, import("@atlaskit/editor-common/types").FeatureFlags>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
4449
+ pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
4450
+ sharedState: {
4451
+ createAnalyticsEvent: import("@atlaskit/analytics-next").CreateUIAnalyticsEvent | null;
4452
+ attachAnalyticsEvent: import("@atlaskit/editor-plugin-analytics").CreateAttachPayloadIntoTransaction | null;
4453
+ performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
4454
+ };
4455
+ dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
4456
+ pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
4457
+ sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
4458
+ }, import("@atlaskit/editor-common/types").FeatureFlags>>];
4459
+ actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
4460
+ }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"accessibilityUtils", {
4461
+ dependencies: [];
4462
+ actions: {
4463
+ ariaNotify: (message: string, ariaLiveElementAttributes?: import("@atlaskit/editor-plugin-accessibility-utils").AriaLiveElementAttributes | undefined) => void;
4464
+ };
4465
+ sharedState: import("@atlaskit/editor-plugin-accessibility-utils").AccessibilityUtilsPluginState;
4466
+ }, undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"quickInsert", {
4467
+ pluginConfiguration: import("@atlaskit/editor-common/types").QuickInsertPluginOptions | undefined;
4468
+ dependencies: [import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"typeAhead", {
4469
+ pluginConfiguration: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginOptions | undefined;
4470
+ dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
4471
+ pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
4472
+ sharedState: {
4473
+ createAnalyticsEvent: import("@atlaskit/analytics-next").CreateUIAnalyticsEvent | null;
4474
+ attachAnalyticsEvent: import("@atlaskit/editor-plugin-analytics").CreateAttachPayloadIntoTransaction | null;
4475
+ performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
4476
+ };
4477
+ dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
4478
+ pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
4479
+ sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
4480
+ }, import("@atlaskit/editor-common/types").FeatureFlags>>];
4481
+ actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
4482
+ }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
4483
+ pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
4484
+ sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
4485
+ }, import("@atlaskit/editor-common/types").FeatureFlags>>];
4486
+ sharedState: import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginSharedState;
4487
+ actions: {
4488
+ isOpen: (editorState: import("prosemirror-state").EditorState) => boolean;
4489
+ isAllowed: (editorState: import("prosemirror-state").EditorState) => boolean;
4490
+ insert: (props: {
4491
+ triggerHandler: import("@atlaskit/editor-common/types").TypeAheadHandler;
4492
+ contentItem: import("@atlaskit/editor-common/types").TypeAheadItem;
4493
+ query: string;
4494
+ sourceListItem: import("@atlaskit/editor-common/types").TypeAheadItem[];
4495
+ mode?: import("@atlaskit/editor-common/type-ahead").SelectItemMode | undefined;
4496
+ }) => boolean;
4497
+ findHandlerByTrigger: (trigger: string) => import("@atlaskit/editor-common/types").TypeAheadHandler | null;
4498
+ open: (props: {
4499
+ triggerHandler: import("@atlaskit/editor-common/types").TypeAheadHandler;
4500
+ inputMethod: import("@atlaskit/editor-plugin-type-ahead").TypeAheadInputMethod;
4501
+ query?: string | undefined;
4502
+ }) => boolean;
4503
+ close: (props: {
4504
+ insertCurrentQueryAsRawText: boolean;
4505
+ attachCommand?: import("@atlaskit/editor-common/types").Command | undefined;
4506
+ }) => boolean;
4507
+ openAtTransaction: (props: {
4508
+ triggerHandler: import("@atlaskit/editor-common/types").TypeAheadHandler;
4509
+ inputMethod: import("@atlaskit/editor-plugin-type-ahead").TypeAheadInputMethod;
4510
+ query?: string | undefined;
4511
+ }) => (tr: import("prosemirror-state").Transaction) => boolean;
4512
+ };
4513
+ }, import("@atlaskit/editor-plugin-type-ahead").TypeAheadPluginOptions | undefined>];
4514
+ sharedState: import("@atlaskit/editor-plugin-quick-insert").QuickInsertSharedState | null;
4515
+ actions: {
4516
+ openTypeAhead: (inputMethod: import("@atlaskit/editor-plugin-type-ahead").TypeAheadInputMethod) => boolean;
4517
+ insertItem: (item: import("@atlaskit/editor-common/provider-factory").QuickInsertItem, source?: import("@atlaskit/editor-common/analytics").INPUT_METHOD.QUICK_INSERT | import("@atlaskit/editor-common/analytics").INPUT_METHOD.TOOLBAR | undefined) => import("@atlaskit/editor-common/types").Command;
4518
+ getSuggestions: (searchOptions: import("@atlaskit/editor-common/types").QuickInsertSearchOptions) => import("@atlaskit/editor-common/provider-factory").QuickInsertItem[];
4519
+ };
4520
+ commands: {
4521
+ openElementBrowserModal: import("@atlaskit/editor-common/types").EditorCommand;
4522
+ addQuickInsertItem: (item: import("@atlaskit/editor-common/types").QuickInsertHandler) => import("@atlaskit/editor-common/types").EditorCommand;
4523
+ };
4524
+ }, import("@atlaskit/editor-common/types").QuickInsertPluginOptions | undefined>>];
4525
+ sharedState: import("@atlaskit/editor-plugin-block-controls").BlockControlsSharedState;
4526
+ commands: {
4527
+ moveToLayout: (start: number, to: number, options?: {
4528
+ moveToEnd?: boolean | undefined;
4529
+ } | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
4530
+ moveNode: (start: number, to: number, inputMethod?: import("@atlaskit/editor-plugin-block-controls").MoveNodeMethod | undefined, formatMessage?: {
4531
+ (descriptor: import("react-intl-next").MessageDescriptor, values?: Record<string, import("intl-messageformat").PrimitiveType | import("intl-messageformat").FormatXMLElementFn<string, string>> | undefined, opts?: import("intl-messageformat").Options | undefined): string;
4532
+ (descriptor: import("react-intl-next").MessageDescriptor, values?: Record<string, string | number | boolean | {} | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNodeArray | import("react").ReactPortal | Date | import("intl-messageformat").FormatXMLElementFn<import("react").ReactNode, import("react").ReactNode> | null | undefined> | undefined, opts?: import("intl-messageformat").Options | undefined): import("react").ReactNode;
4533
+ } | undefined) => import("@atlaskit/editor-common/types").EditorCommand;
4534
+ showDragHandleAt: (pos: number, anchorName: string, nodeType: string, handleOptions?: import("@atlaskit/editor-plugin-block-controls").HandleOptions) => import("@atlaskit/editor-common/types").EditorCommand;
4535
+ setNodeDragged: (getPos: () => number | undefined, anchorName: string, nodeType: string) => import("@atlaskit/editor-common/types").EditorCommand;
4536
+ };
4443
4537
  }, undefined>>];
4444
4538
  sharedState: Partial<import("@atlaskit/editor-plugin-breakout").BreakoutPluginState>;
4445
4539
  }, import("@atlaskit/editor-plugin-breakout").BreakoutPluginOptions | undefined> | undefined, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"batchAttributeUpdates", {