@atlaskit/editor-plugin-block-menu 6.0.21 → 6.0.23

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 6.0.23
+
+### Patch Changes
+
+- [`0d8216e610e34`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0d8216e610e34) -
+  [ux] Add cmd-option-a shortcut for copylink to block from block menu
+- Updated dependencies
+
+## 6.0.22
+
+### Patch Changes
+
+- [`33f11753a7104`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/33f11753a7104) -
+  [ux] Added i18n for sections' titles in the Turn into menu.
+- Updated dependencies
+
 ## 6.0.21
 
 ### Patch Changes

package/afm-jira/tsconfig.json

@@ -1,5 +1,5 @@
 {
-	"extends": "../../../../tsconfig.entry-points.jira.json",
+	"extends": "../../../../tsconfig.local-consumption.json",
 	"compilerOptions": {
 		"target": "es5",
 		"outDir": "../../../../../jira/tsDist/@atlaskit__editor-plugin-block-menu/app",

package/dist/cjs/blockMenuPlugin.js

@@ -10,6 +10,7 @@ var _editorActions = require("./editor-actions");
 var _isTransformToTargetDisabled = require("./editor-actions/isTransformToTargetDisabled");
 var _formatNode2 = require("./editor-commands/formatNode");
 var _transformNode2 = require("./editor-commands/transformNode");
+var _keymap = require("./pm-plugins/keymap");
 var _main = require("./pm-plugins/main");
 var _blockMenu = _interopRequireDefault(require("./ui/block-menu"));
 var _blockMenuComponents = require("./ui/block-menu-components");
@@ -31,6 +32,11 @@ var blockMenuPlugin = exports.blockMenuPlugin = function blockMenuPlugin(_ref) {
         plugin: function plugin() {
           return (0, _main.createPlugin)(api);
         }
+      }, {
+        name: 'blockMenuKeymap',
+        plugin: function plugin() {
+          return (0, _keymap.keymapPlugin)(api, config);
+        }
       }];
     },
     actions: {

package/dist/cjs/pm-plugins/keymap.js

@@ -0,0 +1,61 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.keymapPlugin = keymapPlugin;
+var _keymaps = require("@atlaskit/editor-common/keymaps");
+var _selection = require("@atlaskit/editor-common/selection");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _blockMenuPluginType = require("../blockMenuPluginType");
+var _main = require("../pm-plugins/main");
+var _copyLink = require("../ui/utils/copyLink");
+function keymapPlugin(api, config) {
+  var list = {};
+  var copyLinkToBlockCommand = function copyLinkToBlockCommand(state, dispatch) {
+    var _api$blockControls, _node$attrs;
+    // Check if feature flag is enabled
+    if (!(0, _platformFeatureFlags.fg)('platform_editor_adf_with_localid')) {
+      return false;
+    }
+
+    // Get the preserved selection (only works when block menu is open and selection is preserved)
+    var selection = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.sharedState.currentState()) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.preservedSelection;
+    if (!selection) {
+      return false;
+    }
+
+    // Check if the selection has a valid block range with localId
+    var blockRange = (0, _selection.expandSelectionToBlockRange)(selection);
+    if (!blockRange) {
+      return false;
+    }
+    var node = blockRange.$from.nodeAfter;
+    if (!(node !== null && node !== void 0 && (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.localId)) {
+      return false;
+    }
+
+    // Execute the copy link action
+    var _ref = config || {},
+      getLinkPath = _ref.getLinkPath,
+      blockLinkHashPrefix = _ref.blockLinkHashPrefix;
+    (0, _copyLink.copyLink)({
+      getLinkPath: getLinkPath,
+      blockLinkHashPrefix: blockLinkHashPrefix,
+      selection: selection
+    }).then(function (success) {
+      if (success && dispatch) {
+        dispatch(state.tr.setMeta(_main.blockMenuPluginKey, {
+          showFlag: _blockMenuPluginType.FLAG_ID.LINK_COPIED_TO_CLIPBOARD
+        }));
+      }
+    });
+    return true;
+  };
+
+  // Ignored via go/ees005
+  (0, _keymaps.bindKeymapWithCommand)(
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  _keymaps.copyLinkToBlock.common, copyLinkToBlockCommand, list);
+  return (0, _keymaps.keymap)(list);
+}

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.createPlugin = exports.blockMenuPluginKey = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _shouldSuppressKeyboardEvent = require("./utils/shouldSuppressKeyboardEvent");
 var blockMenuPluginKey = exports.blockMenuPluginKey = new _state.PluginKey('blockMenuPlugin');
 var createPlugin = exports.createPlugin = function createPlugin(api) {
   return new _safePlugin.SafePlugin({
@@ -35,14 +36,8 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
         }
 
         // Block further handling of key events when block menu is open
-        // Except for backspace/delete/copy/cut/paste/undo/redo which should be handled by the selection preservation plugin
-        var key = event.key.toLowerCase();
-        var isMetaCtrl = event.metaKey || event.ctrlKey;
-        var isBackspaceDelete = ['backspace', 'delete'].includes(key);
-        var isCopyCutPaste = isMetaCtrl && ['c', 'x', 'v'].includes(key);
-        var isUndoRedo = isMetaCtrl && ['z', 'y'].includes(key);
-        var suppressNativeHandling = !isCopyCutPaste && !isBackspaceDelete && !isUndoRedo;
-        return suppressNativeHandling;
+        // Except for backspace/delete/copy/cut/paste/undo/redo/copy-link-to-block which should be handled by the selection preservation plugin
+        return (0, _shouldSuppressKeyboardEvent.shouldSuppressKeyboardEvent)(event);
       }
     }
   });

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

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shouldSuppressKeyboardEvent = void 0;
+/**
+ * Determines whether keyboard events should be suppressed when the block menu is open.
+ *
+ * When the block menu is open, we want to block most keyboard events to prevent
+ * unintended interactions. However, certain actions should still be allowed:
+ * - 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)
+ *
+ * @param event - The keyboard event to check
+ * @returns true if the event should be suppressed, false if it should be allowed
+ */
+var shouldSuppressKeyboardEvent = exports.shouldSuppressKeyboardEvent = function shouldSuppressKeyboardEvent(event) {
+  var key = event.key.toLowerCase();
+  var code = event.code.toLowerCase();
+  var isMetaCtrl = event.metaKey || event.ctrlKey;
+  var isAlt = event.altKey;
+
+  // Check for allowed keyboard shortcuts
+  var isBackspaceDelete = ['backspace', 'delete'].includes(key);
+  var isCopyCutPaste = isMetaCtrl && ['c', 'x', 'v'].includes(key);
+  var isUndoRedo = isMetaCtrl && ['z', 'y'].includes(key);
+
+  // Use event.code to detect physical key 'A' because on macOS Option+A produces 'å'
+  var isCopyLinkToBlock = isMetaCtrl && isAlt && code === 'keya';
+
+  // Suppress all events except the allowed ones
+  var suppressNativeHandling = !isCopyCutPaste && !isBackspaceDelete && !isUndoRedo && !isCopyLinkToBlock;
+  return suppressNativeHandling;
+};

