@atlaskit/editor-plugin-block-controls 2.21.0 → 2.21.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.21.2
+
+### Patch Changes
+
+- [#103365](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/103365)
+  [`fb69e4b7a2f59`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fb69e4b7a2f59) -
+  ED-26243 Removed unused drop-target v1
+
+## 2.21.1
+
+### Patch Changes
+
+- [#102744](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102744)
+  [`289c0169e410a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/289c0169e410a) -
+  ED-26243 Cleaned up platform_editor_drag_and_drop_target_v2 FG
+
 ## 2.21.0
 
 ### Minor Changes

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

@@ -16,7 +16,6 @@ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _consts = require("../ui/consts");
 var _dropTarget = require("../ui/drop-target");
 var _dropTargetLayout = require("../ui/drop-target-layout");
-var _dropTargetV = require("../ui/drop-target-v2");
 var _decorationsCommon = require("./decorations-common");
 var _consts2 = require("./utils/consts");
 var _dragTargetDebug = require("./utils/drag-target-debug");
@@ -27,10 +26,7 @@ var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn', 'lis
 var PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand', 'bodiedExtension'];
 var DISABLE_CHILD_DROP_TARGET = ['orderedList', 'bulletList'];
 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;
+  return !['mediaSingle', 'paragraph', 'heading'].includes(node.type.name);
 };
 var getNodeMargins = function getNodeMargins(node) {
   if (!node) {
@@ -105,40 +101,26 @@ var createDropTargetDecoration = exports.createDropTargetDecoration = function c
     element.setAttribute('data-blocks-drop-target-container', 'true');
     element.setAttribute('data-blocks-drop-target-key', key);
     element.style.clear = 'unset';
-    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"));
-      element.style.setProperty('display', 'block');
-      if ((0, _platformFeatureFlags.fg)('platform_editor_react18_plugin_portalprovider')) {
-        nodeViewPortalProviderAPI.render(function () {
-          return /*#__PURE__*/(0, _react.createElement)(_dropTargetV.DropTargetV2, _objectSpread(_objectSpread({}, props), {}, {
-            getPos: getPos,
-            anchorRectCache: anchorRectCache,
-            isSameLayout: isSameLayout
-          }));
-        }, element, key);
-      } else {
-        _reactDom.default.render( /*#__PURE__*/(0, _react.createElement)(_dropTargetV.DropTargetV2, _objectSpread(_objectSpread({}, props), {}, {
+    var _getGapAndOffset = getGapAndOffset(props.prevNode, props.nextNode, props.parentNode),
+      gap = _getGapAndOffset.gap,
+      offset = _getGapAndOffset.offset;
+    element.style.setProperty(_dropTarget.EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_OFFSET, "".concat(offset, "px"));
+    element.style.setProperty(_dropTarget.EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP, "".concat(gap, "px"));
+    element.style.setProperty('display', 'block');
+    if ((0, _platformFeatureFlags.fg)('platform_editor_react18_plugin_portalprovider')) {
+      nodeViewPortalProviderAPI.render(function () {
+        return /*#__PURE__*/(0, _react.createElement)(_dropTarget.DropTarget, _objectSpread(_objectSpread({}, props), {}, {
           getPos: getPos,
           anchorRectCache: anchorRectCache,
           isSameLayout: isSameLayout
-        })), element);
-      }
+        }));
+      }, element, key);
     } else {
-      if ((0, _platformFeatureFlags.fg)('platform_editor_react18_plugin_portalprovider')) {
-        nodeViewPortalProviderAPI.render(function () {
-          return /*#__PURE__*/(0, _react.createElement)(_dropTarget.DropTarget, _objectSpread(_objectSpread({}, props), {}, {
-            getPos: getPos
-          }));
-        }, element, key);
-      } else {
-        _reactDom.default.render( /*#__PURE__*/(0, _react.createElement)(_dropTarget.DropTarget, _objectSpread(_objectSpread({}, props), {}, {
-          getPos: getPos
-        })), element);
-      }
+      _reactDom.default.render( /*#__PURE__*/(0, _react.createElement)(_dropTarget.DropTarget, _objectSpread(_objectSpread({}, props), {}, {
+        getPos: getPos,
+        anchorRectCache: anchorRectCache,
+        isSameLayout: isSameLayout
+      })), element);
     }
     return element;
   }, {
@@ -190,7 +172,6 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
   var POS_END_OF_DOC = newState.doc.nodeSize - 2;
   var docFrom = from === undefined || from < 0 ? 0 : from;
   var docTo = to === undefined || to > POS_END_OF_DOC ? POS_END_OF_DOC : to;
-  var prevNode;
   var activeNodePos = activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos;
   var $activeNodePos = typeof activeNodePos === 'number' && newState.doc.resolve(activeNodePos);
   var activePMNode = $activeNodePos && $activeNodePos.nodeAfter;
@@ -236,40 +217,28 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
         }
       }
       if (node.isInline || !parent || DISABLE_CHILD_DROP_TARGET.includes(parent.type.name)) {
-        if ((0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2')) {
-          pushNodeStack(node, depth);
-        } else {
-          prevNode = node;
-        }
+        pushNodeStack(node, depth);
         return false;
       }
       if (IGNORE_NODES.includes(node.type.name)) {
-        if ((0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2')) {
-          pushNodeStack(node, depth);
-        } else {
-          prevNode = node;
-        }
+        pushNodeStack(node, depth);
         return shouldDescend(node); //skip over, don't consider it a valid depth
       }
       var canDrop = activePMNode && (0, _validation.canMoveNodeToIndex)(parent, index, activePMNode, $pos, node);
 
       //NOTE: This will block drop targets showing for nodes that are valid after transformation (i.e. expand -> nestedExpand)
       if (!canDrop && !(0, _dragTargetDebug.isBlocksDragTargetDebug)()) {
-        if ((0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2')) {
-          pushNodeStack(node, depth);
-        } else {
-          prevNode = node;
-        }
+        pushNodeStack(node, depth);
         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 = (0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2') ? popNodeStack(depth) : prevNode; // created scoped variable
+    var previousNode = popNodeStack(depth); // created scoped variable
 
     // only table and layout need to render full height drop target
-    var isInSupportedContainer = (0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2') && ['tableCell', 'tableHeader', 'layoutColumn'].includes((parent === null || parent === void 0 ? void 0 : parent.type.name) || '');
+    var isInSupportedContainer = ['tableCell', 'tableHeader', 'layoutColumn'].includes((parent === null || parent === void 0 ? void 0 : parent.type.name) || '');
     var shouldShowFullHeight = isInSupportedContainer && (parent === null || parent === void 0 ? void 0 : parent.lastChild) === node && (0, _utils.isEmptyParagraph)(node);
     decs.push(createDropTargetDecoration(pos, {
       api: api,
@@ -282,17 +251,13 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
     if (endPos !== undefined) {
       decs.push(createDropTargetDecoration(endPos, {
         api: api,
-        prevNode: (0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2') ? node : undefined,
+        prevNode: node,
         parentNode: parent || undefined,
         formatMessage: formatMessage,
         dropTargetStyle: 'remainingHeight'
       }, nodeViewPortalProviderAPI, -1, anchorRectCache));
     }
-    if ((0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2')) {
-      pushNodeStack(node, depth);
-    } else {
-      prevNode = node;
-    }
+    pushNodeStack(node, depth);
     return depth < (0, _decorationsCommon.getNestedDepth)() && shouldDescend(node);
   });
   if (docTo === POS_END_OF_DOC) {

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

@@ -430,7 +430,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
     isNestedEnabled: isNestedEnabled
   };
   var anchorRectCache;
-  if (!(0, _anchorUtils.isAnchorSupported)() && (0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_v2')) {
+  if (!(0, _anchorUtils.isAnchorSupported)()) {
     anchorRectCache = new _anchorUtils.AnchorRectCache();
   }
   return new _safePlugin.SafePlugin({

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

@@ -4,7 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DropTarget = void 0;
+exports.EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_OFFSET = exports.EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP = exports.DropTarget = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
@@ -14,8 +15,13 @@ 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 _decorationsCommon = require("../pm-plugins/decorations-common");
+var _activeAnchorTracker = require("../pm-plugins/utils/active-anchor-tracker");
+var _anchorUtils = require("../pm-plugins/utils/anchor-utils");
 var _dragTargetDebug = require("../pm-plugins/utils/drag-target-debug");
+var _inlineDropTarget = require("../pm-plugins/utils/inline-drop-target");
 var _consts = require("./consts");
+var _inlineDropTarget2 = require("./inline-drop-target");
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -27,15 +33,16 @@ 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)({
-  height: "var(--ds-space-100, 8px)",
-  marginTop: "var(--ds-space-negative-100, -8px)",
   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)")
+  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%',
@@ -46,65 +53,141 @@ var styleDropIndicator = (0, _react2.css)({
 var nestedDropIndicatorStyle = (0, _react2.css)({
   position: 'relative'
 });
-var marginLookupMap = Object.fromEntries(Object.entries(_consts.spaceLookupMap).map(function (_ref, i) {
-  var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
-    key = _ref2[0],
-    value = _ref2[1];
-  return [key,
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
-  (0, _react2.css)({
-    transform: "translateY(".concat(value, ")")
-  })];
-}));
-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 getNestedDropTargetMarginTop = function getNestedDropTargetMarginTop(prevNode, nextNode, isNestedDropTarget) {
-  if (!prevNode || !nextNode) {
-    return (0, _react2.css)({
-      marginTop: "var(--ds-space-negative-100, -8px)"
-    });
-  }
-  var top = getNodeMargins(nextNode).top;
-  var bottom = getNodeMargins(prevNode).bottom;
-  if (['rule', 'media', 'mediaSingle'].includes(prevNode.type.name) && isNestedDropTarget && top > 0 && bottom > 0) {
-    var collapsedMarginOffset = top === bottom ? top : Math.abs(top - bottom);
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
-    var marginTop = _consts.dropTargetMarginMap[-collapsedMarginOffset - 8] || "-".concat(collapsedMarginOffset + 8, "px");
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+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'];
+
+// This z index is used in container like layout
+var fullHeightStyleAdjustZIndexStyle = (0, _react2.css)({
+  zIndex: 0
+});
+var HoverZone = function HoverZone(_ref) {
+  var _onDragEnter = _ref.onDragEnter,
+    onDragLeave = _ref.onDragLeave,
+    onDrop = _ref.onDrop,
+    node = _ref.node,
+    parent = _ref.parent,
+    editorWidth = _ref.editorWidth,
+    anchorRectCache = _ref.anchorRectCache,
+    position = _ref.position,
+    isNestedDropTarget = _ref.isNestedDropTarget,
+    dropTargetStyle = _ref.dropTargetStyle;
+  var ref = (0, _react.useRef)(null);
+  var isRemainingheight = dropTargetStyle === 'remainingHeight';
+  var anchorName = (0, _react.useMemo)(function () {
+    return node ? (0, _decorationsCommon.getNodeAnchor)(node) : '';
+  }, [node]);
+  var _useActiveAnchorTrack = (0, _activeAnchorTracker.useActiveAnchorTracker)(anchorName),
+    _useActiveAnchorTrack2 = (0, _slicedToArray2.default)(_useActiveAnchorTrack, 2),
+    _isActive = _useActiveAnchorTrack2[0],
+    setActiveAnchor = _useActiveAnchorTrack2[1];
+  (0, _react.useEffect)(function () {
+    if (ref.current) {
+      return (0, _adapter.dropTargetForElements)({
+        element: ref.current,
+        onDragEnter: function onDragEnter() {
+          if (!isNestedDropTarget && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
+            setActiveAnchor();
+          }
+          _onDragEnter();
+        },
+        onDragLeave: onDragLeave,
+        onDrop: onDrop
+      });
+    }
+  }, [isNestedDropTarget, _onDragEnter, onDragLeave, onDrop, setActiveAnchor]);
+  var hoverZoneUpperStyle = (0, _react.useMemo)(function () {
+    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(((anchorRectCache === null || anchorRectCache === void 0 ? void 0 : anchorRectCache.getHeight(anchorName)) || 0) / 2, "px + ").concat(heightStyleOffset, ")") : '4px';
+    var transform = position === 'upper' ? "translateY(calc(-100% + ".concat(transformOffset, "))") : "translateY(".concat(transformOffset, ")");
     return (0, _react2.css)({
-      marginTop: marginTop
+      // 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")
     });
-  }
-};
-var getDropTargetOffsetStyle = function getDropTargetOffsetStyle(prevNode, nextNode) {
-  if (!prevNode || !nextNode) {
-    return null;
-  }
-  var top = getNodeMargins(nextNode).top;
-  var bottom = getNodeMargins(prevNode).bottom;
-  var marginDiff = Math.round((top - bottom) / 2);
-  if (marginDiff === 0) {
+  }, [anchorName, anchorRectCache, editorWidth, node === null || node === void 0 ? void 0 : node.type.name, position]);
+
+  /**
+   * 1. Above the last empty line
+   * 2. Below the last element
+   *
+   * Both cases will take the remaining height of the the container
+   */
+  var heightStyle = (0, _react.useMemo)(function () {
+    // only apply upper drop zone
+    if (isRemainingheight && position === 'upper') {
+      // previous node
+      var _anchorName = node ? (0, _decorationsCommon.getNodeAnchor)(node) : '';
+      var top = 'unset';
+      if (_anchorName) {
+        var enabledDropZone = enableDropZone.includes((node === null || node === void 0 ? void 0 : node.type.name) || '');
+        if ((0, _anchorUtils.isAnchorSupported)()) {
+          top = enabledDropZone ? "calc(anchor(".concat(_anchorName, " 50%))") : "calc(anchor(".concat(_anchorName, " bottom) - 4px)");
+        } else if (anchorRectCache) {
+          var preNodeTopPos = anchorRectCache.getTop(_anchorName) || 0;
+          var prevNodeHeight = anchorRectCache.getHeight(_anchorName) || 0;
+          top = enabledDropZone ? "calc(".concat(preNodeTopPos, "px + ").concat(prevNodeHeight / 2, "px)") : "calc(".concat(preNodeTopPos, "px + ").concat(prevNodeHeight, "px - 4px)");
+        } else {
+          // Should not happen
+          return null;
+        }
+      } else {
+        // first empty paragraph
+        top = '4px';
+      }
+      return (0, _react2.css)({
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+        top: top,
+        bottom: '4px',
+        height: 'unset',
+        zIndex: 10,
+        transform: 'none'
+      });
+    }
     return null;
-  }
-  var offset = Math.max(Math.min(marginDiff, 24), -24);
-  return marginLookupMap[offset];
+  }, [anchorRectCache, isRemainingheight, node, position]);
+  var isFullHeightInLayout = isRemainingheight && (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'layoutColumn';
+  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),
+    "data-testid": "drop-target-zone-".concat(position)
+    // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
+    ,
+    css: [dropZoneStyles, isNestedDropTarget && nestedDropZoneStyle,
+    // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
+    hoverZoneUpperStyle,
+    // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
+    heightStyle, isFullHeightInLayout && fullHeightStyleAdjustZIndexStyle]
+  });
 };
-var DropTarget = exports.DropTarget = function DropTarget(_ref3) {
-  var api = _ref3.api,
-    getPos = _ref3.getPos,
-    prevNode = _ref3.prevNode,
-    nextNode = _ref3.nextNode,
-    parentNode = _ref3.parentNode,
-    formatMessage = _ref3.formatMessage;
-  var ref = (0, _react.useRef)(null);
+var DropTarget = exports.DropTarget = function DropTarget(props) {
+  var _api$blockControls;
+  var api = props.api,
+    getPos = props.getPos,
+    prevNode = props.prevNode,
+    nextNode = props.nextNode,
+    parentNode = props.parentNode,
+    formatMessage = props.formatMessage,
+    anchorRectCache = props.anchorRectCache,
+    _props$dropTargetStyl = props.dropTargetStyle,
+    dropTargetStyle = _props$dropTargetStyl === void 0 ? 'default' : _props$dropTargetStyl,
+    isSameLayout = props.isSameLayout;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isDraggedOver = _useState2[0],
@@ -112,102 +195,73 @@ var DropTarget = exports.DropTarget = function DropTarget(_ref3) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['width']),
     widthState = _useSharedPluginState.widthState;
   var isNestedDropTarget = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) !== 'doc';
-  (0, _react.useEffect)(function () {
-    var element = ref.current;
-    if (!element) {
+  var _ref2 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
+    activeNode = _ref2.activeNode;
+  var onDrop = function onDrop() {
+    if (!activeNode) {
       return;
     }
-
-    // This should be moved to platform/packages/editor/editor-plugin-block-controls/src/pm-plugins/utils/validation.ts
-    // Since we are moved to drop-target-v2
-    // Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
-    if ((0, _experiments.editorExperiment)('nest-media-and-codeblock-in-quote', false)) {
-      var _api$blockControls;
-      var _ref4 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
-        activeNode = _ref4.activeNode;
-      var parentNodeType = parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name;
-      var activeNodeType = activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType;
-      if (parentNodeType === 'blockquote' && (activeNodeType === 'mediaGroup' || activeNodeType === 'mediaSingle' || activeNodeType === 'codeBlock')) {
-        return;
-      }
-    }
-    if ((0, _experiments.editorExperiment)('nested-expand-in-expand', false)) {
-      var _api$blockControls2;
-      var _ref5 = (api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.sharedState.currentState()) || {},
-        _activeNode = _ref5.activeNode;
-      var _parentNodeType = parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name;
-      var _activeNodeType = _activeNode === null || _activeNode === void 0 ? void 0 : _activeNode.nodeType;
-      if (_parentNodeType === 'expand' && (_activeNodeType === 'expand' || _activeNodeType === 'nestedExpand')) {
-        return;
-      }
-    }
-    return (0, _adapter.dropTargetForElements)({
-      element: element,
-      getIsSticky: function getIsSticky() {
-        return true;
-      },
-      onDragEnter: function onDragEnter() {
-        setIsDraggedOver(true);
-      },
-      onDragLeave: function onDragLeave() {
-        setIsDraggedOver(false);
-      },
-      onDrop: function onDrop() {
-        var _api$blockControls3;
-        var _ref6 = (api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.sharedState.currentState()) || {},
-          activeNode = _ref6.activeNode;
-        if (!activeNode) {
-          return;
-        }
-        var pos = getPos();
-        if (activeNode && pos !== undefined) {
-          var _api$core, _api$blockControls4;
-          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$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 || (_api$blockControls4 = _api$blockControls4.commands) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.moveNode(start, pos, undefined, formatMessage));
-        }
-      }
-    });
-  }, [api, formatMessage, getPos, parentNode]);
-  var dropTargetOffsetStyle = (0, _react.useMemo)(function () {
-    /**
-     * First child of a nested node.
-     * Disable the position adjustment temporarily
-     */
-    if (parentNode === prevNode) {
-      return null;
+    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));
     }
-    return getDropTargetOffsetStyle(prevNode, nextNode);
-  }, [prevNode, nextNode, parentNode]);
-  var dropTargetMarginTopStyles = (0, _react.useMemo)(function () {
-    if (parentNode === prevNode) {
-      return null;
-    }
-    return getNestedDropTargetMarginTop(prevNode, nextNode, isNestedDropTarget);
-  }, [prevNode, nextNode, parentNode, isNestedDropTarget]);
+  };
   var dynamicStyle = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
     width: isNestedDropTarget ? 'unset' : '100%'
   }, EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_WIDTH, isNestedDropTarget ? '100%' : "".concat((widthState === null || widthState === void 0 ? void 0 : widthState.lineLength) || DEFAULT_DROP_INDICATOR_WIDTH, "px")), EDITOR_BLOCK_CONTROLS_DROP_TARGET_LEFT_MARGIN, isNestedDropTarget ? (0, _consts.getNestedNodeLeftPaddingMargin)(parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) : '0'), EDITOR_BLOCK_CONTROLS_DROP_TARGET_ZINDEX, (0, _experiments.editorExperiment)('nested-dnd', true) ? _constants.layers.navigation() : _constants.layers.card());
-  return (
-    // Note: Firefox has trouble with using a button element as the handle for drag and drop
-    (0, _react2.jsx)("div", {
-      css: [styleDropTarget,
-      // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
-      dropTargetOffsetStyle, isNestedDropTarget && nestedDropIndicatorStyle,
-      // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
-      dropTargetMarginTopStyles]
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
-      ,
-      style: dynamicStyle,
-      ref: ref,
-      "data-testid": "block-ctrl-drop-target"
+  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,
+    anchorRectCache: anchorRectCache,
+    position: "upper",
+    isNestedDropTarget: isNestedDropTarget,
+    dropTargetStyle: dropTargetStyle
+  }), (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"
+  }))), dropTargetStyle !== 'remainingHeight' && (0, _react2.jsx)(HoverZone, {
+    onDragEnter: function onDragEnter() {
+      return setIsDraggedOver(true);
+    },
+    onDragLeave: function onDragLeave() {
+      return setIsDraggedOver(false);
     },
-    // 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",
-      gap: "4px"
-    })))
-  );
+    onDrop: onDrop,
+    node: nextNode,
+    parent: parentNode,
+    editorWidth: widthState === null || widthState === void 0 ? void 0 : widthState.lineLength,
+    anchorRectCache: anchorRectCache,
+    position: "lower",
+    isNestedDropTarget: isNestedDropTarget
+  }), (0, _inlineDropTarget.shouldAllowInlineDropTarget)(isNestedDropTarget, nextNode, isSameLayout, activeNode) && (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_inlineDropTarget2.InlineDropTarget
+  // Ignored via go/ees005
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  , (0, _extends2.default)({}, props, {
+    position: "left"
+  })), (0, _react2.jsx)(_inlineDropTarget2.InlineDropTarget
+  // Ignored via go/ees005
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  , (0, _extends2.default)({}, props, {
+    position: "right"
+  }))));
 };