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

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

@@ -247,39 +247,27 @@ export var DragHandle = function DragHandle(_ref) {
           return;
         }
         api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.execute(function (_ref6) {
-          var _api$blockControls, _api$analytics3;
+          var _api$blockControls2, _api$analytics3;
           var tr = _ref6.tr;
           var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true, {
             exposure: true
           });
-          var selectionStart = start;
           if (isMultiSelect) {
-            var selection = tr.selection;
-            var selectionFrom = selection.$from.pos;
-            var selectionTo = selection.$to.pos;
-            var $selectionFrom = tr.doc.resolve(selectionFrom);
-            var $selectionTo = tr.doc.resolve(selectionTo);
-            selectionStart = $selectionFrom.start();
-            var selectionEnd = $selectionTo.end();
             var handlePos = getPos();
             if (typeof handlePos !== 'number') {
               return tr;
             }
-            var posBeforeNode = $selectionFrom.pos ? $selectionFrom.start() - 1 : $selectionFrom.pos;
-            var shouldExpandSelection = handlePos >= posBeforeNode && handlePos <= selectionEnd;
-            if (shouldExpandSelection) {
-              //TODO: What happens if not a text selection?
-              var newSelection = TextSelection.create(tr.doc, selectionStart, selectionEnd);
-              tr.setSelection(newSelection);
-            } else {
-              var _$selectionFrom = tr.doc.resolve(handlePos + 1);
-              selectNode(tr, handlePos, _$selectionFrom.node().type.name);
+            if (!tr.selection.empty && handlePos >= tr.selection.$from.start() - 1 && handlePos <= tr.selection.to) {
+              var _api$blockControls;
+              api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || _api$blockControls.commands.setMultiSelectPositions()({
+                tr: tr
+              });
             }
           }
-          api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || _api$blockControls.commands.setNodeDragged(getPos, anchorName, nodeType)({
+          api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.setNodeDragged(getPos, anchorName, nodeType)({
             tr: tr
           });
-          var resolvedMovingNode = tr.doc.resolve(selectionStart);
+          var resolvedMovingNode = tr.doc.resolve(start);
           var maybeNode = resolvedMovingNode.nodeAfter;
           tr.setMeta('scrollIntoView', false);
           api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || _api$analytics3.actions.attachAnalyticsEvent({
@@ -427,6 +415,9 @@ export var DragHandle = function DragHandle(_ref) {
   var message = helpDescriptors.map(function (descriptor) {
     return descriptor.keymap ? [descriptor.description, getAriaKeyshortcuts(descriptor.keymap)] : [descriptor.description];
   }).join('. ');
+  var handleOnDrop = function handleOnDrop(event) {
+    editorExperiment('platform_editor_element_drag_and_drop_multiselect', true) && event.stopPropagation();
+  };
   var renderButton = function renderButton() {
     return (
       // eslint-disable-next-line @atlaskit/design-system/no-html-button
@@ -442,7 +433,10 @@ export var DragHandle = function DragHandle(_ref) {
         style: positionStyles,
         onClick: handleOnClick,
         onMouseDown: handleMouseDown,
-        onKeyDown: handleKeyDown,
+        onKeyDown: handleKeyDown
+        // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop
+        ,
+        onDrop: handleOnDrop,
         "data-testid": "block-ctrl-drag-handle"
       }, jsx(Box, {
         as: "span",

package/dist/types/blockControlsPluginType.d.ts

@@ -6,6 +6,7 @@ import { type AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { QuickInsertPlugin } from '@atlaskit/editor-plugin-quick-insert';
+import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 import { type DecorationSet } from '@atlaskit/editor-prosemirror/view';
 export type ActiveNode = {
@@ -14,6 +15,14 @@ export type ActiveNode = {
     nodeType: string;
     handleOptions?: HandleOptions;
 };
+export type MultiSelectDnD = {
+    anchor: number;
+    head: number;
+    textAnchor: number;
+    textHead: number;
+    userAnchor: number;
+    userHead: number;
+};
 export interface PluginState {
     decorations: DecorationSet;
     isDragging: boolean;
@@ -32,6 +41,7 @@ export interface PluginState {
      * is dragging the node without using drag handle, i,e, native prosemirror DnD
      */
     isPMDragging: boolean;
+    multiSelectDnD?: MultiSelectDnD;
 }
 export type ReleaseHiddenDecoration = () => boolean | undefined;
 export type BlockControlsSharedState = {
@@ -39,6 +49,7 @@ export type BlockControlsSharedState = {
     activeNode?: ActiveNode;
     isDragging: boolean;
     isPMDragging: boolean;
+    multiSelectDnD?: MultiSelectDnD;
 } | undefined;
 export type HandleOptions = {
     isFocused: boolean;
@@ -54,7 +65,8 @@ export type BlockControlsPluginDependencies = [
      * For Typeahead - Empty line prompt experiment
      * Clean up ticket ED-24824
      */
-    OptionalPlugin<QuickInsertPlugin>
+    OptionalPlugin<QuickInsertPlugin>,
+    OptionalPlugin<SelectionPlugin>
 ];
 export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
     dependencies: BlockControlsPluginDependencies;
@@ -74,6 +86,7 @@ export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
         moveNode: MoveNode;
         showDragHandleAt: (pos: number, anchorName: string, nodeType: string, handleOptions?: HandleOptions) => EditorCommand;
         setNodeDragged: (getPos: () => number | undefined, anchorName: string, nodeType: string) => EditorCommand;
+        setMultiSelectPositions: () => EditorCommand;
     };
 }>;
 export type BlockControlsMeta = {

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

@@ -10,6 +10,7 @@ import { AnchorRectCache } from './utils/anchor-utils';
 export declare const key: PluginKey<PluginState>;
 export interface FlagType {
     isNestedEnabled: boolean;
+    isMultiSelectEnabled: boolean;
 }
 export declare const newApply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
     decorations: DecorationSet;
@@ -22,6 +23,7 @@ export declare const newApply: (api: ExtractInjectionAPI<BlockControlsPlugin> |
     isResizerResizing: boolean;
     isDocSizeLimitEnabled: boolean | null;
     isPMDragging: any;
+    multiSelectDnD: any;
 };
 export declare const oldApply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, oldState: EditorState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
     decorations: DecorationSet;

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

@@ -0,0 +1,6 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { BlockControlsPlugin } from '../../blockControlsPluginType';
+export declare const getMultiSelectionIfPosInside: (api: ExtractInjectionAPI<BlockControlsPlugin>, pos: number) => {
+    anchor?: number;
+    head?: number;
+};

package/dist/types-ts4.5/blockControlsPluginType.d.ts

@@ -6,6 +6,7 @@ import { type AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { QuickInsertPlugin } from '@atlaskit/editor-plugin-quick-insert';
+import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 import { type DecorationSet } from '@atlaskit/editor-prosemirror/view';
 export type ActiveNode = {
@@ -14,6 +15,14 @@ export type ActiveNode = {
     nodeType: string;
     handleOptions?: HandleOptions;
 };
+export type MultiSelectDnD = {
+    anchor: number;
+    head: number;
+    textAnchor: number;
+    textHead: number;
+    userAnchor: number;
+    userHead: number;
+};
 export interface PluginState {
     decorations: DecorationSet;
     isDragging: boolean;
@@ -32,6 +41,7 @@ export interface PluginState {
      * is dragging the node without using drag handle, i,e, native prosemirror DnD
      */
     isPMDragging: boolean;
+    multiSelectDnD?: MultiSelectDnD;
 }
 export type ReleaseHiddenDecoration = () => boolean | undefined;
 export type BlockControlsSharedState = {
@@ -39,6 +49,7 @@ export type BlockControlsSharedState = {
     activeNode?: ActiveNode;
     isDragging: boolean;
     isPMDragging: boolean;
+    multiSelectDnD?: MultiSelectDnD;
 } | undefined;
 export type HandleOptions = {
     isFocused: boolean;
@@ -54,7 +65,8 @@ export type BlockControlsPluginDependencies = [
      * For Typeahead - Empty line prompt experiment
      * Clean up ticket ED-24824
      */
-    OptionalPlugin<QuickInsertPlugin>
+    OptionalPlugin<QuickInsertPlugin>,
+    OptionalPlugin<SelectionPlugin>
 ];
 export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
     dependencies: BlockControlsPluginDependencies;
@@ -74,6 +86,7 @@ export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
         moveNode: MoveNode;
         showDragHandleAt: (pos: number, anchorName: string, nodeType: string, handleOptions?: HandleOptions) => EditorCommand;
         setNodeDragged: (getPos: () => number | undefined, anchorName: string, nodeType: string) => EditorCommand;
+        setMultiSelectPositions: () => EditorCommand;
     };
 }>;
 export type BlockControlsMeta = {

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

@@ -10,6 +10,7 @@ import { AnchorRectCache } from './utils/anchor-utils';
 export declare const key: PluginKey<PluginState>;
 export interface FlagType {
     isNestedEnabled: boolean;
+    isMultiSelectEnabled: boolean;
 }
 export declare const newApply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
     decorations: DecorationSet;
@@ -22,6 +23,7 @@ export declare const newApply: (api: ExtractInjectionAPI<BlockControlsPlugin> |
     isResizerResizing: boolean;
     isDocSizeLimitEnabled: boolean | null;
     isPMDragging: any;
+    multiSelectDnD: any;
 };
 export declare const oldApply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, oldState: EditorState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
     decorations: DecorationSet;

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

@@ -0,0 +1,6 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { BlockControlsPlugin } from '../../blockControlsPluginType';
+export declare const getMultiSelectionIfPosInside: (api: ExtractInjectionAPI<BlockControlsPlugin>, pos: number) => {
+    anchor?: number;
+    head?: number;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.23.0",
+	"version": "2.24.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,12 +31,13 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^99.10.0",
+		"@atlaskit/editor-common": "^99.11.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.4.0",
 		"@atlaskit/editor-plugin-analytics": "^1.12.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.5.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.3.0",
 		"@atlaskit/editor-plugin-quick-insert": "^1.10.0",
+		"@atlaskit/editor-plugin-selection": "^1.8.0",
 		"@atlaskit/editor-plugin-width": "^2.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
@@ -48,7 +49,7 @@
 		"@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.43.0",
+		"@atlaskit/tmp-editor-statsig": "^2.44.0",
 		"@atlaskit/tokens": "^3.3.0",
 		"@atlaskit/tooltip": "^19.1.0",
 		"@babel/runtime": "^7.0.0",