@atlaskit/editor-plugin-block-controls 3.8.4 → 3.8.6

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

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { getNestedDepth, getNodeAnchor, getNodeTypeWithLevel, TYPE_NODE_DEC } from './decorations-common';
+import { NESTED_DEPTH, getNodeAnchor, getNodeTypeWithLevel, TYPE_NODE_DEC } from './decorations-common';
 var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption', 'layoutColumn'];
 var IGNORE_NODES_NEXT = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption'];
 var IGNORE_NODE_DESCENDANTS = ['listItem', 'taskList', 'decisionList', 'mediaSingle'];
@@ -81,19 +81,16 @@ export var nodeDecorations = function nodeDecorations(newState, from, to) {
     var shouldDescend = shouldDescendIntoNode(node);
     var anchorName = getNodeAnchor(node);
     var nodeTypeWithLevel = getNodeTypeWithLevel(node);
-    if (editorExperiment('nested-dnd', true)) {
-      // Doesn't descend into a node
-      if (node.isInline) {
-        return false;
-      }
-      depth = newState.doc.resolve(pos).depth;
-      if (shouldIgnoreNode(node, ignore_nodes, depth, parent)) {
-        return shouldDescend; //skip over, don't consider it a valid depth
-      }
+
+    // Doesn't descend into a node
+    if (node.isInline) {
+      return false;
+    }
+    depth = newState.doc.resolve(pos).depth;
+    if (shouldIgnoreNode(node, ignore_nodes, depth, parent)) {
+      return shouldDescend; //skip over, don't consider it a valid depth
     }
-    var anchorStyles = pos === 0 && editorExperiment('platform_editor_controls', 'variant1') ? // why margin-top:0? well it's not possible using CSS to select the first node in the document while excluding n number of nodes, in this case
-    // we're rendering quick insert button and drag handle. For now override margin-top to 0
-    "anchor-name: ".concat(anchorName, ";margin-top:0px;") : "anchor-name: ".concat(anchorName, ";");
+    var anchorStyles = "anchor-name: ".concat(anchorName, ";");
     decs.push(Decoration.node(pos, pos + node.nodeSize, _defineProperty(_defineProperty(_defineProperty({
       style: anchorStyles
     }, 'data-drag-handler-anchor-name', anchorName), 'data-drag-handler-node-type', nodeTypeWithLevel), 'data-drag-handler-anchor-depth', "".concat(depth)), {
@@ -102,7 +99,7 @@ export var nodeDecorations = function nodeDecorations(newState, from, to) {
       nodeType: node.type.name,
       nodeTypeWithLevel: nodeTypeWithLevel
     }));
-    return shouldDescend && depth < getNestedDepth();
+    return shouldDescend && depth < NESTED_DEPTH;
   });
   return decs;
 };

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

@@ -3,13 +3,10 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import ReactDOM from 'react-dom';
 import uuid from 'uuid';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export var TYPE_DROP_TARGET_DEC = 'drop-target-decoration';
 export var TYPE_HANDLE_DEC = 'drag-handle';
 export var TYPE_NODE_DEC = 'node-decoration';
-export var getNestedDepth = function getNestedDepth() {
-  return editorExperiment('nested-dnd', true) ? 100 : 0;
-};
+export var NESTED_DEPTH = 100;
 export var getNodeAnchor = function getNodeAnchor(node) {
   var handleId = ObjHash.getForNode(node);
   return "--node-anchor-".concat(node.type.name, "-").concat(handleId);

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

@@ -41,25 +41,23 @@ export var dragHandleDecoration = function dragHandleDecoration(api, formatMessa
         return undefined;
       }
     };