package/dist/cjs/ui/MenuSection.js

@@ -0,0 +1,21 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MenuSection = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _editorToolbar = require("@atlaskit/editor-toolbar");
+var MenuSection = exports.MenuSection = function MenuSection(_ref) {
+  var children = _ref.children,
+    title = _ref.title,
+    hasSeparator = _ref.hasSeparator;
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
+  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
+    title: formatMessage(title),
+    hasSeparator: hasSeparator
+  }, children);
+};

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

@@ -8,6 +8,7 @@ exports.getBlockMenuComponents = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
 var _blockMenu = require("@atlaskit/editor-common/block-menu");
+var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _utils = require("./block-menu-renderer/utils");
 var _copyLink = require("./copy-link");
@@ -16,6 +17,7 @@ var _deleteButton = require("./delete-button");
 var _deleteSection = require("./delete-section");
 var _formatMenuNested = require("./format-menu-nested");
 var _formatMenuSection = require("./format-menu-section");
+var _MenuSection = require("./MenuSection");
 var _moveDown = require("./move-down");
 var _moveUp = require("./move-up");
 var _suggestedItemsMenuSection = require("./suggested-items-menu-section");
@@ -139,8 +141,8 @@ var getTurnIntoMenuComponents = function getTurnIntoMenuComponents(api) {
           children: null
         },
         children = _ref3.children;
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
-        title: "Create"
+      return /*#__PURE__*/_react.default.createElement(_MenuSection.MenuSection, {
+        title: _messages.blockMenuMessages.create
       }, children);
     }
   }, {
@@ -156,8 +158,8 @@ var getTurnIntoMenuComponents = function getTurnIntoMenuComponents(api) {
           children: null
         },
         children = _ref4.children;
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
-        title: "Structure"
+      return /*#__PURE__*/_react.default.createElement(_MenuSection.MenuSection, {
+        title: _messages.blockMenuMessages.structure
       }, children);
     }
   }, {
@@ -173,8 +175,8 @@ var getTurnIntoMenuComponents = function getTurnIntoMenuComponents(api) {
           children: null
         },
         children = _ref5.children;
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
-        title: "Headings",
+      return /*#__PURE__*/_react.default.createElement(_MenuSection.MenuSection, {
+        title: _messages.blockMenuMessages.headings,
         hasSeparator: true
       }, children);
     }

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

