@atlaskit/editor-plugin-annotation 1.25.0 → 1.25.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.25.2
+
+### Patch Changes
+
+- [#168832](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/168832)
+  [`6a5261e14e959`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6a5261e14e959) -
+  [ux] ED-25834 allow comment on inline node selection
+
+## 1.25.1
+
+### Patch Changes
+
+- [#167498](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/167498)
+  [`e275b9ee8b698`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e275b9ee8b698) -
+  ED-25805: refactors plugins to meet folder standards
+- Updated dependencies
+
 ## 1.25.0
 
 ### Minor Changes

package/dist/cjs/{plugin.js → annotationPlugin.js}

@@ -15,12 +15,12 @@ var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _annotation = require("@atlaskit/editor-common/annotation");
 var _hooks = require("@atlaskit/editor-common/hooks");
-var _commands = require("./commands");
+var _editorCommands = require("./editor-commands");
 var _inlineComment = require("./pm-plugins/inline-comment");
 var _keymap = require("./pm-plugins/keymap");
-var _toolbar = require("./toolbar");
+var _toolbar = require("./pm-plugins/toolbar");
+var _utils = require("./pm-plugins/utils");
 var _InlineCommentView = require("./ui/InlineCommentView");
-var _utils = require("./utils");
 var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref) {
   var _api$featureFlags, _api$analytics;
   var annotationProviders = _ref.config,
@@ -36,8 +36,8 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
     },
     actions: {
       stripNonExistingAnnotations: _utils.stripNonExistingAnnotations,
-      setInlineCommentDraftState: (0, _commands.setInlineCommentDraftState)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes),
-      showCommentForBlockNode: (0, _commands.showInlineCommentForBlockNode)(annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes)
+      setInlineCommentDraftState: (0, _editorCommands.setInlineCommentDraftState)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes),
+      showCommentForBlockNode: (0, _editorCommands.showInlineCommentForBlockNode)(annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes)
     },
     getSharedState: function getSharedState(editorState) {
       if (!editorState) {

package/dist/cjs/annotationPluginType.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/{commands → editor-commands}/index.js

@@ -11,8 +11,8 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
 var _types = require("../pm-plugins/types");
+var _utils = require("../pm-plugins/utils");
 var _types2 = require("../types");
-var _utils = require("../utils");
 var _transform = _interopRequireDefault(require("./transform"));
 var updateInlineCommentResolvedState = exports.updateInlineCommentResolvedState = function updateInlineCommentResolvedState(editorAnalyticsAPI) {
   return function (partialNewState, resolveMethod) {

package/dist/cjs/{commands → editor-commands}/transform.js

@@ -10,7 +10,7 @@ var _mark = require("@atlaskit/editor-common/mark");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _utils2 = require("../utils");
+var _utils2 = require("../pm-plugins/utils");
 var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes) {
   return function (transaction, state) {
     var inlineCommentState = (0, _utils2.getPluginState)(state);

package/dist/cjs/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "annotationPlugin", {
   enumerable: true,
   get: function get() {
-    return _plugin.annotationPlugin;
+    return _annotationPlugin.annotationPlugin;
   }
 });
-var _plugin = require("./plugin");
+var _annotationPlugin = require("./annotationPlugin");

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

@@ -13,10 +13,10 @@ 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 _editorCommands = require("../editor-commands");
 var _nodeviews = require("../nodeviews");
-var _utils = require("../utils");
 var _pluginFactory = require("./plugin-factory");
+var _utils = require("./utils");
 var fetchProviderStates = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(provider, annotationIds) {
     var data, result;
@@ -64,7 +64,7 @@ var fetchState = /*#__PURE__*/function () {
         case 4:
           inlineCommentStates = _context2.sent;
           if (editorView.dispatch) {
-            (0, _commands.updateInlineCommentResolvedState)(editorAnalyticsAPI)(inlineCommentStates)(editorView.state, editorView.dispatch);
+            (0, _editorCommands.updateInlineCommentResolvedState)(editorAnalyticsAPI)(inlineCommentStates)(editorView.state, editorView.dispatch);
           }
         case 6:
         case "end":
@@ -96,7 +96,7 @@ var initialState = function initialState() {
 };
 var hideToolbar = function hideToolbar(state, dispatch) {
   return function () {
-    (0, _commands.updateMouseState)({
+    (0, _editorCommands.updateMouseState)({
       isSelecting: true
     })(state, dispatch);
   };
@@ -106,14 +106,14 @@ var hideToolbar = function hideToolbar(state, dispatch) {
 var onResolve = function onResolve(editorAnalyticsAPI) {
   return function (state, dispatch) {
     return function (annotationId) {
-      (0, _commands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, annotationId, true), _analytics.RESOLVE_METHOD.CONSUMER)(state, dispatch);
+      (0, _editorCommands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, annotationId, true), _analytics.RESOLVE_METHOD.CONSUMER)(state, dispatch);
     };
   };
 };
 var onUnResolve = function onUnResolve(editorAnalyticsAPI) {
   return function (state, dispatch) {
     return function (annotationId) {
-      (0, _commands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, annotationId, false))(state, dispatch);
+      (0, _editorCommands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, annotationId, false))(state, dispatch);
     };
   };
 };
@@ -122,7 +122,7 @@ var onMouseUp = function onMouseUp(state, dispatch) {
     var _ref3 = (0, _utils.getPluginState)(state) || {},
       mouseData = _ref3.mouseData;
     if (mouseData !== null && mouseData !== void 0 && mouseData.isSelecting) {
-      (0, _commands.updateMouseState)({
+      (0, _editorCommands.updateMouseState)({
         isSelecting: false
       })(state, dispatch);
     }
@@ -132,7 +132,7 @@ var onSetVisibility = function onSetVisibility(view) {
   return function (isVisible) {
     var state = view.state,
       dispatch = view.dispatch;
-    (0, _commands.setInlineCommentsVisibility)(isVisible)(state, dispatch);
+    (0, _editorCommands.setInlineCommentsVisibility)(isVisible)(state, dispatch);
     if (isVisible) {
       // PM retains focus when we click away from the editor.
       // This will restore the visual aspect of the selection,
@@ -168,20 +168,20 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
       };
       var setSelectedAnnotationFn = function setSelectedAnnotationFn(annotationId) {
         if (!annotationId) {
-          (0, _commands.closeComponent)()(editorView.state, editorView.dispatch);
+          (0, _editorCommands.closeComponent)()(editorView.state, editorView.dispatch);
         } else {
-          (0, _commands.setSelectedAnnotation)(annotationId)(editorView.state, editorView.dispatch);
+          (0, _editorCommands.setSelectedAnnotation)(annotationId)(editorView.state, editorView.dispatch);
         }
       };
       var setHoveredAnnotationFn = function setHoveredAnnotationFn(annotationId) {
         if (!annotationId) {
-          (0, _commands.closeComponent)()(editorView.state, editorView.dispatch);
+          (0, _editorCommands.closeComponent)()(editorView.state, editorView.dispatch);
         } else {
-          (0, _commands.setHoveredAnnotation)(annotationId)(editorView.state, editorView.dispatch);
+          (0, _editorCommands.setHoveredAnnotation)(annotationId)(editorView.state, editorView.dispatch);
         }
       };
       var removeHoveredannotationFn = function removeHoveredannotationFn() {
-        (0, _commands.setHoveredAnnotation)('')(editorView.state, editorView.dispatch);
+        (0, _editorCommands.setHoveredAnnotation)('')(editorView.state, editorView.dispatch);
       };
       var updateSubscriber = provider.updateSubscriber;
       if (updateSubscriber) {
@@ -197,7 +197,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
           if (!dirtyAnnotations) {
             return;
           }
-          (0, _commands.clearDirtyMark)()(view.state, view.dispatch);
+          (0, _editorCommands.clearDirtyMark)()(view.state, view.dispatch);
           fetchState(provider, (0, _utils.getAllAnnotations)(view.state.doc), view, options.editorAnalyticsAPI);
         },
         destroy: function destroy() {

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

@@ -7,9 +7,9 @@ exports.keymapPlugin = keymapPlugin;
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
-var _commands = require("../commands");
+var _editorCommands = require("../editor-commands");
 function keymapPlugin(editorAnalyticsAPI) {
   var list = {};
-  (0, _keymaps.bindKeymapWithCommand)(_keymaps.addInlineComment.common, (0, _commands.setInlineCommentDraftState)(editorAnalyticsAPI)(true, _analytics.INPUT_METHOD.SHORTCUT), list);
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.addInlineComment.common, (0, _editorCommands.setInlineCommentDraftState)(editorAnalyticsAPI)(true, _analytics.INPUT_METHOD.SHORTCUT), list);
   return (0, _keymap.keymap)(list);
 }

package/dist/cjs/pm-plugins/plugin-factory.js

@@ -9,8 +9,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _utils2 = require("../utils");
 var _reducer = _interopRequireDefault(require("./reducer"));
+var _utils2 = require("./utils");
 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; }
 var handleDocChanged = function handleDocChanged(tr, prevPluginState) {

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

@@ -8,8 +8,8 @@ exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _utils = require("../utils");
 var _types = require("./types");
+var _utils = require("./utils");
 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; }
 var _default = exports.default = function _default(pluginState, action) {

package/dist/cjs/{toolbar.js → pm-plugins/toolbar.js}

@@ -15,8 +15,8 @@ var _comment = _interopRequireDefault(require("@atlaskit/icon/core/comment"));
 var _comment2 = _interopRequireDefault(require("@atlaskit/icon/glyph/comment"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
-var _commands = require("./commands");
-var _types = require("./types");
+var _editorCommands = require("../editor-commands");
+var _types = require("../types");
 var _utils2 = require("./utils");
 var INLINE_COMMENT_ON_INLINE_NODE_SPOTLIGHT_EP_MESSAGE_ID = 'inline-comments-on-inline-node-spotlight';
 var createSpotlightConfig = function createSpotlightConfig(_ref) {
@@ -138,7 +138,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
             }
           });
         }
-        return (0, _commands.setInlineCommentDraftState)(editorAnalyticsAPI)(true)(state, dispatch);
+        return (0, _editorCommands.setInlineCommentDraftState)(editorAnalyticsAPI)(true)(state, dispatch);
       },
       supportsViewMode: true,
       // TODO: MODES-3950 Clean up this floating toolbar view mode logic,

package/dist/cjs/{utils.js → pm-plugins/utils.js}

@@ -34,7 +34,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _types = require("./types");
+var _types = require("../types");
 function sum(arr, f) {
   return arr.reduce(function (val, x) {
     return val + f(x);
@@ -321,12 +321,13 @@ var isSelectionValid = exports.isSelectionValid = function isSelectionValid(stat
   var selection = state.selection;
   var _ref4 = getPluginState(state) || {},
     disallowOnWhitespace = _ref4.disallowOnWhitespace;
+  var allowedInlineNodes = ['emoji', 'status', 'date', 'mention', 'inlineCard'];
 
   // Allow media so that it can enter draft mode
   if ((_currentMediaNodeWith = (0, _mediaSingle.currentMediaNodeWithPos)(state)) !== null && _currentMediaNodeWith !== void 0 && _currentMediaNodeWith.node) {
     return _types.AnnotationSelectionType.VALID;
   }
-  if (selection.empty || !(selection instanceof _state.TextSelection || selection instanceof _state.AllSelection)) {
+  if (selection.empty || !(selection instanceof _state.TextSelection || selection instanceof _state.AllSelection || selection instanceof _state.NodeSelection && allowedInlineNodes.includes(selection.node.type.name) && (0, _platformFeatureFlags.fg)('platform_inline_node_as_valid_annotation_selection'))) {
     return _types.AnnotationSelectionType.INVALID;
   }
   var containsInvalidNodes = hasInvalidNodes(state);
@@ -342,7 +343,7 @@ var isSelectionValid = exports.isSelectionValid = function isSelectionValid(stat
   if (disallowOnWhitespace && hasInvalidWhitespaceNode(selection, state.schema)) {
     return _types.AnnotationSelectionType.INVALID;
   }
-  if ((0, _utils.isEmptyTextSelection)(selection, state.schema)) {
+  if (!(selection instanceof _state.NodeSelection) && (0, _utils.isEmptyTextSelection)(selection, state.schema)) {
     return _types.AnnotationSelectionType.INVALID;
   }
   return _types.AnnotationSelectionType.VALID;

package/dist/cjs/ui/InlineCommentView.js

@@ -11,9 +11,9 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("@atlaskit/editor-common/utils");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
-var _commands = require("../commands");
+var _editorCommands = require("../editor-commands");
+var _utils3 = require("../pm-plugins/utils");
 var _types = require("../types");
-var _utils3 = require("../utils");
 var _AnnotationViewWrapper = require("./AnnotationViewWrapper");
 var findPosForDOM = function findPosForDOM(sel) {
   var $from = sel.$from,
@@ -98,11 +98,11 @@ function InlineCommentView(_ref) {
       dom: dom,
       textSelection: textSelection,
       onCreate: function onCreate(id) {
-        (0, _commands.createAnnotation)(editorAnalyticsAPI, editorAPI)(id, _adfSchema.AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch);
+        (0, _editorCommands.createAnnotation)(editorAnalyticsAPI, editorAPI)(id, _adfSchema.AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch);
         !editorView.hasFocus() && editorView.focus();
       },
       onClose: function onClose() {
-        (0, _commands.setInlineCommentDraftState)(editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
+        (0, _editorCommands.setInlineCommentDraftState)(editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
         !editorView.hasFocus() && editorView.focus();
       },
       inlineNodeTypes: inlineNodeTypes,
@@ -160,13 +160,13 @@ function InlineCommentView(_ref) {
     getInlineNodeTypes: getInlineNodeTypes,
     dom: dom,
     onDelete: function onDelete(id) {
-      return (0, _commands.removeInlineCommentNearSelection)(id, inlineCommentProvider.supportedBlockNodes)(state, dispatch);
+      return (0, _editorCommands.removeInlineCommentNearSelection)(id, inlineCommentProvider.supportedBlockNodes)(state, dispatch);
     },
     onResolve: function onResolve(id) {
-      return (0, _commands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, id, true), _analytics.RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch);
+      return (0, _editorCommands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, id, true), _analytics.RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch);
     },
     onClose: function onClose() {
-      (0, _commands.closeComponent)()(editorView.state, editorView.dispatch);
+      (0, _editorCommands.closeComponent)()(editorView.state, editorView.dispatch);
     },
     isOpeningMediaCommentFromToolbar: isOpeningMediaCommentFromToolbar
   }));

package/dist/es2019/{plugin.js → annotationPlugin.js}

@@ -2,12 +2,12 @@ import React from 'react';
 import { annotation } from '@atlaskit/adf-schema';
 import { AnnotationUpdateEmitter } from '@atlaskit/editor-common/annotation';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './commands';
+import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './editor-commands';
 import { inlineCommentPlugin } from './pm-plugins/inline-comment';
 import { keymapPlugin } from './pm-plugins/keymap';
-import { buildToolbar } from './toolbar';
+import { buildToolbar } from './pm-plugins/toolbar';
+import { getPluginState, stripNonExistingAnnotations } from './pm-plugins/utils';
 import { InlineCommentView } from './ui/InlineCommentView';
-import { getPluginState, stripNonExistingAnnotations } from './utils';
 export const annotationPlugin = ({
   config: annotationProviders,
   api

package/dist/es2019/annotationPluginType.js

@@ -0,0 +1 @@
+export {};

package/dist/es2019/{commands → editor-commands}/index.js

@@ -3,8 +3,8 @@ import { INPUT_METHOD, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics'
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { createCommand } from '../pm-plugins/plugin-factory';
 import { ACTIONS } from '../pm-plugins/types';
+import { getPluginState, inlineCommentPluginKey, isSelectionValid, isSupportedBlockNode } from '../pm-plugins/utils';
 import { AnnotationSelectionType } from '../types';
-import { getPluginState, inlineCommentPluginKey, isSelectionValid, isSupportedBlockNode } from '../utils';
 import transform from './transform';
 export const updateInlineCommentResolvedState = editorAnalyticsAPI => (partialNewState, resolveMethod) => {
   const command = {

package/dist/es2019/{commands → editor-commands}/transform.js

@@ -4,7 +4,7 @@ import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
 import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { getDraftCommandAnalyticsPayload, getPluginState, resolveDraftBookmark } from '../utils';
+import { getDraftCommandAnalyticsPayload, getPluginState, resolveDraftBookmark } from '../pm-plugins/utils';
 const addAnnotationMark = (id, supportedBlockNodes) => (transaction, state) => {
   const inlineCommentState = getPluginState(state);
   const {

package/dist/es2019/index.js

@@ -1 +1 @@
-export { annotationPlugin } from './plugin';
+export { annotationPlugin } from './annotationPlugin';

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

@@ -3,10 +3,10 @@ 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 { fg } from '@atlaskit/platform-feature-flags';
-import { clearDirtyMark, closeComponent, setHoveredAnnotation, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../commands';
+import { clearDirtyMark, closeComponent, setHoveredAnnotation, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../editor-commands';
 import { AnnotationNodeView, getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
-import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
 import { createPluginState } from './plugin-factory';
+import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from './utils';
 const fetchProviderStates = async (provider, annotationIds) => {
   const data = await provider.getState(annotationIds);
   let result = {};

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

@@ -1,7 +1,7 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { addInlineComment, bindKeymapWithCommand } from '@atlaskit/editor-common/keymaps';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import { setInlineCommentDraftState } from '../commands';
+import { setInlineCommentDraftState } from '../editor-commands';
 export function keymapPlugin(editorAnalyticsAPI) {
   const list = {};
   bindKeymapWithCommand(addInlineComment.common, setInlineCommentDraftState(editorAnalyticsAPI)(true, INPUT_METHOD.SHORTCUT), list);

package/dist/es2019/pm-plugins/plugin-factory.js

@@ -1,8 +1,8 @@
 import { pluginFactory } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { decorationKey, findAnnotationsInSelection, inlineCommentPluginKey, isBlockNodeAnnotationsSelected, isSelectedAnnotationsChanged } from '../utils';
 import reducer from './reducer';
+import { decorationKey, findAnnotationsInSelection, inlineCommentPluginKey, isBlockNodeAnnotationsSelected, isSelectedAnnotationsChanged } from './utils';
 const handleDocChanged = (tr, prevPluginState) => {
   if (!tr.getMeta('replaceDocument')) {
     return getSelectionChangedHandler(false)(tr, prevPluginState);

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

@@ -1,6 +1,6 @@
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { addDraftDecoration, resolveDraftBookmark } from '../utils';
 import { ACTIONS } from './types';
+import { addDraftDecoration, resolveDraftBookmark } from './utils';
 export default ((pluginState, action) => {
   switch (action.type) {
     case ACTIONS.UPDATE_INLINE_COMMENT_STATE:

package/dist/es2019/{toolbar.js → pm-plugins/toolbar.js}

@@ -8,8 +8,8 @@ import CommentIcon from '@atlaskit/icon/core/comment';
 import LegacyCommentIcon from '@atlaskit/icon/glyph/comment';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { setInlineCommentDraftState } from './commands';
-import { AnnotationSelectionType, AnnotationTestIds } from './types';
+import { setInlineCommentDraftState } from '../editor-commands';
+import { AnnotationSelectionType, AnnotationTestIds } from '../types';
 import { getPluginState, isSelectionValid, resolveDraftBookmark } from './utils';
 const INLINE_COMMENT_ON_INLINE_NODE_SPOTLIGHT_EP_MESSAGE_ID = 'inline-comments-on-inline-node-spotlight';
 const createSpotlightConfig = ({

package/dist/es2019/{utils.js → pm-plugins/utils.js}

@@ -6,7 +6,7 @@ import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFrom
 import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { AnnotationSelectionType } from './types';
+import { AnnotationSelectionType } from '../types';
 export { hasAnnotationMark, containsAnyAnnotations };
 function sum(arr, f) {
   return arr.reduce((val, x) => val + f(x), 0);
@@ -286,12 +286,13 @@ export const isSelectionValid = (state, _supportedNodes = []) => {
   const {
     disallowOnWhitespace
   } = getPluginState(state) || {};
+  const allowedInlineNodes = ['emoji', 'status', 'date', 'mention', 'inlineCard'];
 
   // Allow media so that it can enter draft mode
   if ((_currentMediaNodeWith = currentMediaNodeWithPos(state)) !== null && _currentMediaNodeWith !== void 0 && _currentMediaNodeWith.node) {
     return AnnotationSelectionType.VALID;
   }
-  if (selection.empty || !(selection instanceof TextSelection || selection instanceof AllSelection)) {
+  if (selection.empty || !(selection instanceof TextSelection || selection instanceof AllSelection || selection instanceof NodeSelection && allowedInlineNodes.includes(selection.node.type.name) && fg('platform_inline_node_as_valid_annotation_selection'))) {
     return AnnotationSelectionType.INVALID;
   }
   const containsInvalidNodes = hasInvalidNodes(state);
@@ -307,7 +308,7 @@ export const isSelectionValid = (state, _supportedNodes = []) => {
   if (disallowOnWhitespace && hasInvalidWhitespaceNode(selection, state.schema)) {
     return AnnotationSelectionType.INVALID;
   }
-  if (isEmptyTextSelection(selection, state.schema)) {
+  if (!(selection instanceof NodeSelection) && isEmptyTextSelection(selection, state.schema)) {
     return AnnotationSelectionType.INVALID;
   }
   return AnnotationSelectionType.VALID;

package/dist/es2019/ui/InlineCommentView.js

@@ -3,9 +3,9 @@ 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 { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { closeComponent, createAnnotation, removeInlineCommentNearSelection, setInlineCommentDraftState, updateInlineCommentResolvedState } from '../commands';
+import { closeComponent, createAnnotation, removeInlineCommentNearSelection, setInlineCommentDraftState, updateInlineCommentResolvedState } from '../editor-commands';
+import { getAllAnnotations, getAnnotationViewKey, getPluginState, getSelectionPositions } from '../pm-plugins/utils';
 import { AnnotationTestIds } from '../types';
-import { getAllAnnotations, getAnnotationViewKey, getPluginState, getSelectionPositions } from '../utils';
 import { AnnotationViewWrapper } from './AnnotationViewWrapper';
 const findPosForDOM = sel => {
   const {

package/dist/esm/{plugin.js → annotationPlugin.js}

@@ -2,12 +2,12 @@ import React from 'react';
 import { annotation } from '@atlaskit/adf-schema';
 import { AnnotationUpdateEmitter } from '@atlaskit/editor-common/annotation';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './commands';
+import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './editor-commands';
 import { inlineCommentPlugin } from './pm-plugins/inline-comment';
 import { keymapPlugin } from './pm-plugins/keymap';
-import { buildToolbar } from './toolbar';
+import { buildToolbar } from './pm-plugins/toolbar';
+import { getPluginState, stripNonExistingAnnotations } from './pm-plugins/utils';
 import { InlineCommentView } from './ui/InlineCommentView';
-import { getPluginState, stripNonExistingAnnotations } from './utils';
 export var annotationPlugin = function annotationPlugin(_ref) {
   var _api$featureFlags, _api$analytics;
   var annotationProviders = _ref.config,

package/dist/esm/annotationPluginType.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/{commands → editor-commands}/index.js

@@ -4,8 +4,8 @@ import { INPUT_METHOD, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics'
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { createCommand } from '../pm-plugins/plugin-factory';
 import { ACTIONS } from '../pm-plugins/types';
+import { getPluginState, inlineCommentPluginKey, isSelectionValid, isSupportedBlockNode } from '../pm-plugins/utils';
 import { AnnotationSelectionType } from '../types';
-import { getPluginState, inlineCommentPluginKey, isSelectionValid, isSupportedBlockNode } from '../utils';
 import transform from './transform';
 export var updateInlineCommentResolvedState = function updateInlineCommentResolvedState(editorAnalyticsAPI) {
   return function (partialNewState, resolveMethod) {

package/dist/esm/{commands → editor-commands}/transform.js

@@ -4,7 +4,7 @@ import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
 import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { getDraftCommandAnalyticsPayload, getPluginState, resolveDraftBookmark } from '../utils';
+import { getDraftCommandAnalyticsPayload, getPluginState, resolveDraftBookmark } from '../pm-plugins/utils';
 var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes) {
   return function (transaction, state) {
     var inlineCommentState = getPluginState(state);

package/dist/esm/index.js

@@ -1 +1 @@
-export { annotationPlugin } from './plugin';
+export { annotationPlugin } from './annotationPlugin';

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

@@ -6,10 +6,10 @@ 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 { fg } from '@atlaskit/platform-feature-flags';
-import { clearDirtyMark, closeComponent, setHoveredAnnotation, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../commands';
+import { clearDirtyMark, closeComponent, setHoveredAnnotation, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../editor-commands';
 import { AnnotationNodeView, getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
-import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
 import { createPluginState } from './plugin-factory';
+import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from './utils';
 var fetchProviderStates = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(provider, annotationIds) {
     var data, result;

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

@@ -1,7 +1,7 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { addInlineComment, bindKeymapWithCommand } from '@atlaskit/editor-common/keymaps';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import { setInlineCommentDraftState } from '../commands';
+import { setInlineCommentDraftState } from '../editor-commands';
 export function keymapPlugin(editorAnalyticsAPI) {
   var list = {};
   bindKeymapWithCommand(addInlineComment.common, setInlineCommentDraftState(editorAnalyticsAPI)(true, INPUT_METHOD.SHORTCUT), list);

package/dist/esm/pm-plugins/plugin-factory.js

@@ -4,8 +4,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { pluginFactory } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { decorationKey, findAnnotationsInSelection, inlineCommentPluginKey, isBlockNodeAnnotationsSelected, isSelectedAnnotationsChanged } from '../utils';
 import reducer from './reducer';
+import { decorationKey, findAnnotationsInSelection, inlineCommentPluginKey, isBlockNodeAnnotationsSelected, isSelectedAnnotationsChanged } from './utils';
 var handleDocChanged = function handleDocChanged(tr, prevPluginState) {
   if (!tr.getMeta('replaceDocument')) {
     return getSelectionChangedHandler(false)(tr, prevPluginState);

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

@@ -3,8 +3,8 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _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 { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { addDraftDecoration, resolveDraftBookmark } from '../utils';
 import { ACTIONS } from './types';
+import { addDraftDecoration, resolveDraftBookmark } from './utils';
 export default (function (pluginState, action) {
   switch (action.type) {
     case ACTIONS.UPDATE_INLINE_COMMENT_STATE:

package/dist/esm/{toolbar.js → pm-plugins/toolbar.js}

@@ -8,8 +8,8 @@ import CommentIcon from '@atlaskit/icon/core/comment';
 import LegacyCommentIcon from '@atlaskit/icon/glyph/comment';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { setInlineCommentDraftState } from './commands';
-import { AnnotationSelectionType, AnnotationTestIds } from './types';
+import { setInlineCommentDraftState } from '../editor-commands';
+import { AnnotationSelectionType, AnnotationTestIds } from '../types';
 import { getPluginState, isSelectionValid, resolveDraftBookmark } from './utils';
 var INLINE_COMMENT_ON_INLINE_NODE_SPOTLIGHT_EP_MESSAGE_ID = 'inline-comments-on-inline-node-spotlight';
 var createSpotlightConfig = function createSpotlightConfig(_ref) {

package/dist/esm/{utils.js → pm-plugins/utils.js}

@@ -6,7 +6,7 @@ import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFrom
 import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { AnnotationSelectionType } from './types';
+import { AnnotationSelectionType } from '../types';
 export { hasAnnotationMark, containsAnyAnnotations };
 function sum(arr, f) {
   return arr.reduce(function (val, x) {
@@ -294,12 +294,13 @@ export var isSelectionValid = function isSelectionValid(state) {
   var selection = state.selection;
   var _ref4 = getPluginState(state) || {},
     disallowOnWhitespace = _ref4.disallowOnWhitespace;
+  var allowedInlineNodes = ['emoji', 'status', 'date', 'mention', 'inlineCard'];
 
   // Allow media so that it can enter draft mode
   if ((_currentMediaNodeWith = currentMediaNodeWithPos(state)) !== null && _currentMediaNodeWith !== void 0 && _currentMediaNodeWith.node) {
     return AnnotationSelectionType.VALID;
   }
-  if (selection.empty || !(selection instanceof TextSelection || selection instanceof AllSelection)) {
+  if (selection.empty || !(selection instanceof TextSelection || selection instanceof AllSelection || selection instanceof NodeSelection && allowedInlineNodes.includes(selection.node.type.name) && fg('platform_inline_node_as_valid_annotation_selection'))) {
     return AnnotationSelectionType.INVALID;
   }
   var containsInvalidNodes = hasInvalidNodes(state);
@@ -315,7 +316,7 @@ export var isSelectionValid = function isSelectionValid(state) {
   if (disallowOnWhitespace && hasInvalidWhitespaceNode(selection, state.schema)) {
     return AnnotationSelectionType.INVALID;
   }
-  if (isEmptyTextSelection(selection, state.schema)) {
+  if (!(selection instanceof NodeSelection) && isEmptyTextSelection(selection, state.schema)) {
     return AnnotationSelectionType.INVALID;
   }
   return AnnotationSelectionType.VALID;

package/dist/esm/ui/InlineCommentView.js

@@ -4,9 +4,9 @@ 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 { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { closeComponent, createAnnotation, removeInlineCommentNearSelection, setInlineCommentDraftState, updateInlineCommentResolvedState } from '../commands';
+import { closeComponent, createAnnotation, removeInlineCommentNearSelection, setInlineCommentDraftState, updateInlineCommentResolvedState } from '../editor-commands';
+import { getAllAnnotations, getAnnotationViewKey, getPluginState, getSelectionPositions } from '../pm-plugins/utils';
 import { AnnotationTestIds } from '../types';
-import { getAllAnnotations, getAnnotationViewKey, getPluginState, getSelectionPositions } from '../utils';
 import { AnnotationViewWrapper } from './AnnotationViewWrapper';
 var findPosForDOM = function findPosForDOM(sel) {
   var $from = sel.$from,

package/dist/types/{plugin.d.ts → annotationPlugin.d.ts}

@@ -1,6 +1,7 @@
 import type { UpdateEvent } from '@atlaskit/editor-common/annotation';
 import { AnnotationUpdateEmitter } from '@atlaskit/editor-common/annotation';
-import type { AnnotationInfo, AnnotationPlugin, AnnotationProviders, AnnotationState, AnnotationTypeProvider, InlineCommentAnnotationProvider, InlineCommentCreateComponentProps, InlineCommentState, InlineCommentViewComponentProps } from './types';
+import type { AnnotationPlugin } from './annotationPluginType';
+import type { AnnotationInfo, AnnotationProviders, AnnotationState, AnnotationTypeProvider, InlineCommentAnnotationProvider, InlineCommentCreateComponentProps, InlineCommentState, InlineCommentViewComponentProps } from './types';
 export declare const annotationPlugin: AnnotationPlugin;
 export { AnnotationUpdateEmitter };
 export type { AnnotationProviders, InlineCommentAnnotationProvider, InlineCommentCreateComponentProps, InlineCommentViewComponentProps, AnnotationTypeProvider, AnnotationInfo, AnnotationState, InlineCommentState, UpdateEvent, };

package/dist/types/annotationPluginType.d.ts

@@ -0,0 +1,35 @@
+import type { Command, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { EditorViewModeEffectsPlugin } from '@atlaskit/editor-plugin-editor-viewmode-effects';
+import type { EngagementPlatformPlugin } from '@atlaskit/editor-plugin-engagement-platform';
+import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
+import type { Slice } from '@atlaskit/editor-prosemirror/model';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { showInlineCommentForBlockNode } from './editor-commands';
+import type { InlineCommentPluginState } from './pm-plugins/types';
+import type { AnnotationProviders, InlineCommentInputMethod, TargetType } from './types';
+type StripNonExistingAnnotations = (slice: Slice, state: EditorState) => boolean | undefined;
+type SetInlineCommentDraftState = (drafting: boolean, inputMethod: InlineCommentInputMethod, 
+/** @default 'inline' */
+targetType?: TargetType, targetNodeId?: string, isOpeningMediaCommentFromToolbar?: boolean) => Command;
+export type AnnotationPlugin = NextEditorPlugin<'annotation', {
+    pluginConfiguration: AnnotationProviders | undefined;
+    sharedState: InlineCommentPluginState | undefined;
+    dependencies: [
+        OptionalPlugin<AnalyticsPlugin>,
+        OptionalPlugin<EditorViewModeEffectsPlugin>,
+        OptionalPlugin<FeatureFlagsPlugin>,
+        OptionalPlugin<EngagementPlatformPlugin>
+    ];
+    actions: {
+        stripNonExistingAnnotations: StripNonExistingAnnotations;
+        setInlineCommentDraftState: SetInlineCommentDraftState;
+        /**
+         * This function attempts to display the inline comment popup for a given node.
+         * @returns A command function that returns true if the given node is supported and has resolved annotation mark(s);
+         * otherwise, it will return false.
+         */
+        showCommentForBlockNode: ReturnType<typeof showInlineCommentForBlockNode>;
+    };
+}>;
+export {};

package/dist/types/{commands → editor-commands}/index.d.ts

@@ -3,8 +3,9 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { RESOLVE_METHOD, type VIEW_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { AnnotationPlugin } from '../annotationPluginType';
 import type { InlineCommentMap, InlineCommentMouseData } from '../pm-plugins/types';
-import type { AnnotationPlugin, InlineCommentInputMethod, TargetType } from '../types';
+import type { InlineCommentInputMethod, TargetType } from '../types';
 export declare const updateInlineCommentResolvedState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (partialNewState: InlineCommentMap, resolveMethod?: RESOLVE_METHOD) => Command;
 export declare const closeComponent: () => Command;
 export declare const clearDirtyMark: () => Command;

package/dist/types/index.d.ts

@@ -1,3 +1,4 @@
-export { annotationPlugin } from './plugin';
-export type { AnnotationPlugin, AnnotationProviders, InlineCommentAnnotationProvider, AnnotationInfo, InlineCommentCreateComponentProps, InlineCommentViewComponentProps, AnnotationState, AnnotationTypeProvider, InlineCommentState, TargetType, InlineCommentInputMethod, } from './types';
+export { annotationPlugin } from './annotationPlugin';
+export type { AnnotationPlugin } from './annotationPluginType';
+export type { AnnotationProviders, InlineCommentAnnotationProvider, AnnotationInfo, InlineCommentCreateComponentProps, InlineCommentViewComponentProps, AnnotationState, AnnotationTypeProvider, InlineCommentState, TargetType, InlineCommentInputMethod, } from './types';
 export type { InlineCommentMap, InlineCommentPluginState, InlineCommentPluginOptions, InlineCommentAction, } from './pm-plugins/types';

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

@@ -2,7 +2,7 @@ import type { IntlShape } from 'react-intl-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { ExtractInjectionAPI, FloatingToolbarConfig } from '@atlaskit/editor-common/types';
 import { type EditorState } from '@atlaskit/editor-prosemirror/state';
-import { type AnnotationPlugin } from './types';
+import type { AnnotationPlugin } from '../annotationPluginType';
 interface BuildToolbarOptions {
     state: EditorState;
     intl: IntlShape;

package/dist/types/{utils.d.ts → pm-plugins/utils.d.ts}

@@ -2,11 +2,11 @@ import type { AnalyticsEventPayloadCallback } from '@atlaskit/editor-common/anal
 import { containsAnyAnnotations, hasAnnotationMark } from '@atlaskit/editor-common/utils';
 import type { Mark, Node, ResolvedPos, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Selection, SelectionBookmark } from '@atlaskit/editor-prosemirror/state';
-import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import type { InlineCommentPluginState } from './pm-plugins/types';
-import type { AnnotationInfo, DraftBookmark, InlineCommentInputMethod, TargetType } from './types';
-import { AnnotationSelectionType } from './types';
+import type { AnnotationInfo, DraftBookmark, InlineCommentInputMethod, TargetType } from '../types';
+import { AnnotationSelectionType } from '../types';
+import type { InlineCommentPluginState } from './types';
 export { hasAnnotationMark, containsAnyAnnotations };
 /**
  * Finds the marks in the nodes to the left and right.
@@ -41,7 +41,7 @@ export declare const isSupportedBlockNode: (node: Node, supportedBlockNodes?: st
  * Checks if any of the nodes in a given selection are completely whitespace
  * This is to conform to Confluence annotation specifications
  */
-export declare function hasInvalidWhitespaceNode(selection: TextSelection | AllSelection, schema: Schema): boolean;
+export declare function hasInvalidWhitespaceNode(selection: TextSelection | AllSelection | NodeSelection, schema: Schema): boolean;
 export declare function annotationExists(annotationId: string, state: EditorState): boolean;
 export declare function stripNonExistingAnnotations(slice: Slice, state: EditorState): false | undefined;
 /**

package/dist/{types-ts4.5/types.d.ts → types/types/index.d.ts}

@@ -2,16 +2,6 @@ import type React from 'react';
 import type { AnnotationTypes } from '@atlaskit/adf-schema';
 import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { AnnotationUpdateEmitter } from '@atlaskit/editor-common/annotation';
-import type { Command, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
-import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { EditorViewModeEffectsPlugin } from '@atlaskit/editor-plugin-editor-viewmode-effects';
-import type { EngagementPlatformPlugin } from '@atlaskit/editor-plugin-engagement-platform';
-import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
-import type { Slice } from '@atlaskit/editor-prosemirror/model';
-import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-import type { showInlineCommentForBlockNode } from './commands';
-import type { InlineCommentPluginState } from './pm-plugins/types';
-type StripNonExistingAnnotations = (slice: Slice, state: EditorState) => boolean | undefined;
 /**
  * type of target that annotation apply to.
  * This is used to apply correct decoration to a draft comment
@@ -21,29 +11,6 @@ export type TargetType = 'block' | 'inline';
  * The source of draft comment being created
  */
 export type InlineCommentInputMethod = INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHORTCUT | INPUT_METHOD.FLOATING_TB;
-type SetInlineCommentDraftState = (drafting: boolean, inputMethod: InlineCommentInputMethod, 
-/** @default 'inline' */
-targetType?: TargetType, targetNodeId?: string, isOpeningMediaCommentFromToolbar?: boolean) => Command;
-export type AnnotationPlugin = NextEditorPlugin<'annotation', {
-    pluginConfiguration: AnnotationProviders | undefined;
-    sharedState: InlineCommentPluginState | undefined;
-    dependencies: [
-        OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<EditorViewModeEffectsPlugin>,
-        OptionalPlugin<FeatureFlagsPlugin>,
-        OptionalPlugin<EngagementPlatformPlugin>
-    ];
-    actions: {
-        stripNonExistingAnnotations: StripNonExistingAnnotations;
-        setInlineCommentDraftState: SetInlineCommentDraftState;
-        /**
-         * This function attempts to display the inline comment popup for a given node.
-         * @returns A command function that returns true if the given node is supported and has resolved annotation mark(s);
-         * otherwise, it will return false.
-         */
-        showCommentForBlockNode: ReturnType<typeof showInlineCommentForBlockNode>;
-    };
-}>;
 export type AnnotationInfo = {
     id: string;
     type: AnnotationTypes.INLINE_COMMENT;

package/dist/types/ui/InlineCommentView.d.ts

@@ -2,7 +2,8 @@
 import type { DispatchAnalyticsEvent, EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { AnnotationPlugin, AnnotationProviders } from '../types';
+import type { AnnotationPlugin } from '../annotationPluginType';
+import { type AnnotationProviders } from '../types';
 interface InlineCommentViewProps {
     providers: AnnotationProviders;
     editorView: EditorView;

package/dist/types-ts4.5/{plugin.d.ts → annotationPlugin.d.ts}

@@ -1,6 +1,7 @@
 import type { UpdateEvent } from '@atlaskit/editor-common/annotation';
 import { AnnotationUpdateEmitter } from '@atlaskit/editor-common/annotation';
-import type { AnnotationInfo, AnnotationPlugin, AnnotationProviders, AnnotationState, AnnotationTypeProvider, InlineCommentAnnotationProvider, InlineCommentCreateComponentProps, InlineCommentState, InlineCommentViewComponentProps } from './types';
+import type { AnnotationPlugin } from './annotationPluginType';
+import type { AnnotationInfo, AnnotationProviders, AnnotationState, AnnotationTypeProvider, InlineCommentAnnotationProvider, InlineCommentCreateComponentProps, InlineCommentState, InlineCommentViewComponentProps } from './types';
 export declare const annotationPlugin: AnnotationPlugin;
 export { AnnotationUpdateEmitter };
 export type { AnnotationProviders, InlineCommentAnnotationProvider, InlineCommentCreateComponentProps, InlineCommentViewComponentProps, AnnotationTypeProvider, AnnotationInfo, AnnotationState, InlineCommentState, UpdateEvent, };

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

@@ -0,0 +1,35 @@
+import type { Command, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { EditorViewModeEffectsPlugin } from '@atlaskit/editor-plugin-editor-viewmode-effects';
+import type { EngagementPlatformPlugin } from '@atlaskit/editor-plugin-engagement-platform';
+import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
+import type { Slice } from '@atlaskit/editor-prosemirror/model';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { showInlineCommentForBlockNode } from './editor-commands';
+import type { InlineCommentPluginState } from './pm-plugins/types';
+import type { AnnotationProviders, InlineCommentInputMethod, TargetType } from './types';
+type StripNonExistingAnnotations = (slice: Slice, state: EditorState) => boolean | undefined;
+type SetInlineCommentDraftState = (drafting: boolean, inputMethod: InlineCommentInputMethod, 
+/** @default 'inline' */
+targetType?: TargetType, targetNodeId?: string, isOpeningMediaCommentFromToolbar?: boolean) => Command;
+export type AnnotationPlugin = NextEditorPlugin<'annotation', {
+    pluginConfiguration: AnnotationProviders | undefined;
+    sharedState: InlineCommentPluginState | undefined;
+    dependencies: [
+        OptionalPlugin<AnalyticsPlugin>,
+        OptionalPlugin<EditorViewModeEffectsPlugin>,
+        OptionalPlugin<FeatureFlagsPlugin>,
+        OptionalPlugin<EngagementPlatformPlugin>
+    ];
+    actions: {
+        stripNonExistingAnnotations: StripNonExistingAnnotations;
+        setInlineCommentDraftState: SetInlineCommentDraftState;
+        /**
+         * This function attempts to display the inline comment popup for a given node.
+         * @returns A command function that returns true if the given node is supported and has resolved annotation mark(s);
+         * otherwise, it will return false.
+         */
+        showCommentForBlockNode: ReturnType<typeof showInlineCommentForBlockNode>;
+    };
+}>;
+export {};

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

@@ -3,8 +3,9 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { RESOLVE_METHOD, type VIEW_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { AnnotationPlugin } from '../annotationPluginType';
 import type { InlineCommentMap, InlineCommentMouseData } from '../pm-plugins/types';
-import type { AnnotationPlugin, InlineCommentInputMethod, TargetType } from '../types';
+import type { InlineCommentInputMethod, TargetType } from '../types';
 export declare const updateInlineCommentResolvedState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (partialNewState: InlineCommentMap, resolveMethod?: RESOLVE_METHOD) => Command;
 export declare const closeComponent: () => Command;
 export declare const clearDirtyMark: () => Command;

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

@@ -1,3 +1,4 @@
-export { annotationPlugin } from './plugin';
-export type { AnnotationPlugin, AnnotationProviders, InlineCommentAnnotationProvider, AnnotationInfo, InlineCommentCreateComponentProps, InlineCommentViewComponentProps, AnnotationState, AnnotationTypeProvider, InlineCommentState, TargetType, InlineCommentInputMethod, } from './types';
+export { annotationPlugin } from './annotationPlugin';
+export type { AnnotationPlugin } from './annotationPluginType';
+export type { AnnotationProviders, InlineCommentAnnotationProvider, AnnotationInfo, InlineCommentCreateComponentProps, InlineCommentViewComponentProps, AnnotationState, AnnotationTypeProvider, InlineCommentState, TargetType, InlineCommentInputMethod, } from './types';
 export type { InlineCommentMap, InlineCommentPluginState, InlineCommentPluginOptions, InlineCommentAction, } from './pm-plugins/types';

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

@@ -2,7 +2,7 @@ import type { IntlShape } from 'react-intl-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { ExtractInjectionAPI, FloatingToolbarConfig } from '@atlaskit/editor-common/types';
 import { type EditorState } from '@atlaskit/editor-prosemirror/state';
-import { type AnnotationPlugin } from './types';
+import type { AnnotationPlugin } from '../annotationPluginType';
 interface BuildToolbarOptions {
     state: EditorState;
     intl: IntlShape;

package/dist/types-ts4.5/{utils.d.ts → pm-plugins/utils.d.ts}

@@ -2,11 +2,11 @@ import type { AnalyticsEventPayloadCallback } from '@atlaskit/editor-common/anal
 import { containsAnyAnnotations, hasAnnotationMark } from '@atlaskit/editor-common/utils';
 import type { Mark, Node, ResolvedPos, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Selection, SelectionBookmark } from '@atlaskit/editor-prosemirror/state';
-import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import type { InlineCommentPluginState } from './pm-plugins/types';
-import type { AnnotationInfo, DraftBookmark, InlineCommentInputMethod, TargetType } from './types';
-import { AnnotationSelectionType } from './types';
+import type { AnnotationInfo, DraftBookmark, InlineCommentInputMethod, TargetType } from '../types';
+import { AnnotationSelectionType } from '../types';
+import type { InlineCommentPluginState } from './types';
 export { hasAnnotationMark, containsAnyAnnotations };
 /**
  * Finds the marks in the nodes to the left and right.
@@ -41,7 +41,7 @@ export declare const isSupportedBlockNode: (node: Node, supportedBlockNodes?: st
  * Checks if any of the nodes in a given selection are completely whitespace
  * This is to conform to Confluence annotation specifications
  */
-export declare function hasInvalidWhitespaceNode(selection: TextSelection | AllSelection, schema: Schema): boolean;
+export declare function hasInvalidWhitespaceNode(selection: TextSelection | AllSelection | NodeSelection, schema: Schema): boolean;
 export declare function annotationExists(annotationId: string, state: EditorState): boolean;
 export declare function stripNonExistingAnnotations(slice: Slice, state: EditorState): false | undefined;
 /**

package/dist/{types/types.d.ts → types-ts4.5/types/index.d.ts}

@@ -2,16 +2,6 @@ import type React from 'react';
 import type { AnnotationTypes } from '@atlaskit/adf-schema';
 import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { AnnotationUpdateEmitter } from '@atlaskit/editor-common/annotation';
-import type { Command, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
-import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { EditorViewModeEffectsPlugin } from '@atlaskit/editor-plugin-editor-viewmode-effects';
-import type { EngagementPlatformPlugin } from '@atlaskit/editor-plugin-engagement-platform';
-import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
-import type { Slice } from '@atlaskit/editor-prosemirror/model';
-import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-import type { showInlineCommentForBlockNode } from './commands';
-import type { InlineCommentPluginState } from './pm-plugins/types';
-type StripNonExistingAnnotations = (slice: Slice, state: EditorState) => boolean | undefined;
 /**
  * type of target that annotation apply to.
  * This is used to apply correct decoration to a draft comment
@@ -21,29 +11,6 @@ export type TargetType = 'block' | 'inline';
  * The source of draft comment being created
  */
 export type InlineCommentInputMethod = INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHORTCUT | INPUT_METHOD.FLOATING_TB;
-type SetInlineCommentDraftState = (drafting: boolean, inputMethod: InlineCommentInputMethod, 
-/** @default 'inline' */
-targetType?: TargetType, targetNodeId?: string, isOpeningMediaCommentFromToolbar?: boolean) => Command;
-export type AnnotationPlugin = NextEditorPlugin<'annotation', {
-    pluginConfiguration: AnnotationProviders | undefined;
-    sharedState: InlineCommentPluginState | undefined;
-    dependencies: [
-        OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<EditorViewModeEffectsPlugin>,
-        OptionalPlugin<FeatureFlagsPlugin>,
-        OptionalPlugin<EngagementPlatformPlugin>
-    ];
-    actions: {
-        stripNonExistingAnnotations: StripNonExistingAnnotations;
-        setInlineCommentDraftState: SetInlineCommentDraftState;
-        /**
-         * This function attempts to display the inline comment popup for a given node.
-         * @returns A command function that returns true if the given node is supported and has resolved annotation mark(s);
-         * otherwise, it will return false.
-         */
-        showCommentForBlockNode: ReturnType<typeof showInlineCommentForBlockNode>;
-    };
-}>;
 export type AnnotationInfo = {
     id: string;
     type: AnnotationTypes.INLINE_COMMENT;

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

@@ -2,7 +2,8 @@
 import type { DispatchAnalyticsEvent, EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { AnnotationPlugin, AnnotationProviders } from '../types';
+import type { AnnotationPlugin } from '../annotationPluginType';
+import { type AnnotationProviders } from '../types';
 interface InlineCommentViewProps {
     providers: AnnotationProviders;
     editorView: EditorView;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "1.25.0",
+	"version": "1.25.2",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,16 +32,16 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^44.2.0",
-		"@atlaskit/editor-common": "^95.4.0",
+		"@atlaskit/editor-common": "^95.6.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^1.1.0",
 		"@atlaskit/editor-plugin-engagement-platform": "^2.1.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
 		"@atlaskit/editor-prosemirror": "6.0.0",
-		"@atlaskit/icon": "^22.25.0",
+		"@atlaskit/icon": "^22.26.0",
 		"@atlaskit/onboarding": "^12.1.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/tmp-editor-statsig": "^2.19.0",
+		"@atlaskit/tmp-editor-statsig": "^2.21.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
@@ -59,6 +59,9 @@
 	},
 	"techstack": {
 		"@atlassian/frontend": {
+			"code-structure": [
+				"editor-plugin"
+			],
 			"import-structure": [
 				"atlassian-conventions"
 			],
@@ -96,6 +99,9 @@
 		},
 		"editor_inline_comments_on_inline_nodes_spotlight": {
 			"type": "boolean"
+		},
+		"platform_inline_node_as_valid_annotation_selection": {
+			"type": "boolean"
 		}
 	}
 }