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

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.3.1
+
+### Patch Changes
+
+- [#149764](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/149764)
+  [`f6226757e21b9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f6226757e21b9) -
+  Change move left/right shortcut for nested nodes
+
+## 2.3.0
+
+### Minor Changes
+
+- [#151121](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/151121)
+  [`2909af0f0c958`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2909af0f0c958) -
+  ED-24591 implement drop target v2
+
 ## 2.2.2
 
 ### Patch Changes

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

@@ -105,7 +105,9 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
         moveToPos = $pos.after($pos.depth) + 1;
       } else if (direction === _consts.DIRECTION.UP) {
         var nodeBefore = $pos.depth > 1 && nodeIndex === 0 && (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_a11y') ? $pos.node($pos.depth) : $pos.nodeBefore;
-        moveToPos = $pos.depth > 1 && nodeIndex === 0 && (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_a11y') ? $pos.before($pos.depth) - 1 : nodeBefore ? currentNodePos - nodeBefore.nodeSize : moveToPos;
+        if (nodeBefore) {
+          moveToPos = currentNodePos - nodeBefore.nodeSize;
+        }
       } else {
         var endOfDoc = $pos.end();
         var nodeAfterPos = $pos.posAtIndex($pos.index() + 1);

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.nodeDecorations = exports.emptyParagraphNodeDecorations = exports.dropTargetDecorations = exports.dragHandleDecoration = void 0;
+exports.nodeDecorations = exports.getNodeAnchor = exports.emptyParagraphNodeDecorations = exports.dropTargetDecorations = exports.dragHandleDecoration = exports.createDropTargetDecoration = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -17,10 +17,14 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+var _consts = require("../ui/consts");
 var _dragHandle = require("../ui/drag-handle");
 var _dropTarget = require("../ui/drop-target");
+var _dropTargetV = require("../ui/drop-target-v2");
 var _dragTargetDebug = require("../utils/drag-target-debug");
 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; }
 var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn', 'listItem', 'caption'];
 var IGNORE_NODE_DESCENDANTS = ['listItem', 'taskList', 'decisionList', 'mediaSingle'];
 var PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand', 'bodiedExtension'];
@@ -28,24 +32,101 @@ var DISABLE_CHILD_DROP_TARGET = ['orderedList', 'bulletList'];
 var getNestedDepth = function getNestedDepth() {
   return (0, _experiments.editorExperiment)('nested-dnd', true) ? 100 : 0;
 };
-var createDropTargetDecoration = function createDropTargetDecoration(pos, dropTargetDec) {
+var getNodeAnchor = exports.getNodeAnchor = function getNodeAnchor(node) {
+  var handleId = ObjHash.getForNode(node);
+  return "--node-anchor-".concat(node.type.name, "-").concat(handleId);
+};
+var getNodeMargins = function getNodeMargins(node) {
+  if (!node) {
+    return _consts.nodeMargins['default'];
+  }
+  var nodeTypeName = node.type.name;
+  if (nodeTypeName === 'heading') {
+    return _consts.nodeMargins["heading".concat(node.attrs.level)] || _consts.nodeMargins['default'];
+  }
+  return _consts.nodeMargins[nodeTypeName] || _consts.nodeMargins['default'];
+};
+var getGapAndOffset = function getGapAndOffset(prevNode, nextNode, parentNode) {
+  if (!prevNode && nextNode) {
+    // first node
+    return {
+      gap: 0,
+      offset: 0
+    };
+  } else if (prevNode && !nextNode) {
+    return {
+      gap: 0,
+      offset: 0
+    };
+  }
+  var top = getNodeMargins(nextNode).top || 4;
+  var bottom = getNodeMargins(prevNode).bottom || 4;
+  var gap = Math.max(top, bottom);
+  var offset = top - gap / 2;
+  if ((prevNode === null || prevNode === void 0 ? void 0 : prevNode.type.name) === 'mediaSingle' && (nextNode === null || nextNode === void 0 ? void 0 : nextNode.type.name) === 'mediaSingle') {
+    offset = -offset;
+  } else if (prevNode !== null && prevNode !== void 0 && prevNode.type.name && ['tableCell', 'tableHeader'].includes(prevNode === null || prevNode === void 0 ? void 0 : prevNode.type.name)) {
+    offset = 0;
+  }
+  return {
+    gap: gap,
+    offset: offset
+  };
+};
+var shouldDescend = function shouldDescend(node) {
+  if ((0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2')) {
+    return !['mediaSingle', 'paragraph', 'heading'].includes(node.type.name);
+  }
+  return true;
+};
+var createDropTargetDecoration = exports.createDropTargetDecoration = function createDropTargetDecoration(pos, props, side, anchorHeightsCache) {
   return _view.Decoration.widget(pos, function (_, getPos) {
     var element = document.createElement('div');
     element.setAttribute('data-blocks-drop-target-container', 'true');
     element.style.clear = 'unset';
-    _reactDom.default.render(dropTargetDec(getPos), element);
+    if ((0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2')) {
+      var _getGapAndOffset = getGapAndOffset(props.prevNode, props.nextNode, props.parentNode),
+        gap = _getGapAndOffset.gap,
+        offset = _getGapAndOffset.offset;
+      element.style.setProperty(_dropTargetV.EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_OFFSET, "".concat(offset, "px"));
+      element.style.setProperty(_dropTargetV.EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP, "".concat(gap, "px"));
+    }
+    if ((0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2')) {
+      _reactDom.default.render( /*#__PURE__*/(0, _react.createElement)(_dropTargetV.DropTargetV2, _objectSpread(_objectSpread({}, props), {}, {
+        getPos: getPos,
+        anchorHeightsCache: anchorHeightsCache
+      })), element);
+    } else {
+      _reactDom.default.render( /*#__PURE__*/(0, _react.createElement)(_dropTarget.DropTarget, _objectSpread(_objectSpread({}, props), {}, {
+        getPos: getPos
+      })), element);
+    }
     return element;
   }, {
     type: 'drop-target-decoration',
-    side: -1
+    side: side
   });
 };
-var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetDecorations(newState, api, formatMessage, activeNode) {
+var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetDecorations(newState, api, formatMessage, activeNode, anchorHeightsCache) {
   var decs = [];
   unmountDecorations('data-blocks-drop-target-container');
   var prevNode;
   var activeNodePos = activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos;
   var activePMNode = typeof activeNodePos === 'number' && newState.doc.resolve(activeNodePos).nodeAfter;
+  anchorHeightsCache === null || anchorHeightsCache === void 0 || anchorHeightsCache.clear();
+  var prevNodeStack = [];
+  var popNodeStack = function popNodeStack(depth) {
+    var result;
+    var toDepth = Math.max(depth, 0);
+    while (prevNodeStack.length > toDepth) {
+      result = prevNodeStack.pop();
+    }
+    return result;
+  };
+  var pushNodeStack = function pushNodeStack(node, depth) {
+    popNodeStack(depth);
+    prevNodeStack.push(node);
+  };
   newState.doc.descendants(function (node, pos, parent, index) {
     var depth = 0;
     // drop target deco at the end position
@@ -53,62 +134,65 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
     if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
       depth = newState.doc.resolve(pos).depth;
       if (node.isInline || !parent || DISABLE_CHILD_DROP_TARGET.includes(parent.type.name)) {
-        prevNode = node;
+        if ((0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2')) {
+          pushNodeStack(node, depth);
+        } else {
+          prevNode = node;
+        }
         return false;
       }
       if (IGNORE_NODES.includes(node.type.name)) {
-        prevNode = node;
-        return true; //skip over, don't consider it a valid depth
+        if ((0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2')) {
+          pushNodeStack(node, depth);
+        } else {
+          prevNode = node;
+        }
+        return shouldDescend(node); //skip over, don't consider it a valid depth
       }
       var canDrop = activePMNode && (0, _validation.canMoveNodeToIndex)(parent, index, activePMNode);
 
       //NOTE: This will block drop targets showing for nodes that are valid after transformation (i.e. expand -> nestedExpand)
       if (!canDrop && !(0, _dragTargetDebug.isBlocksDragTargetDebug)()) {
-        prevNode = node;
+        if ((0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2')) {
+          pushNodeStack(node, depth);
+        } else {
+          prevNode = node;
+        }
         return false; //not valid pos, so nested not valid either
       }
       if (parent.lastChild === node && !(0, _utils.isEmptyParagraph)(node) && PARENT_WITH_END_DROP_TARGET.includes(parent.type.name)) {
         endPos = pos + node.nodeSize;
       }
     }
-    var previousNode = prevNode; // created scoped variable
-    decs.push(createDropTargetDecoration(pos, function (getPos) {
-      return /*#__PURE__*/(0, _react.createElement)(_dropTarget.DropTarget, {
+    var previousNode = (0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2') ? popNodeStack(depth) : prevNode; // created scoped variable
+    decs.push(createDropTargetDecoration(pos, {
+      api: api,
+      prevNode: previousNode,
+      nextNode: node,
+      parentNode: parent || undefined,
+      formatMessage: formatMessage
+    }, -1, anchorHeightsCache));
+    if (endPos !== undefined) {
+      decs.push(createDropTargetDecoration(endPos, {
         api: api,
-        getPos: getPos,
-        prevNode: previousNode,
-        nextNode: node,
-        parentNode: parent,
+        prevNode: (0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2') ? node : undefined,
+        parentNode: parent || undefined,
         formatMessage: formatMessage
-      });
-    }));
-    if (endPos !== undefined) {
-      decs.push(createDropTargetDecoration(endPos, function (getPos) {
-        return /*#__PURE__*/(0, _react.createElement)(_dropTarget.DropTarget, {
-          api: api,
-          getPos: getPos,
-          parentNode: parent,
-          formatMessage: formatMessage
-        });
-      }));
+      }, -1, anchorHeightsCache));
+    }
+    if ((0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2')) {
+      pushNodeStack(node, depth);
+    } else {
+      prevNode = node;
     }
-    prevNode = node;
-    return depth < getNestedDepth();
+    return depth < getNestedDepth() && shouldDescend(node);
   });
-
-  //TODO: Should this use createDropTargetDecoration?
-  decs.push(_view.Decoration.widget(newState.doc.nodeSize - 2, function (_, getPos) {
-    var element = document.createElement('div');
-    element.setAttribute('data-blocks-drop-target-container', 'true');
-    _reactDom.default.render( /*#__PURE__*/(0, _react.createElement)(_dropTarget.DropTarget, {
-      api: api,
-      getPos: getPos,
-      formatMessage: formatMessage
-    }), element);
-    return element;
-  }, {
-    type: 'drop-target-decoration'
-  }));
+  decs.push(createDropTargetDecoration(newState.doc.nodeSize - 2, {
+    api: api,
+    formatMessage: formatMessage,
+    prevNode: newState.doc.lastChild || undefined,
+    parentNode: newState.doc
+  }, undefined, anchorHeightsCache));
   return decs;
 };
 var emptyParagraphNodeDecorations = exports.emptyParagraphNodeDecorations = function emptyParagraphNodeDecorations() {

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

@@ -19,6 +19,7 @@ var _element = require("@atlaskit/pragmatic-drag-and-drop-auto-scroll/element");
 var _combine = require("@atlaskit/pragmatic-drag-and-drop/combine");
 var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+var _anchorUtils = require("../utils/anchor-utils");
 var _dragTargetDebug = require("../utils/drag-target-debug");
 var _decorations = require("./decorations");
 var _handleMouseOver = require("./handle-mouse-over");
@@ -102,6 +103,10 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
   if ((0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_2')) {
     // TODO: Remove this once FG is used in code
   }
+  var anchorHeightsCache;
+  if (!(0, _anchorUtils.isAnchorSupported)() && (0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2')) {
+    anchorHeightsCache = new _anchorUtils.AnchorHeightsCache();
+  }
   return new _safePlugin.SafePlugin({
     key: key,
     state: {
@@ -270,7 +275,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
           // if the transaction is only for analytics and user is dragging, continue to draw drop targets
           if (shouldCreateDropTargets || (0, _dragTargetDebug.isBlocksDragTargetDebug)()) {
             var _meta$activeNode6;
-            var _decs2 = (0, _decorations.dropTargetDecorations)(newState, api, formatMessage, isNestedEnabled ? (_meta$activeNode6 = meta === null || meta === void 0 ? void 0 : meta.activeNode) !== null && _meta$activeNode6 !== void 0 ? _meta$activeNode6 : mappedActiveNodePos : meta === null || meta === void 0 ? void 0 : meta.activeNode);
+            var _decs2 = (0, _decorations.dropTargetDecorations)(newState, api, formatMessage, isNestedEnabled ? (_meta$activeNode6 = meta === null || meta === void 0 ? void 0 : meta.activeNode) !== null && _meta$activeNode6 !== void 0 ? _meta$activeNode6 : mappedActiveNodePos : meta === null || meta === void 0 ? void 0 : meta.activeNode, anchorHeightsCache);
             decorations = decorations.add(newState.doc, _decs2);
           }
         }
@@ -347,6 +352,8 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
           return false;
         },
         dragstart: function dragstart(view) {
+          var _anchorHeightsCache;
+          (_anchorHeightsCache = anchorHeightsCache) === null || _anchorHeightsCache === void 0 || _anchorHeightsCache.setEditorView(view);
           view.dispatch(view.state.tr.setMeta(key, {
             isPMDragging: true
           }));

package/dist/cjs/ui/consts.js

@@ -107,7 +107,7 @@ var nodeMargins = exports.nodeMargins = {
     bottom: 0
   },
   codeBlock: {
-    top: 0,
+    top: 12,
     bottom: 0
   },
   panel: {
@@ -115,8 +115,8 @@ var nodeMargins = exports.nodeMargins = {
     bottom: 0
   },
   rule: {
-    top: 20,
-    bottom: 20
+    top: 24,
+    bottom: 24
   },
   mediaSingle: {
     top: 24,

package/dist/cjs/ui/drop-target-v2.js

@@ -0,0 +1,184 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_OFFSET = exports.EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP = exports.DropTargetV2 = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _react2 = require("@emotion/react");
+var _hooks = require("@atlaskit/editor-common/hooks");
+var _box = require("@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box");
+var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
+var _constants = require("@atlaskit/theme/constants");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+var _decorations = require("../pm-plugins/decorations");
+var _anchorUtils = require("../utils/anchor-utils");
+var _dragTargetDebug = require("../utils/drag-target-debug");
+var _consts = require("./consts");
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+
+var DEFAULT_DROP_INDICATOR_WIDTH = 760;
+var EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_WIDTH = '--editor-block-controls-drop-indicator-width';
+var EDITOR_BLOCK_CONTROLS_DROP_TARGET_LEFT_MARGIN = '--editor-block-controls-drop-target-leftMargin';
+var EDITOR_BLOCK_CONTROLS_DROP_TARGET_ZINDEX = '--editor-block-controls-drop-target-zindex';
+var EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_OFFSET = exports.EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_OFFSET = '--editor-block-controls-drop-indicator-offset';
+var EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP = exports.EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP = '--editor-block-controls-drop-indicator-gap';
+var styleDropTarget = (0, _react2.css)({
+  marginLeft: "calc(-1 * var(".concat(EDITOR_BLOCK_CONTROLS_DROP_TARGET_LEFT_MARGIN, ", 0))"),
+  paddingLeft: "var(".concat(EDITOR_BLOCK_CONTROLS_DROP_TARGET_LEFT_MARGIN, ", 0)"),
+  position: 'absolute',
+  left: '0',
+  display: 'block',
+  zIndex: "var(".concat(EDITOR_BLOCK_CONTROLS_DROP_TARGET_ZINDEX, ", 110)"),
+  transform: "translateY(var(".concat(EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_OFFSET, ", 0))")
+});
+var styleDropIndicator = (0, _react2.css)({
+  height: '100%',
+  margin: '0 auto',
+  position: 'relative',
+  width: "var(".concat(EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_WIDTH, ", 100%)")
+});
+var nestedDropIndicatorStyle = (0, _react2.css)({
+  position: 'relative'
+});
+var dropZoneStyles = (0, _react2.css)({
+  margin: 0,
+  position: 'absolute',
+  width: '100%',
+  zIndex: 110,
+  minHeight: '4px'
+});
+var nestedDropZoneStyle = (0, _react2.css)({
+  left: '4px',
+  right: '4px',
+  width: 'unset'
+});
+var enableDropZone = ['paragraph', 'mediaSingle', 'heading', 'codeBlock', 'decisionList', 'bulletList', 'orderedList', 'taskList', 'extension', 'blockCard'];
+var HoverZone = function HoverZone(_ref) {
+  var onDragEnter = _ref.onDragEnter,
+    onDragLeave = _ref.onDragLeave,
+    onDrop = _ref.onDrop,
+    node = _ref.node,
+    editorWidth = _ref.editorWidth,
+    anchorHeightsCache = _ref.anchorHeightsCache,
+    position = _ref.position,
+    isNestedDropTarget = _ref.isNestedDropTarget;
+  var ref = (0, _react.useRef)(null);
+  (0, _react.useEffect)(function () {
+    if (ref.current) {
+      return (0, _adapter.dropTargetForElements)({
+        element: ref.current,
+        onDragEnter: onDragEnter,
+        onDragLeave: onDragLeave,
+        onDrop: onDrop
+      });
+    }
+  }, [onDragEnter, onDragLeave, onDrop]);
+  var hoverZoneUpperStyle = (0, _react.useMemo)(function () {
+    var anchorName = node ? (0, _decorations.getNodeAnchor)(node) : '';
+    var heightStyleOffset = "var(--editor-block-controls-drop-indicator-gap, 0)/2";
+    var transformOffset = "var(".concat(EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_OFFSET, ", 0)");
+    var heightStyle = anchorName && enableDropZone.includes((node === null || node === void 0 ? void 0 : node.type.name) || '') ? (0, _anchorUtils.isAnchorSupported)() ? "calc(anchor-size(".concat(anchorName, " height)/2 + ").concat(heightStyleOffset, ")") : "calc(".concat(((anchorHeightsCache === null || anchorHeightsCache === void 0 ? void 0 : anchorHeightsCache.getHeight(anchorName)) || 0) / 2, "px + ").concat(heightStyleOffset, ")") : '4px';
+    var transform = position === 'upper' ? "translateY(calc(-100% + ".concat(transformOffset, "))") : "translateY(".concat(transformOffset, ")");
+    return (0, _react2.css)({
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+      height: heightStyle,
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+      transform: transform,
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+      maxWidth: "".concat(editorWidth || 0, "px")
+    });
+  }, [anchorHeightsCache, editorWidth, node, position]);
+  return (0, _react2.jsx)("div", {
+    ref: ref
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
+    ,
+    className: "drop-target-hover-zone-".concat(position)
+    // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
+    ,
+    css: [dropZoneStyles, isNestedDropTarget && nestedDropZoneStyle, hoverZoneUpperStyle]
+  });
+};
+var DropTargetV2 = exports.DropTargetV2 = function DropTargetV2(_ref2) {
+  var _dynamicStyle;
+  var api = _ref2.api,
+    getPos = _ref2.getPos,
+    prevNode = _ref2.prevNode,
+    nextNode = _ref2.nextNode,
+    parentNode = _ref2.parentNode,
+    formatMessage = _ref2.formatMessage,
+    anchorHeightsCache = _ref2.anchorHeightsCache;
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    isDraggedOver = _useState2[0],
+    setIsDraggedOver = _useState2[1];
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['width']),
+    widthState = _useSharedPluginState.widthState;
+  var isNestedDropTarget = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) !== 'doc';
+  var onDrop = function onDrop() {
+    var _api$blockControls;
+    var _ref3 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
+      activeNode = _ref3.activeNode;
+    if (!activeNode) {
+      return;
+    }
+    var pos = getPos();
+    if (activeNode && pos !== undefined) {
+      var _api$core, _api$blockControls2;
+      var start = activeNode.pos;
+      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.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.moveNode(start, pos, undefined, formatMessage));
+    }
+  };
+  var dynamicStyle = (_dynamicStyle = {
+    width: isNestedDropTarget ? 'unset' : '100%'
+  }, (0, _defineProperty2.default)(_dynamicStyle, EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_WIDTH, isNestedDropTarget ? '100%' : "".concat((widthState === null || widthState === void 0 ? void 0 : widthState.lineLength) || DEFAULT_DROP_INDICATOR_WIDTH, "px")), (0, _defineProperty2.default)(_dynamicStyle, EDITOR_BLOCK_CONTROLS_DROP_TARGET_LEFT_MARGIN, isNestedDropTarget ? (0, _consts.getNestedNodeLeftPaddingMargin)(parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) : '0'), (0, _defineProperty2.default)(_dynamicStyle, EDITOR_BLOCK_CONTROLS_DROP_TARGET_ZINDEX, (0, _experiments.editorExperiment)('nested-dnd', true) ? _constants.layers.navigation() : _constants.layers.card()), _dynamicStyle);
+  return (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(HoverZone, {
+    onDragEnter: function onDragEnter() {
+      return setIsDraggedOver(true);
+    },
+    onDragLeave: function onDragLeave() {
+      return setIsDraggedOver(false);
+    },
+    onDrop: onDrop,
+    node: prevNode,
+    editorWidth: widthState === null || widthState === void 0 ? void 0 : widthState.lineLength,
+    anchorHeightsCache: anchorHeightsCache,
+    position: "upper",
+    isNestedDropTarget: isNestedDropTarget
+  }), (0, _react2.jsx)("div", {
+    // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
+    css: [styleDropTarget, isNestedDropTarget && nestedDropIndicatorStyle]
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
+    ,
+    style: dynamicStyle,
+    "data-testid": "block-ctrl-drop-target"
+  },
+  // 4px gap to clear expand node border
+  (isDraggedOver || (0, _dragTargetDebug.isBlocksDragTargetDebug)()) && (0, _react2.jsx)("div", {
+    css: styleDropIndicator,
+    "data-testid": "block-ctrl-drop-indicator"
+  }, (0, _react2.jsx)(_box.DropIndicator, {
+    edge: "bottom"
+  }))), (0, _react2.jsx)(HoverZone, {
+    onDragEnter: function onDragEnter() {
+      return setIsDraggedOver(true);
+    },
+    onDragLeave: function onDragLeave() {
+      return setIsDraggedOver(false);
+    },
+    onDrop: onDrop,
+    node: nextNode,
+    editorWidth: widthState === null || widthState === void 0 ? void 0 : widthState.lineLength,
+    anchorHeightsCache: anchorHeightsCache,
+    position: "lower",
+    isNestedDropTarget: isNestedDropTarget
+  }));
+};

package/dist/cjs/utils/anchor-utils.js

@@ -0,0 +1,70 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isAnchorSupported = exports.AnchorHeightsCache = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _memoizeOne = _interopRequireDefault(require("memoize-one"));
+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; }
+var isAnchorSupported = exports.isAnchorSupported = (0, _memoizeOne.default)(function () {
+  // directly use CSS would cause failed SSR tests.
+  if (window.CSS && window.CSS.supports) {
+    return window.CSS.supports('anchor-name: --a');
+  }
+  return false;
+});
+var AnchorHeightsCache = exports.AnchorHeightsCache = /*#__PURE__*/function () {
+  function AnchorHeightsCache() {
+    (0, _classCallCheck2.default)(this, AnchorHeightsCache);
+    (0, _defineProperty2.default)(this, "anchorHeightsMap", {});
+    (0, _defineProperty2.default)(this, "isAnchorSupported", isAnchorSupported());
+    (0, _defineProperty2.default)(this, "isDirty", true);
+    (0, _defineProperty2.default)(this, "view", null);
+  }
+  (0, _createClass2.default)(AnchorHeightsCache, [{
+    key: "clear",
+    value: function clear() {
+      this.isDirty = true;
+      this.anchorHeightsMap = {};
+    }
+  }, {
+    key: "getHeights",
+    value: function getHeights() {
+      if (this.isDirty) {
+        var _this$view;
+        var anchorElements = ((_this$view = this.view) === null || _this$view === void 0 ? void 0 : _this$view.dom.querySelectorAll('[data-drag-handler-anchor-name]')) || [];
+        this.anchorHeightsMap = Array.from(anchorElements).reduce(function (prev, curr) {
+          var anchorName = curr.getAttribute('data-drag-handler-anchor-name');
+          if (anchorName) {
+            return _objectSpread(_objectSpread({}, prev), {}, (0, _defineProperty2.default)({}, anchorName, curr.clientHeight));
+          }
+          return prev;
+        }, {});
+        this.isDirty = false;
+      }
+      return this.anchorHeightsMap;
+    }
+  }, {
+    key: "setEditorView",
+    value: function setEditorView(view) {
+      if (this.view !== view) {
+        this.view = view;
+      }
+    }
+  }, {
+    key: "getHeight",
+    value: function getHeight(anchorName) {
+      if (this.isAnchorSupported) {
+        return null;
+      }
+      var heights = this.getHeights();
+      return heights[anchorName];
+    }
+  }]);
+  return AnchorHeightsCache;
+}();

package/dist/cjs/utils/getNestedNodePosition.js

@@ -15,10 +15,10 @@ var getNestedNodePosition = exports.getNestedNodePosition = function getNestedNo
     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);
+    var parentNodeOfSpecificTypes = (0, _utils.findParentNodeOfType)([state.schema.nodes.bulletList, state.schema.nodes.orderedList, state.schema.nodes.blockquote, state.schema.nodes.taskList, state.schema.nodes.decisionList])(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;
+      nestedNodePos = ['bulletList', 'orderedList'].includes(parentNodeType) ? $pos.before($pos.depth - 1) : ['blockquote', 'taskList', 'decisionList'].includes(parentNodeType) ? $pos.before() : nestedNodePos;
     }
   } else {
     nestedNodePos = selection.$from.pos;

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

@@ -100,7 +100,9 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
         moveToPos = $pos.after($pos.depth) + 1;
       } else if (direction === DIRECTION.UP) {
         const nodeBefore = $pos.depth > 1 && nodeIndex === 0 && fg('platform_editor_element_dnd_nested_a11y') ? $pos.node($pos.depth) : $pos.nodeBefore;
-        moveToPos = $pos.depth > 1 && nodeIndex === 0 && fg('platform_editor_element_dnd_nested_a11y') ? $pos.before($pos.depth) - 1 : nodeBefore ? currentNodePos - nodeBefore.nodeSize : moveToPos;
+        if (nodeBefore) {
+          moveToPos = currentNodePos - nodeBefore.nodeSize;
+        }
       } else {
         const endOfDoc = $pos.end();
         const nodeAfterPos = $pos.posAtIndex($pos.index() + 1);