@atlaskit/editor-core 220.3.2 → 220.4.0

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 (23) hide show
  1. package/CHANGELOG.md +11 -0
  2. package/dist/cjs/composable-editor/editor-internal.js +1 -0
  3. package/dist/cjs/composable-editor/hooks/useMemoEditorProps.js +2 -1
  4. package/dist/cjs/ui/Appearance/Comment/Comment.js +7 -2
  5. package/dist/cjs/ui/Appearance/Comment/Toolbar.js +12 -2
  6. package/dist/cjs/version-wrapper.js +1 -1
  7. package/dist/es2019/composable-editor/editor-internal.js +1 -0
  8. package/dist/es2019/composable-editor/hooks/useMemoEditorProps.js +2 -1
  9. package/dist/es2019/ui/Appearance/Comment/Comment.js +7 -2
  10. package/dist/es2019/ui/Appearance/Comment/Toolbar.js +12 -2
  11. package/dist/es2019/version-wrapper.js +1 -1
  12. package/dist/esm/composable-editor/editor-internal.js +1 -0
  13. package/dist/esm/composable-editor/hooks/useMemoEditorProps.js +2 -1
  14. package/dist/esm/ui/Appearance/Comment/Comment.js +7 -2
  15. package/dist/esm/ui/Appearance/Comment/Toolbar.js +12 -2
  16. package/dist/esm/version-wrapper.js +1 -1
  17. package/dist/types/types/editor-appearance-component.d.ts +1 -0
  18. package/dist/types/types/editor-props.d.ts +1 -0
  19. package/dist/types/ui/Appearance/Comment/Toolbar.d.ts +2 -1
  20. package/dist/types-ts4.5/types/editor-appearance-component.d.ts +1 -0
  21. package/dist/types-ts4.5/types/editor-props.d.ts +1 -0
  22. package/dist/types-ts4.5/ui/Appearance/Comment/Toolbar.d.ts +2 -1
  23. package/package.json +3 -3
package/CHANGELOG.md CHANGED
@@ -1,5 +1,16 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 220.4.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`3300f270bc8ea`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3300f270bc8ea) -
8
+ Update comment editor modernisation styling
9
+
10
+ ### Patch Changes
11
+
12
+ - Updated dependencies
13
+
3
14
  ## 220.3.2
4
15
 
5
16
  ### Patch Changes
package/dist/cjs/composable-editor/editor-internal.js CHANGED
@@ -147,6 +147,7 @@ var EditorInternal = exports.EditorInternal = /*#__PURE__*/(0, _react.memo)(func
147
147
  collabEdit: props.collabEdit,
148
148
  persistScrollGutter: props.persistScrollGutter,
149
149
  enableToolbarMinWidth: ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.toolbarMinWidthOverflow) != null ? !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.toolbarMinWidthOverflow) : props.allowUndoRedoButtons,
150
+ isEditorModernisationEnabled: props.isEditorModernisationEnabled,
150
151
  useStickyToolbar: props.useStickyToolbar,
151
152
  featureFlags: featureFlags,
152
153
  pluginHooks: config.pluginHooks,
package/dist/cjs/composable-editor/hooks/useMemoEditorProps.js CHANGED
@@ -44,6 +44,7 @@ var useMemoEditorProps = exports.useMemoEditorProps = function useMemoEditorProp
44
44
  extensionProviders: passedProps.extensionProviders,
45
45
  UNSAFE_useAnalyticsContext: passedProps.UNSAFE_useAnalyticsContext,
46
46
  useStickyToolbar: passedProps.useStickyToolbar,
47
+ isEditorModernisationEnabled: passedProps.isEditorModernisationEnabled,
47
48
  featureFlags: passedProps.featureFlags,
48
49
  onSave: passedProps.onSave,
49
50
  sanitizePrivateContent: passedProps.sanitizePrivateContent,
@@ -119,7 +120,7 @@ var useMemoEditorProps = exports.useMemoEditorProps = function useMemoEditorProp
119
120
  };
120
121
  var nextProps = _objectSpread(_objectSpread({}, defaultProps), allProps);
121
122
  return nextProps;
