@atlaskit/editor-plugin-annotation 1.26.6 → 1.26.8

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.26.8
+
+### Patch Changes
+
+- [#98661](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/98661)
+  [`9a4b50703ea36`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9a4b50703ea36) -
+  Clean up inline comment spotlight experiment
+- Updated dependencies
+
+## 1.26.7
+
+### Patch Changes
+
+- [#181574](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/181574)
+  [`8645daab34a55`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8645daab34a55) -
+  Add missing dom attributes to annotation mark in AnnotaitonNodeView, hot-114046
+
 ## 1.26.6
 
 ### Patch Changes

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

@@ -54,7 +54,10 @@ var clearDirtyMark = exports.clearDirtyMark = function clearDirtyMark() {
 var removeInlineCommentFromNode = function removeInlineCommentFromNode(id) {
   var supportedBlockNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var state = arguments.length > 2 ? arguments[2] : undefined;
-  var dispatch = arguments.length > 3 ? arguments[3] : undefined;
+  var dispatch
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/max-params
+  = arguments.length > 3 ? arguments[3] : undefined;
   var tr = state.tr,
     selection = state.selection;
   if (selection instanceof _state.NodeSelection && (0, _utils.isSupportedBlockNode)(selection.node, supportedBlockNodes)) {
@@ -112,7 +115,10 @@ var removeInlineCommentNearSelection = exports.removeInlineCommentNearSelection
     return true;
   };
 };
-var getDraftCommandAction = function getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar) {
+var getDraftCommandAction = function getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   return function (editorState) {
     // validate selection only when entering draft mode
     if (drafting && (0, _utils.isSelectionValid)(editorState) !== _types2.AnnotationSelectionType.VALID) {
@@ -178,7 +184,10 @@ var setInlineCommentDraftState = exports.setInlineCommentDraftState = function s
     var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
     var targetType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'inline';
     var targetNodeId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
-    var isOpeningMediaCommentFromToolbar = arguments.length > 4 ? arguments[4] : undefined;
+    var isOpeningMediaCommentFromToolbar
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/max-params
+    = arguments.length > 4 ? arguments[4] : undefined;
     var commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar);
     return (0, _pluginFactory.createCommand)(commandAction, _transform.default.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod));
   };

package/dist/cjs/nodeviews/index.js

@@ -43,6 +43,8 @@ var AnnotationNodeView = exports.AnnotationNodeView = /*#__PURE__*/function (_Re
         // all inline comment states are now set in decorations at ../pm-plugins/inline-comment.ts
         _react.default.createElement("span", {
           "data-mark-type": "annotation",
+          "data-id": this.node.attrs.id,
+          "data-mark-annotation-type": this.node.attrs.annotationType,
           ref: forwardRef
         })
       );

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

@@ -10,6 +10,9 @@ var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _editorCommands = require("../editor-commands");
 function keymapPlugin(editorAnalyticsAPI) {
   var list = {};
-  (0, _keymaps.bindKeymapWithCommand)(_keymaps.addInlineComment.common, (0, _editorCommands.setInlineCommentDraftState)(editorAnalyticsAPI)(true, _analytics.INPUT_METHOD.SHORTCUT), list);
+  (0, _keymaps.bindKeymapWithCommand)(
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  _keymaps.addInlineComment.common, (0, _editorCommands.setInlineCommentDraftState)(editorAnalyticsAPI)(true, _analytics.INPUT_METHOD.SHORTCUT), list);
   return (0, _keymap.keymap)(list);
 }

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

@@ -69,7 +69,8 @@ var _default = exports.default = function _default(pluginState, action) {
     default:
       return pluginState;
   }
-};
+}; // Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 function getNewDraftState(pluginState, drafting, editorState, targetType, supportedBlockNodes, targetNodeId, isOpeningMediaCommentFromToolbar) {
   var draftDecorationSet = pluginState.draftDecorationSet;
   if (!draftDecorationSet || !drafting) {

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

@@ -18,47 +18,16 @@ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 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) {
-  var _api$engagementPlatfo;
-  var api = _ref.api,
-    intl = _ref.intl;
-  var isUserEnrolledInEpAudience = !!(api !== null && api !== void 0 && (_api$engagementPlatfo = api.engagementPlatform) !== null && _api$engagementPlatfo !== void 0 && (_api$engagementPlatfo = _api$engagementPlatfo.sharedState.currentState()) !== null && _api$engagementPlatfo !== void 0 && _api$engagementPlatfo.messageStates[INLINE_COMMENT_ON_INLINE_NODE_SPOTLIGHT_EP_MESSAGE_ID]);
-  // Ensure experiment is only ran on users who are in the EP audience
-  var isSpotlightOpen = isUserEnrolledInEpAudience && (0, _experiments.editorExperiment)('comment_on_inline_node_spotlight', true, {
-    exposure: true
-  });
-  var stopSpotlight = function stopSpotlight() {
-    var _api$engagementPlatfo2;
-    return api === null || api === void 0 || (_api$engagementPlatfo2 = api.engagementPlatform) === null || _api$engagementPlatfo2 === void 0 ? void 0 : _api$engagementPlatfo2.actions.stopMessage(INLINE_COMMENT_ON_INLINE_NODE_SPOTLIGHT_EP_MESSAGE_ID);
-  };
-  return {
-    isSpotlightOpen: isSpotlightOpen,
-    pulse: isSpotlightOpen,
-    onTargetClick: stopSpotlight,
-    spotlightCardOptions: {
-      children: intl.formatMessage(_messages.annotationMessages.createCommentOnInlineNodeSpotlightBody),
-      actions: [{
-        text: intl.formatMessage(_messages.annotationMessages.createCommentOnInlineNodeSpotlightAction),
-        onClick: function onClick() {
-          return stopSpotlight();
-        }
-      }],
-      placement: 'top-start',
-      width: 275
-    }
-  };
-};
 var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsAPI) {
-  return function (_ref2) {
+  return function (_ref) {
     var _api$editorViewMode, _api$connectivity;
-    var state = _ref2.state,
-      intl = _ref2.intl,
-      _ref2$isToolbarAbove = _ref2.isToolbarAbove,
-      isToolbarAbove = _ref2$isToolbarAbove === void 0 ? false : _ref2$isToolbarAbove,
-      _ref2$_supportedNodes = _ref2._supportedNodes,
-      _supportedNodes = _ref2$_supportedNodes === void 0 ? [] : _ref2$_supportedNodes,
-      api = _ref2.api;
+    var state = _ref.state,
+      intl = _ref.intl,
+      _ref$isToolbarAbove = _ref.isToolbarAbove,
+      isToolbarAbove = _ref$isToolbarAbove === void 0 ? false : _ref$isToolbarAbove,
+      _ref$_supportedNodes = _ref._supportedNodes,
+      _supportedNodes = _ref$_supportedNodes === void 0 ? [] : _ref$_supportedNodes,
+      api = _ref.api;
     var schema = state.schema;
     var selectionValid = (0, _utils2.isSelectionValid)(state);
     var isMediaSelected = (0, _mediaSingle.currentMediaNodeWithPos)(state);
@@ -109,23 +78,6 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
             }
           });
         }
