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

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;

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

@@ -205,7 +205,7 @@ export var DropTarget = function DropTarget(props) {
   };
   var dynamicStyle = _defineProperty(_defineProperty(_defineProperty({
     width: isNestedDropTarget ? 'unset' : '100%'
-  }, EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_WIDTH, isNestedDropTarget ? '100%' : "".concat((widthState === null || widthState === void 0 ? void 0 : widthState.lineLength) || DEFAULT_DROP_INDICATOR_WIDTH, "px")), EDITOR_BLOCK_CONTROLS_DROP_TARGET_LEFT_MARGIN, isNestedDropTarget ? getNestedNodeLeftPaddingMargin(parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) : '0'), EDITOR_BLOCK_CONTROLS_DROP_TARGET_ZINDEX, editorExperiment('nested-dnd', true) ? layers.navigation() : layers.card());
+  }, EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_WIDTH, isNestedDropTarget ? '100%' : "".concat((widthState === null || widthState === void 0 ? void 0 : widthState.lineLength) || DEFAULT_DROP_INDICATOR_WIDTH, "px")), EDITOR_BLOCK_CONTROLS_DROP_TARGET_LEFT_MARGIN, isNestedDropTarget ? getNestedNodeLeftPaddingMargin(parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) : '0'), EDITOR_BLOCK_CONTROLS_DROP_TARGET_ZINDEX, layers.navigation());
   return jsx(Fragment, null, jsx(HoverZone, {
     onDragEnter: function onDragEnter() {
       return setIsDraggedOver(true);

package/dist/esm/ui/global-styles.js

@@ -15,27 +15,6 @@ import { DRAG_HANDLE_MAX_WIDTH_PLUS_GAP, DRAG_HANDLE_WIDTH } from './consts';
  */
 var dragHandlerAnchorSelector = '[data-drag-handler-anchor-name]:not([data-drag-handler-node-type="tableRow"], [data-drag-handler-node-type="media"])';
 var extendedHoverZone = function extendedHoverZone() {
-  return css(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ".block-ctrl-drag-preview ".concat(dragHandlerAnchorSelector, "::after"), {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
-    display: 'none !important'
-  }), '.ProseMirror', _defineProperty({}, "&& ".concat(dragHandlerAnchorSelector, "::after"), {
-    content: '""',
-    position: 'absolute',
-    top: 0,
-    left: '-100%',
-    width: '100%',
-    height: '100%',
-    background: 'transparent',
-    cursor: 'default',
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-    zIndex: -1
-  })), 'hr[data-drag-handler-anchor-name]', {
-    overflow: 'visible'
-  }), '[data-blocks-drag-handle-container="true"] + *::after', {
-    display: 'none'
-  }));
-};
-var extendedHoverZoneNested = function extendedHoverZoneNested() {
   return css(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ".block-ctrl-drag-preview ".concat(dragHandlerAnchorSelector, "::after"), {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
     display: 'none !important'
@@ -177,12 +156,6 @@ var withRelativePosStyle = css({
   })
 });
 var withAnchorNameZindexStyle = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.ProseMirror': _defineProperty({}, "&& ".concat(dragHandlerAnchorSelector), {
-    zIndex: 1
-  })
-});
-var withAnchorNameZindexNestedStyle = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.ProseMirror': {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
@@ -208,6 +181,6 @@ var blockCardWithoutLayout = css({
 });
 export var GlobalStylesWrapper = function GlobalStylesWrapper() {
   return jsx(Global, {
-    styles: [globalStyles(), globalDnDStyle, editorExperiment('nested-dnd', true) ? extendedHoverZoneNested() : extendedHoverZone(), withInlineNodeStyle, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, withRelativePosStyle, topLevelNodeMarginStyles, editorExperiment('nested-dnd', true) ? withAnchorNameZindexNestedStyle : withAnchorNameZindexStyle,,]
+    styles: [globalStyles(), globalDnDStyle, extendedHoverZone(), withInlineNodeStyle, withDeleteLinesStyleFix, withMediaSingleStyleFix, legacyBreakoutWideLayoutStyle, headingWithIndentationInLayoutStyleFix, editorExperiment('advanced_layouts', true) ? blockCardWithoutLayout : undefined, withDividerInPanelStyleFix, withFormatInLayoutStyleFix, withRelativePosStyle, topLevelNodeMarginStyles, withAnchorNameZindexStyle,,]
   });
 };