@@ -10,6 +10,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _hooks = require("@atlaskit/editor-common/hooks");
+var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _link = _interopRequireDefault(require("@atlaskit/icon/core/link"));
@@ -30,6 +31,7 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
   var _ref2 = config || {},
     getLinkPath = _ref2.getLinkPath,
     blockLinkHashPrefix = _ref2.blockLinkHashPrefix;
+  var shortcut = (0, _keymaps.formatShortcut)(_keymaps.copyLinkToBlock);
   var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['blockControls', 'selection'], function (_ref3) {
       var blockControlsState = _ref3.blockControlsState,
         selectionState = _ref3.selectionState;
@@ -90,7 +92,11 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/_react.default.createElement(_link.default, {
       label: ""
-    })
+    }),
+    elemAfter: shortcut ? /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+      shortcut: shortcut
+    }) : undefined,
+    ariaKeyshortcuts: shortcut
   }, formatMessage(_messages.blockMenuMessages.copyLinkToBlock));
 };
 var CopyLinkDropdownItem = exports.CopyLinkDropdownItem = (0, _reactIntlNext.injectIntl)(CopyLinkDropdownItemContent);

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

@@ -6,16 +6,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SuggestedItemsMenuSection = void 0;
 var _react = _interopRequireDefault(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _useSuggestedItems = require("./hooks/useSuggestedItems");
 var SuggestedItemsMenuSection = exports.SuggestedItemsMenuSection = /*#__PURE__*/_react.default.memo(function (_ref) {
   var api = _ref.api,
     children = _ref.children;
   var suggestedItems = (0, _useSuggestedItems.useSuggestedItems)(api);
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
   if (suggestedItems.length === 0) {
     return null;
   }
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
-    title: "Suggested"
+    title: formatMessage(_messages.blockMenuMessages.suggested)
   }, children);
 });

package/dist/es2019/blockMenuPlugin.js

@@ -3,6 +3,7 @@ import { createBlockMenuRegistry } from './editor-actions';
 import { isTransformToTargetDisabled } from './editor-actions/isTransformToTargetDisabled';
 import { formatNode } from './editor-commands/formatNode';
 import { transformNode } from './editor-commands/transformNode';
+import { keymapPlugin } from './pm-plugins/keymap';
 import { blockMenuPluginKey, createPlugin } from './pm-plugins/main';
 import BlockMenu from './ui/block-menu';
 import { getBlockMenuComponents } from './ui/block-menu-components';