-
-        /* When a user selects a valid range of content that includes non-text inline node (e.g. media, mention, emoji, etc.)
-         * Attempt to fire a spotlight to guide the user to create an inline comment on the inline node.
-         * The spotlight will only be displayed if the user is a valid EP audience and the feature flag is enabled.
-         */
-        if (isNonTextInlineNodeInludedInComment && selectionValid === _types.AnnotationSelectionType.VALID && (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes_spotlight')) {
-          var _api$engagementPlatfo3;
-          api === null || api === void 0 || (_api$engagementPlatfo3 = api.engagementPlatform) === null || _api$engagementPlatfo3 === void 0 || _api$engagementPlatfo3.actions.startMessage('inline-comments-on-inline-node-spotlight');
-        }
-      },
-      onUnmount: function onUnmount() {
-        var _api$engagementPlatfo4;
-        // if enagement spotlight is still active, stop it
-        if (api !== null && api !== void 0 && (_api$engagementPlatfo4 = api.engagementPlatform) !== null && _api$engagementPlatfo4 !== void 0 && (_api$engagementPlatfo4 = _api$engagementPlatfo4.sharedState.currentState()) !== null && _api$engagementPlatfo4 !== void 0 && _api$engagementPlatfo4.messageStates[INLINE_COMMENT_ON_INLINE_NODE_SPOTLIGHT_EP_MESSAGE_ID]) {
-          var _api$engagementPlatfo5;
-          api === null || api === void 0 || (_api$engagementPlatfo5 = api.engagementPlatform) === null || _api$engagementPlatfo5 === void 0 || _api$engagementPlatfo5.actions.stopMessage(INLINE_COMMENT_ON_INLINE_NODE_SPOTLIGHT_EP_MESSAGE_ID);
-        }
       },
       onClick: function onClick(state, dispatch) {
         if (editorAnalyticsAPI) {
@@ -142,12 +94,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
         }
         return (0, _editorCommands.setInlineCommentDraftState)(editorAnalyticsAPI)(true)(state, dispatch);
       },
