@atlaskit/editor-plugin-block-controls 1.10.6 → 1.11.0

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

@@ -6,9 +6,24 @@ import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { DragHandle } from '../ui/drag-handle';
 import { DropTarget } from '../ui/drop-target';
+import { isBlocksDragTargetDebug } from '../utils/drag-target-debug';
 import { canMoveToIndex } from '../utils/validation';
-const IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn'];
-const NESTED_DEPTH = fg('platform_editor_elements_dnd_nested') ? 100 : 0;
+const IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn', 'listItem'];
+const IGNORE_NODES_AND_DESCENDANTS = ['listItem'];
+const PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand'];
+const getNestedDepth = () => fg('platform_editor_elements_dnd_nested') ? 100 : 0;
+const createDropTargetDecoration = (pos, dropTargetDec) => {
+  return Decoration.widget(pos, () => {
+    const element = document.createElement('div');
+    element.setAttribute('data-blocks-drop-target-container', 'true');
+    element.style.clear = 'unset';
+    ReactDOM.render(dropTargetDec, element);
+    return element;
+  }, {
+    type: 'drop-target-decoration',
+    side: -1
+  });
+};
 export const dropTargetDecorations = (oldState, newState, api, formatMessage, activeNodeType) => {
   const decs = [];
   unmountDecorations('data-blocks-drop-target-container');
@@ -16,53 +31,61 @@ 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];
+    let endDec = null;
     if (fg('platform_editor_elements_dnd_nested')) {
       depth = newState.doc.resolve(pos).depth;
-      if (node.isInline) {
+      if (node.isInline || !parent) {
         return false;
       }
       if (IGNORE_NODES.includes(node.type.name)) {
         return true; //skip over, don't consider it a valid depth
       }
-      const canDrop = parent && activeNodeType && canMoveToIndex(parent, index, nodeType);
+      const canDrop = activeNodeType && canMoveToIndex(parent, index, nodeType);
 
       //NOTE: This will block drop targets showing for nodes that are valid after transformation (i.e. expand -> nestedExpand)
-      if (!canDrop) {
+      if (!canDrop && !isBlocksDragTargetDebug()) {
         return false; //not valid pos, so nested not valid either
       }
       decorationState.push({
         id: pos,
         pos
       });
+      if (parent.lastChild === node && PARENT_WITH_END_DROP_TARGET.includes(parent.type.name)) {
+        const endpos = pos + node.nodeSize;
+        endDec = {
+          id: endpos,
+          pos: endpos
+        };
+        decorationState.push({
+          id: endpos,
+          pos: endpos
+        });
+      }
     } else {
       decorationState.push({
         id: index,
         pos
       });
     }
-    const dropTargetDec = /*#__PURE__*/createElement(DropTarget, {
+    decs.push(createDropTargetDecoration(pos, /*#__PURE__*/createElement(DropTarget, {
       api,
       id: fg('platform_editor_elements_dnd_nested') ? pos : index,
       formatMessage,
       prevNode,
       nextNode: node
-    });
-    decs.push(Decoration.widget(pos, () => {
-      const element = document.createElement('div');
-      element.setAttribute('data-blocks-drop-target-container', 'true');
-      element.style.clear = 'unset';
-      ReactDOM.render(dropTargetDec, element);
-      return element;
-    }, {
-      type: 'drop-target-decoration',
-      side: -1
-    }));
+    })));
+    if (endDec) {
+      decs.push(createDropTargetDecoration(endDec.pos, /*#__PURE__*/createElement(DropTarget, {
+        api,
+        id: endDec.id,
+        formatMessage
+      })));
+    }
     prevNode = node;
-    return depth < NESTED_DEPTH;
+    return depth < getNestedDepth();
   });
 
   /**
@@ -72,7 +95,6 @@ export const dropTargetDecorations = (oldState, newState, api, formatMessage, ac
    * node and not its size.
    *
    */
-
   const lastPos = newState.doc.content.size;
   if (fg('platform_editor_elements_dnd_nested')) {
     decorationState.push({
@@ -114,11 +136,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)) {
@@ -137,15 +160,14 @@ export const nodeDecorations = newState => {
     }, {
       type: 'node-decoration'
     }));
