@atlaskit/editor-plugin-block-controls 1.5.3 → 1.5.5

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 1.5.5
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.5.4
+
+### Patch Changes
+
+- [#114530](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114530)
+  [`fac9f4b0e5a45`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fac9f4b0e5a45) -
+  [ED-23892] Fix action list duplicates itself when dropping on itself, update how dropping at node
+  itself is detected so it works when mouse move wrapper is removed
+
 ## 1.5.3
 
 ### Patch Changes

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

@@ -294,7 +294,17 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
           // so we only need to check first child
           var draggable = dragging === null || dragging === void 0 ? void 0 : dragging.slice.content.firstChild;
           var activeNode = state.tr.doc.nodeAt(pluginState.activeNode.pos);
-          if (draggable === activeNode) {
+          var isSameNode = draggable === activeNode;
+          if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.elements.drag-and-drop-ed-23892')) {
+            var _event$target;
+            var nodeElement = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.closest('[data-drag-handler-anchor-name]');
+            if (!nodeElement) {
+              return false;
+            }
+            var nodeTarget = state.doc.nodeAt(view.posAtDOM(nodeElement, 0) - 1);
+            isSameNode = !!(nodeTarget && draggable !== null && draggable !== void 0 && draggable.eq(nodeTarget));
+          }
+          if (isSameNode) {
             // Prevent the default drop behavior if the position is within the activeNode
             event.preventDefault();
             return true;

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

@@ -286,7 +286,17 @@ export const createPlugin = api => {
           // so we only need to check first child
           const draggable = dragging === null || dragging === void 0 ? void 0 : dragging.slice.content.firstChild;
           const activeNode = state.tr.doc.nodeAt(pluginState.activeNode.pos);
-          if (draggable === activeNode) {
+          let isSameNode = draggable === activeNode;
+          if (getBooleanFF('platform.editor.elements.drag-and-drop-ed-23892')) {
+            var _event$target;
+            const nodeElement = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.closest('[data-drag-handler-anchor-name]');
+            if (!nodeElement) {
+              return false;
+            }
+            const nodeTarget = state.doc.nodeAt(view.posAtDOM(nodeElement, 0) - 1);
+            isSameNode = !!(nodeTarget && draggable !== null && draggable !== void 0 && draggable.eq(nodeTarget));
+          }
+          if (isSameNode) {
             // Prevent the default drop behavior if the position is within the activeNode
             event.preventDefault();
             return true;

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

@@ -287,7 +287,17 @@ export var createPlugin = function createPlugin(api) {
           // so we only need to check first child
           var draggable = dragging === null || dragging === void 0 ? void 0 : dragging.slice.content.firstChild;
           var activeNode = state.tr.doc.nodeAt(pluginState.activeNode.pos);
-          if (draggable === activeNode) {
+          var isSameNode = draggable === activeNode;
+          if (getBooleanFF('platform.editor.elements.drag-and-drop-ed-23892')) {
+            var _event$target;
+            var nodeElement = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.closest('[data-drag-handler-anchor-name]');
+            if (!nodeElement) {
+              return false;
+            }
+            var nodeTarget = state.doc.nodeAt(view.posAtDOM(nodeElement, 0) - 1);
+            isSameNode = !!(nodeTarget && draggable !== null && draggable !== void 0 && draggable.eq(nodeTarget));
+          }
+          if (isSameNode) {
             // Prevent the default drop behavior if the position is within the activeNode
             event.preventDefault();
             return true;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "1.5.3",
+	"version": "1.5.5",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,7 +41,7 @@
 		"@atlaskit/editor-shared-styles": "^2.12.0",
 		"@atlaskit/editor-tables": "^2.7.0",
 		"@atlaskit/icon": "^22.5.0",
-		"@atlaskit/platform-feature-flags": "^0.2.0",
+		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.3.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
@@ -104,6 +104,9 @@
 		"platform.editor.media.extended-resize-experience": {
 			"type": "boolean",
 			"referenceOnly": true
+		},
+		"platform.editor.elements.drag-and-drop-ed-23892": {
+			"type": "boolean"
 		}
 	}
 }