@atlaskit/editor-core 216.12.2 → 216.12.4

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-core
 
+## 216.12.4
+
+### Patch Changes
+
+- [`8872ed42db4ef`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8872ed42db4ef) -
+  Handle gap cursor caret visibility via CSS selector instead of plugin state
+- [`abf0f1a208ab4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/abf0f1a208ab4) -
+  EDITOR-5441 Update comment editor border raidus
+- Updated dependencies
+
+## 216.12.3
+
+### Patch Changes
+
+- [`85444e8a5672a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/85444e8a5672a) -
+  EDITOR-5526 clean up platform_synced_block_patch_2
+- Updated dependencies
+
 ## 216.12.2
 
 ### Patch Changes

package/dist/cjs/ui/Appearance/Comment/Comment.js

@@ -19,6 +19,7 @@ var _messages = _interopRequireDefault(require("@atlaskit/editor-common/messages
 var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _ClickAreaBlock = _interopRequireDefault(require("../../Addon/ClickAreaBlock"));
 var _contentComponentWrapper = require("../../Addon/ClickAreaBlock/contentComponentWrapper");
 var _EditorContentContainer = _interopRequireDefault(require("../../EditorContentContainer/EditorContentContainer"));
@@ -40,7 +41,9 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 // eslint-disable-next-line import/no-named-as-default
 
 var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
-var commentEditorStyles = (0, _react2.css)({
+
+// Remove when platform_editor_comment_editor_border_radius is cleaned up
+var commentEditorStylesOld = (0, _react2.css)({
   display: 'flex',
   flexDirection: 'column',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
@@ -57,6 +60,22 @@ var commentEditorStyles = (0, _react2.css)({
   maxWidth: 'inherit',
   wordWrap: 'break-word'
 });
+var commentEditorStyles = (0, _react2.css)({
+  display: 'flex',
+  flexDirection: 'column',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '.less-margin > .ProseMirror': {
+    margin: "var(--ds-space-150, 12px)".concat(" ", "var(--ds-space-100, 8px)", " ", "var(--ds-space-100, 8px)")
+  },
+  minWidth: '272px',
+  height: 'auto',
+  backgroundColor: "var(--ds-background-input, white)",
+  border: "var(--ds-border-width, 1px)".concat(" solid ", "var(--ds-border-input, #8C8F97)"),
+  boxSizing: 'border-box',
+  borderRadius: "var(--ds-radius-medium, 6px)",
+  maxWidth: 'inherit',
+  wordWrap: 'break-word'
+});
 var secondaryToolbarStyles = (0, _react2.css)({
   boxSizing: 'border-box',
   justifyContent: 'flex-end',
@@ -178,7 +197,7 @@ var CommentEditorWithIntl = exports.CommentEditorWithIntl = function CommentEdit
   return (0, _react2.jsx)(_WithFlash.default, {
     animate: maxContentSizeReached
   }, (0, _react2.jsx)(_ui.WidthProvider, null, (0, _react2.jsx)("div", {
-    css: [commentEditorStyles,
+    css: [(0, _expValEquals.expValEquals)('platform_editor_comment_editor_border_radius', 'isEnabled', true) ? commentEditorStyles : commentEditorStylesOld,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     (0, _react2.css)({
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766

package/dist/cjs/ui/Appearance/Comment/Toolbar.js

@@ -13,6 +13,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 /**
  * @jsxRuntime classic
@@ -77,6 +78,9 @@ var mainToolbarWrapperStylesVisualRefresh = (0, _react2.css)({
 var mainToolbarWithRadiusStyle = (0, _react2.css)({
   borderRadius: "var(--ds-radius-small, 3px)".concat(" ", "var(--ds-radius-small, 3px)", " 0 0")
 });
+var mainToolbarRadius = (0, _react2.css)({
+  borderRadius: "var(--ds-radius-medium, 6px)".concat(" ", "var(--ds-radius-medium, 6px)", " 0 0")
+});
 var stickyToolbarWrapperStyleNew = (0, _react2.css)({
   position: 'sticky',
   paddingBottom: "var(--ds-space-100, 8px)",
@@ -124,7 +128,7 @@ var FixedToolbar = function FixedToolbar(props) {
   return (
     // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
     (0, _react2.jsx)("div", {
-      css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, (0, _platformFeatureFlags.fg)('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle],
+      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],
       "data-testid": "ak-editor-main-toolbar"
     }, props.children)
   );

package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js

@@ -254,7 +254,9 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _telepointerStyles.telepointerColorAndCommonStyle,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    _gapCursorStyles.gapCursorStyles,
+    _gapCursorStyles.gapCursorStyles, (0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    _gapCursorStyles.gapCursorStylesVisibilityFix,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _panelStyles.panelStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -382,13 +384,13 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _layout.layoutSelectedStylesAdvanced :
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    _layout.layoutSelectedStylesNotAdvanced, (0, _experiments.editorExperiment)('platform_synced_block', true) && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_2') &&
+    _layout.layoutSelectedStylesNotAdvanced, (0, _experiments.editorExperiment)('platform_synced_block', true) &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _layout.layoutSelectedStylesAdvancedFix,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     (0, _experiments.editorExperiment)('advanced_layouts', true) && _layout.layoutColumnResponsiveStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    (0, _experiments.editorExperiment)('advanced_layouts', true) && _layout.layoutResponsiveBaseStyles, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') && ((0, _experiments.editorExperiment)('platform_synced_block', true) && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_2') ?
+    (0, _experiments.editorExperiment)('advanced_layouts', true) && _layout.layoutResponsiveBaseStyles, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') && ((0, _experiments.editorExperiment)('platform_synced_block', true) ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _layout.layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync :
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/cjs/ui/EditorContentContainer/styles/gapCursorStyles.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.hideCaretModifier = exports.gapCursorStyles = void 0;
+exports.hideCaretModifier = exports.gapCursorStylesVisibilityFix = exports.gapCursorStyles = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
@@ -33,6 +33,7 @@ var marginDeepChildrenFixSelector = "\n".concat(wrapLeft, " + ").concat(gapCurso
 var gapCursorStyles = exports.gapCursorStyles = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.ProseMirror': (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, "&.".concat(hideCaretModifier), {
+    // Clean this up with platform_synced_block_patch_4
     caretColor: 'transparent'
   }), gapCursorSelector, (0, _defineProperty2.default)((0, _defineProperty2.default)({
     display: 'none',
@@ -96,4 +97,13 @@ var gapCursorStyles = exports.gapCursorStyles = (0, _react.css)((0, _definePrope
   height: 0
 }), marginDeepChildrenFixSelector, {
   marginTop: 0
-}));
+}));
+
+// Hide native caret when gap cursor widget is present (no class toggle = no VC90 mutation)
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+var gapCursorStylesVisibilityFix = exports.gapCursorStylesVisibilityFix = (0, _react.css)({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror': (0, _defineProperty2.default)({}, "&:has(".concat(gapCursorSelector, ")"), {
+    caretColor: 'transparent'
+  })
+});

package/dist/cjs/ui/EditorContentContainer/styles/layout.js

@@ -507,8 +507,6 @@ var layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync = exports.layoutBas
   }
 });
 
-// platform_synced_block_patch_2
-
 /**
  * Layout in view mode styles for selected state when advanced layouts experiment is on.
  */

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "0.0.0-development";
+var version = exports.version = "216.12.3";

package/dist/es2019/ui/Appearance/Comment/Comment.js

@@ -15,6 +15,7 @@ import messages from '@atlaskit/editor-common/messages';
 import { WidthConsumer, WidthProvider } from '@atlaskit/editor-common/ui';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
 import ClickAreaBlock from '../../Addon/ClickAreaBlock';
@@ -27,7 +28,9 @@ import WithFlash from '../../WithFlash';
 import { CommentToolbar } from './CommentToolbar';
 import { MainToolbar } from './Toolbar';
 const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
-const commentEditorStyles = css({
+
+// Remove when platform_editor_comment_editor_border_radius is cleaned up
+const commentEditorStylesOld = css({
   display: 'flex',
   flexDirection: 'column',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
@@ -44,6 +47,22 @@ const commentEditorStyles = css({
   maxWidth: 'inherit',
   wordWrap: 'break-word'
 });
+const commentEditorStyles = css({
+  display: 'flex',
+  flexDirection: 'column',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '.less-margin > .ProseMirror': {
+    margin: `${"var(--ds-space-150, 12px)"} ${"var(--ds-space-100, 8px)"} ${"var(--ds-space-100, 8px)"}`
+  },
+  minWidth: '272px',
+  height: 'auto',
+  backgroundColor: "var(--ds-background-input, white)",
+  border: `${"var(--ds-border-width, 1px)"} solid ${"var(--ds-border-input, #8C8F97)"}`,
+  boxSizing: 'border-box',
+  borderRadius: "var(--ds-radius-medium, 6px)",
+  maxWidth: 'inherit',
+  wordWrap: 'break-word'
+});
 const secondaryToolbarStyles = css({
   boxSizing: 'border-box',
   justifyContent: 'flex-end',
@@ -166,7 +185,7 @@ export const CommentEditorWithIntl = props => {
   return jsx(WithFlash, {
     animate: maxContentSizeReached
   }, jsx(WidthProvider, null, jsx("div", {
-    css: [commentEditorStyles,
+    css: [expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) ? commentEditorStyles : commentEditorStylesOld,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     css({
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766

package/dist/es2019/ui/Appearance/Comment/Toolbar.js

@@ -9,6 +9,7 @@ import React, { useEffect, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
 const akEditorMenuZIndex = 500;
 const akEditorToolbarKeylineHeight = 2;
@@ -74,6 +75,9 @@ const mainToolbarWrapperStylesVisualRefresh = css({
 const mainToolbarWithRadiusStyle = css({
   borderRadius: `${"var(--ds-radius-small, 3px)"} ${"var(--ds-radius-small, 3px)"} 0 0`
 });
+const mainToolbarRadius = css({
+  borderRadius: `${"var(--ds-radius-medium, 6px)"} ${"var(--ds-radius-medium, 6px)"} 0 0`
+});
 const stickyToolbarWrapperStyleNew = css({
   position: 'sticky',
   paddingBottom: "var(--ds-space-100, 8px)",
@@ -117,7 +121,7 @@ const StickyToolbar = props => {
 const FixedToolbar = props =>
 // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
 jsx("div", {
-  css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, fg('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle],
+  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],
   "data-testid": "ak-editor-main-toolbar"
 }, props.children);
 

package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js

@@ -37,7 +37,7 @@ import { findReplaceStyles, findReplaceStylesNew, findReplaceStylesNewWithA11Y,
 import { firstBlockNodeStyles } from './styles/firstBlockNodeStyles';
 import { firstFloatingToolbarButtonStyles } from './styles/floatingToolbarStyles';
 import { fullPageEditorStyles } from './styles/fullPageEditorStyles';
-import { gapCursorStyles } from './styles/gapCursorStyles';
+import { gapCursorStyles, gapCursorStylesVisibilityFix } from './styles/gapCursorStyles';
 import { gridStyles } from './styles/gridStyles';
 import { indentationStyles } from './styles/indentationStyles';
 import { InlineNodeViewSharedStyles } from './styles/inlineNodeViewSharedStyles';
@@ -250,7 +250,9 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     telepointerColorAndCommonStyle,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    gapCursorStyles,
+    gapCursorStyles, expValEquals('platform_synced_block', 'isEnabled', true) && fg('platform_synced_block_patch_4') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    gapCursorStylesVisibilityFix,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     panelStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -378,13 +380,13 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     layoutSelectedStylesAdvanced :
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    layoutSelectedStylesNotAdvanced, editorExperiment('platform_synced_block', true) && fg('platform_synced_block_patch_2') &&
+    layoutSelectedStylesNotAdvanced, editorExperiment('platform_synced_block', true) &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     layoutSelectedStylesAdvancedFix,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     editorExperiment('advanced_layouts', true) && layoutColumnResponsiveStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    editorExperiment('advanced_layouts', true) && layoutResponsiveBaseStyles, fg('platform_editor_nested_dnd_styles_changes') && (editorExperiment('platform_synced_block', true) && fg('platform_synced_block_patch_2') ?
+    editorExperiment('advanced_layouts', true) && layoutResponsiveBaseStyles, fg('platform_editor_nested_dnd_styles_changes') && (editorExperiment('platform_synced_block', true) ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync :
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/es2019/ui/EditorContentContainer/styles/gapCursorStyles.js

@@ -80,6 +80,7 @@ export const gapCursorStyles = css({
   '.ProseMirror': {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values
     [`&.${hideCaretModifier}`]: {
+      // Clean this up with platform_synced_block_patch_4
       caretColor: 'transparent'
     },
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values
@@ -164,4 +165,16 @@ export const gapCursorStyles = css({
   [marginDeepChildrenFixSelector]: {
     marginTop: 0
   }
+});
+
+// Hide native caret when gap cursor widget is present (no class toggle = no VC90 mutation)
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export const gapCursorStylesVisibilityFix = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values
+    [`&:has(${gapCursorSelector})`]: {
+      caretColor: 'transparent'
+    }
+  }
 });

package/dist/es2019/ui/EditorContentContainer/styles/layout.js

@@ -572,8 +572,6 @@ export const layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync = css({
   }
 });
 
-// platform_synced_block_patch_2
-
 /**
  * Layout in view mode styles for selected state when advanced layouts experiment is on.
  */

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "0.0.0-development";
+export const version = "216.12.3";

package/dist/esm/ui/Appearance/Comment/Comment.js

@@ -17,6 +17,7 @@ import messages from '@atlaskit/editor-common/messages';
 import { WidthConsumer, WidthProvider } from '@atlaskit/editor-common/ui';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
 import ClickAreaBlock from '../../Addon/ClickAreaBlock';
@@ -29,7 +30,9 @@ import WithFlash from '../../WithFlash';
 import { CommentToolbar } from './CommentToolbar';
 import { MainToolbar } from './Toolbar';
 var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
-var commentEditorStyles = css({
+
+// Remove when platform_editor_comment_editor_border_radius is cleaned up
+var commentEditorStylesOld = css({
   display: 'flex',
   flexDirection: 'column',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
@@ -46,6 +49,22 @@ var commentEditorStyles = css({
   maxWidth: 'inherit',
   wordWrap: 'break-word'
 });
+var commentEditorStyles = css({
+  display: 'flex',
+  flexDirection: 'column',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '.less-margin > .ProseMirror': {
+    margin: "var(--ds-space-150, 12px)".concat(" ", "var(--ds-space-100, 8px)", " ", "var(--ds-space-100, 8px)")
+  },
+  minWidth: '272px',
+  height: 'auto',
+  backgroundColor: "var(--ds-background-input, white)",
+  border: "var(--ds-border-width, 1px)".concat(" solid ", "var(--ds-border-input, #8C8F97)"),
+  boxSizing: 'border-box',
+  borderRadius: "var(--ds-radius-medium, 6px)",
+  maxWidth: 'inherit',
+  wordWrap: 'break-word'
+});
 var secondaryToolbarStyles = css({
   boxSizing: 'border-box',
   justifyContent: 'flex-end',
@@ -167,7 +186,7 @@ export var CommentEditorWithIntl = function CommentEditorWithIntl(props) {
   return jsx(WithFlash, {
     animate: maxContentSizeReached
   }, jsx(WidthProvider, null, jsx("div", {
-    css: [commentEditorStyles,
+    css: [expValEquals('platform_editor_comment_editor_border_radius', 'isEnabled', true) ? commentEditorStyles : commentEditorStylesOld,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     css({
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766

package/dist/esm/ui/Appearance/Comment/Toolbar.js

@@ -12,6 +12,7 @@ import React, { useEffect, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
 var akEditorMenuZIndex = 500;
 var akEditorToolbarKeylineHeight = 2;
@@ -68,6 +69,9 @@ var mainToolbarWrapperStylesVisualRefresh = css({
 var mainToolbarWithRadiusStyle = css({
   borderRadius: "var(--ds-radius-small, 3px)".concat(" ", "var(--ds-radius-small, 3px)", " 0 0")
 });
+var mainToolbarRadius = css({
+  borderRadius: "var(--ds-radius-medium, 6px)".concat(" ", "var(--ds-radius-medium, 6px)", " 0 0")
+});
 var stickyToolbarWrapperStyleNew = css({
   position: 'sticky',
   paddingBottom: "var(--ds-space-100, 8px)",
@@ -115,7 +119,7 @@ var FixedToolbar = function FixedToolbar(props) {
   return (
     // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
     jsx("div", {
-      css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, fg('platform_editor_comments_border_radius') && mainToolbarWithRadiusStyle],
+      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],
       "data-testid": "ak-editor-main-toolbar"
     }, props.children)
   );

package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js

@@ -38,7 +38,7 @@ import { findReplaceStyles, findReplaceStylesNew, findReplaceStylesNewWithA11Y,
 import { firstBlockNodeStyles } from './styles/firstBlockNodeStyles';
 import { firstFloatingToolbarButtonStyles } from './styles/floatingToolbarStyles';
 import { fullPageEditorStyles } from './styles/fullPageEditorStyles';
-import { gapCursorStyles } from './styles/gapCursorStyles';
+import { gapCursorStyles, gapCursorStylesVisibilityFix } from './styles/gapCursorStyles';
 import { gridStyles } from './styles/gridStyles';
 import { indentationStyles } from './styles/indentationStyles';
 import { InlineNodeViewSharedStyles } from './styles/inlineNodeViewSharedStyles';
@@ -246,7 +246,9 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     telepointerColorAndCommonStyle,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    gapCursorStyles,
+    gapCursorStyles, expValEquals('platform_synced_block', 'isEnabled', true) && fg('platform_synced_block_patch_4') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    gapCursorStylesVisibilityFix,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     panelStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -374,13 +376,13 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     layoutSelectedStylesAdvanced :
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    layoutSelectedStylesNotAdvanced, editorExperiment('platform_synced_block', true) && fg('platform_synced_block_patch_2') &&
+    layoutSelectedStylesNotAdvanced, editorExperiment('platform_synced_block', true) &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     layoutSelectedStylesAdvancedFix,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     editorExperiment('advanced_layouts', true) && layoutColumnResponsiveStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    editorExperiment('advanced_layouts', true) && layoutResponsiveBaseStyles, fg('platform_editor_nested_dnd_styles_changes') && (editorExperiment('platform_synced_block', true) && fg('platform_synced_block_patch_2') ?
+    editorExperiment('advanced_layouts', true) && layoutResponsiveBaseStyles, fg('platform_editor_nested_dnd_styles_changes') && (editorExperiment('platform_synced_block', true) ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync :
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/esm/ui/EditorContentContainer/styles/gapCursorStyles.js

@@ -25,6 +25,7 @@ var marginDeepChildrenFixSelector = "\n".concat(wrapLeft, " + ").concat(gapCurso
 export var gapCursorStyles = css(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.ProseMirror': _defineProperty(_defineProperty(_defineProperty({}, "&.".concat(hideCaretModifier), {
+    // Clean this up with platform_synced_block_patch_4
     caretColor: 'transparent'
   }), gapCursorSelector, _defineProperty(_defineProperty({
     display: 'none',
@@ -88,4 +89,13 @@ export var gapCursorStyles = css(_defineProperty(_defineProperty(_defineProperty
   height: 0
 }), marginDeepChildrenFixSelector, {
   marginTop: 0
-}));
+}));
+
+// Hide native caret when gap cursor widget is present (no class toggle = no VC90 mutation)
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export var gapCursorStylesVisibilityFix = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror': _defineProperty({}, "&:has(".concat(gapCursorSelector, ")"), {
+    caretColor: 'transparent'
+  })
+});

package/dist/esm/ui/EditorContentContainer/styles/layout.js

@@ -499,8 +499,6 @@ export var layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync = css({
   }
 });
 
-// platform_synced_block_patch_2
-
 /**
  * Layout in view mode styles for selected state when advanced layouts experiment is on.
  */

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "0.0.0-development";
+export var version = "216.12.3";

package/dist/types/ui/EditorContentContainer/styles/gapCursorStyles.d.ts

@@ -1,3 +1,4 @@
 import { type SerializedStyles } from '@emotion/react';
 export declare const hideCaretModifier = "ProseMirror-hide-gapcursor";
 export declare const gapCursorStyles: SerializedStyles;
+export declare const gapCursorStylesVisibilityFix: SerializedStyles;

package/dist/types-ts4.5/ui/EditorContentContainer/styles/gapCursorStyles.d.ts

@@ -1,3 +1,4 @@
 import { type SerializedStyles } from '@emotion/react';
 export declare const hideCaretModifier = "ProseMirror-hide-gapcursor";
 export declare const gapCursorStyles: SerializedStyles;
+export declare const gapCursorStylesVisibilityFix: SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "216.12.2",
+	"version": "216.12.4",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -56,7 +56,7 @@
 		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/editor-ssr-renderer": "^2.2.0",
 		"@atlaskit/editor-toolbar": "^0.19.0",
-		"@atlaskit/editor-toolbar-model": "^0.3.0",
+		"@atlaskit/editor-toolbar-model": "^0.4.0",
 		"@atlaskit/emoji": "^69.10.0",
 		"@atlaskit/icon": "^31.0.0",
 		"@atlaskit/link": "^3.3.0",
@@ -66,7 +66,7 @@
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/react-ufo": "^5.3.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^29.3.0",
+		"@atlaskit/tmp-editor-statsig": "^29.6.0",
 		"@atlaskit/tokens": "^11.0.0",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@atlaskit/width-detector": "^5.0.0",
@@ -83,7 +83,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.18.0",
+		"@atlaskit/editor-common": "^111.19.0",
 		"@atlaskit/link-provider": "^4.2.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",
@@ -107,7 +107,7 @@
 		"@atlaskit/media-integration-test-helpers": "workspace:^",
 		"@atlaskit/media-test-helpers": "^40.0.0",
 		"@atlaskit/modal-dialog": "^14.11.0",
-		"@atlaskit/renderer": "^126.11.0",
+		"@atlaskit/renderer": "^126.12.0",
 		"@atlaskit/section-message": "^8.12.0",
 		"@atlaskit/synchrony-test-helpers": "workspace:^",
 		"@atlaskit/toggle": "^15.2.0",
@@ -335,10 +335,10 @@
 		"platform_editor_a11y_9262": {
 			"type": "boolean"
 		},
-		"platform_synced_block_patch_2": {
+		"platform_synced_block_patch_3": {
 			"type": "boolean"
 		},
-		"platform_synced_block_patch_3": {
+		"platform_synced_block_patch_4": {
 			"type": "boolean"
 		}
 	},