@atlaskit/editor-plugin-block-menu 6.1.0 → 6.1.1

package/dist/es2019/ui/block-menu.js

@@ -5,6 +5,7 @@ import React, { useContext, useEffect, useRef } from 'react';
 import { injectIntl } from 'react-intl-next';
 import { cx } from '@atlaskit/css';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { BLOCK_MENU_TEST_ID } from '@atlaskit/editor-common/block-menu';
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { DRAG_HANDLE_SELECTOR, DRAG_HANDLE_WIDTH } from '@atlaskit/editor-common/styles';
@@ -93,7 +94,7 @@ const BlockMenuContent = ({
     return target.closest('[data-toolbar-nested-dropdown-menu]') !== null;
   };
   return /*#__PURE__*/React.createElement(Box, {
-    testId: "editor-block-menu",
+    testId: BLOCK_MENU_TEST_ID,
     role: expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menu' : undefined,
     ref: ref,
     xcss: cx(styles.base, fg('platform_editor_block_menu_v2_patch_2') && styles.maxWidthStyles, editorExperiment('platform_synced_block', true) && styles.emptyMenuSectionStyles)

package/dist/es2019/ui/copy-link.js

@@ -87,15 +87,26 @@ const CopyLinkDropdownItemContent = ({
   if (!fg('platform_editor_adf_with_localid')) {
     return null;
   }
+
+  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
+  // Conditionally display message based on feature flag
+  // To clean up: remove the conditional and use only copyLinkToBlock message
+  const message = fg('platform_editor_block_menu_v2_patch_3') ? messages.copyLinkToBlock : messages.copyLinkToBlockOld;
+
+  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
+  // Adds size="small" to icons for better visual consistency in block menu.
+  // To clean up: remove conditional, keep only size="small" version.
+  const iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(LinkIcon, {
-      label: ""
+      label: "",
+      size: iconSize
     }),
     elemAfter: shortcut ? /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: shortcut
     }) : undefined,
     ariaKeyshortcuts: shortcut
-  }, formatMessage(messages.copyLinkToBlock));
+  }, formatMessage(message));
 };
 export const CopyLinkDropdownItem = injectIntl(CopyLinkDropdownItemContent);

package/dist/es2019/ui/delete-button.js

@@ -6,6 +6,7 @@ import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { deleteSelectedRange, getSourceNodesFromSelectionRange } from '@atlaskit/editor-common/selection';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import DeleteIcon from '@atlaskit/icon/core/delete';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Box } from '@atlaskit/primitives/box';
 import Text from '@atlaskit/primitives/text';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
@@ -92,6 +93,11 @@ const DeleteDropdownItemContent = ({
       onRemoveHoverDecoration();
     };
   }, [onRemoveHoverDecoration]);
