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

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.3.0
+
+### Minor Changes
+
+- [#120928](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/120928)
+  [`01cb5ca9596cf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/01cb5ca9596cf) -
+  [ED-26316] Refactor checkTrActionType functions to be in it's own file to help with readability,
+  add check for safe insert count and update it in analytics event fired
+
+### Patch Changes
+
+- [#121803](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/121803)
+  [`41a43b5d95052`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/41a43b5d95052) -
+  Fix logic for determining drag handle corresponding to selection, shortcuts
+- Updated dependencies
+
 ## 3.2.1
 
 ### Patch Changes

package/dist/cjs/blockControlsPlugin.js

@@ -9,6 +9,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _moveNode = require("./editor-commands/move-node");
 var _moveToLayout = require("./editor-commands/move-to-layout");
@@ -89,6 +90,15 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
               nodeType: nodeType
             }
           }));
+          if ((0, _platformFeatureFlags.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/cjs/editor-commands/move-node.js

@@ -93,6 +93,7 @@ var getFocusedHandle = function getFocusedHandle(state) {
 };
 var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, formatMessage) {
   return function (state) {
+    var _hoistedPos;
     var isParentNodeOfTypeLayout;
     var shouldEnableNestedDndA11y = (0, _experiments.editorExperiment)('nested-dnd', true);
     var selection = state.selection;
@@ -103,19 +104,26 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
     var expandedSelection = (0, _selection.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 && (0, _platformFeatureFlags.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 _state.NodeSelection && selection.node.type.name === 'layoutColumn';
       if (direction === _consts.DIRECTION.LEFT && shouldEnableNestedDndA11y) {
         if (isTopLevelNode && (0, _experiments.editorExperiment)('advanced_layouts', true) && (0, _platformFeatureFlags.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;
           }
@@ -139,28 +147,28 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
           api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.focus();
           return true;
         } else if (isLayoutColumnSelected && (0, _platformFeatureFlags.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 === _consts.DIRECTION.RIGHT && shouldEnableNestedDndA11y) {
         if (isTopLevelNode && (0, _experiments.editorExperiment)('advanced_layouts', true) && (0, _platformFeatureFlags.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;
           }
@@ -181,8 +189,8 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
           return true;
         } else if (isLayoutColumnSelected && (0, _platformFeatureFlags.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;
 
@@ -192,29 +200,29 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
             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 === _consts.DIRECTION.UP) {
         if (isLayoutColumnSelected && (0, _platformFeatureFlags.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;
         }
@@ -231,14 +239,23 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
       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' && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_accessibility');
+      var shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn' && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_accessibility');
+      var _expandSelectionBound = (0, _selection.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 ((0, _platformFeatureFlags.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, _analytics.INPUT_METHOD.SHORTCUT, formatMessage)({
             tr: tr
           });
@@ -260,9 +277,15 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
         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 ((0, _platformFeatureFlags.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;
         });
@@ -293,6 +316,12 @@ var moveNode = exports.moveNode = function moveNode(api) {
       var isMultiSelect = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true, {
         exposure: true
       });
+      if ((0, _platformFeatureFlags.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 = (0, _selection2.getSelectedSlicePosition)(start, tr, api);
       if (isMultiSelect) {
         sliceFrom = slicePosition.from;

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

@@ -319,6 +319,12 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
       if (!fromContentWithoutBreakout) {
         return tr;
       }
+      if ((0, _platformFeatureFlags.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 = (0, _experiments.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;

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

@@ -138,6 +138,12 @@ var destroyFn = function destroyFn(api, editorView) {
             })
           })(tr);
         }
+        if ((0, _platformFeatureFlags.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.startActiveSessionTimer()({
+            tr: tr
+          });
+        }
         return tr.setMeta(key, _objectSpread(_objectSpread({}, tr.getMeta(key)), {}, {
           isDragging: false,
           isPMDragging: false,
@@ -591,7 +597,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
       },
       handleDOMEvents: {
         drop: function 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
           var dispatch = view.dispatch,
             dragging = view.dragging,
@@ -600,6 +606,12 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
           var pluginState = key.getState(state);
           var dndDragCancelled = (_pluginState = pluginState) === null || _pluginState === void 0 ? void 0 : _pluginState.lastDragCancelled;
           if ((_pluginState2 = pluginState) !== null && _pluginState2 !== void 0 && _pluginState2.isPMDragging || dndDragCancelled && isMultiSelectEnabled) {
+            if ((0, _platformFeatureFlags.fg)('platform_editor_ease_of_use_metrics')) {
+              var _api$metrics2;
+              api === null || api === void 0 || (_api$metrics2 = api.metrics) === null || _api$metrics2 === void 0 || _api$metrics2.commands.startActiveSessionTimer()({
+                tr: tr
+              });
+            }
             dispatch(tr.setMeta(key, _objectSpread(_objectSpread({}, tr.getMeta(key)), {}, {
               isPMDragging: false,
               lastDragCancelled: false
@@ -617,7 +629,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
             event.preventDefault();
             return false;
           }
-          var nodeElement = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.closest('[data-drag-handler-anchor-name]');
+          var nodeElement = (_event$target = event.target) === null || _event$target === 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;
           }
@@ -663,9 +675,17 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
           var state = view.state,
             dispatch = view.dispatch;
           if ((_key$getState3 = key.getState(state)) !== null && _key$getState3 !== void 0 && _key$getState3.isPMDragging) {
-            dispatch(state.tr.setMeta(key, _objectSpread(_objectSpread({}, state.tr.getMeta(key)), {}, {
+            var tr = state.tr;
+            tr.setMeta(key, _objectSpread(_objectSpread({}, state.tr.getMeta(key)), {}, {
               isPMDragging: false
-            })));
+            }));
+            if ((0, _platformFeatureFlags.fg)('platform_editor_ease_of_use_metrics')) {
+              var _api$metrics3;
+              api === null || api === void 0 || (_api$metrics3 = api.metrics) === null || _api$metrics3 === void 0 || _api$metrics3.commands.startActiveSessionTimer()({
+                tr: tr
+              });
+            }
+            dispatch(tr);
           }
         },
         mouseover: function mouseover(view, event) {

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

@@ -8,6 +8,7 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _utils2 = require("@atlaskit/editor-tables/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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
@@ -59,6 +60,8 @@ var getSelection = exports.getSelection = function 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 _state.NodeSelection($startPos);
+  } else if (nodeName === 'taskList' && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_1')) {
+    return _state.TextSelection.create(tr.doc, start, start + nodeSize);
   } else {
     var _getInlineNodePos = getInlineNodePos(tr, start, nodeSize),
       inlineNodePos = _getInlineNodePos.inlineNodePos,
@@ -104,21 +107,42 @@ var isHandleCorrelatedToSelection = exports.isHandleCorrelatedToSelection = func
   if (selection.empty) {
     return false;
   }
+  var nodeStart;
   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();
+  if ((0, _platformFeatureFlags.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;
+    }
+    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();
+    }
+  } else {
+    var selectionFrom = $selectionFrom.pos;
+    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);
 };

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

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

package/dist/es2019/blockControlsPlugin.js

@@ -1,6 +1,7 @@
 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';
@@ -80,6 +81,15 @@ export const blockControlsPlugin = ({
           nodeType
         }
       });
+      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.handleIntentToStartEdit({
+          shouldStartTimer: false,
+          shouldPersistActiveSession: true
+        })({
+          tr
+        });
+      }
       return tr;
     },
     setMultiSelectPositions: (anchor, head) => ({

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;