@atlaskit/editor-plugin-block-controls 3.2.1 → 3.3.1

package/dist/es2019/editor-commands/move-node.js

@@ -88,6 +88,7 @@ const getFocusedHandle = state => {
 };
 export const moveNodeViaShortcut = (api, direction, formatMessage) => {
   return state => {
+    var _hoistedPos;
     let isParentNodeOfTypeLayout;
     const shouldEnableNestedDndA11y = editorExperiment('nested-dnd', true);
     const {
@@ -100,19 +101,26 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
     const expandedSelection = expandSelectionBounds(selection.$anchor, selection.$head);
     const expandedAnchor = expandedSelection.$anchor.pos;
     const expandedHead = expandedSelection.$head.pos;
-    const currentNodePos = isMultiSelectEnabled && !getFocusedHandle(state) ? Math.min(expandedAnchor, expandedHead) : getCurrentNodePos(state);
+    let hoistedPos;
+    const from = Math.min(expandedAnchor, expandedHead);
+    // Nodes like lists nest within themselves, we need to find the top most position
+    if (isParentNodeOfTypeLayout && fg('platform_editor_elements_dnd_multi_select_patch_1')) {
+      const LAYOUT_COL_DEPTH = 3;
+      hoistedPos = state.doc.resolve(from).before(LAYOUT_COL_DEPTH);
+    }
+    const currentNodePos = isMultiSelectEnabled && !getFocusedHandle(state) && !selection.empty ? (_hoistedPos = hoistedPos) !== null && _hoistedPos !== void 0 ? _hoistedPos : from : getCurrentNodePos(state);
     if (currentNodePos > -1) {
       var _state$doc$nodeAt;
-      const $pos = state.doc.resolve(currentNodePos);
-      const nodeAfterPos = isMultiSelectEnabled && !getFocusedHandle(state) ? Math.max(expandedAnchor, expandedHead) : $pos.posAtIndex($pos.index() + 1);
-      const isTopLevelNode = $pos.depth === 0;
+      const $currentNodePos = state.doc.resolve(currentNodePos);
+      const nodeAfterPos = isMultiSelectEnabled && !getFocusedHandle(state) ? Math.max(expandedAnchor, expandedHead) : $currentNodePos.posAtIndex($currentNodePos.index() + 1);
+      const isTopLevelNode = $currentNodePos.depth === 0;
       let moveToPos = -1;
-      const nodeIndex = $pos.index();
+      const nodeIndex = $currentNodePos.index();
       const isLayoutColumnSelected = selection instanceof NodeSelection && selection.node.type.name === 'layoutColumn';
       if (direction === DIRECTION.LEFT && shouldEnableNestedDndA11y) {
         if (isTopLevelNode && editorExperiment('advanced_layouts', true) && fg('platform_editor_advanced_layouts_accessibility')) {
           var _api$core, _api$core2;
-          const nodeBefore = $pos.nodeBefore;
+          const nodeBefore = $currentNodePos.nodeBefore;
           if (nodeBefore) {
             moveToPos = currentNodePos - nodeBefore.nodeSize;
           }
@@ -137,28 +145,28 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
           api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.focus();
           return true;
         } else if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
-          var _$pos$nodeBefore, _api$core3, _api$blockControls2, _api$blockControls2$c;
-          moveToPos = selection.from - (((_$pos$nodeBefore = $pos.nodeBefore) === null || _$pos$nodeBefore === void 0 ? void 0 : _$pos$nodeBefore.nodeSize) || 1);
+          var _$currentNodePos$node, _api$core3, _api$blockControls2, _api$blockControls2$c;
+          moveToPos = selection.from - (((_$currentNodePos$node = $currentNodePos.nodeBefore) === null || _$currentNodePos$node === void 0 ? void 0 : _$currentNodePos$node.nodeSize) || 1);
           api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : (_api$blockControls2$c = _api$blockControls2.commands) === null || _api$blockControls2$c === void 0 ? void 0 : _api$blockControls2$c.moveToLayout(currentNodePos, moveToPos, {
             selectMovedNode: true
           }));
           return true;
         } else {
-          if ($pos.depth < 2 || !isParentNodeOfTypeLayout) {
+          if ($currentNodePos.depth < 2 || !isParentNodeOfTypeLayout) {
             return false;
           }
 
           // get the previous layoutSection node
-          const index = $pos.index($pos.depth - 1);
-          const grandParent = $pos.node($pos.depth - 1);
+          const index = $currentNodePos.index($currentNodePos.depth - 1);
+          const grandParent = $currentNodePos.node($currentNodePos.depth - 1);
           const previousNode = grandParent ? grandParent.maybeChild(index - 1) : null;
-          moveToPos = $pos.start() - ((previousNode === null || previousNode === void 0 ? void 0 : previousNode.nodeSize) || 1);
+          moveToPos = $currentNodePos.start() - ((previousNode === null || previousNode === void 0 ? void 0 : previousNode.nodeSize) || 1);
         }
       } else if (direction === DIRECTION.RIGHT && shouldEnableNestedDndA11y) {
         if (isTopLevelNode && editorExperiment('advanced_layouts', true) && fg('platform_editor_advanced_layouts_accessibility')) {
           var _api$core4, _api$core5;
-          const endOfDoc = $pos.end();
-          moveToPos = $pos.posAtIndex($pos.index() + 1);
+          const endOfDoc = $currentNodePos.end();
+          moveToPos = $currentNodePos.posAtIndex($currentNodePos.index() + 1);
           if (moveToPos >= endOfDoc) {
             return false;
           }
@@ -180,8 +188,8 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
           return true;
         } else if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
           var _api$core6, _api$blockControls4, _api$blockControls4$c;
-          const index = $pos.index($pos.depth);
-          const parent = $pos.node($pos.depth);
+          const index = $currentNodePos.index($currentNodePos.depth);
+          const parent = $currentNodePos.node($currentNodePos.depth);
           // get the next layoutColumn node
           const nextNode = parent ? parent.maybeChild(index + 1) : null;
 
@@ -191,29 +199,29 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
             return true;
           }
           const moveToEnd = index === parent.childCount - 2;
-          moveToPos = moveToEnd ? $pos.before() : selection.to + ((nextNode === null || nextNode === void 0 ? void 0 : nextNode.nodeSize) || 1);
+          moveToPos = moveToEnd ? $currentNodePos.before() : selection.to + ((nextNode === null || nextNode === void 0 ? void 0 : nextNode.nodeSize) || 1);
           api === null || api === void 0 ? void 0 : (_api$core6 = api.core) === null || _api$core6 === void 0 ? void 0 : _api$core6.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : (_api$blockControls4$c = _api$blockControls4.commands) === null || _api$blockControls4$c === void 0 ? void 0 : _api$blockControls4$c.moveToLayout(currentNodePos, moveToPos, {
             moveToEnd,
             selectMovedNode: true
           }));
           return true;
         } else {
-          if ($pos.depth < 2 || !isParentNodeOfTypeLayout) {
+          if ($currentNodePos.depth < 2 || !isParentNodeOfTypeLayout) {
             return false;
           }
-          moveToPos = $pos.after($pos.depth) + 1;
+          moveToPos = $currentNodePos.after($currentNodePos.depth) + 1;
         }
       } else if (direction === DIRECTION.UP) {
         if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
-          moveToPos = $pos.start() - 1;
+          moveToPos = $currentNodePos.start() - 1;
         } else {
-          const nodeBefore = $pos.depth > 1 && nodeIndex === 0 && shouldEnableNestedDndA11y ? $pos.node($pos.depth) : $pos.nodeBefore;
+          const nodeBefore = $currentNodePos.depth > 1 && nodeIndex === 0 && shouldEnableNestedDndA11y ? $currentNodePos.node($currentNodePos.depth) : $currentNodePos.nodeBefore;
           if (nodeBefore) {
             moveToPos = currentNodePos - nodeBefore.nodeSize;
           }
         }
       } else {
-        const endOfDoc = $pos.end();
+        const endOfDoc = $currentNodePos.end();
         if (nodeAfterPos > endOfDoc) {
           return false;
         }
@@ -230,15 +238,25 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
       const nodeType = (_state$doc$nodeAt = state.doc.nodeAt(currentNodePos)) === null || _state$doc$nodeAt === void 0 ? void 0 : _state$doc$nodeAt.type.name;
 
       // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
-      const shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $pos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn' && fg('platform_editor_advanced_layouts_accessibility');
+      const shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn' && fg('platform_editor_advanced_layouts_accessibility');
+      const {
+        $anchor: $newAnchor,
+        $head: $newHead
+      } = expandSelectionBounds($currentNodePos, selection.$to);
       if (shouldMoveNode) {
         var _api$core7;
         api === null || api === void 0 ? void 0 : (_api$core7 = api.core) === null || _api$core7 === void 0 ? void 0 : _api$core7.actions.execute(({
           tr
         }) => {
-          api === null || api === void 0 ? void 0 : api.blockControls.commands.setMultiSelectPositions(expandedAnchor, expandedHead)({
-            tr
-          });
+          if (fg('platform_editor_elements_dnd_multi_select_patch_1')) {
+            api === null || api === void 0 ? void 0 : api.blockControls.commands.setMultiSelectPositions($newAnchor.pos, $newHead.pos)({
+              tr
+            });
+          } else {
+            api === null || api === void 0 ? void 0 : api.blockControls.commands.setMultiSelectPositions(expandedAnchor, expandedHead)({
+              tr
+            });
+          }
           moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.SHORTCUT, formatMessage)({
             tr
           });
@@ -262,9 +280,15 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
         api === null || api === void 0 ? void 0 : (_api$core9 = api.core) === null || _api$core9 === void 0 ? void 0 : _api$core9.actions.execute(({
           tr
         }) => {
-          api.blockControls.commands.setMultiSelectPositions(expandedAnchor, expandedHead)({
-            tr
-          });
+          if (fg('platform_editor_elements_dnd_multi_select_patch_1')) {
+            api === null || api === void 0 ? void 0 : api.blockControls.commands.setMultiSelectPositions($newAnchor.pos, $newHead.pos)({
+              tr
+            });
+          } else {
+            api === null || api === void 0 ? void 0 : api.blockControls.commands.setMultiSelectPositions(expandedAnchor, expandedHead)({
+              tr
+            });
+          }
           tr.scrollIntoView();
           return tr;
         });
@@ -292,6 +316,12 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
   const isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true, {
     exposure: true
   });
+  if (fg('platform_editor_ease_of_use_metrics')) {
+    var _api$metrics;
+    api === null || api === void 0 ? void 0 : (_api$metrics = api.metrics) === null || _api$metrics === void 0 ? void 0 : _api$metrics.commands.setContentMoved()({
+      tr
+    });
+  }
   const slicePosition = getSelectedSlicePosition(start, tr, api);
   if (isMultiSelect) {
     sliceFrom = slicePosition.from;

package/dist/es2019/editor-commands/move-to-layout.js

@@ -313,6 +313,12 @@ export const moveToLayout = api => (from, to, options) => ({
   if (!fromContentWithoutBreakout) {
     return tr;
   }
+  if (fg('platform_editor_ease_of_use_metrics')) {
+    var _api$metrics;
+    api === null || api === void 0 ? void 0 : (_api$metrics = api.metrics) === null || _api$metrics === void 0 ? void 0 : _api$metrics.commands.setContentMoved()({
+      tr
+    });
+  }
   const isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
   if (toNode.type === layoutSection) {
     const toPos = options !== null && options !== void 0 && options.moveToEnd ? to + toNode.nodeSize - 1 : to + 1;

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

@@ -133,6 +133,12 @@ const destroyFn = (api, editorView) => {
             }
           })(tr);
         }
+        if (fg('platform_editor_ease_of_use_metrics')) {
+          var _api$metrics;
+          api === null || api === void 0 ? void 0 : (_api$metrics = api.metrics) === null || _api$metrics === void 0 ? void 0 : _api$metrics.commands.startActiveSessionTimer()({
+            tr
+          });
+        }
         return tr.setMeta(key, {
           ...tr.getMeta(key),
           isDragging: false,
@@ -310,24 +316,23 @@ export const newApply = (api, formatMessage, tr, currentState, newState, flags,
     const oldHandle = findHandleDec(decorations, (_activeNode3 = activeNode) === null || _activeNode3 === void 0 ? void 0 : _activeNode3.pos, (_activeNode4 = activeNode) === null || _activeNode4 === void 0 ? void 0 : _activeNode4.pos);
     decorations = decorations.remove(oldHandle);
     if (editorExperiment('platform_editor_controls', 'variant1')) {
-      var _activeNode5, _activeNode6;
-      const oldQuickInsertButton = findQuickInsertInsertButtonDecoration(decorations, (_activeNode5 = activeNode) === null || _activeNode5 === void 0 ? void 0 : _activeNode5.rootPos, (_activeNode6 = activeNode) === null || _activeNode6 === void 0 ? void 0 : _activeNode6.rootPos);
+      const oldQuickInsertButton = findQuickInsertInsertButtonDecoration(decorations);
       decorations = decorations.remove(oldQuickInsertButton);
     }
   } else if (api && shouldRecreateHandle) {
-    var _activeNode7, _activeNode8;
-    const oldHandle = findHandleDec(decorations, (_activeNode7 = activeNode) === null || _activeNode7 === void 0 ? void 0 : _activeNode7.pos, (_activeNode8 = activeNode) === null || _activeNode8 === void 0 ? void 0 : _activeNode8.pos);
+    var _activeNode5, _activeNode6;
+    const oldHandle = findHandleDec(decorations, (_activeNode5 = activeNode) === null || _activeNode5 === void 0 ? void 0 : _activeNode5.pos, (_activeNode6 = activeNode) === null || _activeNode6 === void 0 ? void 0 : _activeNode6.pos);
     decorations = decorations.remove(oldHandle);
     const handleDec = dragHandleDecoration(api, formatMessage, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.pos, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.anchorName, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.nodeType, nodeViewPortalProviderAPI, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.handleOptions);
     if (editorExperiment('platform_editor_controls', 'variant1')) {
-      var _activeNode9, _activeNode10;
-      const oldQuickInsertButton = findQuickInsertInsertButtonDecoration(decorations, (_activeNode9 = activeNode) === null || _activeNode9 === void 0 ? void 0 : _activeNode9.rootPos, (_activeNode10 = activeNode) === null || _activeNode10 === void 0 ? void 0 : _activeNode10.rootPos);
-      decorations = decorations.remove(oldQuickInsertButton);
-      const quickInsertButton = quickInsertButtonDecoration(api, formatMessage, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.rootPos, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.anchorName, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.nodeType, nodeViewPortalProviderAPI, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.rootAnchorName, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.rootNodeType);
-      decorations = decorations.add(newState.doc, [handleDec, quickInsertButton]);
-    } else {
-      decorations = decorations.add(newState.doc, [handleDec]);
+      if ((latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.rootPos) !== undefined) {
+        const oldQuickInsertButton = findQuickInsertInsertButtonDecoration(decorations);
+        decorations = decorations.remove(oldQuickInsertButton);
+        const quickInsertButton = quickInsertButtonDecoration(api, formatMessage, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.rootPos, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.anchorName, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.nodeType, nodeViewPortalProviderAPI, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.rootAnchorName, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.rootNodeType);
+        decorations = decorations.add(newState.doc, [quickInsertButton]);
+      }
     }
+    decorations = decorations.add(newState.doc, [handleDec]);
   }
 
   // Drop targets may be missing when the node count is being changed during a drag
@@ -570,7 +575,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
       },
       handleDOMEvents: {
         drop(view, event) {
-          var _pluginState, _pluginState2, _pluginState3, _event$target;
+          var _pluginState, _pluginState2, _pluginState3, _event$target, _event$target$closest;
           // Prevent native DnD from triggering if we are in drag
           const {
             dispatch,
@@ -581,6 +586,12 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
           let pluginState = key.getState(state);
           const dndDragCancelled = (_pluginState = pluginState) === null || _pluginState === void 0 ? void 0 : _pluginState.lastDragCancelled;
           if ((_pluginState2 = pluginState) !== null && _pluginState2 !== void 0 && _pluginState2.isPMDragging || dndDragCancelled && isMultiSelectEnabled) {
+            if (fg('platform_editor_ease_of_use_metrics')) {
+              var _api$metrics2;
+              api === null || api === void 0 ? void 0 : (_api$metrics2 = api.metrics) === null || _api$metrics2 === void 0 ? void 0 : _api$metrics2.commands.startActiveSessionTimer()({
+                tr
+              });
+            }
             dispatch(tr.setMeta(key, {
               ...tr.getMeta(key),
               isPMDragging: false,
@@ -599,7 +610,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
             event.preventDefault();
             return false;
           }
-          const nodeElement = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.closest('[data-drag-handler-anchor-name]');
+          const nodeElement = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : (_event$target$closest = _event$target.closest) === null || _event$target$closest === void 0 ? void 0 : _event$target$closest.call(_event$target, '[data-drag-handler-anchor-name]');
           if (!nodeElement) {
             return false;
           }
@@ -648,10 +659,18 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
             dispatch
           } = view;
           if ((_key$getState3 = key.getState(state)) !== null && _key$getState3 !== void 0 && _key$getState3.isPMDragging) {
-            dispatch(state.tr.setMeta(key, {
+            const tr = state.tr;
+            tr.setMeta(key, {
               ...state.tr.getMeta(key),
               isPMDragging: false
-            }));
+            });
+            if (fg('platform_editor_ease_of_use_metrics')) {
+              var _api$metrics3;
+              api === null || api === void 0 ? void 0 : (_api$metrics3 = api.metrics) === null || _api$metrics3 === void 0 ? void 0 : _api$metrics3.commands.startActiveSessionTimer()({
+                tr
+              });
+            }
+            dispatch(tr);
           }
         },
         mouseover: (view, event) => {

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

@@ -2,6 +2,7 @@ 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';
+import { fg } from '@atlaskit/platform-feature-flags';
 export const getInlineNodePos = (tr, start, nodeSize) => {
   const $startPos = tr.doc.resolve(start);
   // To trigger the annotation floating toolbar for non-selectable node, we need to select inline nodes
@@ -53,6 +54,8 @@ export const getSelection = (tr, start) => {
   // we need a quick way to make all child media nodes appear as selected without the need for a custom selection
   nodeName === 'mediaGroup') {
     return new NodeSelection($startPos);
+  } else if (nodeName === 'taskList' && fg('platform_editor_elements_dnd_multi_select_patch_1')) {
+    return TextSelection.create(tr.doc, start, start + nodeSize);
   } else {
     const {
       inlineNodePos,
@@ -100,21 +103,42 @@ export const isHandleCorrelatedToSelection = (state, selection, handlePos) => {
   if (selection.empty) {
     return false;
   }
+  let nodeStart;
   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();
+  if (fg('platform_editor_elements_dnd_multi_select_patch_1')) {
+    nodeStart = $selectionFrom.before($selectionFrom.sharedDepth(selection.to) + 1);
+    if (nodeStart === $selectionFrom.pos) {
+      nodeStart = $selectionFrom.depth ? $selectionFrom.before() : $selectionFrom.pos;
+    }
+    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();
+    }
+  } else {
+    const selectionFrom = $selectionFrom.pos;
+    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);
 };

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

@@ -288,7 +288,7 @@ export const DragHandle = ({
               return tr;
             }
             const oldHandlePosCheck = handlePos >= tr.selection.$from.start() - 1 && handlePos <= tr.selection.to;
-            const newHandlePosCheck = handlePos >= (tr.selection.$from.depth ? tr.selection.$from.before() : tr.selection.from) && handlePos < tr.selection.to;
+            const newHandlePosCheck = isHandleCorrelatedToSelection(view.state, tr.selection, handlePos);
             if (!tr.selection.empty && (fg('platform_editor_elements_dnd_multi_select_patch_1') ? newHandlePosCheck : oldHandlePosCheck)) {
               var _api$blockControls4;
               api === null || api === void 0 ? void 0 : (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands.setMultiSelectPositions()({

package/dist/esm/blockControlsPlugin.js

@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import { expandSelectionBounds } from '@atlaskit/editor-common/selection';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { moveNode } from './editor-commands/move-node';
 import { moveToLayout } from './editor-commands/move-to-layout';
@@ -82,6 +83,15 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
               nodeType: nodeType
             }
           }));
+          if (fg('platform_editor_ease_of_use_metrics')) {
+            var _api$metrics;
+            api === null || api === void 0 || (_api$metrics = api.metrics) === null || _api$metrics === void 0 || _api$metrics.commands.handleIntentToStartEdit({
+              shouldStartTimer: false,
+              shouldPersistActiveSession: true
+            })({
+              tr: tr
+            });
+          }
           return tr;
         };
       },

package/dist/esm/editor-commands/move-node.js

@@ -87,6 +87,7 @@ var getFocusedHandle = function getFocusedHandle(state) {
 };
 export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, formatMessage) {
   return function (state) {
+    var _hoistedPos;
     var isParentNodeOfTypeLayout;
     var shouldEnableNestedDndA11y = editorExperiment('nested-dnd', true);
     var selection = state.selection;
@@ -97,19 +98,26 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
     var expandedSelection = expandSelectionBounds(selection.$anchor, selection.$head);
     var expandedAnchor = expandedSelection.$anchor.pos;
     var expandedHead = expandedSelection.$head.pos;
-    var currentNodePos = isMultiSelectEnabled && !getFocusedHandle(state) ? Math.min(expandedAnchor, expandedHead) : getCurrentNodePos(state);
+    var hoistedPos;
+    var from = Math.min(expandedAnchor, expandedHead);
+    // Nodes like lists nest within themselves, we need to find the top most position
+    if (isParentNodeOfTypeLayout && fg('platform_editor_elements_dnd_multi_select_patch_1')) {
+      var LAYOUT_COL_DEPTH = 3;
+      hoistedPos = state.doc.resolve(from).before(LAYOUT_COL_DEPTH);
+    }
+    var currentNodePos = isMultiSelectEnabled && !getFocusedHandle(state) && !selection.empty ? (_hoistedPos = hoistedPos) !== null && _hoistedPos !== void 0 ? _hoistedPos : from : getCurrentNodePos(state);
     if (currentNodePos > -1) {
       var _state$doc$nodeAt;
-      var $pos = state.doc.resolve(currentNodePos);
-      var nodeAfterPos = isMultiSelectEnabled && !getFocusedHandle(state) ? Math.max(expandedAnchor, expandedHead) : $pos.posAtIndex($pos.index() + 1);
-      var isTopLevelNode = $pos.depth === 0;
+      var $currentNodePos = state.doc.resolve(currentNodePos);
+      var nodeAfterPos = isMultiSelectEnabled && !getFocusedHandle(state) ? Math.max(expandedAnchor, expandedHead) : $currentNodePos.posAtIndex($currentNodePos.index() + 1);
+      var isTopLevelNode = $currentNodePos.depth === 0;
       var moveToPos = -1;
-      var nodeIndex = $pos.index();
+      var nodeIndex = $currentNodePos.index();
       var isLayoutColumnSelected = selection instanceof NodeSelection && selection.node.type.name === 'layoutColumn';
       if (direction === DIRECTION.LEFT && shouldEnableNestedDndA11y) {
         if (isTopLevelNode && editorExperiment('advanced_layouts', true) && fg('platform_editor_advanced_layouts_accessibility')) {
           var _api$core, _api$core2;
-          var nodeBefore = $pos.nodeBefore;
+          var nodeBefore = $currentNodePos.nodeBefore;
           if (nodeBefore) {
             moveToPos = currentNodePos - nodeBefore.nodeSize;
           }
@@ -133,28 +141,28 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
           api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.focus();
           return true;
         } else if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
-          var _$pos$nodeBefore, _api$core3, _api$blockControls2;
-          moveToPos = selection.from - (((_$pos$nodeBefore = $pos.nodeBefore) === null || _$pos$nodeBefore === void 0 ? void 0 : _$pos$nodeBefore.nodeSize) || 1);
+          var _$currentNodePos$node, _api$core3, _api$blockControls2;
+          moveToPos = selection.from - (((_$currentNodePos$node = $currentNodePos.nodeBefore) === null || _$currentNodePos$node === void 0 ? void 0 : _$currentNodePos$node.nodeSize) || 1);
           api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.moveToLayout(currentNodePos, moveToPos, {
             selectMovedNode: true
           }));
           return true;
         } else {
-          if ($pos.depth < 2 || !isParentNodeOfTypeLayout) {
+          if ($currentNodePos.depth < 2 || !isParentNodeOfTypeLayout) {
             return false;
           }
 
           // get the previous layoutSection node
-          var index = $pos.index($pos.depth - 1);
-          var grandParent = $pos.node($pos.depth - 1);
+          var index = $currentNodePos.index($currentNodePos.depth - 1);
+          var grandParent = $currentNodePos.node($currentNodePos.depth - 1);
           var previousNode = grandParent ? grandParent.maybeChild(index - 1) : null;
-          moveToPos = $pos.start() - ((previousNode === null || previousNode === void 0 ? void 0 : previousNode.nodeSize) || 1);
+          moveToPos = $currentNodePos.start() - ((previousNode === null || previousNode === void 0 ? void 0 : previousNode.nodeSize) || 1);
         }
       } else if (direction === DIRECTION.RIGHT && shouldEnableNestedDndA11y) {
         if (isTopLevelNode && editorExperiment('advanced_layouts', true) && fg('platform_editor_advanced_layouts_accessibility')) {
           var _api$core4, _api$core5;
-          var endOfDoc = $pos.end();
-          moveToPos = $pos.posAtIndex($pos.index() + 1);
+          var endOfDoc = $currentNodePos.end();
+          moveToPos = $currentNodePos.posAtIndex($currentNodePos.index() + 1);
           if (moveToPos >= endOfDoc) {
             return false;
           }
@@ -175,8 +183,8 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
           return true;
         } else if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
           var _api$core6, _api$blockControls4;
-          var _index = $pos.index($pos.depth);
-          var parent = $pos.node($pos.depth);
+          var _index = $currentNodePos.index($currentNodePos.depth);
+          var parent = $currentNodePos.node($currentNodePos.depth);
           // get the next layoutColumn node
           var nextNode = parent ? parent.maybeChild(_index + 1) : null;
 
@@ -186,29 +194,29 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
             return true;
           }
           var moveToEnd = _index === parent.childCount - 2;
-          moveToPos = moveToEnd ? $pos.before() : selection.to + ((nextNode === null || nextNode === void 0 ? void 0 : nextNode.nodeSize) || 1);
+          moveToPos = moveToEnd ? $currentNodePos.before() : selection.to + ((nextNode === null || nextNode === void 0 ? void 0 : nextNode.nodeSize) || 1);
           api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 || _api$core6.actions.execute(api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 || (_api$blockControls4 = _api$blockControls4.commands) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.moveToLayout(currentNodePos, moveToPos, {
             moveToEnd: moveToEnd,
             selectMovedNode: true
           }));
           return true;
         } else {
-          if ($pos.depth < 2 || !isParentNodeOfTypeLayout) {
+          if ($currentNodePos.depth < 2 || !isParentNodeOfTypeLayout) {
             return false;
           }
-          moveToPos = $pos.after($pos.depth) + 1;
+          moveToPos = $currentNodePos.after($currentNodePos.depth) + 1;
         }
       } else if (direction === DIRECTION.UP) {
         if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
-          moveToPos = $pos.start() - 1;
+          moveToPos = $currentNodePos.start() - 1;
         } else {
-          var _nodeBefore = $pos.depth > 1 && nodeIndex === 0 && shouldEnableNestedDndA11y ? $pos.node($pos.depth) : $pos.nodeBefore;
+          var _nodeBefore = $currentNodePos.depth > 1 && nodeIndex === 0 && shouldEnableNestedDndA11y ? $currentNodePos.node($currentNodePos.depth) : $currentNodePos.nodeBefore;
           if (_nodeBefore) {
             moveToPos = currentNodePos - _nodeBefore.nodeSize;
           }
         }
       } else {
-        var _endOfDoc = $pos.end();
+        var _endOfDoc = $currentNodePos.end();
         if (nodeAfterPos > _endOfDoc) {
           return false;
         }
@@ -225,14 +233,23 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
       var nodeType = (_state$doc$nodeAt = state.doc.nodeAt(currentNodePos)) === null || _state$doc$nodeAt === void 0 ? void 0 : _state$doc$nodeAt.type.name;
 
       // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
-      var shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $pos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn' && fg('platform_editor_advanced_layouts_accessibility');
+      var shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn' && fg('platform_editor_advanced_layouts_accessibility');
+      var _expandSelectionBound = expandSelectionBounds($currentNodePos, selection.$to),
+        $newAnchor = _expandSelectionBound.$anchor,
+        $newHead = _expandSelectionBound.$head;
       if (shouldMoveNode) {
         var _api$core7;
         api === null || api === void 0 || (_api$core7 = api.core) === null || _api$core7 === void 0 || _api$core7.actions.execute(function (_ref4) {
           var tr = _ref4.tr;
-          api === null || api === void 0 || api.blockControls.commands.setMultiSelectPositions(expandedAnchor, expandedHead)({
-            tr: tr
-          });
+          if (fg('platform_editor_elements_dnd_multi_select_patch_1')) {
+            api === null || api === void 0 || api.blockControls.commands.setMultiSelectPositions($newAnchor.pos, $newHead.pos)({
+              tr: tr
+            });
+          } else {
+            api === null || api === void 0 || api.blockControls.commands.setMultiSelectPositions(expandedAnchor, expandedHead)({
+              tr: tr
+            });
+          }
           moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.SHORTCUT, formatMessage)({
             tr: tr
           });
@@ -254,9 +271,15 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
         var _api$core9;
         api === null || api === void 0 || (_api$core9 = api.core) === null || _api$core9 === void 0 || _api$core9.actions.execute(function (_ref6) {
           var tr = _ref6.tr;
-          api.blockControls.commands.setMultiSelectPositions(expandedAnchor, expandedHead)({
-            tr: tr
-          });
+          if (fg('platform_editor_elements_dnd_multi_select_patch_1')) {
+            api === null || api === void 0 || api.blockControls.commands.setMultiSelectPositions($newAnchor.pos, $newHead.pos)({
+              tr: tr
+            });
+          } else {
+            api === null || api === void 0 || api.blockControls.commands.setMultiSelectPositions(expandedAnchor, expandedHead)({
+              tr: tr
+            });
+          }
           tr.scrollIntoView();
           return tr;
         });
@@ -287,6 +310,12 @@ export var moveNode = function moveNode(api) {
       var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true, {
         exposure: true
       });
+      if (fg('platform_editor_ease_of_use_metrics')) {
+        var _api$metrics;
+        api === null || api === void 0 || (_api$metrics = api.metrics) === null || _api$metrics === void 0 || _api$metrics.commands.setContentMoved()({
+          tr: tr
+        });
+      }
       var slicePosition = getSelectedSlicePosition(start, tr, api);
       if (isMultiSelect) {
         sliceFrom = slicePosition.from;

package/dist/esm/editor-commands/move-to-layout.js

@@ -313,6 +313,12 @@ export var moveToLayout = function moveToLayout(api) {
       if (!fromContentWithoutBreakout) {
         return tr;
       }
+      if (fg('platform_editor_ease_of_use_metrics')) {
+        var _api$metrics;
+        api === null || api === void 0 || (_api$metrics = api.metrics) === null || _api$metrics === void 0 || _api$metrics.commands.setContentMoved()({
+          tr: tr
+        });
+      }
       var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
       if (toNode.type === layoutSection) {
         var toPos = options !== null && options !== void 0 && options.moveToEnd ? to + toNode.nodeSize - 1 : to + 1;