@atlaskit/editor-plugin-block-menu 5.2.1 → 5.2.3

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

@@ -1,6 +1,7 @@
 import React, { useCallback } from 'react';
-import { useIntl, injectIntl } from 'react-intl-next';
+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 { blockMenuMessages as messages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import LinkIcon from '@atlaskit/icon/core/link';
@@ -12,18 +13,38 @@ import { BLOCK_MENU_ITEM_NAME } from './consts';
 import { copyLink } from './utils/copyLink';
 import { isNestedNode } from './utils/isNestedNode';
 var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
-  var _api$selection;
   var api = _ref.api,
     config = _ref.config;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var _useBlockMenu = useBlockMenu(),
     onDropdownOpenChanged = _useBlockMenu.onDropdownOpenChanged;
-  var selection = api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.sharedState) === null || _api$selection === void 0 || (_api$selection = _api$selection.currentState()) === null || _api$selection === void 0 ? void 0 : _api$selection.selection;
+  var _ref2 = config || {},
+    getLinkPath = _ref2.getLinkPath,
+    blockLinkHashPrefix = _ref2.blockLinkHashPrefix;
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['blockControls', 'selection', 'core'], function (_ref3) {
+      var blockControlsState = _ref3.blockControlsState,
+        selectionState = _ref3.selectionState,
+        coreState = _ref3.coreState;
+      return {
+        menuTriggerBy: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.menuTriggerBy,
+        preservedSelection: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.preservedSelection,
+        defaultSelection: selectionState === null || selectionState === void 0 ? void 0 : selectionState.selection,
+        schema: coreState === null || coreState === void 0 ? void 0 : coreState.schema
+      };
+    }),
+    preservedSelection = _useSharedPluginState.preservedSelection,
+    defaultSelection = _useSharedPluginState.defaultSelection,
+    menuTriggerBy = _useSharedPluginState.menuTriggerBy,
+    schema = _useSharedPluginState.schema;
+  var selection = preservedSelection || defaultSelection;
   var handleClick = useCallback(function () {
-    api === null || api === void 0 || api.core.actions.execute(function (_ref2) {
+    if (!selection || !schema) {
+      return;
+    }
+    api === null || api === void 0 || api.core.actions.execute(function (_ref4) {
       var _api$analytics, _api$blockControls;
-      var tr = _ref2.tr;
+      var tr = _ref4.tr;
       var payload = {
         action: ACTION.CLICKED,
         actionSubject: ACTION_SUBJECT.BLOCK_MENU_ITEM,
@@ -41,10 +62,15 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
       return tr;
     });
     onDropdownOpenChanged(false);
-    copyLink(config === null || config === void 0 ? void 0 : config.getLinkPath, config === null || config === void 0 ? void 0 : config.blockLinkHashPrefix, api).then(function (success) {
+    copyLink({
+      getLinkPath: getLinkPath,
+      blockLinkHashPrefix: blockLinkHashPrefix,
+      selection: selection,
+      schema: schema
+    }).then(function (success) {
       if (success) {
-        api === null || api === void 0 || api.core.actions.execute(function (_ref3) {
-          var tr = _ref3.tr;
+        api === null || api === void 0 || api.core.actions.execute(function (_ref5) {
+          var tr = _ref5.tr;
           tr.setMeta(blockMenuPluginKey, {
             showFlag: FLAG_ID.LINK_COPIED_TO_CLIPBOARD
           });
@@ -52,19 +78,10 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
         });
       }
     });
-  }, [config === null || config === void 0 ? void 0 : config.getLinkPath, config === null || config === void 0 ? void 0 : config.blockLinkHashPrefix, api, onDropdownOpenChanged]);
-  var checkIsNestedNode = useCallback(function () {
-    var _api$selection2, _api$blockControls2;
-    var selection = api === null || api === void 0 || (_api$selection2 = api.selection) === null || _api$selection2 === void 0 || (_api$selection2 = _api$selection2.sharedState) === null || _api$selection2 === void 0 || (_api$selection2 = _api$selection2.currentState()) === null || _api$selection2 === void 0 ? void 0 : _api$selection2.selection;
-    var menuTriggerBy = api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.sharedState) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.currentState()) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.menuTriggerBy;
-    if (!selection || !menuTriggerBy) {
-      return false;
-    }
-    return isNestedNode(selection, menuTriggerBy);
-  }, [api]);
+  }, [api, blockLinkHashPrefix, getLinkPath, onDropdownOpenChanged, schema, selection]);
 
   // Hide copy link when `platform_editor_adf_with_localid` feature flag is off or when the node is nested or on empty line
-  if (!fg('platform_editor_adf_with_localid') || checkIsNestedNode() || !!(selection !== null && selection !== void 0 && selection.empty)) {
+  if (!fg('platform_editor_adf_with_localid') || !!menuTriggerBy && isNestedNode(selection, menuTriggerBy) || selection !== null && selection !== void 0 && selection.empty) {
     return null;
   }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {

package/dist/esm/ui/utils/copyLink.js

@@ -1,34 +1,25 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { DEFAULT_BLOCK_LINK_HASH_PREFIX } from '@atlaskit/editor-common/block-menu';
+import { createBlockLinkHashValue, DEFAULT_BLOCK_LINK_HASH_PREFIX } from '@atlaskit/editor-common/block-menu';
 import { copyToClipboard } from '@atlaskit/editor-common/clipboard';
-import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { CellSelection } from '@atlaskit/editor-tables';
+import { logException } from '@atlaskit/editor-common/monitoring';
+import { expandSelectionToBlockRange } from '../../editor-commands/transform-node-utils/utils';
 export var copyLink = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(getLinkPath) {
-    var blockLinkHashPrefix,
-      api,
-      _api$selection,
-      node,
-      selection,
-      path,
-      url,
-      href,
-      _args = arguments;
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
+    var getLinkPath, _ref$blockLinkHashPre, blockLinkHashPrefix, selection, schema, blockRange, node, path, url, href;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          blockLinkHashPrefix = _args.length > 1 && _args[1] !== undefined ? _args[1] : DEFAULT_BLOCK_LINK_HASH_PREFIX;
-          api = _args.length > 2 ? _args[2] : undefined;
-          _context.prev = 2;
-          selection = api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.sharedState.currentState()) === null || _api$selection === void 0 ? void 0 : _api$selection.selection;
-          if (selection instanceof NodeSelection && selection.node) {
-            node = selection.node;
-          } else if (selection instanceof TextSelection) {
-            node = selection.$from.node();
-          } else if (selection instanceof CellSelection) {
-            node = selection.$anchorCell.node(-1);
+          getLinkPath = _ref.getLinkPath, _ref$blockLinkHashPre = _ref.blockLinkHashPrefix, blockLinkHashPrefix = _ref$blockLinkHashPre === void 0 ? DEFAULT_BLOCK_LINK_HASH_PREFIX : _ref$blockLinkHashPre, selection = _ref.selection, schema = _ref.schema;
+          blockRange = expandSelectionToBlockRange(selection, schema);
+          if (blockRange) {
+            _context.next = 4;
+            break;
           }
+          return _context.abrupt("return", false);
+        case 4:
+          // get the link to the first node in the selection
+          node = blockRange.$from.nodeAfter;
           if (!(!node || !node.attrs || !node.attrs.localId)) {
             _context.next = 7;
             break;
@@ -36,30 +27,31 @@ export var copyLink = /*#__PURE__*/function () {
           return _context.abrupt("return", false);
         case 7:
           path = (getLinkPath === null || getLinkPath === void 0 ? void 0 : getLinkPath()) || location.pathname;
-          if (path) {
-            _context.next = 10;
-            break;
-          }
-          return _context.abrupt("return", false);
-        case 10:
-          url = new URL(location.origin + path); // append the localId as a hash fragment in the form #block-{localId}
-          url.hash = "".concat(blockLinkHashPrefix).concat(node.attrs.localId);
+          _context.prev = 8;
+          url = new URL(location.origin + path);
+          url.hash = createBlockLinkHashValue(node.attrs.localId, blockLinkHashPrefix);
           href = url.toString();
-          _context.next = 15;
+          _context.next = 14;
           return copyToClipboard(href);
-        case 15:
-          return _context.abrupt("return", true);
-        case 18:
-          _context.prev = 18;
-          _context.t0 = _context["catch"](2);
+        case 14:
+          _context.next = 20;
+          break;
+        case 16:
+          _context.prev = 16;
+          _context.t0 = _context["catch"](8);
+          logException(_context.t0, {
+            location: 'editor-plugin-block-menu'
+          });
           return _context.abrupt("return", false);
+        case 20:
+          return _context.abrupt("return", true);
         case 21:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[2, 18]]);
+    }, _callee, null, [[8, 16]]);
   }));
   return function copyLink(_x) {
-    return _ref.apply(this, arguments);
+    return _ref2.apply(this, arguments);
   };
 }();