+
+  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
+  // Adds size="small" to icons for better visual consistency in block menu.
+  // To clean up: remove conditional, keep only size="small" version.
+  const iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(Box, {
     onMouseEnter: onShowHoverDecoration,
     onMouseLeave: onRemoveHoverDecoration,
@@ -100,7 +106,8 @@ const DeleteDropdownItemContent = ({
   }, /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/React.createElement(DeleteIcon, {
       color: "var(--ds-icon-danger, #C9372C)",
-      label: ""
+      label: "",
+      size: iconSize
     }),
     onClick: onClick,
     testId: BLOCK_MENU_ACTION_TEST_ID.DELETE

package/dist/es2019/ui/flag.js

@@ -4,6 +4,7 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages';
 import AkFlag, { FlagGroup, AutoDismissFlag } from '@atlaskit/flag';
 import SuccessIcon from '@atlaskit/icon/core/check-circle';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { FLAG_ID } from '../blockMenuPluginType';
 import { blockMenuPluginKey } from '../pm-plugins/main';
 const flagMap = {
@@ -44,6 +45,11 @@ export const Flag = ({
     api === null || api === void 0 ? void 0 : api.core.actions.focus();
   };
   const FlagComponent = flagMap[showFlag].autoDismiss ? AutoDismissFlag : AkFlag;
+
+  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
+  // Adds size="small" to icons for better visual consistency in block menu.
+  // To clean up: remove conditional, keep only size="small" version.
+  const iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(FlagGroup, null, /*#__PURE__*/React.createElement(FlagComponent, {
     onDismissed: onDismissed,
     title: formatMessage(title),
@@ -51,7 +57,8 @@ export const Flag = ({
     testId: showFlag,
     icon: /*#__PURE__*/React.createElement(SuccessIcon, {
       label: "",
-      color: "var(--ds-icon-success, #6A9A23)"
+      color: "var(--ds-icon-success, #6A9A23)",
+      size: iconSize
     })
   }));
 };

package/dist/es2019/ui/format-menu-nested.js

@@ -5,6 +5,7 @@ import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import ChangesIcon from '@atlaskit/icon/core/changes';
 import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
 export const FormatMenuComponent = ({
   api,
@@ -30,13 +31,20 @@ export const FormatMenuComponent = ({
       return tr;
     });
   }, [api]);
+
+  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
+  // Adds size="small" to icons for better visual consistency in block menu.
+  // To clean up: remove conditional, keep only size="small" version.
+  const iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
     text: formatMessage(blockMenuMessages.turnInto),
     elemBefore: /*#__PURE__*/React.createElement(ChangesIcon, {
-      label: ""
+      label: "",
+      size: iconSize
     }),
     elemAfter: /*#__PURE__*/React.createElement(ChevronRightIcon, {
-      label: ""
+      label: "",
+      size: iconSize
     }),
     enableMaxHeight: true,
     onClick: handleClick,

package/dist/es2019/ui/move-down.js

@@ -8,6 +8,7 @@ import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages'
 import { DIRECTION } from '@atlaskit/editor-common/types';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import ArrowDownIcon from '@atlaskit/icon/core/arrow-down';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useBlockMenu } from './block-menu-provider';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
 import { fixBlockMenuPositionAndScroll } from './utils/fixBlockMenuPositionAndScroll';
@@ -64,11 +65,17 @@ const MoveDownDropdownItemContent = ({
       fixBlockMenuPositionAndScroll(newFirstNode);
     });
   };
+
+  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
+  // Adds size="small" to icons for better visual consistency in block menu.
+  // To clean up: remove conditional, keep only size="small" version.
+  const iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     triggerRef: moveDownRef,
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(ArrowDownIcon, {
-      label: ""
+      label: "",
+      size: iconSize
     }),
     isDisabled: !canMoveDown,
     testId: BLOCK_MENU_ACTION_TEST_ID.MOVE_DOWN

package/dist/es2019/ui/move-up.js

@@ -8,6 +8,7 @@ import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages'
 import { DIRECTION } from '@atlaskit/editor-common/types';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import ArrowUpIcon from '@atlaskit/icon/core/arrow-up';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useBlockMenu } from './block-menu-provider';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
 import { fixBlockMenuPositionAndScroll } from './utils/fixBlockMenuPositionAndScroll';
@@ -62,11 +63,17 @@ const MoveUpDropdownItemContent = ({
       fixBlockMenuPositionAndScroll(newFirstNode);
     });
   };
+
+  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
+  // Adds size="small" to icons for better visual consistency in block menu.
+  // To clean up: remove conditional, keep only size="small" version.
+  const iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     triggerRef: moveUpRef,
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(ArrowUpIcon, {
-      label: ""
+      label: "",
+      size: iconSize
     }),
     isDisabled: !canMoveUp,
     testId: BLOCK_MENU_ACTION_TEST_ID.MOVE_UP

package/dist/es2019/ui/suggested-items-menu-section.js

@@ -2,7 +2,9 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useSuggestedItems } from './hooks/useSuggestedItems';
+import { hasCreateSectionContent, hasStructureSectionContent } from './utils/checkHasPreviousSectionContent';
 export const SuggestedItemsMenuSection = /*#__PURE__*/React.memo(({
   api,
   children
@@ -14,7 +16,14 @@ export const SuggestedItemsMenuSection = /*#__PURE__*/React.memo(({
   if (suggestedItems.length === 0) {
     return null;
   }
+
+  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
+  // Conditionally show separator based on whether there's content after this section.
+  // Old behavior: always show separator (true).
+  // To clean up: remove conditional, keep only the hasCreateSectionContent || hasStructureSectionContent logic.
+  const hasSeparator = fg('platform_editor_block_menu_v2_patch_3') ? hasCreateSectionContent(api) || hasStructureSectionContent(api) : true;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-    title: formatMessage(blockMenuMessages.suggested)
+    title: formatMessage(blockMenuMessages.suggested),
+    hasSeparator: hasSeparator
   }, children);
 });

package/dist/es2019/ui/utils/checkHasPreviousSectionContent.js

@@ -0,0 +1,59 @@
+import { TRANSFORM_SUGGESTED_MENU_SECTION, TRANSFORM_CREATE_MENU_SECTION, TRANSFORM_STRUCTURE_MENU_SECTION } from '@atlaskit/editor-common/block-menu';
+import { buildChildrenMap, getChildrenMapKey, willComponentRender } from '../block-menu-renderer/utils';
+
+/**
+ * Checks if a section has any visible content (items that will render)
+ */
+const hasSectionContent = (sectionKey, api) => {
+  var _api$blockMenu;
+  const blockMenuComponents = api === null || api === void 0 ? void 0 : (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.actions.getBlockMenuComponents();
+  if (!blockMenuComponents) {
+    return false;
+  }
+  const childrenMap = buildChildrenMap(blockMenuComponents);
+  const sectionMapKey = getChildrenMapKey(sectionKey, 'block-menu-section');
+  const sectionChildren = childrenMap.get(sectionMapKey) || [];
+  return sectionChildren.some(child => willComponentRender(child, childrenMap));
+};
+
+/**
+ * Checks if the Suggested section has any visible content
+ */
+export const hasSuggestedSectionContent = api => {
+  return hasSectionContent(TRANSFORM_SUGGESTED_MENU_SECTION.key, api);
+};
+
+/**
+ * Checks if the Create section has any visible content
+ */
+export const hasCreateSectionContent = api => {
+  return hasSectionContent(TRANSFORM_CREATE_MENU_SECTION.key, api);
+};
+
+/**
+ * Checks if the Structure section has any visible content
+ */
+export const hasStructureSectionContent = api => {
+  return hasSectionContent(TRANSFORM_STRUCTURE_MENU_SECTION.key, api);
+};
+
+/**
+ * Checks if there's any content before the Create section (i.e., Suggested section has content)
+ */
+export const hasContentBeforeCreate = api => {
+  return hasSuggestedSectionContent(api);
+};
+
+/**
+ * Checks if there's any content before the Structure section (i.e., Create or Suggested sections have content)
+ */
+export const hasContentBeforeStructure = api => {
+  return hasCreateSectionContent(api) || hasSuggestedSectionContent(api);
+};
+
+/**
+ * Checks if there's any content before the Headings section (i.e., Structure, Create, or Suggested sections have content)
+ */
+export const hasContentBeforeHeadings = api => {
+  return hasStructureSectionContent(api) || hasCreateSectionContent(api) || hasSuggestedSectionContent(api);
+};

package/dist/es2019/ui/utils/fixBlockMenuPositionAndScroll.js

@@ -1,10 +1,11 @@
 import { getDocument } from '@atlaskit/browser-apis';
+import { BLOCK_MENU_TEST_ID } from '@atlaskit/editor-common/block-menu';
 export const fixBlockMenuPositionAndScroll = firstSelectedNode => {
   const doc = getDocument();
   if (!doc) {
     return;
   }
-  const blockMenuEl = doc.querySelector('[data-testid="editor-block-menu"]');
+  const blockMenuEl = doc.querySelector(`[data-testid="${BLOCK_MENU_TEST_ID}"]`);
   if (!(blockMenuEl !== null && blockMenuEl !== void 0 && blockMenuEl.parentElement)) {
     return;
   }

package/dist/esm/editor-commands/transform-node-utils/wrapStep.js

@@ -7,7 +7,7 @@ import { convertExpandToNestedExpand } from './utils';
  * Wraps nodes into the target container type.
  * When wrapping into expand, any expand children are converted to nestedExpand
  * since expand cannot be a direct child of expand.
- * 
+ *
  * Preserves breakout marks when both source and target nodes support resizing
  * (codeBlock, expand, layoutSection).
  */

package/dist/esm/pm-plugins/experiences/block-menu-experiences.js

@@ -1,10 +1,10 @@
 import { bind } from 'bind-event-listener';
 import { ACTION, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
-import { BLOCK_MENU_ACTION_TEST_ID } from '@atlaskit/editor-common/block-menu';
-import { Experience, EXPERIENCE_ID, ExperienceCheckDomMutation, ExperienceCheckTimeout, getPopupContainerFromEditorView } from '@atlaskit/editor-common/experiences';
+import { BLOCK_MENU_ACTION_TEST_ID, BLOCK_MENU_TEST_ID } from '@atlaskit/editor-common/block-menu';
+import { Experience, EXPERIENCE_ID, ExperienceCheckDomMutation, ExperienceCheckPopupMutation, ExperienceCheckTimeout, getPopupContainerFromEditorView } from '@atlaskit/editor-common/experiences';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import { getParentDOMAtSelection, handleDeleteDomMutation, handleMenuOpenDomMutation, handleMoveDomMutation, handleTransformDomMutation, isBlockMenuVisible, isDragHandleElement } from './experience-check-utils';
+import { getParentDOMAtSelection, handleDeleteDomMutation, handleMoveDomMutation, handleTransformDomMutation, isBlockMenuVisible, isDragHandleElement } from './experience-check-utils';
 var TIMEOUT_DURATION = 1000;
 var pluginKey = new PluginKey('blockMenuExperiences');
 var START_METHOD = {
@@ -27,21 +27,23 @@ export var getBlockMenuExperiencesPlugin = function getBlockMenuExperiencesPlugi
     }
     return popupTargetEl;
   };
+  var getEditorDom = function getEditorDom() {
+    var _editorView2;
+    if (((_editorView2 = editorView) === null || _editorView2 === void 0 ? void 0 : _editorView2.dom) instanceof HTMLElement) {
+      return editorView.dom;
+    }
+    return null;
+  };
   var blockMenuOpenExperience = new Experience(EXPERIENCE_ID.MENU_OPEN, {
     actionSubjectId: ACTION_SUBJECT_ID.BLOCK_MENU,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     checks: [new ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), new ExperienceCheckDomMutation({
-      onDomMutation: handleMenuOpenDomMutation,
-      observeConfig: function observeConfig() {
-        return {
-          target: getPopupsTarget(),
-          options: {
-            childList: true
-          }
-        };
-      }
+    }), new ExperienceCheckPopupMutation({
+      nestedElementQuery: "[data-testid=\"".concat(BLOCK_MENU_TEST_ID, "\"]"),
+      getTarget: getPopupsTarget,
+      getEditorDom: getEditorDom,
+      type: 'editorContent'
     })]
   });
   var actionObserveConfig = function actionObserveConfig() {

package/dist/esm/pm-plugins/experiences/experience-check-utils.js

@@ -2,6 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+import { BLOCK_MENU_TEST_ID } from '@atlaskit/editor-common/block-menu';
 import { popupWithNestedElement } from '@atlaskit/editor-common/experiences';
 import { CellSelection } from '@atlaskit/editor-tables';
 
@@ -25,7 +26,7 @@ export var isBlockMenuVisible = function isBlockMenuVisible(popupsTarget) {
   if (!popupsTarget) {
     return false;
   }
-  return popupWithNestedElement(popupsTarget, '[data-testid="editor-block-menu"]') !== null;
+  return popupWithNestedElement(popupsTarget, "[data-testid=\"".concat(BLOCK_MENU_TEST_ID, "\"]")) !== null;
 };
 
 /**
@@ -65,7 +66,7 @@ var isBlockMenuAddedInMutation = function isBlockMenuAddedInMutation(_ref) {
   return type === 'childList' && _toConsumableArray(addedNodes).some(isBlockMenuWithinNode);
 };
 var isBlockMenuWithinNode = function isBlockMenuWithinNode(node) {
-  return popupWithNestedElement(node, '[data-testid="editor-block-menu"]') !== null;
+  return popupWithNestedElement(node, "[data-testid=\"".concat(BLOCK_MENU_TEST_ID, "\"]")) !== null;
 };
 
 /**

package/dist/esm/pm-plugins/main.js

@@ -30,7 +30,7 @@ export var createPlugin = function createPlugin(api) {
         }
 
         // Block further handling of key events when block menu is open
-        // Except for backspace/delete/copy/cut/paste/undo/redo/copy-link-to-block which should be handled by the selection preservation plugin
+        // Except for backspace/delete/copy/cut/paste/undo/redo/copy-link-to-selection which should be handled by the selection preservation plugin
         return shouldSuppressKeyboardEvent(event);
       }
     }

package/dist/esm/pm-plugins/utils/shouldSuppressKeyboardEvent.js

@@ -6,7 +6,7 @@
  * - Backspace/Delete: Allow deleting selected content
  * - Copy/Cut/Paste: Allow clipboard operations (Cmd/Ctrl+C, Cmd/Ctrl+X, Cmd/Ctrl+V)
  * - Undo/Redo: Allow undo/redo operations (Cmd/Ctrl+Z, Cmd/Ctrl+Y)
- * - Copy Link to Block: Allow the keyboard shortcut (Cmd/Ctrl+Alt+A)
+ * - Copy Link to Selection: Allow the keyboard shortcut (Cmd/Ctrl+Alt+A)
  *
  * @param event - The keyboard event to check
  * @returns true if the event should be suppressed, false if it should be allowed

package/dist/esm/ui/block-menu-components.js

@@ -15,6 +15,7 @@ import { MoveDownDropdownItem } from './move-down';
 import { MoveUpDropdownItem } from './move-up';
 import { SuggestedItemsMenuSection } from './suggested-items-menu-section';
 import { SuggestedMenuItems } from './suggested-menu-items';
+import { hasContentBeforeCreate, hasContentBeforeStructure, hasContentBeforeHeadings } from './utils/checkHasPreviousSectionContent';
 import { createMenuItemsMap } from './utils/createMenuItemsMap';
 import { getSuggestedItemsFromSelection } from './utils/getSuggestedItemsFromSelection';
 var MIN_NUMBER_OF_AVAILABLE_NATIVE_TRANSFORMS = 7;
@@ -135,7 +136,8 @@ var getTurnIntoMenuComponents = function getTurnIntoMenuComponents(api) {
         },
         children = _ref3.children;
       return /*#__PURE__*/React.createElement(MenuSection, {
-        title: blockMenuMessages.create
+        title: blockMenuMessages.create,
+        hasSeparator: hasContentBeforeCreate(api)
       }, children);
     }
   }, {
@@ -152,7 +154,8 @@ var getTurnIntoMenuComponents = function getTurnIntoMenuComponents(api) {
         },
         children = _ref4.children;
       return /*#__PURE__*/React.createElement(MenuSection, {
-        title: blockMenuMessages.structure
+        title: blockMenuMessages.structure,
+        hasSeparator: hasContentBeforeStructure(api)
       }, children);
     }
   }, {
@@ -170,7 +173,7 @@ var getTurnIntoMenuComponents = function getTurnIntoMenuComponents(api) {
         children = _ref5.children;
       return /*#__PURE__*/React.createElement(MenuSection, {
         title: blockMenuMessages.headings,
-        hasSeparator: true
+        hasSeparator: hasContentBeforeHeadings(api)
       }, children);
     }
   }, {

package/dist/esm/ui/block-menu-renderer/fallbacks.js

@@ -3,14 +3,20 @@ import { useIntl } from 'react-intl-next';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItem, ToolbarDropdownItemSection, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
+import { fg } from '@atlaskit/platform-feature-flags';
 var FallbackNestedMenu = function FallbackNestedMenu(_ref) {
   var children = _ref.children;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
+  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
+  // Adds size="small" to icons for better visual consistency in block menu.
+  // To clean up: remove conditional, keep only size="small" version.
+  var iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
     elemBefore: undefined,
     elemAfter: /*#__PURE__*/React.createElement(ChevronRightIcon, {
-      label: ""
+      label: "",
+      size: iconSize
     }),
     text: formatMessage(blockMenuMessages.fallbackNestedMenu),
     enableMaxHeight: true,

package/dist/esm/ui/block-menu.js

@@ -6,6 +6,7 @@ import React, { useContext, useEffect, useRef } from 'react';
 import { injectIntl } from 'react-intl-next';
 import { cx } from '@atlaskit/css';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { BLOCK_MENU_TEST_ID } from '@atlaskit/editor-common/block-menu';
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { DRAG_HANDLE_SELECTOR, DRAG_HANDLE_WIDTH } from '@atlaskit/editor-common/styles';
@@ -91,7 +92,7 @@ var BlockMenuContent = function BlockMenuContent(_ref2) {
     return target.closest('[data-toolbar-nested-dropdown-menu]') !== null;
   };
   return /*#__PURE__*/React.createElement(Box, {
-    testId: "editor-block-menu",
+    testId: BLOCK_MENU_TEST_ID,
     role: expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menu' : undefined,
     ref: ref,
     xcss: cx(styles.base, fg('platform_editor_block_menu_v2_patch_2') && styles.maxWidthStyles, editorExperiment('platform_synced_block', true) && styles.emptyMenuSectionStyles)

package/dist/esm/ui/copy-link.js

@@ -79,15 +79,26 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
   if (!fg('platform_editor_adf_with_localid')) {
     return null;
   }
+
+  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
+  // Conditionally display message based on feature flag
+  // To clean up: remove the conditional and use only copyLinkToBlock message
+  var message = fg('platform_editor_block_menu_v2_patch_3') ? messages.copyLinkToBlock : messages.copyLinkToBlockOld;
+
+  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
+  // Adds size="small" to icons for better visual consistency in block menu.
+  // To clean up: remove conditional, keep only size="small" version.
+  var iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(LinkIcon, {
-      label: ""
+      label: "",
+      size: iconSize
     }),
     elemAfter: shortcut ? /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: shortcut
     }) : undefined,
     ariaKeyshortcuts: shortcut
-  }, formatMessage(messages.copyLinkToBlock));
+  }, formatMessage(message));
 };
 export var CopyLinkDropdownItem = injectIntl(CopyLinkDropdownItemContent);