@@ -23,6 +24,9 @@ export const blockMenuPlugin = ({
       return [{
         name: 'blockMenuPlugin',
         plugin: () => createPlugin(api)
+      }, {
+        name: 'blockMenuKeymap',
+        plugin: () => keymapPlugin(api, config)
       }];
     },
     actions: {

package/dist/es2019/pm-plugins/keymap.js

@@ -0,0 +1,56 @@
+import { bindKeymapWithCommand, copyLinkToBlock, keymap } from '@atlaskit/editor-common/keymaps';
+import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { FLAG_ID } from '../blockMenuPluginType';
+import { blockMenuPluginKey } from '../pm-plugins/main';
+import { copyLink } from '../ui/utils/copyLink';
+export function keymapPlugin(api, config) {
+  const list = {};
+  const copyLinkToBlockCommand = (state, dispatch) => {
+    var _api$blockControls, _api$blockControls$sh, _node$attrs;
+    // Check if feature flag is enabled
+    if (!fg('platform_editor_adf_with_localid')) {
+      return false;
+    }
+
+    // Get the preserved selection (only works when block menu is open and selection is preserved)
+    const selection = api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$sh = _api$blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.preservedSelection;
+    if (!selection) {
+      return false;
+    }
+
+    // Check if the selection has a valid block range with localId
+    const blockRange = expandSelectionToBlockRange(selection);
+    if (!blockRange) {
+      return false;
+    }
+    const node = blockRange.$from.nodeAfter;
+    if (!(node !== null && node !== void 0 && (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.localId)) {
+      return false;
+    }
+
+    // Execute the copy link action
+    const {
+      getLinkPath,
+      blockLinkHashPrefix
+    } = config || {};
+    copyLink({
+      getLinkPath,
+      blockLinkHashPrefix,
+      selection
+    }).then(success => {
+      if (success && dispatch) {
+        dispatch(state.tr.setMeta(blockMenuPluginKey, {
+          showFlag: FLAG_ID.LINK_COPIED_TO_CLIPBOARD
+        }));
+      }
+    });
+    return true;
+  };
+
+  // Ignored via go/ees005
+  bindKeymapWithCommand(
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  copyLinkToBlock.common, copyLinkToBlockCommand, list);
+  return keymap(list);
+}

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

@@ -1,5 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { shouldSuppressKeyboardEvent } from './utils/shouldSuppressKeyboardEvent';
 export const blockMenuPluginKey = new PluginKey('blockMenuPlugin');
 export const createPlugin = api => {
   return new SafePlugin({
@@ -29,14 +30,8 @@ export const createPlugin = api => {
         }
 
         // Block further handling of key events when block menu is open
-        // Except for backspace/delete/copy/cut/paste/undo/redo which should be handled by the selection preservation plugin
-        const key = event.key.toLowerCase();
-        const isMetaCtrl = event.metaKey || event.ctrlKey;
-        const isBackspaceDelete = ['backspace', 'delete'].includes(key);
-        const isCopyCutPaste = isMetaCtrl && ['c', 'x', 'v'].includes(key);
-        const isUndoRedo = isMetaCtrl && ['z', 'y'].includes(key);
-        const suppressNativeHandling = !isCopyCutPaste && !isBackspaceDelete && !isUndoRedo;
-        return suppressNativeHandling;
+        // Except for backspace/delete/copy/cut/paste/undo/redo/copy-link-to-block which should be handled by the selection preservation plugin
+        return shouldSuppressKeyboardEvent(event);
       }
     }
   });

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

@@ -0,0 +1,31 @@
+/**
+ * Determines whether keyboard events should be suppressed when the block menu is open.
+ *
+ * When the block menu is open, we want to block most keyboard events to prevent
+ * unintended interactions. However, certain actions should still be allowed:
+ * - 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)
+ *
+ * @param event - The keyboard event to check
+ * @returns true if the event should be suppressed, false if it should be allowed
+ */
+export const shouldSuppressKeyboardEvent = event => {
+  const key = event.key.toLowerCase();
+  const code = event.code.toLowerCase();
+  const isMetaCtrl = event.metaKey || event.ctrlKey;
+  const isAlt = event.altKey;
+
+  // Check for allowed keyboard shortcuts
+  const isBackspaceDelete = ['backspace', 'delete'].includes(key);
+  const isCopyCutPaste = isMetaCtrl && ['c', 'x', 'v'].includes(key);
+  const isUndoRedo = isMetaCtrl && ['z', 'y'].includes(key);
+
+  // Use event.code to detect physical key 'A' because on macOS Option+A produces 'å'
+  const isCopyLinkToBlock = isMetaCtrl && isAlt && code === 'keya';
+
+  // Suppress all events except the allowed ones
+  const suppressNativeHandling = !isCopyCutPaste && !isBackspaceDelete && !isUndoRedo && !isCopyLinkToBlock;
+  return suppressNativeHandling;
+};

package/dist/es2019/ui/MenuSection.js

@@ -0,0 +1,16 @@
+import React from 'react';
+import { useIntl } from 'react-intl-next';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+export const MenuSection = ({
+  children,
+  title,
+  hasSeparator
+}) => {
+  const {
+    formatMessage
+  } = useIntl();
+  return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
+    title: formatMessage(title),
+    hasSeparator: hasSeparator
+  }, children);
+};

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import { BLOCK_ACTIONS_COPY_LINK_TO_BLOCK_MENU_ITEM, BLOCK_ACTIONS_MENU_SECTION, BLOCK_ACTIONS_MENU_SECTION_RANK, DELETE_MENU_SECTION, DELETE_MENU_SECTION_RANK, DELETE_MENU_ITEM, POSITION_MENU_SECTION, POSITION_MENU_SECTION_RANK, POSITION_MOVE_DOWN_MENU_ITEM, POSITION_MOVE_UP_MENU_ITEM, TRANSFORM_MENU_ITEM, TRANSFORM_MENU_ITEM_RANK, TRANSFORM_MENU_SECTION, TRANSFORM_MENU_SECTION_RANK, TRANSFORM_CREATE_MENU_SECTION, TRANSFORM_SUGGESTED_MENU_SECTION, TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_HEADINGS_MENU_SECTION, MAIN_BLOCK_MENU_SECTION_RANK, TRANSFORM_SUGGESTED_MENU_SECTION_RANK, TRANSFORM_SUGGESTED_MENU_ITEM } from '@atlaskit/editor-common/block-menu';
+import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
 import { buildChildrenMap, getChildrenMapKey, willComponentRender } from './block-menu-renderer/utils';
 import { CopyLinkDropdownItem } from './copy-link';
