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

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @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

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',
@@ -159,7 +162,9 @@ 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: handleOnClick,
     onMouseDown: handleMouseDown,

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/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',
@@ -154,7 +157,9 @@ 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: handleOnClick,
     onMouseDown: handleMouseDown,

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/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',
@@ -151,7 +154,9 @@ 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: handleOnClick,
     onMouseDown: handleMouseDown,

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/package.json

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