-      supportsViewMode: true,
-      // TODO: MODES-3950 Clean up this floating toolbar view mode logic,
-      spotlightConfig: createSpotlightConfig({
-        api: api,
-        intl: intl
-      })
+      supportsViewMode: true // TODO: MODES-3950 Clean up this floating toolbar view mode logic,
     };
     var annotation = schema.marks.annotation;
     var validNodes = Object.keys(schema.nodes).reduce(function (acc, current) {

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

@@ -389,8 +389,12 @@ function hasInvalidWhitespaceNode(selection, schema) {
         // whitespace nodes.
         var nodeIsTrailingNewLine =
         // it is the final node
+        // Ignored via go/ees005
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         node.eq(content.lastChild) &&
         // and there are multiple nodes
+        // Ignored via go/ees005
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         !node.eq(content.firstChild) &&
         // and it is a paragraph node
         (0, _utils.isParagraph)(node, schema);

package/dist/cjs/ui/InlineCommentView.js

@@ -55,6 +55,8 @@ function InlineCommentView(_ref) {
   var position = findPosForDOM(selection);
   var dom;
   try {
+    // Ignored via go/ees005
+    // eslint-disable-next-line @atlaskit/editor/no-as-casting
     dom = (0, _utils2.findDomRefAtPos)(position, editorView.domAtPos.bind(editorView));
   } catch (error) {
     // eslint-disable-next-line no-console

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

@@ -31,7 +31,10 @@ export const closeComponent = () => createCommand({
 export const clearDirtyMark = () => createCommand({
   type: ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK
 });
-const removeInlineCommentFromNode = (id, supportedBlockNodes = [], state, dispatch) => {
+const removeInlineCommentFromNode = (id, supportedBlockNodes = [], state, dispatch
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) => {
   const {
     tr,
     selection
@@ -94,7 +97,10 @@ export const removeInlineCommentNearSelection = (id, supportedNodes = []) => (st
   }
   return true;
 };
-const getDraftCommandAction = (drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar) => {
+const getDraftCommandAction = (drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) => {
   return editorState => {
     // validate selection only when entering draft mode
     if (drafting && isSelectionValid(editorState) !== AnnotationSelectionType.VALID) {
@@ -147,7 +153,10 @@ export const showInlineCommentForBlockNode = (supportedBlockNodes = []) => (node
   }
   return false;
 };
-export const setInlineCommentDraftState = (editorAnalyticsAPI, supportedBlockNodes = []) => (drafting, inputMethod = INPUT_METHOD.TOOLBAR, targetType = 'inline', targetNodeId = undefined, isOpeningMediaCommentFromToolbar) => {
+export const setInlineCommentDraftState = (editorAnalyticsAPI, supportedBlockNodes = []) => (drafting, inputMethod = INPUT_METHOD.TOOLBAR, targetType = 'inline', targetNodeId = undefined, isOpeningMediaCommentFromToolbar
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) => {
   const commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar);
   return createCommand(commandAction, transform.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod));
 };

package/dist/es2019/nodeviews/index.js

@@ -18,6 +18,8 @@ export class AnnotationNodeView extends ReactNodeView {
       // all inline comment states are now set in decorations at ../pm-plugins/inline-comment.ts
       React.createElement("span", {
         "data-mark-type": "annotation",
+        "data-id": this.node.attrs.id,
+        "data-mark-annotation-type": this.node.attrs.annotationType,
         ref: forwardRef
       })
     );

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

@@ -4,6 +4,9 @@ import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { setInlineCommentDraftState } from '../editor-commands';
 export function keymapPlugin(editorAnalyticsAPI) {
   const list = {};
-  bindKeymapWithCommand(addInlineComment.common, setInlineCommentDraftState(editorAnalyticsAPI)(true, INPUT_METHOD.SHORTCUT), list);
+  bindKeymapWithCommand(
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  addInlineComment.common, setInlineCommentDraftState(editorAnalyticsAPI)(true, INPUT_METHOD.SHORTCUT), list);
   return keymap(list);
 }

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

@@ -75,6 +75,9 @@ export default ((pluginState, action) => {
       return pluginState;
   }
 });
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 function getNewDraftState(pluginState, drafting, editorState, targetType, supportedBlockNodes, targetNodeId, isOpeningMediaCommentFromToolbar) {
   let {
     draftDecorationSet

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

@@ -11,36 +11,6 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 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 = ({
-  api,
-  intl
-}) => {
-  var _api$engagementPlatfo, _api$engagementPlatfo2;
-  const isUserEnrolledInEpAudience = !!(api !== null && api !== void 0 && (_api$engagementPlatfo = api.engagementPlatform) !== null && _api$engagementPlatfo !== void 0 && (_api$engagementPlatfo2 = _api$engagementPlatfo.sharedState.currentState()) !== null && _api$engagementPlatfo2 !== void 0 && _api$engagementPlatfo2.messageStates[INLINE_COMMENT_ON_INLINE_NODE_SPOTLIGHT_EP_MESSAGE_ID]);
-  // Ensure experiment is only ran on users who are in the EP audience
-  const isSpotlightOpen = isUserEnrolledInEpAudience && editorExperiment('comment_on_inline_node_spotlight', true, {
-    exposure: true
-  });
-  const stopSpotlight = () => {
-    var _api$engagementPlatfo3;
-    return api === null || api === void 0 ? void 0 : (_api$engagementPlatfo3 = api.engagementPlatform) === null || _api$engagementPlatfo3 === void 0 ? void 0 : _api$engagementPlatfo3.actions.stopMessage(INLINE_COMMENT_ON_INLINE_NODE_SPOTLIGHT_EP_MESSAGE_ID);
-  };
-  return {
-    isSpotlightOpen,
-    pulse: isSpotlightOpen,
-    onTargetClick: stopSpotlight,
-    spotlightCardOptions: {
-      children: intl.formatMessage(annotationMessages.createCommentOnInlineNodeSpotlightBody),
-      actions: [{
-        text: intl.formatMessage(annotationMessages.createCommentOnInlineNodeSpotlightAction),
-        onClick: () => stopSpotlight()
-      }],
-      placement: 'top-start',
-      width: 275
-    }
-  };
-};
 export const buildToolbar = editorAnalyticsAPI => ({
   state,
   intl,
@@ -99,23 +69,6 @@ export const buildToolbar = editorAnalyticsAPI => ({
           }
         });
       }
-
-      /* When a user selects a valid range of content that includes non-text inline node (e.g. media, mention, emoji, etc.)
-       * Attempt to fire a spotlight to guide the user to create an inline comment on the inline node.
-       * The spotlight will only be displayed if the user is a valid EP audience and the feature flag is enabled.
-       */
-      if (isNonTextInlineNodeInludedInComment && selectionValid === AnnotationSelectionType.VALID && fg('editor_inline_comments_on_inline_nodes_spotlight')) {
-        var _api$engagementPlatfo4;
-        api === null || api === void 0 ? void 0 : (_api$engagementPlatfo4 = api.engagementPlatform) === null || _api$engagementPlatfo4 === void 0 ? void 0 : _api$engagementPlatfo4.actions.startMessage('inline-comments-on-inline-node-spotlight');
-      }
-    },
-    onUnmount: () => {
-      var _api$engagementPlatfo5, _api$engagementPlatfo6;
-      // if enagement spotlight is still active, stop it
-      if (api !== null && api !== void 0 && (_api$engagementPlatfo5 = api.engagementPlatform) !== null && _api$engagementPlatfo5 !== void 0 && (_api$engagementPlatfo6 = _api$engagementPlatfo5.sharedState.currentState()) !== null && _api$engagementPlatfo6 !== void 0 && _api$engagementPlatfo6.messageStates[INLINE_COMMENT_ON_INLINE_NODE_SPOTLIGHT_EP_MESSAGE_ID]) {
-        var _api$engagementPlatfo7;
-        api === null || api === void 0 ? void 0 : (_api$engagementPlatfo7 = api.engagementPlatform) === null || _api$engagementPlatfo7 === void 0 ? void 0 : _api$engagementPlatfo7.actions.stopMessage(INLINE_COMMENT_ON_INLINE_NODE_SPOTLIGHT_EP_MESSAGE_ID);
-      }
     },
     onClick: (state, dispatch) => {
       if (editorAnalyticsAPI) {
@@ -132,12 +85,7 @@ export const buildToolbar = editorAnalyticsAPI => ({
       }
       return setInlineCommentDraftState(editorAnalyticsAPI)(true)(state, dispatch);
     },
-    supportsViewMode: true,
-    // TODO: MODES-3950 Clean up this floating toolbar view mode logic,
-    spotlightConfig: createSpotlightConfig({
-      api,
-      intl
-    })
+    supportsViewMode: true // TODO: MODES-3950 Clean up this floating toolbar view mode logic,
   };
   const {
     annotation

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

@@ -366,8 +366,12 @@ export function hasInvalidWhitespaceNode(selection, schema) {
         // whitespace nodes.
         const nodeIsTrailingNewLine =
         // it is the final node
+        // Ignored via go/ees005
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         node.eq(content.lastChild) &&
         // and there are multiple nodes
+        // Ignored via go/ees005
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         !node.eq(content.firstChild) &&
         // and it is a paragraph node
         isParagraph(node, schema);

package/dist/es2019/ui/InlineCommentView.js

@@ -55,6 +55,8 @@ export function InlineCommentView({
   const position = findPosForDOM(selection);
   let dom;
   try {
+    // Ignored via go/ees005
+    // eslint-disable-next-line @atlaskit/editor/no-as-casting
     dom = findDomRefAtPos(position, editorView.domAtPos.bind(editorView));
   } catch (error) {
     // eslint-disable-next-line no-console

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

@@ -47,7 +47,10 @@ export var clearDirtyMark = function clearDirtyMark() {
 var removeInlineCommentFromNode = function removeInlineCommentFromNode(id) {
   var supportedBlockNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var state = arguments.length > 2 ? arguments[2] : undefined;
-  var dispatch = arguments.length > 3 ? arguments[3] : undefined;
+  var dispatch
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/max-params
+  = arguments.length > 3 ? arguments[3] : undefined;
   var tr = state.tr,
     selection = state.selection;
   if (selection instanceof NodeSelection && isSupportedBlockNode(selection.node, supportedBlockNodes)) {
@@ -105,7 +108,10 @@ export var removeInlineCommentNearSelection = function removeInlineCommentNearSe
     return true;
   };
 };
-var getDraftCommandAction = function getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar) {
+var getDraftCommandAction = function getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   return function (editorState) {
     // validate selection only when entering draft mode
     if (drafting && isSelectionValid(editorState) !== AnnotationSelectionType.VALID) {
@@ -171,7 +177,10 @@ export var setInlineCommentDraftState = function setInlineCommentDraftState(edit
     var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.TOOLBAR;
     var targetType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'inline';
     var targetNodeId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
-    var isOpeningMediaCommentFromToolbar = arguments.length > 4 ? arguments[4] : undefined;
+    var isOpeningMediaCommentFromToolbar
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/max-params
+    = arguments.length > 4 ? arguments[4] : undefined;
     var commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar);
     return createCommand(commandAction, transform.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod));
   };

package/dist/esm/nodeviews/index.js

@@ -36,6 +36,8 @@ export var AnnotationNodeView = /*#__PURE__*/function (_ReactNodeView) {
         // all inline comment states are now set in decorations at ../pm-plugins/inline-comment.ts
         React.createElement("span", {
           "data-mark-type": "annotation",
+          "data-id": this.node.attrs.id,
+          "data-mark-annotation-type": this.node.attrs.annotationType,
           ref: forwardRef
         })
       );

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

@@ -4,6 +4,9 @@ import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { setInlineCommentDraftState } from '../editor-commands';
 export function keymapPlugin(editorAnalyticsAPI) {
   var list = {};
-  bindKeymapWithCommand(addInlineComment.common, setInlineCommentDraftState(editorAnalyticsAPI)(true, INPUT_METHOD.SHORTCUT), list);
+  bindKeymapWithCommand(
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  addInlineComment.common, setInlineCommentDraftState(editorAnalyticsAPI)(true, INPUT_METHOD.SHORTCUT), list);
   return keymap(list);
 }

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

@@ -63,6 +63,9 @@ export default (function (pluginState, action) {
       return pluginState;
   }
 });
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 function getNewDraftState(pluginState, drafting, editorState, targetType, supportedBlockNodes, targetNodeId, isOpeningMediaCommentFromToolbar) {
   var draftDecorationSet = pluginState.draftDecorationSet;
   if (!draftDecorationSet || !drafting) {

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

@@ -11,47 +11,16 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 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) {
-  var _api$engagementPlatfo;
-  var api = _ref.api,
-    intl = _ref.intl;
-  var isUserEnrolledInEpAudience = !!(api !== null && api !== void 0 && (_api$engagementPlatfo = api.engagementPlatform) !== null && _api$engagementPlatfo !== void 0 && (_api$engagementPlatfo = _api$engagementPlatfo.sharedState.currentState()) !== null && _api$engagementPlatfo !== void 0 && _api$engagementPlatfo.messageStates[INLINE_COMMENT_ON_INLINE_NODE_SPOTLIGHT_EP_MESSAGE_ID]);
-  // Ensure experiment is only ran on users who are in the EP audience
-  var isSpotlightOpen = isUserEnrolledInEpAudience && editorExperiment('comment_on_inline_node_spotlight', true, {
-    exposure: true
-  });
-  var stopSpotlight = function stopSpotlight() {
-    var _api$engagementPlatfo2;
-    return api === null || api === void 0 || (_api$engagementPlatfo2 = api.engagementPlatform) === null || _api$engagementPlatfo2 === void 0 ? void 0 : _api$engagementPlatfo2.actions.stopMessage(INLINE_COMMENT_ON_INLINE_NODE_SPOTLIGHT_EP_MESSAGE_ID);
-  };
-  return {
-    isSpotlightOpen: isSpotlightOpen,
-    pulse: isSpotlightOpen,
-    onTargetClick: stopSpotlight,
-    spotlightCardOptions: {
-      children: intl.formatMessage(annotationMessages.createCommentOnInlineNodeSpotlightBody),
-      actions: [{
-        text: intl.formatMessage(annotationMessages.createCommentOnInlineNodeSpotlightAction),
-        onClick: function onClick() {
-          return stopSpotlight();
-        }
-      }],
-      placement: 'top-start',
-      width: 275
-    }
-  };
-};
 export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
-  return function (_ref2) {
+  return function (_ref) {
     var _api$editorViewMode, _api$connectivity;
-    var state = _ref2.state,
-      intl = _ref2.intl,
-      _ref2$isToolbarAbove = _ref2.isToolbarAbove,
-      isToolbarAbove = _ref2$isToolbarAbove === void 0 ? false : _ref2$isToolbarAbove,
-      _ref2$_supportedNodes = _ref2._supportedNodes,
-      _supportedNodes = _ref2$_supportedNodes === void 0 ? [] : _ref2$_supportedNodes,
-      api = _ref2.api;
+    var state = _ref.state,
+      intl = _ref.intl,
+      _ref$isToolbarAbove = _ref.isToolbarAbove,
+      isToolbarAbove = _ref$isToolbarAbove === void 0 ? false : _ref$isToolbarAbove,
+      _ref$_supportedNodes = _ref._supportedNodes,
+      _supportedNodes = _ref$_supportedNodes === void 0 ? [] : _ref$_supportedNodes,
+      api = _ref.api;
     var schema = state.schema;
     var selectionValid = isSelectionValid(state);
     var isMediaSelected = currentMediaNodeWithPos(state);
@@ -102,23 +71,6 @@ export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
             }
           });
         }
-
-        /* When a user selects a valid range of content that includes non-text inline node (e.g. media, mention, emoji, etc.)
-         * Attempt to fire a spotlight to guide the user to create an inline comment on the inline node.
-         * The spotlight will only be displayed if the user is a valid EP audience and the feature flag is enabled.
-         */
-        if (isNonTextInlineNodeInludedInComment && selectionValid === AnnotationSelectionType.VALID && fg('editor_inline_comments_on_inline_nodes_spotlight')) {
-          var _api$engagementPlatfo3;
-          api === null || api === void 0 || (_api$engagementPlatfo3 = api.engagementPlatform) === null || _api$engagementPlatfo3 === void 0 || _api$engagementPlatfo3.actions.startMessage('inline-comments-on-inline-node-spotlight');
-        }
-      },
-      onUnmount: function onUnmount() {
-        var _api$engagementPlatfo4;
-        // if enagement spotlight is still active, stop it
-        if (api !== null && api !== void 0 && (_api$engagementPlatfo4 = api.engagementPlatform) !== null && _api$engagementPlatfo4 !== void 0 && (_api$engagementPlatfo4 = _api$engagementPlatfo4.sharedState.currentState()) !== null && _api$engagementPlatfo4 !== void 0 && _api$engagementPlatfo4.messageStates[INLINE_COMMENT_ON_INLINE_NODE_SPOTLIGHT_EP_MESSAGE_ID]) {
-          var _api$engagementPlatfo5;
-          api === null || api === void 0 || (_api$engagementPlatfo5 = api.engagementPlatform) === null || _api$engagementPlatfo5 === void 0 || _api$engagementPlatfo5.actions.stopMessage(INLINE_COMMENT_ON_INLINE_NODE_SPOTLIGHT_EP_MESSAGE_ID);
-        }
       },
       onClick: function onClick(state, dispatch) {
         if (editorAnalyticsAPI) {
@@ -135,12 +87,7 @@ export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
         }
         return setInlineCommentDraftState(editorAnalyticsAPI)(true)(state, dispatch);
       },
-      supportsViewMode: true,
-      // TODO: MODES-3950 Clean up this floating toolbar view mode logic,
-      spotlightConfig: createSpotlightConfig({
-        api: api,
-        intl: intl
-      })
+      supportsViewMode: true // TODO: MODES-3950 Clean up this floating toolbar view mode logic,
     };
     var annotation = schema.marks.annotation;
     var validNodes = Object.keys(schema.nodes).reduce(function (acc, current) {

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

@@ -373,8 +373,12 @@ export function hasInvalidWhitespaceNode(selection, schema) {
         // whitespace nodes.
         var nodeIsTrailingNewLine =
         // it is the final node
+        // Ignored via go/ees005
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         node.eq(content.lastChild) &&
         // and there are multiple nodes
+        // Ignored via go/ees005
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         !node.eq(content.firstChild) &&
         // and it is a paragraph node
         isParagraph(node, schema);

package/dist/esm/ui/InlineCommentView.js

@@ -48,6 +48,8 @@ export function InlineCommentView(_ref) {
   var position = findPosForDOM(selection);
   var dom;
   try {
+    // Ignored via go/ees005
+    // eslint-disable-next-line @atlaskit/editor/no-as-casting
     dom = findDomRefAtPos(position, editorView.domAtPos.bind(editorView));
   } catch (error) {
     // eslint-disable-next-line no-console

package/dist/types/annotationPluginType.d.ts

@@ -3,7 +3,6 @@ import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { ConnectivityPlugin } from '@atlaskit/editor-plugin-connectivity';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 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';
@@ -22,7 +21,6 @@ export type AnnotationPlugin = NextEditorPlugin<'annotation', {
         OptionalPlugin<EditorViewModeEffectsPlugin>,
         OptionalPlugin<EditorViewModePlugin>,
         OptionalPlugin<FeatureFlagsPlugin>,
-        OptionalPlugin<EngagementPlatformPlugin>,
         OptionalPlugin<ConnectivityPlugin>
     ];
     actions: {

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

@@ -9,7 +9,7 @@ declare const _default: {
         dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
             pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
             sharedState: {
-                createAnalyticsEvent: import("@atlaskit/analytics-next").CreateUIAnalyticsEvent | null;
+                createAnalyticsEvent: import("packages/analytics/analytics-next/dist/types").CreateUIAnalyticsEvent | null;
                 attachAnalyticsEvent: import("@atlaskit/editor-plugin-analytics").CreateAttachPayloadIntoTransaction | null;
                 performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
             };
@@ -20,14 +20,14 @@ declare const _default: {
             actions: EditorAnalyticsAPI;
         }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorViewModeEffects", {
             dependencies: [import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"collabEdit", {
-                pluginConfiguration: import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions;
+                pluginConfiguration: import("packages/editor/editor-plugin-collab-edit/dist/types").PrivateCollabEditOptions;
                 dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
                     pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
                     sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
                 }, import("@atlaskit/editor-common/types").FeatureFlags>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
                     pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
                     sharedState: {
-                        createAnalyticsEvent: import("@atlaskit/analytics-next").CreateUIAnalyticsEvent | null;
+                        createAnalyticsEvent: import("packages/analytics/analytics-next/dist/types").CreateUIAnalyticsEvent | null;
                         attachAnalyticsEvent: import("@atlaskit/editor-plugin-analytics").CreateAttachPayloadIntoTransaction | null;
                         performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
                     };
@@ -37,18 +37,18 @@ declare const _default: {
                     }, import("@atlaskit/editor-common/types").FeatureFlags>>];
                     actions: EditorAnalyticsAPI;
                 }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorViewMode", {
-                    sharedState: import("@atlaskit/editor-plugin-editor-viewmode").EditorViewModePluginState | null;
+                    sharedState: import("packages/editor/editor-plugin-editor-viewmode/dist/types").EditorViewModePluginState | null;
                     dependencies: [];
                     pluginConfiguration?: {
-                        mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
+                        mode?: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode | undefined;
                     } | undefined;
                     commands: {
-                        updateViewMode: (mode: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode) => import("@atlaskit/editor-common/types").EditorCommand;
+                        updateViewMode: (mode: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode) => import("@atlaskit/editor-common/types").EditorCommand;
                     };
                 }, {
-                    mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
+                    mode?: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode | undefined;
                 } | undefined>>];
-                sharedState: import("@atlaskit/editor-plugin-collab-edit").CollabEditPluginSharedState;
+                sharedState: import("packages/editor/editor-plugin-collab-edit/dist/types").CollabEditPluginSharedState;
                 actions: {
                     getAvatarColor: (str: string) => {
                         index: number;
@@ -66,61 +66,41 @@ declare const _default: {
                     isRemoteReplaceDocumentTransaction: (tr: Transaction) => boolean;
                     getCurrentCollabState: () => {
                         version: number | undefined;
-                        sendableSteps: import("@atlaskit/editor-plugin-collab-edit").CollabSendableSteps | null | undefined;
-                        content: import("@atlaskit/editor-json-transformer").JSONNode | undefined;
+                        sendableSteps: import("packages/editor/editor-plugin-collab-edit/dist/types").CollabSendableSteps | null | undefined;
+                        content: import("packages/editor/editor-json-transformer/dist/types").JSONNode | undefined;
                     };
                     validatePMJSONDocument: (doc: any) => boolean;
                 };
-            }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorViewMode", {
-                sharedState: import("@atlaskit/editor-plugin-editor-viewmode").EditorViewModePluginState | null;
+            }, import("packages/editor/editor-plugin-collab-edit/dist/types").PrivateCollabEditOptions>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorViewMode", {
+                sharedState: import("packages/editor/editor-plugin-editor-viewmode/dist/types").EditorViewModePluginState | null;
                 dependencies: [];
                 pluginConfiguration?: {
-                    mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
+                    mode?: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode | undefined;
                 } | undefined;
                 commands: {
-                    updateViewMode: (mode: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode) => import("@atlaskit/editor-common/types").EditorCommand;
+                    updateViewMode: (mode: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode) => import("@atlaskit/editor-common/types").EditorCommand;
                 };
             }, {
-                mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
+                mode?: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode | undefined;
             } | undefined>];
             actions: {
                 applyViewModeStepAt: (tr: Transaction) => boolean;
             };
         }, undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorViewMode", {
-            sharedState: import("@atlaskit/editor-plugin-editor-viewmode").EditorViewModePluginState | null;
+            sharedState: import("packages/editor/editor-plugin-editor-viewmode/dist/types").EditorViewModePluginState | null;
             dependencies: [];
             pluginConfiguration?: {
-                mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
+                mode?: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode | undefined;
             } | undefined;
             commands: {
-                updateViewMode: (mode: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode) => import("@atlaskit/editor-common/types").EditorCommand;
+                updateViewMode: (mode: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode) => import("@atlaskit/editor-common/types").EditorCommand;
             };
         }, {
-            mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
+            mode?: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode | undefined;
         } | undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
             pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
             sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
-        }, import("@atlaskit/editor-common/types").FeatureFlags>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"engagementPlatform", {
-            actions: {
-                startMessage: (messageId: string, variationId?: string | undefined) => Promise<boolean>;
-                stopMessage: (messageId: string) => Promise<boolean>;
-            };
-            pluginConfiguration: import("@atlaskit/editor-plugin-engagement-platform").EngagementPlatformPluginConfig;
-            dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
-                pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
-                sharedState: {
-                    createAnalyticsEvent: import("@atlaskit/analytics-next").CreateUIAnalyticsEvent | null;
-                    attachAnalyticsEvent: import("@atlaskit/editor-plugin-analytics").CreateAttachPayloadIntoTransaction | null;
-                    performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
-                };
-                dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
-                    pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
-                    sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
-                }, import("@atlaskit/editor-common/types").FeatureFlags>>];
-                actions: EditorAnalyticsAPI;
-            }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>];
-            sharedState: import("@atlaskit/editor-plugin-engagement-platform").EngagementPlatformPluginState;
-        }, import("@atlaskit/editor-plugin-engagement-platform").EngagementPlatformPluginConfig>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"connectivity", {
+        }, import("@atlaskit/editor-common/types").FeatureFlags>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"connectivity", {
             sharedState: {
                 mode: "offline" | "online";
             };

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

@@ -6,7 +6,7 @@ export declare class AnnotationNodeView extends ReactNodeView {
     getContentDOM(): {
         dom: HTMLSpanElement;
     };
-    render(_props: {}, forwardRef: ForwardRef): JSX.Element;
+    render(_props: Object, forwardRef: ForwardRef): JSX.Element;
 }
 export declare const getAnnotationViewClassname: (isUnresolved: boolean, hasFocus: boolean, isHovered: boolean) => string | undefined;
 export declare const getBlockAnnotationViewClassname: (isUnresolved: boolean, hasFocus: boolean) => string | undefined;

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

@@ -3,7 +3,6 @@ import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { ConnectivityPlugin } from '@atlaskit/editor-plugin-connectivity';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 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';
@@ -22,7 +21,6 @@ export type AnnotationPlugin = NextEditorPlugin<'annotation', {
         OptionalPlugin<EditorViewModeEffectsPlugin>,
         OptionalPlugin<EditorViewModePlugin>,
         OptionalPlugin<FeatureFlagsPlugin>,
-        OptionalPlugin<EngagementPlatformPlugin>,
         OptionalPlugin<ConnectivityPlugin>
     ];
     actions: {

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

@@ -10,7 +10,7 @@ declare const _default: {
             import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
                 pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
                 sharedState: {
-                    createAnalyticsEvent: import("@atlaskit/analytics-next").CreateUIAnalyticsEvent | null;
+                    createAnalyticsEvent: import("packages/analytics/analytics-next/dist/types").CreateUIAnalyticsEvent | null;
                     attachAnalyticsEvent: import("@atlaskit/editor-plugin-analytics").CreateAttachPayloadIntoTransaction | null;
                     performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
                 };
@@ -25,7 +25,7 @@ declare const _default: {
             import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorViewModeEffects", {
                 dependencies: [
                     import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"collabEdit", {
-                        pluginConfiguration: import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions;
+                        pluginConfiguration: import("packages/editor/editor-plugin-collab-edit/dist/types").PrivateCollabEditOptions;
                         dependencies: [
                             import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
                                 pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
@@ -34,7 +34,7 @@ declare const _default: {
                             import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
                                 pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
                                 sharedState: {
-                                    createAnalyticsEvent: import("@atlaskit/analytics-next").CreateUIAnalyticsEvent | null;
+                                    createAnalyticsEvent: import("packages/analytics/analytics-next/dist/types").CreateUIAnalyticsEvent | null;
                                     attachAnalyticsEvent: import("@atlaskit/editor-plugin-analytics").CreateAttachPayloadIntoTransaction | null;
                                     performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
                                 };
@@ -47,20 +47,20 @@ declare const _default: {
                                 actions: EditorAnalyticsAPI;
                             }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>,
                             import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorViewMode", {
-                                sharedState: import("@atlaskit/editor-plugin-editor-viewmode").EditorViewModePluginState | null;
+                                sharedState: import("packages/editor/editor-plugin-editor-viewmode/dist/types").EditorViewModePluginState | null;
                                 dependencies: [
                                 ];
                                 pluginConfiguration?: {
-                                    mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
+                                    mode?: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode | undefined;
                                 } | undefined;
                                 commands: {
-                                    updateViewMode: (mode: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode) => import("@atlaskit/editor-common/types").EditorCommand;
+                                    updateViewMode: (mode: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode) => import("@atlaskit/editor-common/types").EditorCommand;
                                 };
                             }, {
-                                mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
+                                mode?: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode | undefined;
                             } | undefined>>
                         ];
-                        sharedState: import("@atlaskit/editor-plugin-collab-edit").CollabEditPluginSharedState;
+                        sharedState: import("packages/editor/editor-plugin-collab-edit/dist/types").CollabEditPluginSharedState;
                         actions: {
                             getAvatarColor: (str: string) => {
                                 index: number;
@@ -78,24 +78,24 @@ declare const _default: {
                             isRemoteReplaceDocumentTransaction: (tr: Transaction) => boolean;
                             getCurrentCollabState: () => {
                                 version: number | undefined;
-                                sendableSteps: import("@atlaskit/editor-plugin-collab-edit").CollabSendableSteps | null | undefined;
-                                content: import("@atlaskit/editor-json-transformer").JSONNode | undefined;
+                                sendableSteps: import("packages/editor/editor-plugin-collab-edit/dist/types").CollabSendableSteps | null | undefined;
+                                content: import("packages/editor/editor-json-transformer/dist/types").JSONNode | undefined;
                             };
                             validatePMJSONDocument: (doc: any) => boolean;
                         };
-                    }, import("@atlaskit/editor-plugin-collab-edit").PrivateCollabEditOptions>,
+                    }, import("packages/editor/editor-plugin-collab-edit/dist/types").PrivateCollabEditOptions>,
                     import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorViewMode", {
-                        sharedState: import("@atlaskit/editor-plugin-editor-viewmode").EditorViewModePluginState | null;
+                        sharedState: import("packages/editor/editor-plugin-editor-viewmode/dist/types").EditorViewModePluginState | null;
                         dependencies: [
                         ];
                         pluginConfiguration?: {
-                            mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
+                            mode?: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode | undefined;
                         } | undefined;
                         commands: {
-                            updateViewMode: (mode: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode) => import("@atlaskit/editor-common/types").EditorCommand;
+                            updateViewMode: (mode: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode) => import("@atlaskit/editor-common/types").EditorCommand;
                         };
                     }, {
-                        mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
+                        mode?: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode | undefined;
                     } | undefined>
                 ];
                 actions: {
@@ -103,47 +103,22 @@ declare const _default: {
                 };
             }, undefined>>,
             import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorViewMode", {
-                sharedState: import("@atlaskit/editor-plugin-editor-viewmode").EditorViewModePluginState | null;
+                sharedState: import("packages/editor/editor-plugin-editor-viewmode/dist/types").EditorViewModePluginState | null;
                 dependencies: [
                 ];
                 pluginConfiguration?: {
-                    mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
+                    mode?: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode | undefined;
                 } | undefined;
                 commands: {
-                    updateViewMode: (mode: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode) => import("@atlaskit/editor-common/types").EditorCommand;
+                    updateViewMode: (mode: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode) => import("@atlaskit/editor-common/types").EditorCommand;
                 };
             }, {
-                mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
+                mode?: import("packages/editor/editor-plugin-editor-viewmode/dist/types").ViewMode | undefined;
             } | undefined>>,
             import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
                 pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
                 sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
             }, import("@atlaskit/editor-common/types").FeatureFlags>>,
-            import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"engagementPlatform", {
-                actions: {
-                    startMessage: (messageId: string, variationId?: string | undefined) => Promise<boolean>;
-                    stopMessage: (messageId: string) => Promise<boolean>;
-                };
-                pluginConfiguration: import("@atlaskit/editor-plugin-engagement-platform").EngagementPlatformPluginConfig;
-                dependencies: [
-                    import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
-                        pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
-                        sharedState: {
-                            createAnalyticsEvent: import("@atlaskit/analytics-next").CreateUIAnalyticsEvent | null;
-                            attachAnalyticsEvent: import("@atlaskit/editor-plugin-analytics").CreateAttachPayloadIntoTransaction | null;
-                            performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
-                        };
-                        dependencies: [
-                            import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
-                                pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
-                                sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
-                            }, import("@atlaskit/editor-common/types").FeatureFlags>>
-                        ];
-                        actions: EditorAnalyticsAPI;
-                    }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>>
-                ];
-                sharedState: import("@atlaskit/editor-plugin-engagement-platform").EngagementPlatformPluginState;
-            }, import("@atlaskit/editor-plugin-engagement-platform").EngagementPlatformPluginConfig>>,
             import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"connectivity", {
                 sharedState: {
                     mode: "offline" | "online";

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

@@ -6,7 +6,7 @@ export declare class AnnotationNodeView extends ReactNodeView {
     getContentDOM(): {
         dom: HTMLSpanElement;
     };
-    render(_props: {}, forwardRef: ForwardRef): JSX.Element;
+    render(_props: Object, forwardRef: ForwardRef): JSX.Element;
 }
 export declare const getAnnotationViewClassname: (isUnresolved: boolean, hasFocus: boolean, isHovered: boolean) => string | undefined;
 export declare const getBlockAnnotationViewClassname: (isUnresolved: boolean, hasFocus: boolean) => string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "1.26.6",
+	"version": "1.26.8",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,17 +32,16 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^97.0.0",
+		"@atlaskit/editor-common": "^97.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-connectivity": "^1.1.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.2.1",
 		"@atlaskit/icon": "^23.1.0",
 		"@atlaskit/onboarding": "^12.2.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/tmp-editor-statsig": "^2.29.0",
+		"@atlaskit/tmp-editor-statsig": "^2.30.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
@@ -98,9 +97,6 @@
 		"editor_inline_comments_on_inline_nodes": {
 			"type": "boolean"
 		},
-		"editor_inline_comments_on_inline_nodes_spotlight": {
-			"type": "boolean"
-		},
 		"platform_inline_node_as_valid_annotation_selection": {
 			"type": "boolean"
 		}