@@ -8,6 +9,7 @@ import { DeleteDropdownItem } from './delete-button';
 import { DeleteSection } from './delete-section';
 import { FormatMenuComponent } from './format-menu-nested';
 import { FormatMenuSection } from './format-menu-section';
+import { MenuSection } from './MenuSection';
 import { MoveDownDropdownItem } from './move-down';
 import { MoveUpDropdownItem } from './move-up';
 import { SuggestedItemsMenuSection } from './suggested-items-menu-section';
@@ -121,8 +123,8 @@ const getTurnIntoMenuComponents = api => {
     } = {
       children: null
     }) => {
-      return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-        title: "Create"
+      return /*#__PURE__*/React.createElement(MenuSection, {
+        title: blockMenuMessages.create
       }, children);
     }
   }, {
@@ -138,8 +140,8 @@ const getTurnIntoMenuComponents = api => {
     } = {
       children: null
     }) => {
-      return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-        title: "Structure"
+      return /*#__PURE__*/React.createElement(MenuSection, {
+        title: blockMenuMessages.structure
       }, children);
     }
   }, {
@@ -155,8 +157,8 @@ const getTurnIntoMenuComponents = api => {
     } = {
       children: null
     }) => {
-      return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-        title: "Headings",
+      return /*#__PURE__*/React.createElement(MenuSection, {
+        title: blockMenuMessages.headings,
         hasSeparator: true
       }, children);
     }

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

@@ -2,8 +2,9 @@ import React, { useCallback } from 'react';
 import { injectIntl, useIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { copyLinkToBlock, formatShortcut } from '@atlaskit/editor-common/keymaps';
 import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages';
-import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
 import LinkIcon from '@atlaskit/icon/core/link';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { FLAG_ID } from '../blockMenuPluginType';
@@ -25,6 +26,7 @@ const CopyLinkDropdownItemContent = ({
     getLinkPath,
     blockLinkHashPrefix
   } = config || {};
+  const shortcut = formatShortcut(copyLinkToBlock);
   const {
     preservedSelection,
     defaultSelection
@@ -89,7 +91,11 @@ const CopyLinkDropdownItemContent = ({
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(LinkIcon, {
       label: ""
-    })
+    }),
+    elemAfter: shortcut ? /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
+      shortcut: shortcut
+    }) : undefined,
+    ariaKeyshortcuts: shortcut
   }, formatMessage(messages.copyLinkToBlock));
 };
 export const CopyLinkDropdownItem = injectIntl(CopyLinkDropdownItemContent);

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

@@ -1,4 +1,6 @@
 import React from 'react';
