@atlaskit/editor-core 215.0.4 → 215.0.6

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @atlaskit/editor-core
 
+## 215.0.6
+
+### Patch Changes
+
+- [`1e40e7f832859`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1e40e7f832859) -
+  [ux] Scale emojis in editor compact mode
+- [`a48139f041cd4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a48139f041cd4) -
+  [ux] EDITOR-1654 implement sync block ui for hovered, selected and delete states
+- [`ab5c971734fe5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ab5c971734fe5) -
+  NOISSUE: Hydration mutation detection within editor example
+- [`9d0a393b141f9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9d0a393b141f9) -
+  [HOT-121657] Revert PR that sets minHeight behind FG
+  `platform_expand_editor_click_area_with_minheight`, there is another solution behind
+  `platform_editor_focus_fix` that can be used instead
+- [`b0b556769b28e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b0b556769b28e) -
+  [EDITOR-1735] prompt editor padding issue
+- Updated dependencies
+
+## 215.0.5
+
+### Patch Changes
+
+- [`8e2162706bb08`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8e2162706bb08) -
+  [REMOVE FF] platform_nested_nbm_analytics_location
+- [`0b4cd77e72217`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0b4cd77e72217) -
+  clean up references to platform_editor_controls_performance_fixes
+- Updated dependencies
+
 ## 215.0.4
 
 ### Patch Changes

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

