@atlaskit/editor-plugin-annotation 1.10.1 → 1.10.3

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.10.3
+
+### Patch Changes
+
+- [#110714](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/110714)
+  [`9e5e71458aec6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9e5e71458aec6) -
+  [ED-23281] Explictly opt out scrollIntoView when adding annotation mark as it is handled by
+  scrolling comment sidebar into view instead
+- Updated dependencies
+
+## 1.10.2
+
+### Patch Changes
+
+- [#111460](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/111460)
+  [`c7cfc31d4a7b6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c7cfc31d4a7b6) -
+  ED-23707 fix issue where comment ui was not triggered on commented node selections.
+- [#110966](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/110966)
+  [`31348c335b4b3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/31348c335b4b3) -
+  ED-23690 - add inlineNodeTypes property to AnnotationComponentProps
+- Updated dependencies
+
 ## 1.10.1
 
 ### Patch Changes

package/dist/cjs/commands/index.js

@@ -179,7 +179,7 @@ var setInlineCommentDraftState = exports.setInlineCommentDraftState = function s
     var isCommentOnMediaOn = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     var targetNodeId = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : undefined;
     var commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, isCommentOnMediaOn, supportedBlockNodes);
-    return (0, _pluginFactory.createCommand)(commandAction, _transform.default.addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, inputMethod));
+    return (0, _pluginFactory.createCommand)(commandAction, _transform.default.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod));
   };
 };
 var addInlineComment = exports.addInlineComment = function addInlineComment(editorAnalyticsAPI, editorAPI) {

package/dist/cjs/commands/transform.js

@@ -42,7 +42,7 @@ var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes) {
 var addInlineComment = function addInlineComment(editorAnalyticsAPI, editorAPI) {
   return function (id, supportedBlockNodes) {
     return function (transaction, state) {
-      var _editorAPI$editorView;
+      var _editorAPI$editorView, _pluginState$featureF;
       var tr = addAnnotationMark(id, supportedBlockNodes)(transaction, state);
       editorAPI === null || editorAPI === void 0 || (_editorAPI$editorView = editorAPI.editorViewMode) === null || _editorAPI$editorView === void 0 || _editorAPI$editorView.actions.applyViewModeStepAt(tr);
 
@@ -50,6 +50,12 @@ var addInlineComment = function addInlineComment(editorAnalyticsAPI, editorAPI)
       tr = addInsertAnalytics(editorAnalyticsAPI)(tr, state);
       // add close analytics step to transaction
       tr = addOpenCloseAnalytics(editorAnalyticsAPI)(false, _analytics.INPUT_METHOD.TOOLBAR)(tr, state);
+      var pluginState = (0, _utils2.getPluginState)(state);
+      var isAutoScrollBugFixEnabled = pluginState === null || pluginState === void 0 || (_pluginState$featureF = pluginState.featureFlagsPluginState) === null || _pluginState$featureF === void 0 ? void 0 : _pluginState$featureF.commentsOnMediaAutoscrollInEditor;
+      if (isAutoScrollBugFixEnabled) {
+        // Explicitly disable scrollIntoView as scrolling is handled by CommentSidebar
+        tr.setMeta('scrollIntoView', false);
+      }
       return tr;
     };
   };
@@ -64,6 +70,22 @@ var addOpenCloseAnalytics = function addOpenCloseAnalytics(editorAnalyticsAPI) {
     };
   };
 };
+var handleDraftState = function handleDraftState(editorAnalyticsAPI) {
+  return function (drafting) {
+    var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
+    return function (transaction, state) {
+      var _pluginState$featureF2;
+      var tr = addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, method)(transaction, state);
+      var pluginState = (0, _utils2.getPluginState)(state);
+      var isAutoScrollBugFixEnabled = pluginState === null || pluginState === void 0 || (_pluginState$featureF2 = pluginState.featureFlagsPluginState) === null || _pluginState$featureF2 === void 0 ? void 0 : _pluginState$featureF2.commentsOnMediaAutoscrollInEditor;
+      if (isAutoScrollBugFixEnabled) {
+        // Explicitly disable scrollIntoView as scrolling is handled by CommentSidebar
+        tr.setMeta('scrollIntoView', false);
+      }
+      return tr;
+    };
+  };
+};
 var addInsertAnalytics = function addInsertAnalytics(editorAnalyticsAPI) {
   return function (transaction, state) {
     var analyticsEvent = {
@@ -109,6 +131,7 @@ var addResolveAnalytics = function addResolveAnalytics(editorAnalyticsAPI) {
 var _default = exports.default = {
   addAnnotationMark: addAnnotationMark,
   addInlineComment: addInlineComment,
+  handleDraftState: handleDraftState,
   addOpenCloseAnalytics: addOpenCloseAnalytics,
   addInsertAnalytics: addInsertAnalytics,
   addResolveAnalytics: addResolveAnalytics

package/dist/cjs/ui/InlineCommentView.js

@@ -9,10 +9,11 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _utils = require("@atlaskit/editor-common/utils");
+var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _commands = require("../commands");
 var _types = require("../types");
-var _utils2 = require("../utils");
+var _utils3 = require("../utils");
 var _AnnotationViewWrapper = require("./AnnotationViewWrapper");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(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; }
@@ -44,18 +45,18 @@ function InlineCommentView(_ref) {
     dispatch = editorView.dispatch;
   var CreateComponent = inlineCommentProvider.createComponent,
     ViewComponent = inlineCommentProvider.viewComponent;
-  var inlineCommentState = (0, _utils2.getPluginState)(state);
+  var inlineCommentState = (0, _utils3.getPluginState)(state);
   var _ref2 = inlineCommentState || {},
     bookmark = _ref2.bookmark,
     selectedAnnotations = _ref2.selectedAnnotations,
     annotations = _ref2.annotations,
     isInlineCommentViewClosed = _ref2.isInlineCommentViewClosed;
-  var annotationsList = (0, _utils2.getAllAnnotations)(editorView.state.doc);
-  var selection = (0, _utils2.getSelectionPositions)(state, inlineCommentState);
+  var annotationsList = (0, _utils3.getAllAnnotations)(editorView.state.doc);
+  var selection = (0, _utils3.getSelectionPositions)(state, inlineCommentState);
   var position = findPosForDOM(selection);
   var dom;
   try {
-    dom = (0, _utils.findDomRefAtPos)(position, editorView.domAtPos.bind(editorView));
+    dom = (0, _utils2.findDomRefAtPos)(position, editorView.domAtPos.bind(editorView));
   } catch (error) {
     // eslint-disable-next-line no-console
     console.warn(error);
@@ -78,6 +79,10 @@ function InlineCommentView(_ref) {
   if (!dom) {
     return null;
   }
+  var inlineNodeTypes = (0, _utils.getRangeInlineNodeNames)({
+    doc: state.doc,
+    pos: selection
+  });
 
   // Create Component
   if (bookmark) {
@@ -100,7 +105,8 @@ function InlineCommentView(_ref) {
       onClose: function onClose() {
         (0, _commands.setInlineCommentDraftState)(editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
         !editorView.hasFocus() && editorView.focus();
-      }
+      },
+      inlineNodeTypes: inlineNodeTypes
     }));
   }
 
@@ -142,11 +148,12 @@ function InlineCommentView(_ref) {
   return /*#__PURE__*/_react.default.createElement(_AnnotationViewWrapper.AnnotationViewWrapper, {
     "data-editor-popup": "true",
     "data-testid": _types.AnnotationTestIds.floatingComponent,
-    key: (0, _utils2.getAnnotationViewKey)(activeAnnotations),
+    key: (0, _utils3.getAnnotationViewKey)(activeAnnotations),
     onViewed: onAnnotationViewed
   }, /*#__PURE__*/_react.default.createElement(ViewComponent, {
     annotationsList: annotationsList,
     annotations: activeAnnotations,
+    inlineNodeTypes: inlineNodeTypes,
     dom: dom,
     onDelete: function onDelete(id) {
       return (0, _commands.removeInlineCommentNearSelection)(id, inlineCommentProvider.supportedBlockNodes)(state, dispatch);

package/dist/cjs/utils.js

@@ -173,7 +173,15 @@ var findAnnotationsInSelection = exports.findAnnotationsInSelection = function f
     anchor = selection.anchor;
   // Only detect annotations on caret selection
   if (!empty || !doc) {
-    return [];
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      if (selection instanceof _state.NodeSelection && ['inlineCard', 'emoji', 'date', 'mention', 'status'].includes(selection.node.type.name)) {
+        // Inline comments on these nodes are supported -- so we continue to find annotations
+      } else {
+        return [];
+      }
+    } else {
+      return [];
+    }
   }
   var node = doc.nodeAt(anchor);
   var nodeBefore = $anchor.nodeBefore;

package/dist/es2019/commands/index.js

@@ -148,7 +148,7 @@ export const showInlineCommentForBlockNode = (supportedBlockNodes = []) => (node
 };
 export const setInlineCommentDraftState = (editorAnalyticsAPI, supportedBlockNodes = []) => (drafting, inputMethod = INPUT_METHOD.TOOLBAR, targetType = 'inline', isCommentOnMediaOn = false, targetNodeId = undefined) => {
   const commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, isCommentOnMediaOn, supportedBlockNodes);
-  return createCommand(commandAction, transform.addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, inputMethod));
+  return createCommand(commandAction, transform.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod));
 };
 export const addInlineComment = (editorAnalyticsAPI, editorAPI) => (id, supportedBlockNodes) => {
   const commandAction = editorState => ({

package/dist/es2019/commands/transform.js

@@ -34,7 +34,7 @@ const addAnnotationMark = (id, supportedBlockNodes) => (transaction, state) => {
   return tr;
 };
 const addInlineComment = (editorAnalyticsAPI, editorAPI) => (id, supportedBlockNodes) => (transaction, state) => {
-  var _editorAPI$editorView;
+  var _editorAPI$editorView, _pluginState$featureF;
   let tr = addAnnotationMark(id, supportedBlockNodes)(transaction, state);
   editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$editorView = editorAPI.editorViewMode) === null || _editorAPI$editorView === void 0 ? void 0 : _editorAPI$editorView.actions.applyViewModeStepAt(tr);
 
@@ -42,6 +42,12 @@ const addInlineComment = (editorAnalyticsAPI, editorAPI) => (id, supportedBlockN
   tr = addInsertAnalytics(editorAnalyticsAPI)(tr, state);
   // add close analytics step to transaction
   tr = addOpenCloseAnalytics(editorAnalyticsAPI)(false, INPUT_METHOD.TOOLBAR)(tr, state);
+  const pluginState = getPluginState(state);
+  const isAutoScrollBugFixEnabled = pluginState === null || pluginState === void 0 ? void 0 : (_pluginState$featureF = pluginState.featureFlagsPluginState) === null || _pluginState$featureF === void 0 ? void 0 : _pluginState$featureF.commentsOnMediaAutoscrollInEditor;
+  if (isAutoScrollBugFixEnabled) {
+    // Explicitly disable scrollIntoView as scrolling is handled by CommentSidebar
+    tr.setMeta('scrollIntoView', false);
+  }
   return tr;
 };
 const addOpenCloseAnalytics = editorAnalyticsAPI => (drafting, method = INPUT_METHOD.TOOLBAR) => (transaction, state) => {
@@ -49,6 +55,17 @@ const addOpenCloseAnalytics = editorAnalyticsAPI => (drafting, method = INPUT_ME
   editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(draftingPayload)(transaction);
   return transaction;
 };
+const handleDraftState = editorAnalyticsAPI => (drafting, method = INPUT_METHOD.TOOLBAR) => (transaction, state) => {
+  var _pluginState$featureF2;
+  const tr = addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, method)(transaction, state);
+  const pluginState = getPluginState(state);
+  const isAutoScrollBugFixEnabled = pluginState === null || pluginState === void 0 ? void 0 : (_pluginState$featureF2 = pluginState.featureFlagsPluginState) === null || _pluginState$featureF2 === void 0 ? void 0 : _pluginState$featureF2.commentsOnMediaAutoscrollInEditor;
+  if (isAutoScrollBugFixEnabled) {
+    // Explicitly disable scrollIntoView as scrolling is handled by CommentSidebar
+    tr.setMeta('scrollIntoView', false);
+  }
+  return tr;
+};
 const addInsertAnalytics = editorAnalyticsAPI => (transaction, state) => {
   const analyticsEvent = {
     action: ACTION.INSERTED,
@@ -89,6 +106,7 @@ const addResolveAnalytics = editorAnalyticsAPI => method => (transaction, state)
 export default {
   addAnnotationMark,
   addInlineComment,
+  handleDraftState,
   addOpenCloseAnalytics,
   addInsertAnalytics,
   addResolveAnalytics

package/dist/es2019/ui/InlineCommentView.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
+import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { closeComponent, createAnnotation, removeInlineCommentNearSelection, setInlineCommentDraftState, updateInlineCommentResolvedState } from '../commands';
 import { AnnotationTestIds } from '../types';
@@ -76,6 +77,10 @@ export function InlineCommentView({
   if (!dom) {
     return null;
   }
+  const inlineNodeTypes = getRangeInlineNodeNames({
+    doc: state.doc,
+    pos: selection
+  });
 
   // Create Component
   if (bookmark) {
@@ -98,7 +103,8 @@ export function InlineCommentView({
       onClose: () => {
         setInlineCommentDraftState(editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
         !editorView.hasFocus() && editorView.focus();
-      }
+      },
+      inlineNodeTypes: inlineNodeTypes
     }));
   }
 
@@ -145,6 +151,7 @@ export function InlineCommentView({
   }, /*#__PURE__*/React.createElement(ViewComponent, {
     annotationsList: annotationsList,
     annotations: activeAnnotations,
+    inlineNodeTypes: inlineNodeTypes,
     dom: dom,
     onDelete: id => removeInlineCommentNearSelection(id, inlineCommentProvider.supportedBlockNodes)(state, dispatch),
     onResolve: id => updateInlineCommentResolvedState(editorAnalyticsAPI)({

package/dist/es2019/utils.js

@@ -136,7 +136,15 @@ export const findAnnotationsInSelection = (selection, doc, isCommentsOnMediaMedi
   } = selection;
   // Only detect annotations on caret selection
   if (!empty || !doc) {
-    return [];
+    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      if (selection instanceof NodeSelection && ['inlineCard', 'emoji', 'date', 'mention', 'status'].includes(selection.node.type.name)) {
+        // Inline comments on these nodes are supported -- so we continue to find annotations
+      } else {
+        return [];
+      }
+    } else {
+      return [];
+    }
   }
   const node = doc.nodeAt(anchor);
   const nodeBefore = $anchor.nodeBefore;

package/dist/esm/commands/index.js

@@ -172,7 +172,7 @@ export var setInlineCommentDraftState = function setInlineCommentDraftState(edit
     var isCommentOnMediaOn = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     var targetNodeId = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : undefined;
     var commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, isCommentOnMediaOn, supportedBlockNodes);
-    return createCommand(commandAction, transform.addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, inputMethod));
+    return createCommand(commandAction, transform.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod));
   };
 };
 export var addInlineComment = function addInlineComment(editorAnalyticsAPI, editorAPI) {

package/dist/esm/commands/transform.js

@@ -36,7 +36,7 @@ var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes) {
 var addInlineComment = function addInlineComment(editorAnalyticsAPI, editorAPI) {
   return function (id, supportedBlockNodes) {
     return function (transaction, state) {
-      var _editorAPI$editorView;
+      var _editorAPI$editorView, _pluginState$featureF;
       var tr = addAnnotationMark(id, supportedBlockNodes)(transaction, state);
       editorAPI === null || editorAPI === void 0 || (_editorAPI$editorView = editorAPI.editorViewMode) === null || _editorAPI$editorView === void 0 || _editorAPI$editorView.actions.applyViewModeStepAt(tr);
 
@@ -44,6 +44,12 @@ var addInlineComment = function addInlineComment(editorAnalyticsAPI, editorAPI)
       tr = addInsertAnalytics(editorAnalyticsAPI)(tr, state);
       // add close analytics step to transaction
       tr = addOpenCloseAnalytics(editorAnalyticsAPI)(false, INPUT_METHOD.TOOLBAR)(tr, state);
+      var pluginState = getPluginState(state);
+      var isAutoScrollBugFixEnabled = pluginState === null || pluginState === void 0 || (_pluginState$featureF = pluginState.featureFlagsPluginState) === null || _pluginState$featureF === void 0 ? void 0 : _pluginState$featureF.commentsOnMediaAutoscrollInEditor;
+      if (isAutoScrollBugFixEnabled) {
+        // Explicitly disable scrollIntoView as scrolling is handled by CommentSidebar
+        tr.setMeta('scrollIntoView', false);
+      }
       return tr;
     };
   };
@@ -58,6 +64,22 @@ var addOpenCloseAnalytics = function addOpenCloseAnalytics(editorAnalyticsAPI) {
     };
   };
 };
+var handleDraftState = function handleDraftState(editorAnalyticsAPI) {
+  return function (drafting) {
+    var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.TOOLBAR;
+    return function (transaction, state) {
+      var _pluginState$featureF2;
+      var tr = addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, method)(transaction, state);
+      var pluginState = getPluginState(state);
+      var isAutoScrollBugFixEnabled = pluginState === null || pluginState === void 0 || (_pluginState$featureF2 = pluginState.featureFlagsPluginState) === null || _pluginState$featureF2 === void 0 ? void 0 : _pluginState$featureF2.commentsOnMediaAutoscrollInEditor;
+      if (isAutoScrollBugFixEnabled) {
+        // Explicitly disable scrollIntoView as scrolling is handled by CommentSidebar
+        tr.setMeta('scrollIntoView', false);
+      }
+      return tr;
+    };
+  };
+};
 var addInsertAnalytics = function addInsertAnalytics(editorAnalyticsAPI) {
   return function (transaction, state) {
     var analyticsEvent = {
@@ -103,6 +125,7 @@ var addResolveAnalytics = function addResolveAnalytics(editorAnalyticsAPI) {
 export default {
   addAnnotationMark: addAnnotationMark,
   addInlineComment: addInlineComment,
+  handleDraftState: handleDraftState,
   addOpenCloseAnalytics: addOpenCloseAnalytics,
   addInsertAnalytics: addInsertAnalytics,
   addResolveAnalytics: addResolveAnalytics

package/dist/esm/ui/InlineCommentView.js

@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
+import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { closeComponent, createAnnotation, removeInlineCommentNearSelection, setInlineCommentDraftState, updateInlineCommentResolvedState } from '../commands';
 import { AnnotationTestIds } from '../types';
@@ -71,6 +72,10 @@ export function InlineCommentView(_ref) {
   if (!dom) {
     return null;
   }
+  var inlineNodeTypes = getRangeInlineNodeNames({
+    doc: state.doc,
+    pos: selection
+  });
 
   // Create Component
   if (bookmark) {
@@ -93,7 +98,8 @@ export function InlineCommentView(_ref) {
       onClose: function onClose() {
         setInlineCommentDraftState(editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
         !editorView.hasFocus() && editorView.focus();
-      }
+      },
+      inlineNodeTypes: inlineNodeTypes
     }));
   }
 
@@ -140,6 +146,7 @@ export function InlineCommentView(_ref) {
   }, /*#__PURE__*/React.createElement(ViewComponent, {
     annotationsList: annotationsList,
     annotations: activeAnnotations,
+    inlineNodeTypes: inlineNodeTypes,
     dom: dom,
     onDelete: function onDelete(id) {
       return removeInlineCommentNearSelection(id, inlineCommentProvider.supportedBlockNodes)(state, dispatch);

package/dist/esm/utils.js

@@ -146,7 +146,15 @@ export var findAnnotationsInSelection = function findAnnotationsInSelection(sele
     anchor = selection.anchor;
   // Only detect annotations on caret selection
   if (!empty || !doc) {
-    return [];
+    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      if (selection instanceof NodeSelection && ['inlineCard', 'emoji', 'date', 'mention', 'status'].includes(selection.node.type.name)) {
+        // Inline comments on these nodes are supported -- so we continue to find annotations
+      } else {
+        return [];
+      }
+    } else {
+      return [];
+    }
   }
   var node = doc.nodeAt(anchor);
   var nodeBefore = $anchor.nodeBefore;

package/dist/types/commands/transform.d.ts

@@ -49,6 +49,10 @@ declare const _default: {
                         to: number;
                         mark: import("prosemirror-model").Mark;
                     }) => boolean;
+                    addInlineCommentNodeMark: (props: {
+                        pos: number;
+                        mark: import("prosemirror-model").Mark;
+                    }) => boolean;
                     isRemoteReplaceDocumentTransaction: (tr: Transaction) => boolean;
                 };
             }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>];
@@ -115,6 +119,10 @@ declare const _default: {
                     to: number;
                     mark: import("prosemirror-model").Mark;
                 }) => boolean;
+                addInlineCommentNodeMark: (props: {
+                    pos: number;
+                    mark: import("prosemirror-model").Mark;
+                }) => boolean;
                 isRemoteReplaceDocumentTransaction: (tr: Transaction) => boolean;
             };
         }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>];
@@ -133,6 +141,7 @@ declare const _default: {
         pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
         sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
     }, import("@atlaskit/editor-common/types").FeatureFlags>>]> | undefined) => (id: string, supportedBlockNodes?: string[] | undefined) => (transaction: Transaction, state: EditorState) => Transaction;
+    handleDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (drafting: boolean, method?: InlineCommentInputMethod) => (transaction: Transaction, state: EditorState) => Transaction;
     addOpenCloseAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (drafting: boolean, method?: InlineCommentInputMethod) => (transaction: Transaction, state: EditorState) => Transaction;
     addInsertAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (transaction: Transaction, state: EditorState) => Transaction;
     addResolveAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (method?: RESOLVE_METHOD | undefined) => (transaction: Transaction, state: EditorState) => Transaction;

package/dist/types/types.d.ts

@@ -61,6 +61,8 @@ type AnnotationComponentProps = {
      * Indicates that a draft comment was discarded/cancelled
      */
     onClose?: () => void;
+    /** List of inline node types, which are wrapped by the annotation. */
+    inlineNodeTypes: string[] | undefined;
 };
 export type InlineCommentCreateComponentProps = AnnotationComponentProps & {
     /**

package/dist/types-ts4.5/commands/transform.d.ts

@@ -60,6 +60,10 @@ declare const _default: {
                                     to: number;
                                     mark: import("prosemirror-model").Mark;
                                 }) => boolean;
+                                addInlineCommentNodeMark: (props: {
+                                    pos: number;
+                                    mark: import("prosemirror-model").Mark;
+                                }) => boolean;
                                 isRemoteReplaceDocumentTransaction: (tr: Transaction) => boolean;
                             };
                         }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>
@@ -139,6 +143,10 @@ declare const _default: {
                             to: number;
                             mark: import("prosemirror-model").Mark;
                         }) => boolean;
+                        addInlineCommentNodeMark: (props: {
+                            pos: number;
+                            mark: import("prosemirror-model").Mark;
+                        }) => boolean;
                         isRemoteReplaceDocumentTransaction: (tr: Transaction) => boolean;
                     };
                 }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>
@@ -160,6 +168,7 @@ declare const _default: {
             sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
         }, import("@atlaskit/editor-common/types").FeatureFlags>>
     ]> | undefined) => (id: string, supportedBlockNodes?: string[] | undefined) => (transaction: Transaction, state: EditorState) => Transaction;
+    handleDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (drafting: boolean, method?: InlineCommentInputMethod) => (transaction: Transaction, state: EditorState) => Transaction;
     addOpenCloseAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (drafting: boolean, method?: InlineCommentInputMethod) => (transaction: Transaction, state: EditorState) => Transaction;
     addInsertAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (transaction: Transaction, state: EditorState) => Transaction;
     addResolveAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (method?: RESOLVE_METHOD | undefined) => (transaction: Transaction, state: EditorState) => Transaction;

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

@@ -61,6 +61,8 @@ type AnnotationComponentProps = {
      * Indicates that a draft comment was discarded/cancelled
      */
     onClose?: () => void;
+    /** List of inline node types, which are wrapped by the annotation. */
+    inlineNodeTypes: string[] | undefined;
 };
 export type InlineCommentCreateComponentProps = AnnotationComponentProps & {
     /**

package/package.json

@@ -1,106 +1,106 @@
 {
-  "name": "@atlaskit/editor-plugin-annotation",
-  "version": "1.10.1",
-  "description": "Annotation plugin for @atlaskit/editor-core",
-  "author": "Atlassian Pty Ltd",
-  "license": "Apache-2.0",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "atlassian": {
-    "team": "Editor: AI",
-    "singleton": true,
-    "releaseModel": "continuous",
-    "runReact18": false
-  },
-  "repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "module:es2019": "dist/es2019/index.js",
-  "types": "dist/types/index.d.ts",
-  "typesVersions": {
-    ">=4.5 <4.9": {
-      "*": [
-        "dist/types-ts4.5/*",
-        "dist/types-ts4.5/index.d.ts"
-      ]
-    }
-  },
-  "sideEffects": false,
-  "atlaskit:src": "src/index.ts",
-  "af:exports": {
-    ".": "./src/index.ts"
-  },
-  "dependencies": {
-    "@atlaskit/adf-schema": "^36.10.7",
-    "@atlaskit/editor-common": "^82.3.0",
-    "@atlaskit/editor-plugin-analytics": "^1.2.0",
-    "@atlaskit/editor-plugin-editor-viewmode": "^1.1.0",
-    "@atlaskit/editor-plugin-feature-flags": "^1.1.0",
-    "@atlaskit/editor-prosemirror": "4.0.1",
-    "@atlaskit/icon": "^22.3.0",
-    "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@babel/runtime": "^7.0.0"
-  },
-  "peerDependencies": {
-    "react": "^16.8.0"
-  },
-  "devDependencies": {
-    "@af/integration-testing": "*",
-    "@af/visual-regression": "*",
-    "@atlaskit/ssr": "*",
-    "@atlaskit/visual-regression": "*",
-    "@atlassian/feature-flags-test-utils": "^0.2.0",
-    "@testing-library/react": "^12.1.5",
-    "react-dom": "^16.8.0",
-    "typescript": "~5.4.2",
-    "wait-for-expect": "^1.2.0"
-  },
-  "techstack": {
-    "@atlassian/frontend": {
-      "import-structure": [
-        "atlassian-conventions"
-      ],
-      "circular-dependencies": [
-        "file-and-folder-level"
-      ]
-    },
-    "@repo/internal": {
-      "dom-events": "use-bind-event-listener",
-      "analytics": [
-        "analytics-next"
-      ],
-      "design-tokens": [
-        "color"
-      ],
-      "theming": [
-        "react-context"
-      ],
-      "ui-components": [
-        "lite-mode"
-      ],
-      "deprecation": "no-deprecated-imports",
-      "styling": [
-        "emotion",
-        "emotion"
-      ],
-      "imports": [
-        "import-no-extraneous-disable-for-examples-and-docs"
-      ]
-    }
-  },
-  "platform-feature-flags": {
-    "platform.editor.enable-selection-toolbar_ucdwd": {
-      "type": "boolean"
-    },
-    "platform.editor.allow-inline-comments-for-inline-nodes": {
-      "type": "boolean"
-    },
-    "platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz": {
-      "type": "boolean"
-    },
-    "platform.editor.comments-on-media.bug.preserve-draft_i3vqb": {
-      "type": "boolean"
-    }
-  }
-}
+	"name": "@atlaskit/editor-plugin-annotation",
+	"version": "1.10.3",
+	"description": "Annotation plugin for @atlaskit/editor-core",
+	"author": "Atlassian Pty Ltd",
+	"license": "Apache-2.0",
+	"publishConfig": {
+		"registry": "https://registry.npmjs.org/"
+	},
+	"atlassian": {
+		"team": "Editor: AI",
+		"singleton": true,
+		"releaseModel": "continuous",
+		"runReact18": false
+	},
+	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
+	"main": "dist/cjs/index.js",
+	"module": "dist/esm/index.js",
+	"module:es2019": "dist/es2019/index.js",
+	"types": "dist/types/index.d.ts",
+	"typesVersions": {
+		">=4.5 <4.9": {
+			"*": [
+				"dist/types-ts4.5/*",
+				"dist/types-ts4.5/index.d.ts"
+			]
+		}
+	},
+	"sideEffects": false,
+	"atlaskit:src": "src/index.ts",
+	"af:exports": {
+		".": "./src/index.ts"
+	},
+	"dependencies": {
+		"@atlaskit/adf-schema": "^36.10.7",
+		"@atlaskit/editor-common": "^82.9.0",
+		"@atlaskit/editor-plugin-analytics": "^1.2.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^1.2.0",
+		"@atlaskit/editor-plugin-feature-flags": "^1.1.0",
+		"@atlaskit/editor-prosemirror": "4.0.1",
+		"@atlaskit/icon": "^22.4.0",
+		"@atlaskit/platform-feature-flags": "^0.2.0",
+		"@babel/runtime": "^7.0.0"
+	},
+	"peerDependencies": {
+		"react": "^16.8.0"
+	},
+	"devDependencies": {
+		"@af/integration-testing": "*",
+		"@af/visual-regression": "*",
+		"@atlaskit/ssr": "*",
+		"@atlaskit/visual-regression": "*",
+		"@atlassian/feature-flags-test-utils": "^0.2.0",
+		"@testing-library/react": "^12.1.5",
+		"react-dom": "^16.8.0",
+		"typescript": "~5.4.2",
+		"wait-for-expect": "^1.2.0"
+	},
+	"techstack": {
+		"@atlassian/frontend": {
+			"import-structure": [
+				"atlassian-conventions"
+			],
+			"circular-dependencies": [
+				"file-and-folder-level"
+			]
+		},
+		"@repo/internal": {
+			"dom-events": "use-bind-event-listener",
+			"analytics": [
+				"analytics-next"
+			],
+			"design-tokens": [
+				"color"
+			],
+			"theming": [
+				"react-context"
+			],
+			"ui-components": [
+				"lite-mode"
+			],
+			"deprecation": "no-deprecated-imports",
+			"styling": [
+				"emotion",
+				"emotion"
+			],
+			"imports": [
+				"import-no-extraneous-disable-for-examples-and-docs"
+			]
+		}
+	},
+	"platform-feature-flags": {
+		"platform.editor.enable-selection-toolbar_ucdwd": {
+			"type": "boolean"
+		},
+		"platform.editor.allow-inline-comments-for-inline-nodes": {
+			"type": "boolean"
+		},
+		"platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz": {
+			"type": "boolean"
+		},
+		"platform.editor.comments-on-media.bug.preserve-draft_i3vqb": {
+			"type": "boolean"
+		}
+	}
+}