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

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

package/dist/esm/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';
@@ -56,11 +57,17 @@ var MoveUpDropdownItemContent = function MoveUpDropdownItemContent(_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: moveUpRef,
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(ArrowUpIcon, {
-      label: ""
+      label: "",
+      size: iconSize
     }),
     isDisabled: !canMoveUp,
     testId: BLOCK_MENU_ACTION_TEST_ID.MOVE_UP

package/dist/esm/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 var SuggestedItemsMenuSection = /*#__PURE__*/React.memo(function (_ref) {
   var api = _ref.api,
     children = _ref.children;
@@ -12,7 +14,14 @@ export var SuggestedItemsMenuSection = /*#__PURE__*/React.memo(function (_ref) {
   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.
+  var 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/esm/ui/utils/checkHasPreviousSectionContent.js

@@ -0,0 +1,61 @@
+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)
+ */
+var hasSectionContent = function hasSectionContent(sectionKey, api) {
+  var _api$blockMenu;
+  var blockMenuComponents = api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.actions.getBlockMenuComponents();
+  if (!blockMenuComponents) {
+    return false;
+  }
+  var childrenMap = buildChildrenMap(blockMenuComponents);
+  var sectionMapKey = getChildrenMapKey(sectionKey, 'block-menu-section');
+  var sectionChildren = childrenMap.get(sectionMapKey) || [];
+  return sectionChildren.some(function (child) {
+    return willComponentRender(child, childrenMap);
+  });
+};
+
+/**
+ * Checks if the Suggested section has any visible content
+ */
+export var hasSuggestedSectionContent = function hasSuggestedSectionContent(api) {
+  return hasSectionContent(TRANSFORM_SUGGESTED_MENU_SECTION.key, api);
+};
+
+/**
+ * Checks if the Create section has any visible content
+ */
+export var hasCreateSectionContent = function hasCreateSectionContent(api) {
+  return hasSectionContent(TRANSFORM_CREATE_MENU_SECTION.key, api);
+};
+
+/**
+ * Checks if the Structure section has any visible content
+ */
+export var hasStructureSectionContent = function 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 var hasContentBeforeCreate = function hasContentBeforeCreate(api) {
+  return hasSuggestedSectionContent(api);
+};
+
+/**
+ * Checks if there's any content before the Structure section (i.e., Create or Suggested sections have content)
+ */
+export var hasContentBeforeStructure = function 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 var hasContentBeforeHeadings = function hasContentBeforeHeadings(api) {
+  return hasStructureSectionContent(api) || hasCreateSectionContent(api) || hasSuggestedSectionContent(api);
+};

package/dist/esm/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 var fixBlockMenuPositionAndScroll = function fixBlockMenuPositionAndScroll(firstSelectedNode) {
   var doc = getDocument();
   if (!doc) {
     return;
   }
-  var blockMenuEl = doc.querySelector('[data-testid="editor-block-menu"]');
+  var blockMenuEl = doc.querySelector("[data-testid=\"".concat(BLOCK_MENU_TEST_ID, "\"]"));
   if (!(blockMenuEl !== null && blockMenuEl !== void 0 && blockMenuEl.parentElement)) {
     return;
   }

package/dist/types/pm-plugins/utils/shouldSuppressKeyboardEvent.d.ts

@@ -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/types/ui/utils/checkHasPreviousSectionContent.d.ts

@@ -0,0 +1,26 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { BlockMenuPlugin } from '../../blockMenuPluginType';
+/**
+ * Checks if the Suggested section has any visible content
+ */
+export declare const hasSuggestedSectionContent: (api: ExtractInjectionAPI<BlockMenuPlugin> | undefined) => boolean;
+/**
+ * Checks if the Create section has any visible content
+ */
+export declare const hasCreateSectionContent: (api: ExtractInjectionAPI<BlockMenuPlugin> | undefined) => boolean;
+/**
+ * Checks if the Structure section has any visible content
+ */
+export declare const hasStructureSectionContent: (api: ExtractInjectionAPI<BlockMenuPlugin> | undefined) => boolean;
+/**
+ * Checks if there's any content before the Create section (i.e., Suggested section has content)
+ */
+export declare const hasContentBeforeCreate: (api: ExtractInjectionAPI<BlockMenuPlugin> | undefined) => boolean;
+/**
+ * Checks if there's any content before the Structure section (i.e., Create or Suggested sections have content)
+ */
+export declare const hasContentBeforeStructure: (api: ExtractInjectionAPI<BlockMenuPlugin> | undefined) => boolean;
+/**
+ * Checks if there's any content before the Headings section (i.e., Structure, Create, or Suggested sections have content)
+ */
+export declare const hasContentBeforeHeadings: (api: ExtractInjectionAPI<BlockMenuPlugin> | undefined) => boolean;

package/dist/types-ts4.5/pm-plugins/utils/shouldSuppressKeyboardEvent.d.ts

@@ -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/types-ts4.5/ui/utils/checkHasPreviousSectionContent.d.ts

@@ -0,0 +1,26 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { BlockMenuPlugin } from '../../blockMenuPluginType';
+/**
+ * Checks if the Suggested section has any visible content
+ */
+export declare const hasSuggestedSectionContent: (api: ExtractInjectionAPI<BlockMenuPlugin> | undefined) => boolean;
+/**
+ * Checks if the Create section has any visible content
+ */
+export declare const hasCreateSectionContent: (api: ExtractInjectionAPI<BlockMenuPlugin> | undefined) => boolean;
+/**
+ * Checks if the Structure section has any visible content
+ */
+export declare const hasStructureSectionContent: (api: ExtractInjectionAPI<BlockMenuPlugin> | undefined) => boolean;
+/**
+ * Checks if there's any content before the Create section (i.e., Suggested section has content)
+ */
+export declare const hasContentBeforeCreate: (api: ExtractInjectionAPI<BlockMenuPlugin> | undefined) => boolean;
+/**
+ * Checks if there's any content before the Structure section (i.e., Create or Suggested sections have content)
+ */
+export declare const hasContentBeforeStructure: (api: ExtractInjectionAPI<BlockMenuPlugin> | undefined) => boolean;
+/**
+ * Checks if there's any content before the Headings section (i.e., Structure, Create, or Suggested sections have content)
+ */
+export declare const hasContentBeforeHeadings: (api: ExtractInjectionAPI<BlockMenuPlugin> | undefined) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "6.1.0",
+	"version": "6.1.2",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,7 @@
 		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/dropdown-menu": "^16.4.0",
 		"@atlaskit/editor-plugin-analytics": "^7.0.0",
-		"@atlaskit/editor-plugin-block-controls": "^8.5.0",
+		"@atlaskit/editor-plugin-block-controls": "^8.6.0",
 		"@atlaskit/editor-plugin-decorations": "^7.0.0",
 		"@atlaskit/editor-plugin-selection": "^7.0.0",
 		"@atlaskit/editor-plugin-user-intent": "^5.0.0",
@@ -41,18 +41,18 @@
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.19.0",
 		"@atlaskit/flag": "^17.8.0",
-		"@atlaskit/icon": "^31.0.0",
+		"@atlaskit/icon": "^32.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^18.0.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/tmp-editor-statsig": "^29.4.0",
+		"@atlaskit/tmp-editor-statsig": "^29.6.0",
 		"@atlaskit/tokens": "^11.0.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.19.0",
+		"@atlaskit/editor-common": "^111.20.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
@@ -102,6 +102,9 @@
 		"platform_editor_block_menu_v2_patch_2": {
 			"type": "boolean"
 		},
+		"platform_editor_block_menu_v2_patch_3": {
+			"type": "boolean"
+		},
 		"platform_editor_preserve_breakout_on_transform": {
 			"type": "boolean"
 		}