package/dist/{types-ts4.5/editor-commands/transform-node-utils → types/editor-commands/transform-node-utils/steps}/flattenListStep.d.ts

@@ -1,4 +1,4 @@
-import type { TransformStep } from './types';
+import type { TransformStep } from '../types';
 /**
  * Given an array of nodes, returns an array with the flattened children of any list node
  * to it's first ancestor list, maintaining document order.

package/dist/types/editor-commands/transform-node-utils/steps/listToListStep.d.ts

@@ -0,0 +1,65 @@
+import type { TransformStep } from '../types';
+/**
+ * Transform step that converts between bulletList, orderedList, and taskList types.
+ * This step maintains the order and indentation of the list by recursively
+ * converting all nested lists while preserving the structure. It also handles
+ * conversion between listItem and taskItem types.
+ *
+ * When converting to taskList/taskItem, unsupported content (images, codeBlocks) is filtered out.
+ *
+ * @example
+ * Input (bulletList with nested bulletList):
+ * - bulletList
+ *   - listItem "1"
+ *     - bulletList
+ *       - listItem "1.1"
+ *         - bulletList
+ *           - listItem "1.1.1"
+ *       - listItem "1.2"
+ *   - listItem "2"
+ *
+ * Output (orderedList with nested orderedList):
+ * 1. orderedList
+ *    1. listItem "1"
+ *       1. orderedList
+ *          1. listItem "1.1"
+ *             1. orderedList
+ *                1. listItem "1.1.1"
+ *          2. listItem "1.2"
+ *    2. listItem "2"
+ *
+ * @example
+ * Input (bulletList with nested taskList):
+ * - bulletList
+ *   - listItem "Regular item"
+ *     - taskList
+ *       - taskItem "Task 1" (checked)
+ *       - taskItem "Task 2" (unchecked)
+ *
+ * Output (orderedList with nested orderedList, taskItems converted to listItems):
+ * 1. orderedList
+ *    1. listItem "Regular item"
+ *       1. orderedList
+ *          1. listItem "Task 1"
+ *          2. listItem "Task 2"
+ *
+ * @example
+ * Input (bulletList to taskList, with paragraph extraction):
+ * - bulletList
+ *   - listItem
+ *     - paragraph "Text content"
+ *   - listItem
+ *     - paragraph "Text"
+ *     - codeBlock "code"
+ *     - mediaSingle (image)
+ *
+ * Output (taskList with text extracted from paragraphs, unsupported content filtered):
+ * - taskList
+ *   - taskItem "Text content" (text extracted from paragraph)
+ *   - taskItem "Text" (text extracted, codeBlock and image filtered out)
+ *
+ * @param nodes - The nodes to transform
+ * @param context - The transformation context containing schema and target node type
+ * @returns The transformed nodes
+ */
+export declare const listToListStep: TransformStep;