+import { useIntl } from 'react-intl-next';
+import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
 import { useSuggestedItems } from './hooks/useSuggestedItems';
 export const SuggestedItemsMenuSection = /*#__PURE__*/React.memo(({
@@ -6,10 +8,13 @@ export const SuggestedItemsMenuSection = /*#__PURE__*/React.memo(({
   children
 }) => {
   const suggestedItems = useSuggestedItems(api);
+  const {
+    formatMessage
+  } = useIntl();
   if (suggestedItems.length === 0) {
     return null;
   }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-    title: "Suggested"
+    title: formatMessage(blockMenuMessages.suggested)
   }, children);
 });

package/dist/esm/blockMenuPlugin.js

@@ -3,6 +3,7 @@ import { createBlockMenuRegistry } from './editor-actions';
 import { isTransformToTargetDisabled } from './editor-actions/isTransformToTargetDisabled';
 import { formatNode as _formatNode } from './editor-commands/formatNode';
 import { transformNode as _transformNode } from './editor-commands/transformNode';
+import { keymapPlugin } from './pm-plugins/keymap';
 import { blockMenuPluginKey, createPlugin } from './pm-plugins/main';
 import BlockMenu from './ui/block-menu';
 import { getBlockMenuComponents } from './ui/block-menu-components';
@@ -24,6 +25,11 @@ export var blockMenuPlugin = function blockMenuPlugin(_ref) {
         plugin: function plugin() {
           return createPlugin(api);
         }
+      }, {
+        name: 'blockMenuKeymap',
+        plugin: function plugin() {
+          return keymapPlugin(api, config);
+        }
       }];
     },
     actions: {

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

@@ -0,0 +1,55 @@
+import { bindKeymapWithCommand, copyLinkToBlock, keymap } from '@atlaskit/editor-common/keymaps';
+import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { FLAG_ID } from '../blockMenuPluginType';
+import { blockMenuPluginKey } from '../pm-plugins/main';
+import { copyLink } from '../ui/utils/copyLink';
+export function keymapPlugin(api, config) {
+  var list = {};
+  var copyLinkToBlockCommand = function copyLinkToBlockCommand(state, dispatch) {
+    var _api$blockControls, _node$attrs;
+    // Check if feature flag is enabled
+    if (!fg('platform_editor_adf_with_localid')) {
+      return false;
+    }
+
+    // Get the preserved selection (only works when block menu is open and selection is preserved)
+    var selection = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.sharedState.currentState()) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.preservedSelection;
+    if (!selection) {
+      return false;
+    }
+
+    // Check if the selection has a valid block range with localId
+    var blockRange = expandSelectionToBlockRange(selection);
+    if (!blockRange) {
+      return false;
+    }
+    var node = blockRange.$from.nodeAfter;
+    if (!(node !== null && node !== void 0 && (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.localId)) {
+      return false;
+    }
+
+    // Execute the copy link action
+    var _ref = config || {},
+      getLinkPath = _ref.getLinkPath,
+      blockLinkHashPrefix = _ref.blockLinkHashPrefix;
+    copyLink({
+      getLinkPath: getLinkPath,
+      blockLinkHashPrefix: blockLinkHashPrefix,
+      selection: selection
+    }).then(function (success) {
+      if (success && dispatch) {
+        dispatch(state.tr.setMeta(blockMenuPluginKey, {
+          showFlag: FLAG_ID.LINK_COPIED_TO_CLIPBOARD
+        }));
+      }
+    });
+    return true;
+  };
+
+  // Ignored via go/ees005
+  bindKeymapWithCommand(
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  copyLinkToBlock.common, copyLinkToBlockCommand, list);
+  return keymap(list);
+}

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

@@ -1,5 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { shouldSuppressKeyboardEvent } from './utils/shouldSuppressKeyboardEvent';
 export var blockMenuPluginKey = new PluginKey('blockMenuPlugin');
 export var createPlugin = function createPlugin(api) {
   return new SafePlugin({
@@ -29,14 +30,8 @@ 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 which should be handled by the selection preservation plugin
-        var key = event.key.toLowerCase();
-        var isMetaCtrl = event.metaKey || event.ctrlKey;
-        var isBackspaceDelete = ['backspace', 'delete'].includes(key);
-        var isCopyCutPaste = isMetaCtrl && ['c', 'x', 'v'].includes(key);
-        var isUndoRedo = isMetaCtrl && ['z', 'y'].includes(key);
-        var suppressNativeHandling = !isCopyCutPaste && !isBackspaceDelete && !isUndoRedo;
-        return suppressNativeHandling;
+        // Except for backspace/delete/copy/cut/paste/undo/redo/copy-link-to-block which should be handled by the selection preservation plugin
+        return shouldSuppressKeyboardEvent(event);
       }
     }
   });

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

