@atlaskit/editor-core 220.3.2 → 220.4.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 (29) hide show
  1. package/CHANGELOG.md +19 -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/ui/EditorContentContainer/EditorContentContainer-compiled.compiled.css +18 -6
  7. package/dist/cjs/ui/EditorContentContainer/EditorContentContainer-compiled.js +1 -1
  8. package/dist/cjs/version-wrapper.js +1 -1
  9. package/dist/es2019/composable-editor/editor-internal.js +1 -0
  10. package/dist/es2019/composable-editor/hooks/useMemoEditorProps.js +2 -1
  11. package/dist/es2019/ui/Appearance/Comment/Comment.js +7 -2
  12. package/dist/es2019/ui/Appearance/Comment/Toolbar.js +12 -2
  13. package/dist/es2019/ui/EditorContentContainer/EditorContentContainer-compiled.compiled.css +18 -6
  14. package/dist/es2019/ui/EditorContentContainer/EditorContentContainer-compiled.js +1 -1
  15. package/dist/es2019/version-wrapper.js +1 -1
  16. package/dist/esm/composable-editor/editor-internal.js +1 -0
  17. package/dist/esm/composable-editor/hooks/useMemoEditorProps.js +2 -1
  18. package/dist/esm/ui/Appearance/Comment/Comment.js +7 -2
  19. package/dist/esm/ui/Appearance/Comment/Toolbar.js +12 -2
  20. package/dist/esm/ui/EditorContentContainer/EditorContentContainer-compiled.compiled.css +18 -6
  21. package/dist/esm/ui/EditorContentContainer/EditorContentContainer-compiled.js +1 -1
  22. package/dist/esm/version-wrapper.js +1 -1
  23. package/dist/types/types/editor-appearance-component.d.ts +1 -0
  24. package/dist/types/types/editor-props.d.ts +1 -0
  25. package/dist/types/ui/Appearance/Comment/Toolbar.d.ts +2 -1
  26. package/dist/types-ts4.5/types/editor-appearance-component.d.ts +1 -0
  27. package/dist/types-ts4.5/types/editor-props.d.ts +1 -0
  28. package/dist/types-ts4.5/ui/Appearance/Comment/Toolbar.d.ts +2 -1
  29. package/package.json +5 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,24 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 220.4.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [`edeed2f3314cd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/edeed2f3314cd) -
8
+ Fix rounded table edge interaction overlays
9
+ - Updated dependencies
10
+
11
+ ## 220.4.0
12
+
13
+ ### Minor Changes
14
+
15
+ - [`3300f270bc8ea`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3300f270bc8ea) -
16
+ Update comment editor modernisation styling
17
+
18
+ ### Patch Changes
19
+
20
+ - Updated dependencies
21
+
3
22
  ## 220.3.2
4
23
 
5
24
  ### 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/ui/EditorContentContainer/EditorContentContainer-compiled.compiled.css CHANGED
@@ -58,7 +58,7 @@
58
58
  ._1h9lmihd .ProseMirror .ak-editor-sync-block.creation-loading{transition:box-shadow .2s ease-in}
59
59
  ._1hte8kn1 .danger .inlineCardView-content-wrap>span>a{transition:background-color 0s}
60
60
  ._1i421gfe .ProseMirror h4{font:var(--editor-font-ugc-token-heading-h4)}
61
- ._1i8r1qi0 .pm-table-wrapper>table:after{border-radius:var(--ds-radius-medium,6px)}
61
+ ._1i8rpb1k .pm-table-wrapper>table:after{border-radius:var(--ds-radius-xlarge,9pt)}
62
62
  ._1iac12b0 .show-diff-deleted-node .media-card-wrapper>div{border-radius:var(--ds-radius-small,4px)}
63
63
  ._1j2jidpf .bodiedExtensionView-content-wrap .extension-container .bodiedExtension-content-inner-wrapper{border-radius:0}
64
64
  ._1j2m12b0 .ProseMirror [data-layout-section].selected.danger [data-layout-section]{border-radius:var(--ds-radius-small,4px)}
@@ -67,7 +67,7 @@
67
67
  ._1khk1mok:hover::-webkit-scrollbar-thumb{border-radius:var(--ds-radius-large,8px)}
68
68
  ._1kk7l6jh [data-prosemirror-node-name=decisionItem]>[data-decision-wrapper]>[data-component=icon]{margin:var(--ds-space-050,4px) var(--ds-space-150,9pt) 0 0}
69
69
  ._1l4zlb4i .fabric-background-color-mark{border-radius:var(--ds-radius-xsmall,2px)}
70
- ._1m4qidpf .pm-table-container>table:after{inset:0}
70
+ ._1m4qyvqg .pm-table-container>table:after{inset:-.5px}
71
71
  ._1mc7glyw .ak-editor-selected-node.unsupportedInlineView-content-wrap>span:nth-of-type(2):after{border:none}
72
72
  ._1mml7qp0 .pm-table-container .pm-table-right-border{background:var(--ds-background-accent-gray-subtler,#dddee1)}
73
73
  ._1mx211so [data-prosemirror-node-name=taskItem] .task-item-checkbox-wrap>input[type=checkbox]+svg rect:first-of-type{transition:stroke .2s ease-in-out}
@@ -214,8 +214,8 @@
214
214
  ._j159j0fz .ProseMirror [data-layout-section].selected [data-layout-column]{border:1px solid var(--ds-border,#0b120e24)}
215
215
  ._j6cmidpf .ProseMirror [data-layout-section]:hover [data-layout-column]{border:0}
216
216
  ._j6cmj0fz .ProseMirror [data-layout-section]:hover [data-layout-column]{border:1px solid var(--ds-border,#0b120e24)}
217
- ._jeg71qi0 .pm-table-container>table:after{border-radius:var(--ds-radius-medium,6px)}
218
- ._jx6o1qi0 .pm-table-sticky-wrapper>table:after{border-radius:var(--ds-radius-medium,6px)}
217
+ ._jeg7pb1k .pm-table-container>table:after{border-radius:var(--ds-radius-xlarge,9pt)}
218
+ ._jx6opb1k .pm-table-sticky-wrapper>table:after{border-radius:var(--ds-radius-xlarge,9pt)}
219
219
  ._jz731rb6 .pm-table-container>table{border:1px solid var(--ds-background-accent-gray-subtler,#dddee1)}
220
220
  ._jz73okh7 .pm-table-container>table{border:1px solid transparent}
221
221
  ._k4r0q98m .ak-editor-selected-node.unsupportedInlineView-content-wrap>span:nth-of-type(2):after{background:var(--ds-border-selected,#1868db)}
@@ -256,7 +256,7 @@
256
256
  ._s9qz1mok .ProseMirror .pm-table-wrapper>table:hover::-webkit-scrollbar-thumb{border-radius:var(--ds-radius-large,8px)}
257
257
  ._sh9t1mn3 [data-prosemirror-node-name=blockTaskItem] .task-item-checkbox-wrap>input[type=checkbox]+svg{transition:color .2s ease-in-out,fill .2s ease-in-out}
258
258
  ._sqna1mok .blockCardView-content-wrap.ak-editor-selected-node .loader-wrapper>div{border-radius:var(--ds-radius-large,8px)}
259
- ._t6ioidpf .pm-table-sticky-wrapper>table:after{inset:0}
259
+ ._t6ioyvqg .pm-table-sticky-wrapper>table:after{inset:-.5px}
260
260
  ._tvm38r4n [data-prosemirror-node-name=blockTaskItem] .task-item-checkbox-wrap>input[type=checkbox]:checked:focus+svg{border-radius:var(--ds-radius-small,.25rem)}
261
261
  ._txt11rqd .ProseMirror .left-shadow:before{background:linear-gradient(to left,transparent 0,var(--ds-shadow-overflow-spread,#1e1f2129) 140%),linear-gradient(to right,var(--ds-shadow-overflow-perimeter,#1e1f211f) 0,transparent 1px)}
262
262
  ._uufeidpf .resizer-handle-thumb{border:0}
@@ -275,7 +275,7 @@
275
275
  ._ygeohueu .ak-editor-selected-node.unsupportedInlineView-content-wrap>span:nth-of-type(2){border:1px solid var(--ds-border-selected,#1868db)}
276
276
  ._yhgjt94y .ProseMirror hr{border-radius:1px}
277
277
  ._z7qocu6h .ProseMirror .ak-editor-sync-block:hover .ak-editor-sync-block__label{transition:opacity .2s ease-in,visibility .2s ease-in}
278
- ._zdvfidpf .pm-table-wrapper>table:after{inset:0}
278
+ ._zdvfyvqg .pm-table-wrapper>table:after{inset:-.5px}
279
279
  ._zgyzglyw .ProseMirror [data-layout-section].ak-editor-selected-node:not(.danger) [data-layout-column]:after{border:none}
280
280
  ._zh8m12b0 .layout-column-divider-rail{border-radius:var(--ds-radius-small,4px)}
281
281
  ._zjao12b0 .pm-breakout-resize-handle-rail{border-radius:var(--ds-radius-small,4px)}
@@ -650,9 +650,11 @@
650
650
  ._16a71tmw [data-prosemirror-node-name=status]>[data-color=red] .lozenge-text{color:var(--ds-text-danger,#ae2e24)}
651
651
  ._16am1j28 .ProseMirror [data-layout-section].ak-editor-selected-node:not(.danger) [data-layout-column] ::-moz-selection{background-color:transparent}
652
652
  ._16atr4us .ak-editor-selected-node:not(.search-match-block)>.editor-mention-primitive.mention-self{box-shadow:0 0 0 1px var(--ds-border-selected,#1868db)}
653
+ ._16cpusvi .pm-table-sticky-wrapper>table>tbody>tr>td[data-reaches-bottom]{background-clip:border-box}
653
654
  ._16d4idpf .ProseMirror .fabric-editor-indentation-mark:first-of-type:first-child h4:first-child:not(style){margin-top:0}
654
655
  ._16df1txw .ProseMirror [data-layout-section] [data-layout-column][data-valign=middle]>[data-layout-content]{display:flex}
655
656
  ._16e11mi1 .fabric-editor-breakout-mark:has([data-prosemirror-node-name=expand])>.pm-breakout-resize-handle-container--left{left:-25px}
657
+ ._16e3usvi .pm-table-wrapper>table>tbody>tr>td[data-reaches-bottom]{background-clip:border-box}
656
658
  ._16fuidpf .ProseMirror .fabric-editor-indentation-mark:first-of-type:first-child p style:first-child+*{margin-top:0}
657
659
  ._16fx73ad .ProseMirror [data-layout-section]{cursor:default}
658
660
  ._16fxtlke .ProseMirror [data-layout-section]{cursor:pointer}
@@ -736,6 +738,7 @@
736
738
  ._187pidpf .ProseMirror .ProseMirror-gapcursor:first-of-type+span+pre{margin-top:0}
737
739
  ._1890oqnp .multiBodiedExtensionView-content-wrap{margin-top:.75rem}
738
740
  ._18ab1hou [data-prosemirror-node-name=taskItem] .task-item-checkbox-wrap>input[type=checkbox]:disabled:checked+svg{--checkbox-tick-color:var(--local-tick-disabled)}
741
+ ._18bhusvi .pm-table-sticky-wrapper>table>tbody>tr>th[data-reaches-bottom]{background-clip:border-box}
739
742
  ._18bz1tsb .ProseMirror .ak-editor-bodied-sync-block.user-is-dragging{box-shadow:0 0 0 1px var(--ds-border,#0b120e24)}
740
743
  ._18cr199y [data-prosemirror-node-name=blockTaskItem] .task-item-checkbox-wrap>input[type=checkbox]:hover+svg{--checkbox-border-color:var(--local-border-hover)}
741
744
  ._18cwckbl .ProseMirror .ak-editor-panel{min-width:3pc}
@@ -939,6 +942,7 @@
939
942
  ._1cq5glyw [data-prosemirror-node-name=taskItem] [data-component=placeholder]{display:none}
940
943
  ._1cq71hrf .ProseMirror .rich-media-item.image-wrap-right+.rich-media-item.image-wrap-left{clear:both}
941
944
  ._1cr2idpf .ProseMirror .ak-editor-annotation-hover:has([data-inline-card]){padding-left:0}
945
+ ._1crdusvi .pm-table-container>table>tbody>tr>th[data-reaches-top]{background-clip:border-box}
942
946
  ._1crlidpf .blockCardView-content-wrap{margin-right:0}
943
947
  ._1crm1txw .pm-breakout-resize-handle-rail{display:flex}
944
948
  ._1crwidpf [data-prosemirror-node-name=taskItem] [data-component=content]{margin-top:0}
@@ -1582,6 +1586,7 @@
1582
1586
  ._1qxuysee .pm-table-wrapper>table th{background-color:var(--ds-background-accent-gray-subtlest,#f0f1f2)}
1583
1587
  ._1qypglyw [layout=wrap-right]+.ProseMirror-gapcursor+[layout=wrap-left]{clear:none}
1584
1588
  ._1qyx1kdv .multiBodiedExtensionView-content-wrap:not(.danger).ak-editor-selected-node>span>.multiBodiedExtension--container{-webkit-user-select:text}
1589
+ ._1qzuusvi .pm-table-wrapper>table>tbody>tr>td[data-reaches-top]{background-clip:border-box}
1585
1590
  ._1r0kstnw .ProseMirror .code-block .code-block--start{position:absolute}
1586
1591
  ._1r2pidpf .ProseMirror .ak-editor-selected-node .emoji-common-emoji-sprite:before{top:0}
1587
1592
  ._1r3dhteq [data-prosemirror-node-name=blockTaskItem] .task-item-checkbox-wrap>input[type=checkbox]+svg rect:first-of-type{stroke:var(--checkbox-border-color)}
@@ -1704,6 +1709,7 @@
1704
1709
  ._1tvap1qy .ProseMirror h5>.mediaInlineView-content-wrap>.media-inline-image-wrapper{transform:translateY(-2px)}
1705
1710
  ._1twbidpf .ak-editor-panel.ak-editor-selected-node:not(.danger):before{left:0}
1706
1711
  ._1tx5r4us .inlineCardView-content-wrap.ak-editor-selected-node:not(.search-match-block):not(.danger) .loader-wrapper>a{box-shadow:0 0 0 1px var(--ds-border-selected,#1868db)}
1712
+ ._1tytusvi .pm-table-container>table>tbody>tr>td[data-reaches-bottom]{background-clip:border-box}
1707
1713
  ._1tz91ial .ProseMirror .layoutSectionView-content-wrap.ak-editor-selected-node:not(.danger) [data-layout-column]:before{z-index:12}
1708
1714
  ._1tzc1b66 [data-prosemirror-node-name=status] .lozenge-wrapper{padding-inline-start:var(--ds-space-050,4px)}
1709
1715
  ._1tzri7uo .ProseMirror h1{color:var(--ds-text,#292a2e)}
@@ -2142,6 +2148,7 @@
2142
2148
  ._6eqhi8nm [data-prosemirror-node-name=status] .lozenge-wrapper{background-color:var(--ds-background-neutral,#0515240f)}
2143
2149
  ._6f0lidpf .ProseMirror .ak-editor-annotation-focus{padding-left:0}
2144
2150
  ._6ggl1j28 .pm-table-sticky-wrapper>table{border-left-color:transparent}
2151
+ ._6glausvi .pm-table-wrapper>table>tbody>tr>th[data-reaches-bottom]{background-clip:border-box}
2145
2152
  ._6itxidpf .ProseMirror>.ak-editor-panel:first-child{margin-top:0}
2146
2153
  ._6jbkgrf3 .ProseMirror li:has(>ol:only-child){margin-bottom:0!important}
2147
2154
  ._6jk61j28 .ak-editor-selected-node.unsupportedInlineView-content-wrap>span:nth-of-type(2) ::-moz-selection{background-color:transparent}
@@ -2635,6 +2642,7 @@
2635
2642
  ._gpptagmp .ProseMirror .ak-editor-selected-node .ak-editor-sync-block__renderer span[data-emoji-id]{box-shadow:none!important}
2636
2643
  ._gptrh2mm ol[data-node-type=decisionList].ak-editor-selected-node{position:relative}
2637
2644
  ._grya7wq0 .ProseMirror [data-layout-section].ak-editor-selected-node:not(.danger) [data-layout-column]:before{background-color:var(--ds-blanket-selected,#388bff14)}
2645
+ ._gs0pusvi .pm-table-sticky-wrapper>table>tbody>tr>th[data-reaches-top]{background-clip:border-box}
2638
2646
  ._gsu5idpf [data-prosemirror-node-name=decisionItem]>[data-decision-wrapper]>[data-component=content]{margin-top:0}
2639
2647
  ._gt3aidpf .ProseMirror [data-layout-section] [data-layout-column]>div>.ProseMirror-gapcursor.-right:first-child+.mediaSingleView-content-wrap .rich-media-item{margin-top:0}
2640
2648
  ._gt60idpf .bodiedExtensionView-content-wrap .extension-container .bodiedExtension-content-inner-wrapper{margin-right:0}
@@ -2726,6 +2734,7 @@
2726
2734
  ._im81mz2b [data-prosemirror-node-name=taskItem] .task-item-checkbox-wrap>input[type=checkbox]:disabled:hover+svg{--checkbox-background-color:var(--local-background-disabled)}
2727
2735
  ._imlv15ya .ProseMirror .media-extended-resize-experience[layout^=wrap-]{overflow-y:visible!important}
2728
2736
  ._imnz1j28 .ProseMirror :is(p,h1,h2,h3,h4,h5,h6):not(:is(ul,ol,div[data-node-type=actionList]) :is(p,h1,h2,h3,h4,h5,h6)).ak-editor-selected-node:not(.ak-editor-selected-node *)::selection{background-color:transparent}
2737
+ ._impmusvi .pm-table-container>table>tbody>tr>th[data-reaches-bottom]{background-clip:border-box}
2729
2738
  ._iola16y8 [data-prosemirror-node-name=embedCard].show-diff-deleted-node-traditional{text-decoration-color:var(--ds-border-accent-red,#e2483d)}
2730
2739
  ._iola1r31 [data-prosemirror-node-name=embedCard].show-diff-deleted-node-traditional{text-decoration-color:currentColor}
2731
2740
  ._ip0144v4 .ProseMirror .code-block .code-block-content-wrapper{background-size:var(--ds-space-300,24px) 100%,var(--ds-space-300,24px) 100%,var(--ds-space-100,8px) 100%,var(--ds-space-100,8px) 100%,var(--ds-space-100,8px) 100%,1px 100%,var(--ds-space-100,8px) 100%,1px 100%}
@@ -3036,6 +3045,7 @@
3036
3045
  ._ozidmk5s .ProseMirror :is(p,h1,h2,h3,h4,h5,h6):not(:is(ul,ol,div[data-node-type=actionList]) :is(p,h1,h2,h3,h4,h5,h6)).ak-editor-selected-node:not(.ak-editor-selected-node *){box-shadow:0 -4px 0 var(--ds-background-accent-blue-subtler,#cfe1fd),0 4px 0 var(--ds-background-accent-blue-subtler,#cfe1fd)}
3037
3046
  ._p0351j28 .ak-editor-selected-node>[data-decision-wrapper]::-moz-selection{background-color:transparent}
3038
3047
  ._p31f1hrf .ProseMirror-gapcursor+[layout=wrap-left]+span+[layout=wrap-right]:after{clear:both}
3048
+ ._p3f1usvi .pm-table-sticky-wrapper>table>tbody>tr>td[data-reaches-top]{background-clip:border-box}
3039
3049
  ._p3gngrf3 .ProseMirror .ak-editor-panel__content>.code-block:first-child{margin-top:0!important}
3040
3050
  ._p3lu1txw .richMedia-resize-handle-left{display:flex}
3041
3051
  ._p3p6usvi .gridLine{box-sizing:border-box}
@@ -3096,6 +3106,7 @@
3096
3106
  ._q353idpf .ProseMirror .ak-editor-annotation-draft:has([data-inline-card]){padding-left:0}
3097
3107
  ._q381n7od table .resizer-hover-zone.resizer-is-extended{padding-right:unset}
3098
3108
  ._q3zpv9ra .search-match-block.ak-editor-sync-block{background-color:var(--ds-background-accent-magenta-subtler,#fdd0ec)}
3109
+ ._q44kusvi .pm-table-container>table>tbody>tr>td[data-reaches-top]{background-clip:border-box}
3099
3110
  ._q4ju1ule .ProseMirror blockquote>.mediaSingleView-content-wrap:last-child{display:block}
3100
3111
  ._q5x9b3bt .ak-editor-selected-node>[data-decision-wrapper]:before{content:""}
3101
3112
  ._q7vcidpf .ProseMirror .telepointer:hover .telepointer-initial{opacity:0}
@@ -3472,6 +3483,7 @@
3472
3483
  ._xyed1kw7 .ProseMirror .ak-editor-panel[data-panel-type=warning]{color:inherit}
3473
3484
  ._xypuidpf .ProseMirror .layout-section-container [data-layout-section]>[data-layout-column]{margin-top:0}
3474
3485
  ._xznn1911 [data-prosemirror-node-name=blockquote].show-diff-deleted-node-traditional{text-decoration-line:line-through}
3486
+ ._xzq6usvi .pm-table-wrapper>table>tbody>tr>th[data-reaches-top]{background-clip:border-box}
3475
3487
  ._y1fl1ssb .ProseMirror .ProseMirror-gapcursor span[layout=full-width]{margin-left:50%}
3476
3488
  ._y41iglyw [layout=wrap-right]+.ProseMirror-gapcursor+span+[layout=wrap-left]{clear:none}
3477
3489
  ._y41ln7od table .resizer-hover-zone.resizer-is-extended{left:unset}
package/dist/cjs/ui/EditorContentContainer/EditorContentContainer-compiled.js CHANGED
@@ -309,7 +309,7 @@ var editorContentStyles = {
309
309
  tableLayoutFixesWithFontSize: "_1f5xidpf _156tidpf _f30jidpf _jr291hrf",
310
310
  tableSharedStyle: "_ad1u99ee _9d0e7qp0 _1mml7qp0 _1u4a1ule _1w721ule _1gr6t94y _ihzat94y _zi6e1vmz _1uln1vmz _wqm3stnw _1o0wstnw _1aho1ejb _uqg71ejb _g971h2mm _fzt6usvi _1nd8idpf _5cdi6z83 _kc8l11ss _9vqg11ss _dbl6pzf8 _4e711hrf _1hy1bokp _1bxo1ea5 _10kw1rb6 _1u451rb6 _1gep1rb6 _14oi1rb6 _3yki1rb6 _185t1rb6 _13heu2gc _1uj1u2gc _1ssuu2gc _lqdju2gc _1waku2gc _1nzzu2gc _7xl8ckbl _1jykckbl _1m6qckbl _sellckbl _11t9ckbl _866vckbl _1dlzi7a9 _irzhi7a9 _15t1i7a9 _1ivxi7a9 _16k4i7a9 _1vo6i7a9 _q0zvjp4b _1junjp4b _ixm7jp4b _17dpjp4b _dzhmjp4b _15pyjp4b _dj9oidpf _8zz2idpf _1hwbidpf _1lxyidpf _yqeuidpf _mzo1idpf _9ex2idpf _1805idpf _1iphidpf _qkm8idpf _17v9idpf _4p8kidpf _6o4midpf _1edridpf _5908idpf _1d63idpf _1j36idpf _hlqnidpf _gw0eutpp _1n42utpp _762vutpp _g62yutpp _1y9hutpp _bjiqutpp _5dtjutpp _dclrutpp _1j94utpp _5o16utpp _946yutpp _1kffutpp _13bnglyw _1ekgglyw _nvt3glyw _v91rcfaq _byukcfaq _4oczcfaq _3aim1n9t _xsax1n9t _1hz91n9t _vqlp1x4e _1a0i1x4e _m5f81x4e _12j81osq _135a1osq _vkob1osq _dujf1wug _jr3h1wug _1ei91wug _kq5rusvi _31x2usvi _pavrusvi _14jm1ntv _1rfm1ntv _100i1ntv _1ciasm61 _5gm1sm61 _t176sm61 _1az4vuon _1mdwvuon _9l08vuon _vrwbysee _nwuhysee _1qxuysee _go9a1e5h _ktc91e5h _lr001e5h _komfhp5a _1lj5hp5a _96m3hp5a _s2681tsb _15bz1tsb _1skp1tsb _iley2lzm _ay9u2lzm _8zqr2lzm _qxl3i8nm _3gtki8nm _1nu9i8nm _lezgi8nm _1574i8nm _1yd8i8nm _ywut18tx _cee918tx _17h918tx _1esgtoke _1q0atoke _4waqtoke _1syri8nm _pvtri8nm _12jli8nm",
311
311
  tableSharedStyleBackgroundClipFix: "_m6yo1u8q _19il1u8q _10gj1u8q _tbd61u8q _12ly1u8q _1l071u8q",
312
- tableSharedStyle_with_platform_editor_table_q4_loveability: "_1u4aglyw _1w72glyw _jz73okh7 _13axokh7 _b7zlokh7 _1m4qidpf _t6ioidpf _zdvfidpf _fvpu1rb6 _119m1rb6 _1bew1rb6 _jeg71qi0 _jx6o1qi0 _1i8r1qi0 _frzgb3bt _18cxb3bt _jibgb3bt _1rxpstnw _1aqsstnw _1aazstnw _12gbglyw _1pj5glyw _1trrglyw _14ndkb7n _13qpkb7n _1ubpkb7n _1uhsh2mm _dpkjh2mm _1fpbh2mm _rvx71j28 _tq001j28 _1ioi1j28 _91c11j28 _1owd1j28 _sml91j28 _1yvx1j28 _s4v61j28 _1tfl1j28 _1jhh1j28 _1s681j28 _s7al1j28 _jiyw1j28 _13201j28 _l6531j28 _14t11j28 _1l1u1j28 _w4h41j28 _rwnl1j28 _195x1j28 _2cbt1j28 _1u9gidpf _b9lsidpf _qh1aidpf _fgk3idpf _18kg1j28 _z0011j28",
312
+ tableSharedStyle_with_platform_editor_table_q4_loveability: "_1u4aglyw _1w72glyw _jz73okh7 _13axokh7 _b7zlokh7 _1m4qyvqg _t6ioyvqg _zdvfyvqg _fvpu1rb6 _119m1rb6 _1bew1rb6 _jeg7pb1k _jx6opb1k _1i8rpb1k _frzgb3bt _18cxb3bt _jibgb3bt _1rxpstnw _1aqsstnw _1aazstnw _12gbglyw _1pj5glyw _1trrglyw _14ndkb7n _13qpkb7n _1ubpkb7n _1uhsh2mm _dpkjh2mm _1fpbh2mm _rvx71j28 _tq001j28 _1ioi1j28 _91c11j28 _1owd1j28 _sml91j28 _1yvx1j28 _s4v61j28 _1tfl1j28 _1jhh1j28 _1s681j28 _s7al1j28 _jiyw1j28 _13201j28 _l6531j28 _14t11j28 _1l1u1j28 _w4h41j28 _rwnl1j28 _195x1j28 _2cbt1j28 _1tytusvi _q44kusvi _impmusvi _1crdusvi _16cpusvi _p3f1usvi _18bhusvi _gs0pusvi _16e3usvi _1qzuusvi _6glausvi _xzq6usvi _1u9gidpf _b9lsidpf _qh1aidpf _fgk3idpf _18kg1j28 _z0011j28",
313
313
  tableSharedStyle_without_platform_editor_table_q4_loveability: "_9d0e7qp0 _1mml7qp0 _1u4a1ule _1w721ule _1gr6t94y _ihzat94y _zi6e1vmz _1uln1vmz _wqm3stnw _1o0wstnw _1aho1ejb _uqg71ejb _1j1lidpf _e364idpf _7vb2pzf8 _jz731rb6 _13ax1rb6 _b7zl1rb6 _17xf1j28 _6ggl1j28 _wxs41j28 _1h3k1j28 _1e811j28 _w9wp1j28",
314
314
  tableSharedStyle_with_platform_editor_table_menu_updates: "_n7o2nkob _a8zqnkob _wf2knkob _1hy4nkob _iy21nkob _dvccnkob _1fltyfq0 _14bcyfq0 _t9jryfq0 _13e6yfq0 _103nyfq0 _1ho1yfq0",
315
315
  tableSharedStyle_with_platform_editor_bordered_panel_nested_in_table: "_14kce4h9 _6bj4nqa1 _1fyn1l7x",
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.4.0";
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/ui/EditorContentContainer/EditorContentContainer-compiled.compiled.css CHANGED
@@ -58,7 +58,7 @@
58
58
  ._1h9lmihd .ProseMirror .ak-editor-sync-block.creation-loading{transition:box-shadow .2s ease-in}
59
59
  ._1hte8kn1 .danger .inlineCardView-content-wrap>span>a{transition:background-color 0s}
60
60
  ._1i421gfe .ProseMirror h4{font:var(--editor-font-ugc-token-heading-h4)}
61
- ._1i8r1qi0 .pm-table-wrapper>table:after{border-radius:var(--ds-radius-medium,6px)}
61
+ ._1i8rpb1k .pm-table-wrapper>table:after{border-radius:var(--ds-radius-xlarge,9pt)}
62
62
  ._1iac12b0 .show-diff-deleted-node .media-card-wrapper>div{border-radius:var(--ds-radius-small,4px)}
63
63
  ._1j2jidpf .bodiedExtensionView-content-wrap .extension-container .bodiedExtension-content-inner-wrapper{border-radius:0}
64
64
  ._1j2m12b0 .ProseMirror [data-layout-section].selected.danger [data-layout-section]{border-radius:var(--ds-radius-small,4px)}
@@ -67,7 +67,7 @@
67
67
  ._1khk1mok:hover::-webkit-scrollbar-thumb{border-radius:var(--ds-radius-large,8px)}
68
68
  ._1kk7l6jh [data-prosemirror-node-name=decisionItem]>[data-decision-wrapper]>[data-component=icon]{margin:var(--ds-space-050,4px) var(--ds-space-150,9pt) 0 0}
69
69
  ._1l4zlb4i .fabric-background-color-mark{border-radius:var(--ds-radius-xsmall,2px)}
70
- ._1m4qidpf .pm-table-container>table:after{inset:0}
70
+ ._1m4qyvqg .pm-table-container>table:after{inset:-.5px}
71
71
  ._1mc7glyw .ak-editor-selected-node.unsupportedInlineView-content-wrap>span:nth-of-type(2):after{border:none}
72
72
  ._1mml7qp0 .pm-table-container .pm-table-right-border{background:var(--ds-background-accent-gray-subtler,#dddee1)}
73
73
  ._1mx211so [data-prosemirror-node-name=taskItem] .task-item-checkbox-wrap>input[type=checkbox]+svg rect:first-of-type{transition:stroke .2s ease-in-out}
@@ -214,8 +214,8 @@
214
214
  ._j159j0fz .ProseMirror [data-layout-section].selected [data-layout-column]{border:1px solid var(--ds-border,#0b120e24)}
215
215
  ._j6cmidpf .ProseMirror [data-layout-section]:hover [data-layout-column]{border:0}
216
216
  ._j6cmj0fz .ProseMirror [data-layout-section]:hover [data-layout-column]{border:1px solid var(--ds-border,#0b120e24)}
217
- ._jeg71qi0 .pm-table-container>table:after{border-radius:var(--ds-radius-medium,6px)}
218
- ._jx6o1qi0 .pm-table-sticky-wrapper>table:after{border-radius:var(--ds-radius-medium,6px)}
217
+ ._jeg7pb1k .pm-table-container>table:after{border-radius:var(--ds-radius-xlarge,9pt)}
218
+ ._jx6opb1k .pm-table-sticky-wrapper>table:after{border-radius:var(--ds-radius-xlarge,9pt)}
219
219
  ._jz731rb6 .pm-table-container>table{border:1px solid var(--ds-background-accent-gray-subtler,#dddee1)}
220
220
  ._jz73okh7 .pm-table-container>table{border:1px solid transparent}
221
221
  ._k4r0q98m .ak-editor-selected-node.unsupportedInlineView-content-wrap>span:nth-of-type(2):after{background:var(--ds-border-selected,#1868db)}
@@ -256,7 +256,7 @@
256
256
  ._s9qz1mok .ProseMirror .pm-table-wrapper>table:hover::-webkit-scrollbar-thumb{border-radius:var(--ds-radius-large,8px)}
257
257
  ._sh9t1mn3 [data-prosemirror-node-name=blockTaskItem] .task-item-checkbox-wrap>input[type=checkbox]+svg{transition:color .2s ease-in-out,fill .2s ease-in-out}
258
258
  ._sqna1mok .blockCardView-content-wrap.ak-editor-selected-node .loader-wrapper>div{border-radius:var(--ds-radius-large,8px)}
259
- ._t6ioidpf .pm-table-sticky-wrapper>table:after{inset:0}
259
+ ._t6ioyvqg .pm-table-sticky-wrapper>table:after{inset:-.5px}
260
260
  ._tvm38r4n [data-prosemirror-node-name=blockTaskItem] .task-item-checkbox-wrap>input[type=checkbox]:checked:focus+svg{border-radius:var(--ds-radius-small,.25rem)}
261
261
  ._txt11rqd .ProseMirror .left-shadow:before{background:linear-gradient(to left,transparent 0,var(--ds-shadow-overflow-spread,#1e1f2129) 140%),linear-gradient(to right,var(--ds-shadow-overflow-perimeter,#1e1f211f) 0,transparent 1px)}
262
262
  ._uufeidpf .resizer-handle-thumb{border:0}
@@ -275,7 +275,7 @@
275
275
  ._ygeohueu .ak-editor-selected-node.unsupportedInlineView-content-wrap>span:nth-of-type(2){border:1px solid var(--ds-border-selected,#1868db)}
276
276
  ._yhgjt94y .ProseMirror hr{border-radius:1px}
277
277
  ._z7qocu6h .ProseMirror .ak-editor-sync-block:hover .ak-editor-sync-block__label{transition:opacity .2s ease-in,visibility .2s ease-in}
278
- ._zdvfidpf .pm-table-wrapper>table:after{inset:0}
278
+ ._zdvfyvqg .pm-table-wrapper>table:after{inset:-.5px}
279
279
  ._zgyzglyw .ProseMirror [data-layout-section].ak-editor-selected-node:not(.danger) [data-layout-column]:after{border:none}
280
280
  ._zh8m12b0 .layout-column-divider-rail{border-radius:var(--ds-radius-small,4px)}
281
281
  ._zjao12b0 .pm-breakout-resize-handle-rail{border-radius:var(--ds-radius-small,4px)}
@@ -650,9 +650,11 @@
650
650
  ._16a71tmw [data-prosemirror-node-name=status]>[data-color=red] .lozenge-text{color:var(--ds-text-danger,#ae2e24)}
651
651
  ._16am1j28 .ProseMirror [data-layout-section].ak-editor-selected-node:not(.danger) [data-layout-column] ::-moz-selection{background-color:transparent}
652
652
  ._16atr4us .ak-editor-selected-node:not(.search-match-block)>.editor-mention-primitive.mention-self{box-shadow:0 0 0 1px var(--ds-border-selected,#1868db)}
653
+ ._16cpusvi .pm-table-sticky-wrapper>table>tbody>tr>td[data-reaches-bottom]{background-clip:border-box}
653
654
  ._16d4idpf .ProseMirror .fabric-editor-indentation-mark:first-of-type:first-child h4:first-child:not(style){margin-top:0}
654
655
  ._16df1txw .ProseMirror [data-layout-section] [data-layout-column][data-valign=middle]>[data-layout-content]{display:flex}
655
656
  ._16e11mi1 .fabric-editor-breakout-mark:has([data-prosemirror-node-name=expand])>.pm-breakout-resize-handle-container--left{left:-25px}
657
+ ._16e3usvi .pm-table-wrapper>table>tbody>tr>td[data-reaches-bottom]{background-clip:border-box}
656
658
  ._16fuidpf .ProseMirror .fabric-editor-indentation-mark:first-of-type:first-child p style:first-child+*{margin-top:0}
657
659
  ._16fx73ad .ProseMirror [data-layout-section]{cursor:default}
658
660
  ._16fxtlke .ProseMirror [data-layout-section]{cursor:pointer}
@@ -736,6 +738,7 @@
736
738
  ._187pidpf .ProseMirror .ProseMirror-gapcursor:first-of-type+span+pre{margin-top:0}
737
739
  ._1890oqnp .multiBodiedExtensionView-content-wrap{margin-top:.75rem}
738
740
  ._18ab1hou [data-prosemirror-node-name=taskItem] .task-item-checkbox-wrap>input[type=checkbox]:disabled:checked+svg{--checkbox-tick-color:var(--local-tick-disabled)}
741
+ ._18bhusvi .pm-table-sticky-wrapper>table>tbody>tr>th[data-reaches-bottom]{background-clip:border-box}
739
742
  ._18bz1tsb .ProseMirror .ak-editor-bodied-sync-block.user-is-dragging{box-shadow:0 0 0 1px var(--ds-border,#0b120e24)}
740
743
  ._18cr199y [data-prosemirror-node-name=blockTaskItem] .task-item-checkbox-wrap>input[type=checkbox]:hover+svg{--checkbox-border-color:var(--local-border-hover)}
741
744
  ._18cwckbl .ProseMirror .ak-editor-panel{min-width:3pc}
@@ -939,6 +942,7 @@
939
942
  ._1cq5glyw [data-prosemirror-node-name=taskItem] [data-component=placeholder]{display:none}
940
943
  ._1cq71hrf .ProseMirror .rich-media-item.image-wrap-right+.rich-media-item.image-wrap-left{clear:both}
941
944
  ._1cr2idpf .ProseMirror .ak-editor-annotation-hover:has([data-inline-card]){padding-left:0}
945
+ ._1crdusvi .pm-table-container>table>tbody>tr>th[data-reaches-top]{background-clip:border-box}
942
946
  ._1crlidpf .blockCardView-content-wrap{margin-right:0}
943
947
  ._1crm1txw .pm-breakout-resize-handle-rail{display:flex}
944
948
  ._1crwidpf [data-prosemirror-node-name=taskItem] [data-component=content]{margin-top:0}
@@ -1582,6 +1586,7 @@
1582
1586
  ._1qxuysee .pm-table-wrapper>table th{background-color:var(--ds-background-accent-gray-subtlest,#f0f1f2)}
1583
1587
  ._1qypglyw [layout=wrap-right]+.ProseMirror-gapcursor+[layout=wrap-left]{clear:none}
1584
1588
  ._1qyx1kdv .multiBodiedExtensionView-content-wrap:not(.danger).ak-editor-selected-node>span>.multiBodiedExtension--container{-webkit-user-select:text}
1589
+ ._1qzuusvi .pm-table-wrapper>table>tbody>tr>td[data-reaches-top]{background-clip:border-box}
1585
1590
  ._1r0kstnw .ProseMirror .code-block .code-block--start{position:absolute}
1586
1591
  ._1r2pidpf .ProseMirror .ak-editor-selected-node .emoji-common-emoji-sprite:before{top:0}
1587
1592
  ._1r3dhteq [data-prosemirror-node-name=blockTaskItem] .task-item-checkbox-wrap>input[type=checkbox]+svg rect:first-of-type{stroke:var(--checkbox-border-color)}
@@ -1704,6 +1709,7 @@
1704
1709
  ._1tvap1qy .ProseMirror h5>.mediaInlineView-content-wrap>.media-inline-image-wrapper{transform:translateY(-2px)}
1705
1710
  ._1twbidpf .ak-editor-panel.ak-editor-selected-node:not(.danger):before{left:0}
1706
1711
  ._1tx5r4us .inlineCardView-content-wrap.ak-editor-selected-node:not(.search-match-block):not(.danger) .loader-wrapper>a{box-shadow:0 0 0 1px var(--ds-border-selected,#1868db)}
1712
+ ._1tytusvi .pm-table-container>table>tbody>tr>td[data-reaches-bottom]{background-clip:border-box}
1707
1713
  ._1tz91ial .ProseMirror .layoutSectionView-content-wrap.ak-editor-selected-node:not(.danger) [data-layout-column]:before{z-index:12}
1708
1714
  ._1tzc1b66 [data-prosemirror-node-name=status] .lozenge-wrapper{padding-inline-start:var(--ds-space-050,4px)}
1709
1715
  ._1tzri7uo .ProseMirror h1{color:var(--ds-text,#292a2e)}
@@ -2142,6 +2148,7 @@
2142
2148
  ._6eqhi8nm [data-prosemirror-node-name=status] .lozenge-wrapper{background-color:var(--ds-background-neutral,#0515240f)}
2143
2149
  ._6f0lidpf .ProseMirror .ak-editor-annotation-focus{padding-left:0}
2144
2150
  ._6ggl1j28 .pm-table-sticky-wrapper>table{border-left-color:transparent}
2151
+ ._6glausvi .pm-table-wrapper>table>tbody>tr>th[data-reaches-bottom]{background-clip:border-box}
2145
2152
  ._6itxidpf .ProseMirror>.ak-editor-panel:first-child{margin-top:0}
2146
2153
  ._6jbkgrf3 .ProseMirror li:has(>ol:only-child){margin-bottom:0!important}
2147
2154
  ._6jk61j28 .ak-editor-selected-node.unsupportedInlineView-content-wrap>span:nth-of-type(2) ::-moz-selection{background-color:transparent}
@@ -2635,6 +2642,7 @@
2635
2642
  ._gpptagmp .ProseMirror .ak-editor-selected-node .ak-editor-sync-block__renderer span[data-emoji-id]{box-shadow:none!important}
2636
2643
  ._gptrh2mm ol[data-node-type=decisionList].ak-editor-selected-node{position:relative}
2637
2644
  ._grya7wq0 .ProseMirror [data-layout-section].ak-editor-selected-node:not(.danger) [data-layout-column]:before{background-color:var(--ds-blanket-selected,#388bff14)}
2645
+ ._gs0pusvi .pm-table-sticky-wrapper>table>tbody>tr>th[data-reaches-top]{background-clip:border-box}
2638
2646
  ._gsu5idpf [data-prosemirror-node-name=decisionItem]>[data-decision-wrapper]>[data-component=content]{margin-top:0}
2639
2647
  ._gt3aidpf .ProseMirror [data-layout-section] [data-layout-column]>div>.ProseMirror-gapcursor.-right:first-child+.mediaSingleView-content-wrap .rich-media-item{margin-top:0}
2640
2648
  ._gt60idpf .bodiedExtensionView-content-wrap .extension-container .bodiedExtension-content-inner-wrapper{margin-right:0}
@@ -2726,6 +2734,7 @@
2726
2734
  ._im81mz2b [data-prosemirror-node-name=taskItem] .task-item-checkbox-wrap>input[type=checkbox]:disabled:hover+svg{--checkbox-background-color:var(--local-background-disabled)}
2727
2735
  ._imlv15ya .ProseMirror .media-extended-resize-experience[layout^=wrap-]{overflow-y:visible!important}
2728
2736
  ._imnz1j28 .ProseMirror :is(p,h1,h2,h3,h4,h5,h6):not(:is(ul,ol,div[data-node-type=actionList]) :is(p,h1,h2,h3,h4,h5,h6)).ak-editor-selected-node:not(.ak-editor-selected-node *)::selection{background-color:transparent}
2737
+ ._impmusvi .pm-table-container>table>tbody>tr>th[data-reaches-bottom]{background-clip:border-box}
2729
2738
  ._iola16y8 [data-prosemirror-node-name=embedCard].show-diff-deleted-node-traditional{text-decoration-color:var(--ds-border-accent-red,#e2483d)}
2730
2739
  ._iola1r31 [data-prosemirror-node-name=embedCard].show-diff-deleted-node-traditional{text-decoration-color:currentColor}
2731
2740
  ._ip0144v4 .ProseMirror .code-block .code-block-content-wrapper{background-size:var(--ds-space-300,24px) 100%,var(--ds-space-300,24px) 100%,var(--ds-space-100,8px) 100%,var(--ds-space-100,8px) 100%,var(--ds-space-100,8px) 100%,1px 100%,var(--ds-space-100,8px) 100%,1px 100%}
@@ -3036,6 +3045,7 @@
3036
3045
  ._ozidmk5s .ProseMirror :is(p,h1,h2,h3,h4,h5,h6):not(:is(ul,ol,div[data-node-type=actionList]) :is(p,h1,h2,h3,h4,h5,h6)).ak-editor-selected-node:not(.ak-editor-selected-node *){box-shadow:0 -4px 0 var(--ds-background-accent-blue-subtler,#cfe1fd),0 4px 0 var(--ds-background-accent-blue-subtler,#cfe1fd)}
3037
3046
  ._p0351j28 .ak-editor-selected-node>[data-decision-wrapper]::-moz-selection{background-color:transparent}
3038
3047
  ._p31f1hrf .ProseMirror-gapcursor+[layout=wrap-left]+span+[layout=wrap-right]:after{clear:both}
3048
+ ._p3f1usvi .pm-table-sticky-wrapper>table>tbody>tr>td[data-reaches-top]{background-clip:border-box}
3039
3049
  ._p3gngrf3 .ProseMirror .ak-editor-panel__content>.code-block:first-child{margin-top:0!important}
3040
3050
  ._p3lu1txw .richMedia-resize-handle-left{display:flex}
3041
3051
  ._p3p6usvi .gridLine{box-sizing:border-box}
@@ -3096,6 +3106,7 @@
3096
3106
  ._q353idpf .ProseMirror .ak-editor-annotation-draft:has([data-inline-card]){padding-left:0}
3097
3107
  ._q381n7od table .resizer-hover-zone.resizer-is-extended{padding-right:unset}
3098
3108
  ._q3zpv9ra .search-match-block.ak-editor-sync-block{background-color:var(--ds-background-accent-magenta-subtler,#fdd0ec)}
3109
+ ._q44kusvi .pm-table-container>table>tbody>tr>td[data-reaches-top]{background-clip:border-box}
3099
3110
  ._q4ju1ule .ProseMirror blockquote>.mediaSingleView-content-wrap:last-child{display:block}
3100
3111
  ._q5x9b3bt .ak-editor-selected-node>[data-decision-wrapper]:before{content:""}
3101
3112
  ._q7vcidpf .ProseMirror .telepointer:hover .telepointer-initial{opacity:0}
@@ -3472,6 +3483,7 @@
3472
3483
  ._xyed1kw7 .ProseMirror .ak-editor-panel[data-panel-type=warning]{color:inherit}
3473
3484
  ._xypuidpf .ProseMirror .layout-section-container [data-layout-section]>[data-layout-column]{margin-top:0}
3474
3485
  ._xznn1911 [data-prosemirror-node-name=blockquote].show-diff-deleted-node-traditional{text-decoration-line:line-through}
3486
+ ._xzq6usvi .pm-table-wrapper>table>tbody>tr>th[data-reaches-top]{background-clip:border-box}
3475
3487
  ._y1fl1ssb .ProseMirror .ProseMirror-gapcursor span[layout=full-width]{margin-left:50%}
3476
3488
  ._y41iglyw [layout=wrap-right]+.ProseMirror-gapcursor+span+[layout=wrap-left]{clear:none}
3477
3489
  ._y41ln7od table .resizer-hover-zone.resizer-is-extended{left:unset}
package/dist/es2019/ui/EditorContentContainer/EditorContentContainer-compiled.js CHANGED
@@ -360,7 +360,7 @@ const editorContentStyles = {
360
360
  tableLayoutFixesWithFontSize: "_1f5xidpf _156tidpf _f30jidpf _jr291hrf",
361
361
  tableSharedStyle: "_ad1u99ee _9d0e7qp0 _1mml7qp0 _1u4a1ule _1w721ule _1gr6t94y _ihzat94y _zi6e1vmz _1uln1vmz _wqm3stnw _1o0wstnw _1aho1ejb _uqg71ejb _g971h2mm _fzt6usvi _1nd8idpf _5cdi6z83 _kc8l11ss _9vqg11ss _dbl6pzf8 _4e711hrf _1hy1bokp _1bxo1ea5 _10kw1rb6 _1u451rb6 _1gep1rb6 _14oi1rb6 _3yki1rb6 _185t1rb6 _13heu2gc _1uj1u2gc _1ssuu2gc _lqdju2gc _1waku2gc _1nzzu2gc _7xl8ckbl _1jykckbl _1m6qckbl _sellckbl _11t9ckbl _866vckbl _1dlzi7a9 _irzhi7a9 _15t1i7a9 _1ivxi7a9 _16k4i7a9 _1vo6i7a9 _q0zvjp4b _1junjp4b _ixm7jp4b _17dpjp4b _dzhmjp4b _15pyjp4b _dj9oidpf _8zz2idpf _1hwbidpf _1lxyidpf _yqeuidpf _mzo1idpf _9ex2idpf _1805idpf _1iphidpf _qkm8idpf _17v9idpf _4p8kidpf _6o4midpf _1edridpf _5908idpf _1d63idpf _1j36idpf _hlqnidpf _gw0eutpp _1n42utpp _762vutpp _g62yutpp _1y9hutpp _bjiqutpp _5dtjutpp _dclrutpp _1j94utpp _5o16utpp _946yutpp _1kffutpp _13bnglyw _1ekgglyw _nvt3glyw _v91rcfaq _byukcfaq _4oczcfaq _3aim1n9t _xsax1n9t _1hz91n9t _vqlp1x4e _1a0i1x4e _m5f81x4e _12j81osq _135a1osq _vkob1osq _dujf1wug _jr3h1wug _1ei91wug _kq5rusvi _31x2usvi _pavrusvi _14jm1ntv _1rfm1ntv _100i1ntv _1ciasm61 _5gm1sm61 _t176sm61 _1az4vuon _1mdwvuon _9l08vuon _vrwbysee _nwuhysee _1qxuysee _go9a1e5h _ktc91e5h _lr001e5h _komfhp5a _1lj5hp5a _96m3hp5a _s2681tsb _15bz1tsb _1skp1tsb _iley2lzm _ay9u2lzm _8zqr2lzm _qxl3i8nm _3gtki8nm _1nu9i8nm _lezgi8nm _1574i8nm _1yd8i8nm _ywut18tx _cee918tx _17h918tx _1esgtoke _1q0atoke _4waqtoke _1syri8nm _pvtri8nm _12jli8nm",
362
362
  tableSharedStyleBackgroundClipFix: "_m6yo1u8q _19il1u8q _10gj1u8q _tbd61u8q _12ly1u8q _1l071u8q",
363
- tableSharedStyle_with_platform_editor_table_q4_loveability: "_1u4aglyw _1w72glyw _jz73okh7 _13axokh7 _b7zlokh7 _1m4qidpf _t6ioidpf _zdvfidpf _fvpu1rb6 _119m1rb6 _1bew1rb6 _jeg71qi0 _jx6o1qi0 _1i8r1qi0 _frzgb3bt _18cxb3bt _jibgb3bt _1rxpstnw _1aqsstnw _1aazstnw _12gbglyw _1pj5glyw _1trrglyw _14ndkb7n _13qpkb7n _1ubpkb7n _1uhsh2mm _dpkjh2mm _1fpbh2mm _rvx71j28 _tq001j28 _1ioi1j28 _91c11j28 _1owd1j28 _sml91j28 _1yvx1j28 _s4v61j28 _1tfl1j28 _1jhh1j28 _1s681j28 _s7al1j28 _jiyw1j28 _13201j28 _l6531j28 _14t11j28 _1l1u1j28 _w4h41j28 _rwnl1j28 _195x1j28 _2cbt1j28 _1u9gidpf _b9lsidpf _qh1aidpf _fgk3idpf _18kg1j28 _z0011j28",
363
+ tableSharedStyle_with_platform_editor_table_q4_loveability: "_1u4aglyw _1w72glyw _jz73okh7 _13axokh7 _b7zlokh7 _1m4qyvqg _t6ioyvqg _zdvfyvqg _fvpu1rb6 _119m1rb6 _1bew1rb6 _jeg7pb1k _jx6opb1k _1i8rpb1k _frzgb3bt _18cxb3bt _jibgb3bt _1rxpstnw _1aqsstnw _1aazstnw _12gbglyw _1pj5glyw _1trrglyw _14ndkb7n _13qpkb7n _1ubpkb7n _1uhsh2mm _dpkjh2mm _1fpbh2mm _rvx71j28 _tq001j28 _1ioi1j28 _91c11j28 _1owd1j28 _sml91j28 _1yvx1j28 _s4v61j28 _1tfl1j28 _1jhh1j28 _1s681j28 _s7al1j28 _jiyw1j28 _13201j28 _l6531j28 _14t11j28 _1l1u1j28 _w4h41j28 _rwnl1j28 _195x1j28 _2cbt1j28 _1tytusvi _q44kusvi _impmusvi _1crdusvi _16cpusvi _p3f1usvi _18bhusvi _gs0pusvi _16e3usvi _1qzuusvi _6glausvi _xzq6usvi _1u9gidpf _b9lsidpf _qh1aidpf _fgk3idpf _18kg1j28 _z0011j28",
364
364
  tableSharedStyle_without_platform_editor_table_q4_loveability: "_9d0e7qp0 _1mml7qp0 _1u4a1ule _1w721ule _1gr6t94y _ihzat94y _zi6e1vmz _1uln1vmz _wqm3stnw _1o0wstnw _1aho1ejb _uqg71ejb _1j1lidpf _e364idpf _7vb2pzf8 _jz731rb6 _13ax1rb6 _b7zl1rb6 _17xf1j28 _6ggl1j28 _wxs41j28 _1h3k1j28 _1e811j28 _w9wp1j28",
365
365
  tableSharedStyle_with_platform_editor_table_menu_updates: "_n7o2nkob _a8zqnkob _wf2knkob _1hy4nkob _iy21nkob _dvccnkob _1fltyfq0 _14bcyfq0 _t9jryfq0 _13e6yfq0 _103nyfq0 _1ho1yfq0",
366
366
  tableSharedStyle_with_platform_editor_bordered_panel_nested_in_table: "_14kce4h9 _6bj4nqa1 _1fyn1l7x",
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.4.0";
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/ui/EditorContentContainer/EditorContentContainer-compiled.compiled.css CHANGED
@@ -58,7 +58,7 @@
58
58
  ._1h9lmihd .ProseMirror .ak-editor-sync-block.creation-loading{transition:box-shadow .2s ease-in}
59
59
  ._1hte8kn1 .danger .inlineCardView-content-wrap>span>a{transition:background-color 0s}
60
60
  ._1i421gfe .ProseMirror h4{font:var(--editor-font-ugc-token-heading-h4)}
61
- ._1i8r1qi0 .pm-table-wrapper>table:after{border-radius:var(--ds-radius-medium,6px)}
61
+ ._1i8rpb1k .pm-table-wrapper>table:after{border-radius:var(--ds-radius-xlarge,9pt)}
62
62
  ._1iac12b0 .show-diff-deleted-node .media-card-wrapper>div{border-radius:var(--ds-radius-small,4px)}
63
63
  ._1j2jidpf .bodiedExtensionView-content-wrap .extension-container .bodiedExtension-content-inner-wrapper{border-radius:0}
64
64
  ._1j2m12b0 .ProseMirror [data-layout-section].selected.danger [data-layout-section]{border-radius:var(--ds-radius-small,4px)}
@@ -67,7 +67,7 @@
67
67
  ._1khk1mok:hover::-webkit-scrollbar-thumb{border-radius:var(--ds-radius-large,8px)}
68
68
  ._1kk7l6jh [data-prosemirror-node-name=decisionItem]>[data-decision-wrapper]>[data-component=icon]{margin:var(--ds-space-050,4px) var(--ds-space-150,9pt) 0 0}
69
69
  ._1l4zlb4i .fabric-background-color-mark{border-radius:var(--ds-radius-xsmall,2px)}
70
- ._1m4qidpf .pm-table-container>table:after{inset:0}
70
+ ._1m4qyvqg .pm-table-container>table:after{inset:-.5px}
71
71
  ._1mc7glyw .ak-editor-selected-node.unsupportedInlineView-content-wrap>span:nth-of-type(2):after{border:none}
72
72
  ._1mml7qp0 .pm-table-container .pm-table-right-border{background:var(--ds-background-accent-gray-subtler,#dddee1)}
73
73
  ._1mx211so [data-prosemirror-node-name=taskItem] .task-item-checkbox-wrap>input[type=checkbox]+svg rect:first-of-type{transition:stroke .2s ease-in-out}
@@ -214,8 +214,8 @@
214
214
  ._j159j0fz .ProseMirror [data-layout-section].selected [data-layout-column]{border:1px solid var(--ds-border,#0b120e24)}
215
215
  ._j6cmidpf .ProseMirror [data-layout-section]:hover [data-layout-column]{border:0}
216
216
  ._j6cmj0fz .ProseMirror [data-layout-section]:hover [data-layout-column]{border:1px solid var(--ds-border,#0b120e24)}
217
- ._jeg71qi0 .pm-table-container>table:after{border-radius:var(--ds-radius-medium,6px)}
218
- ._jx6o1qi0 .pm-table-sticky-wrapper>table:after{border-radius:var(--ds-radius-medium,6px)}
217
+ ._jeg7pb1k .pm-table-container>table:after{border-radius:var(--ds-radius-xlarge,9pt)}
218
+ ._jx6opb1k .pm-table-sticky-wrapper>table:after{border-radius:var(--ds-radius-xlarge,9pt)}
219
219
  ._jz731rb6 .pm-table-container>table{border:1px solid var(--ds-background-accent-gray-subtler,#dddee1)}
220
220
  ._jz73okh7 .pm-table-container>table{border:1px solid transparent}
221
221
  ._k4r0q98m .ak-editor-selected-node.unsupportedInlineView-content-wrap>span:nth-of-type(2):after{background:var(--ds-border-selected,#1868db)}
@@ -256,7 +256,7 @@
256
256
  ._s9qz1mok .ProseMirror .pm-table-wrapper>table:hover::-webkit-scrollbar-thumb{border-radius:var(--ds-radius-large,8px)}
257
257
  ._sh9t1mn3 [data-prosemirror-node-name=blockTaskItem] .task-item-checkbox-wrap>input[type=checkbox]+svg{transition:color .2s ease-in-out,fill .2s ease-in-out}
258
258
  ._sqna1mok .blockCardView-content-wrap.ak-editor-selected-node .loader-wrapper>div{border-radius:var(--ds-radius-large,8px)}
259
- ._t6ioidpf .pm-table-sticky-wrapper>table:after{inset:0}
259
+ ._t6ioyvqg .pm-table-sticky-wrapper>table:after{inset:-.5px}
260
260
  ._tvm38r4n [data-prosemirror-node-name=blockTaskItem] .task-item-checkbox-wrap>input[type=checkbox]:checked:focus+svg{border-radius:var(--ds-radius-small,.25rem)}
261
261
  ._txt11rqd .ProseMirror .left-shadow:before{background:linear-gradient(to left,transparent 0,var(--ds-shadow-overflow-spread,#1e1f2129) 140%),linear-gradient(to right,var(--ds-shadow-overflow-perimeter,#1e1f211f) 0,transparent 1px)}
262
262
  ._uufeidpf .resizer-handle-thumb{border:0}
@@ -275,7 +275,7 @@
275
275
  ._ygeohueu .ak-editor-selected-node.unsupportedInlineView-content-wrap>span:nth-of-type(2){border:1px solid var(--ds-border-selected,#1868db)}
276
276
  ._yhgjt94y .ProseMirror hr{border-radius:1px}
277
277
  ._z7qocu6h .ProseMirror .ak-editor-sync-block:hover .ak-editor-sync-block__label{transition:opacity .2s ease-in,visibility .2s ease-in}
278
- ._zdvfidpf .pm-table-wrapper>table:after{inset:0}
278
+ ._zdvfyvqg .pm-table-wrapper>table:after{inset:-.5px}
279
279
  ._zgyzglyw .ProseMirror [data-layout-section].ak-editor-selected-node:not(.danger) [data-layout-column]:after{border:none}
280
280
  ._zh8m12b0 .layout-column-divider-rail{border-radius:var(--ds-radius-small,4px)}
281
281
  ._zjao12b0 .pm-breakout-resize-handle-rail{border-radius:var(--ds-radius-small,4px)}
@@ -650,9 +650,11 @@
650
650
  ._16a71tmw [data-prosemirror-node-name=status]>[data-color=red] .lozenge-text{color:var(--ds-text-danger,#ae2e24)}
651
651
  ._16am1j28 .ProseMirror [data-layout-section].ak-editor-selected-node:not(.danger) [data-layout-column] ::-moz-selection{background-color:transparent}
652
652
  ._16atr4us .ak-editor-selected-node:not(.search-match-block)>.editor-mention-primitive.mention-self{box-shadow:0 0 0 1px var(--ds-border-selected,#1868db)}
653
+ ._16cpusvi .pm-table-sticky-wrapper>table>tbody>tr>td[data-reaches-bottom]{background-clip:border-box}
653
654
  ._16d4idpf .ProseMirror .fabric-editor-indentation-mark:first-of-type:first-child h4:first-child:not(style){margin-top:0}
654
655
  ._16df1txw .ProseMirror [data-layout-section] [data-layout-column][data-valign=middle]>[data-layout-content]{display:flex}
655
656
  ._16e11mi1 .fabric-editor-breakout-mark:has([data-prosemirror-node-name=expand])>.pm-breakout-resize-handle-container--left{left:-25px}
657
+ ._16e3usvi .pm-table-wrapper>table>tbody>tr>td[data-reaches-bottom]{background-clip:border-box}
656
658
  ._16fuidpf .ProseMirror .fabric-editor-indentation-mark:first-of-type:first-child p style:first-child+*{margin-top:0}
657
659
  ._16fx73ad .ProseMirror [data-layout-section]{cursor:default}
658
660
  ._16fxtlke .ProseMirror [data-layout-section]{cursor:pointer}
@@ -736,6 +738,7 @@
736
738
  ._187pidpf .ProseMirror .ProseMirror-gapcursor:first-of-type+span+pre{margin-top:0}
737
739
  ._1890oqnp .multiBodiedExtensionView-content-wrap{margin-top:.75rem}
738
740
  ._18ab1hou [data-prosemirror-node-name=taskItem] .task-item-checkbox-wrap>input[type=checkbox]:disabled:checked+svg{--checkbox-tick-color:var(--local-tick-disabled)}
741
+ ._18bhusvi .pm-table-sticky-wrapper>table>tbody>tr>th[data-reaches-bottom]{background-clip:border-box}
739
742
  ._18bz1tsb .ProseMirror .ak-editor-bodied-sync-block.user-is-dragging{box-shadow:0 0 0 1px var(--ds-border,#0b120e24)}
740
743
  ._18cr199y [data-prosemirror-node-name=blockTaskItem] .task-item-checkbox-wrap>input[type=checkbox]:hover+svg{--checkbox-border-color:var(--local-border-hover)}
741
744
  ._18cwckbl .ProseMirror .ak-editor-panel{min-width:3pc}
@@ -939,6 +942,7 @@
939
942
  ._1cq5glyw [data-prosemirror-node-name=taskItem] [data-component=placeholder]{display:none}
940
943
  ._1cq71hrf .ProseMirror .rich-media-item.image-wrap-right+.rich-media-item.image-wrap-left{clear:both}
941
944
  ._1cr2idpf .ProseMirror .ak-editor-annotation-hover:has([data-inline-card]){padding-left:0}
945
+ ._1crdusvi .pm-table-container>table>tbody>tr>th[data-reaches-top]{background-clip:border-box}
942
946
  ._1crlidpf .blockCardView-content-wrap{margin-right:0}
943
947
  ._1crm1txw .pm-breakout-resize-handle-rail{display:flex}
944
948
  ._1crwidpf [data-prosemirror-node-name=taskItem] [data-component=content]{margin-top:0}
@@ -1582,6 +1586,7 @@
1582
1586
  ._1qxuysee .pm-table-wrapper>table th{background-color:var(--ds-background-accent-gray-subtlest,#f0f1f2)}
1583
1587
  ._1qypglyw [layout=wrap-right]+.ProseMirror-gapcursor+[layout=wrap-left]{clear:none}
1584
1588
  ._1qyx1kdv .multiBodiedExtensionView-content-wrap:not(.danger).ak-editor-selected-node>span>.multiBodiedExtension--container{-webkit-user-select:text}
1589
+ ._1qzuusvi .pm-table-wrapper>table>tbody>tr>td[data-reaches-top]{background-clip:border-box}
1585
1590
  ._1r0kstnw .ProseMirror .code-block .code-block--start{position:absolute}
1586
1591
  ._1r2pidpf .ProseMirror .ak-editor-selected-node .emoji-common-emoji-sprite:before{top:0}
1587
1592
  ._1r3dhteq [data-prosemirror-node-name=blockTaskItem] .task-item-checkbox-wrap>input[type=checkbox]+svg rect:first-of-type{stroke:var(--checkbox-border-color)}
@@ -1704,6 +1709,7 @@
1704
1709
  ._1tvap1qy .ProseMirror h5>.mediaInlineView-content-wrap>.media-inline-image-wrapper{transform:translateY(-2px)}
1705
1710
  ._1twbidpf .ak-editor-panel.ak-editor-selected-node:not(.danger):before{left:0}
1706
1711
  ._1tx5r4us .inlineCardView-content-wrap.ak-editor-selected-node:not(.search-match-block):not(.danger) .loader-wrapper>a{box-shadow:0 0 0 1px var(--ds-border-selected,#1868db)}
1712
+ ._1tytusvi .pm-table-container>table>tbody>tr>td[data-reaches-bottom]{background-clip:border-box}
1707
1713
  ._1tz91ial .ProseMirror .layoutSectionView-content-wrap.ak-editor-selected-node:not(.danger) [data-layout-column]:before{z-index:12}
1708
1714
  ._1tzc1b66 [data-prosemirror-node-name=status] .lozenge-wrapper{padding-inline-start:var(--ds-space-050,4px)}
1709
1715
  ._1tzri7uo .ProseMirror h1{color:var(--ds-text,#292a2e)}
@@ -2142,6 +2148,7 @@
2142
2148
  ._6eqhi8nm [data-prosemirror-node-name=status] .lozenge-wrapper{background-color:var(--ds-background-neutral,#0515240f)}
2143
2149
  ._6f0lidpf .ProseMirror .ak-editor-annotation-focus{padding-left:0}
2144
2150
  ._6ggl1j28 .pm-table-sticky-wrapper>table{border-left-color:transparent}
2151
+ ._6glausvi .pm-table-wrapper>table>tbody>tr>th[data-reaches-bottom]{background-clip:border-box}
2145
2152
  ._6itxidpf .ProseMirror>.ak-editor-panel:first-child{margin-top:0}
2146
2153
  ._6jbkgrf3 .ProseMirror li:has(>ol:only-child){margin-bottom:0!important}
2147
2154
  ._6jk61j28 .ak-editor-selected-node.unsupportedInlineView-content-wrap>span:nth-of-type(2) ::-moz-selection{background-color:transparent}
@@ -2635,6 +2642,7 @@
2635
2642
  ._gpptagmp .ProseMirror .ak-editor-selected-node .ak-editor-sync-block__renderer span[data-emoji-id]{box-shadow:none!important}
2636
2643
  ._gptrh2mm ol[data-node-type=decisionList].ak-editor-selected-node{position:relative}
2637
2644
  ._grya7wq0 .ProseMirror [data-layout-section].ak-editor-selected-node:not(.danger) [data-layout-column]:before{background-color:var(--ds-blanket-selected,#388bff14)}
2645
+ ._gs0pusvi .pm-table-sticky-wrapper>table>tbody>tr>th[data-reaches-top]{background-clip:border-box}
2638
2646
  ._gsu5idpf [data-prosemirror-node-name=decisionItem]>[data-decision-wrapper]>[data-component=content]{margin-top:0}
2639
2647
  ._gt3aidpf .ProseMirror [data-layout-section] [data-layout-column]>div>.ProseMirror-gapcursor.-right:first-child+.mediaSingleView-content-wrap .rich-media-item{margin-top:0}
2640
2648
  ._gt60idpf .bodiedExtensionView-content-wrap .extension-container .bodiedExtension-content-inner-wrapper{margin-right:0}
@@ -2726,6 +2734,7 @@
2726
2734
  ._im81mz2b [data-prosemirror-node-name=taskItem] .task-item-checkbox-wrap>input[type=checkbox]:disabled:hover+svg{--checkbox-background-color:var(--local-background-disabled)}
2727
2735
  ._imlv15ya .ProseMirror .media-extended-resize-experience[layout^=wrap-]{overflow-y:visible!important}
2728
2736
  ._imnz1j28 .ProseMirror :is(p,h1,h2,h3,h4,h5,h6):not(:is(ul,ol,div[data-node-type=actionList]) :is(p,h1,h2,h3,h4,h5,h6)).ak-editor-selected-node:not(.ak-editor-selected-node *)::selection{background-color:transparent}
2737
+ ._impmusvi .pm-table-container>table>tbody>tr>th[data-reaches-bottom]{background-clip:border-box}
2729
2738
  ._iola16y8 [data-prosemirror-node-name=embedCard].show-diff-deleted-node-traditional{text-decoration-color:var(--ds-border-accent-red,#e2483d)}
2730
2739
  ._iola1r31 [data-prosemirror-node-name=embedCard].show-diff-deleted-node-traditional{text-decoration-color:currentColor}
2731
2740
  ._ip0144v4 .ProseMirror .code-block .code-block-content-wrapper{background-size:var(--ds-space-300,24px) 100%,var(--ds-space-300,24px) 100%,var(--ds-space-100,8px) 100%,var(--ds-space-100,8px) 100%,var(--ds-space-100,8px) 100%,1px 100%,var(--ds-space-100,8px) 100%,1px 100%}
@@ -3036,6 +3045,7 @@
3036
3045
  ._ozidmk5s .ProseMirror :is(p,h1,h2,h3,h4,h5,h6):not(:is(ul,ol,div[data-node-type=actionList]) :is(p,h1,h2,h3,h4,h5,h6)).ak-editor-selected-node:not(.ak-editor-selected-node *){box-shadow:0 -4px 0 var(--ds-background-accent-blue-subtler,#cfe1fd),0 4px 0 var(--ds-background-accent-blue-subtler,#cfe1fd)}
3037
3046
  ._p0351j28 .ak-editor-selected-node>[data-decision-wrapper]::-moz-selection{background-color:transparent}
3038
3047
  ._p31f1hrf .ProseMirror-gapcursor+[layout=wrap-left]+span+[layout=wrap-right]:after{clear:both}
3048
+ ._p3f1usvi .pm-table-sticky-wrapper>table>tbody>tr>td[data-reaches-top]{background-clip:border-box}
3039
3049
  ._p3gngrf3 .ProseMirror .ak-editor-panel__content>.code-block:first-child{margin-top:0!important}
3040
3050
  ._p3lu1txw .richMedia-resize-handle-left{display:flex}
3041
3051
  ._p3p6usvi .gridLine{box-sizing:border-box}
@@ -3096,6 +3106,7 @@
3096
3106
  ._q353idpf .ProseMirror .ak-editor-annotation-draft:has([data-inline-card]){padding-left:0}
3097
3107
  ._q381n7od table .resizer-hover-zone.resizer-is-extended{padding-right:unset}
3098
3108
  ._q3zpv9ra .search-match-block.ak-editor-sync-block{background-color:var(--ds-background-accent-magenta-subtler,#fdd0ec)}
3109
+ ._q44kusvi .pm-table-container>table>tbody>tr>td[data-reaches-top]{background-clip:border-box}
3099
3110
  ._q4ju1ule .ProseMirror blockquote>.mediaSingleView-content-wrap:last-child{display:block}
3100
3111
  ._q5x9b3bt .ak-editor-selected-node>[data-decision-wrapper]:before{content:""}
3101
3112
  ._q7vcidpf .ProseMirror .telepointer:hover .telepointer-initial{opacity:0}
@@ -3472,6 +3483,7 @@
3472
3483
  ._xyed1kw7 .ProseMirror .ak-editor-panel[data-panel-type=warning]{color:inherit}
3473
3484
  ._xypuidpf .ProseMirror .layout-section-container [data-layout-section]>[data-layout-column]{margin-top:0}
3474
3485
  ._xznn1911 [data-prosemirror-node-name=blockquote].show-diff-deleted-node-traditional{text-decoration-line:line-through}
3486
+ ._xzq6usvi .pm-table-wrapper>table>tbody>tr>th[data-reaches-top]{background-clip:border-box}
3475
3487
  ._y1fl1ssb .ProseMirror .ProseMirror-gapcursor span[layout=full-width]{margin-left:50%}
3476
3488
  ._y41iglyw [layout=wrap-right]+.ProseMirror-gapcursor+span+[layout=wrap-left]{clear:none}
3477
3489
  ._y41ln7od table .resizer-hover-zone.resizer-is-extended{left:unset}
package/dist/esm/ui/EditorContentContainer/EditorContentContainer-compiled.js CHANGED
@@ -307,7 +307,7 @@ var editorContentStyles = {
307
307
  tableLayoutFixesWithFontSize: "_1f5xidpf _156tidpf _f30jidpf _jr291hrf",
308
308
  tableSharedStyle: "_ad1u99ee _9d0e7qp0 _1mml7qp0 _1u4a1ule _1w721ule _1gr6t94y _ihzat94y _zi6e1vmz _1uln1vmz _wqm3stnw _1o0wstnw _1aho1ejb _uqg71ejb _g971h2mm _fzt6usvi _1nd8idpf _5cdi6z83 _kc8l11ss _9vqg11ss _dbl6pzf8 _4e711hrf _1hy1bokp _1bxo1ea5 _10kw1rb6 _1u451rb6 _1gep1rb6 _14oi1rb6 _3yki1rb6 _185t1rb6 _13heu2gc _1uj1u2gc _1ssuu2gc _lqdju2gc _1waku2gc _1nzzu2gc _7xl8ckbl _1jykckbl _1m6qckbl _sellckbl _11t9ckbl _866vckbl _1dlzi7a9 _irzhi7a9 _15t1i7a9 _1ivxi7a9 _16k4i7a9 _1vo6i7a9 _q0zvjp4b _1junjp4b _ixm7jp4b _17dpjp4b _dzhmjp4b _15pyjp4b _dj9oidpf _8zz2idpf _1hwbidpf _1lxyidpf _yqeuidpf _mzo1idpf _9ex2idpf _1805idpf _1iphidpf _qkm8idpf _17v9idpf _4p8kidpf _6o4midpf _1edridpf _5908idpf _1d63idpf _1j36idpf _hlqnidpf _gw0eutpp _1n42utpp _762vutpp _g62yutpp _1y9hutpp _bjiqutpp _5dtjutpp _dclrutpp _1j94utpp _5o16utpp _946yutpp _1kffutpp _13bnglyw _1ekgglyw _nvt3glyw _v91rcfaq _byukcfaq _4oczcfaq _3aim1n9t _xsax1n9t _1hz91n9t _vqlp1x4e _1a0i1x4e _m5f81x4e _12j81osq _135a1osq _vkob1osq _dujf1wug _jr3h1wug _1ei91wug _kq5rusvi _31x2usvi _pavrusvi _14jm1ntv _1rfm1ntv _100i1ntv _1ciasm61 _5gm1sm61 _t176sm61 _1az4vuon _1mdwvuon _9l08vuon _vrwbysee _nwuhysee _1qxuysee _go9a1e5h _ktc91e5h _lr001e5h _komfhp5a _1lj5hp5a _96m3hp5a _s2681tsb _15bz1tsb _1skp1tsb _iley2lzm _ay9u2lzm _8zqr2lzm _qxl3i8nm _3gtki8nm _1nu9i8nm _lezgi8nm _1574i8nm _1yd8i8nm _ywut18tx _cee918tx _17h918tx _1esgtoke _1q0atoke _4waqtoke _1syri8nm _pvtri8nm _12jli8nm",
309
309
  tableSharedStyleBackgroundClipFix: "_m6yo1u8q _19il1u8q _10gj1u8q _tbd61u8q _12ly1u8q _1l071u8q",
310
- tableSharedStyle_with_platform_editor_table_q4_loveability: "_1u4aglyw _1w72glyw _jz73okh7 _13axokh7 _b7zlokh7 _1m4qidpf _t6ioidpf _zdvfidpf _fvpu1rb6 _119m1rb6 _1bew1rb6 _jeg71qi0 _jx6o1qi0 _1i8r1qi0 _frzgb3bt _18cxb3bt _jibgb3bt _1rxpstnw _1aqsstnw _1aazstnw _12gbglyw _1pj5glyw _1trrglyw _14ndkb7n _13qpkb7n _1ubpkb7n _1uhsh2mm _dpkjh2mm _1fpbh2mm _rvx71j28 _tq001j28 _1ioi1j28 _91c11j28 _1owd1j28 _sml91j28 _1yvx1j28 _s4v61j28 _1tfl1j28 _1jhh1j28 _1s681j28 _s7al1j28 _jiyw1j28 _13201j28 _l6531j28 _14t11j28 _1l1u1j28 _w4h41j28 _rwnl1j28 _195x1j28 _2cbt1j28 _1u9gidpf _b9lsidpf _qh1aidpf _fgk3idpf _18kg1j28 _z0011j28",
310
+ tableSharedStyle_with_platform_editor_table_q4_loveability: "_1u4aglyw _1w72glyw _jz73okh7 _13axokh7 _b7zlokh7 _1m4qyvqg _t6ioyvqg _zdvfyvqg _fvpu1rb6 _119m1rb6 _1bew1rb6 _jeg7pb1k _jx6opb1k _1i8rpb1k _frzgb3bt _18cxb3bt _jibgb3bt _1rxpstnw _1aqsstnw _1aazstnw _12gbglyw _1pj5glyw _1trrglyw _14ndkb7n _13qpkb7n _1ubpkb7n _1uhsh2mm _dpkjh2mm _1fpbh2mm _rvx71j28 _tq001j28 _1ioi1j28 _91c11j28 _1owd1j28 _sml91j28 _1yvx1j28 _s4v61j28 _1tfl1j28 _1jhh1j28 _1s681j28 _s7al1j28 _jiyw1j28 _13201j28 _l6531j28 _14t11j28 _1l1u1j28 _w4h41j28 _rwnl1j28 _195x1j28 _2cbt1j28 _1tytusvi _q44kusvi _impmusvi _1crdusvi _16cpusvi _p3f1usvi _18bhusvi _gs0pusvi _16e3usvi _1qzuusvi _6glausvi _xzq6usvi _1u9gidpf _b9lsidpf _qh1aidpf _fgk3idpf _18kg1j28 _z0011j28",
311
311
  tableSharedStyle_without_platform_editor_table_q4_loveability: "_9d0e7qp0 _1mml7qp0 _1u4a1ule _1w721ule _1gr6t94y _ihzat94y _zi6e1vmz _1uln1vmz _wqm3stnw _1o0wstnw _1aho1ejb _uqg71ejb _1j1lidpf _e364idpf _7vb2pzf8 _jz731rb6 _13ax1rb6 _b7zl1rb6 _17xf1j28 _6ggl1j28 _wxs41j28 _1h3k1j28 _1e811j28 _w9wp1j28",
312
312
  tableSharedStyle_with_platform_editor_table_menu_updates: "_n7o2nkob _a8zqnkob _wf2knkob _1hy4nkob _iy21nkob _dvccnkob _1fltyfq0 _14bcyfq0 _t9jryfq0 _13e6yfq0 _103nyfq0 _1ho1yfq0",
313
313
  tableSharedStyle_with_platform_editor_bordered_panel_nested_in_table: "_14kce4h9 _6bj4nqa1 _1fyn1l7x",
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.4.0";
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.1",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -74,8 +74,8 @@
74
74
  "@atlaskit/platform-feature-flags-react": "^0.5.0",
75
75
  "@atlaskit/react-ufo": "^6.7.0",
76
76
  "@atlaskit/task-decision": "^20.2.0",
77
- "@atlaskit/tmp-editor-statsig": "^99.0.0",
78
- "@atlaskit/tokens": "^13.3.0",
77
+ "@atlaskit/tmp-editor-statsig": "^100.0.0",
78
+ "@atlaskit/tokens": "^13.4.0",
79
79
  "@atlaskit/tooltip": "^22.6.0",
80
80
  "@atlaskit/width-detector": "^5.1.0",
81
81
  "@babel/runtime": "^7.0.0",
@@ -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.15.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",