package/dist/types/pm-plugins/decorations-common.d.ts

@@ -3,7 +3,7 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 export declare const TYPE_DROP_TARGET_DEC = "drop-target-decoration";
 export declare const TYPE_HANDLE_DEC = "drag-handle";
 export declare const TYPE_NODE_DEC = "node-decoration";
-export declare const getNestedDepth: () => 0 | 100;
+export declare const NESTED_DEPTH = 100;
 export declare const getNodeAnchor: (node: PMNode) => string;
 export declare const getNodeTypeWithLevel: (node: PMNode) => string;
 export declare const unmountDecorations: (nodeViewPortalProviderAPI: PortalProviderAPI, selector: string, key: string) => void;

package/dist/types/pm-plugins/main.d.ts

@@ -9,11 +9,10 @@ import type { BlockControlsPlugin, PluginState } from '../blockControlsPluginTyp
 import { AnchorRectCache } from './utils/anchor-utils';
 export declare const key: PluginKey<PluginState>;
 export interface FlagType {
-    isNestedEnabled: boolean;
     isMultiSelectEnabled: boolean;
 }
 export declare const getDecorations: (state: EditorState) => DecorationSet | undefined;
-export declare const newApply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
+export declare const apply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
     decorations: DecorationSet;
     activeNode: any;
     isDragging: any;
@@ -29,17 +28,4 @@ export declare const newApply: (api: ExtractInjectionAPI<BlockControlsPlugin> |
     isShiftDown: any;
     lastDragCancelled: any;
 };
-export declare const oldApply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, oldState: EditorState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
-    decorations: DecorationSet;
-    activeNode: any;
-    isDragging: any;
-    isMenuOpen: boolean | undefined;
-    editorHeight: any;
-    editorWidthLeft: any;
-    editorWidthRight: any;
-    isResizerResizing: boolean;
-    isDocSizeLimitEnabled: boolean | null;
-    isPMDragging: any;
-    lastDragCancelled: any;
-};
 export declare const createPlugin: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, getIntl: () => IntlShape, nodeViewPortalProviderAPI: PortalProviderAPI) => SafePlugin<PluginState>;

package/dist/types-ts4.5/pm-plugins/decorations-common.d.ts

@@ -3,7 +3,7 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 export declare const TYPE_DROP_TARGET_DEC = "drop-target-decoration";
 export declare const TYPE_HANDLE_DEC = "drag-handle";
 export declare const TYPE_NODE_DEC = "node-decoration";
-export declare const getNestedDepth: () => 0 | 100;
+export declare const NESTED_DEPTH = 100;
 export declare const getNodeAnchor: (node: PMNode) => string;
 export declare const getNodeTypeWithLevel: (node: PMNode) => string;
 export declare const unmountDecorations: (nodeViewPortalProviderAPI: PortalProviderAPI, selector: string, key: string) => void;

package/dist/types-ts4.5/pm-plugins/main.d.ts

@@ -9,11 +9,10 @@ import type { BlockControlsPlugin, PluginState } from '../blockControlsPluginTyp
 import { AnchorRectCache } from './utils/anchor-utils';
 export declare const key: PluginKey<PluginState>;
 export interface FlagType {
-    isNestedEnabled: boolean;
     isMultiSelectEnabled: boolean;
 }
 export declare const getDecorations: (state: EditorState) => DecorationSet | undefined;
-export declare const newApply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
+export declare const apply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
     decorations: DecorationSet;
     activeNode: any;
     isDragging: any;
@@ -29,17 +28,4 @@ export declare const newApply: (api: ExtractInjectionAPI<BlockControlsPlugin> |
     isShiftDown: any;
     lastDragCancelled: any;
 };
-export declare const oldApply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, oldState: EditorState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
-    decorations: DecorationSet;
-    activeNode: any;
-    isDragging: any;
-    isMenuOpen: boolean | undefined;
-    editorHeight: any;
-    editorWidthLeft: any;
-    editorWidthRight: any;
-    isResizerResizing: boolean;
-    isDocSizeLimitEnabled: boolean | null;
-    isPMDragging: any;
-    lastDragCancelled: any;
-};
 export declare const createPlugin: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, getIntl: () => IntlShape, nodeViewPortalProviderAPI: PortalProviderAPI) => SafePlugin<PluginState>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.8.4",
+	"version": "3.8.5",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^103.0.0",
+		"@atlaskit/editor-common": "^103.1.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",