@atlaskit/editor-plugin-toolbar 12.0.11 → 12.0.12

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-toolbar
 
+## 12.0.12
+
+### Patch Changes
+
+- [`7d227f4a065e5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7d227f4a065e5) -
+  Prevent selection toolbar false failures when user intent suppresses the toolbar, and exclude
+  structural Shift+Arrow and unchanged-selection mouse interactions behind
+  platform_editor_toolbar_intent_fix
+- Updated dependencies
+
 ## 12.0.11
 
 ### Patch Changes

package/dist/cjs/pm-plugins/experiences/selection-toolbar-open-experience.js

@@ -10,6 +10,8 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _experiences = require("@atlaskit/editor-common/experiences");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
+var _visibility = require("../../ui/SelectionToolbar/visibility");
 var pluginKey = new _state.PluginKey('selectionToolbarOpenExperience');
 var START_METHOD = {
   MOUSE_UP: 'mouseUp',
@@ -18,7 +20,8 @@ var START_METHOD = {
 var ABORT_REASON = {
   SELECTION_CLEARED: 'selectionCleared',
   BLOCK_MENU_OPENED: 'blockMenuOpened',
-  EDITOR_DESTROYED: 'editorDestroyed'
+  EDITOR_DESTROYED: 'editorDestroyed',
+  USER_INTENT_SUPPRESSED: 'userIntentSuppressed'
 };
 /**
  * This experience tracks when the selection toolbar is opened.
@@ -32,11 +35,14 @@ var ABORT_REASON = {
  */
 var getSelectionToolbarOpenExperiencePlugin = exports.getSelectionToolbarOpenExperiencePlugin = function getSelectionToolbarOpenExperiencePlugin(_ref) {
   var refs = _ref.refs,
-    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
+    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
+    getCurrentUserIntent = _ref.getCurrentUserIntent;
+  var isIntentFixEnabled = (0, _fg.fg)('platform_editor_toolbar_intent_fix');
   var editorView;
   var targetEl;
   var shiftArrowKeyPressed = false;
   var mouseDownPos;
+  var mouseDownSelection;
   var getTarget = function getTarget() {
     if (!targetEl) {
       var _editorView;
@@ -44,19 +50,31 @@ var getSelectionToolbarOpenExperiencePlugin = exports.getSelectionToolbarOpenExp
     }
     return targetEl;
   };
+  var isCurrentUserIntentSuppressingToolbar = function isCurrentUserIntentSuppressingToolbar(selection) {
+    if (!selection) {
+      return false;
+    }
+    var isCellSelection = !selection.empty && '$anchorCell' in selection;
+    return (0, _visibility.isSelectionToolbarSuppressedByUserIntent)(getCurrentUserIntent === null || getCurrentUserIntent === void 0 ? void 0 : getCurrentUserIntent(), isCellSelection);
+  };
   var experience = new _experiences.Experience(_experiences.EXPERIENCE_ID.TOOLBAR_OPEN, {
     actionSubjectId: _analytics.ACTION_SUBJECT_ID.SELECTION_TOOLBAR,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     checks: [new _experiences.ExperienceCheckTimeout({
       durationMs: 1000,
       onTimeout: function onTimeout() {
-        var _editorView2;
-        if (isBlockMenuWithinNode(getTarget())) {
+        var _editorView2, _editorView3;
+        if (isIntentFixEnabled && isCurrentUserIntentSuppressingToolbar((_editorView2 = editorView) === null || _editorView2 === void 0 ? void 0 : _editorView2.state.selection)) {
+          return {
+            status: 'abort',
+            reason: ABORT_REASON.USER_INTENT_SUPPRESSED
+          };
+        } else if (isBlockMenuWithinNode(getTarget())) {
           return {
             status: 'abort',
             reason: ABORT_REASON.BLOCK_MENU_OPENED
           };
-        } else if (isSelectionWithoutTextContent((_editorView2 = editorView) === null || _editorView2 === void 0 ? void 0 : _editorView2.state.selection)) {
+        } else if (isSelectionWithoutTextContent((_editorView3 = editorView) === null || _editorView3 === void 0 ? void 0 : _editorView3.state.selection)) {
           return {
             status: 'abort',
             reason: ABORT_REASON.SELECTION_CLEARED
@@ -83,7 +101,7 @@ var getSelectionToolbarOpenExperiencePlugin = exports.getSelectionToolbarOpenExp
     })]
   });
   var shouldSkipExperienceStart = function shouldSkipExperienceStart(selection) {
-    if (isSelectionWithoutTextContent(selection) || isSelectionWithinCodeBlock(selection)) {
+    if (isSelectionWithoutTextContent(selection) || isSelectionWithinCodeBlock(selection) || isIntentFixEnabled && isCurrentUserIntentSuppressingToolbar(selection)) {
       return true;
     }
     var target = getTarget();
@@ -117,17 +135,27 @@ var getSelectionToolbarOpenExperiencePlugin = exports.getSelectionToolbarOpenExp
     },
     props: {
       handleDOMEvents: {
-        mousedown: function mousedown(_view, e) {
+        mousedown: function mousedown(view, e) {
           mouseDownPos = {
             x: e.clientX,
             y: e.clientY
           };
+          if (isIntentFixEnabled) {
+            mouseDownSelection = view.state.selection;
+          }
         },
         mouseup: function mouseup(view, e) {
-          if (!mouseDownPos || shouldSkipExperienceStart(view.state.selection)) {
+          var initialMouseDownPos = mouseDownPos;
+          var selectionChanged = (0, _visibility.hasSelectionChanged)(mouseDownSelection, view.state.selection);
+          if (isIntentFixEnabled) {
+            mouseDownPos = undefined;
+            mouseDownSelection = undefined;
+          }
+          if (!initialMouseDownPos || shouldSkipExperienceStart(view.state.selection)) {
             return;
           }
-          if (e.clientX !== mouseDownPos.x || e.clientY !== mouseDownPos.y) {
+          var mouseCoordinatesChanged = e.clientX !== initialMouseDownPos.x || e.clientY !== initialMouseDownPos.y;
+          if (mouseCoordinatesChanged && (!isIntentFixEnabled || selectionChanged)) {
             experience.start({
               method: START_METHOD.MOUSE_UP
             });
@@ -141,10 +169,8 @@ var getSelectionToolbarOpenExperiencePlugin = exports.getSelectionToolbarOpenExp
             method: START_METHOD.MOUSE_UP
           });
         },
-        keydown: function keydown(_view, _ref3) {
-          var shiftKey = _ref3.shiftKey,
-            key = _ref3.key;
-          shiftArrowKeyPressed = shiftKey && key.includes('Arrow') && !isSelectionToolbarWithinNode(getTarget());
+        keydown: function keydown(_view, event) {
+          shiftArrowKeyPressed = (isIntentFixEnabled ? (0, _visibility.isPlainShiftArrowKey)(event) : event.shiftKey && event.key.includes('Arrow')) && !isSelectionToolbarWithinNode(getTarget());
         },
         keyup: function keyup() {
           shiftArrowKeyPressed = false;
@@ -163,9 +189,9 @@ var getSelectionToolbarOpenExperiencePlugin = exports.getSelectionToolbarOpenExp
     }
   });
 };
-var isSelectionToolbarAddedInMutation = function isSelectionToolbarAddedInMutation(_ref4) {
-  var type = _ref4.type,
-    addedNodes = _ref4.addedNodes;
+var isSelectionToolbarAddedInMutation = function isSelectionToolbarAddedInMutation(_ref3) {
+  var type = _ref3.type,
+    addedNodes = _ref3.addedNodes;
   return type === 'childList' && (0, _toConsumableArray2.default)(addedNodes).some(isSelectionToolbarWithinNode);
 };
 var isSelectionToolbarWithinNode = function isSelectionToolbarWithinNode(node) {

package/dist/cjs/toolbarPlugin.js

@@ -269,6 +269,10 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
             dispatchAnalyticsEvent: function dispatchAnalyticsEvent(payload) {
               var _api$analytics;
               return api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 ? void 0 : _api$analytics.fireAnalyticsEvent(payload);
+            },
+            getCurrentUserIntent: function getCurrentUserIntent() {
+              var _api$userIntent;
+              return 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;
             }
           });
         }

package/dist/cjs/ui/SelectionToolbar/index.js

@@ -26,6 +26,7 @@ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _consts = require("../consts");
 var _keyboardConfig = require("./keyboard-config");
 var _utils2 = require("./utils");
+var _visibility = require("./visibility");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var isToolbarComponent = function isToolbarComponent(component) {
   return component.type === 'toolbar' && component.key === 'inline-text-toolbar';
@@ -100,7 +101,7 @@ var SelectionToolbar = exports.SelectionToolbar = function SelectionToolbar(_ref
   }
   if (!(isTextSelection || isCellSelection || isAllSelection) || currentUserIntent === 'dragging' || !shouldShowToolbar || currentUserIntent === 'blockMenuOpen' && (0, _experiments.editorExperiment)('platform_editor_block_menu', true) ||
   // hide toolbar when user intent is not default, except when it's dragHandleSelected without cell selection
-  currentUserIntent && currentUserIntent !== 'default' && !(currentUserIntent === 'dragHandleSelected' && !isCellSelection) || (0, _coreUtils.isSSR)()) {
+  (0, _visibility.isSelectionToolbarSuppressedByUserIntent)(currentUserIntent, isCellSelection) || (0, _coreUtils.isSSR)()) {
     return null;
   }
   var toolbarContent = /*#__PURE__*/_react.default.createElement(_toolbar.EditorToolbarProvider, {

package/dist/cjs/ui/SelectionToolbar/visibility.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isSelectionToolbarSuppressedByUserIntent = exports.isPlainShiftArrowKey = exports.hasSelectionChanged = void 0;
+var isSelectionToolbarSuppressedByUserIntent = exports.isSelectionToolbarSuppressedByUserIntent = function isSelectionToolbarSuppressedByUserIntent(currentUserIntent, isCellSelection) {
+  return Boolean(currentUserIntent && currentUserIntent !== 'default' && !(currentUserIntent === 'dragHandleSelected' && !isCellSelection));
+};
+var isPlainShiftArrowKey = exports.isPlainShiftArrowKey = function isPlainShiftArrowKey(_ref) {
+  var shiftKey = _ref.shiftKey,
+    key = _ref.key,
+    metaKey = _ref.metaKey,
+    ctrlKey = _ref.ctrlKey,
+    altKey = _ref.altKey;
+  return shiftKey && !metaKey && !ctrlKey && !altKey && key.includes('Arrow');
+};
+var hasSelectionChanged = exports.hasSelectionChanged = function hasSelectionChanged(mouseDownSelection, currentSelection) {
+  return Boolean(mouseDownSelection && !mouseDownSelection.eq(currentSelection));
+};

package/dist/es2019/pm-plugins/experiences/selection-toolbar-open-experience.js

@@ -2,6 +2,8 @@ import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { containsPopupWithNestedElement, Experience, EXPERIENCE_ID, ExperienceCheckDomMutation, ExperienceCheckTimeout, getPopupContainerFromEditorView } from '@atlaskit/editor-common/experiences';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { hasSelectionChanged, isPlainShiftArrowKey, isSelectionToolbarSuppressedByUserIntent } from '../../ui/SelectionToolbar/visibility';
 const pluginKey = new PluginKey('selectionToolbarOpenExperience');
 const START_METHOD = {
   MOUSE_UP: 'mouseUp',
@@ -10,7 +12,8 @@ const START_METHOD = {
 const ABORT_REASON = {
   SELECTION_CLEARED: 'selectionCleared',
   BLOCK_MENU_OPENED: 'blockMenuOpened',
-  EDITOR_DESTROYED: 'editorDestroyed'
+  EDITOR_DESTROYED: 'editorDestroyed',
+  USER_INTENT_SUPPRESSED: 'userIntentSuppressed'
 };
 /**
  * This experience tracks when the selection toolbar is opened.
@@ -24,13 +27,16 @@ const ABORT_REASON = {
  */
 export const getSelectionToolbarOpenExperiencePlugin = ({
   refs,
-  dispatchAnalyticsEvent
+  dispatchAnalyticsEvent,
+  getCurrentUserIntent
   // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 }) => {
+  const isIntentFixEnabled = fg('platform_editor_toolbar_intent_fix');
   let editorView;
   let targetEl;
   let shiftArrowKeyPressed = false;
   let mouseDownPos;
+  let mouseDownSelection;
   const getTarget = () => {
     if (!targetEl) {
       var _editorView;
@@ -38,19 +44,31 @@ export const getSelectionToolbarOpenExperiencePlugin = ({
     }
     return targetEl;
   };
+  const isCurrentUserIntentSuppressingToolbar = selection => {
+    if (!selection) {
+      return false;
+    }
+    const isCellSelection = !selection.empty && '$anchorCell' in selection;
+    return isSelectionToolbarSuppressedByUserIntent(getCurrentUserIntent === null || getCurrentUserIntent === void 0 ? void 0 : getCurrentUserIntent(), isCellSelection);
+  };
   const experience = new Experience(EXPERIENCE_ID.TOOLBAR_OPEN, {
     actionSubjectId: ACTION_SUBJECT_ID.SELECTION_TOOLBAR,
     dispatchAnalyticsEvent,
     checks: [new ExperienceCheckTimeout({
       durationMs: 1000,
       onTimeout: () => {
-        var _editorView2;
-        if (isBlockMenuWithinNode(getTarget())) {
+        var _editorView2, _editorView3;
+        if (isIntentFixEnabled && isCurrentUserIntentSuppressingToolbar((_editorView2 = editorView) === null || _editorView2 === void 0 ? void 0 : _editorView2.state.selection)) {
+          return {
+            status: 'abort',
+            reason: ABORT_REASON.USER_INTENT_SUPPRESSED
+          };
+        } else if (isBlockMenuWithinNode(getTarget())) {
           return {
             status: 'abort',
             reason: ABORT_REASON.BLOCK_MENU_OPENED
           };
-        } else if (isSelectionWithoutTextContent((_editorView2 = editorView) === null || _editorView2 === void 0 ? void 0 : _editorView2.state.selection)) {
+        } else if (isSelectionWithoutTextContent((_editorView3 = editorView) === null || _editorView3 === void 0 ? void 0 : _editorView3.state.selection)) {
           return {
             status: 'abort',
             reason: ABORT_REASON.SELECTION_CLEARED
@@ -76,7 +94,7 @@ export const getSelectionToolbarOpenExperiencePlugin = ({
     })]
   });
   const shouldSkipExperienceStart = selection => {
-    if (isSelectionWithoutTextContent(selection) || isSelectionWithinCodeBlock(selection)) {
+    if (isSelectionWithoutTextContent(selection) || isSelectionWithinCodeBlock(selection) || isIntentFixEnabled && isCurrentUserIntentSuppressingToolbar(selection)) {
       return true;
     }
     const target = getTarget();
@@ -108,17 +126,27 @@ export const getSelectionToolbarOpenExperiencePlugin = ({
     },
     props: {
       handleDOMEvents: {
-        mousedown: (_view, e) => {
+        mousedown: (view, e) => {
           mouseDownPos = {
             x: e.clientX,
             y: e.clientY
           };
+          if (isIntentFixEnabled) {
+            mouseDownSelection = view.state.selection;
+          }
         },
         mouseup: (view, e) => {
-          if (!mouseDownPos || shouldSkipExperienceStart(view.state.selection)) {
+          const initialMouseDownPos = mouseDownPos;
+          const selectionChanged = hasSelectionChanged(mouseDownSelection, view.state.selection);
+          if (isIntentFixEnabled) {
+            mouseDownPos = undefined;
+            mouseDownSelection = undefined;
+          }
+          if (!initialMouseDownPos || shouldSkipExperienceStart(view.state.selection)) {
             return;
           }
-          if (e.clientX !== mouseDownPos.x || e.clientY !== mouseDownPos.y) {
+          const mouseCoordinatesChanged = e.clientX !== initialMouseDownPos.x || e.clientY !== initialMouseDownPos.y;
+          if (mouseCoordinatesChanged && (!isIntentFixEnabled || selectionChanged)) {
             experience.start({
               method: START_METHOD.MOUSE_UP
             });
@@ -132,11 +160,8 @@ export const getSelectionToolbarOpenExperiencePlugin = ({
             method: START_METHOD.MOUSE_UP
           });
         },
-        keydown: (_view, {
-          shiftKey,
-          key
-        }) => {
-          shiftArrowKeyPressed = shiftKey && key.includes('Arrow') && !isSelectionToolbarWithinNode(getTarget());
+        keydown: (_view, event) => {
+          shiftArrowKeyPressed = (isIntentFixEnabled ? isPlainShiftArrowKey(event) : event.shiftKey && event.key.includes('Arrow')) && !isSelectionToolbarWithinNode(getTarget());
         },
         keyup: () => {
           shiftArrowKeyPressed = false;

package/dist/es2019/toolbarPlugin.js

@@ -260,6 +260,10 @@ export const toolbarPlugin = ({
           dispatchAnalyticsEvent: payload => {
             var _api$analytics, _api$analytics$action;
             return api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : (_api$analytics$action = _api$analytics.actions) === null || _api$analytics$action === void 0 ? void 0 : _api$analytics$action.fireAnalyticsEvent(payload);
+          },
+          getCurrentUserIntent: () => {
+            var _api$userIntent, _api$userIntent$share;
+            return 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;
           }
         })
       }] : [])];

package/dist/es2019/ui/SelectionToolbar/index.js

@@ -19,6 +19,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { SELECTION_TOOLBAR_LABEL } from '../consts';
 import { getKeyboardNavigationConfig } from './keyboard-config';
 import { getDomRefFromSelection } from './utils';
+import { isSelectionToolbarSuppressedByUserIntent } from './visibility';
 const isToolbarComponent = component => {
   return component.type === 'toolbar' && component.key === 'inline-text-toolbar';
 };
@@ -93,7 +94,7 @@ export const SelectionToolbar = ({
   }
   if (!(isTextSelection || isCellSelection || isAllSelection) || currentUserIntent === 'dragging' || !shouldShowToolbar || currentUserIntent === 'blockMenuOpen' && editorExperiment('platform_editor_block_menu', true) ||
   // hide toolbar when user intent is not default, except when it's dragHandleSelected without cell selection
-  currentUserIntent && currentUserIntent !== 'default' && !(currentUserIntent === 'dragHandleSelected' && !isCellSelection) || isSSR()) {
+  isSelectionToolbarSuppressedByUserIntent(currentUserIntent, isCellSelection) || isSSR()) {
     return null;
   }
   const toolbarContent = /*#__PURE__*/React.createElement(EditorToolbarProvider, {

package/dist/es2019/ui/SelectionToolbar/visibility.js

@@ -0,0 +1,9 @@
+export const isSelectionToolbarSuppressedByUserIntent = (currentUserIntent, isCellSelection) => Boolean(currentUserIntent && currentUserIntent !== 'default' && !(currentUserIntent === 'dragHandleSelected' && !isCellSelection));
+export const isPlainShiftArrowKey = ({
+  shiftKey,
+  key,
+  metaKey,
+  ctrlKey,
+  altKey
+}) => shiftKey && !metaKey && !ctrlKey && !altKey && key.includes('Arrow');
+export const hasSelectionChanged = (mouseDownSelection, currentSelection) => Boolean(mouseDownSelection && !mouseDownSelection.eq(currentSelection));

package/dist/esm/pm-plugins/experiences/selection-toolbar-open-experience.js

@@ -3,6 +3,8 @@ import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { containsPopupWithNestedElement, Experience, EXPERIENCE_ID, ExperienceCheckDomMutation, ExperienceCheckTimeout, getPopupContainerFromEditorView } from '@atlaskit/editor-common/experiences';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { hasSelectionChanged, isPlainShiftArrowKey, isSelectionToolbarSuppressedByUserIntent } from '../../ui/SelectionToolbar/visibility';
 var pluginKey = new PluginKey('selectionToolbarOpenExperience');
 var START_METHOD = {
   MOUSE_UP: 'mouseUp',
@@ -11,7 +13,8 @@ var START_METHOD = {
 var ABORT_REASON = {
   SELECTION_CLEARED: 'selectionCleared',
   BLOCK_MENU_OPENED: 'blockMenuOpened',
-  EDITOR_DESTROYED: 'editorDestroyed'
+  EDITOR_DESTROYED: 'editorDestroyed',
+  USER_INTENT_SUPPRESSED: 'userIntentSuppressed'
 };
 /**
  * This experience tracks when the selection toolbar is opened.
@@ -25,11 +28,14 @@ var ABORT_REASON = {
  */
 export var getSelectionToolbarOpenExperiencePlugin = function getSelectionToolbarOpenExperiencePlugin(_ref) {
   var refs = _ref.refs,
-    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
+    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
+    getCurrentUserIntent = _ref.getCurrentUserIntent;
+  var isIntentFixEnabled = fg('platform_editor_toolbar_intent_fix');
   var editorView;
   var targetEl;
   var shiftArrowKeyPressed = false;
   var mouseDownPos;
+  var mouseDownSelection;
   var getTarget = function getTarget() {
     if (!targetEl) {
       var _editorView;
@@ -37,19 +43,31 @@ export var getSelectionToolbarOpenExperiencePlugin = function getSelectionToolba
     }
     return targetEl;
   };
+  var isCurrentUserIntentSuppressingToolbar = function isCurrentUserIntentSuppressingToolbar(selection) {
+    if (!selection) {
+      return false;
+    }
+    var isCellSelection = !selection.empty && '$anchorCell' in selection;
+    return isSelectionToolbarSuppressedByUserIntent(getCurrentUserIntent === null || getCurrentUserIntent === void 0 ? void 0 : getCurrentUserIntent(), isCellSelection);
+  };
   var experience = new Experience(EXPERIENCE_ID.TOOLBAR_OPEN, {
     actionSubjectId: ACTION_SUBJECT_ID.SELECTION_TOOLBAR,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     checks: [new ExperienceCheckTimeout({
       durationMs: 1000,
       onTimeout: function onTimeout() {
-        var _editorView2;
-        if (isBlockMenuWithinNode(getTarget())) {
+        var _editorView2, _editorView3;
+        if (isIntentFixEnabled && isCurrentUserIntentSuppressingToolbar((_editorView2 = editorView) === null || _editorView2 === void 0 ? void 0 : _editorView2.state.selection)) {
+          return {
+            status: 'abort',
+            reason: ABORT_REASON.USER_INTENT_SUPPRESSED
+          };
+        } else if (isBlockMenuWithinNode(getTarget())) {
           return {
             status: 'abort',
             reason: ABORT_REASON.BLOCK_MENU_OPENED
           };
-        } else if (isSelectionWithoutTextContent((_editorView2 = editorView) === null || _editorView2 === void 0 ? void 0 : _editorView2.state.selection)) {
+        } else if (isSelectionWithoutTextContent((_editorView3 = editorView) === null || _editorView3 === void 0 ? void 0 : _editorView3.state.selection)) {
           return {
             status: 'abort',
             reason: ABORT_REASON.SELECTION_CLEARED
@@ -76,7 +94,7 @@ export var getSelectionToolbarOpenExperiencePlugin = function getSelectionToolba
     })]
   });
   var shouldSkipExperienceStart = function shouldSkipExperienceStart(selection) {
-    if (isSelectionWithoutTextContent(selection) || isSelectionWithinCodeBlock(selection)) {
+    if (isSelectionWithoutTextContent(selection) || isSelectionWithinCodeBlock(selection) || isIntentFixEnabled && isCurrentUserIntentSuppressingToolbar(selection)) {
       return true;
     }
     var target = getTarget();
@@ -110,17 +128,27 @@ export var getSelectionToolbarOpenExperiencePlugin = function getSelectionToolba
     },
     props: {
       handleDOMEvents: {
-        mousedown: function mousedown(_view, e) {
+        mousedown: function mousedown(view, e) {
           mouseDownPos = {
             x: e.clientX,
             y: e.clientY
           };
+          if (isIntentFixEnabled) {
+            mouseDownSelection = view.state.selection;
+          }
         },
         mouseup: function mouseup(view, e) {
-          if (!mouseDownPos || shouldSkipExperienceStart(view.state.selection)) {
+          var initialMouseDownPos = mouseDownPos;
+          var selectionChanged = hasSelectionChanged(mouseDownSelection, view.state.selection);
+          if (isIntentFixEnabled) {
+            mouseDownPos = undefined;
+            mouseDownSelection = undefined;
+          }
+          if (!initialMouseDownPos || shouldSkipExperienceStart(view.state.selection)) {
             return;
           }
-          if (e.clientX !== mouseDownPos.x || e.clientY !== mouseDownPos.y) {
+          var mouseCoordinatesChanged = e.clientX !== initialMouseDownPos.x || e.clientY !== initialMouseDownPos.y;
+          if (mouseCoordinatesChanged && (!isIntentFixEnabled || selectionChanged)) {
             experience.start({
               method: START_METHOD.MOUSE_UP
             });
@@ -134,10 +162,8 @@ export var getSelectionToolbarOpenExperiencePlugin = function getSelectionToolba
             method: START_METHOD.MOUSE_UP
           });
         },
-        keydown: function keydown(_view, _ref3) {
-          var shiftKey = _ref3.shiftKey,
-            key = _ref3.key;
-          shiftArrowKeyPressed = shiftKey && key.includes('Arrow') && !isSelectionToolbarWithinNode(getTarget());
+        keydown: function keydown(_view, event) {
+          shiftArrowKeyPressed = (isIntentFixEnabled ? isPlainShiftArrowKey(event) : event.shiftKey && event.key.includes('Arrow')) && !isSelectionToolbarWithinNode(getTarget());
         },
         keyup: function keyup() {
           shiftArrowKeyPressed = false;
@@ -156,9 +182,9 @@ export var getSelectionToolbarOpenExperiencePlugin = function getSelectionToolba
     }
   });
 };
-var isSelectionToolbarAddedInMutation = function isSelectionToolbarAddedInMutation(_ref4) {
-  var type = _ref4.type,
-    addedNodes = _ref4.addedNodes;
+var isSelectionToolbarAddedInMutation = function isSelectionToolbarAddedInMutation(_ref3) {
+  var type = _ref3.type,
+    addedNodes = _ref3.addedNodes;
   return type === 'childList' && _toConsumableArray(addedNodes).some(isSelectionToolbarWithinNode);
 };
 var isSelectionToolbarWithinNode = function isSelectionToolbarWithinNode(node) {

package/dist/esm/toolbarPlugin.js

@@ -262,6 +262,10 @@ export var toolbarPlugin = function toolbarPlugin(_ref) {
             dispatchAnalyticsEvent: function dispatchAnalyticsEvent(payload) {
               var _api$analytics;
               return api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 ? void 0 : _api$analytics.fireAnalyticsEvent(payload);
+            },
+            getCurrentUserIntent: function getCurrentUserIntent() {
+              var _api$userIntent;
+              return 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;
             }
           });
         }

package/dist/esm/ui/SelectionToolbar/index.js

@@ -19,6 +19,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { SELECTION_TOOLBAR_LABEL } from '../consts';
 import { getKeyboardNavigationConfig } from './keyboard-config';
 import { getDomRefFromSelection } from './utils';
+import { isSelectionToolbarSuppressedByUserIntent } from './visibility';
 var isToolbarComponent = function isToolbarComponent(component) {
   return component.type === 'toolbar' && component.key === 'inline-text-toolbar';
 };
@@ -92,7 +93,7 @@ export var SelectionToolbar = function SelectionToolbar(_ref) {
   }
   if (!(isTextSelection || isCellSelection || isAllSelection) || currentUserIntent === 'dragging' || !shouldShowToolbar || currentUserIntent === 'blockMenuOpen' && editorExperiment('platform_editor_block_menu', true) ||
   // hide toolbar when user intent is not default, except when it's dragHandleSelected without cell selection
-  currentUserIntent && currentUserIntent !== 'default' && !(currentUserIntent === 'dragHandleSelected' && !isCellSelection) || isSSR()) {
+  isSelectionToolbarSuppressedByUserIntent(currentUserIntent, isCellSelection) || isSSR()) {
     return null;
   }
   var toolbarContent = /*#__PURE__*/React.createElement(EditorToolbarProvider, {

package/dist/esm/ui/SelectionToolbar/visibility.js

@@ -0,0 +1,14 @@
+export var isSelectionToolbarSuppressedByUserIntent = function isSelectionToolbarSuppressedByUserIntent(currentUserIntent, isCellSelection) {
+  return Boolean(currentUserIntent && currentUserIntent !== 'default' && !(currentUserIntent === 'dragHandleSelected' && !isCellSelection));
+};
+export var isPlainShiftArrowKey = function isPlainShiftArrowKey(_ref) {
+  var shiftKey = _ref.shiftKey,
+    key = _ref.key,
+    metaKey = _ref.metaKey,
+    ctrlKey = _ref.ctrlKey,
+    altKey = _ref.altKey;
+  return shiftKey && !metaKey && !ctrlKey && !altKey && key.includes('Arrow');
+};
+export var hasSelectionChanged = function hasSelectionChanged(mouseDownSelection, currentSelection) {
+  return Boolean(mouseDownSelection && !mouseDownSelection.eq(currentSelection));
+};

package/dist/types/pm-plugins/experiences/selection-toolbar-open-experience.d.ts

@@ -1,7 +1,9 @@
 import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { UserIntent } from '@atlaskit/editor-plugin-user-intent/types';
 type SelectionToolbarOpenExperienceOptions = {
     dispatchAnalyticsEvent: DispatchAnalyticsEvent;
+    getCurrentUserIntent?: () => UserIntent | undefined;
     refs: {
         popupsMountPoint?: HTMLElement;
     };
@@ -16,5 +18,5 @@ type SelectionToolbarOpenExperienceOptions = {
  *
  * @see https://hello.atlassian.net/wiki/spaces/EDITOR/pages/6262117789/Experience+tracking+Selection+toolbar+open
  */
-export declare const getSelectionToolbarOpenExperiencePlugin: ({ refs, dispatchAnalyticsEvent, }: SelectionToolbarOpenExperienceOptions) => SafePlugin<{}>;
+export declare const getSelectionToolbarOpenExperiencePlugin: ({ refs, dispatchAnalyticsEvent, getCurrentUserIntent, }: SelectionToolbarOpenExperienceOptions) => SafePlugin<{}>;
 export {};

package/dist/types/ui/SelectionToolbar/visibility.d.ts

@@ -0,0 +1,5 @@
+import type { UserIntent } from '@atlaskit/editor-plugin-user-intent/types';
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
+export declare const isSelectionToolbarSuppressedByUserIntent: (currentUserIntent: UserIntent | undefined, isCellSelection: boolean) => boolean;
+export declare const isPlainShiftArrowKey: ({ shiftKey, key, metaKey, ctrlKey, altKey, }: Pick<KeyboardEvent, 'shiftKey' | 'key' | 'metaKey' | 'ctrlKey' | 'altKey'>) => boolean;
+export declare const hasSelectionChanged: (mouseDownSelection: Selection | undefined, currentSelection: Selection) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-toolbar",
-	"version": "12.0.11",
+	"version": "12.0.12",
 	"description": "Toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,16 +33,19 @@
 		"@atlaskit/editor-toolbar-model": "^1.2.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^157.0.0",
+		"@atlaskit/tmp-editor-statsig": "^158.0.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^119.13.0",
+		"@atlaskit/editor-common": "^119.16.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
 	"platform-feature-flags": {
+		"platform_editor_toolbar_intent_fix": {
+			"type": "boolean"
+		},
 		"platform_editor_blocks_patch_7": {
 			"type": "boolean",
 			"referenceOnly": true