122
- }, [passedProps.preset, passedProps.appearance, passedProps.contentMode, passedProps.contentComponents, passedProps.primaryToolbarIconBefore, passedProps.secondaryToolbarComponents, passedProps.persistScrollGutter, passedProps.quickInsert, passedProps.shouldFocus, passedProps.disabled, passedProps.contextPanel, passedProps.errorReporterHandler, passedProps.contentTransformerProvider, passedProps.maxHeight, passedProps.minHeight, passedProps.placeholder, passedProps.placeholderBracketHint, passedProps.performanceTracking, passedProps.inputSamplingLimit, passedProps.defaultValue, passedProps.assistiveLabel, passedProps.assistiveDescribedBy, passedProps.popupsMountPoint, passedProps.popupsBoundariesElement, passedProps.popupsScrollableElement, passedProps.editorActions, passedProps.onEditorReady, passedProps.onDestroy, passedProps.onChange, passedProps.onCancel, passedProps.onSSRMeasure, passedProps.extensionProviders, passedProps.UNSAFE_useAnalyticsContext, passedProps.useStickyToolbar, passedProps.featureFlags, passedProps.onSave, passedProps.sanitizePrivateContent, passedProps.media, passedProps.collabEdit, passedProps.primaryToolbarComponents, passedProps.allowUndoRedoButtons, passedProps.linking, passedProps.activityProvider, passedProps.searchProvider, passedProps.annotationProviders, passedProps.collabEditProvider, passedProps.presenceProvider, passedProps.emojiProvider, passedProps.taskDecisionProvider, passedProps.legacyImageUploadProvider, passedProps.mentionProvider, passedProps.autoformattingProvider, passedProps.macroProvider, passedProps.contextIdentifierProvider, passedProps.allowExpand, passedProps.allowNestedTasks, passedProps.allowBlockType, passedProps.allowTasksAndDecisions, passedProps.allowBreakout, passedProps.allowRule, passedProps.allowHelpDialog, passedProps.allowPanel, passedProps.allowExtension, passedProps.allowConfluenceInlineComment, passedProps.allowTemplatePlaceholders, passedProps.allowDate, passedProps.allowLayouts, passedProps.allowStatus, passedProps.allowTextAlignment, passedProps.allowIndentation, passedProps.showIndentationButtons, passedProps.allowFindReplace, passedProps.allowBorderMark, passedProps.allowFragmentMark, passedProps.autoScrollIntoView, passedProps.elementBrowser, passedProps.maxContentSize, passedProps.saveOnEnter, passedProps.feedbackInfo, passedProps.mention, passedProps.mentionInsertDisplayName, passedProps.uploadErrorHandler, passedProps.waitForMediaUpload, passedProps.extensionHandlers, passedProps.allowTextColor, passedProps.allowTables, passedProps.insertMenuItems, passedProps.UNSAFE_cards, passedProps.smartLinks, passedProps.allowAnalyticsGASV3, passedProps.codeBlock, passedProps.textFormatting, passedProps.__livePage, passedProps.AppearanceComponent, passedProps.skipValidation, passedProps.syncBlock, passedProps.syncedBlockProvider, passedProps.pasteWarningOptions]);
123
+ }, [passedProps.preset, passedProps.appearance, passedProps.contentMode, passedProps.contentComponents, passedProps.primaryToolbarIconBefore, passedProps.secondaryToolbarComponents, passedProps.persistScrollGutter, passedProps.quickInsert, passedProps.shouldFocus, passedProps.disabled, passedProps.contextPanel, passedProps.errorReporterHandler, passedProps.contentTransformerProvider, passedProps.maxHeight, passedProps.minHeight, passedProps.placeholder, passedProps.placeholderBracketHint, passedProps.performanceTracking, passedProps.inputSamplingLimit, passedProps.defaultValue, passedProps.assistiveLabel, passedProps.assistiveDescribedBy, passedProps.popupsMountPoint, passedProps.popupsBoundariesElement, passedProps.popupsScrollableElement, passedProps.editorActions, passedProps.onEditorReady, passedProps.onDestroy, passedProps.onChange, passedProps.onCancel, passedProps.onSSRMeasure, passedProps.extensionProviders, passedProps.UNSAFE_useAnalyticsContext, passedProps.useStickyToolbar, passedProps.isEditorModernisationEnabled, passedProps.featureFlags, passedProps.onSave, passedProps.sanitizePrivateContent, passedProps.media, passedProps.collabEdit, passedProps.primaryToolbarComponents, passedProps.allowUndoRedoButtons, passedProps.linking, passedProps.activityProvider, passedProps.searchProvider, passedProps.annotationProviders, passedProps.collabEditProvider, passedProps.presenceProvider, passedProps.emojiProvider, passedProps.taskDecisionProvider, passedProps.legacyImageUploadProvider, passedProps.mentionProvider, passedProps.autoformattingProvider, passedProps.macroProvider, passedProps.contextIdentifierProvider, passedProps.allowExpand, passedProps.allowNestedTasks, passedProps.allowBlockType, passedProps.allowTasksAndDecisions, passedProps.allowBreakout, passedProps.allowRule, passedProps.allowHelpDialog, passedProps.allowPanel, passedProps.allowExtension, passedProps.allowConfluenceInlineComment, passedProps.allowTemplatePlaceholders, passedProps.allowDate, passedProps.allowLayouts, passedProps.allowStatus, passedProps.allowTextAlignment, passedProps.allowIndentation, passedProps.showIndentationButtons, passedProps.allowFindReplace, passedProps.allowBorderMark, passedProps.allowFragmentMark, passedProps.autoScrollIntoView, passedProps.elementBrowser, passedProps.maxContentSize, passedProps.saveOnEnter, passedProps.feedbackInfo, passedProps.mention, passedProps.mentionInsertDisplayName, passedProps.uploadErrorHandler, passedProps.waitForMediaUpload, passedProps.extensionHandlers, passedProps.allowTextColor, passedProps.allowTables, passedProps.insertMenuItems, passedProps.UNSAFE_cards, passedProps.smartLinks, passedProps.allowAnalyticsGASV3, passedProps.codeBlock, passedProps.textFormatting, passedProps.__livePage, passedProps.AppearanceComponent, passedProps.skipValidation, passedProps.syncBlock, passedProps.syncedBlockProvider, passedProps.pasteWarningOptions]);
123
124
  return memodProps;
124
125
  };
125
126
 
package/dist/cjs/ui/Appearance/Comment/Comment.js CHANGED
@@ -77,6 +77,9 @@ var commentEditorStyles = (0, _react2.css)({
77
77
  maxWidth: 'inherit',
78
78
  wordWrap: 'break-word'
79
79
  });
