@atlaskit/editor-plugin-block-controls 2.24.0 → 2.26.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.26.0
+
+### Minor Changes
+
+- [#111831](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/111831)
+  [`66895944dfac9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/66895944dfac9) -
+  [ED-26430] Block drag-and-drop of legacy content macro extension
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.25.0
+
+### Minor Changes
+
+- [#107342](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/107342)
+  [`ec6b838ab9935`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ec6b838ab9935) -
+  [ux] Set drag handle selection state based on Editor selection
+
 ## 2.24.0
 
 ### Minor Changes

package/dist/cjs/pm-plugins/decorations-anchor.js

@@ -28,12 +28,17 @@ var shouldDescendIntoNode = exports.shouldDescendIntoNode = function shouldDesce
   return !IGNORE_NODE_DESCENDANTS.includes(node.type.name);
 };
 var shouldIgnoreNode = function shouldIgnoreNode(node, ignore_nodes, depth, parent) {
+  var _node$attrs, _node$attrs2;
   var isEmbedCard = node.type.name === 'embedCard';
   var isMediaSingle = node.type.name === 'mediaSingle';
   var isFirstTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && 'tableRow' === node.type.name && (0, _experiments.editorExperiment)('advanced_layouts', true);
   if (isFirstTableRow) {
     return false;
   }
+  var isLegacyContentMacroExtension = node.type.name === 'extension' && ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.extensionType) === 'com.atlassian.confluence.migration' && ((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.extensionKey) === 'legacy-content';
+  if (isLegacyContentMacroExtension) {
+    return true;
+  }
   return (isEmbedCard || isMediaSingle) && ['wrap-right', 'wrap-left'].includes(node.attrs.layout) ? true : ignore_nodes.includes(node.type.name);
 };
 

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

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setCursorPositionAtMovedNode = exports.selectNode = exports.getSelection = exports.getInlineNodePos = void 0;
+exports.setCursorPositionAtMovedNode = exports.selectNode = exports.rootTaskListDepth = exports.rootListDepth = exports.isHandleInSelection = exports.getSelection = exports.getInlineNodePos = void 0;
 var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _utils = require("@atlaskit/editor-tables/utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _utils2 = require("@atlaskit/editor-tables/utils");
 var getInlineNodePos = exports.getInlineNodePos = function getInlineNodePos(tr, start, nodeSize) {
   var $startPos = tr.doc.resolve(start);
   // To trigger the annotation floating toolbar for non-selectable node, we need to select inline nodes
@@ -68,7 +69,7 @@ var getSelection = exports.getSelection = function getSelection(tr, start) {
 var selectNode = exports.selectNode = function selectNode(tr, start, nodeType) {
   // For table, we need to do cell selection instead of node selection
   if (nodeType === 'table') {
-    tr = (0, _utils.selectTableClosestToPos)(tr, tr.doc.resolve(start + 1));
+    tr = (0, _utils2.selectTableClosestToPos)(tr, tr.doc.resolve(start + 1));
   } else {
     tr.setSelection(getSelection(tr, start));
   }
@@ -90,4 +91,58 @@ var setCursorPositionAtMovedNode = exports.setCursorPositionAtMovedNode = functi
   }
   tr.setSelection(selection);
   return tr;
+};
+
+/**
+ * Checks if handle position is with the selection or corresponds to a (partially) selected node
+ * @param state
+ * @param selection
+ * @param handlePos
+ * @returns
+ */
+var isHandleInSelection = exports.isHandleInSelection = function isHandleInSelection(state, selection, handlePos) {
+  if (selection.empty) {
+    return false;
+  }
+  var $selectionFrom = selection.$from;
+  var selectionFrom = $selectionFrom.pos;
+  var nodeStart = $selectionFrom.depth ? $selectionFrom.before() : selectionFrom;
+  var $resolvedNodePos = state.doc.resolve(nodeStart);
+  if (['tableRow', 'tableCell', 'tableHeader'].includes($resolvedNodePos.node().type.name)) {
+    var parentNodeFindRes = (0, _utils.findParentNodeOfType)(state.schema.nodes['table'])(selection);
+    var tablePos = parentNodeFindRes === null || parentNodeFindRes === void 0 ? void 0 : parentNodeFindRes.pos;
+    nodeStart = typeof tablePos === 'undefined' ? nodeStart : tablePos;
+  } else if (['listItem'].includes($resolvedNodePos.node().type.name)) {
+    nodeStart = $resolvedNodePos.before(rootListDepth($resolvedNodePos));
+  } else if (['taskList'].includes($resolvedNodePos.node().type.name)) {
+    var listdepth = rootTaskListDepth($resolvedNodePos);
+    nodeStart = $resolvedNodePos.before(listdepth);
+  } else if (['blockquote'].includes($resolvedNodePos.node().type.name)) {
+    nodeStart = $resolvedNodePos.before();
+  }
+  return Boolean(handlePos < selection.$to.pos && handlePos >= nodeStart);
+};
+var rootListDepth = exports.rootListDepth = function rootListDepth(itemPos) {
+  var depth;
+  for (var i = itemPos.depth; i > 1; i -= 2) {
+    var node = itemPos.node(i);
+    if (node.type.name === 'listItem') {
+      depth = i - 1;
+    } else {
+      break;
+    }
+  }
+  return depth;
+};
+var rootTaskListDepth = exports.rootTaskListDepth = function rootTaskListDepth(taskListPos) {
+  var depth;
+  for (var i = taskListPos.depth; i > 0; i--) {
+    var node = taskListPos.node(i);
+    if (node.type.name === 'taskList' || node.type.name === 'taskItem') {
+      depth = i;
+    } else {
+      break;
+    }
+  }
+  return depth;
 };

package/dist/cjs/ui/drag-handle.js

@@ -15,6 +15,7 @@ var _browser = require("@atlaskit/editor-common/browser");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
+var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _dragHandler = _interopRequireDefault(require("@atlaskit/icon/glyph/drag-handler"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -128,6 +129,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     setDragHandleSelected = _useState4[1];
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['featureFlags']),
     featureFlagsState = _useSharedPluginState.featureFlagsState;
+  var selection = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'selection.selection');
   var isLayoutColumn = nodeType === 'layoutColumn';
   (0, _react.useEffect)(function () {
     // blockCard/datasource width is rendered correctly after this decoraton does. We need to observe for changes.
@@ -378,6 +380,15 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       };
     }
   }, [buttonRef, handleOptions === null || handleOptions === void 0 ? void 0 : handleOptions.isFocused, view]);
+  (0, _react.useEffect)(function () {
+    var isMultiSelect = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true, {
+      exposure: true
+    });
+    if (!isMultiSelect || typeof start !== 'number' || !selection) {
+      return;
+    }
+    setDragHandleSelected((0, _getSelection.isHandleInSelection)(view.state, selection, start));
+  }, [start, selection, view.state]);
   var helpDescriptors = [{
     description: formatMessage(_messages.blockControlsMessages.dragToMove)
   }, {

package/dist/es2019/pm-plugins/decorations-anchor.js

@@ -20,12 +20,17 @@ export const shouldDescendIntoNode = node => {
   return !IGNORE_NODE_DESCENDANTS.includes(node.type.name);
 };
 const shouldIgnoreNode = (node, ignore_nodes, depth, parent) => {
+  var _node$attrs, _node$attrs2;
   const isEmbedCard = node.type.name === 'embedCard';
   const isMediaSingle = node.type.name === 'mediaSingle';
   const isFirstTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && 'tableRow' === node.type.name && editorExperiment('advanced_layouts', true);
   if (isFirstTableRow) {
     return false;
   }
+  const isLegacyContentMacroExtension = node.type.name === 'extension' && ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.extensionType) === 'com.atlassian.confluence.migration' && ((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.extensionKey) === 'legacy-content';
+  if (isLegacyContentMacroExtension) {
+    return true;
+  }
   return (isEmbedCard || isMediaSingle) && ['wrap-right', 'wrap-left'].includes(node.attrs.layout) ? true : ignore_nodes.includes(node.type.name);
 };
 

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

@@ -1,5 +1,6 @@
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/utils';
 export const getInlineNodePos = (tr, start, nodeSize) => {
   const $startPos = tr.doc.resolve(start);
@@ -86,4 +87,58 @@ export const setCursorPositionAtMovedNode = (tr, start) => {
   }
   tr.setSelection(selection);
   return tr;
+};
+
+/**
+ * Checks if handle position is with the selection or corresponds to a (partially) selected node
+ * @param state
+ * @param selection
+ * @param handlePos
+ * @returns
+ */
+export const isHandleInSelection = (state, selection, handlePos) => {
+  if (selection.empty) {
+    return false;
+  }
+  const $selectionFrom = selection.$from;
+  const selectionFrom = $selectionFrom.pos;
+  let nodeStart = $selectionFrom.depth ? $selectionFrom.before() : selectionFrom;
+  const $resolvedNodePos = state.doc.resolve(nodeStart);
+  if (['tableRow', 'tableCell', 'tableHeader'].includes($resolvedNodePos.node().type.name)) {
+    const parentNodeFindRes = findParentNodeOfType(state.schema.nodes['table'])(selection);
+    const tablePos = parentNodeFindRes === null || parentNodeFindRes === void 0 ? void 0 : parentNodeFindRes.pos;
+    nodeStart = typeof tablePos === 'undefined' ? nodeStart : tablePos;
+  } else if (['listItem'].includes($resolvedNodePos.node().type.name)) {
+    nodeStart = $resolvedNodePos.before(rootListDepth($resolvedNodePos));
+  } else if (['taskList'].includes($resolvedNodePos.node().type.name)) {
+    const listdepth = rootTaskListDepth($resolvedNodePos);
+    nodeStart = $resolvedNodePos.before(listdepth);
+  } else if (['blockquote'].includes($resolvedNodePos.node().type.name)) {
+    nodeStart = $resolvedNodePos.before();
+  }
+  return Boolean(handlePos < selection.$to.pos && handlePos >= nodeStart);
+};
+export const rootListDepth = itemPos => {
+  let depth;
+  for (let i = itemPos.depth; i > 1; i -= 2) {
+    const node = itemPos.node(i);
+    if (node.type.name === 'listItem') {
+      depth = i - 1;
+    } else {
+      break;
+    }
+  }
+  return depth;
+};
+export const rootTaskListDepth = taskListPos => {
+  let depth;
+  for (let i = taskListPos.depth; i > 0; i--) {
+    const node = taskListPos.node(i);
+    if (node.type.name === 'taskList' || node.type.name === 'taskItem') {
+      depth = i;
+    } else {
+      break;
+    }
+  }
+  return depth;
 };

package/dist/es2019/ui/drag-handle.js

@@ -11,6 +11,7 @@ import { browser } from '@atlaskit/editor-common/browser';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { dragToMoveDown, dragToMoveLeft, dragToMoveRight, dragToMoveUp, getAriaKeyshortcuts, TooltipContentWithMultipleShortcuts } from '@atlaskit/editor-common/keymaps';
 import { blockControlsMessages } from '@atlaskit/editor-common/messages';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import DragHandlerIcon from '@atlaskit/icon/glyph/drag-handler';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -22,7 +23,7 @@ import Tooltip from '@atlaskit/tooltip';
 import { key } from '../pm-plugins/main';
 import { getLeftPosition, getTopPosition } from '../pm-plugins/utils/drag-handle-positions';
 import { getNestedNodePosition } from '../pm-plugins/utils/getNestedNodePosition';
-import { selectNode } from '../pm-plugins/utils/getSelection';
+import { isHandleInSelection, selectNode } from '../pm-plugins/utils/getSelection';
 import { DRAG_HANDLE_BORDER_RADIUS, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_WIDTH, DRAG_HANDLE_ZINDEX, dragHandleGap, topPositionAdjustment } from './consts';
 import { dragPreview } from './drag-preview';
 const iconWrapperStyles = xcss({
@@ -112,6 +113,7 @@ export const DragHandle = ({
   const {
     featureFlagsState
   } = useSharedPluginState(api, ['featureFlags']);
+  const selection = useSharedPluginStateSelector(api, 'selection.selection');
   const isLayoutColumn = nodeType === 'layoutColumn';
   useEffect(() => {
     // blockCard/datasource width is rendered correctly after this decoraton does. We need to observe for changes.
@@ -358,6 +360,15 @@ export const DragHandle = ({
       };
     }
   }, [buttonRef, handleOptions === null || handleOptions === void 0 ? void 0 : handleOptions.isFocused, view]);
+  useEffect(() => {
+    const isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true, {
+      exposure: true
+    });
+    if (!isMultiSelect || typeof start !== 'number' || !selection) {
+      return;
+    }
+    setDragHandleSelected(isHandleInSelection(view.state, selection, start));
+  }, [start, selection, view.state]);
   let helpDescriptors = [{
     description: formatMessage(blockControlsMessages.dragToMove)
   }, {

package/dist/esm/pm-plugins/decorations-anchor.js

@@ -21,12 +21,17 @@ export var shouldDescendIntoNode = function shouldDescendIntoNode(node) {
   return !IGNORE_NODE_DESCENDANTS.includes(node.type.name);
 };
 var shouldIgnoreNode = function shouldIgnoreNode(node, ignore_nodes, depth, parent) {
+  var _node$attrs, _node$attrs2;
   var isEmbedCard = node.type.name === 'embedCard';
   var isMediaSingle = node.type.name === 'mediaSingle';
   var isFirstTableRow = (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'table' && depth === 1 && node === parent.firstChild && 'tableRow' === node.type.name && editorExperiment('advanced_layouts', true);
   if (isFirstTableRow) {
     return false;
   }
+  var isLegacyContentMacroExtension = node.type.name === 'extension' && ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.extensionType) === 'com.atlassian.confluence.migration' && ((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.extensionKey) === 'legacy-content';
+  if (isLegacyContentMacroExtension) {
+    return true;
+  }
   return (isEmbedCard || isMediaSingle) && ['wrap-right', 'wrap-left'].includes(node.attrs.layout) ? true : ignore_nodes.includes(node.type.name);
 };
 

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

@@ -1,5 +1,6 @@
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/utils';
 export var getInlineNodePos = function getInlineNodePos(tr, start, nodeSize) {
   var $startPos = tr.doc.resolve(start);
@@ -84,4 +85,58 @@ export var setCursorPositionAtMovedNode = function setCursorPositionAtMovedNode(
   }
   tr.setSelection(selection);
   return tr;
+};
+
+/**
+ * Checks if handle position is with the selection or corresponds to a (partially) selected node
+ * @param state
+ * @param selection
+ * @param handlePos
+ * @returns
+ */
+export var isHandleInSelection = function isHandleInSelection(state, selection, handlePos) {
+  if (selection.empty) {
+    return false;
+  }
+  var $selectionFrom = selection.$from;
+  var selectionFrom = $selectionFrom.pos;
+  var nodeStart = $selectionFrom.depth ? $selectionFrom.before() : selectionFrom;
+  var $resolvedNodePos = state.doc.resolve(nodeStart);
+  if (['tableRow', 'tableCell', 'tableHeader'].includes($resolvedNodePos.node().type.name)) {
+    var parentNodeFindRes = findParentNodeOfType(state.schema.nodes['table'])(selection);
+    var tablePos = parentNodeFindRes === null || parentNodeFindRes === void 0 ? void 0 : parentNodeFindRes.pos;
+    nodeStart = typeof tablePos === 'undefined' ? nodeStart : tablePos;
+  } else if (['listItem'].includes($resolvedNodePos.node().type.name)) {
+    nodeStart = $resolvedNodePos.before(rootListDepth($resolvedNodePos));
+  } else if (['taskList'].includes($resolvedNodePos.node().type.name)) {
+    var listdepth = rootTaskListDepth($resolvedNodePos);
+    nodeStart = $resolvedNodePos.before(listdepth);
+  } else if (['blockquote'].includes($resolvedNodePos.node().type.name)) {
+    nodeStart = $resolvedNodePos.before();
+  }
+  return Boolean(handlePos < selection.$to.pos && handlePos >= nodeStart);
+};
+export var rootListDepth = function rootListDepth(itemPos) {
+  var depth;
+  for (var i = itemPos.depth; i > 1; i -= 2) {
+    var node = itemPos.node(i);
+    if (node.type.name === 'listItem') {
+      depth = i - 1;
+    } else {
+      break;
+    }
+  }
+  return depth;
+};
+export var rootTaskListDepth = function rootTaskListDepth(taskListPos) {
+  var depth;
+  for (var i = taskListPos.depth; i > 0; i--) {
+    var node = taskListPos.node(i);
+    if (node.type.name === 'taskList' || node.type.name === 'taskItem') {
+      depth = i;
+    } else {
+      break;
+    }
+  }
+  return depth;
 };

package/dist/esm/ui/drag-handle.js

@@ -13,6 +13,7 @@ import { browser } from '@atlaskit/editor-common/browser';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { dragToMoveDown, dragToMoveLeft, dragToMoveRight, dragToMoveUp, getAriaKeyshortcuts, TooltipContentWithMultipleShortcuts } from '@atlaskit/editor-common/keymaps';
 import { blockControlsMessages } from '@atlaskit/editor-common/messages';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import DragHandlerIcon from '@atlaskit/icon/glyph/drag-handler';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -24,7 +25,7 @@ import Tooltip from '@atlaskit/tooltip';
 import { key } from '../pm-plugins/main';
 import { getLeftPosition, getTopPosition } from '../pm-plugins/utils/drag-handle-positions';
 import { getNestedNodePosition } from '../pm-plugins/utils/getNestedNodePosition';
-import { selectNode } from '../pm-plugins/utils/getSelection';
+import { isHandleInSelection, selectNode } from '../pm-plugins/utils/getSelection';
 import { DRAG_HANDLE_BORDER_RADIUS, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_WIDTH, DRAG_HANDLE_ZINDEX, dragHandleGap, topPositionAdjustment } from './consts';
 import { dragPreview } from './drag-preview';
 var iconWrapperStyles = xcss({
@@ -119,6 +120,7 @@ export var DragHandle = function DragHandle(_ref) {
     setDragHandleSelected = _useState4[1];
   var _useSharedPluginState = useSharedPluginState(api, ['featureFlags']),
     featureFlagsState = _useSharedPluginState.featureFlagsState;
+  var selection = useSharedPluginStateSelector(api, 'selection.selection');
   var isLayoutColumn = nodeType === 'layoutColumn';
   useEffect(function () {
     // blockCard/datasource width is rendered correctly after this decoraton does. We need to observe for changes.
@@ -369,6 +371,15 @@ export var DragHandle = function DragHandle(_ref) {
       };
     }
   }, [buttonRef, handleOptions === null || handleOptions === void 0 ? void 0 : handleOptions.isFocused, view]);
+  useEffect(function () {
+    var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true, {
+      exposure: true
+    });
+    if (!isMultiSelect || typeof start !== 'number' || !selection) {
+      return;
+    }
+    setDragHandleSelected(isHandleInSelection(view.state, selection, start));
+  }, [start, selection, view.state]);
   var helpDescriptors = [{
     description: formatMessage(blockControlsMessages.dragToMove)
   }, {

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

@@ -1,4 +1,5 @@
-import { NodeSelection, TextSelection, type Transaction } from '@atlaskit/editor-prosemirror/state';
+import { ResolvedPos } from '@atlaskit/editor-prosemirror/model';
+import { EditorState, NodeSelection, Selection, TextSelection, type Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const getInlineNodePos: (tr: Transaction, start: number, nodeSize: number) => {
     inlineNodePos: number;
     inlineNodeEndPos: number;
@@ -6,3 +7,13 @@ export declare const getInlineNodePos: (tr: Transaction, start: number, nodeSize
 export declare const getSelection: (tr: Transaction, start: number) => TextSelection | NodeSelection;
 export declare const selectNode: (tr: Transaction, start: number, nodeType: string) => Transaction;
 export declare const setCursorPositionAtMovedNode: (tr: Transaction, start: number) => Transaction;
+/**
+ * Checks if handle position is with the selection or corresponds to a (partially) selected node
+ * @param state
+ * @param selection
+ * @param handlePos
+ * @returns
+ */
+export declare const isHandleInSelection: (state: EditorState, selection: Selection, handlePos: number) => boolean;
+export declare const rootListDepth: (itemPos: ResolvedPos) => number | undefined;
+export declare const rootTaskListDepth: (taskListPos: ResolvedPos) => number | undefined;

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

@@ -1,4 +1,5 @@
-import { NodeSelection, TextSelection, type Transaction } from '@atlaskit/editor-prosemirror/state';
+import { ResolvedPos } from '@atlaskit/editor-prosemirror/model';
+import { EditorState, NodeSelection, Selection, TextSelection, type Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const getInlineNodePos: (tr: Transaction, start: number, nodeSize: number) => {
     inlineNodePos: number;
     inlineNodeEndPos: number;
@@ -6,3 +7,13 @@ export declare const getInlineNodePos: (tr: Transaction, start: number, nodeSize
 export declare const getSelection: (tr: Transaction, start: number) => TextSelection | NodeSelection;
 export declare const selectNode: (tr: Transaction, start: number, nodeType: string) => Transaction;
 export declare const setCursorPositionAtMovedNode: (tr: Transaction, start: number) => Transaction;
+/**
+ * Checks if handle position is with the selection or corresponds to a (partially) selected node
+ * @param state
+ * @param selection
+ * @param handlePos
+ * @returns
+ */
+export declare const isHandleInSelection: (state: EditorState, selection: Selection, handlePos: number) => boolean;
+export declare const rootListDepth: (itemPos: ResolvedPos) => number | undefined;
+export declare const rootTaskListDepth: (taskListPos: ResolvedPos) => number | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.24.0",
+	"version": "2.26.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^99.11.0",
+		"@atlaskit/editor-common": "^99.12.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.4.0",
 		"@atlaskit/editor-plugin-analytics": "^1.12.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.5.0",
@@ -42,14 +42,14 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/icon": "^23.7.0",
+		"@atlaskit/icon": "^23.8.0",
 		"@atlaskit/platform-feature-flags": "^1.0.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.5.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.2.0",
 		"@atlaskit/primitives": "^13.5.0",
 		"@atlaskit/theme": "^15.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.44.0",
+		"@atlaskit/tmp-editor-statsig": "^2.45.0",
 		"@atlaskit/tokens": "^3.3.0",
 		"@atlaskit/tooltip": "^19.1.0",
 		"@babel/runtime": "^7.0.0",