-    if (editorExperiment('nested-dnd', true)) {
-      var newPos = getPos();
-      if (typeof newPos === 'number') {
-        var $pos = view.state.doc.resolve(newPos);
-        isTopLevelNode = ($pos === null || $pos === void 0 ? void 0 : $pos.parent.type.name) === 'doc';
-      }
-      /*
-       * We disable mouseover event to fix flickering issue on hover
-       * However, the tooltip for nested drag handle is no long working.
-       */
-      if (newPos === undefined || !isTopLevelNode) {
-        // This will also hide the tooltip.
-        unbind = bind(element, {
-          type: 'mouseover',
-          listener: function listener(e) {
-            e.stopPropagation();
-          }
-        });
-      }
+    var newPos = getPos();
+    if (typeof newPos === 'number') {
+      var $pos = view.state.doc.resolve(newPos);
+      isTopLevelNode = ($pos === null || $pos === void 0 ? void 0 : $pos.parent.type.name) === 'doc';
+    }
+    /*
+     * We disable mouseover event to fix flickering issue on hover
+     * However, the tooltip for nested drag handle is no long working.
+     */
+    if (newPos === undefined || !isTopLevelNode) {
+      // This will also hide the tooltip.
+      unbind = bind(element, {
+        type: 'mouseover',
+        listener: function listener(e) {
+          e.stopPropagation();
+        }
+      });
     }
 
     // There are times when global clear: "both" styles are applied to this decoration causing jumpiness
@@ -117,9 +115,7 @@ export var dragHandleDecoration = function dragHandleDecoration(api, formatMessa
     type: TYPE_HANDLE_DEC,
     testid: "".concat(TYPE_HANDLE_DEC, "-").concat(uuid()),
     destroy: function destroy() {
-      if (editorExperiment('nested-dnd', true)) {
-        unbind && unbind();
-      }
+      return unbind && unbind();
     }
   });
 };

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

@@ -10,7 +10,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { nodeMargins } from '../ui/consts';
 import { DropTarget, EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP, EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_OFFSET } from '../ui/drop-target';
 import { DropTargetLayout } from '../ui/drop-target-layout';
-import { getNestedDepth, TYPE_DROP_TARGET_DEC, unmountDecorations } from './decorations-common';
+import { NESTED_DEPTH, TYPE_DROP_TARGET_DEC, unmountDecorations } from './decorations-common';
 import { maxLayoutColumnSupported } from './utils/consts';
 import { canMoveNodeToIndex, canMoveSliceToIndex, isInSameLayout } from './utils/validation';
 var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn', 'listItem', 'caption'];
