@atlaskit/editor-plugin-annotation 1.10.0 → 1.10.2

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @atlaskit/editor-plugin-annotation
 
+## 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
+
+- [#109969](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/109969)
+  [`52590a0b562ef`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/52590a0b562ef) -
+  ED-23690 Adds an attribute to annotation analytic events with the name of nodes inside the
+  annotation range
+- [#109932](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/109932)
+  [`a973fd903870a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a973fd903870a) -
+  ED-23649 fixes a variety of issues such as inline nodes not being fully interactive, and missing
+  selection visuals when inside an annotation.
+- Updated dependencies
+
 ## 1.10.0
 
 ### Minor Changes

package/dist/cjs/commands/transform.js

@@ -7,18 +7,20 @@ exports.default = void 0;
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _mark = require("@atlaskit/editor-common/mark");
+var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _utils = require("../utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _utils2 = require("../utils");
 var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes) {
   return function (transaction, state) {
-    var inlineCommentState = (0, _utils.getPluginState)(state);
+    var inlineCommentState = (0, _utils2.getPluginState)(state);
     var _ref = inlineCommentState || {},
       bookmark = _ref.bookmark;
     var annotationMark = state.schema.marks.annotation.create({
       id: id,
       type: _adfSchema.AnnotationTypes.INLINE_COMMENT
     });
-    var _resolveDraftBookmark = (0, _utils.resolveDraftBookmark)(state, bookmark, supportedBlockNodes),
+    var _resolveDraftBookmark = (0, _utils2.resolveDraftBookmark)(state, bookmark, supportedBlockNodes),
       from = _resolveDraftBookmark.from,
       to = _resolveDraftBookmark.to,
       head = _resolveDraftBookmark.head,
@@ -56,7 +58,7 @@ var addOpenCloseAnalytics = function addOpenCloseAnalytics(editorAnalyticsAPI) {
   return function (drafting) {
     var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
     return function (transaction, state) {
-      var draftingPayload = (0, _utils.getDraftCommandAnalyticsPayload)(drafting, method)(state);
+      var draftingPayload = (0, _utils2.getDraftCommandAnalyticsPayload)(drafting, method)(state);
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(draftingPayload)(transaction);
       return transaction;
     };
@@ -64,13 +66,26 @@ var addOpenCloseAnalytics = function addOpenCloseAnalytics(editorAnalyticsAPI) {
 };
 var addInsertAnalytics = function addInsertAnalytics(editorAnalyticsAPI) {
   return function (transaction, state) {
-    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
+    var analyticsEvent = {
       action: _analytics.ACTION.INSERTED,
       actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
       eventType: _analytics.EVENT_TYPE.TRACK,
       actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
       attributes: {}
-    })(transaction);
+    };
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      var _ref2 = (0, _utils2.getPluginState)(state) || {},
+        bookmark = _ref2.bookmark;
+
+      // When this FF is removed we can move the analytics event creation inside of the
+      // attachAnalyticsEvent and get type inference for the attributes.
+      // @ts-ignore
+      analyticsEvent.attributes.inlineNodeNames = (0, _utils.getRangeInlineNodeNames)({
+        doc: state.doc,
+        pos: (0, _utils2.resolveDraftBookmark)(state, bookmark)
+      });
+    }
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(analyticsEvent)(transaction);
     return transaction;
   };
 };

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

@@ -12,6 +12,7 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("../commands");
 var _nodeviews = require("../nodeviews");
 var _utils = require("../utils");
@@ -248,10 +249,25 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
                   key: _utils.decorationKey.block
                 }));
               } else {
-                focusDecorations.push(_view.Decoration.inline(pos, pos + node.nodeSize, {
-                  class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved),
-                  nodeName: 'span'
-                }));
+                if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+                  if (node.isText) {
+                    focusDecorations.push(_view.Decoration.inline(pos, pos + node.nodeSize, {
+                      class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved),
+                      nodeName: 'span'
+                    }));
+                  } else {
+                    focusDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
+                      class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved)
+                    }, {
+                      key: _utils.decorationKey.block
+                    }));
+                  }
+                } else {
+                  focusDecorations.push(_view.Decoration.inline(pos, pos + node.nodeSize, {
+                    class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved),
+                    nodeName: 'span'
+                  }));
+                }
               }
             }
           });

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;
@@ -289,6 +297,14 @@ var getDraftCommandAnalyticsPayload = exports.getDraftCommandAnalyticsPayload =
         overlap: getAnnotationsInSelectionCount(state)
       };
     }
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      var _ref3 = getPluginState(state) || {},
+        bookmark = _ref3.bookmark;
+      attributes.inlineNodeNames = (0, _utils.getRangeInlineNodeNames)({
+        doc: state.doc,
+        pos: resolveDraftBookmark(state, bookmark)
+      });
+    }
     return {
       action: drafting ? _analytics.ACTION.OPENED : _analytics.ACTION.CLOSED,
       actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
@@ -303,8 +319,8 @@ var isSelectionValid = exports.isSelectionValid = function isSelectionValid(stat
   var _currentMediaNodeWith;
   var _supportedNodes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   var selection = state.selection;
-  var _ref3 = getPluginState(state) || {},
-    disallowOnWhitespace = _ref3.disallowOnWhitespace;
+  var _ref4 = getPluginState(state) || {},
+    disallowOnWhitespace = _ref4.disallowOnWhitespace;
 
   // Allow media so that it can enter draft mode
   if (isCommentOnMediaOn && (_currentMediaNodeWith = (0, _mediaSingle.currentMediaNodeWithPos)(state)) !== null && _currentMediaNodeWith !== void 0 && _currentMediaNodeWith.node) {

package/dist/es2019/commands/transform.js

@@ -1,7 +1,9 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
+import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { getDraftCommandAnalyticsPayload, getPluginState, resolveDraftBookmark } from '../utils';
 const addAnnotationMark = (id, supportedBlockNodes) => (transaction, state) => {
   const inlineCommentState = getPluginState(state);
@@ -48,13 +50,27 @@ const addOpenCloseAnalytics = editorAnalyticsAPI => (drafting, method = INPUT_ME
   return transaction;
 };
 const addInsertAnalytics = editorAnalyticsAPI => (transaction, state) => {
-  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+  const analyticsEvent = {
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.ANNOTATION,
     eventType: EVENT_TYPE.TRACK,
     actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
     attributes: {}
-  })(transaction);
+  };
+  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    const {
+      bookmark
+    } = getPluginState(state) || {};
+
+    // When this FF is removed we can move the analytics event creation inside of the
+    // attachAnalyticsEvent and get type inference for the attributes.
+    // @ts-ignore
+    analyticsEvent.attributes.inlineNodeNames = getRangeInlineNodeNames({
+      doc: state.doc,
+      pos: resolveDraftBookmark(state, bookmark)
+    });
+  }
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(analyticsEvent)(transaction);
   return transaction;
 };
 const addResolveAnalytics = editorAnalyticsAPI => method => (transaction, state) => {

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

@@ -2,6 +2,7 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { clearDirtyMark, closeComponent, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../commands';
 import { AnnotationNodeView, getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
 import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
@@ -184,10 +185,25 @@ export const inlineCommentPlugin = options => {
                   key: decorationKey.block
                 }));
               } else {
-                focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
-                  class: `${getAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`,
-                  nodeName: 'span'
-                }));
+                if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+                  if (node.isText) {
+                    focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
+                      class: `${getAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`,
+                      nodeName: 'span'
+                    }));
+                  } else {
+                    focusDecorations.push(Decoration.node(pos, pos + node.nodeSize, {
+                      class: `${getAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`
+                    }, {
+                      key: decorationKey.block
+                    }));
+                  }
+                } else {
+                  focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
+                    class: `${getAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`,
+                    nodeName: 'span'
+                  }));
+                }
               }
             }
           });

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

@@ -2,7 +2,7 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
-import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, hasAnnotationMark, isParagraph, isText } from '@atlaskit/editor-common/utils';
+import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isParagraph, isText } from '@atlaskit/editor-common/utils';
 import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
@@ -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;
@@ -251,6 +259,15 @@ export const getDraftCommandAnalyticsPayload = (drafting, inputMethod) => {
         overlap: getAnnotationsInSelectionCount(state)
       };
     }
+    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      const {
+        bookmark
+      } = getPluginState(state) || {};
+      attributes.inlineNodeNames = getRangeInlineNodeNames({
+        doc: state.doc,
+        pos: resolveDraftBookmark(state, bookmark)
+      });
+    }
     return {
       action: drafting ? ACTION.OPENED : ACTION.CLOSED,
       actionSubject: ACTION_SUBJECT.ANNOTATION,

package/dist/esm/commands/transform.js

@@ -1,7 +1,9 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
+import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { getDraftCommandAnalyticsPayload, getPluginState, resolveDraftBookmark } from '../utils';
 var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes) {
   return function (transaction, state) {
@@ -58,13 +60,26 @@ var addOpenCloseAnalytics = function addOpenCloseAnalytics(editorAnalyticsAPI) {
 };
 var addInsertAnalytics = function addInsertAnalytics(editorAnalyticsAPI) {
   return function (transaction, state) {
-    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
+    var analyticsEvent = {
       action: ACTION.INSERTED,
       actionSubject: ACTION_SUBJECT.ANNOTATION,
       eventType: EVENT_TYPE.TRACK,
       actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
       attributes: {}
-    })(transaction);
+    };
+    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      var _ref2 = getPluginState(state) || {},
+        bookmark = _ref2.bookmark;
+
+      // When this FF is removed we can move the analytics event creation inside of the
+      // attachAnalyticsEvent and get type inference for the attributes.
+      // @ts-ignore
+      analyticsEvent.attributes.inlineNodeNames = getRangeInlineNodeNames({
+        doc: state.doc,
+        pos: resolveDraftBookmark(state, bookmark)
+      });
+    }
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(analyticsEvent)(transaction);
     return transaction;
   };
 };

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

@@ -5,6 +5,7 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { clearDirtyMark, closeComponent, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../commands';
 import { AnnotationNodeView, getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
 import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
@@ -241,10 +242,25 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
                   key: decorationKey.block
                 }));
               } else {
-                focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
-                  class: "".concat(getAnnotationViewClassname(isUnresolved, isSelected), " ").concat(isUnresolved),
-                  nodeName: 'span'
-                }));
+                if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+                  if (node.isText) {
+                    focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
+                      class: "".concat(getAnnotationViewClassname(isUnresolved, isSelected), " ").concat(isUnresolved),
+                      nodeName: 'span'
+                    }));
+                  } else {
+                    focusDecorations.push(Decoration.node(pos, pos + node.nodeSize, {
+                      class: "".concat(getAnnotationViewClassname(isUnresolved, isSelected), " ").concat(isUnresolved)
+                    }, {
+                      key: decorationKey.block
+                    }));
+                  }
+                } else {
+                  focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
+                    class: "".concat(getAnnotationViewClassname(isUnresolved, isSelected), " ").concat(isUnresolved),
+                    nodeName: 'span'
+                  }));
+                }
               }
             }
           });

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

@@ -2,7 +2,7 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
-import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, hasAnnotationMark, isParagraph, isText } from '@atlaskit/editor-common/utils';
+import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isParagraph, isText } from '@atlaskit/editor-common/utils';
 import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
@@ -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;
@@ -262,6 +270,14 @@ export var getDraftCommandAnalyticsPayload = function getDraftCommandAnalyticsPa
         overlap: getAnnotationsInSelectionCount(state)
       };
     }
+    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      var _ref3 = getPluginState(state) || {},
+        bookmark = _ref3.bookmark;
+      attributes.inlineNodeNames = getRangeInlineNodeNames({
+        doc: state.doc,
+        pos: resolveDraftBookmark(state, bookmark)
+      });
+    }
     return {
       action: drafting ? ACTION.OPENED : ACTION.CLOSED,
       actionSubject: ACTION_SUBJECT.ANNOTATION,
@@ -276,8 +292,8 @@ export var isSelectionValid = function isSelectionValid(state, isCommentOnMediaO
   var _currentMediaNodeWith;
   var _supportedNodes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   var selection = state.selection;
-  var _ref3 = getPluginState(state) || {},
-    disallowOnWhitespace = _ref3.disallowOnWhitespace;
+  var _ref4 = getPluginState(state) || {},
+    disallowOnWhitespace = _ref4.disallowOnWhitespace;
 
   // Allow media so that it can enter draft mode
   if (isCommentOnMediaOn && (_currentMediaNodeWith = currentMediaNodeWithPos(state)) !== null && _currentMediaNodeWith !== void 0 && _currentMediaNodeWith.node) {

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>];

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>

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,86 @@
 {
-  "name": "@atlaskit/editor-plugin-annotation",
-  "version": "1.10.0",
-  "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.1.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.2",
+	"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.6.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.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"
+		}
+	}
+}