@atlaskit/editor-plugin-block-controls 1.4.12 → 1.4.14

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 1.4.14
+
+### Patch Changes
+
+- [#109040](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/109040)
+  [`5c5824e70db23`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5c5824e70db23) -
+  ED-23629 Improve performance of mousemoveWrapper hiding on hover
+
+## 1.4.13
+
+### Patch Changes
+
+- [#108531](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/108531)
+  [`bc1dab1f64bd8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bc1dab1f64bd8) -
+  [ux] Don't render decorations when Editor is disabled or in 'view' mode
+- [#110258](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/110258)
+  [`e12a40c7d31ee`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e12a40c7d31ee) -
+  set selection on drag handle mouse down to ensure drag and drop does not use native behaviour
+- Updated dependencies
+
 ## 1.4.12
 
 ### Patch Changes

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

@@ -30,7 +30,6 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
       },
       apply: function apply(tr, currentState, oldState, newState) {
         var _decorationState, _meta$activeNode, _meta$isDragging, _meta$editorHeight;
-        // return currentState;
         var activeNode = currentState.activeNode,
           decorations = currentState.decorations,
           isMenuOpen = currentState.isMenuOpen,
@@ -115,7 +114,11 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
     },
     props: {
       decorations: function decorations(state) {
-        var _key$getState;
+        var _api$editorDisabled, _key$getState;
+        var isDisabled = api === null || api === void 0 || (_api$editorDisabled = api.editorDisabled) === null || _api$editorDisabled === void 0 || (_api$editorDisabled = _api$editorDisabled.sharedState.currentState()) === null || _api$editorDisabled === void 0 ? void 0 : _api$editorDisabled.editorDisabled;
+        if (isDisabled) {
+          return;
+        }
         return (_key$getState = key.getState(state)) === null || _key$getState === void 0 ? void 0 : _key$getState.decorations;
       }
     },

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

@@ -27,10 +27,13 @@ var dragHandleButtonStyles = (0, _react2.css)({
   flexDirection: 'column',
   justifyContent: 'center',
   alignItems: 'center',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
   height: _consts.DRAG_HANDLE_HEIGHT,
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
   width: _consts.DRAG_HANDLE_WIDTH,
   border: 'none',
   background: 'transparent',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
   borderRadius: _consts.DRAG_HANDLE_BORDER_RADIUS,
   color: "var(--ds-icon, #44546F)",
   cursor: 'grab',
@@ -60,7 +63,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     setDragHandleSelected = _useState2[1];
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['featureFlags']),
     featureFlagsState = _useSharedPluginState.featureFlagsState;
-  var handleClick = (0, _react.useCallback)(function () {
+  var handleOnClick = (0, _react.useCallback)(function () {
     var _api$core, _api$core2;
     setDragHandleSelected(!dragHandleSelected);
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref2) {
@@ -76,6 +79,25 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     });
     api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.focus();
   }, [start, api, dragHandleSelected, setDragHandleSelected, nodeType]);
+
+  // handleMouseDown required along with onClick to ensure the correct selection
+  // is set immediately when the drag handle is clicked. Otherwise browser native
+  // drag and drop can take over and cause unpredictable behaviour.
+  var handleMouseDown = (0, _react.useCallback)(function () {
+    var _api$core3, _api$core4;
+    api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref3) {
+      var tr = _ref3.tr;
+      if (start === undefined) {
+        return tr;
+      }
+      tr = (0, _utils.selectNode)(tr, start, nodeType);
+      tr.setMeta(_main.key, {
+        pos: start
+      });
+      return tr;
+    });
+    api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.focus();
+  }, [start, api, nodeType]);
   (0, _react.useEffect)(function () {
     var element = buttonRef.current;
     if (!element) {
@@ -83,11 +105,11 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     }
     return (0, _adapter.draggable)({
       element: element,
-      onGenerateDragPreview: function onGenerateDragPreview(_ref3) {
-        var nativeSetDragImage = _ref3.nativeSetDragImage;
+      onGenerateDragPreview: function onGenerateDragPreview(_ref4) {
+        var nativeSetDragImage = _ref4.nativeSetDragImage;
         (0, _setCustomNativeDragPreview.setCustomNativeDragPreview)({
-          render: function render(_ref4) {
-            var container = _ref4.container;
+          render: function render(_ref5) {
+            var container = _ref5.container;
             var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
             if (!dom) {
               return;
@@ -98,17 +120,17 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         });
       },
       onDragStart: function onDragStart() {
-        var _api$core3, _api$blockControls, _api$core4;
+        var _api$core5, _api$blockControls, _api$core6;
         if (start === undefined) {
           return;
         }
-        api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.commands.setNodeDragged(start, anchorName, nodeType));
-        api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.focus();
+        api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.execute(api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.commands.setNodeDragged(start, anchorName, nodeType));
+        api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 || _api$core6.actions.focus();
       },
       onDrop: function onDrop() {
-        var _api$core5;
-        api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.execute(function (_ref5) {
-          var tr = _ref5.tr;
+        var _api$core7;
+        api === null || api === void 0 || (_api$core7 = api.core) === null || _api$core7 === void 0 || _api$core7.actions.execute(function (_ref6) {
+          var tr = _ref6.tr;
           return tr.setMeta(_main.key, {
             isDragging: false
           });
@@ -140,9 +162,12 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
   return (0, _react2.jsx)("button", {
     type: "button",
     css: [dragHandleButtonStyles, dragHandleSelected && selectedStyles],
-    ref: buttonRef,
+    ref: buttonRef
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+    ,
     style: positionStyles,
-    onClick: handleClick,
+    onClick: handleOnClick,
+    onMouseDown: handleMouseDown,
     "data-testid": "block-ctrl-drag-handle"
   }, (0, _react2.jsx)(_dragHandler.default, {
     label: "",

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

@@ -6,9 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.GlobalStylesWrapper = void 0;
 var _react = require("@emotion/react");
 /** @jsx jsx */
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles -- Ignored via go/DSP-18766
 
 var globalStyles = (0, _react.css)({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
   '.ProseMirror-widget:first-child + *': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
     marginTop: '0 !important'
   }
 });

package/dist/cjs/ui/mouse-move-wrapper.js

@@ -8,7 +8,6 @@ exports.MouseMoveWrapper = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
-var _hooks = require("@atlaskit/editor-common/hooks");
 var _dragHandlePositions = require("../utils/drag-handle-positions");
 /** @jsx jsx */
 
@@ -28,39 +27,54 @@ var MouseMoveWrapper = exports.MouseMoveWrapper = function MouseMoveWrapper(_ref
     anchorName = _ref.anchorName,
     nodeType = _ref.nodeType,
     getPos = _ref.getPos;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['blockControls']),
-    blockControlsState = _useSharedPluginState.blockControlsState;
-  var activeNode = blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.activeNode;
-  var isDragging = blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isDragging;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    hideWrapper = _useState2[0],
-    setHideWrapper = _useState2[1];
-  var _useState3 = (0, _react.useState)(),
+    isDragging = _useState2[0],
+    setIsDragging = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    pos = _useState4[0],
-    setPos = _useState4[1];
+    hideWrapper = _useState4[0],
+    setHideWrapper = _useState4[1];
+  var _useState5 = (0, _react.useState)(),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    pos = _useState6[0],
+    setPos = _useState6[1];
   var onMouseEnter = (0, _react.useCallback)(function () {
+    if (!isDragging) {
+      setHideWrapper(true);
+    }
     var pos = getPos();
     if (pos === undefined) {
       return;
     }
-    if (api && api.blockControls && (activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos) !== pos && !isDragging) {
+    if (api && api.blockControls && !isDragging) {
       var _api$core;
       api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api.blockControls.commands.showDragHandleAt(pos, anchorName, nodeType));
     }
-  }, [getPos, api, anchorName, isDragging, activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos, nodeType]);
-  (0, _react.useLayoutEffect)(function () {
-    if (!activeNode) {
-      return;
-    }
-    var pos = getPos();
-    if (activeNode.pos !== pos && !isDragging) {
-      setHideWrapper(false);
-      return;
-    }
-    setHideWrapper(true);
-  }, [activeNode, isDragging, getPos]);
+  }, [setHideWrapper, isDragging, api, getPos, anchorName, nodeType]);
+  (0, _react.useEffect)(function () {
+    var _api$blockControls;
+    var unbind = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.onChange(function (_ref2) {
+      var _nextSharedState$acti;
+      var nextSharedState = _ref2.nextSharedState;
+      var pos = getPos();
+      setIsDragging(Boolean(nextSharedState === null || nextSharedState === void 0 ? void 0 : nextSharedState.isDragging));
+      if (!(nextSharedState !== null && nextSharedState !== void 0 && nextSharedState.activeNode)) {
+        return;
+      }
+      if ((nextSharedState === null || nextSharedState === void 0 || (_nextSharedState$acti = nextSharedState.activeNode) === null || _nextSharedState$acti === void 0 ? void 0 : _nextSharedState$acti.pos) !== pos && !(nextSharedState !== null && nextSharedState !== void 0 && nextSharedState.isDragging)) {
+        setHideWrapper(false);
+        return;
+      }
+      if (nextSharedState !== null && nextSharedState !== void 0 && nextSharedState.isDragging) {
+        setHideWrapper(nextSharedState === null || nextSharedState === void 0 ? void 0 : nextSharedState.isDragging);
+        return;
+      }
+    });
+    return function () {
+      unbind === null || unbind === void 0 || unbind();
+    };
+  }, [getPos, api]);
   (0, _react.useLayoutEffect)(function () {
     var supportsAnchor = CSS.supports('height', "anchor-size(".concat(anchorName, " height)")) && CSS.supports('top', "anchor(".concat(anchorName, " start)"));
     if (supportsAnchor) {
@@ -86,7 +100,9 @@ var MouseMoveWrapper = exports.MouseMoveWrapper = function MouseMoveWrapper(_ref
   }, [view, anchorName]);
   return (0, _react2.jsx)("div", {
     onMouseEnter: onMouseEnter,
-    css: [basicStyles, !hideWrapper && mouseMoveWrapperStyles],
+    css: [basicStyles, !hideWrapper && mouseMoveWrapperStyles]
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+    ,
     style: pos
   });
 };

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

@@ -22,7 +22,6 @@ export const createPlugin = api => {
       },
       apply(tr, currentState, oldState, newState) {
         var _decorationState, _meta$activeNode, _meta$isDragging, _meta$editorHeight;
-        // return currentState;
         let {
           activeNode,
           decorations,
@@ -109,7 +108,11 @@ export const createPlugin = api => {
     },
     props: {
       decorations: state => {
-        var _key$getState;
+        var _api$editorDisabled, _api$editorDisabled$s, _key$getState;
+        const isDisabled = api === null || api === void 0 ? void 0 : (_api$editorDisabled = api.editorDisabled) === null || _api$editorDisabled === void 0 ? void 0 : (_api$editorDisabled$s = _api$editorDisabled.sharedState.currentState()) === null || _api$editorDisabled$s === void 0 ? void 0 : _api$editorDisabled$s.editorDisabled;
+        if (isDisabled) {
+          return;
+        }
         return (_key$getState = key.getState(state)) === null || _key$getState === void 0 ? void 0 : _key$getState.decorations;
       }
     },

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

@@ -18,10 +18,13 @@ const dragHandleButtonStyles = css({
   flexDirection: 'column',
   justifyContent: 'center',
   alignItems: 'center',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
   height: DRAG_HANDLE_HEIGHT,
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
   width: DRAG_HANDLE_WIDTH,
   border: 'none',
   background: 'transparent',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
   borderRadius: DRAG_HANDLE_BORDER_RADIUS,
   color: "var(--ds-icon, #44546F)",
   cursor: 'grab',
@@ -50,7 +53,7 @@ export const DragHandle = ({
   const {
     featureFlagsState
   } = useSharedPluginState(api, ['featureFlags']);
-  const handleClick = useCallback(() => {
+  const handleOnClick = useCallback(() => {
     var _api$core, _api$core2;
     setDragHandleSelected(!dragHandleSelected);
     api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({
@@ -67,6 +70,26 @@ export const DragHandle = ({
     });
     api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.focus();
   }, [start, api, dragHandleSelected, setDragHandleSelected, nodeType]);
+
+  // handleMouseDown required along with onClick to ensure the correct selection
+  // is set immediately when the drag handle is clicked. Otherwise browser native
+  // drag and drop can take over and cause unpredictable behaviour.
+  const handleMouseDown = useCallback(() => {
+    var _api$core3, _api$core4;
+    api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(({
+      tr
+    }) => {
+      if (start === undefined) {
+        return tr;
+      }
+      tr = selectNode(tr, start, nodeType);
+      tr.setMeta(key, {
+        pos: start
+      });
+      return tr;
+    });
+    api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions.focus();
+  }, [start, api, nodeType]);
   useEffect(() => {
     const element = buttonRef.current;
     if (!element) {
@@ -91,16 +114,16 @@ export const DragHandle = ({
         });
       },
       onDragStart() {
-        var _api$core3, _api$blockControls, _api$core4;
+        var _api$core5, _api$blockControls, _api$core6;
         if (start === undefined) {
           return;
         }
-        api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.commands.setNodeDragged(start, anchorName, nodeType));
-        api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions.focus();
+        api === null || api === void 0 ? void 0 : (_api$core5 = api.core) === null || _api$core5 === void 0 ? void 0 : _api$core5.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.commands.setNodeDragged(start, anchorName, nodeType));
+        api === null || api === void 0 ? void 0 : (_api$core6 = api.core) === null || _api$core6 === void 0 ? void 0 : _api$core6.actions.focus();
       },
       onDrop() {
-        var _api$core5;
-        api === null || api === void 0 ? void 0 : (_api$core5 = api.core) === null || _api$core5 === void 0 ? void 0 : _api$core5.actions.execute(({
+        var _api$core7;
+        api === null || api === void 0 ? void 0 : (_api$core7 = api.core) === null || _api$core7 === void 0 ? void 0 : _api$core7.actions.execute(({
           tr
         }) => {
           return tr.setMeta(key, {
@@ -134,9 +157,12 @@ export const DragHandle = ({
   return jsx("button", {
     type: "button",
     css: [dragHandleButtonStyles, dragHandleSelected && selectedStyles],
-    ref: buttonRef,
+    ref: buttonRef
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+    ,
     style: positionStyles,
-    onClick: handleClick,
+    onClick: handleOnClick,
+    onMouseDown: handleMouseDown,
     "data-testid": "block-ctrl-drag-handle"
   }, jsx(DragHandlerIcon, {
     label: "",

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

@@ -1,7 +1,10 @@
 /** @jsx jsx */
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles -- Ignored via go/DSP-18766
 import { css, Global, jsx } from '@emotion/react';
 const globalStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
   '.ProseMirror-widget:first-child + *': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
     marginTop: '0 !important'
   }
 });

package/dist/es2019/ui/mouse-move-wrapper.js

@@ -1,7 +1,6 @@
 /** @jsx jsx */
-import { useCallback, useLayoutEffect, useState } from 'react';
+import { useCallback, useEffect, useLayoutEffect, useState } from 'react';
 import { css, jsx } from '@emotion/react';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { getTopPosition } from '../utils/drag-handle-positions';
 const basicStyles = css({
   position: 'absolute',
@@ -20,34 +19,46 @@ export const MouseMoveWrapper = ({
   nodeType,
   getPos
 }) => {
-  const {
-    blockControlsState
-  } = useSharedPluginState(api, ['blockControls']);
-  const activeNode = blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.activeNode;
-  const isDragging = blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isDragging;
+  const [isDragging, setIsDragging] = useState(false);
   const [hideWrapper, setHideWrapper] = useState(false);
   const [pos, setPos] = useState();
   const onMouseEnter = useCallback(() => {
+    if (!isDragging) {
+      setHideWrapper(true);
+    }
     const pos = getPos();
     if (pos === undefined) {
       return;
     }
-    if (api && api.blockControls && (activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos) !== pos && !isDragging) {
+    if (api && api.blockControls && !isDragging) {
       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(api.blockControls.commands.showDragHandleAt(pos, anchorName, nodeType));
     }
-  }, [getPos, api, anchorName, isDragging, activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos, nodeType]);
-  useLayoutEffect(() => {
-    if (!activeNode) {
-      return;
-    }
-    const pos = getPos();
-    if (activeNode.pos !== pos && !isDragging) {
-      setHideWrapper(false);
-      return;
-    }
-    setHideWrapper(true);
-  }, [activeNode, isDragging, getPos]);
+  }, [setHideWrapper, isDragging, api, getPos, anchorName, nodeType]);
+  useEffect(() => {
+    var _api$blockControls;
+    const unbind = api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.onChange(({
+      nextSharedState
+    }) => {
+      var _nextSharedState$acti;
+      const pos = getPos();
+      setIsDragging(Boolean(nextSharedState === null || nextSharedState === void 0 ? void 0 : nextSharedState.isDragging));
+      if (!(nextSharedState !== null && nextSharedState !== void 0 && nextSharedState.activeNode)) {
+        return;
+      }
+      if ((nextSharedState === null || nextSharedState === void 0 ? void 0 : (_nextSharedState$acti = nextSharedState.activeNode) === null || _nextSharedState$acti === void 0 ? void 0 : _nextSharedState$acti.pos) !== pos && !(nextSharedState !== null && nextSharedState !== void 0 && nextSharedState.isDragging)) {
+        setHideWrapper(false);
+        return;
+      }
+      if (nextSharedState !== null && nextSharedState !== void 0 && nextSharedState.isDragging) {
+        setHideWrapper(nextSharedState === null || nextSharedState === void 0 ? void 0 : nextSharedState.isDragging);
+        return;
+      }
+    });
+    return () => {
+      unbind === null || unbind === void 0 ? void 0 : unbind();
+    };
+  }, [getPos, api]);
   useLayoutEffect(() => {
     const supportsAnchor = CSS.supports('height', `anchor-size(${anchorName} height)`) && CSS.supports('top', `anchor(${anchorName} start)`);
     if (supportsAnchor) {
@@ -71,7 +82,9 @@ export const MouseMoveWrapper = ({
   }, [view, anchorName]);
   return jsx("div", {
     onMouseEnter: onMouseEnter,
-    css: [basicStyles, !hideWrapper && mouseMoveWrapperStyles],
+    css: [basicStyles, !hideWrapper && mouseMoveWrapperStyles]
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+    ,
     style: pos
   });
 };

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

@@ -23,7 +23,6 @@ export var createPlugin = function createPlugin(api) {
       },
       apply: function apply(tr, currentState, oldState, newState) {
         var _decorationState, _meta$activeNode, _meta$isDragging, _meta$editorHeight;
-        // return currentState;
         var activeNode = currentState.activeNode,
           decorations = currentState.decorations,
           isMenuOpen = currentState.isMenuOpen,
@@ -108,7 +107,11 @@ export var createPlugin = function createPlugin(api) {
     },
     props: {
       decorations: function decorations(state) {
-        var _key$getState;
+        var _api$editorDisabled, _key$getState;
+        var isDisabled = api === null || api === void 0 || (_api$editorDisabled = api.editorDisabled) === null || _api$editorDisabled === void 0 || (_api$editorDisabled = _api$editorDisabled.sharedState.currentState()) === null || _api$editorDisabled === void 0 ? void 0 : _api$editorDisabled.editorDisabled;
+        if (isDisabled) {
+          return;
+        }
         return (_key$getState = key.getState(state)) === null || _key$getState === void 0 ? void 0 : _key$getState.decorations;
       }
     },

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

@@ -19,10 +19,13 @@ var dragHandleButtonStyles = css({
   flexDirection: 'column',
   justifyContent: 'center',
   alignItems: 'center',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
   height: DRAG_HANDLE_HEIGHT,
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
   width: DRAG_HANDLE_WIDTH,
   border: 'none',
   background: 'transparent',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
   borderRadius: DRAG_HANDLE_BORDER_RADIUS,
   color: "var(--ds-icon, #44546F)",
   cursor: 'grab',
@@ -52,7 +55,7 @@ export var DragHandle = function DragHandle(_ref) {
     setDragHandleSelected = _useState2[1];
   var _useSharedPluginState = useSharedPluginState(api, ['featureFlags']),
     featureFlagsState = _useSharedPluginState.featureFlagsState;
-  var handleClick = useCallback(function () {
+  var handleOnClick = useCallback(function () {
     var _api$core, _api$core2;
     setDragHandleSelected(!dragHandleSelected);
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref2) {
@@ -68,6 +71,25 @@ export var DragHandle = function DragHandle(_ref) {
     });
     api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.focus();
   }, [start, api, dragHandleSelected, setDragHandleSelected, nodeType]);
+
+  // handleMouseDown required along with onClick to ensure the correct selection
+  // is set immediately when the drag handle is clicked. Otherwise browser native
+  // drag and drop can take over and cause unpredictable behaviour.
+  var handleMouseDown = useCallback(function () {
+    var _api$core3, _api$core4;
+    api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref3) {
+      var tr = _ref3.tr;
+      if (start === undefined) {
+        return tr;
+      }
+      tr = selectNode(tr, start, nodeType);
+      tr.setMeta(key, {
+        pos: start
+      });
+      return tr;
+    });
+    api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.focus();
+  }, [start, api, nodeType]);
   useEffect(function () {
     var element = buttonRef.current;
     if (!element) {
@@ -75,11 +97,11 @@ export var DragHandle = function DragHandle(_ref) {
     }
     return draggable({
       element: element,
-      onGenerateDragPreview: function onGenerateDragPreview(_ref3) {
-        var nativeSetDragImage = _ref3.nativeSetDragImage;
+      onGenerateDragPreview: function onGenerateDragPreview(_ref4) {
+        var nativeSetDragImage = _ref4.nativeSetDragImage;
         setCustomNativeDragPreview({
-          render: function render(_ref4) {
-            var container = _ref4.container;
+          render: function render(_ref5) {
+            var container = _ref5.container;
             var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
             if (!dom) {
               return;
@@ -90,17 +112,17 @@ export var DragHandle = function DragHandle(_ref) {
         });
       },
       onDragStart: function onDragStart() {
-        var _api$core3, _api$blockControls, _api$core4;
+        var _api$core5, _api$blockControls, _api$core6;
         if (start === undefined) {
           return;
         }
-        api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.commands.setNodeDragged(start, anchorName, nodeType));
-        api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.focus();
+        api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.execute(api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.commands.setNodeDragged(start, anchorName, nodeType));
+        api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 || _api$core6.actions.focus();
       },
       onDrop: function onDrop() {
-        var _api$core5;
-        api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.execute(function (_ref5) {
-          var tr = _ref5.tr;
+        var _api$core7;
+        api === null || api === void 0 || (_api$core7 = api.core) === null || _api$core7 === void 0 || _api$core7.actions.execute(function (_ref6) {
+          var tr = _ref6.tr;
           return tr.setMeta(key, {
             isDragging: false
           });
@@ -132,9 +154,12 @@ export var DragHandle = function DragHandle(_ref) {
   return jsx("button", {
     type: "button",
     css: [dragHandleButtonStyles, dragHandleSelected && selectedStyles],
-    ref: buttonRef,
+    ref: buttonRef
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+    ,
     style: positionStyles,
-    onClick: handleClick,
+    onClick: handleOnClick,
+    onMouseDown: handleMouseDown,
     "data-testid": "block-ctrl-drag-handle"
   }, jsx(DragHandlerIcon, {
     label: "",

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

@@ -1,7 +1,10 @@
 /** @jsx jsx */
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles -- Ignored via go/DSP-18766
 import { css, Global, jsx } from '@emotion/react';
 var globalStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
   '.ProseMirror-widget:first-child + *': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
     marginTop: '0 !important'
   }
 });

package/dist/esm/ui/mouse-move-wrapper.js

@@ -1,8 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 /** @jsx jsx */
-import { useCallback, useLayoutEffect, useState } from 'react';
+import { useCallback, useEffect, useLayoutEffect, useState } from 'react';
 import { css, jsx } from '@emotion/react';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { getTopPosition } from '../utils/drag-handle-positions';
 var basicStyles = css({
   position: 'absolute',
@@ -20,39 +19,54 @@ export var MouseMoveWrapper = function MouseMoveWrapper(_ref) {
     anchorName = _ref.anchorName,
     nodeType = _ref.nodeType,
     getPos = _ref.getPos;
-  var _useSharedPluginState = useSharedPluginState(api, ['blockControls']),
-    blockControlsState = _useSharedPluginState.blockControlsState;
-  var activeNode = blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.activeNode;
-  var isDragging = blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isDragging;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
-    hideWrapper = _useState2[0],
-    setHideWrapper = _useState2[1];
-  var _useState3 = useState(),
+    isDragging = _useState2[0],
+    setIsDragging = _useState2[1];
+  var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    pos = _useState4[0],
-    setPos = _useState4[1];
+    hideWrapper = _useState4[0],
+    setHideWrapper = _useState4[1];
+  var _useState5 = useState(),
+    _useState6 = _slicedToArray(_useState5, 2),
+    pos = _useState6[0],
+    setPos = _useState6[1];
   var onMouseEnter = useCallback(function () {
+    if (!isDragging) {
+      setHideWrapper(true);
+    }
     var pos = getPos();
     if (pos === undefined) {
       return;
     }
-    if (api && api.blockControls && (activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos) !== pos && !isDragging) {
+    if (api && api.blockControls && !isDragging) {
       var _api$core;
       api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api.blockControls.commands.showDragHandleAt(pos, anchorName, nodeType));
     }
-  }, [getPos, api, anchorName, isDragging, activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos, nodeType]);
-  useLayoutEffect(function () {
-    if (!activeNode) {
-      return;
-    }
-    var pos = getPos();
-    if (activeNode.pos !== pos && !isDragging) {
-      setHideWrapper(false);
-      return;
-    }
-    setHideWrapper(true);
-  }, [activeNode, isDragging, getPos]);
+  }, [setHideWrapper, isDragging, api, getPos, anchorName, nodeType]);
+  useEffect(function () {
+    var _api$blockControls;
+    var unbind = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.onChange(function (_ref2) {
+      var _nextSharedState$acti;
+      var nextSharedState = _ref2.nextSharedState;
+      var pos = getPos();
+      setIsDragging(Boolean(nextSharedState === null || nextSharedState === void 0 ? void 0 : nextSharedState.isDragging));
+      if (!(nextSharedState !== null && nextSharedState !== void 0 && nextSharedState.activeNode)) {
+        return;
+      }
+      if ((nextSharedState === null || nextSharedState === void 0 || (_nextSharedState$acti = nextSharedState.activeNode) === null || _nextSharedState$acti === void 0 ? void 0 : _nextSharedState$acti.pos) !== pos && !(nextSharedState !== null && nextSharedState !== void 0 && nextSharedState.isDragging)) {
+        setHideWrapper(false);
+        return;
+      }
+      if (nextSharedState !== null && nextSharedState !== void 0 && nextSharedState.isDragging) {
+        setHideWrapper(nextSharedState === null || nextSharedState === void 0 ? void 0 : nextSharedState.isDragging);
+        return;
+      }
+    });
+    return function () {
+      unbind === null || unbind === void 0 || unbind();
+    };
+  }, [getPos, api]);
   useLayoutEffect(function () {
     var supportsAnchor = CSS.supports('height', "anchor-size(".concat(anchorName, " height)")) && CSS.supports('top', "anchor(".concat(anchorName, " start)"));
     if (supportsAnchor) {
@@ -78,7 +92,9 @@ export var MouseMoveWrapper = function MouseMoveWrapper(_ref) {
   }, [view, anchorName]);
   return jsx("div", {
     onMouseEnter: onMouseEnter,
-    css: [basicStyles, !hideWrapper && mouseMoveWrapperStyles],
+    css: [basicStyles, !hideWrapper && mouseMoveWrapperStyles]
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+    ,
     style: pos
   });
 };

package/dist/types/types.d.ts

@@ -1,4 +1,5 @@
 import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 import { type DecorationSet } from '@atlaskit/editor-prosemirror/view';
@@ -16,7 +17,11 @@ export interface PluginState {
 }
 export type ReleaseHiddenDecoration = () => boolean | undefined;
 export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
-    dependencies: [OptionalPlugin<WidthPlugin>, OptionalPlugin<FeatureFlagsPlugin>];
+    dependencies: [
+        OptionalPlugin<EditorDisabledPlugin>,
+        OptionalPlugin<WidthPlugin>,
+        OptionalPlugin<FeatureFlagsPlugin>
+    ];
     sharedState: {
         isMenuOpen: boolean;
         activeNode: {

package/dist/types-ts4.5/types.d.ts

@@ -1,4 +1,5 @@
 import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 import { type DecorationSet } from '@atlaskit/editor-prosemirror/view';
@@ -17,6 +18,7 @@ export interface PluginState {
 export type ReleaseHiddenDecoration = () => boolean | undefined;
 export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
     dependencies: [
+        OptionalPlugin<EditorDisabledPlugin>,
         OptionalPlugin<WidthPlugin>,
         OptionalPlugin<FeatureFlagsPlugin>
     ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-block-controls",
-  "version": "1.4.12",
+  "version": "1.4.14",
   "description": "Block controls plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -31,7 +31,8 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/editor-common": "^82.2.0",
+    "@atlaskit/editor-common": "^82.3.0",
+    "@atlaskit/editor-plugin-editor-disabled": "^1.1.5",
     "@atlaskit/editor-plugin-feature-flags": "^1.1.0",
     "@atlaskit/editor-plugin-width": "^1.1.0",
     "@atlaskit/editor-prosemirror": "4.0.1",
@@ -40,7 +41,7 @@
     "@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",
-    "@atlaskit/tokens": "^1.49.0",
+    "@atlaskit/tokens": "^1.50.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
     "raf-schd": "^4.0.3"