@@ -0,0 +1,31 @@
+/**
+ * Determines whether keyboard events should be suppressed when the block menu is open.
+ *
+ * When the block menu is open, we want to block most keyboard events to prevent
+ * unintended interactions. However, certain actions should still be allowed:
+ * - 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)
+ *
+ * @param event - The keyboard event to check
+ * @returns true if the event should be suppressed, false if it should be allowed
+ */
+export var shouldSuppressKeyboardEvent = function shouldSuppressKeyboardEvent(event) {
+  var key = event.key.toLowerCase();
+  var code = event.code.toLowerCase();
+  var isMetaCtrl = event.metaKey || event.ctrlKey;
+  var isAlt = event.altKey;
+
+  // Check for allowed keyboard shortcuts
+  var isBackspaceDelete = ['backspace', 'delete'].includes(key);
+  var isCopyCutPaste = isMetaCtrl && ['c', 'x', 'v'].includes(key);
+  var isUndoRedo = isMetaCtrl && ['z', 'y'].includes(key);
+
+  // Use event.code to detect physical key 'A' because on macOS Option+A produces 'å'
+  var isCopyLinkToBlock = isMetaCtrl && isAlt && code === 'keya';
+
+  // Suppress all events except the allowed ones
+  var suppressNativeHandling = !isCopyCutPaste && !isBackspaceDelete && !isUndoRedo && !isCopyLinkToBlock;
+  return suppressNativeHandling;
+};

package/dist/esm/ui/MenuSection.js

@@ -0,0 +1,14 @@
+import React from 'react';
+import { useIntl } from 'react-intl-next';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+export var MenuSection = function MenuSection(_ref) {
+  var children = _ref.children,
+    title = _ref.title,
+    hasSeparator = _ref.hasSeparator;
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
+  return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
+    title: formatMessage(title),
+    hasSeparator: hasSeparator
+  }, children);
+};

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

@@ -1,6 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import React from 'react';
 import { BLOCK_ACTIONS_COPY_LINK_TO_BLOCK_MENU_ITEM, BLOCK_ACTIONS_MENU_SECTION, BLOCK_ACTIONS_MENU_SECTION_RANK, DELETE_MENU_SECTION, DELETE_MENU_SECTION_RANK, DELETE_MENU_ITEM, POSITION_MENU_SECTION, POSITION_MENU_SECTION_RANK, POSITION_MOVE_DOWN_MENU_ITEM, POSITION_MOVE_UP_MENU_ITEM, TRANSFORM_MENU_ITEM, TRANSFORM_MENU_ITEM_RANK, TRANSFORM_MENU_SECTION, TRANSFORM_MENU_SECTION_RANK, TRANSFORM_CREATE_MENU_SECTION, TRANSFORM_SUGGESTED_MENU_SECTION, TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_HEADINGS_MENU_SECTION, MAIN_BLOCK_MENU_SECTION_RANK, TRANSFORM_SUGGESTED_MENU_SECTION_RANK, TRANSFORM_SUGGESTED_MENU_ITEM } from '@atlaskit/editor-common/block-menu';
+import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
 import { buildChildrenMap, getChildrenMapKey, willComponentRender } from './block-menu-renderer/utils';
 import { CopyLinkDropdownItem } from './copy-link';
@@ -9,6 +10,7 @@ import { DeleteDropdownItem } from './delete-button';
 import { DeleteSection } from './delete-section';
 import { FormatMenuComponent } from './format-menu-nested';
 import { FormatMenuSection } from './format-menu-section';
+import { MenuSection } from './MenuSection';
 import { MoveDownDropdownItem } from './move-down';
 import { MoveUpDropdownItem } from './move-up';
 import { SuggestedItemsMenuSection } from './suggested-items-menu-section';
@@ -132,8 +134,8 @@ var getTurnIntoMenuComponents = function getTurnIntoMenuComponents(api) {
           children: null
         },
         children = _ref3.children;
-      return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-        title: "Create"
+      return /*#__PURE__*/React.createElement(MenuSection, {
+        title: blockMenuMessages.create
       }, children);
     }
   }, {
@@ -149,8 +151,8 @@ var getTurnIntoMenuComponents = function getTurnIntoMenuComponents(api) {
           children: null
         },
         children = _ref4.children;
-      return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-        title: "Structure"
+      return /*#__PURE__*/React.createElement(MenuSection, {
+        title: blockMenuMessages.structure
       }, children);
     }
   }, {
@@ -166,8 +168,8 @@ var getTurnIntoMenuComponents = function getTurnIntoMenuComponents(api) {
           children: null
         },
         children = _ref5.children;
-      return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-        title: "Headings",
+      return /*#__PURE__*/React.createElement(MenuSection, {
+        title: blockMenuMessages.headings,
         hasSeparator: true
       }, children);
     }

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