-    return depth < NESTED_DEPTH;
+    return depth < getNestedDepth();
   });
   return decs;
 };
 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 +180,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 +199,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);
-      }
     }
   });
 };

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

@@ -1,5 +1,4 @@
 import rafSchedule from 'raf-schd';
-import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { browser } from '@atlaskit/editor-common/utils';
@@ -87,7 +86,7 @@ export const createPlugin = (api, getIntl) => {
         return initialState;
       },
       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;
         let {
           activeNode,
           decorations,
@@ -102,18 +101,12 @@ export const createPlugin = (api, getIntl) => {
         } = currentState;
         let activeNodeWithNewNodeType = null;
         const 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
-        const isAnalyticTr = tr.steps.every(step => step instanceof AnalyticsStep);
 
         // If tables or media are being resized, we want to hide the drag handle
         const resizerMeta = tr.getMeta('is-resizer-resizing');
         isResizerResizing = resizerMeta !== null && resizerMeta !== void 0 ? resizerMeta : isResizerResizing;
         const nodeCountChanged = oldState.doc.childCount !== newState.doc.childCount;
-        let shouldRemoveHandle = true;
-        if (fg('platform_editor_elements_drag_and_drop_ed_24000')) {
-          shouldRemoveHandle = !tr.getMeta('isRemote');
-        }
+        const 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
@@ -138,15 +131,13 @@ export const createPlugin = (api, getIntl) => {
         if (!fg('platform_editor_elements_dnd_nested')) {
           isDecsMissing = !(isDragging || meta !== null && meta !== void 0 && meta.isDragging) && decsLength !== newState.doc.childCount;
         }
-        if (fg('platform_editor_element_drag_and_drop_ed_24372')) {
-          const dropTargetLen = decorations.find().filter(({
-            spec
-          }) => spec.type === 'drop-target-decoration').length;
+        const dropTargetLen = decorations.find().filter(({
+          spec
+        }) => spec.type === 'drop-target-decoration').length;
 
-          //TODO: Fix this logic for nested scenarios
-          if (!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 (!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
@@ -166,14 +157,10 @@ export const createPlugin = (api, getIntl) => {
 
         // Draw node and mouseWrapper decorations at top level node if decorations is empty, editor height changes or node is moved
         if (redrawDecorations && !isResizerResizing && api) {
-          if (fg('platform_editor_elements_drag_and_drop_ed_24000')) {
-            const oldNodeDecs = decorations.find().filter(({
-              spec
-            }) => spec.type !== 'drop-target-decoration');
-            decorations = decorations.remove(oldNodeDecs);
-          } else {
-            decorations = DecorationSet.create(newState.doc, []);
-          }
+          const oldNodeDecs = decorations.find().filter(({
+            spec
+          }) => spec.type !== 'drop-target-decoration');
+          decorations = decorations.remove(oldNodeDecs);
           const nodeDecs = nodeDecorations(newState);
           decorations = decorations.add(newState.doc, [...nodeDecs]);
 
@@ -185,9 +172,7 @@ export const createPlugin = (api, getIntl) => {
 
             // When a node type changed to be nested inside another node, the position of the active node is off by 1
             // This is a workaround to fix the position of the active node when it is nested
-
-            const shouldUpdateNestedPosition = fg('platform_editor_element_drag_and_drop_ed_24049') ? tr.docChanged && !nodeCountChanged : true;
-            if (shouldUpdateNestedPosition && mappedPosisiton === prevMappedPos + 1) {
+            if (tr.docChanged && !nodeCountChanged && mappedPosisiton === prevMappedPos + 1) {
               mappedPosisiton = prevMappedPos;
             }
             const newActiveNode = tr.doc.nodeAt(mappedPosisiton);
@@ -216,91 +201,50 @@ export const createPlugin = (api, getIntl) => {
           const decs = dragHandleDecoration(api, getIntl, meta.activeNode.pos, meta.activeNode.anchorName, meta.activeNode.nodeType, meta.activeNode.handleOptions);
           decorations = decorations.add(newState.doc, [decs]);
         }
-        if (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) {
-            const oldHandle = decorations.find().filter(({
-              spec
-            }) => spec.id === 'drag-handle');
-            decorations = decorations.remove(oldHandle);
-            const decs = 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) {
+          const oldHandle = decorations.find().filter(({
+            spec
+          }) => spec.id === 'drag-handle');
+          decorations = decorations.remove(oldHandle);
+          const decs = dragHandleDecoration(api, getIntl, activeNodeWithNewNodeType.pos, activeNodeWithNewNodeType.anchorName, activeNodeWithNewNodeType.nodeType);
+          decorations = decorations.add(newState.doc, [decs]);
         }
         const shouldUpdateDropTargets = (meta === null || meta === void 0 ? void 0 : meta.isDragging) || isDropTargetsMissing;
-        let shouldMapDropTargets = false;
-        if (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
-            const dropTargetDecs = decorations.find().filter(({
-              spec
-            }) => 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 || isBlocksDragTargetDebug()) {
-              var _meta$activeNode2;
-              const {
-                decs,
-                decorationState: updatedDecorationState
-              } = dropTargetDecorations(oldState, newState, api, formatMessage, meta === null || meta === void 0 ? void 0 : (_meta$activeNode2 = meta.activeNode) === null || _meta$activeNode2 === void 0 ? void 0 : _meta$activeNode2.nodeType);
-              decorationState = updatedDecorationState;
-              decorations = decorations.add(newState.doc, decs);
-            }
-          }
-
-          //Map drop target decoration positions when the document changes
-          if (shouldMapDropTargets) {
-            decorationState = decorationState.map(({
-              id,
-              pos
-            }) => {
-              return {
-                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
-            const shouldShowDragTarget = (meta === null || meta === void 0 ? void 0 : meta.isDragging) && (!tr.docChanged || tr.docChanged && isAnalyticTr);
-            if (shouldShowDragTarget || isBlocksDragTargetDebug()) {
-              var _meta$activeNode3;
-              const {
-                decs,
-                decorationState: updatedDecorationState
-              } = dropTargetDecorations(oldState, newState, api, formatMessage, meta === null || meta === void 0 ? void 0 : (_meta$activeNode3 = meta.activeNode) === null || _meta$activeNode3 === void 0 ? void 0 : _meta$activeNode3.nodeType);
-              decorationState = updatedDecorationState;
-              decorations = decorations.add(newState.doc, decs);
-            }
-          }
-
+        const 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 && (fg('platform_editor_element_drag_and_drop_ed_24330') ? true : !tr.docChanged)) {
-            const dropTargetDecs = decorations.find().filter(({
-              spec
-            }) => spec.type === 'drop-target-decoration');
-            decorations = decorations.remove(dropTargetDecs);
+          const dropTargetDecs = decorations.find().filter(({
+            spec
+          }) => 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 || isBlocksDragTargetDebug()) {
+            var _meta$activeNode2;
+            const {
+              decs,
+              decorationState: updatedDecorationState
+            } = dropTargetDecorations(oldState, newState, api, formatMessage, meta === null || meta === void 0 ? void 0 : (_meta$activeNode2 = meta.activeNode) === null || _meta$activeNode2 === void 0 ? void 0 : _meta$activeNode2.nodeType);
+            decorationState = updatedDecorationState;
+            decorations = decorations.add(newState.doc, decs);
           }
+        }
 
-          // Map drop target decoration positions when the document changes
-          if (tr.docChanged && isDragging) {
-            decorationState = decorationState.map(({
+        //Map drop target decoration positions when the document changes
+        if (shouldMapDropTargets) {
+          decorationState = decorationState.map(({
+            id,
+            pos
+          }) => {
+            return {
               id,
-              pos
-            }) => {
-              return {
-                id,
-                pos: tr.mapping.map(pos)
-              };
-            });
-          }
+              pos: tr.mapping.map(pos)
+            };
+          });
         }
 
         // Map decorations if document changes and node decorations do not need to be redrawn
@@ -316,24 +260,15 @@ export const createPlugin = (api, getIntl) => {
         }
 
         // Map active node position when the document changes
-        let mappedActiveNodePos;
-        if (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;
-        }
+        const mappedActiveNodePos = tr.docChanged && activeNode ? activeNodeWithNewNodeType || {
+          pos: tr.mapping.map(activeNode.pos),
+          anchorName: activeNode.anchorName,
+          nodeType: activeNode.nodeType
+        } : activeNode;
         return {
           decorations,
           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/es2019/ui/drag-handle.js

@@ -2,7 +2,7 @@
  * @jsxRuntime classic
  * @jsx jsx
  */
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { bind } from 'bind-event-listener';
@@ -108,7 +108,7 @@ const DragHandleInternal = ({
       });
       const resolvedMovingNode = tr.doc.resolve(startPos);
       const maybeNode = resolvedMovingNode.nodeAfter;
-      fg('platform.editor.elements.drag-and-drop-long-node-scroll') && tr.setMeta('scrollIntoView', false);
+      tr.setMeta('scrollIntoView', false);
       api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.attachAnalyticsEvent({
         eventType: EVENT_TYPE.UI,
         action: ACTION.CLICKED,
@@ -271,13 +271,10 @@ const DragHandleInternal = ({
       top: fg('platform_editor_elements_dnd_ed_23674') ? getTopPosition(dom, nodeType) : getTopPosition(dom)
     };
   }, [anchorName, nodeType, view, blockCardWidth, macroInteractionUpdates]);
-  const [newPositionStyles, setNewPositionStyles] = useState({
+  const [positionStyles, setPositionStyles] = useState({
     display: 'none'
   });
   useEffect(() => {
-    if (!fg('platform_editor_element_drag_and_drop_ed_23896')) {
-      return;
-    }
     let cleanUpTransitionListener;
     if (nodeType === 'extension' || nodeType === 'embedCard') {
       const dom = view.dom.querySelector(`[data-drag-handler-anchor-name="${anchorName}"]`);
@@ -287,12 +284,12 @@ const DragHandleInternal = ({
       cleanUpTransitionListener = bind(dom, {
         type: 'transitionend',
         listener: () => {
-          setNewPositionStyles(calculatePosition());
+          setPositionStyles(calculatePosition());
         }
       });
     }
     const calcPos = requestAnimationFrame(() => {
-      setNewPositionStyles(calculatePosition());
+      setPositionStyles(calculatePosition());
     });
     return () => {
       var _cleanUpTransitionLis;
@@ -300,12 +297,6 @@ const DragHandleInternal = ({
       (_cleanUpTransitionLis = cleanUpTransitionListener) === null || _cleanUpTransitionLis === void 0 ? void 0 : _cleanUpTransitionLis();
     };
   }, [calculatePosition, view.dom, anchorName, nodeType]);
-  const positionStyles = useMemo(() => {
-    if (fg('platform_editor_element_drag_and_drop_ed_23896')) {
-      return newPositionStyles;
-    }
-    return calculatePosition();
-  }, [calculatePosition, newPositionStyles]);
   useEffect(() => {
     if (handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && buttonRef.current && fg('platform_editor_element_drag_and_drop_ed_23873')) {
       const id = requestAnimationFrame(() => {
@@ -338,7 +329,7 @@ const DragHandleInternal = ({
     ref: buttonRef
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     ,
-    style: fg('platform_editor_element_drag_and_drop_ed_23896') ? newPositionStyles : positionStyles,
+    style: positionStyles,
     onClick: handleOnClick,
     onMouseDown: handleMouseDown,
     onKeyDown: handleKeyDown,

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

@@ -7,7 +7,6 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box';
 import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { layers } from '@atlaskit/theme/constants';
@@ -40,9 +39,6 @@ const getNodeMargins = node => {
   return nodeMargins[nodeTypeName] || nodeMargins['default'];
 };
 const getDropTargetPositionStyle = (prevNode, nextNode) => {
-  if (!fg('platform_editor_drag_and_drop_target_gap_fix')) {
-    return null;
-  }
   if (!prevNode || !nextNode) {
     return null;
   }

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

@@ -1,5 +1,5 @@
 import { fg } from '@atlaskit/platform-feature-flags';
 const IS_GEMINI_TEST_ENV = Boolean(process.env.NODE_ENV === 'development') && Boolean(window.__gemini_set_feature_flag__);
 export const isBlocksDragTargetDebug = () => {
-  return IS_GEMINI_TEST_ENV && fg('platform_editor_drag_and_drop_target_gap_fix');
+  return IS_GEMINI_TEST_ENV && fg('platform_editor_element_drag_and_drop_debug');
 };