@atlaskit/editor-plugin-annotation 4.0.4 → 4.0.5

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-annotation
 
+## 4.0.5
+
+### Patch Changes
+
+- [`a8630c1107c3d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a8630c1107c3d) -
+  [ED-28781] Hide inline text toolbar when other popups are open
+- Updated dependencies
+
 ## 4.0.4
 
 ### Patch Changes

package/dist/cjs/annotationPlugin.js

@@ -79,8 +79,7 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
         name: 'annotationKeymap',
         plugin: function plugin() {
           if (annotationProviders) {
-            var _api$analytics3;
-            return (0, _keymap.keymapPlugin)(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
+            return (0, _keymap.keymapPlugin)(api);
           }
           return;
         }
@@ -106,13 +105,13 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
         }
         var pluginState = (0, _utils.getPluginState)(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
-          var _api$analytics4;
+          var _api$analytics3;
           var _annotationProviders$ = annotationProviders.inlineComment,
             isToolbarAbove = _annotationProviders$.isToolbarAbove,
             onCommentButtonMount = _annotationProviders$.onCommentButtonMount,
             getCanAddComments = _annotationProviders$.getCanAddComments,
             contentType = _annotationProviders$.contentType;
-          var toolbarConfig = (0, _toolbar.buildToolbar)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)({
+          var toolbarConfig = (0, _toolbar.buildToolbar)(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)({
             state: state,
             intl: intl,
             isToolbarAbove: isToolbarAbove,
@@ -157,7 +156,7 @@ var selector = function selector(states) {
   };
 };
 function AnnotationContentComponent(_ref4) {
-  var _api$analytics5;
+  var _api$analytics4;
   var api = _ref4.api,
     editorView = _ref4.editorView,
     annotationProviders = _ref4.annotationProviders,
@@ -177,7 +176,7 @@ function AnnotationContentComponent(_ref4) {
     providers: annotationProviders,
     editorView: editorView,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-    editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions,
+    editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions,
     editorAPI: api
   }));
 }

package/dist/cjs/editor-commands/index.js

@@ -9,11 +9,14 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
 var _types = require("../pm-plugins/types");
 var _utils = require("../pm-plugins/utils");
 var _types2 = require("../types");
 var _transform = _interopRequireDefault(require("./transform"));
+var _utils2 = require("./utils");
 var updateInlineCommentResolvedState = exports.updateInlineCommentResolvedState = function updateInlineCommentResolvedState(editorAnalyticsAPI) {
   return function (partialNewState, resolveMethod) {
     var command = {
@@ -233,13 +236,35 @@ var showInlineCommentForBlockNode = exports.showInlineCommentForBlockNode = func
 };
 var setInlineCommentDraftState = exports.setInlineCommentDraftState = function setInlineCommentDraftState(editorAnalyticsAPI) {
   var supportedBlockNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var api = arguments.length > 2 ? arguments[2] : undefined;
   return function (drafting) {
     var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
     var targetType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'inline';
     var targetNodeId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
     var isOpeningMediaCommentFromToolbar = arguments.length > 4 ? arguments[4] : undefined;
     var commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar);
-    return (0, _pluginFactory.createCommand)(commandAction, _transform.default.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod));
+    if ((0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true) && (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
+      return function (state, dispatch) {
+        var tr = _transform.default.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod)(state.tr, state);
+        var newPluginState = commandAction(state);
+        if (tr && newPluginState) {
+          tr.setMeta(_utils.inlineCommentPluginKey, newPluginState);
+          if (drafting) {
+            (0, _utils2.setUserIntent)(api, tr);
+          } else {
+            (0, _utils2.resetUserIntent)(api, tr);
+          }
+          if (dispatch) {
+            dispatch(tr);
+          }
+        } else {
+          return false;
+        }
+        return true;
+      };
+    } else {
+      return (0, _pluginFactory.createCommand)(commandAction, _transform.default.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod));
+    }
   };
 };
 var addInlineComment = exports.addInlineComment = function addInlineComment(editorAnalyticsAPI, editorAPI) {
@@ -260,7 +285,20 @@ var addInlineComment = exports.addInlineComment = function addInlineComment(edit
         }
       };
     };
-    return (0, _pluginFactory.createCommand)(commandAction, _transform.default.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes));
+    if ((0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true) && (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
+      return function (state, dispatch) {
+        var tr = _transform.default.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes)(state.tr, state);
+        tr.setMeta(_utils.inlineCommentPluginKey, commandAction(state));
+        (0, _utils2.resetUserIntent)(editorAPI, tr);
+        if (dispatch) {
+          dispatch(tr);
+          return true;
+        }
+        return false;
+      };
+    } else {
+      return (0, _pluginFactory.createCommand)(commandAction, _transform.default.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes));
+    }
   };
 };
 var updateMouseState = exports.updateMouseState = function updateMouseState(mouseData) {

package/dist/cjs/editor-commands/utils.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setUserIntent = exports.resetUserIntent = void 0;
+var setUserIntent = exports.setUserIntent = function setUserIntent(api, tr) {
+  var _api$userIntent;
+  return api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.commands) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.setCurrentUserIntent('commenting')({
+    tr: tr
+  });
+};
+var resetUserIntent = exports.resetUserIntent = function resetUserIntent(api, tr) {
+  var _api$userIntent2;
+  return api === null || api === void 0 || (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 || (_api$userIntent2 = _api$userIntent2.commands) === null || _api$userIntent2 === void 0 ? void 0 : _api$userIntent2.setCurrentUserIntent('default')({
+    tr: tr
+  });
+};

package/dist/cjs/pm-plugins/annotation-manager-hooks.js

@@ -75,7 +75,7 @@ var startDraft = exports.startDraft = function startDraft(editorView, options) {
         });
       });
     }
-    (0, _editorCommands.setInlineCommentDraftState)(options.editorAnalyticsAPI)(true)(editorView.state, editorView.dispatch);
+    (0, _editorCommands.setInlineCommentDraftState)(options.editorAnalyticsAPI, undefined, options.api)(true)(editorView.state, editorView.dispatch);
     var _ref3 = _utils3.inlineCommentPluginKey.getState(editorView.state) || {},
       draftDecorationSet = _ref3.draftDecorationSet;
     var decorations = draftDecorationSet === null || draftDecorationSet === void 0 ? void 0 : draftDecorationSet.find();
@@ -131,7 +131,7 @@ var clearDraft = exports.clearDraft = function clearDraft(editorView, options) {
         reason: ERROR_REASON_DRAFT_NOT_STARTED
       };
     }
-    (0, _editorCommands.setInlineCommentDraftState)(options.editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
+    (0, _editorCommands.setInlineCommentDraftState)(options.editorAnalyticsAPI, undefined, options.api)(false)(editorView.state, editorView.dispatch);
     !editorView.hasFocus() && editorView.focus();
     return {
       success: true

package/dist/cjs/pm-plugins/inline-comment.js

@@ -14,11 +14,15 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _editorCommands = require("../editor-commands");
+var _utils2 = require("../editor-commands/utils");
 var _nodeviews = require("../nodeviews");
 var _annotationManagerHooks = require("./annotation-manager-hooks");
 var _pluginFactory = require("./plugin-factory");
-var _utils2 = require("./utils");
+var _toolbar = require("./toolbar");
+var _utils3 = require("./utils");
 var fetchProviderStates = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(provider, annotationIds) {
     var data, result;
@@ -137,7 +141,7 @@ var onUnResolve = function onUnResolve(editorAnalyticsAPI) {
 };
 var onMouseUp = function onMouseUp(state, dispatch) {
   return function (e) {
-    var _ref3 = (0, _utils2.getPluginState)(state) || {},
+    var _ref3 = (0, _utils3.getPluginState)(state) || {},
       mouseData = _ref3.mouseData;
     if (mouseData !== null && mouseData !== void 0 && mouseData.isSelecting) {
       (0, _editorCommands.updateMouseState)({
@@ -165,7 +169,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
     featureFlagsPluginState = options.featureFlagsPluginState,
     annotationManager = options.annotationManager;
   return new _safePlugin.SafePlugin({
-    key: _utils2.inlineCommentPluginKey,
+    key: _utils3.inlineCommentPluginKey,
     state: (0, _pluginFactory.createPluginState)(options.dispatch, initialState(provider.disallowOnWhitespace, featureFlagsPluginState, !!annotationManager)),
     view: function view(editorView) {
       var allowAnnotationFn;
@@ -196,7 +200,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
       }
       // Get initial state
       // Need to pass `editorView` to mitigate editor state going stale
-      fetchState(provider, (0, _utils2.getAllAnnotations)(editorView.state.doc), editorView, options.editorAnalyticsAPI);
+      fetchState(provider, (0, _utils3.getAllAnnotations)(editorView.state.doc), editorView, options.editorAnalyticsAPI);
       var resolve = function resolve(annotationId) {
         return onResolve(options.editorAnalyticsAPI)(editorView.state, editorView.dispatch)(annotationId);
       };
@@ -210,7 +214,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
         return onSetVisibility(editorView)(isVisible);
       };
       var setSelectedAnnotationFn = function setSelectedAnnotationFn(annotationId) {
-        var pluginState = (0, _utils2.getPluginState)(editorView.state);
+        var pluginState = (0, _utils3.getPluginState)(editorView.state);
         if ((0, _platformFeatureFlags.fg)('platform_editor_listen_for_focussed_query_param')) {
           // When feature flag is true, only close if no annotationId
           if (!annotationId) {
@@ -260,10 +264,12 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
       return {
         update: function update(view, _prevState) {
           var _prevSelectedAnnotati;
-          var _ref4 = (0, _utils2.getPluginState)(view.state) || {},
+          var _ref4 = (0, _utils3.getPluginState)(view.state) || {},
             selectedAnnotations = _ref4.selectedAnnotations,
-            annotations = _ref4.annotations;
-          var _ref5 = (0, _utils2.getPluginState)(_prevState) || {},
+            annotations = _ref4.annotations,
+            isDrafting = _ref4.isDrafting,
+            bookmark = _ref4.bookmark;
+          var _ref5 = (0, _utils3.getPluginState)(_prevState) || {},
             prevSelectedAnnotations = _ref5.selectedAnnotations;
           var selectedAnnotationId = selectedAnnotations && selectedAnnotations.length !== 0 && selectedAnnotations[0].id ? selectedAnnotations[0].id : undefined;
 
@@ -284,6 +290,23 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
               (_options$viewInlineCo = options.viewInlineCommentTraceUFOPress) === null || _options$viewInlineCo === void 0 || _options$viewInlineCo.call(options);
             }
           }
+          var api = options.api;
+          if (isDrafting && !view.state.selection.eq(_prevState.selection) && (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true) && (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
+            // It is possible that user update selection while having a active draft,
+            // so we need to reset the user intent to allow inline text toolbar to be visible
+            api === null || api === void 0 || api.core.actions.execute(function (_ref6) {
+              var tr = _ref6.tr;
+              if ((0, _toolbar.shouldSuppressFloatingToolbar)({
+                state: view.state,
+                bookmark: bookmark
+              })) {
+                (0, _utils2.setUserIntent)(api, tr);
+              } else {
+                (0, _utils2.resetUserIntent)(api, tr);
+              }
+              return tr;
+            });
+          }
           if (annotationManager) {
             // In the Editor, Annotations can be selected in three ways:
             // 1. By clicking on the annotation in the editor
@@ -293,25 +316,25 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
             // at a time when changing the selection could cause data loss.
             // The following preemptive check is designed to cover these items.
 
-            var _ref6 = (0, _utils2.getPluginState)(view.state) || {},
-              pendingSelectedAnnotations = _ref6.pendingSelectedAnnotations,
-              pendingSelectedAnnotationsUpdateCount = _ref6.pendingSelectedAnnotationsUpdateCount;
-            var _ref7 = (0, _utils2.getPluginState)(_prevState) || {},
-              prevPendingSelectedAnnotationsUpdateCount = _ref7.pendingSelectedAnnotationsUpdateCount;
+            var _ref7 = (0, _utils3.getPluginState)(view.state) || {},
+              pendingSelectedAnnotations = _ref7.pendingSelectedAnnotations,
+              pendingSelectedAnnotationsUpdateCount = _ref7.pendingSelectedAnnotationsUpdateCount;
+            var _ref8 = (0, _utils3.getPluginState)(_prevState) || {},
+              prevPendingSelectedAnnotationsUpdateCount = _ref8.pendingSelectedAnnotationsUpdateCount;
             if (!isPreemptiveGateActive && pendingSelectedAnnotationsUpdateCount !== prevPendingSelectedAnnotationsUpdateCount && !!(pendingSelectedAnnotations !== null && pendingSelectedAnnotations !== void 0 && pendingSelectedAnnotations.length)) {
               // Need to set a lock to avoid calling gate multiple times. The lock will be released
               // when the preemptive gate is complete.
               isPreemptiveGateActive = true;
               annotationManager.checkPreemptiveGate().then(function (canSelectAnnotation) {
-                var _ref8 = (0, _utils2.getPluginState)(view.state) || {},
-                  isDrafting = _ref8.isDrafting,
-                  latestPendingSelectedAnnotations = _ref8.pendingSelectedAnnotations,
-                  latestSelectedAnnotations = _ref8.selectedAnnotations;
+                var _ref9 = (0, _utils3.getPluginState)(view.state) || {},
+                  isDrafting = _ref9.isDrafting,
+                  latestPendingSelectedAnnotations = _ref9.pendingSelectedAnnotations,
+                  latestSelectedAnnotations = _ref9.selectedAnnotations;
                 if (canSelectAnnotation) {
                   if (isDrafting) {
                     // The user must have chosen to discard there draft. So before we flush the pending selections
                     // we need to clear the draft if there is one.
-                    (0, _editorCommands.setInlineCommentDraftState)(options.editorAnalyticsAPI)(false)(view.state, view.dispatch);
+                    (0, _editorCommands.setInlineCommentDraftState)(options.editorAnalyticsAPI, undefined, options.api)(false)(view.state, view.dispatch);
                   }
 
                   // Flush the pending selections into the selected annotations list.
@@ -333,9 +356,9 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
                   });
 
                   // Notify the annotation manager that the pending selection has changed.
-                  latestPendingSelectedAnnotations === null || latestPendingSelectedAnnotations === void 0 || latestPendingSelectedAnnotations.forEach(function (_ref9) {
+                  latestPendingSelectedAnnotations === null || latestPendingSelectedAnnotations === void 0 || latestPendingSelectedAnnotations.forEach(function (_ref0) {
                     var _getAnnotationInlineN2;
-                    var id = _ref9.id;
+                    var id = _ref0.id;
                     annotationManager.emit({
                       name: 'annotationSelectionChanged',
                       data: {
@@ -359,13 +382,13 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
               });
             }
           }
-          var _ref0 = (0, _utils2.getPluginState)(view.state) || {},
-            dirtyAnnotations = _ref0.dirtyAnnotations;
+          var _ref1 = (0, _utils3.getPluginState)(view.state) || {},
+            dirtyAnnotations = _ref1.dirtyAnnotations;
           if (!dirtyAnnotations) {
             return;
           }
           (0, _editorCommands.clearDirtyMark)()(view.state, view.dispatch);
-          fetchState(provider, (0, _utils2.getAllAnnotations)(view.state.doc), view, options.editorAnalyticsAPI);
+          fetchState(provider, (0, _utils3.getAllAnnotations)(view.state.doc), view, options.editorAnalyticsAPI);
         },
         destroy: function destroy() {
           // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
@@ -389,7 +412,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
     props: {
       handleDOMEvents: {
         mousedown: function mousedown(view) {
-          var pluginState = (0, _utils2.getPluginState)(view.state);
+          var pluginState = (0, _utils3.getPluginState)(view.state);
           if (!(pluginState !== null && pluginState !== void 0 && pluginState.mouseData.isSelecting)) {
             hideToolbar(view.state, view.dispatch)();
           }
@@ -414,7 +437,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
           if (!annotationId) {
             return false;
           }
-          var pluginState = (0, _utils2.getPluginState)(view.state);
+          var pluginState = (0, _utils3.getPluginState)(view.state);
           var isSelected = pluginState === null || pluginState === void 0 || (_pluginState$selected = pluginState.selectedAnnotations) === null || _pluginState$selected === void 0 ? void 0 : _pluginState$selected.some(function (selectedAnnotation) {
             return selectedAnnotation.id === annotationId;
           });
@@ -423,8 +446,8 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
           if (isSelected && !(pluginState !== null && pluginState !== void 0 && pluginState.isInlineCommentViewClosed)) {
             return false;
           }
-          var _ref1 = pluginState || {},
-            annotations = _ref1.annotations;
+          var _ref10 = pluginState || {},
+            annotations = _ref10.annotations;
           var isUnresolved = annotations && annotations[annotationId] === false;
           if (!isUnresolved) {
             return false;
@@ -452,13 +475,13 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
       },
       decorations: function decorations(state) {
         // highlight comments, depending on state
-        var _ref10 = (0, _utils2.getPluginState)(state) || {},
-          draftDecorationSet = _ref10.draftDecorationSet,
-          annotations = _ref10.annotations,
-          selectedAnnotations = _ref10.selectedAnnotations,
-          isVisible = _ref10.isVisible,
-          isInlineCommentViewClosed = _ref10.isInlineCommentViewClosed,
-          hoveredAnnotations = _ref10.hoveredAnnotations;
+        var _ref11 = (0, _utils3.getPluginState)(state) || {},
+          draftDecorationSet = _ref11.draftDecorationSet,
+          annotations = _ref11.annotations,
+          selectedAnnotations = _ref11.selectedAnnotations,
+          isVisible = _ref11.isVisible,
+          isInlineCommentViewClosed = _ref11.isInlineCommentViewClosed,
+          hoveredAnnotations = _ref11.hoveredAnnotations;
         var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : _view.DecorationSet.empty;
         var focusDecorations = [];
 
@@ -488,7 +511,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
                 focusDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
                   class: "".concat((0, _nodeviews.getBlockAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved)
                 }, {
-                  key: _utils2.decorationKey.block
+                  key: _utils3.decorationKey.block
                 }));
               } else {
                 if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
@@ -501,7 +524,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
                     focusDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
                       class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected, isHovered), " ").concat(isUnresolved)
                     }, {
-                      key: _utils2.decorationKey.block
+                      key: _utils3.decorationKey.block
                     }));
                   }
                 } else {

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

@@ -8,11 +8,12 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _editorCommands = require("../editor-commands");
-function keymapPlugin(editorAnalyticsAPI) {
+function keymapPlugin(api) {
+  var _api$analytics;
   var list = {};
   (0, _keymaps.bindKeymapWithCommand)(
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  _keymaps.addInlineComment.common, (0, _editorCommands.setInlineCommentDraftState)(editorAnalyticsAPI)(true, _analytics.INPUT_METHOD.SHORTCUT), list);
+  _keymaps.addInlineComment.common, (0, _editorCommands.setInlineCommentDraftState)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, undefined, api)(true, _analytics.INPUT_METHOD.SHORTCUT), list);
   return (0, _keymap.keymap)(list);
 }

package/dist/cjs/ui/CommentButton/utils.js

@@ -117,6 +117,6 @@ var startCommentExperience = exports.startCommentExperience = function startComm
       }
     });
     annotationProviders === null || annotationProviders === void 0 || (_annotationProviders$4 = annotationProviders.createCommentExperience) === null || _annotationProviders$4 === void 0 || _annotationProviders$4.initExperience.start();
-    return (0, _editorCommands.setInlineCommentDraftState)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(true)(state, dispatch);
+    return (0, _editorCommands.setInlineCommentDraftState)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, undefined, api)(true)(state, dispatch);
   }
 };

package/dist/cjs/ui/InlineCommentView.js

@@ -143,7 +143,7 @@ function InlineCommentView(_ref) {
       },
       onClose: function onClose() {
         if (!isAnnotationManagerEnabled) {
-          (0, _editorCommands.setInlineCommentDraftState)(editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
+          (0, _editorCommands.setInlineCommentDraftState)(editorAnalyticsAPI, undefined, editorAPI)(false)(editorView.state, editorView.dispatch);
           !editorView.hasFocus() && editorView.focus();
         }
       },

package/dist/es2019/annotationPlugin.js

@@ -70,8 +70,7 @@ export const annotationPlugin = ({
       name: 'annotationKeymap',
       plugin: () => {
         if (annotationProviders) {
-          var _api$analytics3;
-          return keymapPlugin(api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
+          return keymapPlugin(api);
         }
         return;
       }
@@ -96,14 +95,14 @@ export const annotationPlugin = ({
         }
         const pluginState = getPluginState(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
-          var _api$analytics4;
+          var _api$analytics3;
           const {
             isToolbarAbove,
             onCommentButtonMount,
             getCanAddComments,
             contentType
           } = annotationProviders.inlineComment;
-          const toolbarConfig = buildToolbar(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)({
+          const toolbarConfig = buildToolbar(api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)({
             state,
             intl,
             isToolbarAbove,
@@ -155,7 +154,7 @@ function AnnotationContentComponent({
   annotationProviders,
   dispatchAnalyticsEvent
 }) {
-  var _api$analytics5;
+  var _api$analytics4;
   const annotationState = useSharedPluginStateWithSelector(api, ['annotation'], selector);
   if (annotationState && !annotationState.isVisible && expValEquals('platform_editor_usesharedpluginstatewithselector', 'isEnabled', false)) {
     return null;
@@ -171,7 +170,7 @@ function AnnotationContentComponent({
     providers: annotationProviders,
     editorView: editorView,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-    editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions,
+    editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions,
     editorAPI: api
   }));
 }

package/dist/es2019/editor-commands/index.js

@@ -1,11 +1,14 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { INPUT_METHOD, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createCommand } from '../pm-plugins/plugin-factory';
 import { ACTIONS } from '../pm-plugins/types';
 import { getPluginState, inlineCommentPluginKey, isSelectionValid, isSupportedBlockNode } from '../pm-plugins/utils';
 import { AnnotationSelectionType } from '../types';
 import transform from './transform';
+import { resetUserIntent, setUserIntent } from './utils';
 export const updateInlineCommentResolvedState = editorAnalyticsAPI => (partialNewState, resolveMethod) => {
   const command = {
     type: ACTIONS.UPDATE_INLINE_COMMENT_STATE,
@@ -195,9 +198,30 @@ export const showInlineCommentForBlockNode = (supportedBlockNodes = []) => (node
   }
   return false;
 };
-export const setInlineCommentDraftState = (editorAnalyticsAPI, supportedBlockNodes = []) => (drafting, inputMethod = INPUT_METHOD.TOOLBAR, targetType = 'inline', targetNodeId = undefined, isOpeningMediaCommentFromToolbar) => {
+export const setInlineCommentDraftState = (editorAnalyticsAPI, supportedBlockNodes = [], api) => (drafting, inputMethod = INPUT_METHOD.TOOLBAR, targetType = 'inline', targetNodeId = undefined, isOpeningMediaCommentFromToolbar) => {
   const commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar);
-  return createCommand(commandAction, transform.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod));
+  if (editorExperiment('platform_editor_toolbar_aifc', true) && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
+    return (state, dispatch) => {
+      const tr = transform.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod)(state.tr, state);
+      const newPluginState = commandAction(state);
+      if (tr && newPluginState) {
+        tr.setMeta(inlineCommentPluginKey, newPluginState);
+        if (drafting) {
+          setUserIntent(api, tr);
+        } else {
+          resetUserIntent(api, tr);
+        }
+        if (dispatch) {
+          dispatch(tr);
+        }
+      } else {
+        return false;
+      }
+      return true;
+    };
+  } else {
+    return createCommand(commandAction, transform.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod));
+  }
 };
 export const addInlineComment = (editorAnalyticsAPI, editorAPI) => (id, supportedBlockNodes) => {
   const commandAction = editorState => ({
@@ -216,7 +240,20 @@ export const addInlineComment = (editorAnalyticsAPI, editorAPI) => (id, supporte
       editorState
     }
   });
-  return createCommand(commandAction, transform.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes));
+  if (editorExperiment('platform_editor_toolbar_aifc', true) && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
+    return (state, dispatch) => {
+      const tr = transform.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes)(state.tr, state);
+      tr.setMeta(inlineCommentPluginKey, commandAction(state));
+      resetUserIntent(editorAPI, tr);
+      if (dispatch) {
+        dispatch(tr);
+        return true;
+      }
+      return false;
+    };
+  } else {
+    return createCommand(commandAction, transform.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes));
+  }
 };
 export const updateMouseState = mouseData => createCommand({
   type: ACTIONS.INLINE_COMMENT_UPDATE_MOUSE_STATE,

package/dist/es2019/editor-commands/utils.js

@@ -0,0 +1,12 @@
+export const setUserIntent = (api, tr) => {
+  var _api$userIntent, _api$userIntent$comma;
+  return api === null || api === void 0 ? void 0 : (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 ? void 0 : (_api$userIntent$comma = _api$userIntent.commands) === null || _api$userIntent$comma === void 0 ? void 0 : _api$userIntent$comma.setCurrentUserIntent('commenting')({
+    tr
+  });
+};
+export const resetUserIntent = (api, tr) => {
+  var _api$userIntent2, _api$userIntent2$comm;
+  return api === null || api === void 0 ? void 0 : (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 ? void 0 : (_api$userIntent2$comm = _api$userIntent2.commands) === null || _api$userIntent2$comm === void 0 ? void 0 : _api$userIntent2$comm.setCurrentUserIntent('default')({
+    tr
+  });
+};

package/dist/es2019/pm-plugins/annotation-manager-hooks.js

@@ -68,7 +68,7 @@ export const startDraft = (editorView, options) => () => {
       });
     });
   }
-  setInlineCommentDraftState(options.editorAnalyticsAPI)(true)(editorView.state, editorView.dispatch);
+  setInlineCommentDraftState(options.editorAnalyticsAPI, undefined, options.api)(true)(editorView.state, editorView.dispatch);
   const {
     draftDecorationSet
   } = inlineCommentPluginKey.getState(editorView.state) || {};
@@ -124,7 +124,7 @@ export const clearDraft = (editorView, options) => () => {
       reason: ERROR_REASON_DRAFT_NOT_STARTED
     };
   }
-  setInlineCommentDraftState(options.editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
+  setInlineCommentDraftState(options.editorAnalyticsAPI, undefined, options.api)(false)(editorView.state, editorView.dispatch);
   !editorView.hasFocus() && editorView.focus();
   return {
     success: true

package/dist/es2019/pm-plugins/inline-comment.js

@@ -4,10 +4,14 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { getAnnotationInlineNodeTypes } from '@atlaskit/editor-common/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { clearDirtyMark, closeComponent, setHoveredAnnotation, setInlineCommentsVisibility, setSelectedAnnotation, flushPendingSelections, updateInlineCommentResolvedState, updateMouseState, setPendingSelectedAnnotation, setInlineCommentDraftState } from '../editor-commands';
+import { resetUserIntent, setUserIntent } from '../editor-commands/utils';
 import { getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
 import { allowAnnotation, applyDraft, clearDraft, clearAnnotation, getDraft, setIsAnnotationHovered, setIsAnnotationSelected, startDraft } from './annotation-manager-hooks';
 import { createPluginState } from './plugin-factory';
+import { shouldSuppressFloatingToolbar } from './toolbar';
 import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from './utils';
 const fetchProviderStates = async (provider, annotationIds) => {
   if ((!provider || !provider.getState) && fg('use_comments_data_annotation_updater')) {
@@ -195,7 +199,9 @@ export const inlineCommentPlugin = options => {
           var _prevSelectedAnnotati;
           const {
             selectedAnnotations,
-            annotations
+            annotations,
+            isDrafting,
+            bookmark
           } = getPluginState(view.state) || {};
           const {
             selectedAnnotations: prevSelectedAnnotations
@@ -219,6 +225,26 @@ export const inlineCommentPlugin = options => {
               (_options$viewInlineCo = options.viewInlineCommentTraceUFOPress) === null || _options$viewInlineCo === void 0 ? void 0 : _options$viewInlineCo.call(options);
             }
           }
+          const {
+            api
+          } = options;
+          if (isDrafting && !view.state.selection.eq(_prevState.selection) && editorExperiment('platform_editor_toolbar_aifc', true) && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
+            // It is possible that user update selection while having a active draft,
+            // so we need to reset the user intent to allow inline text toolbar to be visible
+            api === null || api === void 0 ? void 0 : api.core.actions.execute(({
+              tr
+            }) => {
+              if (shouldSuppressFloatingToolbar({
+                state: view.state,
+                bookmark
+              })) {
+                setUserIntent(api, tr);
+              } else {
+                resetUserIntent(api, tr);
+              }
+              return tr;
+            });
+          }
           if (annotationManager) {
             // In the Editor, Annotations can be selected in three ways:
             // 1. By clicking on the annotation in the editor
@@ -249,7 +275,7 @@ export const inlineCommentPlugin = options => {
                   if (isDrafting) {
                     // The user must have chosen to discard there draft. So before we flush the pending selections
                     // we need to clear the draft if there is one.
-                    setInlineCommentDraftState(options.editorAnalyticsAPI)(false)(view.state, view.dispatch);
+                    setInlineCommentDraftState(options.editorAnalyticsAPI, undefined, options.api)(false)(view.state, view.dispatch);
                   }
 
                   // Flush the pending selections into the selected annotations list.

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

@@ -2,11 +2,12 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { addInlineComment, bindKeymapWithCommand } from '@atlaskit/editor-common/keymaps';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { setInlineCommentDraftState } from '../editor-commands';
-export function keymapPlugin(editorAnalyticsAPI) {
+export function keymapPlugin(api) {
+  var _api$analytics;
   const list = {};
   bindKeymapWithCommand(
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  addInlineComment.common, setInlineCommentDraftState(editorAnalyticsAPI)(true, INPUT_METHOD.SHORTCUT), list);
+  addInlineComment.common, setInlineCommentDraftState(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, undefined, api)(true, INPUT_METHOD.SHORTCUT), list);
   return keymap(list);
 }

package/dist/es2019/ui/CommentButton/utils.js

@@ -117,6 +117,6 @@ export const startCommentExperience = ({
       }
     });
     annotationProviders === null || annotationProviders === void 0 ? void 0 : (_annotationProviders$4 = annotationProviders.createCommentExperience) === null || _annotationProviders$4 === void 0 ? void 0 : _annotationProviders$4.initExperience.start();
-    return setInlineCommentDraftState(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(true)(state, dispatch);
+    return setInlineCommentDraftState(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, undefined, api)(true)(state, dispatch);
   }
 };

package/dist/es2019/ui/InlineCommentView.js

@@ -141,7 +141,7 @@ export function InlineCommentView({
       },
       onClose: () => {
         if (!isAnnotationManagerEnabled) {
-          setInlineCommentDraftState(editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
+          setInlineCommentDraftState(editorAnalyticsAPI, undefined, editorAPI)(false)(editorView.state, editorView.dispatch);
           !editorView.hasFocus() && editorView.focus();
         }
       },

package/dist/esm/annotationPlugin.js

@@ -72,8 +72,7 @@ export var annotationPlugin = function annotationPlugin(_ref) {
         name: 'annotationKeymap',
         plugin: function plugin() {
           if (annotationProviders) {
-            var _api$analytics3;
-            return keymapPlugin(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
+            return keymapPlugin(api);
           }
           return;
         }
@@ -99,13 +98,13 @@ export var annotationPlugin = function annotationPlugin(_ref) {
         }
         var pluginState = getPluginState(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
-          var _api$analytics4;
+          var _api$analytics3;
           var _annotationProviders$ = annotationProviders.inlineComment,
             isToolbarAbove = _annotationProviders$.isToolbarAbove,
             onCommentButtonMount = _annotationProviders$.onCommentButtonMount,
             getCanAddComments = _annotationProviders$.getCanAddComments,
             contentType = _annotationProviders$.contentType;
-          var toolbarConfig = buildToolbar(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)({
+          var toolbarConfig = buildToolbar(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)({
             state: state,
             intl: intl,
             isToolbarAbove: isToolbarAbove,
@@ -150,7 +149,7 @@ var selector = function selector(states) {
   };
 };
 function AnnotationContentComponent(_ref4) {
-  var _api$analytics5;
+  var _api$analytics4;
   var api = _ref4.api,
     editorView = _ref4.editorView,
     annotationProviders = _ref4.annotationProviders,
@@ -170,7 +169,7 @@ function AnnotationContentComponent(_ref4) {
     providers: annotationProviders,
     editorView: editorView,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-    editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions,
+    editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions,
     editorAPI: api
   }));
 }

package/dist/esm/editor-commands/index.js

@@ -2,11 +2,14 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { INPUT_METHOD, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createCommand } from '../pm-plugins/plugin-factory';
 import { ACTIONS } from '../pm-plugins/types';
 import { getPluginState, inlineCommentPluginKey, isSelectionValid, isSupportedBlockNode } from '../pm-plugins/utils';
 import { AnnotationSelectionType } from '../types';
 import transform from './transform';
+import { resetUserIntent, setUserIntent } from './utils';
 export var updateInlineCommentResolvedState = function updateInlineCommentResolvedState(editorAnalyticsAPI) {
   return function (partialNewState, resolveMethod) {
     var command = {
@@ -226,13 +229,35 @@ export var showInlineCommentForBlockNode = function showInlineCommentForBlockNod
 };
 export var setInlineCommentDraftState = function setInlineCommentDraftState(editorAnalyticsAPI) {
   var supportedBlockNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var api = arguments.length > 2 ? arguments[2] : undefined;
   return function (drafting) {
     var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.TOOLBAR;
     var targetType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'inline';
     var targetNodeId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
     var isOpeningMediaCommentFromToolbar = arguments.length > 4 ? arguments[4] : undefined;
     var commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar);
-    return createCommand(commandAction, transform.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod));
+    if (editorExperiment('platform_editor_toolbar_aifc', true) && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
+      return function (state, dispatch) {
+        var tr = transform.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod)(state.tr, state);
+        var newPluginState = commandAction(state);
+        if (tr && newPluginState) {
+          tr.setMeta(inlineCommentPluginKey, newPluginState);
+          if (drafting) {
+            setUserIntent(api, tr);
+          } else {
+            resetUserIntent(api, tr);
+          }
+          if (dispatch) {
+            dispatch(tr);
+          }
+        } else {
+          return false;
+        }
+        return true;
+      };
+    } else {
+      return createCommand(commandAction, transform.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod));
+    }
   };
 };
 export var addInlineComment = function addInlineComment(editorAnalyticsAPI, editorAPI) {
@@ -253,7 +278,20 @@ export var addInlineComment = function addInlineComment(editorAnalyticsAPI, edit
         }
       };
     };
-    return createCommand(commandAction, transform.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes));
+    if (editorExperiment('platform_editor_toolbar_aifc', true) && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
+      return function (state, dispatch) {
+        var tr = transform.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes)(state.tr, state);
+        tr.setMeta(inlineCommentPluginKey, commandAction(state));
+        resetUserIntent(editorAPI, tr);
+        if (dispatch) {
+          dispatch(tr);
+          return true;
+        }
+        return false;
+      };
+    } else {
+      return createCommand(commandAction, transform.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes));
+    }
   };
 };
 export var updateMouseState = function updateMouseState(mouseData) {

package/dist/esm/editor-commands/utils.js

@@ -0,0 +1,12 @@
+export var setUserIntent = function setUserIntent(api, tr) {
+  var _api$userIntent;
+  return api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.commands) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.setCurrentUserIntent('commenting')({
+    tr: tr
+  });
+};
+export var resetUserIntent = function resetUserIntent(api, tr) {
+  var _api$userIntent2;
+  return api === null || api === void 0 || (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 || (_api$userIntent2 = _api$userIntent2.commands) === null || _api$userIntent2 === void 0 ? void 0 : _api$userIntent2.setCurrentUserIntent('default')({
+    tr: tr
+  });
+};

package/dist/esm/pm-plugins/annotation-manager-hooks.js

@@ -69,7 +69,7 @@ export var startDraft = function startDraft(editorView, options) {
         });
       });
     }
-    setInlineCommentDraftState(options.editorAnalyticsAPI)(true)(editorView.state, editorView.dispatch);
+    setInlineCommentDraftState(options.editorAnalyticsAPI, undefined, options.api)(true)(editorView.state, editorView.dispatch);
     var _ref3 = inlineCommentPluginKey.getState(editorView.state) || {},
       draftDecorationSet = _ref3.draftDecorationSet;
     var decorations = draftDecorationSet === null || draftDecorationSet === void 0 ? void 0 : draftDecorationSet.find();
@@ -125,7 +125,7 @@ export var clearDraft = function clearDraft(editorView, options) {
         reason: ERROR_REASON_DRAFT_NOT_STARTED
       };
     }
-    setInlineCommentDraftState(options.editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
+    setInlineCommentDraftState(options.editorAnalyticsAPI, undefined, options.api)(false)(editorView.state, editorView.dispatch);
     !editorView.hasFocus() && editorView.focus();
     return {
       success: true

package/dist/esm/pm-plugins/inline-comment.js

@@ -7,10 +7,14 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { getAnnotationInlineNodeTypes } from '@atlaskit/editor-common/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { clearDirtyMark, closeComponent, setHoveredAnnotation, setInlineCommentsVisibility, setSelectedAnnotation, flushPendingSelections, updateInlineCommentResolvedState, updateMouseState, setPendingSelectedAnnotation, setInlineCommentDraftState } from '../editor-commands';
+import { resetUserIntent, setUserIntent } from '../editor-commands/utils';
 import { getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
 import { allowAnnotation, applyDraft, clearDraft, clearAnnotation, getDraft, setIsAnnotationHovered, setIsAnnotationSelected, startDraft } from './annotation-manager-hooks';
 import { createPluginState } from './plugin-factory';
+import { shouldSuppressFloatingToolbar } from './toolbar';
 import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from './utils';
 var fetchProviderStates = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(provider, annotationIds) {
@@ -255,7 +259,9 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
           var _prevSelectedAnnotati;
           var _ref4 = getPluginState(view.state) || {},
             selectedAnnotations = _ref4.selectedAnnotations,
-            annotations = _ref4.annotations;
+            annotations = _ref4.annotations,
+            isDrafting = _ref4.isDrafting,
+            bookmark = _ref4.bookmark;
           var _ref5 = getPluginState(_prevState) || {},
             prevSelectedAnnotations = _ref5.selectedAnnotations;
           var selectedAnnotationId = selectedAnnotations && selectedAnnotations.length !== 0 && selectedAnnotations[0].id ? selectedAnnotations[0].id : undefined;
@@ -277,6 +283,23 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
               (_options$viewInlineCo = options.viewInlineCommentTraceUFOPress) === null || _options$viewInlineCo === void 0 || _options$viewInlineCo.call(options);
             }
           }
+          var api = options.api;
+          if (isDrafting && !view.state.selection.eq(_prevState.selection) && editorExperiment('platform_editor_toolbar_aifc', true) && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
+            // It is possible that user update selection while having a active draft,
+            // so we need to reset the user intent to allow inline text toolbar to be visible
+            api === null || api === void 0 || api.core.actions.execute(function (_ref6) {
+              var tr = _ref6.tr;
+              if (shouldSuppressFloatingToolbar({
+                state: view.state,
+                bookmark: bookmark
+              })) {
+                setUserIntent(api, tr);
+              } else {
+                resetUserIntent(api, tr);
+              }
+              return tr;
+            });
+          }
           if (annotationManager) {
             // In the Editor, Annotations can be selected in three ways:
             // 1. By clicking on the annotation in the editor
@@ -286,25 +309,25 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
             // at a time when changing the selection could cause data loss.
             // The following preemptive check is designed to cover these items.
 
-            var _ref6 = getPluginState(view.state) || {},
-              pendingSelectedAnnotations = _ref6.pendingSelectedAnnotations,
-              pendingSelectedAnnotationsUpdateCount = _ref6.pendingSelectedAnnotationsUpdateCount;
-            var _ref7 = getPluginState(_prevState) || {},
-              prevPendingSelectedAnnotationsUpdateCount = _ref7.pendingSelectedAnnotationsUpdateCount;
+            var _ref7 = getPluginState(view.state) || {},
+              pendingSelectedAnnotations = _ref7.pendingSelectedAnnotations,
+              pendingSelectedAnnotationsUpdateCount = _ref7.pendingSelectedAnnotationsUpdateCount;
+            var _ref8 = getPluginState(_prevState) || {},
+              prevPendingSelectedAnnotationsUpdateCount = _ref8.pendingSelectedAnnotationsUpdateCount;
             if (!isPreemptiveGateActive && pendingSelectedAnnotationsUpdateCount !== prevPendingSelectedAnnotationsUpdateCount && !!(pendingSelectedAnnotations !== null && pendingSelectedAnnotations !== void 0 && pendingSelectedAnnotations.length)) {
               // Need to set a lock to avoid calling gate multiple times. The lock will be released
               // when the preemptive gate is complete.
               isPreemptiveGateActive = true;
               annotationManager.checkPreemptiveGate().then(function (canSelectAnnotation) {
-                var _ref8 = getPluginState(view.state) || {},
-                  isDrafting = _ref8.isDrafting,
-                  latestPendingSelectedAnnotations = _ref8.pendingSelectedAnnotations,
-                  latestSelectedAnnotations = _ref8.selectedAnnotations;
+                var _ref9 = getPluginState(view.state) || {},
+                  isDrafting = _ref9.isDrafting,
+                  latestPendingSelectedAnnotations = _ref9.pendingSelectedAnnotations,
+                  latestSelectedAnnotations = _ref9.selectedAnnotations;
                 if (canSelectAnnotation) {
                   if (isDrafting) {
                     // The user must have chosen to discard there draft. So before we flush the pending selections
                     // we need to clear the draft if there is one.
-                    setInlineCommentDraftState(options.editorAnalyticsAPI)(false)(view.state, view.dispatch);
+                    setInlineCommentDraftState(options.editorAnalyticsAPI, undefined, options.api)(false)(view.state, view.dispatch);
                   }
 
                   // Flush the pending selections into the selected annotations list.
@@ -326,9 +349,9 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
                   });
 
                   // Notify the annotation manager that the pending selection has changed.
-                  latestPendingSelectedAnnotations === null || latestPendingSelectedAnnotations === void 0 || latestPendingSelectedAnnotations.forEach(function (_ref9) {
+                  latestPendingSelectedAnnotations === null || latestPendingSelectedAnnotations === void 0 || latestPendingSelectedAnnotations.forEach(function (_ref0) {
                     var _getAnnotationInlineN2;
-                    var id = _ref9.id;
+                    var id = _ref0.id;
                     annotationManager.emit({
                       name: 'annotationSelectionChanged',
                       data: {
@@ -352,8 +375,8 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
               });
             }
           }
-          var _ref0 = getPluginState(view.state) || {},
-            dirtyAnnotations = _ref0.dirtyAnnotations;
+          var _ref1 = getPluginState(view.state) || {},
+            dirtyAnnotations = _ref1.dirtyAnnotations;
           if (!dirtyAnnotations) {
             return;
           }
@@ -416,8 +439,8 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
           if (isSelected && !(pluginState !== null && pluginState !== void 0 && pluginState.isInlineCommentViewClosed)) {
             return false;
           }
-          var _ref1 = pluginState || {},
-            annotations = _ref1.annotations;
+          var _ref10 = pluginState || {},
+            annotations = _ref10.annotations;
           var isUnresolved = annotations && annotations[annotationId] === false;
           if (!isUnresolved) {
             return false;
@@ -445,13 +468,13 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
       },
       decorations: function decorations(state) {
         // highlight comments, depending on state
-        var _ref10 = getPluginState(state) || {},
-          draftDecorationSet = _ref10.draftDecorationSet,
-          annotations = _ref10.annotations,
-          selectedAnnotations = _ref10.selectedAnnotations,
-          isVisible = _ref10.isVisible,
-          isInlineCommentViewClosed = _ref10.isInlineCommentViewClosed,
-          hoveredAnnotations = _ref10.hoveredAnnotations;
+        var _ref11 = getPluginState(state) || {},
+          draftDecorationSet = _ref11.draftDecorationSet,
+          annotations = _ref11.annotations,
+          selectedAnnotations = _ref11.selectedAnnotations,
+          isVisible = _ref11.isVisible,
+          isInlineCommentViewClosed = _ref11.isInlineCommentViewClosed,
+          hoveredAnnotations = _ref11.hoveredAnnotations;
         var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : DecorationSet.empty;
         var focusDecorations = [];
 

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

@@ -2,11 +2,12 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { addInlineComment, bindKeymapWithCommand } from '@atlaskit/editor-common/keymaps';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { setInlineCommentDraftState } from '../editor-commands';
-export function keymapPlugin(editorAnalyticsAPI) {
+export function keymapPlugin(api) {
+  var _api$analytics;
   var list = {};
   bindKeymapWithCommand(
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  addInlineComment.common, setInlineCommentDraftState(editorAnalyticsAPI)(true, INPUT_METHOD.SHORTCUT), list);
+  addInlineComment.common, setInlineCommentDraftState(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, undefined, api)(true, INPUT_METHOD.SHORTCUT), list);
   return keymap(list);
 }

package/dist/esm/ui/CommentButton/utils.js

@@ -111,6 +111,6 @@ export var startCommentExperience = function startCommentExperience(_ref6) {
       }
     });
     annotationProviders === null || annotationProviders === void 0 || (_annotationProviders$4 = annotationProviders.createCommentExperience) === null || _annotationProviders$4 === void 0 || _annotationProviders$4.initExperience.start();
-    return setInlineCommentDraftState(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(true)(state, dispatch);
+    return setInlineCommentDraftState(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, undefined, api)(true)(state, dispatch);
   }
 };

package/dist/esm/ui/InlineCommentView.js

@@ -134,7 +134,7 @@ export function InlineCommentView(_ref) {
       },
       onClose: function onClose() {
         if (!isAnnotationManagerEnabled) {
-          setInlineCommentDraftState(editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
+          setInlineCommentDraftState(editorAnalyticsAPI, undefined, editorAPI)(false)(editorView.state, editorView.dispatch);
           !editorView.hasFocus() && editorView.focus();
         }
       },

package/dist/types/annotationPluginType.d.ts

@@ -5,6 +5,7 @@ import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmo
 import type { EditorViewModeEffectsPlugin } from '@atlaskit/editor-plugin-editor-viewmode-effects';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
+import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { showInlineCommentForBlockNode } from './editor-commands';
@@ -20,7 +21,8 @@ export type AnnotationPluginDependencies = [
     OptionalPlugin<EditorViewModePlugin>,
     OptionalPlugin<FeatureFlagsPlugin>,
     OptionalPlugin<ConnectivityPlugin>,
-    OptionalPlugin<ToolbarPlugin>
+    OptionalPlugin<ToolbarPlugin>,
+    OptionalPlugin<UserIntentPlugin>
 ];
 export type AnnotationPluginOptions = AnnotationProviders;
 export type AnnotationPlugin = NextEditorPlugin<'annotation', {

package/dist/types/editor-commands/index.d.ts

@@ -20,7 +20,7 @@ export declare const removeInlineCommentFromDoc: (editorAnalyticsAPI: EditorAnal
  * @example
  */
 export declare const showInlineCommentForBlockNode: (supportedBlockNodes?: string[]) => (node: PMNode | null, viewMethod?: VIEW_METHOD, isOpeningMediaCommentFromToolbar?: boolean) => Command;
-export declare const setInlineCommentDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, supportedBlockNodes?: string[]) => (drafting: boolean, inputMethod?: InlineCommentInputMethod, targetType?: TargetType, targetNodeId?: string | undefined, isOpeningMediaCommentFromToolbar?: boolean) => Command;
+export declare const setInlineCommentDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, supportedBlockNodes?: string[], api?: ExtractInjectionAPI<AnnotationPlugin>) => (drafting: boolean, inputMethod?: InlineCommentInputMethod, targetType?: TargetType, targetNodeId?: string | undefined, isOpeningMediaCommentFromToolbar?: boolean) => Command;
 export declare const addInlineComment: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorAPI?: ExtractInjectionAPI<AnnotationPlugin> | undefined) => (id: string, supportedBlockNodes?: string[]) => Command;
 export declare const updateMouseState: (mouseData: InlineCommentMouseData) => Command;
 export declare const setSelectedAnnotation: (id: string) => Command;

package/dist/types/editor-commands/utils.d.ts

@@ -0,0 +1,5 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { AnnotationPlugin } from '../annotationPluginType';
+export declare const setUserIntent: (api: ExtractInjectionAPI<AnnotationPlugin> | undefined, tr: Transaction) => Transaction | null | undefined;
+export declare const resetUserIntent: (api: ExtractInjectionAPI<AnnotationPlugin> | undefined, tr: Transaction) => Transaction | null | undefined;

package/dist/types/pm-plugins/keymap.d.ts

@@ -1,3 +1,4 @@
-import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-export declare function keymapPlugin(editorAnalyticsAPI: EditorAnalyticsAPI | undefined): SafePlugin;
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { AnnotationPlugin } from '../annotationPluginType';
+export declare function keymapPlugin(api: ExtractInjectionAPI<AnnotationPlugin> | undefined): SafePlugin;

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

@@ -5,6 +5,7 @@ import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmo
 import type { EditorViewModeEffectsPlugin } from '@atlaskit/editor-plugin-editor-viewmode-effects';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
+import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { showInlineCommentForBlockNode } from './editor-commands';
@@ -20,7 +21,8 @@ export type AnnotationPluginDependencies = [
     OptionalPlugin<EditorViewModePlugin>,
     OptionalPlugin<FeatureFlagsPlugin>,
     OptionalPlugin<ConnectivityPlugin>,
-    OptionalPlugin<ToolbarPlugin>
+    OptionalPlugin<ToolbarPlugin>,
+    OptionalPlugin<UserIntentPlugin>
 ];
 export type AnnotationPluginOptions = AnnotationProviders;
 export type AnnotationPlugin = NextEditorPlugin<'annotation', {

package/dist/types-ts4.5/editor-commands/index.d.ts

@@ -20,7 +20,7 @@ export declare const removeInlineCommentFromDoc: (editorAnalyticsAPI: EditorAnal
  * @example
  */
 export declare const showInlineCommentForBlockNode: (supportedBlockNodes?: string[]) => (node: PMNode | null, viewMethod?: VIEW_METHOD, isOpeningMediaCommentFromToolbar?: boolean) => Command;
-export declare const setInlineCommentDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, supportedBlockNodes?: string[]) => (drafting: boolean, inputMethod?: InlineCommentInputMethod, targetType?: TargetType, targetNodeId?: string | undefined, isOpeningMediaCommentFromToolbar?: boolean) => Command;
+export declare const setInlineCommentDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, supportedBlockNodes?: string[], api?: ExtractInjectionAPI<AnnotationPlugin>) => (drafting: boolean, inputMethod?: InlineCommentInputMethod, targetType?: TargetType, targetNodeId?: string | undefined, isOpeningMediaCommentFromToolbar?: boolean) => Command;
 export declare const addInlineComment: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorAPI?: ExtractInjectionAPI<AnnotationPlugin> | undefined) => (id: string, supportedBlockNodes?: string[]) => Command;
 export declare const updateMouseState: (mouseData: InlineCommentMouseData) => Command;
 export declare const setSelectedAnnotation: (id: string) => Command;

package/dist/types-ts4.5/editor-commands/utils.d.ts

@@ -0,0 +1,5 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { AnnotationPlugin } from '../annotationPluginType';
+export declare const setUserIntent: (api: ExtractInjectionAPI<AnnotationPlugin> | undefined, tr: Transaction) => Transaction | null | undefined;
+export declare const resetUserIntent: (api: ExtractInjectionAPI<AnnotationPlugin> | undefined, tr: Transaction) => Transaction | null | undefined;

package/dist/types-ts4.5/pm-plugins/keymap.d.ts

@@ -1,3 +1,4 @@
-import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-export declare function keymapPlugin(editorAnalyticsAPI: EditorAnalyticsAPI | undefined): SafePlugin;
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { AnnotationPlugin } from '../annotationPluginType';
+export declare function keymapPlugin(api: ExtractInjectionAPI<AnnotationPlugin> | undefined): SafePlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "4.0.4",
+	"version": "4.0.5",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,6 +34,7 @@
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^4.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^3.0.0",
 		"@atlaskit/editor-plugin-toolbar": "^1.1.0",
+		"@atlaskit/editor-plugin-user-intent": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-toolbar": "^0.8.0",
 		"@atlaskit/editor-toolbar-model": "^0.2.0",
@@ -45,7 +46,7 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^108.3.0",
+		"@atlaskit/editor-common": "^108.5.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},