@@ -2,8 +2,9 @@ import React, { useCallback } from 'react';
 import { injectIntl, useIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { copyLinkToBlock, formatShortcut } from '@atlaskit/editor-common/keymaps';
 import { blockMenuMessages as messages } from '@atlaskit/editor-common/messages';
-import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
 import LinkIcon from '@atlaskit/icon/core/link';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { FLAG_ID } from '../blockMenuPluginType';
@@ -21,6 +22,7 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
   var _ref2 = config || {},
     getLinkPath = _ref2.getLinkPath,
     blockLinkHashPrefix = _ref2.blockLinkHashPrefix;
+  var shortcut = formatShortcut(copyLinkToBlock);
   var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['blockControls', 'selection'], function (_ref3) {
       var blockControlsState = _ref3.blockControlsState,
         selectionState = _ref3.selectionState;
@@ -81,7 +83,11 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(LinkIcon, {
       label: ""
-    })
+    }),
+    elemAfter: shortcut ? /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
+      shortcut: shortcut
+    }) : undefined,
+    ariaKeyshortcuts: shortcut
   }, formatMessage(messages.copyLinkToBlock));
 };
 export var CopyLinkDropdownItem = injectIntl(CopyLinkDropdownItemContent);

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

@@ -1,14 +1,18 @@
 import React from 'react';
+import { useIntl } from 'react-intl-next';
+import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
 import { useSuggestedItems } from './hooks/useSuggestedItems';
 export var SuggestedItemsMenuSection = /*#__PURE__*/React.memo(function (_ref) {
   var api = _ref.api,
     children = _ref.children;
   var suggestedItems = useSuggestedItems(api);
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
   if (suggestedItems.length === 0) {
     return null;
   }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-    title: "Suggested"
+    title: formatMessage(blockMenuMessages.suggested)
   }, children);
 });

package/dist/types/pm-plugins/keymap.d.ts

@@ -0,0 +1,4 @@
+import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { BlockMenuPlugin, BlockMenuPluginOptions } from '../blockMenuPluginType';
+export declare function keymapPlugin(api: ExtractInjectionAPI<BlockMenuPlugin> | undefined, config: BlockMenuPluginOptions | undefined): SafePlugin;

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

@@ -0,0 +1,14 @@
+/**
+ * Determines whether keyboard events should be suppressed when the block menu is open.
+ *
+ * When the block menu is open, we want to block most keyboard events to prevent
+ * unintended interactions. However, certain actions should still be allowed:
+ * - 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)
+ *
+ * @param event - The keyboard event to check
+ * @returns true if the event should be suppressed, false if it should be allowed
+ */
+export declare const shouldSuppressKeyboardEvent: (event: KeyboardEvent) => boolean;

package/dist/types/ui/MenuSection.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import { type MessageDescriptor } from 'react-intl-next';
+type MenuSectionProps = {
+    children?: React.ReactNode;
+    hasSeparator?: boolean;
+    title: MessageDescriptor;
+};
+export declare const MenuSection: ({ children, title, hasSeparator, }: MenuSectionProps) => React.JSX.Element;
+export {};

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

@@ -0,0 +1,4 @@
+import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { BlockMenuPlugin, BlockMenuPluginOptions } from '../blockMenuPluginType';
+export declare function keymapPlugin(api: ExtractInjectionAPI<BlockMenuPlugin> | undefined, config: BlockMenuPluginOptions | undefined): SafePlugin;

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

@@ -0,0 +1,14 @@
+/**
+ * Determines whether keyboard events should be suppressed when the block menu is open.
+ *
+ * When the block menu is open, we want to block most keyboard events to prevent
+ * unintended interactions. However, certain actions should still be allowed:
+ * - 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)
+ *
+ * @param event - The keyboard event to check
+ * @returns true if the event should be suppressed, false if it should be allowed
+ */
+export declare const shouldSuppressKeyboardEvent: (event: KeyboardEvent) => boolean;

package/dist/types-ts4.5/ui/MenuSection.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import { type MessageDescriptor } from 'react-intl-next';
+type MenuSectionProps = {
+    children?: React.ReactNode;
+    hasSeparator?: boolean;
+    title: MessageDescriptor;
+};
+export declare const MenuSection: ({ children, title, hasSeparator, }: MenuSectionProps) => React.JSX.Element;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "6.0.21",
+	"version": "6.0.23",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -46,7 +46,7 @@
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^17.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/tmp-editor-statsig": "^16.27.0",
+		"@atlaskit/tmp-editor-statsig": "^16.30.0",
 		"@atlaskit/tokens": "^10.1.0",
 		"@babel/runtime": "^7.0.0"
 	},