package/dist/{types-ts4.5/editor-commands/transform-node-utils → types/editor-commands/transform-node-utils/steps}/unwrapListStep.d.ts

@@ -1,4 +1,4 @@
-import type { TransformStep } from './types';
+import type { TransformStep } from '../types';
 /**
  * Given an array of nodes, processes each list removing all parent list nodes and
  * just returning their child contents.

package/dist/types/ui/utils/copyLink.d.ts

@@ -1,3 +1,10 @@
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { BlockMenuPlugin } from '../../blockMenuPluginType';
-export declare const copyLink: (getLinkPath?: () => string | null, blockLinkHashPrefix?: string, api?: ExtractInjectionAPI<BlockMenuPlugin>) => Promise<boolean>;
+import type { Schema } from '@atlaskit/editor-prosemirror/model';
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
+type CopyLinkOptions = {
+    blockLinkHashPrefix?: string;
+    getLinkPath?: () => string | null;
+    schema: Schema;
+    selection: Selection;
+};
+export declare const copyLink: ({ getLinkPath, blockLinkHashPrefix, selection, schema, }: CopyLinkOptions) => Promise<boolean>;
+export {};

package/dist/{types/editor-commands/transform-node-utils → types-ts4.5/editor-commands/transform-node-utils/steps}/flattenListStep.d.ts

@@ -1,4 +1,4 @@
-import type { TransformStep } from './types';
+import type { TransformStep } from '../types';
 /**
  * Given an array of nodes, returns an array with the flattened children of any list node
  * to it's first ancestor list, maintaining document order.

package/dist/types-ts4.5/editor-commands/transform-node-utils/steps/listToListStep.d.ts

@@ -0,0 +1,65 @@
+import type { TransformStep } from '../types';
+/**
+ * Transform step that converts between bulletList, orderedList, and taskList types.
+ * This step maintains the order and indentation of the list by recursively
+ * converting all nested lists while preserving the structure. It also handles
+ * conversion between listItem and taskItem types.
+ *
+ * When converting to taskList/taskItem, unsupported content (images, codeBlocks) is filtered out.
+ *
+ * @example
+ * Input (bulletList with nested bulletList):
+ * - bulletList
+ *   - listItem "1"
+ *     - bulletList
+ *       - listItem "1.1"
+ *         - bulletList
+ *           - listItem "1.1.1"
+ *       - listItem "1.2"
+ *   - listItem "2"
+ *
+ * Output (orderedList with nested orderedList):
+ * 1. orderedList
+ *    1. listItem "1"
+ *       1. orderedList
+ *          1. listItem "1.1"
+ *             1. orderedList
+ *                1. listItem "1.1.1"
+ *          2. listItem "1.2"
+ *    2. listItem "2"
+ *
+ * @example
+ * Input (bulletList with nested taskList):
+ * - bulletList
+ *   - listItem "Regular item"
+ *     - taskList
+ *       - taskItem "Task 1" (checked)
+ *       - taskItem "Task 2" (unchecked)
+ *
+ * Output (orderedList with nested orderedList, taskItems converted to listItems):
+ * 1. orderedList
+ *    1. listItem "Regular item"
+ *       1. orderedList
+ *          1. listItem "Task 1"
+ *          2. listItem "Task 2"
+ *
+ * @example
+ * Input (bulletList to taskList, with paragraph extraction):
+ * - bulletList
+ *   - listItem
+ *     - paragraph "Text content"
+ *   - listItem
+ *     - paragraph "Text"
+ *     - codeBlock "code"
+ *     - mediaSingle (image)
+ *
+ * Output (taskList with text extracted from paragraphs, unsupported content filtered):
+ * - taskList
+ *   - taskItem "Text content" (text extracted from paragraph)
+ *   - taskItem "Text" (text extracted, codeBlock and image filtered out)
+ *
+ * @param nodes - The nodes to transform
+ * @param context - The transformation context containing schema and target node type
+ * @returns The transformed nodes
+ */
+export declare const listToListStep: TransformStep;