@@ -21,14 +21,11 @@ var _EditorContentContainer = _interopRequireDefault(require("../EditorContentCo
 var _PluginSlot = _interopRequireDefault(require("../PluginSlot"));
 var _WithFlash = _interopRequireDefault(require("../WithFlash"));
 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" != _typeof(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); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /**
  * @jsxRuntime classic
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-var AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR = '--ak-editor-chromeless-min-height';
 var scrollbarStylesNew = (0, _react2.css)({
   msOverflowStyle: '-ms-autohiding-scrollbar',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
@@ -70,18 +67,6 @@ var chromelessEditorStylesNew = (0, _react2.css)({
     }
   }
 });
-
-/**
- * minHeight styles are needed to expand the clickable area of ProseMirror.
- * Here, we propagate the minHeight that's used in the editor container to ProseMirror.
- */
-var minHeightStyles = (0, _react2.css)({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  'div > .ProseMirror': {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
-    minHeight: "var(".concat(AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR, ")")
-  }
-});
 var extraSpaceLastLineFix = (0, _react2.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '.ProseMirror': {
@@ -198,11 +183,11 @@ function ChromelessEditorContainer(_ref3) {
     children = _ref3.children,
     containerRef = _ref3.containerRef;
   return (0, _react2.jsx)("div", {
-    css: [chromelessEditorStylesNew, scrollbarStylesNew, (0, _platformFeatureFlags.fg)('platform_expand_editor_click_area_with_minheight') && minHeightStyles, (0, _platformFeatureFlags.fg)('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
-    style: _objectSpread({
+    css: [chromelessEditorStylesNew, scrollbarStylesNew, (0, _platformFeatureFlags.fg)('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
+    style: {
       maxHeight: maxHeight ? "".concat(maxHeight, "px") : undefined,
       minHeight: "".concat(minHeight, "px")
-    }, (0, _platformFeatureFlags.fg)('platform_expand_editor_click_area_with_minheight') && (0, _defineProperty2.default)({}, AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR, "".concat(minHeight, "px"))),
+    },
     "data-testid": "chromeless-editor",
     id: "chromeless-editor",
     ref: containerRef

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

@@ -46,7 +46,7 @@ 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': {
+  '.less-margin > .ProseMirror': {
     margin: "var(--ds-space-150, 12px)".concat(" ", "var(--ds-space-100, 8px)", " ", "var(--ds-space-100, 8px)")
   },
   minWidth: '272px',

package/dist/cjs/ui/Appearance/FullPage/FullPageContentArea.js

@@ -234,16 +234,6 @@ var Content = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       }
     };
   }, []);
-  var shouldSetHiddenDataAttribute = function shouldSetHiddenDataAttribute() {
-    // When platform_editor_controls_performance_fixes is enabled we use a different method to
-    // determine if the toolbar is hidden from outside of the editor, which doesn't require setting
-    // data-editor-primary-toolbar-hidden on the content area
-    // NOTE: When tidying, this function and the data attribute can be removed
-    if (!props.isEditorToolbarHidden || (0, _experiments.editorExperiment)('platform_editor_controls_performance_fixes', true)) {
-      return false;
-    }
-    return (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1');
-  };
   return (0, _react2.jsx)("div", {
     css: [contentAreaNew, props.isEditorToolbarHidden && contentAreaHeightNoToolbar],
     "data-testid": CONTENT_AREA_TEST_ID,
@@ -279,7 +269,6 @@ var Content = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     ,
     className: "ak-editor-content-area-region",
     "data-editor-editable-content": true,
-    "data-editor-primary-toolbar-hidden": shouldSetHiddenDataAttribute() ? 'true' : undefined,
     role: "region",
     "aria-label": props.intl.formatMessage(_messages.fullPageMessages.editableContentLabel),
     ref: contentAreaRef

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

@@ -17,6 +17,7 @@ var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equa
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 var _tokens = require("@atlaskit/tokens");
+var _getBaseFontSize = require("../../composable-editor/utils/getBaseFontSize");
 var _aiPanel = require("./styles/aiPanel");
 var _annotationStyles = require("./styles/annotationStyles");
 var _backgroundColorStyles = require("./styles/backgroundColorStyles");
@@ -66,7 +67,6 @@ var _textColorStyles = require("./styles/textColorStyles");
 var _textHighlightStyles = require("./styles/textHighlightStyles");
 var _unsupportedStyles = require("./styles/unsupportedStyles");
 var _whitespaceStyles = require("./styles/whitespaceStyles");
-/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 /* eslint-disable @atlaskit/design-system/consistent-css-prop-usage */
 /**
  * @jsxRuntime classic
@@ -116,12 +116,14 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     children = props.children,
     viewMode = props.viewMode,
     isScrollable = props.isScrollable,
-    appearance = props.appearance;
+    appearance = props.appearance,
+    contentMode = props.contentMode;
   var theme = (0, _react2.useTheme)();
   var _useThemeObserver = (0, _tokens.useThemeObserver)(),
     colorMode = _useThemeObserver.colorMode;
   var isFullPage = appearance === 'full-page' || appearance === 'full-width';
   var isComment = appearance === 'comment';
+  var baseFontSize = (0, _getBaseFontSize.getBaseFontSize)(appearance, contentMode);
   var style = (0, _experiments.editorExperiment)('platform_editor_preview_panel_responsiveness', true, {
     exposure: true
   }) ? {
@@ -393,6 +395,10 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     _mentions.mentionsStylesMixin_platform_editor_centre_mention_padding,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _emoji.emojiStyles,
+    // Dense emoji scaling based on base font size
+    (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    (0, _emoji.getDenseEmojiStyles)(baseFontSize),
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _panelStyles.panelViewStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.emojiStyles = exports.emojiDangerStyles = void 0;
+exports.getDenseEmojiStyles = exports.emojiStyles = exports.emojiDangerStyles = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
 var _emoji = require("@atlaskit/editor-common/emoji");
@@ -38,6 +38,32 @@ _selectionStyles.boxShadowSelectionStyles,
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
 _selectionStyles.hideNativeBrowserTextSelectionStyles])));
 
+/**
+ * Gets dynamic emoji styles that scale emoji size based on the base font size.
+ * This allows emojis to scale proportionally when the base font size changes.
+ * @param baseFontSize - The base font size in pixels (e.g., 16 for default, 13 for dense mode)
+ * @returns SerializedStyles with emoji size overrides if baseFontSize is provided and different from default.
+ */
+var getDenseEmojiStyles = exports.getDenseEmojiStyles = function getDenseEmojiStyles(baseFontSize) {
+  if (!baseFontSize || baseFontSize === _editorSharedStyles.akEditorFullPageDefaultFontSize) {
+    return (0, _react.css)({});
+  }
+
+  // Calculate emoji size based on base font size
+  // Default: 20px emoji at 16px base font
+  // Scaled: 20px * (baseFontSize/16)
+  // E.g., dense mode (13px base): 20px * (13/16) = 16.25px
+  var emojiSize = _emoji.defaultEmojiHeight * baseFontSize / 16;
+  return (0, _react.css)((0, _defineProperty2.default)({}, ".ProseMirror :is(.".concat(_emoji.EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(_emoji.EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+    width: emojiSize,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+    height: emojiSize,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+    maxHeight: emojiSize
+  }));
+};
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 var emojiDangerStyles = exports.emojiDangerStyles = (0, _react.css)((0, _defineProperty2.default)({}, ".ProseMirror .".concat(_editorSharedStyles.akEditorSelectedNodeClassName, ".danger"), (0, _defineProperty2.default)({}, ".".concat(_emoji.EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(_emoji.EmojiSharedCssClassName.EMOJI_IMAGE), [
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

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

@@ -14,6 +14,7 @@ var syncBlockStyles = exports.syncBlockStyles = (0, _react.css)({
   '.ProseMirror': {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
     '.ak-editor-sync-block': {
+      position: 'relative',
       cursor: 'pointer',
       /* Danger when top level node */
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -25,25 +26,26 @@ var syncBlockStyles = exports.syncBlockStyles = (0, _react.css)({
         '.ak-editor-panel__icon': {
           // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
           color: "var(--ds-icon-danger, #C9372C)".concat(" !important")
+        },
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+        '.ak-editor-sync-block__label': {
+          color: "var(--ds-icon-danger, #C9372C)",
+          backgroundColor: "var(--ds-background-danger-hovered, #FFD5D2)"
         }
       },
-      // borderRadius: token('radius.small', '3px'),
+      borderRadius: "var(--ds-radius-small, 3px)",
       marginTop: "var(--ds-space-150, 12px)",
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-      marginRight: "-".concat((0, _editorSharedStyles.akEditorGutterPaddingDynamic)(), "px"),
+      marginRight: "-".concat(_editorSharedStyles.akEditorGutterPadding, "px"),
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-      marginLeft: "-".concat((0, _editorSharedStyles.akEditorGutterPaddingDynamic)(), "px"),
+      marginLeft: "-".concat(_editorSharedStyles.akEditorGutterPadding, "px"),
       marginBottom: 0,
-      paddingTop: 0,
-      paddingBottom: 0,
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-      paddingRight: "".concat((0, _editorSharedStyles.akEditorGutterPaddingDynamic)() - 32, "px"),
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-      paddingLeft: "".concat((0, _editorSharedStyles.akEditorGutterPaddingDynamic)() - 32, "px"),
+      paddingTop: "var(--ds-space-050, 4px)",
+      paddingBottom: "var(--ds-space-050, 4px)",
       color: 'inherit',
       '&:hover': {
         // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
-        boxShadow: "0px 0px 0px 1px ".concat("var(--ds-background-accent-purple-subtle, #9F8FEF)")
+        boxShadow: "0px 0px 0px 1px ".concat("var(--ds-border-accent-purple, #8270DB)")
       },
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
       '.ak-editor-sync-block__editor': {
@@ -57,7 +59,28 @@ var syncBlockStyles = exports.syncBlockStyles = (0, _react.css)({
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
   '.ak-editor-sync-block.ak-editor-selected-node:not(.danger)': {
-    boxShadow: "0 0 0 1px ".concat("var(--ds-background-accent-purple-bolder, #6E5DC6)"),
-    borderColor: 'transparent'
+    boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-purple, #8270DB)")
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ak-editor-sync-block.ak-editor-selected-node': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.ak-editor-sync-block__label': {
+      display: 'unset'
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ak-editor-sync-block__label': {
+    color: "var(--ds-text-accent-purple, #5E4DB2)",
+    borderRadius: "var(--ds-radius-small, 3px)",
+    position: 'absolute',
+    display: 'none',
+    paddingLeft: "var(--ds-space-100, 8px)",
+    paddingRight: "var(--ds-space-100, 8px)",
+    paddingBottom: "var(--ds-space-050, 4px)",
+    paddingTop: "var(--ds-space-050, 4px)",
+    // height of label (32px) + space between sync block and label (4px) = 36px
+    top: '-36px',
+    right: '0px',
+    backgroundColor: "var(--ds-background-accent-purple-subtlest, #F3F0FF)"
   }
 });

package/dist/cjs/utils/extensions.js

@@ -15,7 +15,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _extensions = require("@atlaskit/editor-common/extensions");
 var _providerHelpers = require("@atlaskit/editor-common/provider-helpers");
 var _analytics2 = require("@atlaskit/editor-common/utils/analytics");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
@@ -23,7 +22,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  */
 function sendExtensionQuickInsertAnalytics(item, selection, createAnalyticsEvent, source) {
   if (createAnalyticsEvent) {
-    var insertLocation = (0, _platformFeatureFlags.fg)('platform_nested_nbm_analytics_location') ? (0, _analytics2.findInsertLocation)(selection) : undefined;
+    var insertLocation = (0, _analytics2.findInsertLocation)(selection);
     (0, _analytics.fireAnalyticsEvent)(createAnalyticsEvent)({
       payload: {
         action: _analytics.ACTION.INSERTED,

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 = "215.0.3";
+var version = exports.version = "215.0.5";

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

@@ -12,7 +12,6 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import EditorContentContainer from '../EditorContentContainer/EditorContentContainer';
 import PluginSlot from '../PluginSlot';
 import WithFlash from '../WithFlash';
-const AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR = '--ak-editor-chromeless-min-height';
 const scrollbarStylesNew = css({
   msOverflowStyle: '-ms-autohiding-scrollbar',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
@@ -54,18 +53,6 @@ const chromelessEditorStylesNew = css({
     }
   }
 });
-
-/**
- * minHeight styles are needed to expand the clickable area of ProseMirror.
- * Here, we propagate the minHeight that's used in the editor container to ProseMirror.
- */
-const minHeightStyles = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  'div > .ProseMirror': {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
-    minHeight: `var(${AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR})`
-  }
-});
 const extraSpaceLastLineFix = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '.ProseMirror': {
@@ -173,14 +160,10 @@ export function ChromelessEditorContainer({
   containerRef
 }) {
   return jsx("div", {
-    css: [chromelessEditorStylesNew, scrollbarStylesNew, fg('platform_expand_editor_click_area_with_minheight') && minHeightStyles, fg('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
+    css: [chromelessEditorStylesNew, scrollbarStylesNew, fg('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
     style: {
       maxHeight: maxHeight ? `${maxHeight}px` : undefined,
-      minHeight: `${minHeight}px`,
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
-      ...(fg('platform_expand_editor_click_area_with_minheight') && {
-        [AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR]: `${minHeight}px`
-      })
+      minHeight: `${minHeight}px`
     },
     "data-testid": "chromeless-editor",
     id: "chromeless-editor",

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

@@ -33,7 +33,7 @@ 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': {
+  '.less-margin > .ProseMirror': {
     margin: `${"var(--ds-space-150, 12px)"} ${"var(--ds-space-100, 8px)"} ${"var(--ds-space-100, 8px)"}`
   },
   minWidth: '272px',

package/dist/es2019/ui/Appearance/FullPage/FullPageContentArea.js

@@ -226,16 +226,6 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
       return containerRef.current;
     }
   }), []);
-  const shouldSetHiddenDataAttribute = () => {
-    // When platform_editor_controls_performance_fixes is enabled we use a different method to
-    // determine if the toolbar is hidden from outside of the editor, which doesn't require setting
-    // data-editor-primary-toolbar-hidden on the content area
-    // NOTE: When tidying, this function and the data attribute can be removed
-    if (!props.isEditorToolbarHidden || editorExperiment('platform_editor_controls_performance_fixes', true)) {
-      return false;
-    }
-    return editorExperiment('platform_editor_controls', 'variant1');
-  };
   return jsx("div", {
     css: [contentAreaNew, props.isEditorToolbarHidden && contentAreaHeightNoToolbar],
     "data-testid": CONTENT_AREA_TEST_ID,
@@ -272,7 +262,6 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
     ,
     className: "ak-editor-content-area-region",
     "data-editor-editable-content": true,
-    "data-editor-primary-toolbar-hidden": shouldSetHiddenDataAttribute() ? 'true' : undefined,
     role: "region",
     "aria-label": props.intl.formatMessage(messages.editableContentLabel),
     ref: contentAreaRef

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

@@ -1,4 +1,3 @@
-/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 /* eslint-disable @atlaskit/design-system/consistent-css-prop-usage */
 /**
  * @jsxRuntime classic
@@ -17,6 +16,7 @@ import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equ
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
 import { useThemeObserver } from '@atlaskit/tokens';
+import { getBaseFontSize } from '../../composable-editor/utils/getBaseFontSize';
 import { aiPanelBaseFirefoxStyles, aiPanelBaseStyles, aiPanelDarkFirefoxStyles, aiPanelDarkStyles } from './styles/aiPanel';
 import { annotationStyles } from './styles/annotationStyles';
 import { backgroundColorStyles, textHighlightPaddingStyles } from './styles/backgroundColorStyles';
@@ -31,7 +31,7 @@ import { cursorStyles } from './styles/cursorStyles';
 import { dangerDateStyles, dateStyles, dateVanillaStyles } from './styles/dateStyles';
 import { editorUGCTokensDefault, editorUGCTokensRefreshed } from './styles/editorUGCTokenStyles';
 import { embedCardStyles } from './styles/embedCardStyles';
-import { emojiDangerStyles, emojiStyles } from './styles/emoji';
+import { emojiDangerStyles, emojiStyles, getDenseEmojiStyles } from './styles/emoji';
 import { expandStyles, expandStylesMixin_fg_platform_editor_nested_dnd_styles_changes, expandStylesMixin_fg_platform_visual_refresh_icons, expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes } from './styles/expandStyles';
 import { getExtensionStyles } from './styles/extensionStyles';
 import { findReplaceStyles, findReplaceStylesNew } from './styles/findReplaceStyles';
@@ -110,7 +110,8 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     children,
     viewMode,
     isScrollable,
-    appearance
+    appearance,
+    contentMode
   } = props;
   const theme = useTheme();
   const {
@@ -118,6 +119,7 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
   } = useThemeObserver();
   const isFullPage = appearance === 'full-page' || appearance === 'full-width';
   const isComment = appearance === 'comment';
+  const baseFontSize = getBaseFontSize(appearance, contentMode);
   const style = editorExperiment('platform_editor_preview_panel_responsiveness', true, {
     exposure: true
   }) ? {
@@ -389,6 +391,10 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     mentionsStylesMixin_platform_editor_centre_mention_padding,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     emojiStyles,
+    // Dense emoji scaling based on base font size
+    expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    getDenseEmojiStyles(baseFontSize),
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     panelViewStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

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

@@ -1,7 +1,7 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css } from '@emotion/react';
 import { defaultEmojiHeight, EmojiSharedCssClassName } from '@atlaskit/editor-common/emoji';
-import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
+import { akEditorFullPageDefaultFontSize, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 import { blanketSelectionStyles, boxShadowSelectionStyles, dangerBackgroundStyles, dangerBorderStyles, hideNativeBrowserTextSelectionStyles } from './selectionStyles';
 const emojiSelectionStyles = css({
   borderRadius: "var(--ds-radius-xsmall, 2px)"
@@ -39,6 +39,35 @@ export const emojiStyles = css({
   }
 });
 
+/**
+ * Gets dynamic emoji styles that scale emoji size based on the base font size.
+ * This allows emojis to scale proportionally when the base font size changes.
+ * @param baseFontSize - The base font size in pixels (e.g., 16 for default, 13 for dense mode)
+ * @returns SerializedStyles with emoji size overrides if baseFontSize is provided and different from default.
+ */
+export const getDenseEmojiStyles = baseFontSize => {
+  if (!baseFontSize || baseFontSize === akEditorFullPageDefaultFontSize) {
+    return css({});
+  }
+
+  // Calculate emoji size based on base font size
+  // Default: 20px emoji at 16px base font
+  // Scaled: 20px * (baseFontSize/16)
+  // E.g., dense mode (13px base): 20px * (13/16) = 16.25px
+  const emojiSize = defaultEmojiHeight * baseFontSize / 16;
+  return css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+    [`.ProseMirror :is(.${EmojiSharedCssClassName.EMOJI_SPRITE}, .${EmojiSharedCssClassName.EMOJI_IMAGE})`]: {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+      width: emojiSize,
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+      height: emojiSize,
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+      maxHeight: emojiSize
+    }
+  });
+};
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export const emojiDangerStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values

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

@@ -1,12 +1,13 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css } from '@emotion/react';
-import { akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
+import { akEditorGutterPadding } from '@atlaskit/editor-shared-styles';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export const syncBlockStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.ProseMirror': {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
     '.ak-editor-sync-block': {
+      position: 'relative',
       cursor: 'pointer',
       /* Danger when top level node */
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -18,25 +19,26 @@ export const syncBlockStyles = css({
         '.ak-editor-panel__icon': {
           // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
           color: `${"var(--ds-icon-danger, #C9372C)"} !important`
+        },
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+        '.ak-editor-sync-block__label': {
+          color: "var(--ds-icon-danger, #C9372C)",
+          backgroundColor: "var(--ds-background-danger-hovered, #FFD5D2)"
         }
       },
-      // borderRadius: token('radius.small', '3px'),
+      borderRadius: "var(--ds-radius-small, 3px)",
       marginTop: "var(--ds-space-150, 12px)",
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-      marginRight: `-${akEditorGutterPaddingDynamic()}px`,
+      marginRight: `-${akEditorGutterPadding}px`,
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-      marginLeft: `-${akEditorGutterPaddingDynamic()}px`,
+      marginLeft: `-${akEditorGutterPadding}px`,
       marginBottom: 0,
-      paddingTop: 0,
-      paddingBottom: 0,
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-      paddingRight: `${akEditorGutterPaddingDynamic() - 32}px`,
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-      paddingLeft: `${akEditorGutterPaddingDynamic() - 32}px`,
+      paddingTop: "var(--ds-space-050, 4px)",
+      paddingBottom: "var(--ds-space-050, 4px)",
       color: 'inherit',
       '&:hover': {
         // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
-        boxShadow: `0px 0px 0px 1px ${"var(--ds-background-accent-purple-subtle, #9F8FEF)"}`
+        boxShadow: `0px 0px 0px 1px ${"var(--ds-border-accent-purple, #8270DB)"}`
       },
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
       '.ak-editor-sync-block__editor': {
@@ -50,7 +52,28 @@ export const syncBlockStyles = css({
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
   '.ak-editor-sync-block.ak-editor-selected-node:not(.danger)': {
-    boxShadow: `0 0 0 1px ${"var(--ds-background-accent-purple-bolder, #6E5DC6)"}`,
-    borderColor: 'transparent'
+    boxShadow: `0 0 0 1px ${"var(--ds-border-accent-purple, #8270DB)"}`
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ak-editor-sync-block.ak-editor-selected-node': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.ak-editor-sync-block__label': {
+      display: 'unset'
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ak-editor-sync-block__label': {
+    color: "var(--ds-text-accent-purple, #5E4DB2)",
+    borderRadius: "var(--ds-radius-small, 3px)",
+    position: 'absolute',
+    display: 'none',
+    paddingLeft: "var(--ds-space-100, 8px)",
+    paddingRight: "var(--ds-space-100, 8px)",
+    paddingBottom: "var(--ds-space-050, 4px)",
+    paddingTop: "var(--ds-space-050, 4px)",
+    // height of label (32px) + space between sync block and label (4px) = 36px
+    top: '-36px',
+    right: '0px',
+    backgroundColor: "var(--ds-background-accent-purple-subtlest, #F3F0FF)"
   }
 });

package/dist/es2019/utils/extensions.js

@@ -4,13 +4,12 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, fireAnalyticsEve
 import { getQuickInsertItemsFromModule, resolveImport } from '@atlaskit/editor-common/extensions';
 import { combineProviders } from '@atlaskit/editor-common/provider-helpers';
 import { findInsertLocation } from '@atlaskit/editor-common/utils/analytics';
-import { fg } from '@atlaskit/platform-feature-flags';
 /**
  * Utils to send analytics event when a extension is inserted using quickInsert
  */
 function sendExtensionQuickInsertAnalytics(item, selection, createAnalyticsEvent, source) {
   if (createAnalyticsEvent) {
-    const insertLocation = fg('platform_nested_nbm_analytics_location') ? findInsertLocation(selection) : undefined;
+    const insertLocation = findInsertLocation(selection);
     fireAnalyticsEvent(createAnalyticsEvent)({
       payload: {
         action: ACTION.INSERTED,

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "215.0.3";
+export const version = "215.0.5";

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

@@ -4,8 +4,6 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 /**
@@ -21,7 +19,6 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import EditorContentContainer from '../EditorContentContainer/EditorContentContainer';
 import PluginSlot from '../PluginSlot';
 import WithFlash from '../WithFlash';
-var AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR = '--ak-editor-chromeless-min-height';
 var scrollbarStylesNew = css({
   msOverflowStyle: '-ms-autohiding-scrollbar',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
@@ -63,18 +60,6 @@ var chromelessEditorStylesNew = css({
     }
   }
 });
-
-/**
- * minHeight styles are needed to expand the clickable area of ProseMirror.
- * Here, we propagate the minHeight that's used in the editor container to ProseMirror.
- */
-var minHeightStyles = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  'div > .ProseMirror': {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
-    minHeight: "var(".concat(AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR, ")")
-  }
-});
 var extraSpaceLastLineFix = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '.ProseMirror': {
@@ -192,11 +177,11 @@ export function ChromelessEditorContainer(_ref3) {
     children = _ref3.children,
     containerRef = _ref3.containerRef;
   return jsx("div", {
-    css: [chromelessEditorStylesNew, scrollbarStylesNew, fg('platform_expand_editor_click_area_with_minheight') && minHeightStyles, fg('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
-    style: _objectSpread({
+    css: [chromelessEditorStylesNew, scrollbarStylesNew, fg('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
+    style: {
       maxHeight: maxHeight ? "".concat(maxHeight, "px") : undefined,
       minHeight: "".concat(minHeight, "px")
-    }, fg('platform_expand_editor_click_area_with_minheight') && _defineProperty({}, AK_EDITOR_CHROMELESS_MIN_HEIGHT_VAR, "".concat(minHeight, "px"))),
+    },
     "data-testid": "chromeless-editor",
     id: "chromeless-editor",
     ref: containerRef

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

@@ -35,7 +35,7 @@ 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': {
+  '.less-margin > .ProseMirror': {
     margin: "var(--ds-space-150, 12px)".concat(" ", "var(--ds-space-100, 8px)", " ", "var(--ds-space-100, 8px)")
   },
   minWidth: '272px',

package/dist/esm/ui/Appearance/FullPage/FullPageContentArea.js

@@ -224,16 +224,6 @@ var Content = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }
     };
   }, []);
-  var shouldSetHiddenDataAttribute = function shouldSetHiddenDataAttribute() {
-    // When platform_editor_controls_performance_fixes is enabled we use a different method to
-    // determine if the toolbar is hidden from outside of the editor, which doesn't require setting
-    // data-editor-primary-toolbar-hidden on the content area
-    // NOTE: When tidying, this function and the data attribute can be removed
-    if (!props.isEditorToolbarHidden || editorExperiment('platform_editor_controls_performance_fixes', true)) {
-      return false;
-    }
-    return editorExperiment('platform_editor_controls', 'variant1');
-  };
   return jsx("div", {
     css: [contentAreaNew, props.isEditorToolbarHidden && contentAreaHeightNoToolbar],
     "data-testid": CONTENT_AREA_TEST_ID,
@@ -269,7 +259,6 @@ var Content = /*#__PURE__*/React.forwardRef(function (props, ref) {
     ,
     className: "ak-editor-content-area-region",
     "data-editor-editable-content": true,
-    "data-editor-primary-toolbar-hidden": shouldSetHiddenDataAttribute() ? 'true' : undefined,
     role: "region",
     "aria-label": props.intl.formatMessage(messages.editableContentLabel),
     ref: contentAreaRef

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

@@ -1,5 +1,4 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 /* eslint-disable @atlaskit/design-system/consistent-css-prop-usage */
 /**
  * @jsxRuntime classic
@@ -18,6 +17,7 @@ import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equ
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
 import { useThemeObserver } from '@atlaskit/tokens';
+import { getBaseFontSize } from '../../composable-editor/utils/getBaseFontSize';
 import { aiPanelBaseFirefoxStyles, aiPanelBaseStyles, aiPanelDarkFirefoxStyles, aiPanelDarkStyles } from './styles/aiPanel';
 import { annotationStyles } from './styles/annotationStyles';
 import { backgroundColorStyles, textHighlightPaddingStyles } from './styles/backgroundColorStyles';
@@ -32,7 +32,7 @@ import { cursorStyles } from './styles/cursorStyles';
 import { dangerDateStyles, dateStyles, dateVanillaStyles } from './styles/dateStyles';
 import { editorUGCTokensDefault, editorUGCTokensRefreshed } from './styles/editorUGCTokenStyles';
 import { embedCardStyles } from './styles/embedCardStyles';
-import { emojiDangerStyles, emojiStyles } from './styles/emoji';
+import { emojiDangerStyles, emojiStyles, getDenseEmojiStyles } from './styles/emoji';
 import { expandStyles, expandStylesMixin_fg_platform_editor_nested_dnd_styles_changes, expandStylesMixin_fg_platform_visual_refresh_icons, expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes } from './styles/expandStyles';
 import { getExtensionStyles } from './styles/extensionStyles';
 import { findReplaceStyles, findReplaceStylesNew } from './styles/findReplaceStyles';
@@ -108,12 +108,14 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     children = props.children,
     viewMode = props.viewMode,
     isScrollable = props.isScrollable,
-    appearance = props.appearance;
+    appearance = props.appearance,
+    contentMode = props.contentMode;
   var theme = useTheme();
   var _useThemeObserver = useThemeObserver(),
     colorMode = _useThemeObserver.colorMode;
   var isFullPage = appearance === 'full-page' || appearance === 'full-width';
   var isComment = appearance === 'comment';
+  var baseFontSize = getBaseFontSize(appearance, contentMode);
   var style = editorExperiment('platform_editor_preview_panel_responsiveness', true, {
     exposure: true
   }) ? {
@@ -385,6 +387,10 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     mentionsStylesMixin_platform_editor_centre_mention_padding,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     emojiStyles,
+    // Dense emoji scaling based on base font size
+    expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    getDenseEmojiStyles(baseFontSize),
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     panelViewStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

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

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css } from '@emotion/react';
 import { defaultEmojiHeight, EmojiSharedCssClassName } from '@atlaskit/editor-common/emoji';
-import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
+import { akEditorFullPageDefaultFontSize, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 import { blanketSelectionStyles, boxShadowSelectionStyles, dangerBackgroundStyles, dangerBorderStyles, hideNativeBrowserTextSelectionStyles } from './selectionStyles';
 var emojiSelectionStyles = css({
   borderRadius: "var(--ds-radius-xsmall, 2px)"
@@ -30,6 +30,32 @@ boxShadowSelectionStyles,
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
 hideNativeBrowserTextSelectionStyles])));
 
+/**
+ * Gets dynamic emoji styles that scale emoji size based on the base font size.
+ * This allows emojis to scale proportionally when the base font size changes.
+ * @param baseFontSize - The base font size in pixels (e.g., 16 for default, 13 for dense mode)
+ * @returns SerializedStyles with emoji size overrides if baseFontSize is provided and different from default.
+ */
+export var getDenseEmojiStyles = function getDenseEmojiStyles(baseFontSize) {
+  if (!baseFontSize || baseFontSize === akEditorFullPageDefaultFontSize) {
+    return css({});
+  }
+
+  // Calculate emoji size based on base font size
+  // Default: 20px emoji at 16px base font
+  // Scaled: 20px * (baseFontSize/16)
+  // E.g., dense mode (13px base): 20px * (13/16) = 16.25px
+  var emojiSize = defaultEmojiHeight * baseFontSize / 16;
+  return css(_defineProperty({}, ".ProseMirror :is(.".concat(EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(EmojiSharedCssClassName.EMOJI_IMAGE, ")"), {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+    width: emojiSize,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+    height: emojiSize,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+    maxHeight: emojiSize
+  }));
+};
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export var emojiDangerStyles = css(_defineProperty({}, ".ProseMirror .".concat(akEditorSelectedNodeClassName, ".danger"), _defineProperty({}, ".".concat(EmojiSharedCssClassName.EMOJI_SPRITE, ", .").concat(EmojiSharedCssClassName.EMOJI_IMAGE), [
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

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

@@ -1,12 +1,13 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css } from '@emotion/react';
-import { akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
+import { akEditorGutterPadding } from '@atlaskit/editor-shared-styles';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export var syncBlockStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.ProseMirror': {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
     '.ak-editor-sync-block': {
+      position: 'relative',
       cursor: 'pointer',
       /* Danger when top level node */
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -18,25 +19,26 @@ export var syncBlockStyles = css({
         '.ak-editor-panel__icon': {
           // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
           color: "var(--ds-icon-danger, #C9372C)".concat(" !important")
+        },
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+        '.ak-editor-sync-block__label': {
+          color: "var(--ds-icon-danger, #C9372C)",
+          backgroundColor: "var(--ds-background-danger-hovered, #FFD5D2)"
         }
       },
-      // borderRadius: token('radius.small', '3px'),
+      borderRadius: "var(--ds-radius-small, 3px)",
       marginTop: "var(--ds-space-150, 12px)",
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-      marginRight: "-".concat(akEditorGutterPaddingDynamic(), "px"),
+      marginRight: "-".concat(akEditorGutterPadding, "px"),
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-      marginLeft: "-".concat(akEditorGutterPaddingDynamic(), "px"),
+      marginLeft: "-".concat(akEditorGutterPadding, "px"),
       marginBottom: 0,
-      paddingTop: 0,
-      paddingBottom: 0,
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-      paddingRight: "".concat(akEditorGutterPaddingDynamic() - 32, "px"),
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-      paddingLeft: "".concat(akEditorGutterPaddingDynamic() - 32, "px"),
+      paddingTop: "var(--ds-space-050, 4px)",
+      paddingBottom: "var(--ds-space-050, 4px)",
       color: 'inherit',
       '&:hover': {
         // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
-        boxShadow: "0px 0px 0px 1px ".concat("var(--ds-background-accent-purple-subtle, #9F8FEF)")
+        boxShadow: "0px 0px 0px 1px ".concat("var(--ds-border-accent-purple, #8270DB)")
       },
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
       '.ak-editor-sync-block__editor': {
@@ -50,7 +52,28 @@ export var syncBlockStyles = css({
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
   '.ak-editor-sync-block.ak-editor-selected-node:not(.danger)': {
-    boxShadow: "0 0 0 1px ".concat("var(--ds-background-accent-purple-bolder, #6E5DC6)"),
-    borderColor: 'transparent'
+    boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-purple, #8270DB)")
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ak-editor-sync-block.ak-editor-selected-node': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.ak-editor-sync-block__label': {
+      display: 'unset'
+    }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ak-editor-sync-block__label': {
+    color: "var(--ds-text-accent-purple, #5E4DB2)",
+    borderRadius: "var(--ds-radius-small, 3px)",
+    position: 'absolute',
+    display: 'none',
+    paddingLeft: "var(--ds-space-100, 8px)",
+    paddingRight: "var(--ds-space-100, 8px)",
+    paddingBottom: "var(--ds-space-050, 4px)",
+    paddingTop: "var(--ds-space-050, 4px)",
+    // height of label (32px) + space between sync block and label (4px) = 36px
+    top: '-36px',
+    right: '0px',
+    backgroundColor: "var(--ds-background-accent-purple-subtlest, #F3F0FF)"
   }
 });

package/dist/esm/utils/extensions.js

@@ -9,13 +9,12 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, fireAnalyticsEve
 import { getQuickInsertItemsFromModule, resolveImport } from '@atlaskit/editor-common/extensions';
 import { combineProviders } from '@atlaskit/editor-common/provider-helpers';
 import { findInsertLocation } from '@atlaskit/editor-common/utils/analytics';
-import { fg } from '@atlaskit/platform-feature-flags';
 /**
  * Utils to send analytics event when a extension is inserted using quickInsert
  */
 function sendExtensionQuickInsertAnalytics(item, selection, createAnalyticsEvent, source) {
   if (createAnalyticsEvent) {
-    var insertLocation = fg('platform_nested_nbm_analytics_location') ? findInsertLocation(selection) : undefined;
+    var insertLocation = findInsertLocation(selection);
     fireAnalyticsEvent(createAnalyticsEvent)({
       payload: {
         action: ACTION.INSERTED,

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "215.0.3";
+export var version = "215.0.5";

package/dist/types/create-editor/create-universal-preset.d.ts

@@ -461,6 +461,7 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
     commands: {
         setAnimatingPlaceholderPrompts: (placeholderPrompts: string[]) => import("@atlaskit/editor-common/types").EditorCommand;
         setPlaceholder: (placeholder: string) => import("@atlaskit/editor-common/types").EditorCommand;
+        setPlaceholderHidden: (isPlaceholderHidden: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
     };
     dependencies: [import("@atlaskit/editor-plugins/focus").FocusPlugin, import("@atlaskit/editor-plugins/composition").CompositionPlugin, import("@atlaskit/editor-plugins/type-ahead").TypeAheadPlugin, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-plugins/show-diff").ShowDiffPlugin>];
     pluginConfiguration: import("@atlaskit/editor-plugins/placeholder").PlaceholderPluginOptions | undefined;

package/dist/types/presets/universal.d.ts

@@ -522,6 +522,7 @@ export default function createUniversalPresetInternal({ appearance, props, featu
     commands: {
         setAnimatingPlaceholderPrompts: (placeholderPrompts: string[]) => import("@atlaskit/editor-common/types").EditorCommand;
         setPlaceholder: (placeholder: string) => import("@atlaskit/editor-common/types").EditorCommand;
+        setPlaceholderHidden: (isPlaceholderHidden: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
     };
     dependencies: [import("@atlaskit/editor-plugins/focus").FocusPlugin, import("@atlaskit/editor-plugins/composition").CompositionPlugin, import("@atlaskit/editor-plugins/type-ahead").TypeAheadPlugin, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-plugins/show-diff").ShowDiffPlugin>];
     pluginConfiguration: import("@atlaskit/editor-plugins/placeholder").PlaceholderPluginOptions | undefined;

package/dist/types/presets/useUniversalPreset.d.ts

@@ -461,6 +461,7 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
     commands: {
         setAnimatingPlaceholderPrompts: (placeholderPrompts: string[]) => import("@atlaskit/editor-common/types").EditorCommand;
         setPlaceholder: (placeholder: string) => import("@atlaskit/editor-common/types").EditorCommand;
+        setPlaceholderHidden: (isPlaceholderHidden: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
     };
     dependencies: [import("@atlaskit/editor-plugins/focus").FocusPlugin, import("@atlaskit/editor-plugins/composition").CompositionPlugin, import("@atlaskit/editor-plugins/type-ahead").TypeAheadPlugin, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-plugins/show-diff").ShowDiffPlugin>];
     pluginConfiguration: import("@atlaskit/editor-plugins/placeholder").PlaceholderPluginOptions | undefined;

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

@@ -1,3 +1,10 @@
 import { type SerializedStyles } from '@emotion/react';
 export declare const emojiStyles: SerializedStyles;
+/**
+ * Gets dynamic emoji styles that scale emoji size based on the base font size.
+ * This allows emojis to scale proportionally when the base font size changes.
+ * @param baseFontSize - The base font size in pixels (e.g., 16 for default, 13 for dense mode)
+ * @returns SerializedStyles with emoji size overrides if baseFontSize is provided and different from default.
+ */
+export declare const getDenseEmojiStyles: (baseFontSize?: number) => SerializedStyles;
 export declare const emojiDangerStyles: SerializedStyles;

package/dist/types-ts4.5/create-editor/create-universal-preset.d.ts

@@ -650,6 +650,7 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
         commands: {
             setAnimatingPlaceholderPrompts: (placeholderPrompts: string[]) => import("@atlaskit/editor-common/types").EditorCommand;
             setPlaceholder: (placeholder: string) => import("@atlaskit/editor-common/types").EditorCommand;
+            setPlaceholderHidden: (isPlaceholderHidden: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
         };
         dependencies: [
             import("@atlaskit/editor-plugins/focus").FocusPlugin,

package/dist/types-ts4.5/presets/universal.d.ts

@@ -711,6 +711,7 @@ export default function createUniversalPresetInternal({ appearance, props, featu
         commands: {
             setAnimatingPlaceholderPrompts: (placeholderPrompts: string[]) => import("@atlaskit/editor-common/types").EditorCommand;
             setPlaceholder: (placeholder: string) => import("@atlaskit/editor-common/types").EditorCommand;
+            setPlaceholderHidden: (isPlaceholderHidden: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
         };
         dependencies: [
             import("@atlaskit/editor-plugins/focus").FocusPlugin,

package/dist/types-ts4.5/presets/useUniversalPreset.d.ts

@@ -650,6 +650,7 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
         commands: {
             setAnimatingPlaceholderPrompts: (placeholderPrompts: string[]) => import("@atlaskit/editor-common/types").EditorCommand;
             setPlaceholder: (placeholder: string) => import("@atlaskit/editor-common/types").EditorCommand;
+            setPlaceholderHidden: (isPlaceholderHidden: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
         };
         dependencies: [
             import("@atlaskit/editor-plugins/focus").FocusPlugin,

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

@@ -1,3 +1,10 @@
 import { type SerializedStyles } from '@emotion/react';
 export declare const emojiStyles: SerializedStyles;
+/**
+ * Gets dynamic emoji styles that scale emoji size based on the base font size.
+ * This allows emojis to scale proportionally when the base font size changes.
+ * @param baseFontSize - The base font size in pixels (e.g., 16 for default, 13 for dense mode)
+ * @returns SerializedStyles with emoji size overrides if baseFontSize is provided and different from default.
+ */
+export declare const getDenseEmojiStyles: (baseFontSize?: number) => SerializedStyles;
 export declare const emojiDangerStyles: SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "215.0.4",
+	"version": "215.0.6",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -64,7 +64,7 @@
 		"@atlaskit/platform-feature-flags-react": "^0.3.0",
 		"@atlaskit/react-ufo": "^4.11.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^13.8.0",
+		"@atlaskit/tmp-editor-statsig": "^13.10.0",
 		"@atlaskit/tokens": "^6.4.0",
 		"@atlaskit/tooltip": "^20.5.0",
 		"@atlaskit/width-detector": "^5.0.0",
@@ -105,7 +105,7 @@
 		"@atlaskit/media-test-helpers": "^39.0.0",
 		"@atlaskit/modal-dialog": "^14.5.0",
 		"@atlaskit/primitives": "^14.15.0",
-		"@atlaskit/renderer": "^124.1.0",
+		"@atlaskit/renderer": "^124.3.0",
 		"@atlaskit/section-message": "^8.7.0",
 		"@atlaskit/smart-card": "^43.1.0",
 		"@atlaskit/synchrony-test-helpers": "workspace:^",
@@ -150,6 +150,9 @@
 		}
 	},
 	"platform-feature-flags": {
+		"aifc_use_llm_space_recommendations": {
+			"type": "boolean"
+		},
 		"confluence_floating_toolbar_animation": {
 			"type": "boolean"
 		},
@@ -298,9 +301,6 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
-		"platform_nested_nbm_analytics_location": {
-			"type": "boolean"
-		},
 		"platform_editor_add_media_from_url_rollout": {
 			"type": "boolean"
 		},
@@ -422,9 +422,6 @@
 		"platform_editor_controls_increase_full_page_gutter": {
 			"type": "boolean"
 		},
-		"platform_expand_editor_click_area_with_minheight": {
-			"type": "boolean"
-		},
 		"cc_editor_focus_before_editor_on_load": {
 			"type": "boolean"
 		},