@atlaskit/editor-plugin-block-controls 2.21.6 → 2.21.8

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.21.8
+
+### Patch Changes
+
+- [#107795](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/107795)
+  [`ccf90a27dfe6b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ccf90a27dfe6b) -
+  ED-26407 Cleaned-up FG platform_editor_element_drag_and_drop_ed_24321
+- Updated dependencies
+
+## 2.21.7
+
+### Patch Changes
+
+- [#105486](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/105486)
+  [`ed00542ef3156`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ed00542ef3156) -
+  Validate all the nodes in the selection instead of just the handle node
+
 ## 2.21.6
 
 ### Patch Changes

package/dist/cjs/editor-commands/show-drag-handle.js

@@ -52,7 +52,7 @@ var showDragHandleAtSelection = exports.showDragHandleAtSelection = function sho
     var rootPos = $from.before(1);
     var dom = view === null || view === void 0 ? void 0 : view.domAtPos(rootPos, 0);
     var nodeElement = dom === null || dom === void 0 ? void 0 : dom.node.childNodes[dom === null || dom === void 0 ? void 0 : dom.offset];
-    var rootNode = nodeElement && !nodeElement.hasAttribute('data-drag-handler-anchor-name') && (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24321') ? nodeElement.querySelector('[data-drag-handler-anchor-name]') : nodeElement;
+    var rootNode = nodeElement && !nodeElement.hasAttribute('data-drag-handler-anchor-name') ? nodeElement.querySelector('[data-drag-handler-anchor-name]') : nodeElement;
     if (rootNode) {
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

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

@@ -165,6 +165,9 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
   var activeNodePos = activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos;
   var $activeNodePos = typeof activeNodePos === 'number' && newState.doc.resolve(activeNodePos);
   var activePMNode = $activeNodePos && $activeNodePos.nodeAfter;
+  var isMultiSelect = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true, {
+    exposure: true
+  });
   anchorRectCache === null || anchorRectCache === void 0 || anchorRectCache.clear();
   var prevNodeStack = [];
   var popNodeStack = function popNodeStack(depth) {
@@ -211,12 +214,36 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
         pushNodeStack(node, depth);
         return shouldDescend(node); //skip over, don't consider it a valid depth
       }
-      var canDrop = activePMNode && (0, _validation.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
+      // When multi select is on, validate all the nodes in the selection instead of just the handle node
+      if (isMultiSelect) {
+        var selection = newState.selection;
+        var selectionFrom = selection.$from.pos;
+        var selectionTo = selection.$to.pos;
+        var handleInsideSelection = activeNodePos !== undefined && activeNodePos >= selectionFrom - 1 && activeNodePos <= selectionTo;
+        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 = (0, _validation.canMoveSliceToIndex)(selectionSlice, selectionFrom, newState.doc, parent, index, $pos);
+        } else {
+          canDropSingleNode = !!(activePMNode && (0, _validation.canMoveNodeToIndex)(parent, index, activePMNode, $pos, node));
+        }
+        if (!canDropMultipleNodes || !canDropSingleNode) {
+          pushNodeStack(node, depth);
+          return false; //not valid pos, so nested not valid either
+        }
+      } else {
+        var canDrop = activePMNode && (0, _validation.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 && !(0, _utils.isEmptyParagraph)(node) && PARENT_WITH_END_DROP_TARGET.includes(parent.type.name)) {
         endPos = pos + node.nodeSize;

package/dist/cjs/pm-plugins/utils/validation.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.canMoveNodeToIndex = canMoveNodeToIndex;
+exports.canMoveSliceToIndex = canMoveSliceToIndex;
 exports.transformSliceExpandToNestedExpand = exports.transformExpandToNestedExpand = exports.memoizedTransformExpandToNestedExpand = exports.isNestedExpand = exports.isLayoutColumn = exports.isInsideTable = exports.isInSameLayout = exports.isExpand = exports.isDoc = void 0;
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _nesting = require("@atlaskit/editor-common/nesting");
@@ -126,4 +127,31 @@ function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, $destNodePos,
     srcNodeType = srcNodeType.schema.nodes.expand;
   }
   return destParent.canReplaceWith(indexIntoParent, indexIntoParent, srcNodeType);
+}
+function canMoveSliceToIndex(slice, sliceFromPos, doc, destParent, indexIntoParent, $destNodePos, destNode) {
+  var canMoveNodes = true;
+  var nodesPos = [];
+  for (var i = 0; i < slice.content.childCount; i++) {
+    var node = slice.content.maybeChild(i);
+    if (i === 0) {
+      nodesPos[i] = sliceFromPos;
+    } else {
+      var _slice$content$maybeC;
+      nodesPos[i] = nodesPos[i - 1] + (((_slice$content$maybeC = slice.content.maybeChild(i - 1)) === null || _slice$content$maybeC === void 0 ? void 0 : _slice$content$maybeC.nodeSize) || 0);
+    }
+    if (node && node.isInline) {
+      // If the node is an inline node, we need to find the parent node
+      // as passing in them into canMoveNodeToIndex will return false
+      var $nodePos = doc.resolve(nodesPos[i]);
+      var parentNode = $nodePos.parent;
+      if (!parentNode || parentNode && !canMoveNodeToIndex(destParent, indexIntoParent, parentNode, $destNodePos, destNode)) {
+        canMoveNodes = false;
+        break;
+      }
+    } else if (node && !canMoveNodeToIndex(destParent, indexIntoParent, node, $destNodePos, destNode)) {
+      canMoveNodes = false;
+      break;
+    }
+  }
+  return canMoveNodes;
 }

package/dist/es2019/editor-commands/show-drag-handle.js

@@ -48,7 +48,7 @@ export const showDragHandleAtSelection = (api, shouldFocusParentNode) => (state,
   const rootPos = $from.before(1);
   const dom = view === null || view === void 0 ? void 0 : view.domAtPos(rootPos, 0);
   const nodeElement = dom === null || dom === void 0 ? void 0 : dom.node.childNodes[dom === null || dom === void 0 ? void 0 : dom.offset];
-  const rootNode = nodeElement && !nodeElement.hasAttribute('data-drag-handler-anchor-name') && fg('platform_editor_element_drag_and_drop_ed_24321') ? nodeElement.querySelector('[data-drag-handler-anchor-name]') : nodeElement;
+  const rootNode = nodeElement && !nodeElement.hasAttribute('data-drag-handler-anchor-name') ? nodeElement.querySelector('[data-drag-handler-anchor-name]') : nodeElement;
   if (rootNode) {
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

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

@@ -10,7 +10,7 @@ import { DropTarget, EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP, EDITOR_BLOCK_CONT
 import { DropTargetLayout } from '../ui/drop-target-layout';
 import { getNestedDepth, TYPE_DROP_TARGET_DEC, unmountDecorations } from './decorations-common';
 import { maxLayoutColumnSupported } from './utils/consts';
-import { canMoveNodeToIndex, isInSameLayout } from './utils/validation';
+import { canMoveNodeToIndex, canMoveSliceToIndex, isInSameLayout } from './utils/validation';
 const IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn', 'listItem', 'caption'];
 const PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand', 'bodiedExtension'];
 const DISABLE_CHILD_DROP_TARGET = ['orderedList', 'bulletList'];
@@ -154,6 +154,9 @@ export const dropTargetDecorations = (newState, api, formatMessage, nodeViewPort
   const activeNodePos = activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos;
   const $activeNodePos = typeof activeNodePos === 'number' && newState.doc.resolve(activeNodePos);
   const activePMNode = $activeNodePos && $activeNodePos.nodeAfter;
+  const isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true, {
+    exposure: true
+  });
   anchorRectCache === null || anchorRectCache === void 0 ? void 0 : anchorRectCache.clear();
   const prevNodeStack = [];
   const popNodeStack = depth => {
@@ -200,12 +203,36 @@ export const dropTargetDecorations = (newState, api, formatMessage, nodeViewPort
         pushNodeStack(node, depth);
         return shouldDescend(node); //skip over, don't consider it a valid depth
       }
-      const 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
+      // When multi select is on, validate all the nodes in the selection instead of just the handle node
+      if (isMultiSelect) {
+        const selection = newState.selection;
+        const selectionFrom = selection.$from.pos;
+        const selectionTo = selection.$to.pos;
+        const handleInsideSelection = activeNodePos !== undefined && activeNodePos >= selectionFrom - 1 && activeNodePos <= selectionTo;
+        const selectionSlice = newState.doc.slice(selectionFrom, selectionTo, false);
+        const selectionSliceChildCount = selectionSlice.content.childCount;
+        let canDropSingleNode = true;
+        let 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, newState.doc, 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
+        }
+      } else {
+        const 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;

package/dist/es2019/pm-plugins/utils/validation.js

@@ -120,4 +120,31 @@ export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, $destNo
     srcNodeType = srcNodeType.schema.nodes.expand;
   }
   return destParent.canReplaceWith(indexIntoParent, indexIntoParent, srcNodeType);
+}
+export function canMoveSliceToIndex(slice, sliceFromPos, doc, destParent, indexIntoParent, $destNodePos, destNode) {
+  let canMoveNodes = true;
+  const nodesPos = [];
+  for (let i = 0; i < slice.content.childCount; i++) {
+    const node = slice.content.maybeChild(i);
+    if (i === 0) {
+      nodesPos[i] = sliceFromPos;
+    } else {
+      var _slice$content$maybeC;
+      nodesPos[i] = nodesPos[i - 1] + (((_slice$content$maybeC = slice.content.maybeChild(i - 1)) === null || _slice$content$maybeC === void 0 ? void 0 : _slice$content$maybeC.nodeSize) || 0);
+    }
+    if (node && node.isInline) {
+      // If the node is an inline node, we need to find the parent node
+      // as passing in them into canMoveNodeToIndex will return false
+      const $nodePos = doc.resolve(nodesPos[i]);
+      const parentNode = $nodePos.parent;
+      if (!parentNode || parentNode && !canMoveNodeToIndex(destParent, indexIntoParent, parentNode, $destNodePos, destNode)) {
+        canMoveNodes = false;
+        break;
+      }
+    } else if (node && !canMoveNodeToIndex(destParent, indexIntoParent, node, $destNodePos, destNode)) {
+      canMoveNodes = false;
+      break;
+    }
+  }
+  return canMoveNodes;
 }

package/dist/esm/editor-commands/show-drag-handle.js

@@ -46,7 +46,7 @@ export var showDragHandleAtSelection = function showDragHandleAtSelection(api, s
     var rootPos = $from.before(1);
     var dom = view === null || view === void 0 ? void 0 : view.domAtPos(rootPos, 0);
     var nodeElement = dom === null || dom === void 0 ? void 0 : dom.node.childNodes[dom === null || dom === void 0 ? void 0 : dom.offset];
-    var rootNode = nodeElement && !nodeElement.hasAttribute('data-drag-handler-anchor-name') && fg('platform_editor_element_drag_and_drop_ed_24321') ? nodeElement.querySelector('[data-drag-handler-anchor-name]') : nodeElement;
+    var rootNode = nodeElement && !nodeElement.hasAttribute('data-drag-handler-anchor-name') ? nodeElement.querySelector('[data-drag-handler-anchor-name]') : nodeElement;
     if (rootNode) {
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

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

@@ -13,7 +13,7 @@ import { DropTarget, EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP, EDITOR_BLOCK_CONT
 import { DropTargetLayout } from '../ui/drop-target-layout';
 import { getNestedDepth, TYPE_DROP_TARGET_DEC, unmountDecorations } from './decorations-common';
 import { maxLayoutColumnSupported } from './utils/consts';
-import { canMoveNodeToIndex, isInSameLayout } from './utils/validation';
+import { canMoveNodeToIndex, canMoveSliceToIndex, isInSameLayout } from './utils/validation';
 var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'layoutColumn', 'listItem', 'caption'];
 var PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand', 'bodiedExtension'];
 var DISABLE_CHILD_DROP_TARGET = ['orderedList', 'bulletList'];
@@ -158,6 +158,9 @@ export var dropTargetDecorations = function dropTargetDecorations(newState, api,
   var activeNodePos = activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos;
   var $activeNodePos = typeof activeNodePos === 'number' && newState.doc.resolve(activeNodePos);
   var activePMNode = $activeNodePos && $activeNodePos.nodeAfter;
+  var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true, {
+    exposure: true
+  });
   anchorRectCache === null || anchorRectCache === void 0 || anchorRectCache.clear();
   var prevNodeStack = [];
   var popNodeStack = function popNodeStack(depth) {
@@ -204,12 +207,36 @@ export var dropTargetDecorations = function dropTargetDecorations(newState, api,
         pushNodeStack(node, depth);
         return shouldDescend(node); //skip over, don't consider it a valid depth
       }
-      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
+      // When multi select is on, validate all the nodes in the selection instead of just the handle node
+      if (isMultiSelect) {
+        var selection = newState.selection;
+        var selectionFrom = selection.$from.pos;
+        var selectionTo = selection.$to.pos;
+        var handleInsideSelection = activeNodePos !== undefined && activeNodePos >= selectionFrom - 1 && activeNodePos <= selectionTo;
+        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, newState.doc, 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
+        }
+      } 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;

package/dist/esm/pm-plugins/utils/validation.js

@@ -118,4 +118,31 @@ export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, $destNo
     srcNodeType = srcNodeType.schema.nodes.expand;
   }
   return destParent.canReplaceWith(indexIntoParent, indexIntoParent, srcNodeType);
+}
+export function canMoveSliceToIndex(slice, sliceFromPos, doc, destParent, indexIntoParent, $destNodePos, destNode) {
+  var canMoveNodes = true;
+  var nodesPos = [];
+  for (var i = 0; i < slice.content.childCount; i++) {
+    var node = slice.content.maybeChild(i);
+    if (i === 0) {
+      nodesPos[i] = sliceFromPos;
+    } else {
+      var _slice$content$maybeC;
+      nodesPos[i] = nodesPos[i - 1] + (((_slice$content$maybeC = slice.content.maybeChild(i - 1)) === null || _slice$content$maybeC === void 0 ? void 0 : _slice$content$maybeC.nodeSize) || 0);
+    }
+    if (node && node.isInline) {
+      // If the node is an inline node, we need to find the parent node
+      // as passing in them into canMoveNodeToIndex will return false
+      var $nodePos = doc.resolve(nodesPos[i]);
+      var parentNode = $nodePos.parent;
+      if (!parentNode || parentNode && !canMoveNodeToIndex(destParent, indexIntoParent, parentNode, $destNodePos, destNode)) {
+        canMoveNodes = false;
+        break;
+      }
+    } else if (node && !canMoveNodeToIndex(destParent, indexIntoParent, node, $destNodePos, destNode)) {
+      canMoveNodes = false;
+      break;
+    }
+  }
+  return canMoveNodes;
 }

package/dist/types/pm-plugins/utils/validation.d.ts

@@ -17,3 +17,4 @@ export declare const transformExpandToNestedExpand: (expandNode: PMNode) => PMNo
 export declare const transformSliceExpandToNestedExpand: (slice: Slice) => Slice | null;
 export declare const memoizedTransformExpandToNestedExpand: import("memoize-one").MemoizedFn<(node: PMNode) => PMNode | null>;
 export declare function canMoveNodeToIndex(destParent: PMNode, indexIntoParent: number, srcNode: PMNode, $destNodePos: ResolvedPos, destNode?: PMNode): boolean;
+export declare function canMoveSliceToIndex(slice: Slice, sliceFromPos: number, doc: PMNode, destParent: PMNode, indexIntoParent: number, $destNodePos: ResolvedPos, destNode?: PMNode): boolean;

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

@@ -17,3 +17,4 @@ export declare const transformExpandToNestedExpand: (expandNode: PMNode) => PMNo
 export declare const transformSliceExpandToNestedExpand: (slice: Slice) => Slice | null;
 export declare const memoizedTransformExpandToNestedExpand: import("memoize-one").MemoizedFn<(node: PMNode) => PMNode | null>;
 export declare function canMoveNodeToIndex(destParent: PMNode, indexIntoParent: number, srcNode: PMNode, $destNodePos: ResolvedPos, destNode?: PMNode): boolean;
+export declare function canMoveSliceToIndex(slice: Slice, sliceFromPos: number, doc: PMNode, destParent: PMNode, indexIntoParent: number, $destNodePos: ResolvedPos, destNode?: PMNode): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.21.6",
+	"version": "2.21.8",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,26 +31,26 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^99.5.0",
-		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
+		"@atlaskit/editor-common": "^99.7.0",
+		"@atlaskit/editor-plugin-accessibility-utils": "^1.3.0",
 		"@atlaskit/editor-plugin-analytics": "^1.11.0",
-		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
+		"@atlaskit/editor-plugin-editor-disabled": "^1.4.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
-		"@atlaskit/editor-plugin-quick-insert": "^1.8.0",
+		"@atlaskit/editor-plugin-quick-insert": "^1.9.0",
 		"@atlaskit/editor-plugin-width": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^23.4.0",
+		"@atlaskit/icon": "^23.5.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/pragmatic-drag-and-drop": "^1.4.0",
+		"@atlaskit/pragmatic-drag-and-drop": "^1.5.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
-		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
-		"@atlaskit/primitives": "^13.3.0",
-		"@atlaskit/theme": "^14.0.0",
+		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.2.0",
+		"@atlaskit/primitives": "^13.4.0",
+		"@atlaskit/theme": "^14.1.0",
 		"@atlaskit/tmp-editor-statsig": "^2.41.0",
-		"@atlaskit/tokens": "^3.2.0",
-		"@atlaskit/tooltip": "^19.0.0",
+		"@atlaskit/tokens": "^3.3.0",
+		"@atlaskit/tooltip": "^19.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"bind-event-listener": "^3.0.0",
@@ -112,9 +112,6 @@
 		"platform_editor_element_drag_and_drop_ed_23873": {
 			"type": "boolean"
 		},
-		"platform_editor_element_drag_and_drop_ed_24321": {
-			"type": "boolean"
-		},
 		"platform_editor_element_dnd_nested_fix_patch_6": {
 			"type": "boolean"
 		},