@atlaskit/editor-plugin-block-controls 14.0.4 → 14.0.6

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 14.0.6
+
+### Patch Changes
+
+- [`2857e277050c6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2857e277050c6) -
+  Behind the `platform-dst-top-layer` feature gate, `@atlaskit/popper/unsafe-imperative`'s
+  `createPopper` now renders and positions in the browser top layer via `@atlaskit/top-layer`
+  instead of running the Popper.js engine. Positioning and teardown are applied asynchronously, as
+  Popper.js' own first update is. Flag-off behaviour is unchanged.
+
+  `@atlaskit/top-layer`: the JavaScript positioning fallback no longer clears a consumer's own
+  inline positioning and visibility styles.
+
+- [`d1b5e85073e48`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d1b5e85073e48) -
+  [ED-7926] Fix block controls hover jitter when viewing an AI Suggested Edits diff.
+
+  While a diff is on screen the block controls UI is hidden, but the hover handlers kept running:
+  `handleMouseOver` dispatched `showDragHandleAt` (flip-flopping the active node between
+  neighbouring blocks) and the right-side hover-side tracker kept dispatching
+  `setHoverSide`/`mouseEnter`, both causing visible jitter. Block controls now suppress both hover
+  paths (and hide the drag handle) while a diff is displayed, detected via the show-diff plugin's
+  `isDisplayingChanges` shared state (plus the `reviewing` user intent for AI suggestions with no
+  diff decorations), gated behind `platform_editor_diff_plugin_extended`.
+
+  To let block controls read that state without forming a circular project reference
+  (`block-controls -> show-diff -> expand -> block-controls`), the `toggleExpandRange` command and
+  `TOGGLE_EXPAND_RANGE_META_KEY` were moved from `@atlaskit/editor-plugin-expand` into
+  `@atlaskit/editor-common` (re-exported from expand for backwards compatibility).
+  `@atlaskit/editor-plugin-show-diff` no longer depends on `@atlaskit/editor-plugin-expand`, and
+  `@atlaskit/editor-plugin-block-controls` now takes an optional dependency on
+  `@atlaskit/editor-plugin-show-diff`.
+
+- Updated dependencies
+
+## 14.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 14.0.4
 
 ### Patch Changes

package/dist/cjs/pm-plugins/handle-mouse-over.js

@@ -11,6 +11,7 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _domAttrName = require("../ui/utils/dom-attr-name");
 var _decorationsAnchor = require("./decorations-anchor");
@@ -82,7 +83,7 @@ var redirectParagraphToWrappedMedia = function redirectParagraphToWrappedMedia(r
   return rootElement;
 };
 var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, event, api) {
-  var _api$blockControls, _api$editorDisabled, _api$editorViewMode, _api$blockControls$sh, _api$blockControls2, _target$classList;
+  var _api$blockControls, _api$editorDisabled, _api$editorViewMode, _api$userIntent, _api$showDiff$sharedS, _api$showDiff, _api$blockControls$sh, _api$blockControls2, _target$classList;
   var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
     isDragging = _ref.isDragging,
     activeNode = _ref.activeNode,
@@ -97,6 +98,15 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
   var isViewMode = editorViewMode === 'view';
   var toolbarFlagsEnabled = (0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
 
+  // EDITOR-7926: bail out while a diff is on screen (or a suggestion card is open) so hovering
+  // doesn't dispatch showDragHandleAt and cause the drag handle to jitter over the diff.
+  // No-exposure check as this runs on every mouseover.
+  var currentUserIntent = api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent;
+  var isDisplayingDiff = (_api$showDiff$sharedS = api === null || api === void 0 || (_api$showDiff = api.showDiff) === null || _api$showDiff === void 0 || (_api$showDiff = _api$showDiff.sharedState.currentState()) === null || _api$showDiff === void 0 ? void 0 : _api$showDiff.isDisplayingChanges) !== null && _api$showDiff$sharedS !== void 0 ? _api$showDiff$sharedS : false;
+  if ((isDisplayingDiff || currentUserIntent === 'reviewing') && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
+    return false;
+  }
+
   // We shouldn't be firing mouse over transactions when the editor is disabled,
   // except in view mode when right-side controls are enabled (show controls on block hover)
   var rightSideControlsEnabled = (_api$blockControls$sh = api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.sharedState.currentState()) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.rightSideControlsEnabled) !== null && _api$blockControls$sh !== void 0 ? _api$blockControls$sh : false;
@@ -281,8 +291,8 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
         api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 ? void 0 : _api$blockControls5.commands.showDragHandleAt(targetPos, anchorName, nodeType));
       }
       if ((0, _experiments.editorExperiment)('platform_editor_block_menu', true)) {
-        var _api$userIntent;
-        if (isMenuOpen && originalAnchorName && (api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent) === 'blockMenuOpen') {
+        var _api$userIntent2;
+        if (isMenuOpen && originalAnchorName && (api === null || api === void 0 || (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 || (_api$userIntent2 = _api$userIntent2.sharedState.currentState()) === null || _api$userIntent2 === void 0 ? void 0 : _api$userIntent2.currentUserIntent) === 'blockMenuOpen') {
           var _api$core4, _api$blockControls6;
           api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.execute(api === null || api === void 0 || (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 ? void 0 : _api$blockControls6.commands.toggleBlockMenu());
         }

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

@@ -92,6 +92,7 @@ var classifyRightMarginPosition = function classifyRightMarginPosition(view, eve
  * enabled (confluence_remix_button_right_side_block_fg); handleMouseMove returns early otherwise.
  */
 var processHoverSide = function processHoverSide(view, api) {
+  var _api$userIntent, _api$showDiff$sharedS, _api$showDiff;
   var event = pendingByView.get(view);
   if (!event) {
     return;
@@ -105,6 +106,15 @@ var processHoverSide = function processHoverSide(view, api) {
   var state = (0, _pmPlugin.getInteractionTrackingState)(view.state);
   var target = event.target instanceof HTMLElement ? event.target : null;
 
+  // EDITOR-7926: skip hover-side tracking while a diff is on screen (or a suggestion card is open)
+  // so setHoverSide/mouseEnter don't flip-flop and jitter the controls. No-exposure check as this
+  // runs on every mouse move.
+  var currentUserIntent = api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent;
+  var isDisplayingDiff = (_api$showDiff$sharedS = api === null || api === void 0 || (_api$showDiff = api.showDiff) === null || _api$showDiff === void 0 || (_api$showDiff = _api$showDiff.sharedState.currentState()) === null || _api$showDiff === void 0 ? void 0 : _api$showDiff.isDisplayingChanges) !== null && _api$showDiff$sharedS !== void 0 ? _api$showDiff$sharedS : false;
+  if ((isDisplayingDiff || currentUserIntent === 'reviewing') && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
+    return;
+  }
+
   // When hovering over block controls directly, infer side from which control we're over.
   // This is more reliable than bounds when controls are in portals outside the editor DOM.
   var rightEdgeElement = target === null || target === void 0 ? void 0 : target.closest(RIGHT_EDGE_SELECTOR);

package/dist/cjs/pm-plugins/vanilla-quick-insert.js

@@ -72,6 +72,9 @@ var createVanillaButton = exports.createVanillaButton = function createVanillaBu
       button.onclick = function () {
         return handleQuickInsert(props);
       };
+
+      // Flag-on (platform-dst-top-layer), positioning is async via a React root;
+      // safe here as VanillaTooltip stays hidden until positioned.
       var tooltip = new _vanillaTooltip.VanillaTooltip(button, props.formatMessage(_messages.blockControlsMessages.insert), 'quick-insert-button-tooltip', 'blocks-quick-insert-tooltip');
       props.cleanupCallbacks.push(function () {
         tooltip.destroy();

package/dist/cjs/ui/visibility-container.js

@@ -63,8 +63,8 @@ var VisibilityContainer = exports.VisibilityContainer = function VisibilityConta
     controlSide = _ref.controlSide,
     forceVisibleOnMouseOut = _ref.forceVisibleOnMouseOut,
     shouldUseDisplayContents = _ref.shouldUseDisplayContents;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['typeAhead', 'blockControls', 'editorViewMode', 'userIntent'], function (states) {
-      var _states$typeAheadStat, _states$blockControls, _states$blockControls2, _states$blockControls3, _states$editorViewMod, _states$userIntentSta, _states$blockControls4;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['typeAhead', 'blockControls', 'editorViewMode', 'userIntent', 'showDiff'], function (states) {
+      var _states$typeAheadStat, _states$blockControls, _states$blockControls2, _states$blockControls3, _states$editorViewMod, _states$userIntentSta, _states$showDiffState, _states$blockControls4;
       return {
         isTypeAheadOpen: (_states$typeAheadStat = states.typeAheadState) === null || _states$typeAheadStat === void 0 ? void 0 : _states$typeAheadStat.isOpen,
         isEditing: (_states$blockControls = states.blockControlsState) === null || _states$blockControls === void 0 ? void 0 : _states$blockControls.isEditing,
@@ -72,6 +72,7 @@ var VisibilityContainer = exports.VisibilityContainer = function VisibilityConta
         hoverSide: (_states$blockControls3 = states.blockControlsState) === null || _states$blockControls3 === void 0 ? void 0 : _states$blockControls3.hoverSide,
         editorViewMode: (_states$editorViewMod = states.editorViewModeState) === null || _states$editorViewMod === void 0 ? void 0 : _states$editorViewMod.mode,
         userIntent: (_states$userIntentSta = states.userIntentState) === null || _states$userIntentSta === void 0 ? void 0 : _states$userIntentSta.currentUserIntent,
+        isDisplayingDiff: (_states$showDiffState = states.showDiffState) === null || _states$showDiffState === void 0 ? void 0 : _states$showDiffState.isDisplayingChanges,
         rightSideControlsEnabled: (_states$blockControls4 = states.blockControlsState) === null || _states$blockControls4 === void 0 ? void 0 : _states$blockControls4.rightSideControlsEnabled
       };
     }),
@@ -81,6 +82,7 @@ var VisibilityContainer = exports.VisibilityContainer = function VisibilityConta
     hoverSide = _useSharedPluginState.hoverSide,
     editorViewMode = _useSharedPluginState.editorViewMode,
     userIntent = _useSharedPluginState.userIntent,
+    isDisplayingDiff = _useSharedPluginState.isDisplayingDiff,
     rightSideControlsEnabled = _useSharedPluginState.rightSideControlsEnabled;
   var isViewMode = editorViewMode === 'view';
   // rightSideControlsEnabled is the single source of truth (confluence_remix_button_right_side_block_fg from preset)
@@ -97,7 +99,9 @@ var VisibilityContainer = exports.VisibilityContainer = function VisibilityConta
   // When forceVisibleOnMouseOut is true (e.g. drag handle focused via keyboard Shift+Ctrl+H),
   // override the mouse-out condition so the control stays visible regardless of mouse position.
   var shouldHideWhenMouseOut = forceVisibleOnMouseOut ? false : hideOnMouseOut;
-  var shouldHideImmediate = isTypeAheadOpen || isEditing || shouldHideWhenMouseOut || userIntent === 'aiStreaming' || userIntent === 'viewingDiff' && (0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) || sideHidden;
+  var shouldHideImmediate = isTypeAheadOpen || isEditing || shouldHideWhenMouseOut || userIntent === 'aiStreaming' ||
+  // EDITOR-7926: hide the drag handle while a diff is on screen or a suggestion card is open.
+  (isDisplayingDiff || userIntent === 'reviewing') && (0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) || sideHidden;
 
   // Delay hiding the right control in view mode to reduce flickering when moving from block
   // toward the right-edge button (avoids rapid show/hide as mouse crosses boundaries).

package/dist/es2019/pm-plugins/handle-mouse-over.js

@@ -3,6 +3,7 @@ import { isMultiBlockSelection } from '@atlaskit/editor-common/selection';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getAnchorAttrName, getTypeNameAttrName, getTypeNameFromDom, NODE_ANCHOR_ATTR_NAME } from '../ui/utils/dom-attr-name';
 import { IGNORE_NODE_DESCENDANTS_ADVANCED_LAYOUT, IGNORE_NODES_NEXT } from './decorations-anchor';
@@ -72,7 +73,7 @@ const redirectParagraphToWrappedMedia = (rootElement, isNativeAnchorSupported) =
   return rootElement;
 };
 export const handleMouseOver = (view, event, api) => {
-  var _api$blockControls, _api$editorDisabled, _api$editorViewMode, _api$editorViewMode$s, _api$blockControls$sh, _api$blockControls2, _api$blockControls2$s, _target$classList;
+  var _api$blockControls, _api$editorDisabled, _api$editorViewMode, _api$editorViewMode$s, _api$userIntent, _api$userIntent$share, _api$showDiff$sharedS, _api$showDiff, _api$showDiff$sharedS2, _api$blockControls$sh, _api$blockControls2, _api$blockControls2$s, _target$classList;
   const {
     isDragging,
     activeNode,
@@ -89,6 +90,15 @@ export const handleMouseOver = (view, event, api) => {
   const isViewMode = editorViewMode === 'view';
   const toolbarFlagsEnabled = areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
 
+  // EDITOR-7926: bail out while a diff is on screen (or a suggestion card is open) so hovering
+  // doesn't dispatch showDragHandleAt and cause the drag handle to jitter over the diff.
+  // No-exposure check as this runs on every mouseover.
+  const currentUserIntent = api === null || api === void 0 ? void 0 : (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 ? void 0 : (_api$userIntent$share = _api$userIntent.sharedState.currentState()) === null || _api$userIntent$share === void 0 ? void 0 : _api$userIntent$share.currentUserIntent;
+  const isDisplayingDiff = (_api$showDiff$sharedS = api === null || api === void 0 ? void 0 : (_api$showDiff = api.showDiff) === null || _api$showDiff === void 0 ? void 0 : (_api$showDiff$sharedS2 = _api$showDiff.sharedState.currentState()) === null || _api$showDiff$sharedS2 === void 0 ? void 0 : _api$showDiff$sharedS2.isDisplayingChanges) !== null && _api$showDiff$sharedS !== void 0 ? _api$showDiff$sharedS : false;
+  if ((isDisplayingDiff || currentUserIntent === 'reviewing') && expValEqualsNoExposure('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
+    return false;
+  }
+
   // We shouldn't be firing mouse over transactions when the editor is disabled,
   // except in view mode when right-side controls are enabled (show controls on block hover)
   const rightSideControlsEnabled = (_api$blockControls$sh = api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : (_api$blockControls2$s = _api$blockControls2.sharedState.currentState()) === null || _api$blockControls2$s === void 0 ? void 0 : _api$blockControls2$s.rightSideControlsEnabled) !== null && _api$blockControls$sh !== void 0 ? _api$blockControls$sh : false;
@@ -273,8 +283,8 @@ export const handleMouseOver = (view, event, api) => {
         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$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 ? void 0 : _api$blockControls5.commands.showDragHandleAt(targetPos, anchorName, nodeType));
       }
       if (editorExperiment('platform_editor_block_menu', true)) {
-        var _api$userIntent, _api$userIntent$share;
-        if (isMenuOpen && originalAnchorName && (api === null || api === void 0 ? void 0 : (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 ? void 0 : (_api$userIntent$share = _api$userIntent.sharedState.currentState()) === null || _api$userIntent$share === void 0 ? void 0 : _api$userIntent$share.currentUserIntent) === 'blockMenuOpen') {
+        var _api$userIntent2, _api$userIntent2$shar;
+        if (isMenuOpen && originalAnchorName && (api === null || api === void 0 ? void 0 : (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 ? void 0 : (_api$userIntent2$shar = _api$userIntent2.sharedState.currentState()) === null || _api$userIntent2$shar === void 0 ? void 0 : _api$userIntent2$shar.currentUserIntent) === 'blockMenuOpen') {
           var _api$core4, _api$blockControls6;
           api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 ? void 0 : _api$blockControls6.commands.toggleBlockMenu());
         }

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

@@ -73,6 +73,7 @@ const classifyRightMarginPosition = (view, event) => {
  * enabled (confluence_remix_button_right_side_block_fg); handleMouseMove returns early otherwise.
  */
 const processHoverSide = (view, api) => {
+  var _api$userIntent, _api$userIntent$share, _api$showDiff$sharedS, _api$showDiff, _api$showDiff$sharedS2;
   const event = pendingByView.get(view);
   if (!event) {
     return;
@@ -86,6 +87,15 @@ const processHoverSide = (view, api) => {
   const state = getInteractionTrackingState(view.state);
   const target = event.target instanceof HTMLElement ? event.target : null;
 
+  // EDITOR-7926: skip hover-side tracking while a diff is on screen (or a suggestion card is open)
+  // so setHoverSide/mouseEnter don't flip-flop and jitter the controls. No-exposure check as this
+  // runs on every mouse move.
+  const currentUserIntent = api === null || api === void 0 ? void 0 : (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 ? void 0 : (_api$userIntent$share = _api$userIntent.sharedState.currentState()) === null || _api$userIntent$share === void 0 ? void 0 : _api$userIntent$share.currentUserIntent;
+  const isDisplayingDiff = (_api$showDiff$sharedS = api === null || api === void 0 ? void 0 : (_api$showDiff = api.showDiff) === null || _api$showDiff === void 0 ? void 0 : (_api$showDiff$sharedS2 = _api$showDiff.sharedState.currentState()) === null || _api$showDiff$sharedS2 === void 0 ? void 0 : _api$showDiff$sharedS2.isDisplayingChanges) !== null && _api$showDiff$sharedS !== void 0 ? _api$showDiff$sharedS : false;
+  if ((isDisplayingDiff || currentUserIntent === 'reviewing') && expValEqualsNoExposure('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
+    return;
+  }
+
   // When hovering over block controls directly, infer side from which control we're over.
   // This is more reliable than bounds when controls are in portals outside the editor DOM.
   const rightEdgeElement = target === null || target === void 0 ? void 0 : target.closest(RIGHT_EDGE_SELECTOR);

package/dist/es2019/pm-plugins/vanilla-quick-insert.js

@@ -63,6 +63,9 @@ export const createVanillaButton = props => {
     const button = dom.querySelector('button[data-testid="editor-quick-insert-button"]');
     if (button instanceof HTMLButtonElement) {
       button.onclick = () => handleQuickInsert(props);
+
+      // Flag-on (platform-dst-top-layer), positioning is async via a React root;
+      // safe here as VanillaTooltip stays hidden until positioned.
       const tooltip = new VanillaTooltip(button, props.formatMessage(messages.insert), 'quick-insert-button-tooltip', 'blocks-quick-insert-tooltip');
       props.cleanupCallbacks.push(() => {
         tooltip.destroy();

package/dist/es2019/ui/visibility-container.js

@@ -60,9 +60,10 @@ export const VisibilityContainer = ({
     hoverSide,
     editorViewMode,
     userIntent,
+    isDisplayingDiff,
     rightSideControlsEnabled
-  } = useSharedPluginStateWithSelector(api, ['typeAhead', 'blockControls', 'editorViewMode', 'userIntent'], states => {
-    var _states$typeAheadStat, _states$blockControls, _states$blockControls2, _states$blockControls3, _states$editorViewMod, _states$userIntentSta, _states$blockControls4;
+  } = useSharedPluginStateWithSelector(api, ['typeAhead', 'blockControls', 'editorViewMode', 'userIntent', 'showDiff'], states => {
+    var _states$typeAheadStat, _states$blockControls, _states$blockControls2, _states$blockControls3, _states$editorViewMod, _states$userIntentSta, _states$showDiffState, _states$blockControls4;
     return {
       isTypeAheadOpen: (_states$typeAheadStat = states.typeAheadState) === null || _states$typeAheadStat === void 0 ? void 0 : _states$typeAheadStat.isOpen,
       isEditing: (_states$blockControls = states.blockControlsState) === null || _states$blockControls === void 0 ? void 0 : _states$blockControls.isEditing,
@@ -70,6 +71,7 @@ export const VisibilityContainer = ({
       hoverSide: (_states$blockControls3 = states.blockControlsState) === null || _states$blockControls3 === void 0 ? void 0 : _states$blockControls3.hoverSide,
       editorViewMode: (_states$editorViewMod = states.editorViewModeState) === null || _states$editorViewMod === void 0 ? void 0 : _states$editorViewMod.mode,
       userIntent: (_states$userIntentSta = states.userIntentState) === null || _states$userIntentSta === void 0 ? void 0 : _states$userIntentSta.currentUserIntent,
+      isDisplayingDiff: (_states$showDiffState = states.showDiffState) === null || _states$showDiffState === void 0 ? void 0 : _states$showDiffState.isDisplayingChanges,
       rightSideControlsEnabled: (_states$blockControls4 = states.blockControlsState) === null || _states$blockControls4 === void 0 ? void 0 : _states$blockControls4.rightSideControlsEnabled
     };
   });
@@ -88,7 +90,9 @@ export const VisibilityContainer = ({
   // When forceVisibleOnMouseOut is true (e.g. drag handle focused via keyboard Shift+Ctrl+H),
   // override the mouse-out condition so the control stays visible regardless of mouse position.
   const shouldHideWhenMouseOut = forceVisibleOnMouseOut ? false : hideOnMouseOut;
-  const shouldHideImmediate = isTypeAheadOpen || isEditing || shouldHideWhenMouseOut || userIntent === 'aiStreaming' || userIntent === 'viewingDiff' && expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) || sideHidden;
+  const shouldHideImmediate = isTypeAheadOpen || isEditing || shouldHideWhenMouseOut || userIntent === 'aiStreaming' ||
+  // EDITOR-7926: hide the drag handle while a diff is on screen or a suggestion card is open.
+  (isDisplayingDiff || userIntent === 'reviewing') && expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) || sideHidden;
 
   // Delay hiding the right control in view mode to reduce flickering when moving from block
   // toward the right-edge button (avoids rapid show/hide as mouse crosses boundaries).

package/dist/esm/pm-plugins/handle-mouse-over.js

@@ -4,6 +4,7 @@ import { isMultiBlockSelection } from '@atlaskit/editor-common/selection';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getAnchorAttrName, getTypeNameAttrName, getTypeNameFromDom, NODE_ANCHOR_ATTR_NAME } from '../ui/utils/dom-attr-name';
 import { IGNORE_NODE_DESCENDANTS_ADVANCED_LAYOUT, IGNORE_NODES_NEXT } from './decorations-anchor';
@@ -75,7 +76,7 @@ var redirectParagraphToWrappedMedia = function redirectParagraphToWrappedMedia(r
   return rootElement;
 };
 export var handleMouseOver = function handleMouseOver(view, event, api) {
-  var _api$blockControls, _api$editorDisabled, _api$editorViewMode, _api$blockControls$sh, _api$blockControls2, _target$classList;
+  var _api$blockControls, _api$editorDisabled, _api$editorViewMode, _api$userIntent, _api$showDiff$sharedS, _api$showDiff, _api$blockControls$sh, _api$blockControls2, _target$classList;
   var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
     isDragging = _ref.isDragging,
     activeNode = _ref.activeNode,
@@ -90,6 +91,15 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
   var isViewMode = editorViewMode === 'view';
   var toolbarFlagsEnabled = areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
 
+  // EDITOR-7926: bail out while a diff is on screen (or a suggestion card is open) so hovering
+  // doesn't dispatch showDragHandleAt and cause the drag handle to jitter over the diff.
+  // No-exposure check as this runs on every mouseover.
+  var currentUserIntent = api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent;
+  var isDisplayingDiff = (_api$showDiff$sharedS = api === null || api === void 0 || (_api$showDiff = api.showDiff) === null || _api$showDiff === void 0 || (_api$showDiff = _api$showDiff.sharedState.currentState()) === null || _api$showDiff === void 0 ? void 0 : _api$showDiff.isDisplayingChanges) !== null && _api$showDiff$sharedS !== void 0 ? _api$showDiff$sharedS : false;
+  if ((isDisplayingDiff || currentUserIntent === 'reviewing') && expValEqualsNoExposure('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
+    return false;
+  }
+
   // We shouldn't be firing mouse over transactions when the editor is disabled,
   // except in view mode when right-side controls are enabled (show controls on block hover)
   var rightSideControlsEnabled = (_api$blockControls$sh = api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.sharedState.currentState()) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.rightSideControlsEnabled) !== null && _api$blockControls$sh !== void 0 ? _api$blockControls$sh : false;
@@ -274,8 +284,8 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
         api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 ? void 0 : _api$blockControls5.commands.showDragHandleAt(targetPos, anchorName, nodeType));
       }
       if (editorExperiment('platform_editor_block_menu', true)) {
-        var _api$userIntent;
-        if (isMenuOpen && originalAnchorName && (api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent) === 'blockMenuOpen') {
+        var _api$userIntent2;
+        if (isMenuOpen && originalAnchorName && (api === null || api === void 0 || (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 || (_api$userIntent2 = _api$userIntent2.sharedState.currentState()) === null || _api$userIntent2 === void 0 ? void 0 : _api$userIntent2.currentUserIntent) === 'blockMenuOpen') {
           var _api$core4, _api$blockControls6;
           api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.execute(api === null || api === void 0 || (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 ? void 0 : _api$blockControls6.commands.toggleBlockMenu());
         }

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

@@ -87,6 +87,7 @@ var classifyRightMarginPosition = function classifyRightMarginPosition(view, eve
  * enabled (confluence_remix_button_right_side_block_fg); handleMouseMove returns early otherwise.
  */
 var processHoverSide = function processHoverSide(view, api) {
+  var _api$userIntent, _api$showDiff$sharedS, _api$showDiff;
   var event = pendingByView.get(view);
   if (!event) {
     return;
@@ -100,6 +101,15 @@ var processHoverSide = function processHoverSide(view, api) {
   var state = getInteractionTrackingState(view.state);
   var target = event.target instanceof HTMLElement ? event.target : null;
 
+  // EDITOR-7926: skip hover-side tracking while a diff is on screen (or a suggestion card is open)
+  // so setHoverSide/mouseEnter don't flip-flop and jitter the controls. No-exposure check as this
+  // runs on every mouse move.
+  var currentUserIntent = api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent;
+  var isDisplayingDiff = (_api$showDiff$sharedS = api === null || api === void 0 || (_api$showDiff = api.showDiff) === null || _api$showDiff === void 0 || (_api$showDiff = _api$showDiff.sharedState.currentState()) === null || _api$showDiff === void 0 ? void 0 : _api$showDiff.isDisplayingChanges) !== null && _api$showDiff$sharedS !== void 0 ? _api$showDiff$sharedS : false;
+  if ((isDisplayingDiff || currentUserIntent === 'reviewing') && expValEqualsNoExposure('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
+    return;
+  }
+
   // When hovering over block controls directly, infer side from which control we're over.
   // This is more reliable than bounds when controls are in portals outside the editor DOM.
   var rightEdgeElement = target === null || target === void 0 ? void 0 : target.closest(RIGHT_EDGE_SELECTOR);

package/dist/esm/pm-plugins/vanilla-quick-insert.js

@@ -65,6 +65,9 @@ export var createVanillaButton = function createVanillaButton(props) {
       button.onclick = function () {
         return handleQuickInsert(props);
       };
+
+      // Flag-on (platform-dst-top-layer), positioning is async via a React root;
+      // safe here as VanillaTooltip stays hidden until positioned.
       var tooltip = new VanillaTooltip(button, props.formatMessage(messages.insert), 'quick-insert-button-tooltip', 'blocks-quick-insert-tooltip');
       props.cleanupCallbacks.push(function () {
         tooltip.destroy();

package/dist/esm/ui/visibility-container.js

@@ -52,8 +52,8 @@ export var VisibilityContainer = function VisibilityContainer(_ref) {
     controlSide = _ref.controlSide,
     forceVisibleOnMouseOut = _ref.forceVisibleOnMouseOut,
     shouldUseDisplayContents = _ref.shouldUseDisplayContents;
-  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['typeAhead', 'blockControls', 'editorViewMode', 'userIntent'], function (states) {
-      var _states$typeAheadStat, _states$blockControls, _states$blockControls2, _states$blockControls3, _states$editorViewMod, _states$userIntentSta, _states$blockControls4;
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['typeAhead', 'blockControls', 'editorViewMode', 'userIntent', 'showDiff'], function (states) {
+      var _states$typeAheadStat, _states$blockControls, _states$blockControls2, _states$blockControls3, _states$editorViewMod, _states$userIntentSta, _states$showDiffState, _states$blockControls4;
       return {
         isTypeAheadOpen: (_states$typeAheadStat = states.typeAheadState) === null || _states$typeAheadStat === void 0 ? void 0 : _states$typeAheadStat.isOpen,
         isEditing: (_states$blockControls = states.blockControlsState) === null || _states$blockControls === void 0 ? void 0 : _states$blockControls.isEditing,
@@ -61,6 +61,7 @@ export var VisibilityContainer = function VisibilityContainer(_ref) {
         hoverSide: (_states$blockControls3 = states.blockControlsState) === null || _states$blockControls3 === void 0 ? void 0 : _states$blockControls3.hoverSide,
         editorViewMode: (_states$editorViewMod = states.editorViewModeState) === null || _states$editorViewMod === void 0 ? void 0 : _states$editorViewMod.mode,
         userIntent: (_states$userIntentSta = states.userIntentState) === null || _states$userIntentSta === void 0 ? void 0 : _states$userIntentSta.currentUserIntent,
+        isDisplayingDiff: (_states$showDiffState = states.showDiffState) === null || _states$showDiffState === void 0 ? void 0 : _states$showDiffState.isDisplayingChanges,
         rightSideControlsEnabled: (_states$blockControls4 = states.blockControlsState) === null || _states$blockControls4 === void 0 ? void 0 : _states$blockControls4.rightSideControlsEnabled
       };
     }),
@@ -70,6 +71,7 @@ export var VisibilityContainer = function VisibilityContainer(_ref) {
     hoverSide = _useSharedPluginState.hoverSide,
     editorViewMode = _useSharedPluginState.editorViewMode,
     userIntent = _useSharedPluginState.userIntent,
+    isDisplayingDiff = _useSharedPluginState.isDisplayingDiff,
     rightSideControlsEnabled = _useSharedPluginState.rightSideControlsEnabled;
   var isViewMode = editorViewMode === 'view';
   // rightSideControlsEnabled is the single source of truth (confluence_remix_button_right_side_block_fg from preset)
@@ -86,7 +88,9 @@ export var VisibilityContainer = function VisibilityContainer(_ref) {
   // When forceVisibleOnMouseOut is true (e.g. drag handle focused via keyboard Shift+Ctrl+H),
   // override the mouse-out condition so the control stays visible regardless of mouse position.
   var shouldHideWhenMouseOut = forceVisibleOnMouseOut ? false : hideOnMouseOut;
-  var shouldHideImmediate = isTypeAheadOpen || isEditing || shouldHideWhenMouseOut || userIntent === 'aiStreaming' || userIntent === 'viewingDiff' && expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) || sideHidden;
+  var shouldHideImmediate = isTypeAheadOpen || isEditing || shouldHideWhenMouseOut || userIntent === 'aiStreaming' ||
+  // EDITOR-7926: hide the drag handle while a diff is on screen or a suggestion card is open.
+  (isDisplayingDiff || userIntent === 'reviewing') && expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) || sideHidden;
 
   // Delay hiding the right control in view mode to reduce flickering when moving from block
   // toward the right-edge button (avoids rapid show/hide as mouse crosses boundaries).

package/dist/types/blockControlsPluginType.d.ts

@@ -12,6 +12,7 @@ import type { LimitedModePlugin } from '@atlaskit/editor-plugin-limited-mode';
 import type { MetricsPlugin } from '@atlaskit/editor-plugin-metrics';
 import type { QuickInsertPlugin } from '@atlaskit/editor-plugin-quick-insert';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
+import type { ShowDiffPlugin } from '@atlaskit/editor-plugin-show-diff';
 import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
 import type { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
@@ -157,7 +158,8 @@ export type BlockControlsPluginDependencies = [
     OptionalPlugin<MetricsPlugin>,
     OptionalPlugin<InteractionPlugin>,
     OptionalPlugin<UserIntentPlugin>,
-    OptionalPlugin<ToolbarPlugin>
+    OptionalPlugin<ToolbarPlugin>,
+    OptionalPlugin<ShowDiffPlugin>
 ];
 export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
     actions: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "14.0.4",
+	"version": "14.0.6",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,6 +32,7 @@
 		"@atlaskit/editor-plugin-metrics": "^14.0.0",
 		"@atlaskit/editor-plugin-quick-insert": "^13.1.0",
 		"@atlaskit/editor-plugin-selection": "^13.0.0",
+		"@atlaskit/editor-plugin-show-diff": "^11.0.0",
 		"@atlaskit/editor-plugin-toolbar": "^10.1.0",
 		"@atlaskit/editor-plugin-type-ahead": "^14.0.0",
 		"@atlaskit/editor-plugin-user-intent": "^11.0.0",
@@ -48,8 +49,8 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^4.1.0",
 		"@atlaskit/primitives": "^22.2.0",
 		"@atlaskit/theme": "^27.0.0",
-		"@atlaskit/tmp-editor-statsig": "^141.1.0",
-		"@atlaskit/tokens": "^16.3.0",
+		"@atlaskit/tmp-editor-statsig": "^142.0.0",
+		"@atlaskit/tokens": "^16.4.0",
 		"@atlaskit/tooltip": "^24.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -59,7 +60,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^117.3.0",
+		"@atlaskit/editor-common": "^117.6.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"