@atlaskit/editor-plugin-block-controls 8.0.5 → 8.0.6

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 8.0.6
+
+### Patch Changes
+
+- [`52a4db18c2a6a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/52a4db18c2a6a) -
+  EDITOR-4161 Fix drag handle selection collapse in nested scenarios
+- Updated dependencies
+
 ## 8.0.5
 
 ### Patch Changes

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

@@ -463,6 +463,12 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref3) {
       }
     }
   }, [anchorName, nodeType, view.dom]);
+  var handleMouseUp = (0, _react.useCallback)(function (e) {
+    // Stop propagation so that for drag handles in nested scenarios the click is captured
+    // and doesn't propagate to the edge of the element and trigger a node selection
+    // on the parent element
+    e.stopPropagation();
+  }, []);
   var handleOnClickNew = (0, _react.useCallback)(function (e) {
     var _api$core;
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref4) {
@@ -1085,6 +1091,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref3) {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
         ,
         style: !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? (0, _experiments.editorExperiment)('platform_editor_block_control_optimise_render', true) ? positionStyles : positionStylesOld : {},
+        onMouseUp: (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) ? handleMouseUp : undefined,
         onClick: (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) ? handleOnClickNew : handleOnClick,
         onKeyDown: (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) ? handleKeyDownNew : handleKeyDown
         // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop

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

@@ -441,6 +441,12 @@ export const DragHandle = ({
       }
     }
   }, [anchorName, nodeType, view.dom]);
+  const handleMouseUp = useCallback(e => {
+    // Stop propagation so that for drag handles in nested scenarios the click is captured
+    // and doesn't propagate to the edge of the element and trigger a node selection
+    // on the parent element
+    e.stopPropagation();
+  }, []);
   const handleOnClickNew = useCallback(e => {
     var _api$core;
     api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({
@@ -1073,6 +1079,7 @@ export const DragHandle = ({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     ,
     style: !editorExperiment('platform_editor_controls', 'variant1') ? editorExperiment('platform_editor_block_control_optimise_render', true) ? positionStyles : positionStylesOld : {},
+    onMouseUp: expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? handleMouseUp : undefined,
     onClick: expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? handleOnClickNew : handleOnClick,
     onKeyDown: expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? handleKeyDownNew : handleKeyDown
     // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop

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

@@ -460,6 +460,12 @@ export var DragHandle = function DragHandle(_ref3) {
       }
     }
   }, [anchorName, nodeType, view.dom]);
+  var handleMouseUp = useCallback(function (e) {
+    // Stop propagation so that for drag handles in nested scenarios the click is captured
+    // and doesn't propagate to the edge of the element and trigger a node selection
+    // on the parent element
+    e.stopPropagation();
+  }, []);
   var handleOnClickNew = useCallback(function (e) {
     var _api$core;
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref4) {
@@ -1082,6 +1088,7 @@ export var DragHandle = function DragHandle(_ref3) {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
         ,
         style: !editorExperiment('platform_editor_controls', 'variant1') ? editorExperiment('platform_editor_block_control_optimise_render', true) ? positionStyles : positionStylesOld : {},
+        onMouseUp: expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? handleMouseUp : undefined,
         onClick: expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? handleOnClickNew : handleOnClick,
         onKeyDown: expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? handleKeyDownNew : handleKeyDown
         // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "8.0.5",
+	"version": "8.0.6",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",