@atlaskit/editor-plugin-block-controls 2.17.4 → 2.18.1

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.18.1
+
+### Patch Changes
+
+- [#100915](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/100915)
+  [`8c10232e0f242`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8c10232e0f242) -
+  ED-24615 Fixed expand not remembering expand state when a node is moved into it
+
+## 2.18.0
+
+### Minor Changes
+
+- [#102069](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102069)
+  [`3d4c9e1a85d9c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3d4c9e1a85d9c) -
+  Clean up platform_editor_dnd_input_performance_optimisation experiment
+
+### Patch Changes
+
+- [#101814](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/101814)
+  [`d8fc81718b517`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d8fc81718b517) -
+  [ED-26177] Remove code reference for FG platform_editor_element_dnd_nested_type_error_fix
+- Updated dependencies
+
 ## 2.17.4
 
 ### Patch Changes

package/dist/cjs/editor-commands/move-node.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.moveNodeViaShortcut = exports.moveNode = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _expand = require("@atlaskit/editor-common/expand");
 var _messages = require("@atlaskit/editor-common/messages");
 var _selection = require("@atlaskit/editor-common/selection");
 var _transforms = require("@atlaskit/editor-common/transforms");
@@ -171,13 +172,16 @@ var moveNode = exports.moveNode = function moveNode(api) {
       if (!node) {
         return tr;
       }
+      var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
+        expand = _tr$doc$type$schema$n.expand,
+        nestedExpand = _tr$doc$type$schema$n.nestedExpand;
       var size = (_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 1;
       var end = start + size;
       var $from = tr.doc.resolve(start);
+      var $to = tr.doc.resolve(to);
       var mappedTo;
       if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
         var nodeCopy = tr.doc.slice(start, end, false); // cut the content
-        var $to = tr.doc.resolve(to);
         var destType = $to.node().type;
         var destParent = $to.node($to.depth);
         var sourceNode = $from.nodeAfter;
@@ -221,6 +225,14 @@ var moveNode = exports.moveNode = function moveNode(api) {
       });
       api === null || api === void 0 || api.core.actions.focus();
       var $mappedTo = tr.doc.resolve(mappedTo);
+      var expandAncestor = (0, _utils2.findParentNodeOfTypeClosestToPos)($to, [expand, nestedExpand]);
+      if (expandAncestor && (0, _experiments.editorExperiment)('nested-dnd', true) && (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_6')) {
+        var wasExpandExpanded = _expand.expandedState.get(expandAncestor.node);
+        var updatedExpandAncestor = (0, _utils2.findParentNodeOfTypeClosestToPos)($mappedTo, [expand, nestedExpand]);
+        if (wasExpandExpanded !== undefined && updatedExpandAncestor) {
+          _expand.expandedState.set(updatedExpandAncestor.node, wasExpandExpanded);
+        }
+      }
       if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
         (0, _fireAnalytics.attachMoveNodeAnalytics)(tr, inputMethod, resolvedNode.depth, node.type.name, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name, $from.sameParent($mappedTo), api);
       } else {

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

@@ -256,7 +256,7 @@ var oldApply = exports.oldApply = function oldApply(api, formatMessage, tr, curr
 // Ignored via go/ees005
 // eslint-disable-next-line @typescript-eslint/max-params
 ) {
-  var _meta$activeNode2, _meta$activeNode$hand2, _activeNodeWithNewNod, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2;
+  var _meta$activeNode2, _meta$activeNode$hand2, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2;
   var isNestedEnabled = flags.isNestedEnabled;
   var activeNode = currentState.activeNode,
     isMenuOpen = currentState.isMenuOpen,
@@ -273,10 +273,6 @@ var oldApply = exports.oldApply = function oldApply(api, formatMessage, tr, curr
     decorations = decorations.map(tr.mapping, tr.doc);
   }
   var meta = tr.getMeta(key);
-  var isPerformanceFix = isNestedEnabled || (0, _experiments.editorExperiment)('dnd-input-performance-optimisation', true, {
-    exposure: true
-  });
-  var activeNodeWithNewNodeType = null;
 
   // If tables or media are being resized, we want to hide the drag handle
   var resizerMeta = tr.getMeta('is-resizer-resizing');
@@ -339,6 +335,7 @@ var oldApply = exports.oldApply = function oldApply(api, formatMessage, tr, curr
     var newNodeDecs = (0, _decorationsAnchor.nodeDecorations)(newState);
     decorations = decorations.add(newState.doc, (0, _toConsumableArray2.default)(newNodeDecs));
     if (activeNode && !(meta !== null && meta !== void 0 && meta.nodeMoved) && !isDecsMissing) {
+      var _meta$activeNode$pos, _meta$activeNode3, _ref6, _meta$activeNode$anch, _meta$activeNode4, _decAtPos$spec, _ref7, _meta$activeNode$node, _meta$activeNode5, _decAtPos$spec2, _meta$activeNode6;
       var mappedPosisiton = tr.mapping.map(activeNode.pos);
       var prevMappedPos = oldState.tr.mapping.map(activeNode.pos);
 
@@ -348,33 +345,16 @@ var oldApply = exports.oldApply = function oldApply(api, formatMessage, tr, curr
         mappedPosisiton = prevMappedPos;
       }
       var _newActiveNode = tr.doc.nodeAt(mappedPosisiton);
-      var draghandleDec;
-      if (isPerformanceFix) {
-        var _meta$activeNode$pos, _meta$activeNode3, _ref6, _meta$activeNode$anch, _meta$activeNode4, _decAtPos$spec, _ref7, _meta$activeNode$node, _meta$activeNode5, _decAtPos$spec2, _meta$activeNode6;
-        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;
+      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';
         });
-        draghandleDec = (0, _decorationsDragHandle.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, (_ref6 = (_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 && _ref6 !== void 0 ? _ref6 : activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName, (_ref7 = (_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 && _ref7 !== void 0 ? _ref7 : 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);
-      } else {
-        var nodeType = activeNode.nodeType;
-        var anchorName = activeNode.anchorName;
-        if (_newActiveNode && (_newActiveNode === null || _newActiveNode === void 0 ? void 0 : _newActiveNode.type.name) !== activeNode.nodeType) {
-          nodeType = _newActiveNode.type.name;
-          anchorName = activeNode.anchorName.replace(activeNode.nodeType, nodeType);
-          activeNodeWithNewNodeType = {
-            pos: prevMappedPos,
-            nodeType: nodeType,
-            anchorName: anchorName
-          };
-        }
-        draghandleDec = (0, _decorationsDragHandle.dragHandleDecoration)(api, formatMessage, activeNode.pos, anchorName, nodeType, nodeViewPortalProviderAPI);
+        decorations = decorations.remove(_oldHandle2);
       }
+      var decAtPos = newNodeDecs.find(function (dec) {
+        return dec.from === mappedPosisiton;
+      });
+      var draghandleDec = (0, _decorationsDragHandle.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, (_ref6 = (_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 && _ref6 !== void 0 ? _ref6 : activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName, (_ref7 = (_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 && _ref7 !== void 0 ? _ref7 : 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]);
     }
   }
@@ -388,16 +368,6 @@ var oldApply = exports.oldApply = function oldApply(api, formatMessage, tr, curr
     var decs = (0, _decorationsDragHandle.dragHandleDecoration)(api, formatMessage, meta.activeNode.pos, meta.activeNode.anchorName, meta.activeNode.nodeType, nodeViewPortalProviderAPI, meta.activeNode.handleOptions);
     decorations = decorations.add(newState.doc, [decs]);
   }
-
-  // Remove previous drag handle widget and draw new drag handle widget when node type changes
-  if (!isPerformanceFix && activeNodeWithNewNodeType && ((_activeNodeWithNewNod = activeNodeWithNewNodeType) === null || _activeNodeWithNewNod === void 0 ? void 0 : _activeNodeWithNewNod.nodeType) !== (activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) && api) {
-    var _oldHandle4 = decorations.find(undefined, undefined, function (spec) {
-      return spec.type === 'drag-handle';
-    });
-    decorations = decorations.remove(_oldHandle4);
-    var _decs = (0, _decorationsDragHandle.dragHandleDecoration)(api, formatMessage, activeNodeWithNewNodeType.pos, activeNodeWithNewNodeType.anchorName, activeNodeWithNewNodeType.nodeType, nodeViewPortalProviderAPI);
-    decorations = decorations.add(newState.doc, [_decs]);
-  }
   if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing || (0, _dragTargetDebug.isBlocksDragTargetDebug)()) {
     // Remove drop target decoration when dragging stops
     var dropTargetDecs = decorations.find(undefined, undefined, function (spec) {
@@ -407,7 +377,7 @@ var oldApply = exports.oldApply = function oldApply(api, formatMessage, tr, curr
   }
 
   // Map active node position when the document changes
-  var mappedActiveNodePos = tr.docChanged && activeNode ? !isPerformanceFix && activeNodeWithNewNodeType || {
+  var mappedActiveNodePos = tr.docChanged && activeNode ? {
     pos: tr.mapping.map(activeNode.pos),
     anchorName: activeNode.anchorName,
     nodeType: activeNode.nodeType
@@ -418,8 +388,8 @@ var oldApply = exports.oldApply = function oldApply(api, formatMessage, tr, curr
     // if the transaction is only for analytics and user is dragging, continue to draw drop targets
     if (shouldCreateDropTargets || (0, _dragTargetDebug.isBlocksDragTargetDebug)()) {
       var _meta$activeNode7;
-      var _decs2 = (0, _decorationsDropTarget.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, _decs2);
+      var _decs = (0, _decorationsDropTarget.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;

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

@@ -320,9 +320,6 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     positionStyles = _useState6[0],
     setPositionStyles = _useState6[1];
   (0, _react.useEffect)(function () {
-    if ((0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_type_error_fix')) {
-      return;
-    }
     var cleanUpTransitionListener;
     if (nodeType === 'extension' || nodeType === 'embedCard') {
       var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
@@ -345,32 +342,6 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       (_cleanUpTransitionLis = cleanUpTransitionListener) === null || _cleanUpTransitionLis === void 0 || _cleanUpTransitionLis();
     };
   }, [calculatePosition, view.dom, anchorName, nodeType]);
-  (0, _react.useLayoutEffect)(function () {
-    if (!(0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_type_error_fix')) {
-      return;
-    }
-    var cleanUpTransitionListener;
-    if (nodeType === 'extension' || nodeType === 'embedCard') {
-      var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
-      if (!dom) {
-        return;
-      }
-      cleanUpTransitionListener = (0, _bindEventListener.bind)(dom, {
-        type: 'transitionend',
-        listener: function listener() {
-          setPositionStyles(calculatePosition());
-        }
-      });
-    }
-    var calcPos = requestAnimationFrame(function () {
-      setPositionStyles(calculatePosition());
-    });
-    return function () {
-      var _cleanUpTransitionLis2;
-      cancelAnimationFrame(calcPos);
-      (_cleanUpTransitionLis2 = cleanUpTransitionListener) === null || _cleanUpTransitionLis2 === void 0 || _cleanUpTransitionLis2();
-    };
-  }, [calculatePosition, view.dom, anchorName, nodeType]);
   (0, _react.useEffect)(function () {
     if (handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && buttonRef.current && (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23873')) {
       var id = requestAnimationFrame(function () {

package/dist/es2019/editor-commands/move-node.js

@@ -1,11 +1,12 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { expandedState } from '@atlaskit/editor-common/expand';
 import { blockControlsMessages } from '@atlaskit/editor-common/messages';
 import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/transforms';
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeOfType, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { findTable, isInTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -165,13 +166,17 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
   if (!node) {
     return tr;
   }
+  const {
+    expand,
+    nestedExpand
+  } = tr.doc.type.schema.nodes;
   const size = (_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 1;
   const end = start + size;
   const $from = tr.doc.resolve(start);
+  const $to = tr.doc.resolve(to);
   let mappedTo;
   if (editorExperiment('nested-dnd', true)) {
     const nodeCopy = tr.doc.slice(start, end, false); // cut the content
-    const $to = tr.doc.resolve(to);
     const destType = $to.node().type;
     const destParent = $to.node($to.depth);
     const sourceNode = $from.nodeAfter;
@@ -215,6 +220,14 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
   });
   api === null || api === void 0 ? void 0 : api.core.actions.focus();
   const $mappedTo = tr.doc.resolve(mappedTo);
+  const expandAncestor = findParentNodeOfTypeClosestToPos($to, [expand, nestedExpand]);
+  if (expandAncestor && editorExperiment('nested-dnd', true) && fg('platform_editor_element_dnd_nested_fix_patch_6')) {
+    const wasExpandExpanded = expandedState.get(expandAncestor.node);
+    const updatedExpandAncestor = findParentNodeOfTypeClosestToPos($mappedTo, [expand, nestedExpand]);
+    if (wasExpandExpanded !== undefined && updatedExpandAncestor) {
+      expandedState.set(updatedExpandAncestor.node, wasExpandExpanded);
+    }
+  }
   if (editorExperiment('advanced_layouts', true)) {
     attachMoveNodeAnalytics(tr, inputMethod, resolvedNode.depth, node.type.name, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name, $from.sameParent($mappedTo), api);
   } else {

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

@@ -256,7 +256,7 @@ export const oldApply = (api, formatMessage, tr, currentState, oldState, newStat
 // Ignored via go/ees005
 // eslint-disable-next-line @typescript-eslint/max-params
 ) => {
-  var _meta$activeNode2, _meta$activeNode$hand2, _activeNodeWithNewNod, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2;
+  var _meta$activeNode2, _meta$activeNode$hand2, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2;
   const {
     isNestedEnabled
   } = flags;
@@ -279,10 +279,6 @@ export const oldApply = (api, formatMessage, tr, currentState, oldState, newStat
     decorations = decorations.map(tr.mapping, tr.doc);
   }
   const meta = tr.getMeta(key);
-  const isPerformanceFix = isNestedEnabled || editorExperiment('dnd-input-performance-optimisation', true, {
-    exposure: true
-  });
-  let activeNodeWithNewNodeType = null;
 
   // If tables or media are being resized, we want to hide the drag handle
   const resizerMeta = tr.getMeta('is-resizer-resizing');
@@ -332,6 +328,7 @@ export const oldApply = (api, formatMessage, tr, currentState, oldState, newStat
     const newNodeDecs = nodeDecorations(newState);
     decorations = decorations.add(newState.doc, [...newNodeDecs]);
     if (activeNode && !(meta !== null && meta !== void 0 && meta.nodeMoved) && !isDecsMissing) {
+      var _meta$activeNode$pos, _meta$activeNode3, _ref, _meta$activeNode$anch, _meta$activeNode4, _decAtPos$spec, _ref2, _meta$activeNode$node, _meta$activeNode5, _decAtPos$spec2, _meta$activeNode6;
       let mappedPosisiton = tr.mapping.map(activeNode.pos);
       const prevMappedPos = oldState.tr.mapping.map(activeNode.pos);
 
@@ -341,29 +338,12 @@ export const oldApply = (api, formatMessage, tr, currentState, oldState, newStat
         mappedPosisiton = prevMappedPos;
       }
       const newActiveNode = tr.doc.nodeAt(mappedPosisiton);
-      let draghandleDec;
-      if (isPerformanceFix) {
-        var _meta$activeNode$pos, _meta$activeNode3, _ref, _meta$activeNode$anch, _meta$activeNode4, _decAtPos$spec, _ref2, _meta$activeNode$node, _meta$activeNode5, _decAtPos$spec2, _meta$activeNode6;
-        if (newActiveNode && (newActiveNode === null || newActiveNode === void 0 ? void 0 : newActiveNode.type.name) !== activeNode.nodeType) {
-          const oldHandle = decorations.find(undefined, undefined, spec => spec.type === 'drag-handle');
-          decorations = decorations.remove(oldHandle);
-        }
-        const decAtPos = newNodeDecs.find(dec => dec.from === mappedPosisiton);
-        draghandleDec = dragHandleDecoration(api, formatMessage, (_meta$activeNode$pos = meta === null || meta === void 0 ? 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, (_ref = (_meta$activeNode$anch = meta === null || meta === void 0 ? 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 ? void 0 : (_decAtPos$spec = decAtPos.spec) === null || _decAtPos$spec === void 0 ? void 0 : _decAtPos$spec.anchorName) !== null && _ref !== void 0 ? _ref : activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName, (_ref2 = (_meta$activeNode$node = meta === null || meta === void 0 ? 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 ? void 0 : (_decAtPos$spec2 = decAtPos.spec) === null || _decAtPos$spec2 === void 0 ? void 0 : _decAtPos$spec2.nodeType) !== null && _ref2 !== void 0 ? _ref2 : activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType, nodeViewPortalProviderAPI, meta === null || meta === void 0 ? void 0 : (_meta$activeNode6 = meta.activeNode) === null || _meta$activeNode6 === void 0 ? void 0 : _meta$activeNode6.handleOptions);
-      } else {
-        let nodeType = activeNode.nodeType;
-        let anchorName = activeNode.anchorName;
-        if (newActiveNode && (newActiveNode === null || newActiveNode === void 0 ? void 0 : newActiveNode.type.name) !== activeNode.nodeType) {
-          nodeType = newActiveNode.type.name;
-          anchorName = activeNode.anchorName.replace(activeNode.nodeType, nodeType);
-          activeNodeWithNewNodeType = {
-            pos: prevMappedPos,
-            nodeType,
-            anchorName
-          };
-        }
-        draghandleDec = dragHandleDecoration(api, formatMessage, activeNode.pos, anchorName, nodeType, nodeViewPortalProviderAPI);
+      if (newActiveNode && (newActiveNode === null || newActiveNode === void 0 ? void 0 : newActiveNode.type.name) !== activeNode.nodeType) {
+        const oldHandle = decorations.find(undefined, undefined, spec => spec.type === 'drag-handle');
+        decorations = decorations.remove(oldHandle);
       }
+      const decAtPos = newNodeDecs.find(dec => dec.from === mappedPosisiton);
+      const draghandleDec = dragHandleDecoration(api, formatMessage, (_meta$activeNode$pos = meta === null || meta === void 0 ? 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, (_ref = (_meta$activeNode$anch = meta === null || meta === void 0 ? 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 ? void 0 : (_decAtPos$spec = decAtPos.spec) === null || _decAtPos$spec === void 0 ? void 0 : _decAtPos$spec.anchorName) !== null && _ref !== void 0 ? _ref : activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName, (_ref2 = (_meta$activeNode$node = meta === null || meta === void 0 ? 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 ? void 0 : (_decAtPos$spec2 = decAtPos.spec) === null || _decAtPos$spec2 === void 0 ? void 0 : _decAtPos$spec2.nodeType) !== null && _ref2 !== void 0 ? _ref2 : activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType, nodeViewPortalProviderAPI, meta === null || meta === void 0 ? void 0 : (_meta$activeNode6 = meta.activeNode) === null || _meta$activeNode6 === void 0 ? void 0 : _meta$activeNode6.handleOptions);
       decorations = decorations.add(newState.doc, [draghandleDec]);
     }
   }
@@ -375,14 +355,6 @@ export const oldApply = (api, formatMessage, tr, currentState, oldState, newStat
     const decs = dragHandleDecoration(api, formatMessage, meta.activeNode.pos, meta.activeNode.anchorName, meta.activeNode.nodeType, nodeViewPortalProviderAPI, meta.activeNode.handleOptions);
     decorations = decorations.add(newState.doc, [decs]);
   }
-
-  // Remove previous drag handle widget and draw new drag handle widget when node type changes
-  if (!isPerformanceFix && 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(undefined, undefined, spec => spec.type === 'drag-handle');
-    decorations = decorations.remove(oldHandle);
-    const decs = dragHandleDecoration(api, formatMessage, activeNodeWithNewNodeType.pos, activeNodeWithNewNodeType.anchorName, activeNodeWithNewNodeType.nodeType, nodeViewPortalProviderAPI);
-    decorations = decorations.add(newState.doc, [decs]);
-  }
   if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing || isBlocksDragTargetDebug()) {
     // Remove drop target decoration when dragging stops
     const dropTargetDecs = decorations.find(undefined, undefined, spec => spec.type === 'drop-target-decoration');
@@ -390,7 +362,7 @@ export const oldApply = (api, formatMessage, tr, currentState, oldState, newStat
   }
 
   // Map active node position when the document changes
-  const mappedActiveNodePos = tr.docChanged && activeNode ? !isPerformanceFix && activeNodeWithNewNodeType || {
+  const mappedActiveNodePos = tr.docChanged && activeNode ? {
     pos: tr.mapping.map(activeNode.pos),
     anchorName: activeNode.anchorName,
     nodeType: activeNode.nodeType

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

@@ -2,7 +2,7 @@
  * @jsxRuntime classic
  * @jsx jsx
  */
-import { useCallback, useEffect, useLayoutEffect, 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';
@@ -301,9 +301,6 @@ export const DragHandle = ({
     display: 'none'
   });
   useEffect(() => {
-    if (fg('platform_editor_element_dnd_nested_type_error_fix')) {
-      return;
-    }
     let cleanUpTransitionListener;
     if (nodeType === 'extension' || nodeType === 'embedCard') {
       const dom = view.dom.querySelector(`[data-drag-handler-anchor-name="${anchorName}"]`);
@@ -326,32 +323,6 @@ export const DragHandle = ({
       (_cleanUpTransitionLis = cleanUpTransitionListener) === null || _cleanUpTransitionLis === void 0 ? void 0 : _cleanUpTransitionLis();
     };
   }, [calculatePosition, view.dom, anchorName, nodeType]);
-  useLayoutEffect(() => {
-    if (!fg('platform_editor_element_dnd_nested_type_error_fix')) {
-      return;
-    }
-    let cleanUpTransitionListener;
-    if (nodeType === 'extension' || nodeType === 'embedCard') {
-      const dom = view.dom.querySelector(`[data-drag-handler-anchor-name="${anchorName}"]`);
-      if (!dom) {
-        return;
-      }
-      cleanUpTransitionListener = bind(dom, {
-        type: 'transitionend',
-        listener: () => {
-          setPositionStyles(calculatePosition());
-        }
-      });
-    }
-    const calcPos = requestAnimationFrame(() => {
-      setPositionStyles(calculatePosition());
-    });
-    return () => {
-      var _cleanUpTransitionLis2;
-      cancelAnimationFrame(calcPos);
-      (_cleanUpTransitionLis2 = cleanUpTransitionListener) === null || _cleanUpTransitionLis2 === void 0 ? void 0 : _cleanUpTransitionLis2();
-    };
-  }, [calculatePosition, view.dom, anchorName, nodeType]);
   useEffect(() => {
     if (handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && buttonRef.current && fg('platform_editor_element_drag_and_drop_ed_23873')) {
       const id = requestAnimationFrame(() => {

package/dist/esm/editor-commands/move-node.js

@@ -2,13 +2,14 @@ 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 { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { expandedState } from '@atlaskit/editor-common/expand';
 import { blockControlsMessages } from '@atlaskit/editor-common/messages';
 import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/transforms';
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeOfType, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { findTable, isInTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -165,13 +166,16 @@ export var moveNode = function moveNode(api) {
       if (!node) {
         return tr;
       }
+      var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
+        expand = _tr$doc$type$schema$n.expand,
+        nestedExpand = _tr$doc$type$schema$n.nestedExpand;
       var size = (_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 1;
       var end = start + size;
       var $from = tr.doc.resolve(start);
+      var $to = tr.doc.resolve(to);
       var mappedTo;
       if (editorExperiment('nested-dnd', true)) {
         var nodeCopy = tr.doc.slice(start, end, false); // cut the content
-        var $to = tr.doc.resolve(to);
         var destType = $to.node().type;
         var destParent = $to.node($to.depth);
         var sourceNode = $from.nodeAfter;
@@ -215,6 +219,14 @@ export var moveNode = function moveNode(api) {
       });
       api === null || api === void 0 || api.core.actions.focus();
       var $mappedTo = tr.doc.resolve(mappedTo);
+      var expandAncestor = findParentNodeOfTypeClosestToPos($to, [expand, nestedExpand]);
+      if (expandAncestor && editorExperiment('nested-dnd', true) && fg('platform_editor_element_dnd_nested_fix_patch_6')) {
+        var wasExpandExpanded = expandedState.get(expandAncestor.node);
+        var updatedExpandAncestor = findParentNodeOfTypeClosestToPos($mappedTo, [expand, nestedExpand]);
+        if (wasExpandExpanded !== undefined && updatedExpandAncestor) {
+          expandedState.set(updatedExpandAncestor.node, wasExpandExpanded);
+        }
+      }
       if (editorExperiment('advanced_layouts', true)) {
         attachMoveNodeAnalytics(tr, inputMethod, resolvedNode.depth, node.type.name, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name, $from.sameParent($mappedTo), api);
       } else {

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

@@ -249,7 +249,7 @@ export var oldApply = function oldApply(api, formatMessage, tr, currentState, ol
 // Ignored via go/ees005
 // eslint-disable-next-line @typescript-eslint/max-params
 ) {
-  var _meta$activeNode2, _meta$activeNode$hand2, _activeNodeWithNewNod, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2;
+  var _meta$activeNode2, _meta$activeNode$hand2, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2;
   var isNestedEnabled = flags.isNestedEnabled;
   var activeNode = currentState.activeNode,
     isMenuOpen = currentState.isMenuOpen,
@@ -266,10 +266,6 @@ export var oldApply = function oldApply(api, formatMessage, tr, currentState, ol
     decorations = decorations.map(tr.mapping, tr.doc);
   }
   var meta = tr.getMeta(key);
-  var isPerformanceFix = isNestedEnabled || editorExperiment('dnd-input-performance-optimisation', true, {
-    exposure: true
-  });
-  var activeNodeWithNewNodeType = null;
 
   // If tables or media are being resized, we want to hide the drag handle
   var resizerMeta = tr.getMeta('is-resizer-resizing');
@@ -332,6 +328,7 @@ export var oldApply = function oldApply(api, formatMessage, tr, currentState, ol
     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, _ref6, _meta$activeNode$anch, _meta$activeNode4, _decAtPos$spec, _ref7, _meta$activeNode$node, _meta$activeNode5, _decAtPos$spec2, _meta$activeNode6;
       var mappedPosisiton = tr.mapping.map(activeNode.pos);
       var prevMappedPos = oldState.tr.mapping.map(activeNode.pos);
 
@@ -341,33 +338,16 @@ export var oldApply = function oldApply(api, formatMessage, tr, currentState, ol
         mappedPosisiton = prevMappedPos;
       }
       var _newActiveNode = tr.doc.nodeAt(mappedPosisiton);
-      var draghandleDec;
-      if (isPerformanceFix) {
-        var _meta$activeNode$pos, _meta$activeNode3, _ref6, _meta$activeNode$anch, _meta$activeNode4, _decAtPos$spec, _ref7, _meta$activeNode$node, _meta$activeNode5, _decAtPos$spec2, _meta$activeNode6;
-        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;
+      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';
         });
-        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, (_ref6 = (_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 && _ref6 !== void 0 ? _ref6 : activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName, (_ref7 = (_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 && _ref7 !== void 0 ? _ref7 : 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);
-      } else {
-        var nodeType = activeNode.nodeType;
-        var anchorName = activeNode.anchorName;
-        if (_newActiveNode && (_newActiveNode === null || _newActiveNode === void 0 ? void 0 : _newActiveNode.type.name) !== activeNode.nodeType) {
-          nodeType = _newActiveNode.type.name;
-          anchorName = activeNode.anchorName.replace(activeNode.nodeType, nodeType);
-          activeNodeWithNewNodeType = {
-            pos: prevMappedPos,
-            nodeType: nodeType,
-            anchorName: anchorName
-          };
-        }
-        draghandleDec = dragHandleDecoration(api, formatMessage, activeNode.pos, anchorName, nodeType, nodeViewPortalProviderAPI);
+        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, (_ref6 = (_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 && _ref6 !== void 0 ? _ref6 : activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName, (_ref7 = (_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 && _ref7 !== void 0 ? _ref7 : 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]);
     }
   }
@@ -381,16 +361,6 @@ export var oldApply = function oldApply(api, formatMessage, tr, currentState, ol
     var decs = dragHandleDecoration(api, formatMessage, meta.activeNode.pos, meta.activeNode.anchorName, meta.activeNode.nodeType, nodeViewPortalProviderAPI, meta.activeNode.handleOptions);
     decorations = decorations.add(newState.doc, [decs]);
   }
-
-  // Remove previous drag handle widget and draw new drag handle widget when node type changes
-  if (!isPerformanceFix && activeNodeWithNewNodeType && ((_activeNodeWithNewNod = activeNodeWithNewNodeType) === null || _activeNodeWithNewNod === void 0 ? void 0 : _activeNodeWithNewNod.nodeType) !== (activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) && api) {
-    var _oldHandle4 = decorations.find(undefined, undefined, function (spec) {
-      return spec.type === 'drag-handle';
-    });
-    decorations = decorations.remove(_oldHandle4);
-    var _decs = dragHandleDecoration(api, formatMessage, activeNodeWithNewNodeType.pos, activeNodeWithNewNodeType.anchorName, activeNodeWithNewNodeType.nodeType, nodeViewPortalProviderAPI);
-    decorations = decorations.add(newState.doc, [_decs]);
-  }
   if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing || isBlocksDragTargetDebug()) {
     // Remove drop target decoration when dragging stops
     var dropTargetDecs = decorations.find(undefined, undefined, function (spec) {
@@ -400,7 +370,7 @@ export var oldApply = function oldApply(api, formatMessage, tr, currentState, ol
   }
 
   // Map active node position when the document changes
-  var mappedActiveNodePos = tr.docChanged && activeNode ? !isPerformanceFix && activeNodeWithNewNodeType || {
+  var mappedActiveNodePos = tr.docChanged && activeNode ? {
     pos: tr.mapping.map(activeNode.pos),
     anchorName: activeNode.anchorName,
     nodeType: activeNode.nodeType
@@ -411,8 +381,8 @@ export var oldApply = function oldApply(api, formatMessage, tr, currentState, ol
     // if the transaction is only for analytics and user is dragging, continue to draw drop targets
     if (shouldCreateDropTargets || isBlocksDragTargetDebug()) {
       var _meta$activeNode7;
-      var _decs2 = 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, _decs2);
+      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;

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

@@ -4,7 +4,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
  * @jsxRuntime classic
  * @jsx jsx
  */
-import { useCallback, useEffect, useLayoutEffect, 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';
@@ -311,9 +311,6 @@ export var DragHandle = function DragHandle(_ref) {
     positionStyles = _useState6[0],
     setPositionStyles = _useState6[1];
   useEffect(function () {
-    if (fg('platform_editor_element_dnd_nested_type_error_fix')) {
-      return;
-    }
     var cleanUpTransitionListener;
     if (nodeType === 'extension' || nodeType === 'embedCard') {
       var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
@@ -336,32 +333,6 @@ export var DragHandle = function DragHandle(_ref) {
       (_cleanUpTransitionLis = cleanUpTransitionListener) === null || _cleanUpTransitionLis === void 0 || _cleanUpTransitionLis();
     };
   }, [calculatePosition, view.dom, anchorName, nodeType]);
-  useLayoutEffect(function () {
-    if (!fg('platform_editor_element_dnd_nested_type_error_fix')) {
-      return;
-    }
-    var cleanUpTransitionListener;
-    if (nodeType === 'extension' || nodeType === 'embedCard') {
-      var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
-      if (!dom) {
-        return;
-      }
-      cleanUpTransitionListener = bind(dom, {
-        type: 'transitionend',
-        listener: function listener() {
-          setPositionStyles(calculatePosition());
-        }
-      });
-    }
-    var calcPos = requestAnimationFrame(function () {
-      setPositionStyles(calculatePosition());
-    });
-    return function () {
-      var _cleanUpTransitionLis2;
-      cancelAnimationFrame(calcPos);
-      (_cleanUpTransitionLis2 = cleanUpTransitionListener) === null || _cleanUpTransitionLis2 === void 0 || _cleanUpTransitionLis2();
-    };
-  }, [calculatePosition, view.dom, anchorName, nodeType]);
   useEffect(function () {
     if (handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && buttonRef.current && fg('platform_editor_element_drag_and_drop_ed_23873')) {
       var id = requestAnimationFrame(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.17.4",
+	"version": "2.18.1",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^98.2.0",
+		"@atlaskit/editor-common": "^99.0.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -49,7 +49,7 @@
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/theme": "^14.0.0",
 		"@atlaskit/tmp-editor-statsig": "^2.33.0",
-		"@atlaskit/tokens": "^2.5.0",
+		"@atlaskit/tokens": "^3.0.0",
 		"@atlaskit/tooltip": "^19.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -124,7 +124,7 @@
 		"platform_editor_element_dnd_nested_fix_patch_3": {
 			"type": "boolean"
 		},
-		"platform_editor_element_dnd_nested_type_error_fix": {
+		"platform_editor_element_dnd_nested_fix_patch_6": {
 			"type": "boolean"
 		},
 		"platform_editor_element_dnd_nested_a11y": {