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

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
@@ -216,91 +207,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 +266,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';
@@ -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,
@@ -351,6 +342,7 @@ const DragHandleInternal = ({
     content: jsx(TooltipContentWithMultipleShortcuts, {
       helpDescriptors: helpDescriptors
     }),
+    ignoreTooltipPointerEvents: true,
     onShow: () => {
       var _api$accessibilityUti;
       api === null || api === void 0 ? void 0 : (_api$accessibilityUti = api.accessibilityUtils) === null || _api$accessibilityUti === void 0 ? void 0 : _api$accessibilityUti.actions.ariaNotify(message, {

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');
 };

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

@@ -8,7 +8,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';
-var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn'];
+var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn', 'listItem'];
+var IGNORE_NODES_AND_DESCENDANTS = ['listItem'];
 var NESTED_DEPTH = fg('platform_editor_elements_dnd_nested') ? 100 : 0;
 export var dropTargetDecorations = function dropTargetDecorations(oldState, newState, api, formatMessage, activeNodeType) {
   var decs = [];
@@ -17,8 +18,7 @@ export var dropTargetDecorations = function dropTargetDecorations(oldState, newS
   // and allows us to easily map the updated position in the plugin apply method.
   var decorationState = [];
   var prevNode;
-  var state = 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 (fg('platform_editor_elements_dnd_nested')) {
@@ -114,12 +114,13 @@ export var emptyParagraphNodeDecorations = function emptyParagraphNodeDecoration
 };
 export var 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 (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)) {
@@ -141,9 +142,8 @@ export var nodeDecorations = function nodeDecorations(newState) {
 };
 export var dragHandleDecoration = function dragHandleDecoration(api, getIntl, pos, anchorName, nodeType, handleOptions) {
   var unbind;
-  var elementType = fg('platform_editor_element_drag_and_drop_ed_24150') ? 'span' : 'div';
   return 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');
@@ -156,9 +156,7 @@ export var dragHandleDecoration = function dragHandleDecoration(api, getIntl, po
         }
       });
     }
-    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
@@ -177,13 +175,10 @@ export var dragHandleDecoration = function dragHandleDecoration(api, getIntl, po
   }, {
     side: -1,
     id: 'drag-handle',
-    destroy: function destroy(node) {
+    destroy: function 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/esm/pm-plugins/main.js

@@ -1,6 +1,5 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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';
@@ -86,7 +85,7 @@ export var 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,
@@ -99,20 +98,12 @@ export var 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 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 (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
@@ -140,16 +131,14 @@ export var createPlugin = function 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')) {
-          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 (!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
@@ -220,90 +209,50 @@ export var createPlugin = function createPlugin(api, getIntl) {
           var 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) {
-            var _oldHandle2 = decorations.find().filter(function (_ref11) {
-              var spec = _ref11.spec;
-              return spec.id === 'drag-handle';
-            });
-            decorations = decorations.remove(_oldHandle2);
-            var _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) {
+          var _oldHandle2 = decorations.find().filter(function (_ref11) {
+            var spec = _ref11.spec;
+            return spec.id === 'drag-handle';
+          });
+          decorations = decorations.remove(_oldHandle2);
+          var _decs = 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 (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 || isBlocksDragTargetDebug()) {
-              var _meta$activeNode2;
-              var _dropTargetDecoration = 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 || isBlocksDragTargetDebug()) {
-              var _meta$activeNode3;
-              var _dropTargetDecoration2 = 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 && (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 || isBlocksDragTargetDebug()) {
+            var _meta$activeNode2;
+            var _dropTargetDecoration = 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
@@ -311,8 +260,8 @@ export var 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) {
@@ -320,24 +269,15 @@ export var createPlugin = function createPlugin(api, getIntl) {
         }
 
         // Map active node position when the document changes
-        var 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;
-        }
+        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,