@@ -173,62 +173,60 @@ export var dropTargetDecorations = function dropTargetDecorations(newState, api,
     var endPos;
     var $pos = newState.doc.resolve(pos);
     var isSameLayout = $activeNodePos && isInSameLayout($activeNodePos, $pos);
-    if (editorExperiment('nested-dnd', true)) {
-      depth = $pos.depth;
-      if (isAdvancedLayoutsPreRelease2) {
-        if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos) === pos && activeNode.nodeType !== 'layoutColumn') {
-          return false;
-        }
-        if (node.type.name === 'layoutColumn' && (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'layoutSection' && index !== 0 && (
-        // Not the first node
-        (parent === null || parent === void 0 ? void 0 : parent.childCount) < maxLayoutColumnSupported() || isSameLayout)) {
-          // Add drop target for layout columns
-          decs.push(createLayoutDropTargetDecoration(pos, {
-            api: api,
-            parent: parent,
-            formatMessage: formatMessage
-          }, nodeViewPortalProviderAPI, anchorRectCache));
-        }
-      }
-      if (node.isInline || !parent || DISABLE_CHILD_DROP_TARGET.includes(parent.type.name)) {
-        pushNodeStack(node, depth);
+    depth = $pos.depth;
+    if (isAdvancedLayoutsPreRelease2) {
+      if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos) === pos && activeNode.nodeType !== 'layoutColumn') {
         return false;
       }
-      if (IGNORE_NODES.includes(node.type.name)) {
-        pushNodeStack(node, depth);
-        return shouldDescend(node); //skip over, don't consider it a valid depth
+      if (node.type.name === 'layoutColumn' && (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'layoutSection' && index !== 0 && (
+      // Not the first node
+      (parent === null || parent === void 0 ? void 0 : parent.childCount) < maxLayoutColumnSupported() || isSameLayout)) {
+        // Add drop target for layout columns
+        decs.push(createLayoutDropTargetDecoration(pos, {
+          api: api,
+          parent: parent,
+          formatMessage: formatMessage
+        }, nodeViewPortalProviderAPI, anchorRectCache));
       }
+    }
+    if (node.isInline || !parent || DISABLE_CHILD_DROP_TARGET.includes(parent.type.name)) {
+      pushNodeStack(node, depth);
+      return false;
+    }
+    if (IGNORE_NODES.includes(node.type.name)) {
+      pushNodeStack(node, depth);
+      return shouldDescend(node); //skip over, don't consider it a valid depth
+    }
 
-      // When multi select is on, validate all the nodes in the selection instead of just the handle node
-      if (isMultiSelect) {
-        var selectionSlice = newState.doc.slice(selectionFrom, selectionTo, false);
-        var selectionSliceChildCount = selectionSlice.content.childCount;
-        var canDropSingleNode = true;
-        var canDropMultipleNodes = true;
+    // When multi select is on, validate all the nodes in the selection instead of just the handle node
+    if (isMultiSelect) {
+      var selectionSlice = newState.doc.slice(selectionFrom, selectionTo, false);
+      var selectionSliceChildCount = selectionSlice.content.childCount;
+      var canDropSingleNode = true;
+      var canDropMultipleNodes = true;
 
-        // when there is only one node in the slice, use the same logic as when multi select is not on
-        if (selectionSliceChildCount > 1 && handleInsideSelection) {
-          canDropMultipleNodes = canMoveSliceToIndex(selectionSlice, selectionFrom, selectionTo, parent, index, $pos);
-        } else {
-          canDropSingleNode = !!(activePMNode && canMoveNodeToIndex(parent, index, activePMNode, $pos, node));
-        }
-        if (!canDropMultipleNodes || !canDropSingleNode) {
-          pushNodeStack(node, depth);
-          return false; //not valid pos, so nested not valid either
-        }
+      // when there is only one node in the slice, use the same logic as when multi select is not on
+      if (selectionSliceChildCount > 1 && handleInsideSelection) {
+        canDropMultipleNodes = canMoveSliceToIndex(selectionSlice, selectionFrom, selectionTo, parent, index, $pos);
       } else {
-        var canDrop = activePMNode && 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) {
-          pushNodeStack(node, depth);
-          return false; //not valid pos, so nested not valid either
-        }
+        canDropSingleNode = !!(activePMNode && canMoveNodeToIndex(parent, index, activePMNode, $pos, node));
+      }
+      if (!canDropMultipleNodes || !canDropSingleNode) {
+        pushNodeStack(node, depth);
+        return false; //not valid pos, so nested not valid either
       }
-      if (parent.lastChild === node && !isEmptyParagraph(node) && PARENT_WITH_END_DROP_TARGET.includes(parent.type.name)) {
-        endPos = pos + node.nodeSize;
+    } else {
+      var canDrop = activePMNode && 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) {
+        pushNodeStack(node, depth);
+        return false; //not valid pos, so nested not valid either
       }
     }
+    if (parent.lastChild === node && !isEmptyParagraph(node) && PARENT_WITH_END_DROP_TARGET.includes(parent.type.name)) {
+      endPos = pos + node.nodeSize;
+    }
     var previousNode = popNodeStack(depth); // created scoped variable
 
     // only table and layout need to render full height drop target
@@ -252,7 +250,7 @@ export var dropTargetDecorations = function dropTargetDecorations(newState, api,
       }, nodeViewPortalProviderAPI, -1, anchorRectCache));
     }
     pushNodeStack(node, depth);
