@atlaskit/editor-plugin-block-controls 2.2.0 → 2.2.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.2.2
+
+### Patch Changes
+
+- [#151024](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/151024)
+  [`73afcf51ef0da`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/73afcf51ef0da) -
+  ED-20516 Set selection at end of node after drop instead of selecting entire moved node
+- Updated dependencies
+
+## 2.2.1
+
+### Patch Changes
+
+- [#150591](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/150591)
+  [`13337452246bc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/13337452246bc) -
+  support a11y to move various node types with shortcut
+
 ## 2.2.0
 
 ### Minor Changes

package/dist/cjs/commands/move-node.js

@@ -18,6 +18,7 @@ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _consts = require("../consts");
 var _main = require("../pm-plugins/main");
 var _utils4 = require("../utils");
+var _getSelection = require("../utils/getSelection");
 var _validation = require("../utils/validation");
 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) { (0, _defineProperty2.default)(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; }
@@ -69,8 +70,8 @@ var getCurrentNodePos = function getCurrentNodePos(state, isParentNodeOfTypeLayo
     // 2. caret cursor is inside the node
     // 3. the start of the selection is inside the node
     currentNodePos = selection.$from.before(1);
-    if ((0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_a11y')) {
-      currentNodePos = selection.$from.depth > (isParentNodeOfTypeLayout ? 2 : 1) ? selection.$from.before(selection.$from.depth) : selection.$from.before(1);
+    if (selection.$from.depth > 0 && (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_a11y')) {
+      currentNodePos = (0, _utils4.getNestedNodePosition)(state);
     }
   }
   return currentNodePos;
@@ -189,7 +190,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
         mappedTo = tr.mapping.map(to);
         tr.insert(mappedTo, _nodeCopy); // insert the content at the new position
       }
-      tr = (0, _utils4.selectNode)(tr, mappedTo, node.type.name);
+      tr = inputMethod === _analytics.INPUT_METHOD.DRAG_AND_DROP && (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_2') ? (0, _getSelection.setCursorPositionAtMovedNode)(tr, mappedTo) : (0, _utils4.selectNode)(tr, mappedTo, node.type.name);
       tr.setMeta(_main.key, {
         nodeMoved: true
       });

package/dist/cjs/commands/show-drag-handle.js

@@ -7,6 +7,7 @@ exports.showDragHandleAtSelection = void 0;
 var _utils = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _main = require("../pm-plugins/main");
+var _utils2 = require("../utils");
 var showDragHandleAtSelection = exports.showDragHandleAtSelection = function showDragHandleAtSelection(api, shouldFocusParentNode) {
   return function (state, _, view) {
     var $from = state.selection.$from;
@@ -18,13 +19,21 @@ var showDragHandleAtSelection = exports.showDragHandleAtSelection = function sho
 
       // if the node is already focused, pressing the keymap second times should focus the parent node
       shouldFocusParentNode = activeNode && ((_activeNode$handleOpt = activeNode.handleOptions) === null || _activeNode$handleOpt === void 0 ? void 0 : _activeNode$handleOpt.isFocused);
-      var parentPos = (0, _utils.isInTable)(state) ? $from.before(1) : shouldFocusParentNode ? $from.start($from.depth - 1) : $from.start();
+      var parentPos = (0, _utils.isInTable)(state) ? $from.before(1) : shouldFocusParentNode ? $from.before(1) : (0, _utils2.getNestedNodePosition)(state) + 1;
       var parentElement = view === null || view === void 0 || (_view$domAtPos = view.domAtPos(parentPos, 0)) === null || _view$domAtPos === void 0 ? void 0 : _view$domAtPos.node;
       if (parentElement) {
         var anchorName = parentElement.getAttribute('data-drag-handler-anchor-name');
         var nodeType = parentElement.getAttribute('data-drag-handler-node-type');
+        if (!anchorName || !nodeType) {
+          // for nodes like panel and mediaSingle, the drag handle decoration is not applied to the dom node at the node position but to the parent node
+          var closestParentElement = parentElement.closest('[data-drag-handler-anchor-name]');
+          if (closestParentElement) {
+            anchorName = closestParentElement.getAttribute('data-drag-handler-anchor-name');
+            nodeType = closestParentElement.getAttribute('data-drag-handler-node-type');
+          }
+        }
         if (api && anchorName && nodeType) {
-          api.core.actions.execute(api.blockControls.commands.showDragHandleAt($from.before(), anchorName, nodeType, {
+          api.core.actions.execute(api.blockControls.commands.showDragHandleAt(parentPos - 1, anchorName, nodeType, {
             isFocused: true
           }));
           return true;

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

@@ -16,7 +16,6 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _dragHandler = _interopRequireDefault(require("@atlaskit/icon/glyph/drag-handler"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
@@ -24,7 +23,7 @@ var _setCustomNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/ele
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _main = require("../pm-plugins/main");
-var _utils2 = require("../utils");
+var _utils = require("../utils");
 var _dragHandlePositions = require("../utils/drag-handle-positions");
 var _consts = require("./consts");
 var _dragPreview = require("./drag-preview");
@@ -120,7 +119,7 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
       if (startPos === undefined) {
         return tr;
       }
-      tr = (0, _utils2.selectNode)(tr, startPos, nodeType);
+      tr = (0, _utils.selectNode)(tr, startPos, nodeType);
       var resolvedMovingNode = tr.doc.resolve(startPos);
       var maybeNode = resolvedMovingNode.nodeAfter;
       tr.setMeta('scrollIntoView', false);
@@ -379,7 +378,7 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
   }];
   var isParentNodeOfTypeLayout;
   if (!isTopLevelNode && handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_a11y')) {
-    isParentNodeOfTypeLayout = nodeType === 'layoutSection' || !!(0, _utils.findParentNodeOfType)([view.state.schema.nodes.layoutSection])(view.state.selection);
+    isParentNodeOfTypeLayout = nodeType === 'layoutSection' || view.state.doc.resolve((0, _utils.getNestedNodePosition)(view.state)).node().type.name === 'layoutColumn';
     if (isParentNodeOfTypeLayout) {
       helpDescriptors = [].concat((0, _toConsumableArray2.default)(helpDescriptors), [{
         description: formatMessage(_messages.blockControlsMessages.moveLeft),

package/dist/cjs/utils/getNestedNodePosition.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getNestedNodePosition = void 0;
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var getNestedNodePosition = exports.getNestedNodePosition = function getNestedNodePosition(state) {
+  var selection = state.selection;
+  var nestedNodePos = selection.$from.before(1);
+  if (selection instanceof _state.TextSelection) {
+    nestedNodePos = selection.$from.before();
+    var $pos = state.doc.resolve(nestedNodePos);
+    if ($pos.depth < 1) {
+      return nestedNodePos;
+    }
+    var parentNodeOfSpecificTypes = (0, _utils.findParentNodeOfType)([state.schema.nodes.bulletList, state.schema.nodes.orderedList, state.schema.nodes.blockquote, state.schema.nodes.taskList])(state.selection);
+    if (parentNodeOfSpecificTypes) {
+      var parentNodeType = parentNodeOfSpecificTypes.node.type.name;
+      nestedNodePos = ['bulletList', 'orderedList'].includes(parentNodeType) ? $pos.before($pos.depth - 1) : ['blockquote', 'taskList'].includes(parentNodeType) ? $pos.before() : nestedNodePos;
+    }
+  } else {
+    nestedNodePos = selection.$from.pos;
+  }
+  return nestedNodePos;
+};

package/dist/cjs/utils/getSelection.js

@@ -3,9 +3,32 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.selectNode = exports.getSelection = void 0;
+exports.setCursorPositionAtMovedNode = exports.selectNode = exports.getSelection = exports.getInlineNodePos = void 0;
+var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
+var 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
+  // Find the first inline node in the node
+  var inlineNodePos = start;
+  var foundInlineNode = false;
+  var inlineNodeEndPos = 0;
+  tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n, pos) {
+    if (n.isInline) {
+      inlineNodeEndPos = pos + n.nodeSize;
+    }
+    if (n.isInline && !foundInlineNode) {
+      inlineNodePos = pos;
+      foundInlineNode = true;
+    }
+    return true;
+  });
+  return {
+    inlineNodePos: inlineNodePos,
+    inlineNodeEndPos: inlineNodeEndPos
+  };
+};
 var getSelection = exports.getSelection = function getSelection(tr, start) {
   var node = tr.doc.nodeAt(start);
   var isNodeSelection = node && _state.NodeSelection.isSelectable(node);
@@ -25,21 +48,9 @@ var getSelection = exports.getSelection = function getSelection(tr, start) {
   nodeName === 'mediaGroup') {
     return new _state.NodeSelection($startPos);
   } else {
-    // To trigger the annotation floating toolbar for non-selectable node, we need to select inline nodes
-    // Find the first inline node in the node
-    var inlineNodePos = start;
-    var foundInlineNode = false;
-    var inlineNodeEndPos = 0;
-    tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n, pos) {
-      if (n.isInline) {
-        inlineNodeEndPos = pos + n.nodeSize;
-      }
-      if (n.isInline && !foundInlineNode) {
-        inlineNodePos = pos;
-        foundInlineNode = true;
-      }
-      return true;
-    });
+    var _getInlineNodePos = getInlineNodePos(tr, start, nodeSize),
+      inlineNodePos = _getInlineNodePos.inlineNodePos,
+      inlineNodeEndPos = _getInlineNodePos.inlineNodeEndPos;
     return new _state.TextSelection(tr.doc.resolve(inlineNodeEndPos), tr.doc.resolve(inlineNodePos));
   }
 };
@@ -51,4 +62,20 @@ var selectNode = exports.selectNode = function selectNode(tr, start, nodeType) {
     tr.setSelection(getSelection(tr, start));
   }
   return tr;
+};
+var setCursorPositionAtMovedNode = exports.setCursorPositionAtMovedNode = function setCursorPositionAtMovedNode(tr, start) {
+  var node = tr.doc.nodeAt(start);
+  var isNodeSelection = node && _state.NodeSelection.isSelectable(node);
+  var nodeSize = node ? node.nodeSize : 1;
+  var selection;
+  // decisionList node is not selectable, but we want to select the whole node not just text
+  if (isNodeSelection || (node === null || node === void 0 ? void 0 : node.type.name) === 'decisionList') {
+    selection = new _selection.GapCursorSelection(tr.doc.resolve(start + node.nodeSize), _selection.Side.RIGHT);
+  } else {
+    var _getInlineNodePos2 = getInlineNodePos(tr, start, nodeSize),
+      inlineNodeEndPos = _getInlineNodePos2.inlineNodeEndPos;
+    selection = new _state.TextSelection(tr.doc.resolve(inlineNodeEndPos));
+  }
+  tr.setSelection(selection);
+  return tr;
 };

package/dist/cjs/utils/index.js

@@ -3,6 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "getInlineNodePos", {
+  enumerable: true,
+  get: function get() {
+    return _getSelection.getInlineNodePos;
+  }
+});
+Object.defineProperty(exports, "getNestedNodePosition", {
+  enumerable: true,
+  get: function get() {
+    return _getNestedNodePosition.getNestedNodePosition;
+  }
+});
 Object.defineProperty(exports, "getSelection", {
   enumerable: true,
   get: function get() {
@@ -15,4 +27,11 @@ Object.defineProperty(exports, "selectNode", {
     return _getSelection.selectNode;
   }
 });
-var _getSelection = require("./getSelection");
+Object.defineProperty(exports, "setCursorPositionAtMovedNode", {
+  enumerable: true,
+  get: function get() {
+    return _getSelection.setCursorPositionAtMovedNode;
+  }
+});
+var _getSelection = require("./getSelection");
+var _getNestedNodePosition = require("./getNestedNodePosition");

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

@@ -9,7 +9,8 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DIRECTION } from '../consts';
 import { key } from '../pm-plugins/main';
-import { selectNode } from '../utils';
+import { getNestedNodePosition, selectNode } from '../utils';
+import { setCursorPositionAtMovedNode } from '../utils/getSelection';
 import { canMoveNodeToIndex, isInsideTable, transformSliceExpandToNestedExpand } from '../utils/validation';
 
 /**
@@ -64,8 +65,8 @@ const getCurrentNodePos = (state, isParentNodeOfTypeLayout) => {
     // 2. caret cursor is inside the node
     // 3. the start of the selection is inside the node
     currentNodePos = selection.$from.before(1);
-    if (fg('platform_editor_element_dnd_nested_a11y')) {
-      currentNodePos = selection.$from.depth > (isParentNodeOfTypeLayout ? 2 : 1) ? selection.$from.before(selection.$from.depth) : selection.$from.before(1);
+    if (selection.$from.depth > 0 && fg('platform_editor_element_dnd_nested_a11y')) {
+      currentNodePos = getNestedNodePosition(state);
     }
   }
   return currentNodePos;
@@ -183,7 +184,7 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
     mappedTo = tr.mapping.map(to);
     tr.insert(mappedTo, nodeCopy); // insert the content at the new position
   }
-  tr = selectNode(tr, mappedTo, node.type.name);
+  tr = inputMethod === INPUT_METHOD.DRAG_AND_DROP && fg('platform_editor_element_dnd_nested_fix_patch_2') ? setCursorPositionAtMovedNode(tr, mappedTo) : selectNode(tr, mappedTo, node.type.name);
   tr.setMeta(key, {
     nodeMoved: true
   });

package/dist/es2019/commands/show-drag-handle.js

@@ -1,6 +1,7 @@
 import { isInTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { key } from '../pm-plugins/main';
+import { getNestedNodePosition } from '../utils';
 export const showDragHandleAtSelection = (api, shouldFocusParentNode) => (state, _, view) => {
   const {
     $from
@@ -14,13 +15,21 @@ export const showDragHandleAtSelection = (api, shouldFocusParentNode) => (state,
 
     // if the node is already focused, pressing the keymap second times should focus the parent node
     shouldFocusParentNode = activeNode && ((_activeNode$handleOpt = activeNode.handleOptions) === null || _activeNode$handleOpt === void 0 ? void 0 : _activeNode$handleOpt.isFocused);
-    const parentPos = isInTable(state) ? $from.before(1) : shouldFocusParentNode ? $from.start($from.depth - 1) : $from.start();
+    const parentPos = isInTable(state) ? $from.before(1) : shouldFocusParentNode ? $from.before(1) : getNestedNodePosition(state) + 1;
     const parentElement = view === null || view === void 0 ? void 0 : (_view$domAtPos = view.domAtPos(parentPos, 0)) === null || _view$domAtPos === void 0 ? void 0 : _view$domAtPos.node;
     if (parentElement) {
-      const anchorName = parentElement.getAttribute('data-drag-handler-anchor-name');
-      const nodeType = parentElement.getAttribute('data-drag-handler-node-type');
+      let anchorName = parentElement.getAttribute('data-drag-handler-anchor-name');
+      let nodeType = parentElement.getAttribute('data-drag-handler-node-type');
+      if (!anchorName || !nodeType) {
+        // for nodes like panel and mediaSingle, the drag handle decoration is not applied to the dom node at the node position but to the parent node
+        const closestParentElement = parentElement.closest('[data-drag-handler-anchor-name]');
+        if (closestParentElement) {
+          anchorName = closestParentElement.getAttribute('data-drag-handler-anchor-name');
+          nodeType = closestParentElement.getAttribute('data-drag-handler-node-type');
+        }
+      }
       if (api && anchorName && nodeType) {
-        api.core.actions.execute(api.blockControls.commands.showDragHandleAt($from.before(), anchorName, nodeType, {
+        api.core.actions.execute(api.blockControls.commands.showDragHandleAt(parentPos - 1, anchorName, nodeType, {
           isFocused: true
         }));
         return true;

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

@@ -12,7 +12,6 @@ import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { dragToMoveDown, dragToMoveLeft, dragToMoveRight, dragToMoveUp, getAriaKeyshortcuts, TooltipContentWithMultipleShortcuts } from '@atlaskit/editor-common/keymaps';
 import { blockControlsMessages } from '@atlaskit/editor-common/messages';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import DragHandlerIcon from '@atlaskit/icon/glyph/drag-handler';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
@@ -20,7 +19,7 @@ import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/el
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import Tooltip from '@atlaskit/tooltip';
 import { key } from '../pm-plugins/main';
-import { selectNode } from '../utils';
+import { getNestedNodePosition, selectNode } from '../utils';
 import { getLeftPosition, getTopPosition } from '../utils/drag-handle-positions';
 import { DRAG_HANDLE_BORDER_RADIUS, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_WIDTH, DRAG_HANDLE_ZINDEX, dragHandleGap, topPositionAdjustment } from './consts';
 import { dragPreview } from './drag-preview';
@@ -362,7 +361,7 @@ const DragHandleInternal = ({
   }];
   let isParentNodeOfTypeLayout;
   if (!isTopLevelNode && handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && fg('platform_editor_element_dnd_nested_a11y')) {
-    isParentNodeOfTypeLayout = nodeType === 'layoutSection' || !!findParentNodeOfType([view.state.schema.nodes.layoutSection])(view.state.selection);
+    isParentNodeOfTypeLayout = nodeType === 'layoutSection' || view.state.doc.resolve(getNestedNodePosition(view.state)).node().type.name === 'layoutColumn';
     if (isParentNodeOfTypeLayout) {
       helpDescriptors = [...helpDescriptors, {
         description: formatMessage(blockControlsMessages.moveLeft),

package/dist/es2019/utils/getNestedNodePosition.js

@@ -0,0 +1,23 @@
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+export const getNestedNodePosition = state => {
+  const {
+    selection
+  } = state;
+  let nestedNodePos = selection.$from.before(1);
+  if (selection instanceof TextSelection) {
+    nestedNodePos = selection.$from.before();
+    const $pos = state.doc.resolve(nestedNodePos);
+    if ($pos.depth < 1) {
+      return nestedNodePos;
+    }
+    const parentNodeOfSpecificTypes = findParentNodeOfType([state.schema.nodes.bulletList, state.schema.nodes.orderedList, state.schema.nodes.blockquote, state.schema.nodes.taskList])(state.selection);
+    if (parentNodeOfSpecificTypes) {
+      const parentNodeType = parentNodeOfSpecificTypes.node.type.name;
+      nestedNodePos = ['bulletList', 'orderedList'].includes(parentNodeType) ? $pos.before($pos.depth - 1) : ['blockquote', 'taskList'].includes(parentNodeType) ? $pos.before() : nestedNodePos;
+    }
+  } else {
+    nestedNodePos = selection.$from.pos;
+  }
+  return nestedNodePos;
+};

package/dist/es2019/utils/getSelection.js

@@ -1,5 +1,28 @@
+import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/utils';
+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
+  // Find the first inline node in the node
+  let inlineNodePos = start;
+  let foundInlineNode = false;
+  let inlineNodeEndPos = 0;
+  tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, (n, pos) => {
+    if (n.isInline) {
+      inlineNodeEndPos = pos + n.nodeSize;
+    }
+    if (n.isInline && !foundInlineNode) {
+      inlineNodePos = pos;
+      foundInlineNode = true;
+    }
+    return true;
+  });
+  return {
+    inlineNodePos,
+    inlineNodeEndPos
+  };
+};
 export const getSelection = (tr, start) => {
   const node = tr.doc.nodeAt(start);
   const isNodeSelection = node && NodeSelection.isSelectable(node);
@@ -19,21 +42,10 @@ export const getSelection = (tr, start) => {
   nodeName === 'mediaGroup') {
     return new NodeSelection($startPos);
   } else {
-    // To trigger the annotation floating toolbar for non-selectable node, we need to select inline nodes
-    // Find the first inline node in the node
-    let inlineNodePos = start;
-    let foundInlineNode = false;
-    let inlineNodeEndPos = 0;
-    tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, (n, pos) => {
-      if (n.isInline) {
-        inlineNodeEndPos = pos + n.nodeSize;
-      }
-      if (n.isInline && !foundInlineNode) {
-        inlineNodePos = pos;
-        foundInlineNode = true;
-      }
-      return true;
-    });
+    const {
+      inlineNodePos,
+      inlineNodeEndPos
+    } = getInlineNodePos(tr, start, nodeSize);
     return new TextSelection(tr.doc.resolve(inlineNodeEndPos), tr.doc.resolve(inlineNodePos));
   }
 };
@@ -45,4 +57,21 @@ export const selectNode = (tr, start, nodeType) => {
     tr.setSelection(getSelection(tr, start));
   }
   return tr;
+};
+export const setCursorPositionAtMovedNode = (tr, start) => {
+  const node = tr.doc.nodeAt(start);
+  const isNodeSelection = node && NodeSelection.isSelectable(node);
+  const nodeSize = node ? node.nodeSize : 1;
+  let selection;
+  // decisionList node is not selectable, but we want to select the whole node not just text
+  if (isNodeSelection || (node === null || node === void 0 ? void 0 : node.type.name) === 'decisionList') {
+    selection = new GapCursorSelection(tr.doc.resolve(start + node.nodeSize), Side.RIGHT);
+  } else {
+    const {
+      inlineNodeEndPos
+    } = getInlineNodePos(tr, start, nodeSize);
+    selection = new TextSelection(tr.doc.resolve(inlineNodeEndPos));
+  }
+  tr.setSelection(selection);
+  return tr;
 };

package/dist/es2019/utils/index.js

@@ -1 +1,2 @@
-export { getSelection, selectNode } from './getSelection';
+export { getInlineNodePos, getSelection, selectNode, setCursorPositionAtMovedNode } from './getSelection';
+export { getNestedNodePosition } from './getNestedNodePosition';

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

@@ -12,7 +12,8 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DIRECTION } from '../consts';
 import { key } from '../pm-plugins/main';
-import { selectNode } from '../utils';
+import { getNestedNodePosition, selectNode } from '../utils';
+import { setCursorPositionAtMovedNode } from '../utils/getSelection';
 import { canMoveNodeToIndex, isInsideTable, transformSliceExpandToNestedExpand } from '../utils/validation';
 
 /**
@@ -63,8 +64,8 @@ var getCurrentNodePos = function getCurrentNodePos(state, isParentNodeOfTypeLayo
     // 2. caret cursor is inside the node
     // 3. the start of the selection is inside the node
     currentNodePos = selection.$from.before(1);
-    if (fg('platform_editor_element_dnd_nested_a11y')) {
-      currentNodePos = selection.$from.depth > (isParentNodeOfTypeLayout ? 2 : 1) ? selection.$from.before(selection.$from.depth) : selection.$from.before(1);
+    if (selection.$from.depth > 0 && fg('platform_editor_element_dnd_nested_a11y')) {
+      currentNodePos = getNestedNodePosition(state);
     }
   }
   return currentNodePos;
@@ -183,7 +184,7 @@ export var moveNode = function moveNode(api) {
         mappedTo = tr.mapping.map(to);
         tr.insert(mappedTo, _nodeCopy); // insert the content at the new position
       }
-      tr = selectNode(tr, mappedTo, node.type.name);
+      tr = inputMethod === INPUT_METHOD.DRAG_AND_DROP && fg('platform_editor_element_dnd_nested_fix_patch_2') ? setCursorPositionAtMovedNode(tr, mappedTo) : selectNode(tr, mappedTo, node.type.name);
       tr.setMeta(key, {
         nodeMoved: true
       });

package/dist/esm/commands/show-drag-handle.js

@@ -1,6 +1,7 @@
 import { isInTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { key } from '../pm-plugins/main';
+import { getNestedNodePosition } from '../utils';
 export var showDragHandleAtSelection = function showDragHandleAtSelection(api, shouldFocusParentNode) {
   return function (state, _, view) {
     var $from = state.selection.$from;
@@ -12,13 +13,21 @@ export var showDragHandleAtSelection = function showDragHandleAtSelection(api, s
 
       // if the node is already focused, pressing the keymap second times should focus the parent node
       shouldFocusParentNode = activeNode && ((_activeNode$handleOpt = activeNode.handleOptions) === null || _activeNode$handleOpt === void 0 ? void 0 : _activeNode$handleOpt.isFocused);
-      var parentPos = isInTable(state) ? $from.before(1) : shouldFocusParentNode ? $from.start($from.depth - 1) : $from.start();
+      var parentPos = isInTable(state) ? $from.before(1) : shouldFocusParentNode ? $from.before(1) : getNestedNodePosition(state) + 1;
       var parentElement = view === null || view === void 0 || (_view$domAtPos = view.domAtPos(parentPos, 0)) === null || _view$domAtPos === void 0 ? void 0 : _view$domAtPos.node;
       if (parentElement) {
         var anchorName = parentElement.getAttribute('data-drag-handler-anchor-name');
         var nodeType = parentElement.getAttribute('data-drag-handler-node-type');
+        if (!anchorName || !nodeType) {
+          // for nodes like panel and mediaSingle, the drag handle decoration is not applied to the dom node at the node position but to the parent node
+          var closestParentElement = parentElement.closest('[data-drag-handler-anchor-name]');
+          if (closestParentElement) {
+            anchorName = closestParentElement.getAttribute('data-drag-handler-anchor-name');
+            nodeType = closestParentElement.getAttribute('data-drag-handler-node-type');
+          }
+        }
         if (api && anchorName && nodeType) {
-          api.core.actions.execute(api.blockControls.commands.showDragHandleAt($from.before(), anchorName, nodeType, {
+          api.core.actions.execute(api.blockControls.commands.showDragHandleAt(parentPos - 1, anchorName, nodeType, {
             isFocused: true
           }));
           return true;

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

@@ -14,7 +14,6 @@ import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { dragToMoveDown, dragToMoveLeft, dragToMoveRight, dragToMoveUp, getAriaKeyshortcuts, TooltipContentWithMultipleShortcuts } from '@atlaskit/editor-common/keymaps';
 import { blockControlsMessages } from '@atlaskit/editor-common/messages';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import DragHandlerIcon from '@atlaskit/icon/glyph/drag-handler';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
@@ -22,7 +21,7 @@ import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/el
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import Tooltip from '@atlaskit/tooltip';
 import { key } from '../pm-plugins/main';
-import { selectNode } from '../utils';
+import { getNestedNodePosition, selectNode } from '../utils';
 import { getLeftPosition, getTopPosition } from '../utils/drag-handle-positions';
 import { DRAG_HANDLE_BORDER_RADIUS, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_WIDTH, DRAG_HANDLE_ZINDEX, dragHandleGap, topPositionAdjustment } from './consts';
 import { dragPreview } from './drag-preview';
@@ -370,7 +369,7 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
   }];
   var isParentNodeOfTypeLayout;
   if (!isTopLevelNode && handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && fg('platform_editor_element_dnd_nested_a11y')) {
-    isParentNodeOfTypeLayout = nodeType === 'layoutSection' || !!findParentNodeOfType([view.state.schema.nodes.layoutSection])(view.state.selection);
+    isParentNodeOfTypeLayout = nodeType === 'layoutSection' || view.state.doc.resolve(getNestedNodePosition(view.state)).node().type.name === 'layoutColumn';
     if (isParentNodeOfTypeLayout) {
       helpDescriptors = [].concat(_toConsumableArray(helpDescriptors), [{
         description: formatMessage(blockControlsMessages.moveLeft),

package/dist/esm/utils/getNestedNodePosition.js

@@ -0,0 +1,21 @@
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+export var getNestedNodePosition = function getNestedNodePosition(state) {
+  var selection = state.selection;
+  var nestedNodePos = selection.$from.before(1);
+  if (selection instanceof TextSelection) {
+    nestedNodePos = selection.$from.before();
+    var $pos = state.doc.resolve(nestedNodePos);
+    if ($pos.depth < 1) {
+      return nestedNodePos;
+    }
+    var parentNodeOfSpecificTypes = findParentNodeOfType([state.schema.nodes.bulletList, state.schema.nodes.orderedList, state.schema.nodes.blockquote, state.schema.nodes.taskList])(state.selection);
+    if (parentNodeOfSpecificTypes) {
+      var parentNodeType = parentNodeOfSpecificTypes.node.type.name;
+      nestedNodePos = ['bulletList', 'orderedList'].includes(parentNodeType) ? $pos.before($pos.depth - 1) : ['blockquote', 'taskList'].includes(parentNodeType) ? $pos.before() : nestedNodePos;
+    }
+  } else {
+    nestedNodePos = selection.$from.pos;
+  }
+  return nestedNodePos;
+};

package/dist/esm/utils/getSelection.js

@@ -1,5 +1,28 @@
+import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/utils';
+export var 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
+  // Find the first inline node in the node
+  var inlineNodePos = start;
+  var foundInlineNode = false;
+  var inlineNodeEndPos = 0;
+  tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n, pos) {
+    if (n.isInline) {
+      inlineNodeEndPos = pos + n.nodeSize;
+    }
+    if (n.isInline && !foundInlineNode) {
+      inlineNodePos = pos;
+      foundInlineNode = true;
+    }
+    return true;
+  });
+  return {
+    inlineNodePos: inlineNodePos,
+    inlineNodeEndPos: inlineNodeEndPos
+  };
+};
 export var getSelection = function getSelection(tr, start) {
   var node = tr.doc.nodeAt(start);
   var isNodeSelection = node && NodeSelection.isSelectable(node);
@@ -19,21 +42,9 @@ export var getSelection = function getSelection(tr, start) {
   nodeName === 'mediaGroup') {
     return new NodeSelection($startPos);
   } else {
-    // To trigger the annotation floating toolbar for non-selectable node, we need to select inline nodes
-    // Find the first inline node in the node
-    var inlineNodePos = start;
-    var foundInlineNode = false;
-    var inlineNodeEndPos = 0;
-    tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n, pos) {
-      if (n.isInline) {
-        inlineNodeEndPos = pos + n.nodeSize;
-      }
-      if (n.isInline && !foundInlineNode) {
-        inlineNodePos = pos;
-        foundInlineNode = true;
-      }
-      return true;
-    });
+    var _getInlineNodePos = getInlineNodePos(tr, start, nodeSize),
+      inlineNodePos = _getInlineNodePos.inlineNodePos,
+      inlineNodeEndPos = _getInlineNodePos.inlineNodeEndPos;
     return new TextSelection(tr.doc.resolve(inlineNodeEndPos), tr.doc.resolve(inlineNodePos));
   }
 };
@@ -45,4 +56,20 @@ export var selectNode = function selectNode(tr, start, nodeType) {
     tr.setSelection(getSelection(tr, start));
   }
   return tr;
+};
+export var setCursorPositionAtMovedNode = function setCursorPositionAtMovedNode(tr, start) {
+  var node = tr.doc.nodeAt(start);
+  var isNodeSelection = node && NodeSelection.isSelectable(node);
+  var nodeSize = node ? node.nodeSize : 1;
+  var selection;
+  // decisionList node is not selectable, but we want to select the whole node not just text
+  if (isNodeSelection || (node === null || node === void 0 ? void 0 : node.type.name) === 'decisionList') {
+    selection = new GapCursorSelection(tr.doc.resolve(start + node.nodeSize), Side.RIGHT);
+  } else {
+    var _getInlineNodePos2 = getInlineNodePos(tr, start, nodeSize),
+      inlineNodeEndPos = _getInlineNodePos2.inlineNodeEndPos;
+    selection = new TextSelection(tr.doc.resolve(inlineNodeEndPos));
+  }
+  tr.setSelection(selection);
+  return tr;
 };

package/dist/esm/utils/index.js

@@ -1 +1,2 @@
-export { getSelection, selectNode } from './getSelection';
+export { getInlineNodePos, getSelection, selectNode, setCursorPositionAtMovedNode } from './getSelection';
+export { getNestedNodePosition } from './getNestedNodePosition';

package/dist/types/utils/getNestedNodePosition.d.ts

@@ -0,0 +1,2 @@
+import { type EditorState } from '@atlaskit/editor-prosemirror/state';
+export declare const getNestedNodePosition: (state: EditorState) => number;

package/dist/types/utils/getSelection.d.ts

@@ -1,3 +1,8 @@
 import { NodeSelection, TextSelection, type Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare const getInlineNodePos: (tr: Transaction, start: number, nodeSize: number) => {
+    inlineNodePos: number;
+    inlineNodeEndPos: number;
+};
 export declare const getSelection: (tr: Transaction, start: number) => NodeSelection | TextSelection;
 export declare const selectNode: (tr: Transaction, start: number, nodeType: string) => Transaction;
+export declare const setCursorPositionAtMovedNode: (tr: Transaction, start: number) => Transaction;

package/dist/types/utils/index.d.ts

@@ -1 +1,2 @@
-export { getSelection, selectNode } from './getSelection';
+export { getInlineNodePos, getSelection, selectNode, setCursorPositionAtMovedNode, } from './getSelection';
+export { getNestedNodePosition } from './getNestedNodePosition';

package/dist/types-ts4.5/utils/getNestedNodePosition.d.ts

@@ -0,0 +1,2 @@
+import { type EditorState } from '@atlaskit/editor-prosemirror/state';
+export declare const getNestedNodePosition: (state: EditorState) => number;

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

@@ -1,3 +1,8 @@
 import { NodeSelection, TextSelection, type Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare const getInlineNodePos: (tr: Transaction, start: number, nodeSize: number) => {
+    inlineNodePos: number;
+    inlineNodeEndPos: number;
+};
 export declare const getSelection: (tr: Transaction, start: number) => NodeSelection | TextSelection;
 export declare const selectNode: (tr: Transaction, start: number, nodeType: string) => Transaction;
+export declare const setCursorPositionAtMovedNode: (tr: Transaction, start: number) => Transaction;

package/dist/types-ts4.5/utils/index.d.ts

@@ -1 +1,2 @@
-export { getSelection, selectNode } from './getSelection';
+export { getInlineNodePos, getSelection, selectNode, setCursorPositionAtMovedNode, } from './getSelection';
+export { getNestedNodePosition } from './getNestedNodePosition';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.2.0",
+	"version": "2.2.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": "^40.9.0",
-		"@atlaskit/editor-common": "^93.1.0",
+		"@atlaskit/editor-common": "^93.2.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -41,14 +41,14 @@
 		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/editor-shared-styles": "^3.0.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^22.20.0",
+		"@atlaskit/icon": "^22.22.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/pragmatic-drag-and-drop": "^1.3.0",
+		"@atlaskit/pragmatic-drag-and-drop": "^1.4.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.4.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
 		"@atlaskit/primitives": "^12.2.0",
 		"@atlaskit/theme": "^13.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.2.0",
+		"@atlaskit/tmp-editor-statsig": "^2.3.0",
 		"@atlaskit/tokens": "^2.0.0",
 		"@atlaskit/tooltip": "^18.8.0",
 		"@babel/runtime": "^7.0.0",