@atlaskit/editor-plugin-block-controls 1.10.5 → 1.10.7

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 1.10.7
+
+### Patch Changes
+
+- [`7c744eaad4fb6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7c744eaad4fb6) -
+  ED-24473 Clean up FF in drag-handle and drop-targets
+- [#127997](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/127997)
+  [`3d47f12053750`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3d47f12053750) -
+  ED-24404 ignore list items in Element DnD
+
+## 1.10.6
+
+### Patch Changes
+
+- [#127749](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/127749)
+  [`2709d717d9040`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2709d717d9040) -
+  [ux] Dismiss dnd tooltip when cursor exits handle
+
 ## 1.10.5
 
 ### Patch Changes

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

@@ -15,7 +15,8 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _dragHandle = require("../ui/drag-handle");
 var _dropTarget = require("../ui/drop-target");
 var _validation = require("../utils/validation");
-var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn'];
+var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn', 'listItem'];
+var IGNORE_NODES_AND_DESCENDANTS = ['listItem'];
 var NESTED_DEPTH = (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested') ? 100 : 0;
 var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetDecorations(oldState, newState, api, formatMessage, activeNodeType) {
   var decs = [];
@@ -24,8 +25,7 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
   // and allows us to easily map the updated position in the plugin apply method.
   var decorationState = [];
   var prevNode;
-  var state = (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24372') ? newState : oldState;
-  state.doc.nodesBetween(0, newState.doc.nodeSize - 2, function (node, pos, parent, index) {
+  newState.doc.nodesBetween(0, newState.doc.nodeSize - 2, function (node, pos, parent, index) {
     var depth = 0;
     var nodeType = newState.doc.type.schema.nodes[activeNodeType];
     if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
@@ -121,12 +121,13 @@ var emptyParagraphNodeDecorations = exports.emptyParagraphNodeDecorations = func
 };
 var nodeDecorations = exports.nodeDecorations = function nodeDecorations(newState) {
   var decs = [];
-  newState.doc.descendants(function (node, pos, _parent, index) {
+  newState.doc.descendants(function (node, pos, parent, index) {
     var _Decoration$node2;
     var depth = 0;
     var anchorName;
     if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
-      if (node.isInline) {
+      // Doesn't descend into a node
+      if (node.isInline || IGNORE_NODES_AND_DESCENDANTS.includes((parent === null || parent === void 0 ? void 0 : parent.type.name) || '')) {
         return false;
       }
       if (IGNORE_NODES.includes(node.type.name)) {
@@ -148,9 +149,8 @@ var nodeDecorations = exports.nodeDecorations = function nodeDecorations(newStat
 };
 var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDecoration(api, getIntl, pos, anchorName, nodeType, handleOptions) {
   var unbind;
-  var elementType = (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24150') ? 'span' : 'div';
   return _view.Decoration.widget(pos, function (view, getPos) {
-    var element = document.createElement(elementType);
+    var element = document.createElement('span');
     // Need to set it to inline to avoid text being split when merging two paragraphs
     element.style.display = 'inline';
     element.setAttribute('data-testid', 'block-ctrl-decorator-widget');
@@ -163,9 +163,7 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
         }
       });
     }
-    if ((0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23896')) {
-      unmountDecorations('data-blocks-drag-handle-container');
-    }
+    unmountDecorations('data-blocks-drag-handle-container');
 
     // There are times when global clear: "both" styles are applied to this decoration causing jumpiness
     // due to margins applied to other nodes eg. Headings
@@ -184,13 +182,10 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
   }, {
     side: -1,
     id: 'drag-handle',
-    destroy: function destroy(node) {
+    destroy: function destroy() {
       if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
         unbind && unbind();
       }
-      if (!(0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23896')) {
-        _reactDom.default.unmountComponentAtNode(node);
-      }
     }
   });
 };

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

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.key = exports.createPlugin = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
-var _steps = require("@atlaskit/adf-schema/steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
@@ -93,7 +92,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
         return initialState;
       },
       apply: function apply(tr, currentState, oldState, newState) {
-        var _meta$activeNode, _meta$activeNode$hand, _meta$activeNode4, _meta$isDragging, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging;
+        var _meta$activeNode, _meta$activeNode$hand, _activeNodeWithNewNod, _meta$activeNode3, _meta$isDragging, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging;
         var activeNode = currentState.activeNode,
           decorations = currentState.decorations,
           isMenuOpen = currentState.isMenuOpen,
@@ -106,20 +105,12 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
           isPMDragging = currentState.isPMDragging;
         var activeNodeWithNewNodeType = null;
         var meta = tr.getMeta(key);
-        // when creating analytics during drag/drop events, PM thinks the doc has changed
-        // so tr.docChange is true and causes some decorations to not render
-        var isAnalyticTr = tr.steps.every(function (step) {
-          return step instanceof _steps.AnalyticsStep;
-        });
 
         // If tables or media are being resized, we want to hide the drag handle
         var resizerMeta = tr.getMeta('is-resizer-resizing');
         isResizerResizing = resizerMeta !== null && resizerMeta !== void 0 ? resizerMeta : isResizerResizing;
         var nodeCountChanged = oldState.doc.childCount !== newState.doc.childCount;
-        var shouldRemoveHandle = true;
-        if ((0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_24000')) {
-          shouldRemoveHandle = !tr.getMeta('isRemote');
-        }
+        var shouldRemoveHandle = !tr.getMeta('isRemote');
 
         // During resize, remove the drag handle widget so its dom positioning doesn't need to be maintained
         // Also remove the handle when the node is moved or the node count changes. This helps prevent incorrect positioning
@@ -147,16 +138,14 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
         if (!(0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
           isDecsMissing = !(isDragging || meta !== null && meta !== void 0 && meta.isDragging) && decsLength !== newState.doc.childCount;
         }
-        if ((0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24372')) {
-          var dropTargetLen = decorations.find().filter(function (_ref8) {
-            var spec = _ref8.spec;
-            return spec.type === 'drop-target-decoration';
-          }).length;
+        var dropTargetLen = decorations.find().filter(function (_ref8) {
+          var spec = _ref8.spec;
+          return spec.type === 'drop-target-decoration';
+        }).length;
 
-          //TODO: Fix this logic for nested scenarios
-          if (!(0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
-            isDropTargetsMissing = isDragging && (meta === null || meta === void 0 ? void 0 : meta.isDragging) !== false && dropTargetLen !== newState.doc.childCount + 1;
-          }
+        //TODO: Fix this logic for nested scenarios
+        if (!(0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
+          isDropTargetsMissing = isDragging && (meta === null || meta === void 0 ? void 0 : meta.isDragging) !== false && dropTargetLen !== newState.doc.childCount + 1;
         }
 
         // This is not targeted enough - it's trying to catch events like expand being set to breakout
@@ -227,90 +216,50 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
           var decs = (0, _decorations.dragHandleDecoration)(api, getIntl, meta.activeNode.pos, meta.activeNode.anchorName, meta.activeNode.nodeType, meta.activeNode.handleOptions);
           decorations = decorations.add(newState.doc, [decs]);
         }
-        if ((0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-ed-23816')) {
-          var _activeNodeWithNewNod;
-          // Remove previous drag handle widget and draw new drag handle widget when node type changes
-          if (activeNodeWithNewNodeType && ((_activeNodeWithNewNod = activeNodeWithNewNodeType) === null || _activeNodeWithNewNod === void 0 ? void 0 : _activeNodeWithNewNod.nodeType) !== (activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) && api) {
-            var _oldHandle2 = decorations.find().filter(function (_ref11) {
-              var spec = _ref11.spec;
-              return spec.id === 'drag-handle';
-            });
-            decorations = decorations.remove(_oldHandle2);
-            var _decs = (0, _decorations.dragHandleDecoration)(api, getIntl, activeNodeWithNewNodeType.pos, activeNodeWithNewNodeType.anchorName, activeNodeWithNewNodeType.nodeType);
-            decorations = decorations.add(newState.doc, [_decs]);
-          }
+
+        // Remove previous drag handle widget and draw new drag handle widget when node type changes
+        if (activeNodeWithNewNodeType && ((_activeNodeWithNewNod = activeNodeWithNewNodeType) === null || _activeNodeWithNewNod === void 0 ? void 0 : _activeNodeWithNewNod.nodeType) !== (activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) && api) {
+          var _oldHandle2 = decorations.find().filter(function (_ref11) {
+            var spec = _ref11.spec;
+            return spec.id === 'drag-handle';
+          });
+          decorations = decorations.remove(_oldHandle2);
+          var _decs = (0, _decorations.dragHandleDecoration)(api, getIntl, activeNodeWithNewNodeType.pos, activeNodeWithNewNodeType.anchorName, activeNodeWithNewNodeType.nodeType);
+          decorations = decorations.add(newState.doc, [_decs]);
         }
         var shouldUpdateDropTargets = (meta === null || meta === void 0 ? void 0 : meta.isDragging) || isDropTargetsMissing;
-        var shouldMapDropTargets = false;
-        if ((0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24372')) {
-          shouldMapDropTargets = !shouldUpdateDropTargets && tr.docChanged && isDragging && (meta === null || meta === void 0 ? void 0 : meta.isDragging) !== false && !(meta !== null && meta !== void 0 && meta.nodeMoved);
-          if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing) {
-            // Remove drop target decoration when dragging stops
-            var dropTargetDecs = decorations.find().filter(function (_ref12) {
-              var spec = _ref12.spec;
-              return spec.type === 'drop-target-decoration';
-            });
-            decorations = decorations.remove(dropTargetDecs);
-          }
-          if (api) {
-            // Add drop targets when node is being dragged
-            // if the transaction is only for analytics and user is dragging, continue to draw drop targets
-            if (shouldUpdateDropTargets || (0, _dragTargetDebug.isBlocksDragTargetDebug)()) {
-              var _meta$activeNode2;
-              var _dropTargetDecoration = (0, _decorations.dropTargetDecorations)(oldState, newState, api, formatMessage, meta === null || meta === void 0 || (_meta$activeNode2 = meta.activeNode) === null || _meta$activeNode2 === void 0 ? void 0 : _meta$activeNode2.nodeType),
-                _decs2 = _dropTargetDecoration.decs,
-                updatedDecorationState = _dropTargetDecoration.decorationState;
-              decorationState = updatedDecorationState;
-              decorations = decorations.add(newState.doc, _decs2);
-            }
-          }
-
-          //Map drop target decoration positions when the document changes
-          if (shouldMapDropTargets) {
-            decorationState = decorationState.map(function (_ref13) {
-              var id = _ref13.id,
-                pos = _ref13.pos;
-              return {
-                id: id,
-                pos: tr.mapping.map(pos)
-              };
-            });
-          }
-        } else {
-          if (api) {
-            // Add drop targets when node is being dragged
-            // if the transaction is only for analytics and user is dragging, continue to draw drop targets
-            var shouldShowDragTarget = (meta === null || meta === void 0 ? void 0 : meta.isDragging) && (!tr.docChanged || tr.docChanged && isAnalyticTr);
-            if (shouldShowDragTarget || (0, _dragTargetDebug.isBlocksDragTargetDebug)()) {
-              var _meta$activeNode3;
-              var _dropTargetDecoration2 = (0, _decorations.dropTargetDecorations)(oldState, newState, api, formatMessage, meta === null || meta === void 0 || (_meta$activeNode3 = meta.activeNode) === null || _meta$activeNode3 === void 0 ? void 0 : _meta$activeNode3.nodeType),
-                _decs3 = _dropTargetDecoration2.decs,
-                _updatedDecorationState = _dropTargetDecoration2.decorationState;
-              decorationState = _updatedDecorationState;
-              decorations = decorations.add(newState.doc, _decs3);
-            }
-          }
-
+        var shouldMapDropTargets = !shouldUpdateDropTargets && tr.docChanged && isDragging && (meta === null || meta === void 0 ? void 0 : meta.isDragging) !== false && !(meta !== null && meta !== void 0 && meta.nodeMoved);
+        if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing) {
           // Remove drop target decoration when dragging stops
-          if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false && ((0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24330') ? true : !tr.docChanged)) {
-            var _dropTargetDecs = decorations.find().filter(function (_ref14) {
-              var spec = _ref14.spec;
-              return spec.type === 'drop-target-decoration';
-            });
-            decorations = decorations.remove(_dropTargetDecs);
+          var dropTargetDecs = decorations.find().filter(function (_ref12) {
+            var spec = _ref12.spec;
+            return spec.type === 'drop-target-decoration';
+          });
+          decorations = decorations.remove(dropTargetDecs);
+        }
+        if (api) {
+          // Add drop targets when node is being dragged
+          // if the transaction is only for analytics and user is dragging, continue to draw drop targets
+          if (shouldUpdateDropTargets || (0, _dragTargetDebug.isBlocksDragTargetDebug)()) {
+            var _meta$activeNode2;
+            var _dropTargetDecoration = (0, _decorations.dropTargetDecorations)(oldState, newState, api, formatMessage, meta === null || meta === void 0 || (_meta$activeNode2 = meta.activeNode) === null || _meta$activeNode2 === void 0 ? void 0 : _meta$activeNode2.nodeType),
+              _decs2 = _dropTargetDecoration.decs,
+              updatedDecorationState = _dropTargetDecoration.decorationState;
+            decorationState = updatedDecorationState;
+            decorations = decorations.add(newState.doc, _decs2);
           }
+        }
 
-          // Map drop target decoration positions when the document changes
-          if (tr.docChanged && isDragging) {
-            decorationState = decorationState.map(function (_ref15) {
-              var id = _ref15.id,
-                pos = _ref15.pos;
-              return {
-                id: id,
-                pos: tr.mapping.map(pos)
-              };
-            });
-          }
+        //Map drop target decoration positions when the document changes
+        if (shouldMapDropTargets) {
+          decorationState = decorationState.map(function (_ref13) {
+            var id = _ref13.id,
+              pos = _ref13.pos;
+            return {
+              id: id,
+              pos: tr.mapping.map(pos)
+            };
+          });
         }
 
         // Map decorations if document changes and node decorations do not need to be redrawn
@@ -318,8 +267,8 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
           decorations = decorations.map(tr.mapping, tr.doc);
         }
         var isEmptyDoc = newState.doc.childCount === 1 && newState.doc.nodeSize <= 4;
-        var hasNodeDecoration = decorations.find().some(function (_ref16) {
-          var spec = _ref16.spec;
+        var hasNodeDecoration = decorations.find().some(function (_ref14) {
+          var spec = _ref14.spec;
           return spec.type === 'node-decoration';
         });
         if (!hasNodeDecoration && isEmptyDoc) {
@@ -327,24 +276,15 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
         }
 
         // Map active node position when the document changes
-        var mappedActiveNodePos;
-        if ((0, _platformFeatureFlags.fg)('platform.editor.elements.drag-and-drop-ed-23816')) {
-          mappedActiveNodePos = tr.docChanged && activeNode ? activeNodeWithNewNodeType || {
-            pos: tr.mapping.map(activeNode.pos),
-            anchorName: activeNode.anchorName,
-            nodeType: activeNode.nodeType
-          } : activeNode;
-        } else {
-          mappedActiveNodePos = tr.docChanged && activeNode ? {
-            pos: tr.mapping.map(activeNode.pos),
-            anchorName: activeNode.anchorName,
-            nodeType: activeNode.nodeType
-          } : activeNode;
-        }
+        var mappedActiveNodePos = tr.docChanged && activeNode ? activeNodeWithNewNodeType || {
+          pos: tr.mapping.map(activeNode.pos),
+          anchorName: activeNode.anchorName,
+          nodeType: activeNode.nodeType
+        } : activeNode;
         return {
           decorations: decorations,
           decorationState: decorationState,
-          activeNode: isEmptyDoc || isHandleMissing ? null : (_meta$activeNode4 = meta === null || meta === void 0 ? void 0 : meta.activeNode) !== null && _meta$activeNode4 !== void 0 ? _meta$activeNode4 : mappedActiveNodePos,
+          activeNode: isEmptyDoc || isHandleMissing ? null : (_meta$activeNode3 = meta === null || meta === void 0 ? void 0 : meta.activeNode) !== null && _meta$activeNode3 !== void 0 ? _meta$activeNode3 : mappedActiveNodePos,
           isDragging: (_meta$isDragging = meta === null || meta === void 0 ? void 0 : meta.isDragging) !== null && _meta$isDragging !== void 0 ? _meta$isDragging : isDragging,
           isMenuOpen: meta !== null && meta !== void 0 && meta.toggleMenu ? !isMenuOpen : isMenuOpen,
           editorHeight: (_meta$editorHeight = meta === null || meta === void 0 ? void 0 : meta.editorHeight) !== null && _meta$editorHeight !== void 0 ? _meta$editorHeight : currentState.editorHeight,

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

@@ -287,12 +287,9 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
       display: 'none'
     }),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    newPositionStyles = _useState6[0],
-    setNewPositionStyles = _useState6[1];
+    positionStyles = _useState6[0],
+    setPositionStyles = _useState6[1];
   (0, _react.useEffect)(function () {
-    if (!(0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23896')) {
-      return;
-    }
     var cleanUpTransitionListener;
     if (nodeType === 'extension' || nodeType === 'embedCard') {
       var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
@@ -302,12 +299,12 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
       cleanUpTransitionListener = (0, _bindEventListener.bind)(dom, {
         type: 'transitionend',
         listener: function listener() {
-          setNewPositionStyles(calculatePosition());
+          setPositionStyles(calculatePosition());
         }
       });
     }
     var calcPos = requestAnimationFrame(function () {
-      setNewPositionStyles(calculatePosition());
+      setPositionStyles(calculatePosition());
     });
     return function () {
       var _cleanUpTransitionLis;
@@ -315,12 +312,6 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
       (_cleanUpTransitionLis = cleanUpTransitionListener) === null || _cleanUpTransitionLis === void 0 || _cleanUpTransitionLis();
     };
   }, [calculatePosition, view.dom, anchorName, nodeType]);
-  var positionStyles = (0, _react.useMemo)(function () {
-    if ((0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23896')) {
-      return newPositionStyles;
-    }
-    return calculatePosition();
-  }, [calculatePosition, newPositionStyles]);
   (0, _react.useEffect)(function () {
     if (handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && buttonRef.current && (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23873')) {
       var id = requestAnimationFrame(function () {
@@ -354,7 +345,7 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
         ref: buttonRef
         // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
         ,
-        style: (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23896') ? newPositionStyles : positionStyles,
+        style: positionStyles,
         onClick: handleOnClick,
         onMouseDown: handleMouseDown,
         onKeyDown: handleKeyDown,
@@ -369,6 +360,7 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
     content: (0, _react2.jsx)(_keymaps.TooltipContentWithMultipleShortcuts, {
       helpDescriptors: helpDescriptors
     }),
+    ignoreTooltipPointerEvents: true,
     onShow: function onShow() {
       var _api$accessibilityUti;
       api === null || api === void 0 || (_api$accessibilityUti = api.accessibilityUtils) === null || _api$accessibilityUti === void 0 || _api$accessibilityUti.actions.ariaNotify(message, {

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

@@ -9,7 +9,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _hooks = require("@atlaskit/editor-common/hooks");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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");
@@ -54,9 +53,6 @@ var getNodeMargins = function getNodeMargins(node) {
   return _consts.nodeMargins[nodeTypeName] || _consts.nodeMargins['default'];
 };
 var getDropTargetPositionStyle = function getDropTargetPositionStyle(prevNode, nextNode) {
-  if (!(0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_gap_fix')) {
-    return null;
-  }
   if (!prevNode || !nextNode) {
     return null;
   }

package/dist/cjs/utils/drag-target-debug.js

@@ -7,5 +7,5 @@ exports.isBlocksDragTargetDebug = void 0;
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var IS_GEMINI_TEST_ENV = Boolean(process.env.NODE_ENV === 'development') && Boolean(window.__gemini_set_feature_flag__);
 var isBlocksDragTargetDebug = exports.isBlocksDragTargetDebug = function isBlocksDragTargetDebug() {
-  return IS_GEMINI_TEST_ENV && (0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_target_gap_fix');
+  return IS_GEMINI_TEST_ENV && (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_debug');
 };

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

@@ -7,7 +7,8 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { DragHandle } from '../ui/drag-handle';
 import { DropTarget } from '../ui/drop-target';
 import { canMoveToIndex } from '../utils/validation';
-const IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn'];
+const IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn', 'listItem'];
+const IGNORE_NODES_AND_DESCENDANTS = ['listItem'];
 const NESTED_DEPTH = fg('platform_editor_elements_dnd_nested') ? 100 : 0;
 export const dropTargetDecorations = (oldState, newState, api, formatMessage, activeNodeType) => {
   const decs = [];
@@ -16,8 +17,7 @@ export const dropTargetDecorations = (oldState, newState, api, formatMessage, ac
   // and allows us to easily map the updated position in the plugin apply method.
   const decorationState = [];
   let prevNode;
-  const state = fg('platform_editor_element_drag_and_drop_ed_24372') ? newState : oldState;
-  state.doc.nodesBetween(0, newState.doc.nodeSize - 2, (node, pos, parent, index) => {
+  newState.doc.nodesBetween(0, newState.doc.nodeSize - 2, (node, pos, parent, index) => {
     let depth = 0;
     const nodeType = newState.doc.type.schema.nodes[activeNodeType];
     if (fg('platform_editor_elements_dnd_nested')) {
@@ -114,11 +114,12 @@ export const emptyParagraphNodeDecorations = () => {
 };
 export const nodeDecorations = newState => {
   const decs = [];
-  newState.doc.descendants((node, pos, _parent, index) => {
+  newState.doc.descendants((node, pos, parent, index) => {
     let depth = 0;
     let anchorName;
     if (fg('platform_editor_elements_dnd_nested')) {
-      if (node.isInline) {
+      // Doesn't descend into a node
+      if (node.isInline || IGNORE_NODES_AND_DESCENDANTS.includes((parent === null || parent === void 0 ? void 0 : parent.type.name) || '')) {
         return false;
       }
       if (IGNORE_NODES.includes(node.type.name)) {
@@ -143,9 +144,8 @@ export const nodeDecorations = newState => {
 };
 export const dragHandleDecoration = (api, getIntl, pos, anchorName, nodeType, handleOptions) => {
   let unbind;
-  const elementType = fg('platform_editor_element_drag_and_drop_ed_24150') ? 'span' : 'div';
   return Decoration.widget(pos, (view, getPos) => {
-    const element = document.createElement(elementType);
+    const element = document.createElement('span');
     // Need to set it to inline to avoid text being split when merging two paragraphs
     element.style.display = 'inline';
     element.setAttribute('data-testid', 'block-ctrl-decorator-widget');
@@ -158,9 +158,7 @@ export const dragHandleDecoration = (api, getIntl, pos, anchorName, nodeType, ha
         }
       });
     }
-    if (fg('platform_editor_element_drag_and_drop_ed_23896')) {
-      unmountDecorations('data-blocks-drag-handle-container');
-    }
+    unmountDecorations('data-blocks-drag-handle-container');
 
     // There are times when global clear: "both" styles are applied to this decoration causing jumpiness
     // due to margins applied to other nodes eg. Headings
@@ -179,13 +177,10 @@ export const dragHandleDecoration = (api, getIntl, pos, anchorName, nodeType, ha
   }, {
     side: -1,
     id: 'drag-handle',
-    destroy: node => {
+    destroy: () => {
       if (fg('platform_editor_elements_dnd_nested')) {
         unbind && unbind();
       }
-      if (!fg('platform_editor_element_drag_and_drop_ed_23896')) {
-        ReactDOM.unmountComponentAtNode(node);
-      }
     }
   });
 };