-    return depth < getNestedDepth() && shouldDescend(node);
+    return depth < NESTED_DEPTH && shouldDescend(node);
   });
   if (docTo === POS_END_OF_DOC) {
     decs.push(createDropTargetDecoration(POS_END_OF_DOC, {

package/dist/esm/pm-plugins/first-node-dec-plugin.js

@@ -0,0 +1,40 @@
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
+import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
+export var firstNodeDecPluginKey = new PluginKey('firstNodeDec');
+var createFirstNodeDecSet = function createFirstNodeDecSet(state) {
+  ;
+  var firstNode = state.doc.firstChild;
+  if (!firstNode) {
+    return DecorationSet.empty;
+  }
+  return DecorationSet.create(state.doc, [Decoration.node(0, firstNode.nodeSize, {
+    style: 'margin-top: 0'
+  })]);
+};
+export var firstNodeDecPlugin = function firstNodeDecPlugin() {
+  return new SafePlugin({
+    key: firstNodeDecPluginKey,
+    state: {
+      init: function init(_, state) {
+        return createFirstNodeDecSet(state);
+      },
+      apply: function apply(tr, currentState, _, newState) {
+        var isDocChanged = tr.docChanged && tr.steps.some(function (step) {
+          return step instanceof ReplaceStep || step instanceof ReplaceAroundStep;
+        });
+        // Reapply decorations if there are any steps that modify the document
+        if (isDocChanged) {
+          return createFirstNodeDecSet(newState);
+        }
+        return currentState;
+      }
+    },
+    props: {
+      decorations: function decorations(state) {
+        return firstNodeDecPluginKey.getState(state);
+      }
+    }
+  });
+};

package/dist/esm/pm-plugins/handle-mouse-over.js

@@ -28,7 +28,7 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
   if (rootElement) {
     var _rootElement$parentEl;
     // We want to exlude handles from showing for empty paragraph and heading nodes
-    if (editorExperiment('nested-dnd', true) && isEmptyNestedParagraphOrHeading(rootElement)) {
+    if (isEmptyNestedParagraphOrHeading(rootElement)) {
       return false;
     }
     if (rootElement.getAttribute('data-drag-handler-node-type') === 'media' && editorExperiment('advanced_layouts', true)) {
@@ -41,12 +41,12 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
     var parentElementType = parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('data-drag-handler-node-type');
     if (editorExperiment('advanced_layouts', true)) {
       // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)
-      if (parentElement && (parentElementType === 'table' || parentElementType === 'tableRow') && editorExperiment('nested-dnd', true)) {
+      if (parentElement && (parentElementType === 'table' || parentElementType === 'tableRow')) {
         rootElement = parentElement;
       }
     } else {
       // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)
-      if (parentElement && parentElementType === 'table' && editorExperiment('nested-dnd', true)) {
+      if (parentElement && parentElementType === 'table') {
         rootElement = parentElement;
       }
     }
@@ -67,7 +67,7 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
     }
     var parentRootElement = rootElement.parentElement;
     var pos;
-    if (parentRootElement && editorExperiment('nested-dnd', true)) {
+    if (parentRootElement) {
       var _parentRootElement$ch;
       var childNodes = Array.from(parentRootElement.childNodes);
       var index = childNodes.indexOf(rootElement);
@@ -85,12 +85,7 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
       // Don't show drag handle for layout column in a single column layout
       return false;
     }
-    var targetPos;
-    if (editorExperiment('nested-dnd', true)) {
-      targetPos = view.state.doc.resolve(pos).pos;
-    } else {
-      targetPos = view.state.doc.resolve(pos).start(1) - 1;
-    }
+    var targetPos = view.state.doc.resolve(pos).pos;
     var rootAnchorName;
     var rootNodeType;
     var rootPos;

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

@@ -1,7 +1,6 @@
 import { bindKeymapWithCommand, dragToMoveDown, dragToMoveLeft, dragToMoveRight, dragToMoveUp, showElementDragHandle } from '@atlaskit/editor-common/keymaps';
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { moveNodeViaShortcut } from '../editor-commands/move-node';
 import { showDragHandleAtSelection } from '../editor-commands/show-drag-handle';
 import { DIRECTION } from './utils/consts';
@@ -11,8 +10,8 @@ function keymapList(api, formatMessage) {
     bindKeymapWithCommand(
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    showElementDragHandle.common, function (state, dispatch, view) {
-      showDragHandleAtSelection(api)(state, dispatch, view);
+    showElementDragHandle.common, function (state) {
+      showDragHandleAtSelection(api)(state);
       //we always want to handle this shortcut to prevent default browser special char insert when option + alphabetical key is used
       return true;
     }, keymapList);
@@ -24,16 +23,14 @@ function keymapList(api, formatMessage) {
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     dragToMoveDown.common, moveNodeViaShortcut(api, DIRECTION.DOWN, formatMessage), keymapList);
-    if (editorExperiment('nested-dnd', true)) {
-      bindKeymapWithCommand(
-      // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      dragToMoveLeft.common, moveNodeViaShortcut(api, DIRECTION.LEFT, formatMessage), keymapList);
-      bindKeymapWithCommand(
-      // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      dragToMoveRight.common, moveNodeViaShortcut(api, DIRECTION.RIGHT, formatMessage), keymapList);
-    }
+    bindKeymapWithCommand(
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    dragToMoveLeft.common, moveNodeViaShortcut(api, DIRECTION.LEFT, formatMessage), keymapList);
+    bindKeymapWithCommand(
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    dragToMoveRight.common, moveNodeViaShortcut(api, DIRECTION.RIGHT, formatMessage), keymapList);
   }
   return keymapList;
 }

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

@@ -1,14 +1,12 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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 { browser } from '@atlaskit/editor-common/browser';
 import { isMeasuring, startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { isEmptyDocument, isTextInput } from '@atlaskit/editor-common/utils';
+import { isEmptyDocument } from '@atlaskit/editor-common/utils';
 import { NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -180,7 +178,7 @@ var getDecorationAtPos = function getDecorationAtPos(decorations, pos, to) {
   var nodeDecAtActivePos = nodeDecsAtActivePos.pop();
   return nodeDecAtActivePos;
 };
-export var newApply = function newApply(api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache) {
+var _apply = function apply(api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache) {
   var _meta$multiSelectDnD, _activeNode, _activeNode2, _meta$activeNode$hand, _activeNode3, _activeNode4, _meta$isDragging, _meta$isDragging2, _meta$toggleMenu, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging, _meta$isShiftDown, _meta$lastDragCancell;
   var activeNode = currentState.activeNode,
     decorations = currentState.decorations,
@@ -421,176 +419,10 @@ export var newApply = function newApply(api, formatMessage, tr, currentState, ne
     lastDragCancelled: (_meta$lastDragCancell = meta === null || meta === void 0 ? void 0 : meta.lastDragCancelled) !== null && _meta$lastDragCancell !== void 0 ? _meta$lastDragCancell : lastDragCancelled
   };
 };
-export var oldApply = function oldApply(api, formatMessage, tr, currentState, oldState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache) {
-  var _meta$activeNode2, _meta$activeNode$hand2, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2, _meta$lastDragCancell2;
-  var isNestedEnabled = flags.isNestedEnabled;
-  var activeNode = currentState.activeNode,
-    isMenuOpen = currentState.isMenuOpen,
-    editorHeight = currentState.editorHeight,
-    editorWidthLeft = currentState.editorWidthLeft,
-    editorWidthRight = currentState.editorWidthRight,
-    isDragging = currentState.isDragging,
-    isPMDragging = currentState.isPMDragging,
-    lastDragCancelled = currentState.lastDragCancelled;
-  var decorations = currentState.decorations,
-    isResizerResizing = currentState.isResizerResizing;
-
-  // Remap existing decorations when steps exist
-  if (tr.docChanged) {
-    decorations = decorations.map(tr.mapping, tr.doc);
-  }
-  var meta = tr.getMeta(key);
-
-  // 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 canIgnoreTr = function canIgnoreTr() {
-    return !tr.steps.every(function (e) {
-      return e instanceof AnalyticsStep;
-    });
-  };
-  var maybeNodeCountChanged = isNestedEnabled ? !isTextInput(tr) && tr.docChanged && canIgnoreTr() : oldState.doc.childCount !== newState.doc.childCount;
-  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
-  // Don't remove the handle if remote changes are changing the node count, its prosemirror position can be mapped instead
-  if (isResizerResizing || maybeNodeCountChanged && shouldRemoveHandle || meta !== null && meta !== void 0 && meta.nodeMoved) {
-    var oldHandle = decorations.find(undefined, undefined, function (spec) {
-      return spec.type === 'drag-handle';
-    });
-    decorations = decorations.remove(oldHandle);
-  }
-  var decsLength = isNestedEnabled ? decorations.find(undefined, undefined, function (spec) {
-    return spec.type === 'node-decoration';
-  }).length : decorations.find().filter(function (_ref6) {
-    var spec = _ref6.spec;
-    return spec.type !== 'drag-handle';
-  }).length;
-  var isDecsMissing = false;
-  var isDropTargetsMissing = false;
-  if (isNestedEnabled) {
-    var _meta$isDragging3;
-    isDecsMissing = !(isDragging || meta !== null && meta !== void 0 && meta.isDragging) && maybeNodeCountChanged;
-    isDropTargetsMissing = ((_meta$isDragging3 = meta === null || meta === void 0 ? void 0 : meta.isDragging) !== null && _meta$isDragging3 !== void 0 ? _meta$isDragging3 : isDragging) && maybeNodeCountChanged && !(meta !== null && meta !== void 0 && meta.nodeMoved);
-  } else {
-    isDecsMissing = !(isDragging || meta !== null && meta !== void 0 && meta.isDragging) && decsLength !== newState.doc.childCount;
-    var dropTargetLen = decorations.find(undefined, undefined, function (spec) {
-      return spec.type === 'drop-target-decoration';
-    }).length;
-    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
-  var maybeWidthUpdated = tr.docChanged && oldState.doc.nodeSize === newState.doc.nodeSize && !maybeNodeCountChanged;
-
-  // This addresses scenarios such as undoing table resizing,
-  // where a keyboard shortcut triggers a width change, and
-  // the node's actual width is then updated in a separate renderering cycle.
-  // The tr.meta.activeNode is triggered by the showDragHandleAt function during the mouse entry event
-  // (when the table node rerenders)
-  // The activeNode is from the previous rendering cycle, and verify if they share the same anchor.
-  var maybeTableWidthUpdated = (meta === null || meta === void 0 ? void 0 : meta.activeNode) && (meta === null || meta === void 0 || (_meta$activeNode2 = meta.activeNode) === null || _meta$activeNode2 === void 0 ? void 0 : _meta$activeNode2.nodeType) === 'table' && meta.activeNode.anchorName === (activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName);
-  var redrawDecorations = decorations === DecorationSet.empty || (meta === null || meta === void 0 ? void 0 : meta.editorHeight) !== undefined && (meta === null || meta === void 0 ? void 0 : meta.editorHeight) !== editorHeight || (meta === null || meta === void 0 ? void 0 : meta.editorWidthLeft) !== undefined && (meta === null || meta === void 0 ? void 0 : meta.editorWidthLeft) !== editorWidthLeft || (meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== undefined && (meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== editorWidthRight || maybeWidthUpdated || maybeNodeCountChanged || maybeTableWidthUpdated || resizerMeta === false || isDecsMissing || !!(meta !== null && meta !== void 0 && meta.nodeMoved) && tr.docChanged;
-
-  // Draw node and mouseWrapper decorations at top level node if decorations is empty, editor height changes or node is moved
-  if (redrawDecorations && !isResizerResizing && api) {
-    var oldNodeDecs = decorations.find(undefined, undefined, function (spec) {
-      return spec.type !== 'drop-target-decoration';
-    });
-    decorations = decorations.remove(oldNodeDecs);
-    var newNodeDecs = nodeDecorations(newState);
-    decorations = decorations.add(newState.doc, _toConsumableArray(newNodeDecs));
-    if (activeNode && !(meta !== null && meta !== void 0 && meta.nodeMoved) && !isDecsMissing) {
-      var _meta$activeNode$pos, _meta$activeNode3, _ref7, _meta$activeNode$anch, _meta$activeNode4, _decAtPos$spec, _ref8, _meta$activeNode$node, _meta$activeNode5, _decAtPos$spec2, _meta$activeNode6;
-      var mappedPosisiton = tr.mapping.map(activeNode.pos);
-      var prevMappedPos = oldState.tr.mapping.map(activeNode.pos);
-
-      // 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
-      if (tr.docChanged && !maybeNodeCountChanged && mappedPosisiton === prevMappedPos + 1) {
-        mappedPosisiton = prevMappedPos;
-      }
-      var _newActiveNode = tr.doc.nodeAt(mappedPosisiton);
-      if (_newActiveNode && (_newActiveNode === null || _newActiveNode === void 0 ? void 0 : _newActiveNode.type.name) !== activeNode.nodeType) {
-        var _oldHandle2 = decorations.find(undefined, undefined, function (spec) {
-          return spec.type === 'drag-handle';
-        });
-        decorations = decorations.remove(_oldHandle2);
-      }
-      var decAtPos = newNodeDecs.find(function (dec) {
-        return dec.from === mappedPosisiton;
-      });
-      var draghandleDec = dragHandleDecoration(api, formatMessage, (_meta$activeNode$pos = meta === null || meta === void 0 || (_meta$activeNode3 = meta.activeNode) === null || _meta$activeNode3 === void 0 ? void 0 : _meta$activeNode3.pos) !== null && _meta$activeNode$pos !== void 0 ? _meta$activeNode$pos : mappedPosisiton, (_ref7 = (_meta$activeNode$anch = meta === null || meta === void 0 || (_meta$activeNode4 = meta.activeNode) === null || _meta$activeNode4 === void 0 ? void 0 : _meta$activeNode4.anchorName) !== null && _meta$activeNode$anch !== void 0 ? _meta$activeNode$anch : decAtPos === null || decAtPos === void 0 || (_decAtPos$spec = decAtPos.spec) === null || _decAtPos$spec === void 0 ? void 0 : _decAtPos$spec.anchorName) !== null && _ref7 !== void 0 ? _ref7 : activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName, (_ref8 = (_meta$activeNode$node = meta === null || meta === void 0 || (_meta$activeNode5 = meta.activeNode) === null || _meta$activeNode5 === void 0 ? void 0 : _meta$activeNode5.nodeType) !== null && _meta$activeNode$node !== void 0 ? _meta$activeNode$node : decAtPos === null || decAtPos === void 0 || (_decAtPos$spec2 = decAtPos.spec) === null || _decAtPos$spec2 === void 0 ? void 0 : _decAtPos$spec2.nodeType) !== null && _ref8 !== void 0 ? _ref8 : activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType, nodeViewPortalProviderAPI, meta === null || meta === void 0 || (_meta$activeNode6 = meta.activeNode) === null || _meta$activeNode6 === void 0 ? void 0 : _meta$activeNode6.handleOptions);
-      decorations = decorations.add(newState.doc, [draghandleDec]);
-    }
-  }
-
-  // Remove previous drag handle widget and draw new drag handle widget when activeNode changes
-  if (api && meta !== null && meta !== void 0 && meta.activeNode && ((meta === null || meta === void 0 ? void 0 : meta.activeNode.pos) !== (activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos) && (meta === null || meta === void 0 ? void 0 : meta.activeNode.anchorName) !== (activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName) || meta !== null && meta !== void 0 && (_meta$activeNode$hand2 = meta.activeNode.handleOptions) !== null && _meta$activeNode$hand2 !== void 0 && _meta$activeNode$hand2.isFocused)) {
-    var _oldHandle3 = decorations.find(undefined, undefined, function (spec) {
-      return spec.type === 'drag-handle';
-    });
-    decorations = decorations.remove(_oldHandle3);
-    var decs = dragHandleDecoration(api, formatMessage, meta.activeNode.pos, meta.activeNode.anchorName, meta.activeNode.nodeType, nodeViewPortalProviderAPI, meta.activeNode.handleOptions);
-    decorations = decorations.add(newState.doc, [decs]);
-  }
-  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing) {
-    // Remove drop target decoration when dragging stops
-    var dropTargetDecs = decorations.find(undefined, undefined, function (spec) {
-      return spec.type === 'drop-target-decoration';
-    });
-    decorations = decorations.remove(dropTargetDecs);
-  }
-
-  // Map active node position when the document changes
-  var mappedActiveNodePos = tr.docChanged && activeNode ? {
-    pos: tr.mapping.map(activeNode.pos),
-    anchorName: activeNode.anchorName,
-    nodeType: activeNode.nodeType
-  } : activeNode;
-  var shouldCreateDropTargets = (meta === null || meta === void 0 ? void 0 : meta.isDragging) || isDropTargetsMissing;
-  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 (shouldCreateDropTargets) {
-      var _meta$activeNode7;
-      var _decs = dropTargetDecorations(newState, api, formatMessage, nodeViewPortalProviderAPI, isNestedEnabled ? (_meta$activeNode7 = meta === null || meta === void 0 ? void 0 : meta.activeNode) !== null && _meta$activeNode7 !== void 0 ? _meta$activeNode7 : mappedActiveNodePos : meta === null || meta === void 0 ? void 0 : meta.activeNode, anchorRectCache);
-      decorations = decorations.add(newState.doc, _decs);
-    }
-  }
-  var isEmptyDoc = isNestedEnabled ? newState.doc.childCount === 1 && newState.doc.nodeSize <= 4 && (newState.doc.firstChild === null || newState.doc.firstChild.nodeSize <= 2) : newState.doc.childCount === 1 && newState.doc.nodeSize <= 4;
-  if (isEmptyDoc) {
-    var hasNodeDecoration = !!decorations.find(undefined, undefined, function (spec) {
-      return spec.type === 'node-decoration';
-    }).length;
-    if (!hasNodeDecoration) {
-      decorations = decorations.add(newState.doc, [emptyParagraphNodeDecorations()]);
-    }
-  }
-  var newActiveNode = isEmptyDoc || !(meta !== null && meta !== void 0 && meta.activeNode) && decorations.find(undefined, undefined, function (spec) {
-    return spec.type === 'drag-handle';
-  }).length === 0 ? null : (_meta$activeNode8 = meta === null || meta === void 0 ? void 0 : meta.activeNode) !== null && _meta$activeNode8 !== void 0 ? _meta$activeNode8 : mappedActiveNodePos;
-  return {
-    decorations: decorations,
-    activeNode: newActiveNode,
-    isDragging: (_meta$isDragging4 = meta === null || meta === void 0 ? void 0 : meta.isDragging) !== null && _meta$isDragging4 !== void 0 ? _meta$isDragging4 : isDragging,
-    isMenuOpen: meta !== null && meta !== void 0 && meta.toggleMenu ? !isMenuOpen : isMenuOpen,
-    editorHeight: (_meta$editorHeight2 = meta === null || meta === void 0 ? void 0 : meta.editorHeight) !== null && _meta$editorHeight2 !== void 0 ? _meta$editorHeight2 : currentState.editorHeight,
-    editorWidthLeft: (_meta$editorWidthLeft2 = meta === null || meta === void 0 ? void 0 : meta.editorWidthLeft) !== null && _meta$editorWidthLeft2 !== void 0 ? _meta$editorWidthLeft2 : currentState.editorWidthLeft,
-    editorWidthRight: (_meta$editorWidthRigh2 = meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== null && _meta$editorWidthRigh2 !== void 0 ? _meta$editorWidthRigh2 : currentState.editorWidthRight,
-    isResizerResizing: isResizerResizing,
-    isDocSizeLimitEnabled: initialState.isDocSizeLimitEnabled,
-    isPMDragging: (_meta$isPMDragging2 = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging2 !== void 0 ? _meta$isPMDragging2 : isPMDragging,
-    lastDragCancelled: (_meta$lastDragCancell2 = meta === null || meta === void 0 ? void 0 : meta.lastDragCancelled) !== null && _meta$lastDragCancell2 !== void 0 ? _meta$lastDragCancell2 : lastDragCancelled
-  };
-};
+export { _apply as apply };
 export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProviderAPI) {
   var _getIntl = getIntl(),
     formatMessage = _getIntl.formatMessage;
-  var isNestedEnabled = editorExperiment('nested-dnd', true, {
-    exposure: true
-  });
   var isAdvancedLayoutEnabled = editorExperiment('advanced_layouts', true, {
     exposure: true
   });
@@ -598,7 +430,6 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
     exposure: true
   });
   var flags = {
-    isNestedEnabled: isNestedEnabled,
     isMultiSelectEnabled: isMultiSelectEnabled
   };
   var anchorRectCache;
@@ -611,11 +442,8 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
       init: function init() {
         return initialState;
       },
-      apply: function apply(tr, currentState, oldState, newState) {
-        if (isNestedEnabled) {
-          return newApply(api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache);
-        }
-        return oldApply(api, formatMessage, tr, currentState, oldState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache);
+      apply: function apply(tr, currentState, _, newState) {
+        return _apply(api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache);
       }
     },
     props: {

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

@@ -509,14 +509,11 @@ export var DragHandle = function DragHandle(_ref) {
   }, [anchorName, api, getPos, isMultiSelect, nodeType, start, view]);
   var macroInteractionUpdates = featureFlagsState === null || featureFlagsState === void 0 ? void 0 : featureFlagsState.macroInteractionUpdates;
   var calculatePosition = useCallback(function () {
-    var parentNodeType;
-    if (editorExperiment('nested-dnd', true)) {
-      var pos = getPos();
-      var $pos = pos && view.state.doc.resolve(pos);
-      var parentPos = $pos && $pos.depth ? $pos.before() : undefined;
-      var node = parentPos !== undefined ? view.state.doc.nodeAt(parentPos) : undefined;
-      parentNodeType = node === null || node === void 0 ? void 0 : node.type.name;
-    }
+    var pos = getPos();
+    var $pos = pos && view.state.doc.resolve(pos);
+    var parentPos = $pos && $pos.depth ? $pos.before() : undefined;
+    var node = parentPos !== undefined ? view.state.doc.nodeAt(parentPos) : undefined;
+    var parentNodeType = node === null || node === void 0 ? void 0 : node.type.name;
     var supportsAnchor = CSS.supports('top', "anchor(".concat(anchorName, " start)")) && CSS.supports('left', "anchor(".concat(anchorName, " start)"));
     var safeAnchorName = editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_2') ? refreshAnchorName({
       getPos: getPos,
@@ -641,7 +638,7 @@ export var DragHandle = function DragHandle(_ref) {
     keymap: dragToMoveDown
   }];
   var isParentNodeOfTypeLayout;
-  if (!isTopLevelNode && editorExperiment('nested-dnd', true)) {
+  if (!isTopLevelNode) {
     var pos = getPos();
     if (typeof pos === 'number') {
       var _$pos$parent;