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

package/dist/esm/pm-plugins/decorations-drag-handle.js

@@ -1,10 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { createElement } from 'react';
 import { bind } from 'bind-event-listener';
-import ReactDOM from 'react-dom';
 import uuid from 'uuid';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DragHandle } from '../ui/drag-handle';
 import { TYPE_HANDLE_DEC, TYPE_NODE_DEC, unmountDecorations } from './decorations-common';
@@ -65,21 +63,8 @@ export var dragHandleDecoration = function dragHandleDecoration(api, formatMessa
     // There are times when global clear: "both" styles are applied to this decoration causing jumpiness
     // due to margins applied to other nodes eg. Headings
     element.style.clear = 'unset';
-    if (fg('platform_editor_react18_plugin_portalprovider')) {
-      nodeViewPortalProviderAPI.render(function () {
-        return /*#__PURE__*/createElement(DragHandle, {
-          view: view,
-          api: api,
-          formatMessage: formatMessage,
-          getPos: getPos,
-          anchorName: anchorName,
-          nodeType: nodeType,
-          handleOptions: handleOptions,
-          isTopLevelNode: isTopLevelNode
-        });
-      }, element, key);
-    } else {
-      ReactDOM.render( /*#__PURE__*/createElement(DragHandle, {
+    nodeViewPortalProviderAPI.render(function () {
+      return /*#__PURE__*/createElement(DragHandle, {
         view: view,
         api: api,
         formatMessage: formatMessage,
@@ -88,8 +73,8 @@ export var dragHandleDecoration = function dragHandleDecoration(api, formatMessa
         nodeType: nodeType,
         handleOptions: handleOptions,
         isTopLevelNode: isTopLevelNode
-      }), element);
-    }
+      });
+    }, element, key);
     return element;
   }, {
     side: -1,

package/dist/esm/pm-plugins/decorations-drop-target.js

@@ -2,11 +2,9 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { createElement } from 'react';
-import ReactDOM from 'react-dom';
 import uuid from 'uuid';
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { nodeMargins } from '../ui/consts';
 import { DropTarget, EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP, EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_OFFSET } from '../ui/drop-target';
@@ -96,21 +94,13 @@ export var createDropTargetDecoration = function createDropTargetDecoration(pos,
     element.style.setProperty(EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_OFFSET, "".concat(offset, "px"));
     element.style.setProperty(EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP, "".concat(gap, "px"));
     element.style.setProperty('display', 'block');
-    if (fg('platform_editor_react18_plugin_portalprovider')) {
-      nodeViewPortalProviderAPI.render(function () {
-        return /*#__PURE__*/createElement(DropTarget, _objectSpread(_objectSpread({}, props), {}, {
-          getPos: getPos,
-          anchorRectCache: anchorRectCache,
-          isSameLayout: isSameLayout
-        }));
-      }, element, key);
-    } else {
-      ReactDOM.render( /*#__PURE__*/createElement(DropTarget, _objectSpread(_objectSpread({}, props), {}, {
+    nodeViewPortalProviderAPI.render(function () {
+      return /*#__PURE__*/createElement(DropTarget, _objectSpread(_objectSpread({}, props), {}, {
         getPos: getPos,
         anchorRectCache: anchorRectCache,
         isSameLayout: isSameLayout
-      })), element);
-    }
+      }));
+    }, element, key);
     return element;
   }, {
     type: TYPE_DROP_TARGET_DEC,
@@ -131,19 +121,12 @@ export var createLayoutDropTargetDecoration = function createLayoutDropTargetDec
     element.setAttribute('data-blocks-drop-target-container', 'true');
     element.setAttribute('data-blocks-drop-target-key', key);
     element.style.clear = 'unset';
-    if (fg('platform_editor_react18_plugin_portalprovider')) {
-      nodeViewPortalProviderAPI.render(function () {
-        return /*#__PURE__*/createElement(DropTargetLayout, _objectSpread(_objectSpread({}, props), {}, {
-          getPos: getPos,
-          anchorRectCache: anchorRectCache
-        }));
-      }, element, key);
-    } else {
-      ReactDOM.render( /*#__PURE__*/createElement(DropTargetLayout, _objectSpread(_objectSpread({}, props), {}, {
+    nodeViewPortalProviderAPI.render(function () {
+      return /*#__PURE__*/createElement(DropTargetLayout, _objectSpread(_objectSpread({}, props), {}, {
         getPos: getPos,
         anchorRectCache: anchorRectCache
-      })), element);
-    }
+      }));
+    }, element, key);
     return element;
   }, {
     type: TYPE_DROP_TARGET_DEC

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

@@ -1,4 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import rafSchedule from 'raf-schd';
 import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
@@ -19,7 +22,9 @@ import { dropTargetDecorations, findDropTargetDecs } from './decorations-drop-ta
 import { handleMouseOver } from './handle-mouse-over';
 import { boundKeydownHandler } from './keymap';
 import { defaultActiveAnchorTracker } from './utils/active-anchor-tracker';
+import { getMultiSelectAnalyticsAttributes } from './utils/analytics';
 import { AnchorRectCache, isAnchorSupported } from './utils/anchor-utils';
+import { getSelectedSlicePosition } from './utils/selection';
 import { getTrMetadata } from './utils/transactions';
 export var key = new PluginKey('blockControls');
 var EDITOR_BLOCKS_DRAG_INIT = 'Editor Blocks Drag Initialization Time';
@@ -71,7 +76,8 @@ var destroyFn = function destroyFn(api, editorView) {
       }
       api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref3) {
         var tr = _ref3.tr;
-        if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
+        var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
+        if (isMultiSelect) {
           var _api$blockControls, _api$selection;
           var _ref4 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
             multiSelectDnD = _ref4.multiSelectDnD;
@@ -92,6 +98,13 @@ var destroyFn = function destroyFn(api, editorView) {
         // if no drop targets are rendered, assume that drop is invalid
         if (location.current.dropTargets.length === 0) {
           var _api$analytics2;
+          var nodeTypes, hasSelectedMultipleNodes;
+          if (isMultiSelect && api) {
+            var position = getSelectedSlicePosition(start, tr, api);
+            var attributes = getMultiSelectAnalyticsAttributes(tr, position.from, position.to);
+            nodeTypes = attributes.nodeTypes;
+            hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
+          }
           var resolvedMovingNode = tr.doc.resolve(start);
           var maybeNode = resolvedMovingNode.nodeAfter;
           api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
@@ -99,10 +112,13 @@ var destroyFn = function destroyFn(api, editorView) {
             action: ACTION.CANCELLED,
             actionSubject: ACTION_SUBJECT.DRAG,
             actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-            attributes: {
+            attributes: _objectSpread({
               nodeDepth: resolvedMovingNode.depth,
               nodeType: (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name) || ''
-            }
+            }, isMultiSelect && {
+              nodeTypes: nodeTypes,
+              hasSelectedMultipleNodes: hasSelectedMultipleNodes
+            })
           })(tr);
         }
         return tr.setMeta(key, {
@@ -127,6 +143,10 @@ var initialState = {
   isPMDragging: false,
   multiSelectDnD: undefined
 };
+export var getDecorations = function getDecorations(state) {
+  var _key$getState;
+  return (_key$getState = key.getState(state)) === null || _key$getState === void 0 ? void 0 : _key$getState.decorations;
+};
 export var newApply = function newApply(api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache) {
   var _meta$activeNode, _activeNode, _activeNode2, _meta$activeNode$hand, _meta$isDragging, _meta$isDragging2, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging, _meta$multiSelectDnD;
   var activeNode = currentState.activeNode,
@@ -462,12 +482,12 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
     },
     props: {
       decorations: function decorations(state) {
-        var _api$editorDisabled, _key$getState;
+        var _api$editorDisabled, _key$getState2;
         var isDisabled = api === null || api === void 0 || (_api$editorDisabled = api.editorDisabled) === null || _api$editorDisabled === void 0 || (_api$editorDisabled = _api$editorDisabled.sharedState.currentState()) === null || _api$editorDisabled === void 0 ? void 0 : _api$editorDisabled.editorDisabled;
         if (isDisabled) {
           return;
         }
-        return (_key$getState = key.getState(state)) === null || _key$getState === void 0 ? void 0 : _key$getState.decorations;
+        return (_key$getState2 = key.getState(state)) === null || _key$getState2 === void 0 ? void 0 : _key$getState2.decorations;
       },
       handleDOMEvents: {
         drop: function drop(view, event) {
@@ -540,10 +560,10 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
           }));
         },
         dragend: function dragend(view) {
-          var _key$getState2;
+          var _key$getState3;
           var state = view.state,
             dispatch = view.dispatch;
-          if ((_key$getState2 = key.getState(state)) !== null && _key$getState2 !== void 0 && _key$getState2.isPMDragging) {
+          if ((_key$getState3 = key.getState(state)) !== null && _key$getState3 !== void 0 && _key$getState3.isPMDragging) {
             dispatch(state.tr.setMeta(key, {
               isPMDragging: false
             }));

package/dist/esm/pm-plugins/utils/{fire-analytics.js → analytics.js}

@@ -1,5 +1,7 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-export var attachMoveNodeAnalytics = function attachMoveNodeAnalytics(tr, inputMethod, fromDepth, fromNodeType, toDepth, toNodeType, isSameParent, api) {
+import { fg } from '@atlaskit/platform-feature-flags';
+export var attachMoveNodeAnalytics = function attachMoveNodeAnalytics(tr, inputMethod, fromDepth, fromNodeType, toDepth, toNodeType, isSameParent, api, fromNodeTypes, hasSelectedMultipleNodes) {
   var _api$analytics;
   return api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 ? void 0 : _api$analytics.attachAnalyticsEvent({
     eventType: EVENT_TYPE.TRACK,
@@ -9,6 +11,8 @@ export var attachMoveNodeAnalytics = function attachMoveNodeAnalytics(tr, inputM
     attributes: {
       nodeDepth: fromDepth,
       nodeType: fromNodeType,
+      nodeTypes: fromNodeTypes,
+      hasSelectedMultipleNodes: hasSelectedMultipleNodes,
       destinationNodeDepth: toDepth,
       destinationNodeType: toNodeType,
       isSameParent: isSameParent,
@@ -16,15 +20,40 @@ export var attachMoveNodeAnalytics = function attachMoveNodeAnalytics(tr, inputM
     }
   })(tr);
 };
-export var fireInsertLayoutAnalytics = function fireInsertLayoutAnalytics(tr, api) {
+export var fireInsertLayoutAnalytics = function fireInsertLayoutAnalytics(tr, api, nodeTypes, hasSelectedMultipleNodes) {
   var _api$analytics2;
   api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.attachAnalyticsEvent({
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
     actionSubjectId: ACTION_SUBJECT_ID.LAYOUT,
     attributes: {
-      inputMethod: INPUT_METHOD.DRAG_AND_DROP
+      inputMethod: INPUT_METHOD.DRAG_AND_DROP,
+      nodeTypes: nodeTypes,
+      hasSelectedMultipleNodes: hasSelectedMultipleNodes
     },
     eventType: EVENT_TYPE.TRACK
   })(tr);
+};
+
+/**
+ * Given a range, return distinctive types of node and whether there are multiple nodes in the range
+ */
+export var getMultiSelectAnalyticsAttributes = function getMultiSelectAnalyticsAttributes(tr, anchor, head) {
+  var nodeTypes = [];
+  var from = Math.min(anchor, head);
+  var to = Math.max(anchor, head);
+  tr.doc.nodesBetween(from, to, function (node, pos) {
+    if (pos < from) {
+      // ignore parent node
+      return true;
+    }
+    nodeTypes.push(node.type.name);
+
+    // only care about the top level (relatively in the range) nodes
+    return false;
+  });
+  return {
+    nodeTypes: fg('platform_editor_track_node_types') ? _toConsumableArray(new Set(nodeTypes)).sort().join(',') : undefined,
+    hasSelectedMultipleNodes: nodeTypes.length > 1
+  };
 };

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

@@ -1,6 +1,6 @@
 export var getMultiSelectionIfPosInside = function getMultiSelectionIfPosInside(api, pos) {
   var _api$blockControls;
-  var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
+  var _ref = ((_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
     multiSelectDnD = _ref.multiSelectDnD;
   if (multiSelectDnD && multiSelectDnD.anchor >= 0 && multiSelectDnD.head >= 0) {
     var multiFrom = Math.min(multiSelectDnD.anchor, multiSelectDnD.head);
@@ -13,4 +13,24 @@ export var getMultiSelectionIfPosInside = function getMultiSelectionIfPosInside(
     } : {};
   }
   return {};
+};
+
+/**
+ *
+ * @returns from and to positions of the selected content (after expansion)
+ */
+export var getSelectedSlicePosition = function getSelectedSlicePosition(handlePos, tr, api) {
+  var _activeNode$nodeSize;
+  var _getMultiSelectionIfP = getMultiSelectionIfPosInside(api, handlePos),
+    anchor = _getMultiSelectionIfP.anchor,
+    head = _getMultiSelectionIfP.head;
+  var inSelection = anchor !== undefined && head !== undefined;
+  var from = inSelection ? Math.min(anchor, head) : handlePos;
+  var activeNode = tr.doc.nodeAt(handlePos);
+  var activeNodeEndPos = handlePos + ((_activeNode$nodeSize = activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeSize) !== null && _activeNode$nodeSize !== void 0 ? _activeNode$nodeSize : 1);
+  var to = inSelection ? Math.max(anchor, head) : activeNodeEndPos;
+  return {
+    from: from,
+    to: to
+  };
 };

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

@@ -1,5 +1,8 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -23,6 +26,7 @@ import { Box, xcss } from '@atlaskit/primitives';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import Tooltip from '@atlaskit/tooltip';
 import { key } from '../pm-plugins/main';
+import { getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
 import { getLeftPosition, getTopPosition } from '../pm-plugins/utils/drag-handle-positions';
 import { getNestedNodePosition } from '../pm-plugins/utils/getNestedNodePosition';
 import { isHandleInSelection, selectNode } from '../pm-plugins/utils/getSelection';
@@ -254,7 +258,11 @@ export var DragHandle = function DragHandle(_ref) {
           var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true, {
             exposure: true
           });
+          var nodeTypes, hasSelectedMultipleNodes;
+          var resolvedMovingNode = tr.doc.resolve(start);
+          var maybeNode = resolvedMovingNode.nodeAfter;
           if (isMultiSelect) {
+            var _tr$getMeta;
             var handlePos = getPos();
             if (typeof handlePos !== 'number') {
               return tr;
@@ -265,22 +273,32 @@ export var DragHandle = function DragHandle(_ref) {
                 tr: tr
               });
             }
+            var multiSelectDnD = (_tr$getMeta = tr.getMeta(key)) === null || _tr$getMeta === void 0 ? void 0 : _tr$getMeta.multiSelectDnD;
+            if (multiSelectDnD) {
+              var attributes = getMultiSelectAnalyticsAttributes(tr, multiSelectDnD.anchor, multiSelectDnD.head);
+              nodeTypes = attributes.nodeTypes;
+              hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
+            } else {
+              nodeTypes = maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name;
+              hasSelectedMultipleNodes = false;
+            }
           }
           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(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({
             eventType: EVENT_TYPE.UI,
             action: ACTION.DRAGGED,
             actionSubject: ACTION_SUBJECT.ELEMENT,
             actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-            attributes: {
+            attributes: _objectSpread({
               nodeDepth: resolvedMovingNode.depth,
               nodeType: (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name) || ''
-            }
+            }, isMultiSelect && {
+              nodeTypes: nodeTypes,
+              hasSelectedMultipleNodes: hasSelectedMultipleNodes
+            })
           })(tr);
           return tr;
         });
@@ -380,7 +398,21 @@ export var DragHandle = function DragHandle(_ref) {
     }
     setDragHandleSelected(isHandleInSelection(view.state, selection, start));
   }, [start, selection, view.state]);
-  var helpDescriptors = [{
+  var helpDescriptors = isTopLevelNode && fg('platform_editor_advanced_layouts_accessibility') ? [{
+    description: formatMessage(blockControlsMessages.dragToMove)
+  }, {
+    description: formatMessage(blockControlsMessages.moveUp),
+    keymap: dragToMoveUp
+  }, {
+    description: formatMessage(blockControlsMessages.moveDown),
+    keymap: dragToMoveDown
+  }, {
+    description: formatMessage(blockControlsMessages.moveLeft),
+    keymap: dragToMoveLeft
+  }, {
+    description: formatMessage(blockControlsMessages.moveRight),
+    keymap: dragToMoveRight
+  }] : [{
     description: formatMessage(blockControlsMessages.dragToMove)
   }, {
     description: formatMessage(blockControlsMessages.moveUp),

package/dist/types/blockControlsPluginType.d.ts

@@ -82,6 +82,7 @@ export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
         moveToLayout: (start: number, to: number, options?: {
             moveToEnd?: boolean;
             selectMovedNode?: boolean;
+            moveNodeAtCursorPos?: boolean;
         }) => EditorCommand;
         moveNode: MoveNode;
         showDragHandleAt: (pos: number, anchorName: string, nodeType: string, handleOptions?: HandleOptions) => EditorCommand;

package/dist/types/editor-commands/move-to-layout.d.ts

@@ -3,4 +3,5 @@ import type { BlockControlsPlugin } from '../blockControlsPluginType';
 export declare const moveToLayout: (api?: ExtractInjectionAPI<BlockControlsPlugin>) => (from: number, to: number, options?: {
     moveToEnd?: boolean;
     selectMovedNode?: boolean;
+    moveNodeAtCursorPos?: boolean;
 }) => EditorCommand;

package/dist/types/editor-commands/show-drag-handle.d.ts

@@ -1,3 +1,3 @@
 import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { BlockControlsPlugin } from '../blockControlsPluginType';
-export declare const showDragHandleAtSelection: (api?: ExtractInjectionAPI<BlockControlsPlugin>, shouldFocusParentNode?: boolean) => Command;
+export declare const showDragHandleAtSelection: (api?: ExtractInjectionAPI<BlockControlsPlugin>) => Command;

package/dist/types/pm-plugins/decorations-common.d.ts

@@ -5,4 +5,5 @@ export declare const TYPE_HANDLE_DEC = "drag-handle";
 export declare const TYPE_NODE_DEC = "node-decoration";
 export declare const getNestedDepth: () => 0 | 100;
 export declare const getNodeAnchor: (node: PMNode) => string;
+export declare const getNodeTypeWithLevel: (node: PMNode) => string;
 export declare const unmountDecorations: (nodeViewPortalProviderAPI: PortalProviderAPI, selector: string, key: string) => void;

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

@@ -12,6 +12,7 @@ export interface FlagType {
     isNestedEnabled: boolean;
     isMultiSelectEnabled: boolean;
 }
+export declare const getDecorations: (state: EditorState) => DecorationSet | undefined;
 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;
     activeNode: any;

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

@@ -0,0 +1,12 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import { type Transaction } from '@atlaskit/editor-prosemirror/state';
+import { type BlockControlsPlugin } from '../../blockControlsPluginType';
+export declare const attachMoveNodeAnalytics: (tr: Transaction, inputMethod: string, fromDepth: number, fromNodeType: string, toDepth?: number, toNodeType?: string, isSameParent?: boolean, api?: ExtractInjectionAPI<BlockControlsPlugin>, fromNodeTypes?: string, hasSelectedMultipleNodes?: boolean) => boolean | undefined;
+export declare const fireInsertLayoutAnalytics: (tr: Transaction, api?: ExtractInjectionAPI<BlockControlsPlugin>, nodeTypes?: string, hasSelectedMultipleNodes?: boolean) => void;
+/**
+ * Given a range, return distinctive types of node and whether there are multiple nodes in the range
+ */
+export declare const getMultiSelectAnalyticsAttributes: (tr: Transaction, anchor: number, head: number) => {
+    nodeTypes: string | undefined;
+    hasSelectedMultipleNodes: boolean;
+};

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

@@ -1,6 +1,15 @@
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { BlockControlsPlugin } from '../../blockControlsPluginType';
 export declare const getMultiSelectionIfPosInside: (api: ExtractInjectionAPI<BlockControlsPlugin>, pos: number) => {
     anchor?: number;
     head?: number;
 };
+/**
+ *
+ * @returns from and to positions of the selected content (after expansion)
+ */
+export declare const getSelectedSlicePosition: (handlePos: number, tr: Transaction, api: ExtractInjectionAPI<BlockControlsPlugin>) => {
+    from: number;
+    to: number;
+};

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

@@ -82,6 +82,7 @@ export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
         moveToLayout: (start: number, to: number, options?: {
             moveToEnd?: boolean;
             selectMovedNode?: boolean;
+            moveNodeAtCursorPos?: boolean;
         }) => EditorCommand;
         moveNode: MoveNode;
         showDragHandleAt: (pos: number, anchorName: string, nodeType: string, handleOptions?: HandleOptions) => EditorCommand;

package/dist/types-ts4.5/editor-commands/move-to-layout.d.ts

@@ -3,4 +3,5 @@ import type { BlockControlsPlugin } from '../blockControlsPluginType';
 export declare const moveToLayout: (api?: ExtractInjectionAPI<BlockControlsPlugin>) => (from: number, to: number, options?: {
     moveToEnd?: boolean;
     selectMovedNode?: boolean;
+    moveNodeAtCursorPos?: boolean;
 }) => EditorCommand;

package/dist/types-ts4.5/editor-commands/show-drag-handle.d.ts

@@ -1,3 +1,3 @@
 import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { BlockControlsPlugin } from '../blockControlsPluginType';
-export declare const showDragHandleAtSelection: (api?: ExtractInjectionAPI<BlockControlsPlugin>, shouldFocusParentNode?: boolean) => Command;
+export declare const showDragHandleAtSelection: (api?: ExtractInjectionAPI<BlockControlsPlugin>) => Command;

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

@@ -5,4 +5,5 @@ export declare const TYPE_HANDLE_DEC = "drag-handle";
 export declare const TYPE_NODE_DEC = "node-decoration";
 export declare const getNestedDepth: () => 0 | 100;
 export declare const getNodeAnchor: (node: PMNode) => string;
+export declare const getNodeTypeWithLevel: (node: PMNode) => string;
 export declare const unmountDecorations: (nodeViewPortalProviderAPI: PortalProviderAPI, selector: string, key: string) => void;

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

@@ -12,6 +12,7 @@ export interface FlagType {
     isNestedEnabled: boolean;
     isMultiSelectEnabled: boolean;
 }
+export declare const getDecorations: (state: EditorState) => DecorationSet | undefined;
 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;
     activeNode: any;

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

@@ -0,0 +1,12 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import { type Transaction } from '@atlaskit/editor-prosemirror/state';
+import { type BlockControlsPlugin } from '../../blockControlsPluginType';
+export declare const attachMoveNodeAnalytics: (tr: Transaction, inputMethod: string, fromDepth: number, fromNodeType: string, toDepth?: number, toNodeType?: string, isSameParent?: boolean, api?: ExtractInjectionAPI<BlockControlsPlugin>, fromNodeTypes?: string, hasSelectedMultipleNodes?: boolean) => boolean | undefined;
+export declare const fireInsertLayoutAnalytics: (tr: Transaction, api?: ExtractInjectionAPI<BlockControlsPlugin>, nodeTypes?: string, hasSelectedMultipleNodes?: boolean) => void;
+/**
+ * Given a range, return distinctive types of node and whether there are multiple nodes in the range
+ */
+export declare const getMultiSelectAnalyticsAttributes: (tr: Transaction, anchor: number, head: number) => {
+    nodeTypes: string | undefined;
+    hasSelectedMultipleNodes: boolean;
+};

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

@@ -1,6 +1,15 @@
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { BlockControlsPlugin } from '../../blockControlsPluginType';
 export declare const getMultiSelectionIfPosInside: (api: ExtractInjectionAPI<BlockControlsPlugin>, pos: number) => {
     anchor?: number;
     head?: number;
 };
+/**
+ *
+ * @returns from and to positions of the selected content (after expansion)
+ */
+export declare const getSelectedSlicePosition: (handlePos: number, tr: Transaction, api: ExtractInjectionAPI<BlockControlsPlugin>) => {
+    from: number;
+    to: number;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.26.0",
+	"version": "2.26.2",
 	"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.12.0",
+		"@atlaskit/editor-common": "^99.14.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.8.0",
+		"@atlaskit/icon": "^23.9.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.45.0",
+		"@atlaskit/tmp-editor-statsig": "^2.46.0",
 		"@atlaskit/tokens": "^3.3.0",
 		"@atlaskit/tooltip": "^19.1.0",
 		"@babel/runtime": "^7.0.0",
@@ -119,9 +119,6 @@
 		"platform_editor_advanced_layouts_redraw_on_drag": {
 			"type": "boolean"
 		},
-		"platform_editor_react18_plugin_portalprovider": {
-			"type": "boolean"
-		},
 		"platform_editor_use_nested_table_pm_nodes": {
 			"type": "boolean"
 		},
@@ -145,6 +142,12 @@
 		},
 		"platform_editor_advanced_layouts_accessibility": {
 			"type": "boolean"
+		},
+		"platform_editor_advanced_layouts_a11y": {
+			"type": "boolean"
+		},
+		"platform_editor_track_node_types": {
+			"type": "boolean"
 		}
 	}
 }

package/dist/cjs/pm-plugins/utils/fire-analytics.js

@@ -1,36 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.fireInsertLayoutAnalytics = exports.attachMoveNodeAnalytics = void 0;
-var _analytics = require("@atlaskit/editor-common/analytics");
-var attachMoveNodeAnalytics = exports.attachMoveNodeAnalytics = function attachMoveNodeAnalytics(tr, inputMethod, fromDepth, fromNodeType, toDepth, toNodeType, isSameParent, api) {
-  var _api$analytics;
-  return api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 ? void 0 : _api$analytics.attachAnalyticsEvent({
-    eventType: _analytics.EVENT_TYPE.TRACK,
-    action: _analytics.ACTION.MOVED,
-    actionSubject: _analytics.ACTION_SUBJECT.ELEMENT,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-    attributes: {
-      nodeDepth: fromDepth,
-      nodeType: fromNodeType,
-      destinationNodeDepth: toDepth,
-      destinationNodeType: toNodeType,
-      isSameParent: isSameParent,
-      inputMethod: inputMethod
-    }
-  })(tr);
-};
-var fireInsertLayoutAnalytics = exports.fireInsertLayoutAnalytics = function fireInsertLayoutAnalytics(tr, api) {
-  var _api$analytics2;
-  api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.attachAnalyticsEvent({
-    action: _analytics.ACTION.INSERTED,
-    actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.LAYOUT,
-    attributes: {
-      inputMethod: _analytics.INPUT_METHOD.DRAG_AND_DROP
-    },
-    eventType: _analytics.EVENT_TYPE.TRACK
-  })(tr);
-};

package/dist/types/pm-plugins/utils/fire-analytics.d.ts

@@ -1,5 +0,0 @@
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import { type Transaction } from '@atlaskit/editor-prosemirror/state';
-import { type BlockControlsPlugin } from '../../blockControlsPluginType';
-export declare const attachMoveNodeAnalytics: (tr: Transaction, inputMethod: string, fromDepth: number, fromNodeType: string, toDepth?: number, toNodeType?: string, isSameParent?: boolean, api?: ExtractInjectionAPI<BlockControlsPlugin>) => boolean | undefined;
-export declare const fireInsertLayoutAnalytics: (tr: Transaction, api?: ExtractInjectionAPI<BlockControlsPlugin>) => void;

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

@@ -1,5 +0,0 @@
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import { type Transaction } from '@atlaskit/editor-prosemirror/state';
-import { type BlockControlsPlugin } from '../../blockControlsPluginType';
-export declare const attachMoveNodeAnalytics: (tr: Transaction, inputMethod: string, fromDepth: number, fromNodeType: string, toDepth?: number, toNodeType?: string, isSameParent?: boolean, api?: ExtractInjectionAPI<BlockControlsPlugin>) => boolean | undefined;
-export declare const fireInsertLayoutAnalytics: (tr: Transaction, api?: ExtractInjectionAPI<BlockControlsPlugin>) => void;