@atlaskit/editor-core 189.0.14 → 189.1.1

package/dist/es2019/utils/index.js

@@ -1,5 +1,4 @@
 import { toggleMark } from '@atlaskit/editor-prosemirror/commands';
-import { FakeTextCursorSelection } from '../plugins/fake-text-cursor/cursor';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 export { isEmptyNode, isSelectionInsideLastNodeInDocument, checkNodeDown, insideTableCell, isInListItem, toJSON, nodeToJSON } from '@atlaskit/editor-common/utils';
 export { insideTable } from '@atlaskit/editor-common/core-utils';
@@ -24,9 +23,6 @@ export function getCursor(selection) {
  * allowed.
  */
 export function isMarkTypeAllowedInCurrentSelection(markType, state) {
-  if (state.selection instanceof FakeTextCursorSelection) {
-    return true;
-  }
   if (!isMarkTypeAllowedInNode(markType, state)) {
     return false;
   }

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "189.0.14";
+export const version = "189.1.1";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/extensibility.js

@@ -1,4 +1,4 @@
-export { getChangedNodes } from './utils/document';
+export { getChangedNodes } from '@atlaskit/editor-common/utils';
 export { validateNodes } from './utils/nodes';
 export { toJSON } from './utils';
 export { default as Extension } from './plugins/extension/ui/Extension';

package/dist/esm/plugins/annotation/commands/index.js

@@ -6,18 +6,20 @@ import { isSelectionValid, getPluginState } from '../utils';
 import { ACTIONS } from '../pm-plugins/types';
 import transform from './transform';
 import { AnnotationSelectionType } from '../types';
-export var updateInlineCommentResolvedState = function updateInlineCommentResolvedState(partialNewState, resolveMethod) {
-  var command = {
-    type: ACTIONS.UPDATE_INLINE_COMMENT_STATE,
-    data: partialNewState
+export var updateInlineCommentResolvedState = function updateInlineCommentResolvedState(editorAnalyticsAPI) {
+  return function (partialNewState, resolveMethod) {
+    var command = {
+      type: ACTIONS.UPDATE_INLINE_COMMENT_STATE,
+      data: partialNewState
+    };
+    var allResolved = Object.values(partialNewState).every(function (state) {
+      return state;
+    });
+    if (resolveMethod && allResolved) {
+      return createCommand(command, transform.addResolveAnalytics(editorAnalyticsAPI)(resolveMethod));
+    }
+    return createCommand(command);
   };
-  var allResolved = Object.values(partialNewState).every(function (state) {
-    return state;
-  });
-  if (resolveMethod && allResolved) {
-    return createCommand(command, transform.addResolveAnalytics(resolveMethod));
-  }
-  return createCommand(command);
 };
 export var closeComponent = function closeComponent() {
   return createCommand({
@@ -67,29 +69,33 @@ var getDraftCommandAction = function getDraftCommandAction(drafting) {
     };
   };
 };
-export var setInlineCommentDraftState = function setInlineCommentDraftState(drafting) {
-  var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.TOOLBAR;
-  var commandAction = getDraftCommandAction(drafting);
-  return createCommand(commandAction, transform.addOpenCloseAnalytics(drafting, inputMethod));
+export var setInlineCommentDraftState = function setInlineCommentDraftState(editorAnalyticsAPI) {
+  return function (drafting) {
+    var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.TOOLBAR;
+    var commandAction = getDraftCommandAction(drafting);
+    return createCommand(commandAction, transform.addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, inputMethod));
+  };
 };
-export var addInlineComment = function addInlineComment(id) {
-  var commandAction = function commandAction(editorState) {
-    return {
-      type: ACTIONS.ADD_INLINE_COMMENT,
-      data: {
-        drafting: false,
-        inlineComments: _defineProperty({}, id, false),
-        // Auto make the newly inserted comment selected.
-        // We move the selection to the head of the comment selection.
-        selectedAnnotations: [{
-          id: id,
-          type: AnnotationTypes.INLINE_COMMENT
-        }],
-        editorState: editorState
-      }
+export var addInlineComment = function addInlineComment(editorAnalyticsAPI) {
+  return function (id) {
+    var commandAction = function commandAction(editorState) {
+      return {
+        type: ACTIONS.ADD_INLINE_COMMENT,
+        data: {
+          drafting: false,
+          inlineComments: _defineProperty({}, id, false),
+          // Auto make the newly inserted comment selected.
+          // We move the selection to the head of the comment selection.
+          selectedAnnotations: [{
+            id: id,
+            type: AnnotationTypes.INLINE_COMMENT
+          }],
+          editorState: editorState
+        }
+      };
     };
+    return createCommand(commandAction, transform.addInlineComment(editorAnalyticsAPI)(id));
   };
-  return createCommand(commandAction, transform.addInlineComment(id));
 };
 export var updateMouseState = function updateMouseState(mouseData) {
   return createCommand({
@@ -110,19 +116,21 @@ export var setSelectedAnnotation = function setSelectedAnnotation(id) {
     }
   });
 };
-export var createAnnotation = function createAnnotation(id) {
-  var annotationType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : AnnotationTypes.INLINE_COMMENT;
-  return function (state, dispatch) {
-    // don't try to add if there are is no temp highlight bookmarked
-    var _ref = getPluginState(state) || {},
-      bookmark = _ref.bookmark;
-    if (!bookmark || !dispatch) {
+export var createAnnotation = function createAnnotation(editorAnalyticsAPI) {
+  return function (id) {
+    var annotationType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : AnnotationTypes.INLINE_COMMENT;
+    return function (state, dispatch) {
+      // don't try to add if there are is no temp highlight bookmarked
+      var _ref = getPluginState(state) || {},
+        bookmark = _ref.bookmark;
+      if (!bookmark || !dispatch) {
+        return false;
+      }
+      if (annotationType === AnnotationTypes.INLINE_COMMENT) {
+        return addInlineComment(editorAnalyticsAPI)(id)(state, dispatch);
+      }
       return false;
-    }
-    if (annotationType === AnnotationTypes.INLINE_COMMENT) {
-      return addInlineComment(id)(state, dispatch);
-    }
-    return false;
+    };
   };
 };
 export var setInlineCommentsVisibility = function setInlineCommentsVisibility(isVisible) {

package/dist/esm/plugins/annotation/commands/transform.js

@@ -1,7 +1,6 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, ACTION, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { addAnalytics } from '../../analytics/utils';
 import { getSelectionPositions, getPluginState, getDraftCommandAnalyticsPayload } from '../utils';
 import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
 var addAnnotationMark = function addAnnotationMark(id) {
@@ -22,43 +21,54 @@ var addAnnotationMark = function addAnnotationMark(id) {
     return tr;
   };
 };
-var addInlineComment = function addInlineComment(id) {
-  return function (transaction, state) {
-    var tr = addAnnotationMark(id)(transaction, state);
-    // add insert analytics step to transaction
-    tr = addInsertAnalytics(tr, state);
-    // add close analytics step to transaction
-    tr = addOpenCloseAnalytics(false, INPUT_METHOD.TOOLBAR)(tr, state);
-    return tr;
+var addInlineComment = function addInlineComment(editorAnalyticsAPI) {
+  return function (id) {
+    return function (transaction, state) {
+      var tr = addAnnotationMark(id)(transaction, state);
+      // add insert analytics step to transaction
+      tr = addInsertAnalytics(editorAnalyticsAPI)(tr, state);
+      // add close analytics step to transaction
+      tr = addOpenCloseAnalytics(editorAnalyticsAPI)(false, INPUT_METHOD.TOOLBAR)(tr, state);
+      return tr;
+    };
   };
 };
-var addOpenCloseAnalytics = function addOpenCloseAnalytics(drafting) {
-  var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.TOOLBAR;
-  return function (transaction, state) {
-    var draftingPayload = getDraftCommandAnalyticsPayload(drafting, method)(state);
-    return addAnalytics(state, transaction, draftingPayload);
+var addOpenCloseAnalytics = function addOpenCloseAnalytics(editorAnalyticsAPI) {
+  return function (drafting) {
+    var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.TOOLBAR;
+    return function (transaction, state) {
+      var draftingPayload = getDraftCommandAnalyticsPayload(drafting, method)(state);
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(draftingPayload)(transaction);
+      return transaction;
+    };
   };
 };
-var addInsertAnalytics = function addInsertAnalytics(transaction, state) {
-  return addAnalytics(state, transaction, {
-    action: ACTION.INSERTED,
-    actionSubject: ACTION_SUBJECT.ANNOTATION,
-    eventType: EVENT_TYPE.TRACK,
-    actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT
-  });
-};
-var addResolveAnalytics = function addResolveAnalytics(method) {
+var addInsertAnalytics = function addInsertAnalytics(editorAnalyticsAPI) {
   return function (transaction, state) {
-    var resolvedPayload = {
-      action: ACTION.RESOLVED,
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
+      action: ACTION.INSERTED,
       actionSubject: ACTION_SUBJECT.ANNOTATION,
-      actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
       eventType: EVENT_TYPE.TRACK,
-      attributes: {
-        method: method
-      }
+      actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT
+    })(transaction);
+    return transaction;
+  };
+};
+var addResolveAnalytics = function addResolveAnalytics(editorAnalyticsAPI) {
+  return function (method) {
+    return function (transaction, state) {
+      var resolvedPayload = {
+        action: ACTION.RESOLVED,
+        actionSubject: ACTION_SUBJECT.ANNOTATION,
+        actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
+        eventType: EVENT_TYPE.TRACK,
+        attributes: {
+          method: method
+        }
+      };
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(resolvedPayload)(transaction);
+      return transaction;
     };
-    return addAnalytics(state, transaction, resolvedPayload);
   };
 };
 export default {

package/dist/esm/plugins/annotation/index.js

@@ -33,11 +33,13 @@ var annotationPlugin = function annotationPlugin(_ref) {
             portalProviderAPI = _ref2.portalProviderAPI,
             eventDispatcher = _ref2.eventDispatcher;
           if (annotationProviders) {
+            var _api$analytics;
             return inlineCommentPlugin({
               dispatch: dispatch,
               portalProviderAPI: portalProviderAPI,
               eventDispatcher: eventDispatcher,
-              provider: annotationProviders.inlineComment
+              provider: annotationProviders.inlineComment,
+              editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
             });
           }
           return;
@@ -46,7 +48,8 @@ var annotationPlugin = function annotationPlugin(_ref) {
         name: 'annotationKeymap',
         plugin: function plugin() {
           if (annotationProviders) {
-            return keymapPlugin();
+            var _api$analytics2;
+            return keymapPlugin(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
           }
           return;
         }
@@ -59,8 +62,9 @@ var annotationPlugin = function annotationPlugin(_ref) {
         }
         var pluginState = getPluginState(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
+          var _api$analytics3;
           var isToolbarAbove = annotationProviders.inlineComment.isToolbarAbove;
-          return buildToolbar(state, intl, isToolbarAbove);
+          return buildToolbar(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)(state, intl, isToolbarAbove);
         }
       },
       selectionToolbar: function selectionToolbar(state, intl) {
@@ -69,8 +73,9 @@ var annotationPlugin = function annotationPlugin(_ref) {
         }
         var pluginState = getPluginState(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
+          var _api$analytics4;
           var isToolbarAbove = annotationProviders.inlineComment.isToolbarAbove;
-          return buildToolbar(state, intl, isToolbarAbove);
+          return buildToolbar(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(state, intl, isToolbarAbove);
         }
       }
     },
@@ -90,6 +95,7 @@ var annotationPlugin = function annotationPlugin(_ref) {
   };
 };
 function AnnotationContentComponent(_ref4) {
+  var _api$analytics5;
   var api = _ref4.api,
     editorView = _ref4.editorView,
     annotationProviders = _ref4.annotationProviders,
@@ -104,7 +110,8 @@ function AnnotationContentComponent(_ref4) {
   }, /*#__PURE__*/React.createElement(InlineCommentView, {
     providers: annotationProviders,
     editorView: editorView,
-    dispatchAnalyticsEvent: dispatchAnalyticsEvent
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions
   }));
 }
 export default annotationPlugin;

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

@@ -40,7 +40,7 @@ var fetchProviderStates = /*#__PURE__*/function () {
 // fetchState is unable to return a command as it's runs async and may dispatch at a later time
 // Requires `editorView` instead of the decomposition as the async means state may end up stale
 var fetchState = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(provider, annotationIds, editorView) {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(provider, annotationIds, editorView, editorAnalyticsAPI) {
     var inlineCommentStates;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -56,7 +56,7 @@ var fetchState = /*#__PURE__*/function () {
         case 4:
           inlineCommentStates = _context2.sent;
           if (editorView.dispatch) {
-            updateInlineCommentResolvedState(inlineCommentStates)(editorView.state, editorView.dispatch);
+            updateInlineCommentResolvedState(editorAnalyticsAPI)(inlineCommentStates)(editorView.state, editorView.dispatch);
           }
         case 6:
         case "end":
@@ -64,7 +64,7 @@ var fetchState = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function fetchState(_x3, _x4, _x5) {
+  return function fetchState(_x3, _x4, _x5, _x6) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -90,14 +90,18 @@ var hideToolbar = function hideToolbar(state, dispatch) {
 };
 
 // Subscribe to updates from consumer
-var onResolve = function onResolve(state, dispatch) {
-  return function (annotationId) {
-    updateInlineCommentResolvedState(_defineProperty({}, annotationId, true), RESOLVE_METHOD.CONSUMER)(state, dispatch);
+var onResolve = function onResolve(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    return function (annotationId) {
+      updateInlineCommentResolvedState(editorAnalyticsAPI)(_defineProperty({}, annotationId, true), RESOLVE_METHOD.CONSUMER)(state, dispatch);
+    };
   };
 };
-var onUnResolve = function onUnResolve(state, dispatch) {
-  return function (annotationId) {
-    updateInlineCommentResolvedState(_defineProperty({}, annotationId, false))(state, dispatch);
+var onUnResolve = function onUnResolve(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    return function (annotationId) {
+      updateInlineCommentResolvedState(editorAnalyticsAPI)(_defineProperty({}, annotationId, false))(state, dispatch);
+    };
   };
 };
 var onMouseUp = function onMouseUp(state, dispatch) {
@@ -135,12 +139,12 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
     view: function view(editorView) {
       // Get initial state
       // Need to pass `editorView` to mitigate editor state going stale
-      fetchState(provider, getAllAnnotations(editorView.state.doc), editorView);
+      fetchState(provider, getAllAnnotations(editorView.state.doc), editorView, options.editorAnalyticsAPI);
       var resolve = function resolve(annotationId) {
-        return onResolve(editorView.state, editorView.dispatch)(annotationId);
+        return onResolve(options.editorAnalyticsAPI)(editorView.state, editorView.dispatch)(annotationId);
       };
       var unResolve = function unResolve(annotationId) {
-        return onUnResolve(editorView.state, editorView.dispatch)(annotationId);
+        return onUnResolve(options.editorAnalyticsAPI)(editorView.state, editorView.dispatch)(annotationId);
       };
       var mouseUp = function mouseUp(event) {
         return onMouseUp(editorView.state, editorView.dispatch)(event);
@@ -168,7 +172,7 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
             return;
           }
           clearDirtyMark()(view.state, view.dispatch);
-          fetchState(provider, getAllAnnotations(view.state.doc), view);
+          fetchState(provider, getAllAnnotations(view.state.doc), view, options.editorAnalyticsAPI);
         },
         destroy: function destroy() {
           editorView.root.removeEventListener('mouseup', mouseUp);

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

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

package/dist/esm/plugins/annotation/toolbar.js

@@ -6,45 +6,47 @@ import { AnnotationTestIds, AnnotationSelectionType } from './types';
 import { isSelectionValid } from './utils';
 import { annotationMessages } from '@atlaskit/editor-common/messages';
 import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils';
-export var buildToolbar = function buildToolbar(state, intl) {
-  var isToolbarAbove = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var schema = state.schema;
-  var selectionValid = isSelectionValid(state);
-  if (selectionValid === AnnotationSelectionType.INVALID) {
-    return undefined;
-  }
-  var createCommentMessage = intl.formatMessage(annotationMessages.createComment);
-  var commentDisabledMessage = intl.formatMessage(annotationMessages.createCommentInvalid);
-  var createComment = {
-    type: 'button',
-    showTitle: true,
-    disabled: selectionValid === AnnotationSelectionType.DISABLED,
-    testId: AnnotationTestIds.floatingToolbarCreateButton,
-    icon: CommentIcon,
-    tooltipContent: selectionValid === AnnotationSelectionType.DISABLED ? commentDisabledMessage : /*#__PURE__*/React.createElement(ToolTipContent, {
-      description: createCommentMessage,
-      keymap: addInlineComment
-    }),
-    title: createCommentMessage,
-    onClick: function onClick(state, dispatch) {
-      return setInlineCommentDraftState(true)(state, dispatch);
+export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
+  return function (state, intl) {
+    var isToolbarAbove = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    var schema = state.schema;
+    var selectionValid = isSelectionValid(state);
+    if (selectionValid === AnnotationSelectionType.INVALID) {
+      return undefined;
     }
-  };
-  var annotation = schema.marks.annotation;
-  var validNodes = Object.keys(schema.nodes).reduce(function (acc, current) {
-    var type = schema.nodes[current];
-    if (type.allowsMarkType(annotation)) {
-      acc.push(type);
-    }
-    return acc;
-  }, []);
-  var toolbarTitle = intl.formatMessage(annotationMessages.toolbar);
-  var calcToolbarPosition = isToolbarAbove ? calculateToolbarPositionAboveSelection : calculateToolbarPositionTrackHead;
-  var onPositionCalculated = calcToolbarPosition(toolbarTitle);
-  return {
-    title: toolbarTitle,
-    nodeType: validNodes,
-    items: [createComment],
-    onPositionCalculated: onPositionCalculated
+    var createCommentMessage = intl.formatMessage(annotationMessages.createComment);
+    var commentDisabledMessage = intl.formatMessage(annotationMessages.createCommentInvalid);
+    var createComment = {
+      type: 'button',
+      showTitle: true,
+      disabled: selectionValid === AnnotationSelectionType.DISABLED,
+      testId: AnnotationTestIds.floatingToolbarCreateButton,
+      icon: CommentIcon,
+      tooltipContent: selectionValid === AnnotationSelectionType.DISABLED ? commentDisabledMessage : /*#__PURE__*/React.createElement(ToolTipContent, {
+        description: createCommentMessage,
+        keymap: addInlineComment
+      }),
+      title: createCommentMessage,
+      onClick: function onClick(state, dispatch) {
+        return setInlineCommentDraftState(editorAnalyticsAPI)(true)(state, dispatch);
+      }
+    };
+    var annotation = schema.marks.annotation;
+    var validNodes = Object.keys(schema.nodes).reduce(function (acc, current) {
+      var type = schema.nodes[current];
+      if (type.allowsMarkType(annotation)) {
+        acc.push(type);
+      }
+      return acc;
+    }, []);
+    var toolbarTitle = intl.formatMessage(annotationMessages.toolbar);
+    var calcToolbarPosition = isToolbarAbove ? calculateToolbarPositionAboveSelection : calculateToolbarPositionTrackHead;
+    var onPositionCalculated = calcToolbarPosition(toolbarTitle);
+    return {
+      title: toolbarTitle,
+      nodeType: validNodes,
+      items: [createComment],
+      onPositionCalculated: onPositionCalculated
+    };
   };
 };

package/dist/esm/plugins/annotation/ui/InlineCommentView.js

@@ -27,6 +27,7 @@ var findPosForDOM = function findPosForDOM(sel) {
 export function InlineCommentView(_ref) {
   var providers = _ref.providers,
     editorView = _ref.editorView,
+    editorAnalyticsAPI = _ref.editorAnalyticsAPI,
     dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
   // As inlineComment is the only annotation present, this function is not generic
   var inlineCommentProvider = providers.inlineComment;
@@ -86,11 +87,11 @@ export function InlineCommentView(_ref) {
       dom: dom,
       textSelection: textSelection,
       onCreate: function onCreate(id) {
-        createAnnotation(id)(editorView.state, editorView.dispatch);
+        createAnnotation(editorAnalyticsAPI)(id)(editorView.state, editorView.dispatch);
         !editorView.hasFocus() && editorView.focus();
       },
       onClose: function onClose() {
-        setInlineCommentDraftState(false)(editorView.state, editorView.dispatch);
+        setInlineCommentDraftState(editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
         !editorView.hasFocus() && editorView.focus();
       }
     }));
@@ -135,7 +136,7 @@ export function InlineCommentView(_ref) {
       return removeInlineCommentNearSelection(id)(state, dispatch);
     },
     onResolve: function onResolve(id) {
-      return updateInlineCommentResolvedState(_defineProperty({}, id, true), RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch);
+      return updateInlineCommentResolvedState(editorAnalyticsAPI)(_defineProperty({}, id, true), RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch);
     },
     onClose: function onClose() {
       closeComponent()(editorView.state, editorView.dispatch);

package/dist/esm/plugins/index.js

@@ -2,7 +2,6 @@ export { default as clearMarksOnChangeToEmptyDocumentPlugin } from './clear-mark
 export { default as codeBlockPlugin } from './code-block';
 export { default as collabEditPlugin } from './collab-edit';
 export { default as extensionPlugin } from './extension';
-export { default as fakeTextCursorPlugin } from './fake-text-cursor';
 export { default as insertBlockPlugin } from './insert-block';
 export { default as jiraIssuePlugin } from './jira-issue';
 export { default as layoutPlugin } from './layout';
@@ -16,7 +15,6 @@ export { default as tasksAndDecisionsPlugin } from './tasks-and-decisions';
 export { default as breakoutPlugin } from './breakout';
 export { default as alignmentPlugin } from './alignment';
 export { default as dataConsumerMarkPlugin } from './data-consumer';
-export { default as fragmentMarkPlugin } from './fragment';
 export { default as indentationPlugin } from './indentation';
 export { default as annotationPlugin } from './annotation';
 export { default as analyticsPlugin } from './analytics';

package/dist/esm/plugins/placeholder-text/index.js

@@ -1 +1,2 @@
-export { default as placeholderTextPlugin } from './plugin';
+export { default as placeholderTextPlugin } from './plugin';
+export { FakeTextCursorSelection } from './fake-text-cursor/cursor';

package/dist/esm/plugins/placeholder-text/plugin.js

@@ -5,7 +5,7 @@ import { placeholder } from '@atlaskit/adf-schema';
 import MediaServicesTextIcon from '@atlaskit/icon/glyph/media-services/text';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { isNodeEmpty } from '@atlaskit/editor-common/utils';
-import { FakeTextCursorSelection } from '../fake-text-cursor/cursor';
+import { drawFakeTextCursor, FakeTextCursorSelection } from './fake-text-cursor/cursor';
 import PlaceholderFloatingToolbar from './ui/PlaceholderFloatingToolbar';
 import { hidePlaceholderFloatingToolbar, insertPlaceholderTextAtSelection } from './actions';
 import { PlaceholderTextNodeView } from './placeholder-text-nodeview';
@@ -92,6 +92,7 @@ export function createPlugin(dispatch, options, api) {
       return;
     },
     props: {
+      decorations: drawFakeTextCursor,
       handleDOMEvents: {
         beforeinput: function beforeinput(view, event) {
           var state = view.state;

package/dist/esm/plugins/placeholder-text/styles.js

@@ -1,6 +1,6 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 var _templateObject;
 import { css } from '@emotion/react';
-import { N200 } from '@atlaskit/theme/colors';
+import { B75, N200 } from '@atlaskit/theme/colors';
 import { SelectionStyle, getSelectionStyles, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
-export var placeholderTextStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror span[data-placeholder] {\n    color: ", ";\n    display: inline;\n  }\n\n  .ProseMirror span.pm-placeholder {\n    display: inline;\n    color: ", ";\n  }\n  .ProseMirror span.pm-placeholder__text {\n    display: inline;\n    color: ", ";\n  }\n\n  .ProseMirror span.pm-placeholder.", " {\n    ", "\n  }\n\n  .ProseMirror span.pm-placeholder__text[data-placeholder]::after {\n    color: ", ";\n    cursor: text;\n    content: attr(data-placeholder);\n    display: inline;\n  }\n"])), "var(--ds-text-subtlest, ".concat(N200, ")"), "var(--ds-text-subtlest, ".concat(N200, ")"), "var(--ds-text-subtlest, ".concat(N200, ")"), akEditorSelectedNodeClassName, getSelectionStyles([SelectionStyle.Background]), "var(--ds-text-subtlest, ".concat(N200, ")"));
+export var placeholderTextStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror span[data-placeholder] {\n    color: ", ";\n    display: inline;\n  }\n\n  .ProseMirror span.pm-placeholder {\n    display: inline;\n    color: ", ";\n  }\n  .ProseMirror span.pm-placeholder__text {\n    display: inline;\n    color: ", ";\n  }\n\n  .ProseMirror span.pm-placeholder.", " {\n    ", "\n  }\n\n  .ProseMirror span.pm-placeholder__text[data-placeholder]::after {\n    color: ", ";\n    cursor: text;\n    content: attr(data-placeholder);\n    display: inline;\n  }\n\n  .ProseMirror {\n    .ProseMirror-fake-text-cursor {\n      display: inline;\n      pointer-events: none;\n      position: relative;\n    }\n\n    .ProseMirror-fake-text-cursor::after {\n      content: '';\n      display: inline;\n      top: 0;\n      position: absolute;\n      border-right: 1px solid ", ";\n    }\n\n    .ProseMirror-fake-text-selection {\n      display: inline;\n      pointer-events: none;\n      position: relative;\n      background-color: ", ";\n    }\n  }\n"])), "var(--ds-text-subtlest, ".concat(N200, ")"), "var(--ds-text-subtlest, ".concat(N200, ")"), "var(--ds-text-subtlest, ".concat(N200, ")"), akEditorSelectedNodeClassName, getSelectionStyles([SelectionStyle.Background]), "var(--ds-text-subtlest, ".concat(N200, ")"), "var(--ds-border, rgba(0, 0, 0, 0.4))", "var(--ds-background-selected, ".concat(B75, ")"));

package/dist/esm/presets/default.js

@@ -13,7 +13,6 @@ import { focusPlugin } from '@atlaskit/editor-plugin-focus';
 import { editorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import { typeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 import { submitEditorPlugin } from '@atlaskit/editor-plugin-submit-editor';
-import fakeTextCursorPlugin from '../plugins/fake-text-cursor';
 import { featureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import { copyButtonPlugin } from '@atlaskit/editor-plugin-copy-button';
 import { floatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
@@ -82,7 +81,7 @@ export function createDefaultPreset(options) {
     return builder;
   }).add([hyperlinkPlugin, options.hyperlinkOptions]).add([textFormattingPlugin, options.textFormatting]).add(widthPlugin).add([quickInsertPlugin, options.quickInsert]).add([typeAheadPlugin, options.typeAhead || {
     createAnalyticsEvent: options.createAnalyticsEvent
-  }]).add([placeholderPlugin, options.placeholder]).add(unsupportedContentPlugin).add(editorDisabledPlugin).add([submitEditorPlugin, options.submitEditor]).add(fakeTextCursorPlugin).add(copyButtonPlugin).add(floatingToolbarPlugin).add([selectionPlugin, options.selection]).add([codeBlockPlugin, options.codeBlock || {
+  }]).add([placeholderPlugin, options.placeholder]).add(unsupportedContentPlugin).add(editorDisabledPlugin).add([submitEditorPlugin, options.submitEditor]).add(copyButtonPlugin).add(floatingToolbarPlugin).add([selectionPlugin, options.selection]).add([codeBlockPlugin, options.codeBlock || {
     appearance: 'full-page'
   }]);
   return preset;

package/dist/esm/presets/universal.js

@@ -2,7 +2,7 @@ import _typeof from "@babel/runtime/helpers/typeof";
 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 { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, fragmentMarkPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, panelPlugin, placeholderTextPlugin, tasksAndDecisionsPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, expandPlugin, isExpandInsertionEnabled, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../plugins';
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, panelPlugin, placeholderTextPlugin, tasksAndDecisionsPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, expandPlugin, isExpandInsertionEnabled, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../plugins';
 import { textColorPlugin } from '@atlaskit/editor-plugin-text-color';
 import { historyPlugin } from '@atlaskit/editor-plugin-history';
 import { statusPlugin } from '@atlaskit/editor-plugin-status';
@@ -12,6 +12,7 @@ import { borderPlugin } from '@atlaskit/editor-plugin-border';
 import { helpDialogPlugin } from '@atlaskit/editor-plugin-help-dialog';
 import { mediaPlugin } from '@atlaskit/editor-plugin-media';
 import { rulePlugin } from '@atlaskit/editor-plugin-rule';
+import { fragmentPlugin } from '@atlaskit/editor-plugin-fragment';
 import { emojiPlugin } from '@atlaskit/editor-plugin-emoji';
 import { pasteOptionsToolbarPlugin } from '@atlaskit/editor-plugin-paste-options-toolbar';
 import { listPlugin } from '@atlaskit/editor-plugin-list';
@@ -384,7 +385,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
       return builder.add(plugin);
     }
     return builder;
-  }).maybeAdd(fragmentMarkPlugin, function (plugin, builder) {
+  }).maybeAdd(fragmentPlugin, function (plugin, builder) {
     if (props.allowFragmentMark) {
       return builder.add(plugin);
     }