@atlaskit/editor-plugin-block-controls 16.0.0 → 16.0.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 16.0.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 16.0.1
+
+### Patch Changes
+
+- [`47b2ae576b031`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/47b2ae576b031) -
+  [ux] Under the `cc_maui_remix_button_hover_corridor` experiment, replace the Remix button's
+  rendered hover corridor and fixed right-margin exclusion with the existing click-wrapper hover
+  tracking. Hide block controls over the marked object sidebar container and its control surfaces.
+- Updated dependencies
+
 ## 16.0.0
 
 ### Patch Changes

package/dist/cjs/pm-plugins/interaction-tracking/handle-mouse-move.js

@@ -79,7 +79,7 @@ var classifyRightMarginPosition = function classifyRightMarginPosition(view, eve
   if (event.clientX <= found.rect.right) {
     return null;
   }
-  return event.clientX > getRightMarginBoundary(view) ? {
+  return event.clientX > getRightMarginBoundary(view) && !(0, _expValEqualsNoExposure.expValEqualsNoExposure)('cc_maui_remix_button_hover_corridor', 'isEnabled', true) ? {
     type: 'gap'
   } : {
     type: 'active',
@@ -159,9 +159,8 @@ var processHoverSide = function processHoverSide(view, api) {
     return;
   }
 
-  // In the Rovo gap, dismiss the controls so the button doesn't linger over the Rovo button.
-  // The corridor experiment keeps controls visible when the pointer is still over a real block;
-  // only empty margin remains reserved for Rovo in that case.
+  // Keep the existing fixed Rovo gap in the control cohort. The treatment uses explicitly marked
+  // control surfaces instead, so the rest of the right margin remains hoverable.
   if ((marginZone === null || marginZone === void 0 ? void 0 : marginZone.type) === 'gap' || event.clientX > getRightMarginBoundary(view) && (!blockElement || !(0, _expValEqualsNoExposure.expValEqualsNoExposure)('cc_maui_remix_button_hover_corridor', 'isEnabled', true))) {
     if (!(state !== null && state !== void 0 && state.isMouseOut)) {
       (0, _commands.clearHoverSide)(view);

package/dist/cjs/pm-plugins/interaction-tracking/pm-plugin.js

@@ -7,7 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.interactionTrackingPluginKey = exports.getInteractionTrackingState = exports.createInteractionTrackingPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _bindEventListener = require("bind-event-listener");
+var _blockControlsSuppression = require("@atlaskit/editor-common/block-controls-suppression");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
+var _unsafeExpValNoExposure = require("@atlaskit/platform-feature-experiments/unsafe-exp-val-no-exposure");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _constants = require("./constants");
@@ -47,6 +50,15 @@ var isOverActiveClickArea = function isOverActiveClickArea(target, clientX) {
   var innerWidth = (_target$ownerDocument = (_target$ownerDocument2 = target.ownerDocument.defaultView) === null || _target$ownerDocument2 === void 0 ? void 0 : _target$ownerDocument2.innerWidth) !== null && _target$ownerDocument !== void 0 ? _target$ownerDocument : Number.POSITIVE_INFINITY;
   return clientX <= innerWidth - _constants.RIGHT_MARGIN_ROVO_GAP_PX;
 };
+var isOverTreatmentClickArea = function isOverTreatmentClickArea(target, editorContentArea, clientX) {
+  if (!(target instanceof Element) || !(editorContentArea instanceof HTMLElement)) {
+    return false;
+  }
+  if (!target.closest(CLICK_AREA_SELECTOR)) {
+    return false;
+  }
+  return clientX > editorContentArea.getBoundingClientRect().right;
+};
 var interactionTrackingPluginKey = exports.interactionTrackingPluginKey = new _state.PluginKey('interactionTrackingPlugin');
 var createInteractionTrackingPlugin = exports.createInteractionTrackingPlugin = function createInteractionTrackingPlugin() {
   var rightSideControlsEnabled = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -119,20 +131,24 @@ var createInteractionTrackingPlugin = exports.createInteractionTrackingPlugin =
           mouseLeaveTimeoutId = null;
         }
 
-        // Keep controls visible when moving to block controls or the active right margin
-        // (the Rovo gap is excluded so controls still clear there).
+        // Preserve the existing hover targets for the control cohort.
         if (rightSideControlsEnabled && (isMovingToBlockControlsArea(event.relatedTarget) || isOverActiveClickArea(event.relatedTarget, event.clientX))) {
           return;
         }
+        if (rightSideControlsEnabled && (0, _isExperimentEnabled.isExperimentEnabled)('cc_maui_remix_button_hover_corridor') && isOverTreatmentClickArea(event.relatedTarget, editorContentArea, event.clientX)) {
+          return;
+        }
         mouseLeaveTimeoutId = setTimeout(function () {
           mouseLeaveTimeoutId = null;
-          // Re-check after the debounce: keep controls if the cursor landed on block controls
-          // or the active right margin.
+          // Re-check the control cohort's existing hover targets after the debounce.
           if (rightSideControlsEnabled && typeof document !== 'undefined') {
             var el = document.elementFromPoint(lastMousePosition.x, lastMousePosition.y);
             if (el && (isMovingToBlockControlsArea(el) || isOverActiveClickArea(el, lastMousePosition.x))) {
               return;
             }
+            if (el && (0, _isExperimentEnabled.isExperimentEnabled)('cc_maui_remix_button_hover_corridor') && isOverTreatmentClickArea(el, editorContentArea, lastMousePosition.x)) {
+              return;
+            }
           }
           (0, _handleMouseMove.handleMouseLeave)(view, rightSideControlsEnabled);
         }, MOUSE_LEAVE_DEBOUNCE_MS);
@@ -143,25 +159,54 @@ var createInteractionTrackingPlugin = exports.createInteractionTrackingPlugin =
           mouseLeaveTimeoutId = null;
         }
       };
+      var handleDocumentMouseMove = function handleDocumentMouseMove(event) {
+        lastMousePosition = {
+          x: event.clientX,
+          y: event.clientY
+        };
+        // Catches block controls in portals that handleDOMEvents.mousemove misses.
+        var isOverKnownHoverTarget = (editorContentArea === null || editorContentArea === void 0 ? void 0 : editorContentArea.contains(event.target)) || isMovingToBlockControlsArea(event.target);
+        var overClickArea = event.target instanceof Element && !!event.target.closest(CLICK_AREA_SELECTOR);
+        if (isOverKnownHoverTarget || overClickArea) {
+          (0, _handleMouseMove.handleMouseMove)(view, event, rightSideControlsEnabled, api);
+        }
+      };
+      var handleTreatmentDocumentMouseMove = function handleTreatmentDocumentMouseMove(event) {
+        if ((0, _blockControlsSuppression.isBlockControlsSuppressionTarget)(event.target)) {
+          var _interactionTrackingP;
+          lastMousePosition = {
+            x: event.clientX,
+            y: event.clientY
+          };
+          cancelScheduledMouseLeave();
+          if (!((_interactionTrackingP = interactionTrackingPluginKey.getState(view.state)) !== null && _interactionTrackingP !== void 0 && _interactionTrackingP.isMouseOut)) {
+            (0, _handleMouseMove.handleMouseLeave)(view, rightSideControlsEnabled);
+          }
+          return;
+        }
+        handleDocumentMouseMove(event);
+      };
       if (editorContentArea) {
         if (rightSideControlsEnabled && typeof document !== 'undefined') {
-          unbindDocumentMouseMove = (0, _bindEventListener.bind)(document, {
-            type: 'mousemove',
-            listener: function listener(event) {
-              lastMousePosition = {
-                x: event.clientX,
-                y: event.clientY
-              };
-              // Catches block controls in portals that handleDOMEvents.mousemove misses.
-              var overClickArea = event.target instanceof Element && !!event.target.closest(CLICK_AREA_SELECTOR);
-              if (editorContentArea.contains(event.target) || isMovingToBlockControlsArea(event.target) || overClickArea) {
-                (0, _handleMouseMove.handleMouseMove)(view, event, rightSideControlsEnabled, api);
+          // RemixButtonDecoration fires exposure when the control is visible; this
+          // mount-time split only selects the appropriate interaction listener.
+          if ((0, _unsafeExpValNoExposure.UNSAFE_expValNoExposure)('cc_maui_remix_button_hover_corridor', 'isEnabled', false) === true) {
+            unbindDocumentMouseMove = (0, _bindEventListener.bind)(document, {
+              type: 'mousemove',
+              listener: handleTreatmentDocumentMouseMove,
+              options: {
+                passive: true
               }
-            },
-            options: {
-              passive: true
-            }
-          });
+            });
+          } else {
+            unbindDocumentMouseMove = (0, _bindEventListener.bind)(document, {
+              type: 'mousemove',
+              listener: handleDocumentMouseMove,
+              options: {
+                passive: true
+              }
+            });
+          }
         }
         unbindMouseEnter = (0, _bindEventListener.bind)(editorContentArea, {
           type: 'mouseenter',

package/dist/es2019/pm-plugins/interaction-tracking/handle-mouse-move.js

@@ -60,7 +60,7 @@ const classifyRightMarginPosition = (view, event) => {
   if (event.clientX <= found.rect.right) {
     return null;
   }
-  return event.clientX > getRightMarginBoundary(view) ? {
+  return event.clientX > getRightMarginBoundary(view) && !expValEqualsNoExposure('cc_maui_remix_button_hover_corridor', 'isEnabled', true) ? {
     type: 'gap'
   } : {
     type: 'active',
@@ -140,9 +140,8 @@ const processHoverSide = (view, api) => {
     return;
   }
 
-  // In the Rovo gap, dismiss the controls so the button doesn't linger over the Rovo button.
-  // The corridor experiment keeps controls visible when the pointer is still over a real block;
-  // only empty margin remains reserved for Rovo in that case.
+  // Keep the existing fixed Rovo gap in the control cohort. The treatment uses explicitly marked
+  // control surfaces instead, so the rest of the right margin remains hoverable.
   if ((marginZone === null || marginZone === void 0 ? void 0 : marginZone.type) === 'gap' || event.clientX > getRightMarginBoundary(view) && (!blockElement || !expValEqualsNoExposure('cc_maui_remix_button_hover_corridor', 'isEnabled', true))) {
     if (!(state !== null && state !== void 0 && state.isMouseOut)) {
       clearHoverSide(view);

package/dist/es2019/pm-plugins/interaction-tracking/pm-plugin.js

@@ -1,5 +1,8 @@
 import { bind } from 'bind-event-listener';
+import { isBlockControlsSuppressionTarget } from '@atlaskit/editor-common/block-controls-suppression';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { UNSAFE_expValNoExposure } from '@atlaskit/platform-feature-experiments/unsafe-exp-val-no-exposure';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { RIGHT_MARGIN_ROVO_GAP_PX } from './constants';
@@ -36,6 +39,15 @@ const isOverActiveClickArea = (target, clientX) => {
   const innerWidth = (_target$ownerDocument = (_target$ownerDocument2 = target.ownerDocument.defaultView) === null || _target$ownerDocument2 === void 0 ? void 0 : _target$ownerDocument2.innerWidth) !== null && _target$ownerDocument !== void 0 ? _target$ownerDocument : Number.POSITIVE_INFINITY;
   return clientX <= innerWidth - RIGHT_MARGIN_ROVO_GAP_PX;
 };
+const isOverTreatmentClickArea = (target, editorContentArea, clientX) => {
+  if (!(target instanceof Element) || !(editorContentArea instanceof HTMLElement)) {
+    return false;
+  }
+  if (!target.closest(CLICK_AREA_SELECTOR)) {
+    return false;
+  }
+  return clientX > editorContentArea.getBoundingClientRect().right;
+};
 export const interactionTrackingPluginKey = new PluginKey('interactionTrackingPlugin');
 export const createInteractionTrackingPlugin = (rightSideControlsEnabled = false, api) => {
   return new SafePlugin({
@@ -107,20 +119,24 @@ export const createInteractionTrackingPlugin = (rightSideControlsEnabled = false
           mouseLeaveTimeoutId = null;
         }
 
-        // Keep controls visible when moving to block controls or the active right margin
-        // (the Rovo gap is excluded so controls still clear there).
+        // Preserve the existing hover targets for the control cohort.
         if (rightSideControlsEnabled && (isMovingToBlockControlsArea(event.relatedTarget) || isOverActiveClickArea(event.relatedTarget, event.clientX))) {
           return;
         }
+        if (rightSideControlsEnabled && isExperimentEnabled('cc_maui_remix_button_hover_corridor') && isOverTreatmentClickArea(event.relatedTarget, editorContentArea, event.clientX)) {
+          return;
+        }
         mouseLeaveTimeoutId = setTimeout(() => {
           mouseLeaveTimeoutId = null;
-          // Re-check after the debounce: keep controls if the cursor landed on block controls
-          // or the active right margin.
+          // Re-check the control cohort's existing hover targets after the debounce.
           if (rightSideControlsEnabled && typeof document !== 'undefined') {
             const el = document.elementFromPoint(lastMousePosition.x, lastMousePosition.y);
             if (el && (isMovingToBlockControlsArea(el) || isOverActiveClickArea(el, lastMousePosition.x))) {
               return;
             }
+            if (el && isExperimentEnabled('cc_maui_remix_button_hover_corridor') && isOverTreatmentClickArea(el, editorContentArea, lastMousePosition.x)) {
+              return;
+            }
           }
           handleMouseLeave(view, rightSideControlsEnabled);
         }, MOUSE_LEAVE_DEBOUNCE_MS);
@@ -131,25 +147,54 @@ export const createInteractionTrackingPlugin = (rightSideControlsEnabled = false
           mouseLeaveTimeoutId = null;
         }
       };
+      const handleDocumentMouseMove = event => {
+        lastMousePosition = {
+          x: event.clientX,
+          y: event.clientY
+        };
+        // Catches block controls in portals that handleDOMEvents.mousemove misses.
+        const isOverKnownHoverTarget = (editorContentArea === null || editorContentArea === void 0 ? void 0 : editorContentArea.contains(event.target)) || isMovingToBlockControlsArea(event.target);
+        const overClickArea = event.target instanceof Element && !!event.target.closest(CLICK_AREA_SELECTOR);
+        if (isOverKnownHoverTarget || overClickArea) {
+          handleMouseMove(view, event, rightSideControlsEnabled, api);
+        }
+      };
+      const handleTreatmentDocumentMouseMove = event => {
+        if (isBlockControlsSuppressionTarget(event.target)) {
+          var _interactionTrackingP;
+          lastMousePosition = {
+            x: event.clientX,
+            y: event.clientY
+          };
+          cancelScheduledMouseLeave();
+          if (!((_interactionTrackingP = interactionTrackingPluginKey.getState(view.state)) !== null && _interactionTrackingP !== void 0 && _interactionTrackingP.isMouseOut)) {
+            handleMouseLeave(view, rightSideControlsEnabled);
+          }
+          return;
+        }
+        handleDocumentMouseMove(event);
+      };
       if (editorContentArea) {
         if (rightSideControlsEnabled && typeof document !== 'undefined') {
-          unbindDocumentMouseMove = bind(document, {
-            type: 'mousemove',
-            listener: event => {
-              lastMousePosition = {
-                x: event.clientX,
-                y: event.clientY
-              };
-              // Catches block controls in portals that handleDOMEvents.mousemove misses.
-              const overClickArea = event.target instanceof Element && !!event.target.closest(CLICK_AREA_SELECTOR);
-              if (editorContentArea.contains(event.target) || isMovingToBlockControlsArea(event.target) || overClickArea) {
-                handleMouseMove(view, event, rightSideControlsEnabled, api);
+          // RemixButtonDecoration fires exposure when the control is visible; this
+          // mount-time split only selects the appropriate interaction listener.
+          if (UNSAFE_expValNoExposure('cc_maui_remix_button_hover_corridor', 'isEnabled', false) === true) {
+            unbindDocumentMouseMove = bind(document, {
+              type: 'mousemove',
+              listener: handleTreatmentDocumentMouseMove,
+              options: {
+                passive: true
               }
-            },
-            options: {
-              passive: true
-            }
-          });
+            });
+          } else {
+            unbindDocumentMouseMove = bind(document, {
+              type: 'mousemove',
+              listener: handleDocumentMouseMove,
+              options: {
+                passive: true
+              }
+            });
+          }
         }
         unbindMouseEnter = bind(editorContentArea, {
           type: 'mouseenter',

package/dist/esm/pm-plugins/interaction-tracking/handle-mouse-move.js

@@ -74,7 +74,7 @@ var classifyRightMarginPosition = function classifyRightMarginPosition(view, eve
   if (event.clientX <= found.rect.right) {
     return null;
   }
-  return event.clientX > getRightMarginBoundary(view) ? {
+  return event.clientX > getRightMarginBoundary(view) && !expValEqualsNoExposure('cc_maui_remix_button_hover_corridor', 'isEnabled', true) ? {
     type: 'gap'
   } : {
     type: 'active',
@@ -154,9 +154,8 @@ var processHoverSide = function processHoverSide(view, api) {
     return;
   }
 
-  // In the Rovo gap, dismiss the controls so the button doesn't linger over the Rovo button.
-  // The corridor experiment keeps controls visible when the pointer is still over a real block;
-  // only empty margin remains reserved for Rovo in that case.
+  // Keep the existing fixed Rovo gap in the control cohort. The treatment uses explicitly marked
+  // control surfaces instead, so the rest of the right margin remains hoverable.
   if ((marginZone === null || marginZone === void 0 ? void 0 : marginZone.type) === 'gap' || event.clientX > getRightMarginBoundary(view) && (!blockElement || !expValEqualsNoExposure('cc_maui_remix_button_hover_corridor', 'isEnabled', true))) {
     if (!(state !== null && state !== void 0 && state.isMouseOut)) {
       clearHoverSide(view);

package/dist/esm/pm-plugins/interaction-tracking/pm-plugin.js

@@ -2,7 +2,10 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { bind } from 'bind-event-listener';
+import { isBlockControlsSuppressionTarget } from '@atlaskit/editor-common/block-controls-suppression';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { UNSAFE_expValNoExposure } from '@atlaskit/platform-feature-experiments/unsafe-exp-val-no-exposure';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { RIGHT_MARGIN_ROVO_GAP_PX } from './constants';
@@ -41,6 +44,15 @@ var isOverActiveClickArea = function isOverActiveClickArea(target, clientX) {
   var innerWidth = (_target$ownerDocument = (_target$ownerDocument2 = target.ownerDocument.defaultView) === null || _target$ownerDocument2 === void 0 ? void 0 : _target$ownerDocument2.innerWidth) !== null && _target$ownerDocument !== void 0 ? _target$ownerDocument : Number.POSITIVE_INFINITY;
   return clientX <= innerWidth - RIGHT_MARGIN_ROVO_GAP_PX;
 };
+var isOverTreatmentClickArea = function isOverTreatmentClickArea(target, editorContentArea, clientX) {
+  if (!(target instanceof Element) || !(editorContentArea instanceof HTMLElement)) {
+    return false;
+  }
+  if (!target.closest(CLICK_AREA_SELECTOR)) {
+    return false;
+  }
+  return clientX > editorContentArea.getBoundingClientRect().right;
+};
 export var interactionTrackingPluginKey = new PluginKey('interactionTrackingPlugin');
 export var createInteractionTrackingPlugin = function createInteractionTrackingPlugin() {
   var rightSideControlsEnabled = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -113,20 +125,24 @@ export var createInteractionTrackingPlugin = function createInteractionTrackingP
           mouseLeaveTimeoutId = null;
         }
 
-        // Keep controls visible when moving to block controls or the active right margin
-        // (the Rovo gap is excluded so controls still clear there).
+        // Preserve the existing hover targets for the control cohort.
         if (rightSideControlsEnabled && (isMovingToBlockControlsArea(event.relatedTarget) || isOverActiveClickArea(event.relatedTarget, event.clientX))) {
           return;
         }
+        if (rightSideControlsEnabled && isExperimentEnabled('cc_maui_remix_button_hover_corridor') && isOverTreatmentClickArea(event.relatedTarget, editorContentArea, event.clientX)) {
+          return;
+        }
         mouseLeaveTimeoutId = setTimeout(function () {
           mouseLeaveTimeoutId = null;
-          // Re-check after the debounce: keep controls if the cursor landed on block controls
-          // or the active right margin.
+          // Re-check the control cohort's existing hover targets after the debounce.
           if (rightSideControlsEnabled && typeof document !== 'undefined') {
             var el = document.elementFromPoint(lastMousePosition.x, lastMousePosition.y);
             if (el && (isMovingToBlockControlsArea(el) || isOverActiveClickArea(el, lastMousePosition.x))) {
               return;
             }
+            if (el && isExperimentEnabled('cc_maui_remix_button_hover_corridor') && isOverTreatmentClickArea(el, editorContentArea, lastMousePosition.x)) {
+              return;
+            }
           }
           handleMouseLeave(view, rightSideControlsEnabled);
         }, MOUSE_LEAVE_DEBOUNCE_MS);
@@ -137,25 +153,54 @@ export var createInteractionTrackingPlugin = function createInteractionTrackingP
           mouseLeaveTimeoutId = null;
         }
       };
+      var handleDocumentMouseMove = function handleDocumentMouseMove(event) {
+        lastMousePosition = {
+          x: event.clientX,
+          y: event.clientY
+        };
+        // Catches block controls in portals that handleDOMEvents.mousemove misses.
+        var isOverKnownHoverTarget = (editorContentArea === null || editorContentArea === void 0 ? void 0 : editorContentArea.contains(event.target)) || isMovingToBlockControlsArea(event.target);
+        var overClickArea = event.target instanceof Element && !!event.target.closest(CLICK_AREA_SELECTOR);
+        if (isOverKnownHoverTarget || overClickArea) {
+          handleMouseMove(view, event, rightSideControlsEnabled, api);
+        }
+      };
+      var handleTreatmentDocumentMouseMove = function handleTreatmentDocumentMouseMove(event) {
+        if (isBlockControlsSuppressionTarget(event.target)) {
+          var _interactionTrackingP;
+          lastMousePosition = {
+            x: event.clientX,
+            y: event.clientY
+          };
+          cancelScheduledMouseLeave();
+          if (!((_interactionTrackingP = interactionTrackingPluginKey.getState(view.state)) !== null && _interactionTrackingP !== void 0 && _interactionTrackingP.isMouseOut)) {
+            handleMouseLeave(view, rightSideControlsEnabled);
+          }
+          return;
+        }
+        handleDocumentMouseMove(event);
+      };
       if (editorContentArea) {
         if (rightSideControlsEnabled && typeof document !== 'undefined') {
-          unbindDocumentMouseMove = bind(document, {
-            type: 'mousemove',
-            listener: function listener(event) {
-              lastMousePosition = {
-                x: event.clientX,
-                y: event.clientY
-              };
-              // Catches block controls in portals that handleDOMEvents.mousemove misses.
-              var overClickArea = event.target instanceof Element && !!event.target.closest(CLICK_AREA_SELECTOR);
-              if (editorContentArea.contains(event.target) || isMovingToBlockControlsArea(event.target) || overClickArea) {
-                handleMouseMove(view, event, rightSideControlsEnabled, api);
+          // RemixButtonDecoration fires exposure when the control is visible; this
+          // mount-time split only selects the appropriate interaction listener.
+          if (UNSAFE_expValNoExposure('cc_maui_remix_button_hover_corridor', 'isEnabled', false) === true) {
+            unbindDocumentMouseMove = bind(document, {
+              type: 'mousemove',
+              listener: handleTreatmentDocumentMouseMove,
+              options: {
+                passive: true
               }
-            },
-            options: {
-              passive: true
-            }
-          });
+            });
+          } else {
+            unbindDocumentMouseMove = bind(document, {
+              type: 'mousemove',
+              listener: handleDocumentMouseMove,
+              options: {
+                passive: true
+              }
+            });
+          }
         }
         unbindMouseEnter = bind(editorContentArea, {
           type: 'mouseenter',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "16.0.0",
+	"version": "16.0.2",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 		"@atlaskit/editor-plugin-selection": "^15.0.0",
 		"@atlaskit/editor-plugin-show-diff": "^13.0.0",
 		"@atlaskit/editor-plugin-toolbar": "^12.0.0",
-		"@atlaskit/editor-plugin-type-ahead": "^16.0.0",
+		"@atlaskit/editor-plugin-type-ahead": "^16.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^13.0.0",
 		"@atlaskit/editor-plugin-width": "^16.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
@@ -50,7 +50,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^4.1.0",
 		"@atlaskit/primitives": "^22.2.0",
 		"@atlaskit/theme": "^28.0.0",
-		"@atlaskit/tmp-editor-statsig": "^147.1.0",
+		"@atlaskit/tmp-editor-statsig": "^148.0.0",
 		"@atlaskit/tokens": "^16.7.0",
 		"@atlaskit/tooltip": "^24.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -61,7 +61,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^119.0.0",
+		"@atlaskit/editor-common": "^119.5.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"