80
+ var modernisedEditorStyles = (0, _react2.css)({
81
+ borderRadius: "var(--ds-radius-xlarge, 12px)"
82
+ });
80
83
  var secondaryToolbarStyles = (0, _react2.css)({
81
84
  boxSizing: 'border-box',
82
85
  justifyContent: 'flex-end',
@@ -148,7 +151,8 @@ var CommentEditorWithIntl = exports.CommentEditorWithIntl = function CommentEdit
148
151
  useStickyToolbar = props.useStickyToolbar,
149
152
  pluginHooks = props.pluginHooks,
150
153
  featureFlags = props.featureFlags,
151
- innerRef = props.innerRef;
154
+ innerRef = props.innerRef,
155
+ isEditorModernisationEnabled = props.isEditorModernisationEnabled;
152
156
  var showSecondaryToolbar = !!onSave || !!onCancel || !!customSecondaryToolbarComponents;
153
157
  var containerElement = _react.default.useRef(null);
154
158
 
@@ -227,7 +231,7 @@ var CommentEditorWithIntl = exports.CommentEditorWithIntl = function CommentEdit
227
231
  return (0, _react2.jsx)(_WithFlash.default, {
228
232
  animate: maxContentSizeReached
229
233
  }, (0, _react2.jsx)(_ui.WidthProvider, null, (0, _react2.jsx)("div", {
230
- css: [(0, _expValEquals.expValEquals)('platform_editor_comment_editor_border_radius', 'isEnabled', true) ? commentEditorStyles : commentEditorStylesOld,
234
+ css: [(0, _expValEquals.expValEquals)('platform_editor_comment_editor_border_radius', 'isEnabled', true) ? commentEditorStyles : commentEditorStylesOld, isEditorModernisationEnabled && modernisedEditorStyles,
231
235
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
232
236
  (0, _react2.css)({
233
237
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
@@ -238,6 +242,7 @@ var CommentEditorWithIntl = exports.CommentEditorWithIntl = function CommentEdit
238
242
  className: "akEditor",
239
243
  ref: wrapperElementRef
240
244
  }, (0, _react2.jsx)(_Toolbar.MainToolbar, {
245
+ isEditorModernisationEnabled: isEditorModernisationEnabled,
241
246
  useStickyToolbar: useStickyToolbar,
242
247
  twoLineEditorToolbar: isTwoLineToolbarEnabled,
243
248
  isNewToolbarEnabled: isToolbarAIFCEnabled
package/dist/cjs/ui/Appearance/Comment/Toolbar.js CHANGED
@@ -81,6 +81,13 @@ var mainToolbarWithRadiusStyle = (0, _react2.css)({
81
81
  var mainToolbarRadius = (0, _react2.css)({
82
82
  borderRadius: "var(--ds-radius-medium, 6px)".concat(" ", "var(--ds-radius-medium, 6px)", " 0 0")
83
83
  });
84
+ var editorModernisationToolbarStyle = (0, _react2.css)({
85
+ borderRadius: "var(--ds-radius-xlarge, 12px)".concat(" ", "var(--ds-radius-xlarge, 12px)", " 0 0"),
86
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
87
+ '&.show-keyline': {
88
+ boxShadow: 'none'
89
+ }
90
+ });
84
91
  var stickyToolbarWrapperStyleNew = (0, _react2.css)({
85
92
  position: 'sticky',
86
93
  paddingBottom: "var(--ds-space-100, 8px)",
@@ -111,7 +118,7 @@ var StickyToolbar = function StickyToolbar(props) {
111
118
  return (
112
119
  // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
113
120
  (0, _react2.jsx)("div", {
114
- css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithPadding, (0, _expValEquals.expValEquals)('platform_editor_comment_editor_border_radius', 'isEnabled', true) && mainToolbarRadius, !(0, _expValEquals.expValEquals)('platform_editor_comment_editor_border_radius', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle]
121
+ css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithPadding, (0, _expValEquals.expValEquals)('platform_editor_comment_editor_border_radius', 'isEnabled', true) && mainToolbarRadius, !(0, _expValEquals.expValEquals)('platform_editor_comment_editor_border_radius', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle, props.isEditorModernisationEnabled && editorModernisationToolbarStyle]
115
122
  // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
116
123
  ,
117
124
  style: {
@@ -128,7 +135,7 @@ var FixedToolbar = function FixedToolbar(props) {
128
135
  return (
129
136
  // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
130
137
  (0, _react2.jsx)("div", {
131
- css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, !(0, _expValEquals.expValEquals)('platform_editor_comment_editor_border_radius', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle, (0, _expValEquals.expValEquals)('platform_editor_comment_editor_border_radius', 'isEnabled', true) && mainToolbarRadius],
138
+ css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, !(0, _expValEquals.expValEquals)('platform_editor_comment_editor_border_radius', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle, (0, _expValEquals.expValEquals)('platform_editor_comment_editor_border_radius', 'isEnabled', true) && mainToolbarRadius, props.isEditorModernisationEnabled && editorModernisationToolbarStyle],
132
139
  "data-testid": "ak-editor-main-toolbar"
133
140
  }, props.children)
134
141
  );
@@ -165,17 +172,20 @@ var MainToolbar = exports.MainToolbar = function MainToolbar(_ref) {
165
172
  var useStickyToolbar = _ref.useStickyToolbar,
166
173
  twoLineEditorToolbar = _ref.twoLineEditorToolbar,
167
174
  children = _ref.children,
175
+ isEditorModernisationEnabled = _ref.isEditorModernisationEnabled,
168
176
  isNewToolbarEnabled = _ref.isNewToolbarEnabled;
169
177
  if (useStickyToolbar) {
170
178
  return (0, _react2.jsx)(StickyToolbar
171
179
  // Ignored via go/ees005
172
180
  // eslint-disable-next-line react/jsx-props-no-spreading
173
181
  , (0, _extends2.default)({}, getStickyParameters(useStickyToolbar), {
182
+ isEditorModernisationEnabled: isEditorModernisationEnabled,
174
183
  twoLineEditorToolbar: twoLineEditorToolbar,
175
184
  isNewToolbarEnabled: isNewToolbarEnabled
176
185
  }), children);
177
186
  }
178
187
  return (0, _react2.jsx)(FixedToolbar, {
188
+ isEditorModernisationEnabled: isEditorModernisationEnabled,
179
189
  twoLineEditorToolbar: twoLineEditorToolbar,
180
190
  isNewToolbarEnabled: isNewToolbarEnabled
181
191
  }, children);
package/dist/cjs/version-wrapper.js CHANGED
@@ -6,4 +6,4 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.version = exports.name = void 0;
7
7
  var name = exports.name = "@atlaskit/editor-core";
8
8
  // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
9
- var version = exports.version = "220.3.1";
9
+ var version = exports.version = "220.3.2";
package/dist/es2019/composable-editor/editor-internal.js CHANGED
@@ -129,6 +129,7 @@ export const EditorInternal = /*#__PURE__*/memo(({
129
129
  collabEdit: props.collabEdit,
130
130
  persistScrollGutter: props.persistScrollGutter,
131
131
  enableToolbarMinWidth: ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.toolbarMinWidthOverflow) != null ? !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.toolbarMinWidthOverflow) : props.allowUndoRedoButtons,
132
+ isEditorModernisationEnabled: props.isEditorModernisationEnabled,
132
133
  useStickyToolbar: props.useStickyToolbar,
133
134
  featureFlags: featureFlags,
134
135
  pluginHooks: config.pluginHooks,
package/dist/es2019/composable-editor/hooks/useMemoEditorProps.js CHANGED
@@ -34,6 +34,7 @@ export const useMemoEditorProps = passedProps => {
34
34
  extensionProviders: passedProps.extensionProviders,
35
35
  UNSAFE_useAnalyticsContext: passedProps.UNSAFE_useAnalyticsContext,
36
36
  useStickyToolbar: passedProps.useStickyToolbar,
37
+ isEditorModernisationEnabled: passedProps.isEditorModernisationEnabled,
37
38
  featureFlags: passedProps.featureFlags,
38
39
  onSave: passedProps.onSave,
39
40
  sanitizePrivateContent: passedProps.sanitizePrivateContent,
@@ -112,7 +113,7 @@ export const useMemoEditorProps = passedProps => {
112
113
  ...allProps
113
114
  };
114
115
  return nextProps;
115
- }, [passedProps.preset, passedProps.appearance, passedProps.contentMode, passedProps.contentComponents, passedProps.primaryToolbarIconBefore, passedProps.secondaryToolbarComponents, passedProps.persistScrollGutter, passedProps.quickInsert, passedProps.shouldFocus, passedProps.disabled, passedProps.contextPanel, passedProps.errorReporterHandler, passedProps.contentTransformerProvider, passedProps.maxHeight, passedProps.minHeight, passedProps.placeholder, passedProps.placeholderBracketHint, passedProps.performanceTracking, passedProps.inputSamplingLimit, passedProps.defaultValue, passedProps.assistiveLabel, passedProps.assistiveDescribedBy, passedProps.popupsMountPoint, passedProps.popupsBoundariesElement, passedProps.popupsScrollableElement, passedProps.editorActions, passedProps.onEditorReady, passedProps.onDestroy, passedProps.onChange, passedProps.onCancel, passedProps.onSSRMeasure, passedProps.extensionProviders, passedProps.UNSAFE_useAnalyticsContext, passedProps.useStickyToolbar, passedProps.featureFlags, passedProps.onSave, passedProps.sanitizePrivateContent, passedProps.media, passedProps.collabEdit, passedProps.primaryToolbarComponents, passedProps.allowUndoRedoButtons, passedProps.linking, passedProps.activityProvider, passedProps.searchProvider, passedProps.annotationProviders, passedProps.collabEditProvider, passedProps.presenceProvider, passedProps.emojiProvider, passedProps.taskDecisionProvider, passedProps.legacyImageUploadProvider, passedProps.mentionProvider, passedProps.autoformattingProvider, passedProps.macroProvider, passedProps.contextIdentifierProvider, passedProps.allowExpand, passedProps.allowNestedTasks, passedProps.allowBlockType, passedProps.allowTasksAndDecisions, passedProps.allowBreakout, passedProps.allowRule, passedProps.allowHelpDialog, passedProps.allowPanel, passedProps.allowExtension, passedProps.allowConfluenceInlineComment, passedProps.allowTemplatePlaceholders, passedProps.allowDate, passedProps.allowLayouts, passedProps.allowStatus, passedProps.allowTextAlignment, passedProps.allowIndentation, passedProps.showIndentationButtons, passedProps.allowFindReplace, passedProps.allowBorderMark, passedProps.allowFragmentMark, passedProps.autoScrollIntoView, passedProps.elementBrowser, passedProps.maxContentSize, passedProps.saveOnEnter, passedProps.feedbackInfo, passedProps.mention, passedProps.mentionInsertDisplayName, passedProps.uploadErrorHandler, passedProps.waitForMediaUpload, passedProps.extensionHandlers, passedProps.allowTextColor, passedProps.allowTables, passedProps.insertMenuItems, passedProps.UNSAFE_cards, passedProps.smartLinks, passedProps.allowAnalyticsGASV3, passedProps.codeBlock, passedProps.textFormatting, passedProps.__livePage, passedProps.AppearanceComponent, passedProps.skipValidation, passedProps.syncBlock, passedProps.syncedBlockProvider, passedProps.pasteWarningOptions]);
116
+ }, [passedProps.preset, passedProps.appearance, passedProps.contentMode, passedProps.contentComponents, passedProps.primaryToolbarIconBefore, passedProps.secondaryToolbarComponents, passedProps.persistScrollGutter, passedProps.quickInsert, passedProps.shouldFocus, passedProps.disabled, passedProps.contextPanel, passedProps.errorReporterHandler, passedProps.contentTransformerProvider, passedProps.maxHeight, passedProps.minHeight, passedProps.placeholder, passedProps.placeholderBracketHint, passedProps.performanceTracking, passedProps.inputSamplingLimit, passedProps.defaultValue, passedProps.assistiveLabel, passedProps.assistiveDescribedBy, passedProps.popupsMountPoint, passedProps.popupsBoundariesElement, passedProps.popupsScrollableElement, passedProps.editorActions, passedProps.onEditorReady, passedProps.onDestroy, passedProps.onChange, passedProps.onCancel, passedProps.onSSRMeasure, passedProps.extensionProviders, passedProps.UNSAFE_useAnalyticsContext, passedProps.useStickyToolbar, passedProps.isEditorModernisationEnabled, passedProps.featureFlags, passedProps.onSave, passedProps.sanitizePrivateContent, passedProps.media, passedProps.collabEdit, passedProps.primaryToolbarComponents, passedProps.allowUndoRedoButtons, passedProps.linking, passedProps.activityProvider, passedProps.searchProvider, passedProps.annotationProviders, passedProps.collabEditProvider, passedProps.presenceProvider, passedProps.emojiProvider, passedProps.taskDecisionProvider, passedProps.legacyImageUploadProvider, passedProps.mentionProvider, passedProps.autoformattingProvider, passedProps.macroProvider, passedProps.contextIdentifierProvider, passedProps.allowExpand, passedProps.allowNestedTasks, passedProps.allowBlockType, passedProps.allowTasksAndDecisions, passedProps.allowBreakout, passedProps.allowRule, passedProps.allowHelpDialog, passedProps.allowPanel, passedProps.allowExtension, passedProps.allowConfluenceInlineComment, passedProps.allowTemplatePlaceholders, passedProps.allowDate, passedProps.allowLayouts, passedProps.allowStatus, passedProps.allowTextAlignment, passedProps.allowIndentation, passedProps.showIndentationButtons, passedProps.allowFindReplace, passedProps.allowBorderMark, passedProps.allowFragmentMark, passedProps.autoScrollIntoView, passedProps.elementBrowser, passedProps.maxContentSize, passedProps.saveOnEnter, passedProps.feedbackInfo, passedProps.mention, passedProps.mentionInsertDisplayName, passedProps.uploadErrorHandler, passedProps.waitForMediaUpload, passedProps.extensionHandlers, passedProps.allowTextColor, passedProps.allowTables, passedProps.insertMenuItems, passedProps.UNSAFE_cards, passedProps.smartLinks, passedProps.allowAnalyticsGASV3, passedProps.codeBlock, passedProps.textFormatting, passedProps.__livePage, passedProps.AppearanceComponent, passedProps.skipValidation, passedProps.syncBlock, passedProps.syncedBlockProvider, passedProps.pasteWarningOptions]);
116
117
  return memodProps;
117
118
  };
118
119
 
package/dist/es2019/ui/Appearance/Comment/Comment.js CHANGED
@@ -64,6 +64,9 @@ const commentEditorStyles = css({
64
64
  maxWidth: 'inherit',
65
65
  wordWrap: 'break-word'
66
66
  });
67
+ const modernisedEditorStyles = css({
68
+ borderRadius: "var(--ds-radius-xlarge, 12px)"
69
+ });
67
70
  const secondaryToolbarStyles = css({
68
71
  boxSizing: 'border-box',
69
72
  justifyContent: 'flex-end',
@@ -142,7 +145,8 @@ export const CommentEditorWithIntl = props => {
142
145
  useStickyToolbar,
143
146
  pluginHooks,
144
147
  featureFlags,
145
- innerRef
148
+ innerRef,
149
+ isEditorModernisationEnabled
146
150
  } = props;
147
151
  const showSecondaryToolbar = !!onSave || !!onCancel || !!customSecondaryToolbarComponents;
148
152
  const containerElement = React.useRef(null);
@@ -213,7 +217,7 @@ export const CommentEditorWithIntl = props => {
213
217
  return jsx(WithFlash, {
214
218
  animate: maxContentSizeReached
215
219
  }, jsx(WidthProvider, null, jsx("div", {
216
- css: [expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) ? commentEditorStyles : commentEditorStylesOld,
220
+ css: [expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) ? commentEditorStyles : commentEditorStylesOld, isEditorModernisationEnabled && modernisedEditorStyles,
217
221
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
218
222
  css({
219
223
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
@@ -224,6 +228,7 @@ export const CommentEditorWithIntl = props => {
224
228
  className: "akEditor",
225
229
  ref: wrapperElementRef
226
230
  }, jsx(MainToolbar, {
231
+ isEditorModernisationEnabled: isEditorModernisationEnabled,
227
232
  useStickyToolbar: useStickyToolbar,
228
233
  twoLineEditorToolbar: isTwoLineToolbarEnabled,
229
234
  isNewToolbarEnabled: isToolbarAIFCEnabled
package/dist/es2019/ui/Appearance/Comment/Toolbar.js CHANGED
@@ -78,6 +78,13 @@ const mainToolbarWithRadiusStyle = css({
78
78
  const mainToolbarRadius = css({
79
79
  borderRadius: `${"var(--ds-radius-medium, 6px)"} ${"var(--ds-radius-medium, 6px)"} 0 0`
80
80
  });
81
+ const editorModernisationToolbarStyle = css({
82
+ borderRadius: `${"var(--ds-radius-xlarge, 12px)"} ${"var(--ds-radius-xlarge, 12px)"} 0 0`,
83
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
84
+ '&.show-keyline': {
85
+ boxShadow: 'none'
86
+ }
87
+ });
81
88
  const stickyToolbarWrapperStyleNew = css({
82
89
  position: 'sticky',
83
90
  paddingBottom: "var(--ds-space-100, 8px)",
@@ -105,7 +112,7 @@ const StickyToolbar = props => {
105
112
  return (
106
113
  // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
107
114
  jsx("div", {
108
- css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithPadding, expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) && mainToolbarRadius, !expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) && fg('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle]
115
+ css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithPadding, expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) && mainToolbarRadius, !expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) && fg('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle, props.isEditorModernisationEnabled && editorModernisationToolbarStyle]
109
116
  // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
110
117
  ,
111
118
  style: {
@@ -121,7 +128,7 @@ const StickyToolbar = props => {
121
128
  const FixedToolbar = props =>
122
129
  // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
123
130
  jsx("div", {
124
- css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, !expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) && fg('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle, expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) && mainToolbarRadius],
131
+ css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, !expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) && fg('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle, expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) && mainToolbarRadius, props.isEditorModernisationEnabled && editorModernisationToolbarStyle],
125
132
  "data-testid": "ak-editor-main-toolbar"
126
133
  }, props.children);
127
134
 
@@ -156,6 +163,7 @@ export const MainToolbar = ({
156
163
  useStickyToolbar,
157
164
  twoLineEditorToolbar,
158
165
  children,
166
+ isEditorModernisationEnabled,
159
167
  isNewToolbarEnabled
160
168
  }) => {
161
169
  if (useStickyToolbar) {
@@ -163,11 +171,13 @@ export const MainToolbar = ({
163
171
  // Ignored via go/ees005
164
172
  // eslint-disable-next-line react/jsx-props-no-spreading
165
173
  , _extends({}, getStickyParameters(useStickyToolbar), {
174
+ isEditorModernisationEnabled: isEditorModernisationEnabled,
166
175
  twoLineEditorToolbar: twoLineEditorToolbar,
167
176
  isNewToolbarEnabled: isNewToolbarEnabled
168
177
  }), children);
169
178
  }
170
179
  return jsx(FixedToolbar, {
180
+ isEditorModernisationEnabled: isEditorModernisationEnabled,
171
181
  twoLineEditorToolbar: twoLineEditorToolbar,
172
182
  isNewToolbarEnabled: isNewToolbarEnabled
173
183
  }, children);
package/dist/es2019/version-wrapper.js CHANGED
@@ -1,3 +1,3 @@
1
1
  export const name = "@atlaskit/editor-core";
2
2
  // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
3
- export const version = "220.3.1";
3
+ export const version = "220.3.2";
package/dist/esm/composable-editor/editor-internal.js CHANGED
@@ -138,6 +138,7 @@ export var EditorInternal = /*#__PURE__*/memo(function (_ref) {
138
138
  collabEdit: props.collabEdit,
139
139
  persistScrollGutter: props.persistScrollGutter,
140
140
  enableToolbarMinWidth: ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.toolbarMinWidthOverflow) != null ? !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.toolbarMinWidthOverflow) : props.allowUndoRedoButtons,
141
+ isEditorModernisationEnabled: props.isEditorModernisationEnabled,
141
142
  useStickyToolbar: props.useStickyToolbar,
142
143
  featureFlags: featureFlags,
143
144
  pluginHooks: config.pluginHooks,
package/dist/esm/composable-editor/hooks/useMemoEditorProps.js CHANGED
@@ -37,6 +37,7 @@ export var useMemoEditorProps = function useMemoEditorProps(passedProps) {
37
37
  extensionProviders: passedProps.extensionProviders,
38
38
  UNSAFE_useAnalyticsContext: passedProps.UNSAFE_useAnalyticsContext,
39
39
  useStickyToolbar: passedProps.useStickyToolbar,
40
+ isEditorModernisationEnabled: passedProps.isEditorModernisationEnabled,
40
41
  featureFlags: passedProps.featureFlags,
41
42
  onSave: passedProps.onSave,
42
43
  sanitizePrivateContent: passedProps.sanitizePrivateContent,
@@ -112,7 +113,7 @@ export var useMemoEditorProps = function useMemoEditorProps(passedProps) {
112
113
  };
113
114
  var nextProps = _objectSpread(_objectSpread({}, defaultProps), allProps);
114
115
  return nextProps;
115
- }, [passedProps.preset, passedProps.appearance, passedProps.contentMode, passedProps.contentComponents, passedProps.primaryToolbarIconBefore, passedProps.secondaryToolbarComponents, passedProps.persistScrollGutter, passedProps.quickInsert, passedProps.shouldFocus, passedProps.disabled, passedProps.contextPanel, passedProps.errorReporterHandler, passedProps.contentTransformerProvider, passedProps.maxHeight, passedProps.minHeight, passedProps.placeholder, passedProps.placeholderBracketHint, passedProps.performanceTracking, passedProps.inputSamplingLimit, passedProps.defaultValue, passedProps.assistiveLabel, passedProps.assistiveDescribedBy, passedProps.popupsMountPoint, passedProps.popupsBoundariesElement, passedProps.popupsScrollableElement, passedProps.editorActions, passedProps.onEditorReady, passedProps.onDestroy, passedProps.onChange, passedProps.onCancel, passedProps.onSSRMeasure, passedProps.extensionProviders, passedProps.UNSAFE_useAnalyticsContext, passedProps.useStickyToolbar, passedProps.featureFlags, passedProps.onSave, passedProps.sanitizePrivateContent, passedProps.media, passedProps.collabEdit, passedProps.primaryToolbarComponents, passedProps.allowUndoRedoButtons, passedProps.linking, passedProps.activityProvider, passedProps.searchProvider, passedProps.annotationProviders, passedProps.collabEditProvider, passedProps.presenceProvider, passedProps.emojiProvider, passedProps.taskDecisionProvider, passedProps.legacyImageUploadProvider, passedProps.mentionProvider, passedProps.autoformattingProvider, passedProps.macroProvider, passedProps.contextIdentifierProvider, passedProps.allowExpand, passedProps.allowNestedTasks, passedProps.allowBlockType, passedProps.allowTasksAndDecisions, passedProps.allowBreakout, passedProps.allowRule, passedProps.allowHelpDialog, passedProps.allowPanel, passedProps.allowExtension, passedProps.allowConfluenceInlineComment, passedProps.allowTemplatePlaceholders, passedProps.allowDate, passedProps.allowLayouts, passedProps.allowStatus, passedProps.allowTextAlignment, passedProps.allowIndentation, passedProps.showIndentationButtons, passedProps.allowFindReplace, passedProps.allowBorderMark, passedProps.allowFragmentMark, passedProps.autoScrollIntoView, passedProps.elementBrowser, passedProps.maxContentSize, passedProps.saveOnEnter, passedProps.feedbackInfo, passedProps.mention, passedProps.mentionInsertDisplayName, passedProps.uploadErrorHandler, passedProps.waitForMediaUpload, passedProps.extensionHandlers, passedProps.allowTextColor, passedProps.allowTables, passedProps.insertMenuItems, passedProps.UNSAFE_cards, passedProps.smartLinks, passedProps.allowAnalyticsGASV3, passedProps.codeBlock, passedProps.textFormatting, passedProps.__livePage, passedProps.AppearanceComponent, passedProps.skipValidation, passedProps.syncBlock, passedProps.syncedBlockProvider, passedProps.pasteWarningOptions]);
116
+ }, [passedProps.preset, passedProps.appearance, passedProps.contentMode, passedProps.contentComponents, passedProps.primaryToolbarIconBefore, passedProps.secondaryToolbarComponents, passedProps.persistScrollGutter, passedProps.quickInsert, passedProps.shouldFocus, passedProps.disabled, passedProps.contextPanel, passedProps.errorReporterHandler, passedProps.contentTransformerProvider, passedProps.maxHeight, passedProps.minHeight, passedProps.placeholder, passedProps.placeholderBracketHint, passedProps.performanceTracking, passedProps.inputSamplingLimit, passedProps.defaultValue, passedProps.assistiveLabel, passedProps.assistiveDescribedBy, passedProps.popupsMountPoint, passedProps.popupsBoundariesElement, passedProps.popupsScrollableElement, passedProps.editorActions, passedProps.onEditorReady, passedProps.onDestroy, passedProps.onChange, passedProps.onCancel, passedProps.onSSRMeasure, passedProps.extensionProviders, passedProps.UNSAFE_useAnalyticsContext, passedProps.useStickyToolbar, passedProps.isEditorModernisationEnabled, passedProps.featureFlags, passedProps.onSave, passedProps.sanitizePrivateContent, passedProps.media, passedProps.collabEdit, passedProps.primaryToolbarComponents, passedProps.allowUndoRedoButtons, passedProps.linking, passedProps.activityProvider, passedProps.searchProvider, passedProps.annotationProviders, passedProps.collabEditProvider, passedProps.presenceProvider, passedProps.emojiProvider, passedProps.taskDecisionProvider, passedProps.legacyImageUploadProvider, passedProps.mentionProvider, passedProps.autoformattingProvider, passedProps.macroProvider, passedProps.contextIdentifierProvider, passedProps.allowExpand, passedProps.allowNestedTasks, passedProps.allowBlockType, passedProps.allowTasksAndDecisions, passedProps.allowBreakout, passedProps.allowRule, passedProps.allowHelpDialog, passedProps.allowPanel, passedProps.allowExtension, passedProps.allowConfluenceInlineComment, passedProps.allowTemplatePlaceholders, passedProps.allowDate, passedProps.allowLayouts, passedProps.allowStatus, passedProps.allowTextAlignment, passedProps.allowIndentation, passedProps.showIndentationButtons, passedProps.allowFindReplace, passedProps.allowBorderMark, passedProps.allowFragmentMark, passedProps.autoScrollIntoView, passedProps.elementBrowser, passedProps.maxContentSize, passedProps.saveOnEnter, passedProps.feedbackInfo, passedProps.mention, passedProps.mentionInsertDisplayName, passedProps.uploadErrorHandler, passedProps.waitForMediaUpload, passedProps.extensionHandlers, passedProps.allowTextColor, passedProps.allowTables, passedProps.insertMenuItems, passedProps.UNSAFE_cards, passedProps.smartLinks, passedProps.allowAnalyticsGASV3, passedProps.codeBlock, passedProps.textFormatting, passedProps.__livePage, passedProps.AppearanceComponent, passedProps.skipValidation, passedProps.syncBlock, passedProps.syncedBlockProvider, passedProps.pasteWarningOptions]);
116
117
  return memodProps;
117
118
  };
118
119
 
package/dist/esm/ui/Appearance/Comment/Comment.js CHANGED
@@ -66,6 +66,9 @@ var commentEditorStyles = css({
66
66
  maxWidth: 'inherit',
67
67
  wordWrap: 'break-word'
68
68
  });
69
+ var modernisedEditorStyles = css({
70
+ borderRadius: "var(--ds-radius-xlarge, 12px)"
71
+ });
69
72
  var secondaryToolbarStyles = css({
70
73
  boxSizing: 'border-box',
71
74
  justifyContent: 'flex-end',
@@ -137,7 +140,8 @@ export var CommentEditorWithIntl = function CommentEditorWithIntl(props) {
137
140
  useStickyToolbar = props.useStickyToolbar,
138
141
  pluginHooks = props.pluginHooks,
139
142
  featureFlags = props.featureFlags,
140
- innerRef = props.innerRef;
143
+ innerRef = props.innerRef,
144
+ isEditorModernisationEnabled = props.isEditorModernisationEnabled;
141
145
  var showSecondaryToolbar = !!onSave || !!onCancel || !!customSecondaryToolbarComponents;
142
146
  var containerElement = React.useRef(null);
143
147
 
@@ -216,7 +220,7 @@ export var CommentEditorWithIntl = function CommentEditorWithIntl(props) {
216
220
  return jsx(WithFlash, {
217
221
  animate: maxContentSizeReached
218
222
  }, jsx(WidthProvider, null, jsx("div", {
219
- css: [expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) ? commentEditorStyles : commentEditorStylesOld,
223
+ css: [expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) ? commentEditorStyles : commentEditorStylesOld, isEditorModernisationEnabled && modernisedEditorStyles,
220
224
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
221
225
  css({
222
226
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
@@ -227,6 +231,7 @@ export var CommentEditorWithIntl = function CommentEditorWithIntl(props) {
227
231
  className: "akEditor",
228
232
  ref: wrapperElementRef
229
233
  }, jsx(MainToolbar, {
234
+ isEditorModernisationEnabled: isEditorModernisationEnabled,
230
235
  useStickyToolbar: useStickyToolbar,
231
236
  twoLineEditorToolbar: isTwoLineToolbarEnabled,
232
237
  isNewToolbarEnabled: isToolbarAIFCEnabled
package/dist/esm/ui/Appearance/Comment/Toolbar.js CHANGED
@@ -72,6 +72,13 @@ var mainToolbarWithRadiusStyle = css({
72
72
  var mainToolbarRadius = css({
73
73
  borderRadius: "var(--ds-radius-medium, 6px)".concat(" ", "var(--ds-radius-medium, 6px)", " 0 0")
74
74
  });
75
+ var editorModernisationToolbarStyle = css({
76
+ borderRadius: "var(--ds-radius-xlarge, 12px)".concat(" ", "var(--ds-radius-xlarge, 12px)", " 0 0"),
77
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
78
+ '&.show-keyline': {
79
+ boxShadow: 'none'
80
+ }
81
+ });
75
82
  var stickyToolbarWrapperStyleNew = css({
76
83
  position: 'sticky',
77
84
  paddingBottom: "var(--ds-space-100, 8px)",
@@ -102,7 +109,7 @@ var StickyToolbar = function StickyToolbar(props) {
102
109
  return (
103
110
  // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
104
111
  jsx("div", {
105
- css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithPadding, expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) && mainToolbarRadius, !expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) && fg('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle]
112
+ css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithPadding, expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) && mainToolbarRadius, !expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) && fg('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle, props.isEditorModernisationEnabled && editorModernisationToolbarStyle]
106
113
  // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
107
114
  ,
108
115
  style: {
@@ -119,7 +126,7 @@ var FixedToolbar = function FixedToolbar(props) {
119
126
  return (
120
127
  // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
121
128
  jsx("div", {
122
- css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, !expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) && fg('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle, expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) && mainToolbarRadius],
129
+ css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, !expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) && fg('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle, expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) && mainToolbarRadius, props.isEditorModernisationEnabled && editorModernisationToolbarStyle],
123
130
  "data-testid": "ak-editor-main-toolbar"
124
131
  }, props.children)
125
132
  );
@@ -156,17 +163,20 @@ export var MainToolbar = function MainToolbar(_ref) {
156
163
  var useStickyToolbar = _ref.useStickyToolbar,
157
164
  twoLineEditorToolbar = _ref.twoLineEditorToolbar,
158
165
  children = _ref.children,
166
+ isEditorModernisationEnabled = _ref.isEditorModernisationEnabled,
159
167
  isNewToolbarEnabled = _ref.isNewToolbarEnabled;
160
168
  if (useStickyToolbar) {
161
169
  return jsx(StickyToolbar
162
170
  // Ignored via go/ees005
163
171
  // eslint-disable-next-line react/jsx-props-no-spreading
164
172
  , _extends({}, getStickyParameters(useStickyToolbar), {
173
+ isEditorModernisationEnabled: isEditorModernisationEnabled,
165
174
  twoLineEditorToolbar: twoLineEditorToolbar,
166
175
  isNewToolbarEnabled: isNewToolbarEnabled
167
176
  }), children);
168
177
  }
169
178
  return jsx(FixedToolbar, {
179
+ isEditorModernisationEnabled: isEditorModernisationEnabled,
170
180
  twoLineEditorToolbar: twoLineEditorToolbar,
171
181
  isNewToolbarEnabled: isNewToolbarEnabled
172
182
  }, children);
package/dist/esm/version-wrapper.js CHANGED
@@ -1,3 +1,3 @@
1
1
  export var name = "@atlaskit/editor-core";
2
2
  // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
3
- export var version = "220.3.1";
3
+ export var version = "220.3.2";
package/dist/types/types/editor-appearance-component.d.ts CHANGED
@@ -33,6 +33,7 @@ export interface EditorAppearanceComponentProps<Plugins extends NextEditorPlugin
33
33
  featureFlags: FeatureFlags;
34
34
  innerRef?: RefObject<HTMLDivElement>;
35
35
  insertMenuItems?: MenuItem[];
36
+ isEditorModernisationEnabled?: boolean;
36
37
  maxHeight?: number;
37
38
  minHeight?: number;
38
39
  onCancel?: (editorView: EditorView) => void;
package/dist/types/types/editor-props.d.ts CHANGED
@@ -57,6 +57,7 @@ interface EditorBaseProps {
57
57
  appearance?: EditorAppearance;
58
58
  assistiveLabel?: string;
59
59
  contentComponents?: ContentComponents;
60
+ isEditorModernisationEnabled?: boolean;
60
61
  /**
61
62
  * **WARNING** this attribute is not supported outside of Confluence Full Page editors
62
63
  *
package/dist/types/ui/Appearance/Comment/Toolbar.d.ts CHANGED
@@ -3,9 +3,10 @@ import { jsx } from '@emotion/react';
3
3
  import type { UseStickyToolbarType } from '@atlaskit/editor-common/ui';
4
4
  type MainToolbarProps = {
5
5
  children?: React.ReactNode;
6
+ isEditorModernisationEnabled?: boolean;
6
7
  isNewToolbarEnabled?: boolean;
7
8
  twoLineEditorToolbar?: boolean;
8
9
  useStickyToolbar?: UseStickyToolbarType;
9
10
  };
10
- export declare const MainToolbar: ({ useStickyToolbar, twoLineEditorToolbar, children, isNewToolbarEnabled, }: MainToolbarProps) => jsx.JSX.Element;
11
+ export declare const MainToolbar: ({ useStickyToolbar, twoLineEditorToolbar, children, isEditorModernisationEnabled, isNewToolbarEnabled, }: MainToolbarProps) => jsx.JSX.Element;
11
12
  export {};
package/dist/types-ts4.5/types/editor-appearance-component.d.ts CHANGED
@@ -33,6 +33,7 @@ export interface EditorAppearanceComponentProps<Plugins extends NextEditorPlugin
33
33
  featureFlags: FeatureFlags;
34
34
  innerRef?: RefObject<HTMLDivElement>;
35
35
  insertMenuItems?: MenuItem[];
36
+ isEditorModernisationEnabled?: boolean;
36
37
  maxHeight?: number;
37
38
  minHeight?: number;
38
39
  onCancel?: (editorView: EditorView) => void;
package/dist/types-ts4.5/types/editor-props.d.ts CHANGED
@@ -57,6 +57,7 @@ interface EditorBaseProps {
57
57
  appearance?: EditorAppearance;
58
58
  assistiveLabel?: string;
59
59
  contentComponents?: ContentComponents;
60
+ isEditorModernisationEnabled?: boolean;
60
61
  /**
61
62
  * **WARNING** this attribute is not supported outside of Confluence Full Page editors
62
63
  *
package/dist/types-ts4.5/ui/Appearance/Comment/Toolbar.d.ts CHANGED
@@ -3,9 +3,10 @@ import { jsx } from '@emotion/react';
3
3
  import type { UseStickyToolbarType } from '@atlaskit/editor-common/ui';
4
4
  type MainToolbarProps = {
5
5
  children?: React.ReactNode;
6
+ isEditorModernisationEnabled?: boolean;
6
7
  isNewToolbarEnabled?: boolean;
7
8
  twoLineEditorToolbar?: boolean;
8
9
  useStickyToolbar?: UseStickyToolbarType;
9
10
  };
10
- export declare const MainToolbar: ({ useStickyToolbar, twoLineEditorToolbar, children, isNewToolbarEnabled, }: MainToolbarProps) => jsx.JSX.Element;
11
+ export declare const MainToolbar: ({ useStickyToolbar, twoLineEditorToolbar, children, isEditorModernisationEnabled, isNewToolbarEnabled, }: MainToolbarProps) => jsx.JSX.Element;
11
12
  export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "220.3.2",
3
+ "version": "220.4.0",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -92,7 +92,7 @@
92
92
  "uuid": "^3.1.0"
93
93
  },
94
94
  "peerDependencies": {
95
- "@atlaskit/editor-common": "^115.13.0",
95
+ "@atlaskit/editor-common": "^115.14.0",
96
96
  "@atlaskit/link-provider": "^4.7.0",
97
97
  "@atlaskit/media-core": "^37.1.0",
98
98
  "react": "^18.2.0",
@@ -121,7 +121,7 @@
121
121
  "@atlaskit/modal-dialog": "^15.2.0",
122
122
  "@atlaskit/popper": "^7.2.0",
123
123
  "@atlaskit/portal": "^5.5.0",
124
- "@atlaskit/renderer": "^132.4.0",
124
+ "@atlaskit/renderer": "^132.5.0",
125
125
  "@atlaskit/section-message": "^8.13.0",
126
126
  "@atlaskit/synchrony-test-helpers": "workspace:^",
127
127
  "@atlaskit/toggle": "^16.1.0",