package/dist/esm/ui/delete-button.js

@@ -6,6 +6,7 @@ import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { deleteSelectedRange, getSourceNodesFromSelectionRange } from '@atlaskit/editor-common/selection';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import DeleteIcon from '@atlaskit/icon/core/delete';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Box } from '@atlaskit/primitives/box';
 import Text from '@atlaskit/primitives/text';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
@@ -87,6 +88,11 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
       onRemoveHoverDecoration();
     };
   }, [onRemoveHoverDecoration]);
+
+  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
+  // Adds size="small" to icons for better visual consistency in block menu.
+  // To clean up: remove conditional, keep only size="small" version.
+  var iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(Box, {
     onMouseEnter: onShowHoverDecoration,
     onMouseLeave: onRemoveHoverDecoration,
@@ -95,7 +101,8 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
   }, /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/React.createElement(DeleteIcon, {
       color: "var(--ds-icon-danger, #C9372C)",
-      label: ""
+      label: "",
+      size: iconSize
     }),
     onClick: onClick,
     testId: BLOCK_MENU_ACTION_TEST_ID.DELETE

package/dist/esm/ui/flag.js

@@ -5,6 +5,7 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages';
 import AkFlag, { FlagGroup, AutoDismissFlag } from '@atlaskit/flag';
 import SuccessIcon from '@atlaskit/icon/core/check-circle';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { FLAG_ID } from '../blockMenuPluginType';
 import { blockMenuPluginKey } from '../pm-plugins/main';
 var flagMap = _defineProperty({}, FLAG_ID.LINK_COPIED_TO_CLIPBOARD, {
@@ -37,6 +38,11 @@ export var Flag = function Flag(_ref) {
     api === null || api === void 0 || api.core.actions.focus();
   };
   var FlagComponent = flagMap[showFlag].autoDismiss ? AutoDismissFlag : AkFlag;
+
+  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
+  // Adds size="small" to icons for better visual consistency in block menu.
+  // To clean up: remove conditional, keep only size="small" version.
+  var iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(FlagGroup, null, /*#__PURE__*/React.createElement(FlagComponent, {
     onDismissed: onDismissed,
     title: formatMessage(title),
@@ -44,7 +50,8 @@ export var Flag = function Flag(_ref) {
     testId: showFlag,
     icon: /*#__PURE__*/React.createElement(SuccessIcon, {
       label: "",
-      color: "var(--ds-icon-success, #6A9A23)"
+      color: "var(--ds-icon-success, #6A9A23)",
+      size: iconSize
     })
   }));
 };

package/dist/esm/ui/format-menu-nested.js

@@ -5,6 +5,7 @@ import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import ChangesIcon from '@atlaskit/icon/core/changes';
 import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
 export var FormatMenuComponent = function FormatMenuComponent(_ref) {
   var api = _ref.api,
@@ -27,13 +28,20 @@ export var FormatMenuComponent = function FormatMenuComponent(_ref) {
       return tr;
     });
   }, [api]);
+
+  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
+  // Adds size="small" to icons for better visual consistency in block menu.
+  // To clean up: remove conditional, keep only size="small" version.
+  var iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
     text: formatMessage(blockMenuMessages.turnInto),
     elemBefore: /*#__PURE__*/React.createElement(ChangesIcon, {
-      label: ""
+      label: "",
+      size: iconSize
     }),
     elemAfter: /*#__PURE__*/React.createElement(ChevronRightIcon, {
-      label: ""
+      label: "",
+      size: iconSize
     }),
     enableMaxHeight: true,
     onClick: handleClick,

package/dist/esm/ui/move-down.js

@@ -8,6 +8,7 @@ import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages'
 import { DIRECTION } from '@atlaskit/editor-common/types';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import ArrowDownIcon from '@atlaskit/icon/core/arrow-down';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useBlockMenu } from './block-menu-provider';
 import { BLOCK_MENU_ITEM_NAME } from './consts';
 import { fixBlockMenuPositionAndScroll } from './utils/fixBlockMenuPositionAndScroll';
@@ -58,11 +59,17 @@ var MoveDownDropdownItemContent = function MoveDownDropdownItemContent(_ref) {
       fixBlockMenuPositionAndScroll(newFirstNode);
     });
   };
+
+  // [FEATURE FLAG: platform_editor_block_menu_v2_patch_3]
+  // Adds size="small" to icons for better visual consistency in block menu.
+  // To clean up: remove conditional, keep only size="small" version.
+  var iconSize = fg('platform_editor_block_menu_v2_patch_3') ? 'small' : undefined;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     triggerRef: moveDownRef,
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(ArrowDownIcon, {
-      label: ""
+      label: "",
+      size: iconSize
     }),
     isDisabled: !canMoveDown,
     testId: BLOCK_MENU_ACTION_TEST_ID.MOVE_DOWN