package/dist/{types/editor-commands/transform-node-utils → types-ts4.5/editor-commands/transform-node-utils/steps}/unwrapListStep.d.ts

@@ -1,4 +1,4 @@
-import type { TransformStep } from './types';
+import type { TransformStep } from '../types';
 /**
  * Given an array of nodes, processes each list removing all parent list nodes and
  * just returning their child contents.

package/dist/types-ts4.5/ui/utils/copyLink.d.ts

@@ -1,3 +1,10 @@
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { BlockMenuPlugin } from '../../blockMenuPluginType';
-export declare const copyLink: (getLinkPath?: () => string | null, blockLinkHashPrefix?: string, api?: ExtractInjectionAPI<BlockMenuPlugin>) => Promise<boolean>;
+import type { Schema } from '@atlaskit/editor-prosemirror/model';
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
+type CopyLinkOptions = {
+    blockLinkHashPrefix?: string;
+    getLinkPath?: () => string | null;
+    schema: Schema;
+    selection: Selection;
+};
+export declare const copyLink: ({ getLinkPath, blockLinkHashPrefix, selection, schema, }: CopyLinkOptions) => Promise<boolean>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.2.1",
+	"version": "5.2.3",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -39,7 +39,7 @@
 		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.18.0",
-		"@atlaskit/flag": "^17.5.0",
+		"@atlaskit/flag": "^17.6.0",
 		"@atlaskit/icon": "^29.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",