@atlaskit/editor-plugin-annotation 2.5.0 → 2.5.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-annotation
 
+## 2.5.1
+
+### Patch Changes
+
+- [#140758](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/140758)
+  [`02525232cc778`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/02525232cc778) -
+  [ux] ED-27140 suppress toolbars when inline commenting
+- Updated dependencies
+
 ## 2.5.0
 
 ### Minor Changes

package/dist/cjs/annotationPlugin.js

@@ -8,6 +8,7 @@ exports.annotationPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _hooks = require("@atlaskit/editor-common/hooks");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _editorCommands = require("./editor-commands");
 var _annotationMark = require("./nodeviews/annotationMark");
@@ -57,7 +58,8 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
               dispatch: dispatch,
               provider: annotationProviders.inlineComment,
               editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions,
-              featureFlagsPluginState: featureFlags
+              featureFlagsPluginState: featureFlags,
+              selectCommentExperience: annotationProviders.selectCommentExperience
             });
           }
           return;
@@ -74,6 +76,19 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
       }];
     },
     pluginsOptions: {
+      floatingToolbar: function floatingToolbar(state) {
+        if (!(0, _platformFeatureFlags.fg)('platform_editor_fix_toolbar_comment_jump')) {
+          return;
+        }
+        var pluginState = (0, _utils.getPluginState)(state);
+        var bookmark = pluginState === null || pluginState === void 0 ? void 0 : pluginState.bookmark;
+        if ((0, _toolbar.shouldSuppressFloatingToolbar)({
+          state: state,
+          bookmark: bookmark
+        })) {
+          return (0, _toolbar.buildSuppressedToolbar)(state);
+        }
+      },
       selectionToolbar: function selectionToolbar(state, intl) {
         if (!annotationProviders) {
           return;

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

@@ -216,8 +216,22 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
       editorView.root.addEventListener('mouseup', mouseUp);
       return {
         update: function update(view, _prevState) {
-          var _ref4 = (0, _utils.getPluginState)(view.state) || {},
-            dirtyAnnotations = _ref4.dirtyAnnotations;
+          if ((0, _platformFeatureFlags.fg)('confluence_comments_select_comment_experience')) {
+            var _prevSelectedAnnotati;
+            var _ref4 = (0, _utils.getPluginState)(view.state) || {},
+              selectedAnnotations = _ref4.selectedAnnotations;
+            var _ref5 = (0, _utils.getPluginState)(_prevState) || {},
+              prevSelectedAnnotations = _ref5.selectedAnnotations;
+
+            // If the new state has a selected annotation, and it's different from the previous one
+            // then we mark the select annotation experience as complete
+            if (selectedAnnotations && selectedAnnotations.length !== 0 && selectedAnnotations[0].id !== (prevSelectedAnnotations === null || prevSelectedAnnotations === void 0 || (_prevSelectedAnnotati = prevSelectedAnnotations[0]) === null || _prevSelectedAnnotati === void 0 ? void 0 : _prevSelectedAnnotati.id)) {
+              var _options$selectCommen;
+              (_options$selectCommen = options.selectCommentExperience) === null || _options$selectCommen === void 0 || _options$selectCommen.selectAnnotation.complete(selectedAnnotations[0].id);
+            }
+          }
+          var _ref6 = (0, _utils.getPluginState)(view.state) || {},
+            dirtyAnnotations = _ref6.dirtyAnnotations;
           if (!dirtyAnnotations) {
             return;
           }
@@ -270,8 +284,8 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
           if (isSelected && !(pluginState !== null && pluginState !== void 0 && pluginState.isInlineCommentViewClosed)) {
             return false;
           }
-          var _ref5 = pluginState || {},
-            annotations = _ref5.annotations;
+          var _ref7 = pluginState || {},
+            annotations = _ref7.annotations;
           var isUnresolved = annotations && annotations[annotationId] === false;
           if (!isUnresolved) {
             return false;
@@ -282,13 +296,13 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
       },
       decorations: function decorations(state) {
         // highlight comments, depending on state
-        var _ref6 = (0, _utils.getPluginState)(state) || {},
-          draftDecorationSet = _ref6.draftDecorationSet,
-          annotations = _ref6.annotations,
-          selectedAnnotations = _ref6.selectedAnnotations,
-          isVisible = _ref6.isVisible,
-          isInlineCommentViewClosed = _ref6.isInlineCommentViewClosed,
-          hoveredAnnotations = _ref6.hoveredAnnotations;
+        var _ref8 = (0, _utils.getPluginState)(state) || {},
+          draftDecorationSet = _ref8.draftDecorationSet,
+          annotations = _ref8.annotations,
+          selectedAnnotations = _ref8.selectedAnnotations,
+          isVisible = _ref8.isVisible,
+          isInlineCommentViewClosed = _ref8.isInlineCommentViewClosed,
+          hoveredAnnotations = _ref8.hoveredAnnotations;
         var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : _view.DecorationSet.empty;
         var focusDecorations = [];
         state.doc.descendants(function (node, pos) {

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.buildToolbar = void 0;
+exports.shouldSuppressFloatingToolbar = exports.getValidNodes = exports.buildToolbar = exports.buildSuppressedToolbar = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
@@ -16,17 +16,53 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _editorCommands = require("../editor-commands");
 var _types = require("../types");
 var _utils2 = require("./utils");
+var getValidNodes = exports.getValidNodes = function getValidNodes(state) {
+  var schema = state.schema;
+  var annotation = schema.marks.annotation;
+  return Object.keys(schema.nodes).reduce(function (acc, current) {
+    var type = schema.nodes[current];
+    if (type.allowsMarkType(annotation)) {
+      acc.push(type);
+    }
+    return acc;
+  }, []);
+};
+/**
+ * Should suppress toolbars when the user is creating an inline comment
+ * This only applies when the selection range exactly matches the bookmark range
+ * which should be the case immediately after the comment button is clicked
+ * if the user creates a different selection range, the floating toolbar should still be shown
+ */
+var shouldSuppressFloatingToolbar = exports.shouldSuppressFloatingToolbar = function shouldSuppressFloatingToolbar(_ref) {
+  var state = _ref.state,
+    bookmark = _ref.bookmark;
+  if (!bookmark) {
+    return false;
+  }
+  var tr = state.tr;
+  var resolvedBookmark = bookmark.resolve(tr.doc);
+  var isSelectionMatchingBookmark = resolvedBookmark.to === tr.selection.to && resolvedBookmark.from === tr.selection.from;
+  return isSelectionMatchingBookmark;
+};
+var buildSuppressedToolbar = exports.buildSuppressedToolbar = function buildSuppressedToolbar(state) {
+  return {
+    items: [],
+    nodeType: getValidNodes(state),
+    title: 'Annotation suppressed toolbar',
+    __suppressAllToolbars: true
+  };
+};
 var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsAPI) {
-  return function (_ref) {
+  return function (_ref2) {
     var _api$connectivity;
-    var state = _ref.state,
-      intl = _ref.intl,
-      _ref$isToolbarAbove = _ref.isToolbarAbove,
-      isToolbarAbove = _ref$isToolbarAbove === void 0 ? false : _ref$isToolbarAbove,
-      _ref$_supportedNodes = _ref._supportedNodes,
-      _supportedNodes = _ref$_supportedNodes === void 0 ? [] : _ref$_supportedNodes,
-      api = _ref.api,
-      createCommentExperience = _ref.createCommentExperience;
+    var state = _ref2.state,
+      intl = _ref2.intl,
+      _ref2$isToolbarAbove = _ref2.isToolbarAbove,
+      isToolbarAbove = _ref2$isToolbarAbove === void 0 ? false : _ref2$isToolbarAbove,
+      _ref2$_supportedNodes = _ref2._supportedNodes,
+      _supportedNodes = _ref2$_supportedNodes === void 0 ? [] : _ref2$_supportedNodes,
+      api = _ref2.api,
+      createCommentExperience = _ref2.createCommentExperience;
     var schema = state.schema;
     var selectionValid = (0, _utils2.isSelectionValid)(state);
     var isMediaSelected = (0, _mediaSingle.currentMediaNodeWithPos)(state);
@@ -114,7 +150,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
     var onPositionCalculated = calcToolbarPosition(toolbarTitle);
     return {
       title: toolbarTitle,
-      nodeType: validNodes,
+      nodeType: (0, _platformFeatureFlags.fg)('platform_editor_fix_toolbar_comment_jump') ? getValidNodes(state) : validNodes,
       items: [createComment],
       onPositionCalculated: onPositionCalculated,
       pluginName: 'annotation'

package/dist/es2019/annotationPlugin.js

@@ -1,11 +1,12 @@
 import React from 'react';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './editor-commands';
 import { annotationWithToDOMFix } from './nodeviews/annotationMark';
 import { inlineCommentPlugin } from './pm-plugins/inline-comment';
 import { keymapPlugin } from './pm-plugins/keymap';
-import { buildToolbar } from './pm-plugins/toolbar';
+import { buildSuppressedToolbar, buildToolbar, shouldSuppressFloatingToolbar } from './pm-plugins/toolbar';
 import { getPluginState, hasAnyUnResolvedAnnotationInPage, stripNonExistingAnnotations } from './pm-plugins/utils';
 import { InlineCommentView } from './ui/InlineCommentView';
 export const annotationPlugin = ({
@@ -48,7 +49,8 @@ export const annotationPlugin = ({
             dispatch,
             provider: annotationProviders.inlineComment,
             editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions,
-            featureFlagsPluginState: featureFlags
+            featureFlagsPluginState: featureFlags,
+            selectCommentExperience: annotationProviders.selectCommentExperience
           });
         }
         return;
@@ -64,6 +66,19 @@ export const annotationPlugin = ({
       }
     }],
     pluginsOptions: {
+      floatingToolbar(state) {
+        if (!fg('platform_editor_fix_toolbar_comment_jump')) {
+          return;
+        }
+        const pluginState = getPluginState(state);
+        const bookmark = pluginState === null || pluginState === void 0 ? void 0 : pluginState.bookmark;
+        if (shouldSuppressFloatingToolbar({
+          state,
+          bookmark
+        })) {
+          return buildSuppressedToolbar(state);
+        }
+      },
       selectionToolbar(state, intl) {
         if (!annotationProviders) {
           return;

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

@@ -150,6 +150,22 @@ export const inlineCommentPlugin = options => {
       editorView.root.addEventListener('mouseup', mouseUp);
       return {
         update(view, _prevState) {
+          if (fg('confluence_comments_select_comment_experience')) {
+            var _prevSelectedAnnotati;
+            const {
+              selectedAnnotations
+            } = getPluginState(view.state) || {};
+            const {
+              selectedAnnotations: prevSelectedAnnotations
+            } = getPluginState(_prevState) || {};
+
+            // If the new state has a selected annotation, and it's different from the previous one
+            // then we mark the select annotation experience as complete
+            if (selectedAnnotations && selectedAnnotations.length !== 0 && selectedAnnotations[0].id !== (prevSelectedAnnotations === null || prevSelectedAnnotations === void 0 ? void 0 : (_prevSelectedAnnotati = prevSelectedAnnotations[0]) === null || _prevSelectedAnnotati === void 0 ? void 0 : _prevSelectedAnnotati.id)) {
+              var _options$selectCommen;
+              (_options$selectCommen = options.selectCommentExperience) === null || _options$selectCommen === void 0 ? void 0 : _options$selectCommen.selectAnnotation.complete(selectedAnnotations[0].id);
+            }
+          }
           const {
             dirtyAnnotations
           } = getPluginState(view.state) || {};

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MODE } from '@atlaskit/editor-common/analytics';
-import { addInlineComment, ToolTipContent } from '@atlaskit/editor-common/keymaps';
+import { ToolTipContent, addInlineComment } from '@atlaskit/editor-common/keymaps';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 import { annotationMessages } from '@atlaskit/editor-common/messages';
 import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
@@ -9,6 +9,49 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { setInlineCommentDraftState } from '../editor-commands';
 import { AnnotationSelectionType, AnnotationTestIds } from '../types';
 import { getPluginState, isSelectionValid, resolveDraftBookmark } from './utils';
+export const getValidNodes = state => {
+  const {
+    schema
+  } = state;
+  const {
+    annotation
+  } = schema.marks;
+  return Object.keys(schema.nodes).reduce((acc, current) => {
+    const type = schema.nodes[current];
+    if (type.allowsMarkType(annotation)) {
+      acc.push(type);
+    }
+    return acc;
+  }, []);
+};
+/**
+ * Should suppress toolbars when the user is creating an inline comment
+ * This only applies when the selection range exactly matches the bookmark range
+ * which should be the case immediately after the comment button is clicked
+ * if the user creates a different selection range, the floating toolbar should still be shown
+ */
+export const shouldSuppressFloatingToolbar = ({
+  state,
+  bookmark
+}) => {
+  if (!bookmark) {
+    return false;
+  }
+  const {
+    tr
+  } = state;
+  const resolvedBookmark = bookmark.resolve(tr.doc);
+  const isSelectionMatchingBookmark = resolvedBookmark.to === tr.selection.to && resolvedBookmark.from === tr.selection.from;
+  return isSelectionMatchingBookmark;
+};
+export const buildSuppressedToolbar = state => {
+  return {
+    items: [],
+    nodeType: getValidNodes(state),
+    title: 'Annotation suppressed toolbar',
+    __suppressAllToolbars: true
+  };
+};
 export const buildToolbar = editorAnalyticsAPI => ({
   state,
   intl,
@@ -107,7 +150,7 @@ export const buildToolbar = editorAnalyticsAPI => ({
   const onPositionCalculated = calcToolbarPosition(toolbarTitle);
   return {
     title: toolbarTitle,
-    nodeType: validNodes,
+    nodeType: fg('platform_editor_fix_toolbar_comment_jump') ? getValidNodes(state) : validNodes,
     items: [createComment],
     onPositionCalculated,
     pluginName: 'annotation'

package/dist/esm/annotationPlugin.js

@@ -3,12 +3,13 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React from 'react';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './editor-commands';
 import { annotationWithToDOMFix } from './nodeviews/annotationMark';
 import { inlineCommentPlugin } from './pm-plugins/inline-comment';
 import { keymapPlugin } from './pm-plugins/keymap';
-import { buildToolbar } from './pm-plugins/toolbar';
+import { buildSuppressedToolbar, buildToolbar, shouldSuppressFloatingToolbar } from './pm-plugins/toolbar';
 import { getPluginState, hasAnyUnResolvedAnnotationInPage, stripNonExistingAnnotations } from './pm-plugins/utils';
 import { InlineCommentView } from './ui/InlineCommentView';
 export var annotationPlugin = function annotationPlugin(_ref) {
@@ -50,7 +51,8 @@ export var annotationPlugin = function annotationPlugin(_ref) {
               dispatch: dispatch,
               provider: annotationProviders.inlineComment,
               editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions,
-              featureFlagsPluginState: featureFlags
+              featureFlagsPluginState: featureFlags,
+              selectCommentExperience: annotationProviders.selectCommentExperience
             });
           }
           return;
@@ -67,6 +69,19 @@ export var annotationPlugin = function annotationPlugin(_ref) {
       }];
     },
     pluginsOptions: {
+      floatingToolbar: function floatingToolbar(state) {
+        if (!fg('platform_editor_fix_toolbar_comment_jump')) {
+          return;
+        }
+        var pluginState = getPluginState(state);
+        var bookmark = pluginState === null || pluginState === void 0 ? void 0 : pluginState.bookmark;
+        if (shouldSuppressFloatingToolbar({
+          state: state,
+          bookmark: bookmark
+        })) {
+          return buildSuppressedToolbar(state);
+        }
+      },
       selectionToolbar: function selectionToolbar(state, intl) {
         if (!annotationProviders) {
           return;

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

@@ -209,8 +209,22 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
       editorView.root.addEventListener('mouseup', mouseUp);
       return {
         update: function update(view, _prevState) {
-          var _ref4 = getPluginState(view.state) || {},
-            dirtyAnnotations = _ref4.dirtyAnnotations;
+          if (fg('confluence_comments_select_comment_experience')) {
+            var _prevSelectedAnnotati;
+            var _ref4 = getPluginState(view.state) || {},
+              selectedAnnotations = _ref4.selectedAnnotations;
+            var _ref5 = getPluginState(_prevState) || {},
+              prevSelectedAnnotations = _ref5.selectedAnnotations;
+
+            // If the new state has a selected annotation, and it's different from the previous one
+            // then we mark the select annotation experience as complete
+            if (selectedAnnotations && selectedAnnotations.length !== 0 && selectedAnnotations[0].id !== (prevSelectedAnnotations === null || prevSelectedAnnotations === void 0 || (_prevSelectedAnnotati = prevSelectedAnnotations[0]) === null || _prevSelectedAnnotati === void 0 ? void 0 : _prevSelectedAnnotati.id)) {
+              var _options$selectCommen;
+              (_options$selectCommen = options.selectCommentExperience) === null || _options$selectCommen === void 0 || _options$selectCommen.selectAnnotation.complete(selectedAnnotations[0].id);
+            }
+          }
+          var _ref6 = getPluginState(view.state) || {},
+            dirtyAnnotations = _ref6.dirtyAnnotations;
           if (!dirtyAnnotations) {
             return;
           }
@@ -263,8 +277,8 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
           if (isSelected && !(pluginState !== null && pluginState !== void 0 && pluginState.isInlineCommentViewClosed)) {
             return false;
           }
-          var _ref5 = pluginState || {},
-            annotations = _ref5.annotations;
+          var _ref7 = pluginState || {},
+            annotations = _ref7.annotations;
           var isUnresolved = annotations && annotations[annotationId] === false;
           if (!isUnresolved) {
             return false;
@@ -275,13 +289,13 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
       },
       decorations: function decorations(state) {
         // highlight comments, depending on state
-        var _ref6 = getPluginState(state) || {},
-          draftDecorationSet = _ref6.draftDecorationSet,
-          annotations = _ref6.annotations,
-          selectedAnnotations = _ref6.selectedAnnotations,
-          isVisible = _ref6.isVisible,
-          isInlineCommentViewClosed = _ref6.isInlineCommentViewClosed,
-          hoveredAnnotations = _ref6.hoveredAnnotations;
+        var _ref8 = getPluginState(state) || {},
+          draftDecorationSet = _ref8.draftDecorationSet,
+          annotations = _ref8.annotations,
+          selectedAnnotations = _ref8.selectedAnnotations,
+          isVisible = _ref8.isVisible,
+          isInlineCommentViewClosed = _ref8.isInlineCommentViewClosed,
+          hoveredAnnotations = _ref8.hoveredAnnotations;
         var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : DecorationSet.empty;
         var focusDecorations = [];
         state.doc.descendants(function (node, pos) {

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MODE } from '@atlaskit/editor-common/analytics';
-import { addInlineComment, ToolTipContent } from '@atlaskit/editor-common/keymaps';
+import { ToolTipContent, addInlineComment } from '@atlaskit/editor-common/keymaps';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 import { annotationMessages } from '@atlaskit/editor-common/messages';
 import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
@@ -9,17 +9,53 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { setInlineCommentDraftState } from '../editor-commands';
 import { AnnotationSelectionType, AnnotationTestIds } from '../types';
 import { getPluginState, isSelectionValid, resolveDraftBookmark } from './utils';
+export var getValidNodes = function getValidNodes(state) {
+  var schema = state.schema;
+  var annotation = schema.marks.annotation;
+  return Object.keys(schema.nodes).reduce(function (acc, current) {
+    var type = schema.nodes[current];
+    if (type.allowsMarkType(annotation)) {
+      acc.push(type);
+    }
+    return acc;
+  }, []);
+};
+/**
+ * Should suppress toolbars when the user is creating an inline comment
+ * This only applies when the selection range exactly matches the bookmark range
+ * which should be the case immediately after the comment button is clicked
+ * if the user creates a different selection range, the floating toolbar should still be shown
+ */
+export var shouldSuppressFloatingToolbar = function shouldSuppressFloatingToolbar(_ref) {
+  var state = _ref.state,
+    bookmark = _ref.bookmark;
+  if (!bookmark) {
+    return false;
+  }
+  var tr = state.tr;
+  var resolvedBookmark = bookmark.resolve(tr.doc);
+  var isSelectionMatchingBookmark = resolvedBookmark.to === tr.selection.to && resolvedBookmark.from === tr.selection.from;
+  return isSelectionMatchingBookmark;
+};
+export var buildSuppressedToolbar = function buildSuppressedToolbar(state) {
+  return {
+    items: [],
+    nodeType: getValidNodes(state),
+    title: 'Annotation suppressed toolbar',
+    __suppressAllToolbars: true
+  };
+};
 export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
-  return function (_ref) {
+  return function (_ref2) {
     var _api$connectivity;
-    var state = _ref.state,
-      intl = _ref.intl,
-      _ref$isToolbarAbove = _ref.isToolbarAbove,
-      isToolbarAbove = _ref$isToolbarAbove === void 0 ? false : _ref$isToolbarAbove,
-      _ref$_supportedNodes = _ref._supportedNodes,
-      _supportedNodes = _ref$_supportedNodes === void 0 ? [] : _ref$_supportedNodes,
-      api = _ref.api,
-      createCommentExperience = _ref.createCommentExperience;
+    var state = _ref2.state,
+      intl = _ref2.intl,
+      _ref2$isToolbarAbove = _ref2.isToolbarAbove,
+      isToolbarAbove = _ref2$isToolbarAbove === void 0 ? false : _ref2$isToolbarAbove,
+      _ref2$_supportedNodes = _ref2._supportedNodes,
+      _supportedNodes = _ref2$_supportedNodes === void 0 ? [] : _ref2$_supportedNodes,
+      api = _ref2.api,
+      createCommentExperience = _ref2.createCommentExperience;
     var schema = state.schema;
     var selectionValid = isSelectionValid(state);
     var isMediaSelected = currentMediaNodeWithPos(state);
@@ -107,7 +143,7 @@ export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
     var onPositionCalculated = calcToolbarPosition(toolbarTitle);
     return {
       title: toolbarTitle,
-      nodeType: validNodes,
+      nodeType: fg('platform_editor_fix_toolbar_comment_jump') ? getValidNodes(state) : validNodes,
       items: [createComment],
       onPositionCalculated: onPositionCalculated,
       pluginName: 'annotation'

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

@@ -3,7 +3,7 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command, ExtractInjectionAPI, FloatingToolbarButton } from '@atlaskit/editor-common/types';
 import type { PopupPosition } from '@atlaskit/editor-common/ui';
 import type { NodeType } from '@atlaskit/editor-prosemirror/model';
-import { type EditorState } from '@atlaskit/editor-prosemirror/state';
+import { SelectionBookmark, type EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { AnnotationPlugin } from '../annotationPluginType';
 import { AnnotationProviders } from '../types';
@@ -16,6 +16,24 @@ interface BuildToolbarOptions {
     api?: ExtractInjectionAPI<AnnotationPlugin>;
     createCommentExperience?: AnnotationProviders['createCommentExperience'];
 }
+export declare const getValidNodes: (state: EditorState) => NodeType[];
+type ShouldSuppressFloatingToolbarOptions = {
+    state: EditorState;
+    bookmark?: SelectionBookmark;
+};
+/**
+ * Should suppress toolbars when the user is creating an inline comment
+ * This only applies when the selection range exactly matches the bookmark range
+ * which should be the case immediately after the comment button is clicked
+ * if the user creates a different selection range, the floating toolbar should still be shown
+ */
+export declare const shouldSuppressFloatingToolbar: ({ state, bookmark, }: ShouldSuppressFloatingToolbarOptions) => boolean;
+export declare const buildSuppressedToolbar: (state: EditorState) => {
+    items: never[];
+    nodeType: NodeType[];
+    title: string;
+    __suppressAllToolbars: boolean;
+};
 export declare const buildToolbar: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => ({ state, intl, isToolbarAbove, _supportedNodes, api, createCommentExperience, }: BuildToolbarOptions) => {
     title: string;
     nodeType: NodeType[];

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

@@ -3,7 +3,7 @@ import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import type { FeatureFlags } from '@atlaskit/editor-common/types';
 import type { EditorState, SelectionBookmark } from '@atlaskit/editor-prosemirror/state';
 import type { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import type { AnnotationInfo, InlineCommentAnnotationProvider, TargetType } from '../types';
+import type { AnnotationInfo, AnnotationProviders, InlineCommentAnnotationProvider, TargetType } from '../types';
 export declare enum ACTIONS {
     UPDATE_INLINE_COMMENT_STATE = 0,
     SET_INLINE_COMMENT_DRAFT_STATE = 1,
@@ -20,6 +20,7 @@ export interface InlineCommentPluginOptions {
     provider: InlineCommentAnnotationProvider;
     editorAnalyticsAPI: EditorAnalyticsAPI | undefined;
     featureFlagsPluginState?: FeatureFlags;
+    selectCommentExperience?: AnnotationProviders['selectCommentExperience'];
 }
 export interface InlineCommentMouseData {
     isSelecting: boolean;
@@ -93,4 +94,5 @@ export type InlineCommentPluginState = {
     targetNodeId?: string;
     selectAnnotationMethod?: VIEW_METHOD;
     isOpeningMediaCommentFromToolbar?: boolean;
+    selectCommentExperience?: AnnotationProviders['selectCommentExperience'];
 };

package/dist/types/types/index.d.ts

@@ -121,6 +121,11 @@ export interface AnnotationProviders {
             start: () => void;
         };
     };
+    selectCommentExperience?: {
+        selectAnnotation: {
+            complete: (annotationId: string) => void;
+        };
+    };
     annotationManager?: AnnotationManager;
 }
 export declare enum AnnotationSelectionType {

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

@@ -3,7 +3,7 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command, ExtractInjectionAPI, FloatingToolbarButton } from '@atlaskit/editor-common/types';
 import type { PopupPosition } from '@atlaskit/editor-common/ui';
 import type { NodeType } from '@atlaskit/editor-prosemirror/model';
-import { type EditorState } from '@atlaskit/editor-prosemirror/state';
+import { SelectionBookmark, type EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { AnnotationPlugin } from '../annotationPluginType';
 import { AnnotationProviders } from '../types';
@@ -16,6 +16,24 @@ interface BuildToolbarOptions {
     api?: ExtractInjectionAPI<AnnotationPlugin>;
     createCommentExperience?: AnnotationProviders['createCommentExperience'];
 }
+export declare const getValidNodes: (state: EditorState) => NodeType[];
+type ShouldSuppressFloatingToolbarOptions = {
+    state: EditorState;
+    bookmark?: SelectionBookmark;
+};
+/**
+ * Should suppress toolbars when the user is creating an inline comment
+ * This only applies when the selection range exactly matches the bookmark range
+ * which should be the case immediately after the comment button is clicked
+ * if the user creates a different selection range, the floating toolbar should still be shown
+ */
+export declare const shouldSuppressFloatingToolbar: ({ state, bookmark, }: ShouldSuppressFloatingToolbarOptions) => boolean;
+export declare const buildSuppressedToolbar: (state: EditorState) => {
+    items: never[];
+    nodeType: NodeType[];
+    title: string;
+    __suppressAllToolbars: boolean;
+};
 export declare const buildToolbar: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => ({ state, intl, isToolbarAbove, _supportedNodes, api, createCommentExperience, }: BuildToolbarOptions) => {
     title: string;
     nodeType: NodeType[];

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

@@ -3,7 +3,7 @@ import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import type { FeatureFlags } from '@atlaskit/editor-common/types';
 import type { EditorState, SelectionBookmark } from '@atlaskit/editor-prosemirror/state';
 import type { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import type { AnnotationInfo, InlineCommentAnnotationProvider, TargetType } from '../types';
+import type { AnnotationInfo, AnnotationProviders, InlineCommentAnnotationProvider, TargetType } from '../types';
 export declare enum ACTIONS {
     UPDATE_INLINE_COMMENT_STATE = 0,
     SET_INLINE_COMMENT_DRAFT_STATE = 1,
@@ -20,6 +20,7 @@ export interface InlineCommentPluginOptions {
     provider: InlineCommentAnnotationProvider;
     editorAnalyticsAPI: EditorAnalyticsAPI | undefined;
     featureFlagsPluginState?: FeatureFlags;
+    selectCommentExperience?: AnnotationProviders['selectCommentExperience'];
 }
 export interface InlineCommentMouseData {
     isSelecting: boolean;
@@ -93,4 +94,5 @@ export type InlineCommentPluginState = {
     targetNodeId?: string;
     selectAnnotationMethod?: VIEW_METHOD;
     isOpeningMediaCommentFromToolbar?: boolean;
+    selectCommentExperience?: AnnotationProviders['selectCommentExperience'];
 };

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

@@ -121,6 +121,11 @@ export interface AnnotationProviders {
             start: () => void;
         };
     };
+    selectCommentExperience?: {
+        selectAnnotation: {
+            complete: (annotationId: string) => void;
+        };
+    };
     annotationManager?: AnnotationManager;
 }
 export declare enum AnnotationSelectionType {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "2.5.0",
+	"version": "2.5.1",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^103.4.0",
+		"@atlaskit/editor-common": "^103.6.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^2.0.0",
@@ -108,11 +108,17 @@
 		"platform_editor_listen_for_annotation_clicks": {
 			"type": "boolean"
 		},
+		"platform_editor_fix_toolbar_comment_jump": {
+			"type": "boolean"
+		},
 		"platform_editor_annotation_selected_annotation": {
 			"type": "boolean"
 		},
 		"platform_editor_listen_for_focussed_query_param": {
 			"type": "boolean"
+		},
+		"confluence_comments_select_comment_experience": {
+			"type": "boolean"
 		}
 	}
 }