@atlaskit/editor-core 189.0.14 → 189.1.1

package/dist/cjs/presets/default.js

@@ -19,7 +19,6 @@ var _editorPluginFocus = require("@atlaskit/editor-plugin-focus");
 var _editorPluginEditorDisabled = require("@atlaskit/editor-plugin-editor-disabled");
 var _editorPluginTypeAhead = require("@atlaskit/editor-plugin-type-ahead");
 var _editorPluginSubmitEditor = require("@atlaskit/editor-plugin-submit-editor");
-var _fakeTextCursor = _interopRequireDefault(require("../plugins/fake-text-cursor"));
 var _editorPluginFeatureFlags = require("@atlaskit/editor-plugin-feature-flags");
 var _editorPluginCopyButton = require("@atlaskit/editor-plugin-copy-button");
 var _editorPluginFloatingToolbar = require("@atlaskit/editor-plugin-floating-toolbar");
@@ -90,7 +89,7 @@ function createDefaultPreset(options) {
     return builder;
   }).add([_editorPluginHyperlink.hyperlinkPlugin, options.hyperlinkOptions]).add([_editorPluginTextFormatting.textFormattingPlugin, options.textFormatting]).add(_editorPluginWidth.widthPlugin).add([_editorPluginQuickInsert.quickInsertPlugin, options.quickInsert]).add([_editorPluginTypeAhead.typeAheadPlugin, options.typeAhead || {
     createAnalyticsEvent: options.createAnalyticsEvent
-  }]).add([_editorPluginPlaceholder.placeholderPlugin, options.placeholder]).add(_editorPluginUnsupportedContent.unsupportedContentPlugin).add(_editorPluginEditorDisabled.editorDisabledPlugin).add([_editorPluginSubmitEditor.submitEditorPlugin, options.submitEditor]).add(_fakeTextCursor.default).add(_editorPluginCopyButton.copyButtonPlugin).add(_editorPluginFloatingToolbar.floatingToolbarPlugin).add([_editorPluginSelection.selectionPlugin, options.selection]).add([_codeBlock.default, options.codeBlock || {
+  }]).add([_editorPluginPlaceholder.placeholderPlugin, options.placeholder]).add(_editorPluginUnsupportedContent.unsupportedContentPlugin).add(_editorPluginEditorDisabled.editorDisabledPlugin).add([_editorPluginSubmitEditor.submitEditorPlugin, options.submitEditor]).add(_editorPluginCopyButton.copyButtonPlugin).add(_editorPluginFloatingToolbar.floatingToolbarPlugin).add([_editorPluginSelection.selectionPlugin, options.selection]).add([_codeBlock.default, options.codeBlock || {
     appearance: 'full-page'
   }]);
   return preset;

package/dist/cjs/presets/universal.js

@@ -17,6 +17,7 @@ var _editorPluginBorder = require("@atlaskit/editor-plugin-border");
 var _editorPluginHelpDialog = require("@atlaskit/editor-plugin-help-dialog");
 var _editorPluginMedia = require("@atlaskit/editor-plugin-media");
 var _editorPluginRule = require("@atlaskit/editor-plugin-rule");
+var _editorPluginFragment = require("@atlaskit/editor-plugin-fragment");
 var _editorPluginEmoji = require("@atlaskit/editor-plugin-emoji");
 var _editorPluginPasteOptionsToolbar = require("@atlaskit/editor-plugin-paste-options-toolbar");
 var _editorPluginList = require("@atlaskit/editor-plugin-list");
@@ -391,7 +392,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       return builder.add(plugin);
     }
     return builder;
-  }).maybeAdd(_plugins.fragmentMarkPlugin, function (plugin, builder) {
+  }).maybeAdd(_editorPluginFragment.fragmentPlugin, function (plugin, builder) {
     if (props.allowFragmentMark) {
       return builder.add(plugin);
     }

package/dist/cjs/ui/ContentStyles/index.js

@@ -20,12 +20,11 @@ var _styles5 = require("../../plugins/code-block/styles");
 var _media = require("./media");
 var _styles6 = require("../../plugins/layout/styles");
 var _styles7 = require("../../plugins/panel/styles");
-var _styles8 = require("../../plugins/fake-text-cursor/styles");
-var _styles9 = require("../../plugins/placeholder-text/styles");
-var _styles10 = require("../../plugins/extension/ui/styles");
-var _styles11 = require("../../plugins/expand/ui/styles");
-var _styles12 = require("../../plugins/find-replace/styles");
-var _styles13 = require("../../plugins/tasks-and-decisions/styles");
+var _styles8 = require("../../plugins/placeholder-text/styles");
+var _styles9 = require("../../plugins/extension/ui/styles");
+var _styles10 = require("../../plugins/expand/ui/styles");
+var _styles11 = require("../../plugins/find-replace/styles");
+var _styles12 = require("../../plugins/tasks-and-decisions/styles");
 var _status = require("./status");
 var _date = require("./date");
 var _getInlineNodeViewProducer = require("../../nodeviews/getInlineNodeViewProducer.styles");
@@ -46,9 +45,9 @@ var listsStyles = (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _
 var emojiStyles = (0, _react2.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  .", " {\n    display: inline-block;\n\n    .", " {\n      cursor: pointer;\n\n      &.", " > span {\n        /** needed for selection style to cover custom emoji image properly */\n        display: flex;\n      }\n    }\n\n    &.", " {\n      .", ",\n        .", " {\n        border-radius: 2px;\n        ", "\n      }\n    }\n  }\n"])), _emoji.EmojiSharedCssClassName.EMOJI_CONTAINER, _emoji.EmojiSharedCssClassName.EMOJI_NODE, _emoji.EmojiSharedCssClassName.EMOJI_IMAGE, _editorSharedStyles.akEditorSelectedNodeClassName, _emoji.EmojiSharedCssClassName.EMOJI_SPRITE, _emoji.EmojiSharedCssClassName.EMOJI_IMAGE, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.Blanket, _editorSharedStyles.SelectionStyle.BoxShadow]));
 var placeholderStyles = exports.placeholderStyles = (0, _react2.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror .placeholder-decoration {\n    color: ", ";\n    width: 100%;\n    pointer-events: none;\n    user-select: none;\n\n    .placeholder-android {\n      pointer-events: none;\n      outline: none;\n      user-select: none;\n      position: absolute;\n    }\n  }\n"])), "var(--ds-text-subtlest, ".concat(_colors.N200, ")"));
 var contentStyles = function contentStyles(props) {
-  return (0, _react2.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    outline: none;\n    font-size: ", "px;\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n  }\n\n  .ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n    pointer-events: none;\n    opacity: 0.7;\n  }\n\n  .ProseMirror-hideselection *::selection {\n    background: transparent;\n  }\n\n  .ProseMirror-hideselection *::-moz-selection {\n    background: transparent;\n  }\n\n  .ProseMirror-selectednode {\n    outline: none;\n  }\n\n  .ProseMirror-selectednode:empty {\n    outline: 2px solid ", ";\n  }\n\n  ", "\n  ", "\n  ", "\n\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", ";\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n\n  .panelView-content-wrap {\n    box-sizing: border-box;\n  }\n\n  .mediaGroupView-content-wrap ul {\n    padding: 0;\n  }\n\n  /** Needed to override any cleared floats, e.g. image wrapping */\n\n  div.fabric-editor-block-mark[class^='fabric-editor-align'] {\n    clear: none !important;\n  }\n\n  .fabric-editor-align-end {\n    text-align: right;\n  }\n\n  .fabric-editor-align-start {\n    text-align: left;\n  }\n\n  .fabric-editor-align-center {\n    text-align: center;\n  }\n\n  .pm-table-header-content-wrap :not(.fabric-editor-alignment),\n  .pm-table-header-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark,\n  .pm-table-cell-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark {\n    p:first-of-type {\n      margin-top: 0;\n    }\n  }\n\n  .hyperlink-floating-toolbar,\n  .", " {\n    padding: 0;\n  }\n\n  /* Link icon in the Atlaskit package\n     is bigger than the others\n  */\n  .hyperlink-open-link {\n    svg {\n      max-width: 18px;\n    }\n    &[href] {\n      padding: 0 4px;\n    }\n  }\n"])), (0, _editorSharedStyles.editorFontSize)({
+  return (0, _react2.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    outline: none;\n    font-size: ", "px;\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n  }\n\n  .ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n    pointer-events: none;\n    opacity: 0.7;\n  }\n\n  .ProseMirror-hideselection *::selection {\n    background: transparent;\n  }\n\n  .ProseMirror-hideselection *::-moz-selection {\n    background: transparent;\n  }\n\n  .ProseMirror-selectednode {\n    outline: none;\n  }\n\n  .ProseMirror-selectednode:empty {\n    outline: 2px solid ", ";\n  }\n\n  ", "\n  ", "\n  ", "\n\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", ";\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n\n  .panelView-content-wrap {\n    box-sizing: border-box;\n  }\n\n  .mediaGroupView-content-wrap ul {\n    padding: 0;\n  }\n\n  /** Needed to override any cleared floats, e.g. image wrapping */\n\n  div.fabric-editor-block-mark[class^='fabric-editor-align'] {\n    clear: none !important;\n  }\n\n  .fabric-editor-align-end {\n    text-align: right;\n  }\n\n  .fabric-editor-align-start {\n    text-align: left;\n  }\n\n  .fabric-editor-align-center {\n    text-align: center;\n  }\n\n  .pm-table-header-content-wrap :not(.fabric-editor-alignment),\n  .pm-table-header-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark,\n  .pm-table-cell-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark {\n    p:first-of-type {\n      margin-top: 0;\n    }\n  }\n\n  .hyperlink-floating-toolbar,\n  .", " {\n    padding: 0;\n  }\n\n  /* Link icon in the Atlaskit package\n     is bigger than the others\n  */\n  .hyperlink-open-link {\n    svg {\n      max-width: 18px;\n    }\n    &[href] {\n      padding: 0 4px;\n    }\n  }\n"])), (0, _editorSharedStyles.editorFontSize)({
     theme: props.theme
-  }), _styles.whitespaceSharedStyles, _styles.paragraphSharedStyles, _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.shadowSharedStyle, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, "var(--ds-border-focused, #8cf)", _styles9.placeholderTextStyles, placeholderStyles, (0, _styles5.codeBlockStyles)(props), (0, _styles3.blocktypeStyles)(props), (0, _styles.codeMarkSharedStyles)(props), _styles.textColorStyles, listsStyles, ruleStyles(props), _media.mediaStyles, (0, _styles6.layoutStyles)(props), _styles2.telepointerStyle, _selection.gapCursorStyles, (0, _commonStyles.tableStyles)(props), (0, _styles7.panelStyles)(props), _styles8.fakeCursorStyles, mentionsStyles, emojiStyles, _styles.tasksAndDecisionsStyles, _styles.gridStyles, linkStyles, _styles.blockMarksSharedStyles, _styles.dateSharedStyle, _styles10.extensionStyles, (0, _styles11.expandStyles)(props), _styles12.findReplaceStyles, _styles4.textHighlightStyle, _styles13.taskDecisionStyles, _status.statusStyles, (0, _styles.annotationSharedStyles)(props), _styles.smartCardStyles, _styles.smartCardSharedStyles, _date.dateStyles, _styles.embedCardStyles, _styles.unsupportedStyles, _styles.resizerStyles, _styles.MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT);
+  }), _styles.whitespaceSharedStyles, _styles.paragraphSharedStyles, _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.shadowSharedStyle, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, "var(--ds-border-focused, #8cf)", _styles8.placeholderTextStyles, placeholderStyles, (0, _styles5.codeBlockStyles)(props), (0, _styles3.blocktypeStyles)(props), (0, _styles.codeMarkSharedStyles)(props), _styles.textColorStyles, listsStyles, ruleStyles(props), _media.mediaStyles, (0, _styles6.layoutStyles)(props), _styles2.telepointerStyle, _selection.gapCursorStyles, (0, _commonStyles.tableStyles)(props), (0, _styles7.panelStyles)(props), mentionsStyles, emojiStyles, _styles.tasksAndDecisionsStyles, _styles.gridStyles, linkStyles, _styles.blockMarksSharedStyles, _styles.dateSharedStyle, _styles9.extensionStyles, (0, _styles10.expandStyles)(props), _styles11.findReplaceStyles, _styles4.textHighlightStyle, _styles12.taskDecisionStyles, _status.statusStyles, (0, _styles.annotationSharedStyles)(props), _styles.smartCardStyles, _styles.smartCardSharedStyles, _date.dateStyles, _styles.embedCardStyles, _styles.unsupportedStyles, _styles.resizerStyles, _styles.MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT);
 };
 var createEditorContentStyle = exports.createEditorContentStyle = function createEditorContentStyle(styles) {
   return /*#__PURE__*/_react.default.forwardRef(function (props, ref) {

package/dist/cjs/utils/document.js

@@ -10,8 +10,6 @@ Object.defineProperty(exports, "findFarthestParentNode", {
     return _utils.findFarthestParentNode;
   }
 });
-exports.getChangedNodes = getChangedNodes;
-exports.getChangedNodesIn = getChangedNodesIn;
 exports.getChildBreakoutModes = getChildBreakoutModes;
 exports.getNodesCount = getNodesCount;
 Object.defineProperty(exports, "isInEmptyLine", {
@@ -40,30 +38,6 @@ function processRawFragmentValue(schema, value, providerFactory, sanitizePrivate
   }
   return _model.Fragment.from(adfEntities);
 }
-function getChangedNodesIn(_ref) {
-  var tr = _ref.tr,
-    doc = _ref.doc;
-  var nodes = [];
-  var stepRange = (0, _utils.getStepRange)(tr);
-  if (!stepRange) {
-    return nodes;
-  }
-  var from = Math.min(doc.nodeSize - 2, stepRange.from);
-  var to = Math.min(doc.nodeSize - 2, stepRange.to);
-  doc.nodesBetween(from, to, function (node, pos) {
-    nodes.push({
-      node: node,
-      pos: pos
-    });
-  });
-  return nodes;
-}
-function getChangedNodes(tr) {
-  return getChangedNodesIn({
-    tr: tr,
-    doc: tr.doc
-  });
-}
 function nodesBetweenChanged(tr, f, startPos) {
   var stepRange = (0, _utils.getStepRange)(tr);
   if (!stepRange) {

package/dist/cjs/utils/index.js

@@ -147,7 +147,6 @@ Object.defineProperty(exports, "toJSON", {
 });
 exports.whichTransitionEvent = whichTransitionEvent;
 var _commands = require("@atlaskit/editor-prosemirror/commands");
-var _cursor = require("../plugins/fake-text-cursor/cursor");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _utils2 = require("@atlaskit/editor-common/utils");
 var _coreUtils = require("@atlaskit/editor-common/core-utils");
@@ -173,9 +172,6 @@ function getCursor(selection) {
  * allowed.
  */
 function isMarkTypeAllowedInCurrentSelection(markType, state) {
-  if (state.selection instanceof _cursor.FakeTextCursorSelection) {
-    return true;
-  }
   if (!isMarkTypeAllowedInNode(markType, state)) {
     return false;
   }

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "189.0.14";
+var version = exports.version = "189.1.1";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/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/es2019/plugins/annotation/commands/index.js

@@ -5,14 +5,14 @@ import { isSelectionValid, getPluginState } from '../utils';
 import { ACTIONS } from '../pm-plugins/types';
 import transform from './transform';
 import { AnnotationSelectionType } from '../types';
-export const updateInlineCommentResolvedState = (partialNewState, resolveMethod) => {
+export const updateInlineCommentResolvedState = editorAnalyticsAPI => (partialNewState, resolveMethod) => {
   const command = {
     type: ACTIONS.UPDATE_INLINE_COMMENT_STATE,
     data: partialNewState
   };
   const allResolved = Object.values(partialNewState).every(state => state);
   if (resolveMethod && allResolved) {
-    return createCommand(command, transform.addResolveAnalytics(resolveMethod));
+    return createCommand(command, transform.addResolveAnalytics(editorAnalyticsAPI)(resolveMethod));
   }
   return createCommand(command);
 };
@@ -62,11 +62,11 @@ const getDraftCommandAction = drafting => {
     };
   };
 };
-export const setInlineCommentDraftState = (drafting, inputMethod = INPUT_METHOD.TOOLBAR) => {
+export const setInlineCommentDraftState = editorAnalyticsAPI => (drafting, inputMethod = INPUT_METHOD.TOOLBAR) => {
   const commandAction = getDraftCommandAction(drafting);
-  return createCommand(commandAction, transform.addOpenCloseAnalytics(drafting, inputMethod));
+  return createCommand(commandAction, transform.addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, inputMethod));
 };
-export const addInlineComment = id => {
+export const addInlineComment = editorAnalyticsAPI => id => {
   const commandAction = editorState => ({
     type: ACTIONS.ADD_INLINE_COMMENT,
     data: {
@@ -83,7 +83,7 @@ export const addInlineComment = id => {
       editorState
     }
   });
-  return createCommand(commandAction, transform.addInlineComment(id));
+  return createCommand(commandAction, transform.addInlineComment(editorAnalyticsAPI)(id));
 };
 export const updateMouseState = mouseData => createCommand({
   type: ACTIONS.INLINE_COMMENT_UPDATE_MOUSE_STATE,
@@ -100,7 +100,7 @@ export const setSelectedAnnotation = id => createCommand({
     }]
   }
 });
-export const createAnnotation = (id, annotationType = AnnotationTypes.INLINE_COMMENT) => (state, dispatch) => {
+export const createAnnotation = editorAnalyticsAPI => (id, annotationType = AnnotationTypes.INLINE_COMMENT) => (state, dispatch) => {
   // don't try to add if there are is no temp highlight bookmarked
   const {
     bookmark
@@ -109,7 +109,7 @@ export const createAnnotation = (id, annotationType = AnnotationTypes.INLINE_COM
     return false;
   }
   if (annotationType === AnnotationTypes.INLINE_COMMENT) {
-    return addInlineComment(id)(state, dispatch);
+    return addInlineComment(editorAnalyticsAPI)(id)(state, dispatch);
   }
   return false;
 };

package/dist/es2019/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';
 const addAnnotationMark = id => (transaction, state) => {
@@ -21,27 +20,29 @@ const addAnnotationMark = id => (transaction, state) => {
   tr.setSelection(TextSelection.create(tr.doc, head));
   return tr;
 };
-const addInlineComment = id => (transaction, state) => {
+const addInlineComment = editorAnalyticsAPI => id => (transaction, state) => {
   let tr = addAnnotationMark(id)(transaction, state);
   // add insert analytics step to transaction
-  tr = addInsertAnalytics(tr, state);
+  tr = addInsertAnalytics(editorAnalyticsAPI)(tr, state);
   // add close analytics step to transaction
-  tr = addOpenCloseAnalytics(false, INPUT_METHOD.TOOLBAR)(tr, state);
+  tr = addOpenCloseAnalytics(editorAnalyticsAPI)(false, INPUT_METHOD.TOOLBAR)(tr, state);
   return tr;
 };
-const addOpenCloseAnalytics = (drafting, method = INPUT_METHOD.TOOLBAR) => (transaction, state) => {
+const addOpenCloseAnalytics = editorAnalyticsAPI => (drafting, method = INPUT_METHOD.TOOLBAR) => (transaction, state) => {
   const draftingPayload = getDraftCommandAnalyticsPayload(drafting, method)(state);
-  return addAnalytics(state, transaction, draftingPayload);
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(draftingPayload)(transaction);
+  return transaction;
 };
-const addInsertAnalytics = (transaction, state) => {
-  return addAnalytics(state, transaction, {
+const addInsertAnalytics = editorAnalyticsAPI => (transaction, state) => {
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.ANNOTATION,
     eventType: EVENT_TYPE.TRACK,
     actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT
-  });
+  })(transaction);
+  return transaction;
 };
-const addResolveAnalytics = method => (transaction, state) => {
+const addResolveAnalytics = editorAnalyticsAPI => method => (transaction, state) => {
   const resolvedPayload = {
     action: ACTION.RESOLVED,
     actionSubject: ACTION_SUBJECT.ANNOTATION,
@@ -51,7 +52,8 @@ const addResolveAnalytics = method => (transaction, state) => {
       method
     }
   };
-  return addAnalytics(state, transaction, resolvedPayload);
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(resolvedPayload)(transaction);
+  return transaction;
 };
 export default {
   addAnnotationMark,

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

@@ -34,11 +34,13 @@ const annotationPlugin = ({
         eventDispatcher
       }) => {
         if (annotationProviders) {
+          var _api$analytics;
           return inlineCommentPlugin({
             dispatch,
             portalProviderAPI,
             eventDispatcher,
-            provider: annotationProviders.inlineComment
+            provider: annotationProviders.inlineComment,
+            editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
           });
         }
         return;
@@ -47,7 +49,8 @@ const annotationPlugin = ({
       name: 'annotationKeymap',
       plugin: () => {
         if (annotationProviders) {
-          return keymapPlugin();
+          var _api$analytics2;
+          return keymapPlugin(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
         }
         return;
       }
@@ -59,10 +62,11 @@ const annotationPlugin = ({
         }
         const pluginState = getPluginState(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
+          var _api$analytics3;
           const {
             isToolbarAbove
           } = annotationProviders.inlineComment;
-          return buildToolbar(state, intl, isToolbarAbove);
+          return buildToolbar(api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)(state, intl, isToolbarAbove);
         }
       },
       selectionToolbar(state, intl) {
@@ -71,10 +75,11 @@ const annotationPlugin = ({
         }
         const pluginState = getPluginState(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
+          var _api$analytics4;
           const {
             isToolbarAbove
           } = annotationProviders.inlineComment;
-          return buildToolbar(state, intl, isToolbarAbove);
+          return buildToolbar(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(state, intl, isToolbarAbove);
         }
       }
     },
@@ -100,6 +105,7 @@ function AnnotationContentComponent({
   annotationProviders,
   dispatchAnalyticsEvent
 }) {
+  var _api$analytics5;
   const {
     annotationState: inlineCommentState
   } = useSharedPluginState(api, ['annotation']);
@@ -111,7 +117,8 @@ function AnnotationContentComponent({
   }, /*#__PURE__*/React.createElement(InlineCommentView, {
     providers: annotationProviders,
     editorView: editorView,
-    dispatchAnalyticsEvent: dispatchAnalyticsEvent
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions
   }));
 }
 export default annotationPlugin;

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

@@ -19,13 +19,13 @@ const fetchProviderStates = async (provider, annotationIds) => {
 
 // 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
-const fetchState = async (provider, annotationIds, editorView) => {
+const fetchState = async (provider, annotationIds, editorView, editorAnalyticsAPI) => {
   if (!annotationIds || !annotationIds.length) {
     return;
   }
   const inlineCommentStates = await fetchProviderStates(provider, annotationIds);
   if (editorView.dispatch) {
-    updateInlineCommentResolvedState(inlineCommentStates)(editorView.state, editorView.dispatch);
+    updateInlineCommentResolvedState(editorAnalyticsAPI)(inlineCommentStates)(editorView.state, editorView.dispatch);
   }
 };
 const initialState = (disallowOnWhitespace = false) => {
@@ -47,13 +47,13 @@ const hideToolbar = (state, dispatch) => () => {
 };
 
 // Subscribe to updates from consumer
-const onResolve = (state, dispatch) => annotationId => {
-  updateInlineCommentResolvedState({
+const onResolve = editorAnalyticsAPI => (state, dispatch) => annotationId => {
+  updateInlineCommentResolvedState(editorAnalyticsAPI)({
     [annotationId]: true
   }, RESOLVE_METHOD.CONSUMER)(state, dispatch);
 };
-const onUnResolve = (state, dispatch) => annotationId => {
-  updateInlineCommentResolvedState({
+const onUnResolve = editorAnalyticsAPI => (state, dispatch) => annotationId => {
+  updateInlineCommentResolvedState(editorAnalyticsAPI)({
     [annotationId]: false
   })(state, dispatch);
 };
@@ -93,9 +93,9 @@ export const inlineCommentPlugin = options => {
     view(editorView) {
       // Get initial state
       // Need to pass `editorView` to mitigate editor state going stale
-      fetchState(provider, getAllAnnotations(editorView.state.doc), editorView);
-      const resolve = annotationId => onResolve(editorView.state, editorView.dispatch)(annotationId);
-      const unResolve = annotationId => onUnResolve(editorView.state, editorView.dispatch)(annotationId);
+      fetchState(provider, getAllAnnotations(editorView.state.doc), editorView, options.editorAnalyticsAPI);
+      const resolve = annotationId => onResolve(options.editorAnalyticsAPI)(editorView.state, editorView.dispatch)(annotationId);
+      const unResolve = annotationId => onUnResolve(options.editorAnalyticsAPI)(editorView.state, editorView.dispatch)(annotationId);
       const mouseUp = event => onMouseUp(editorView.state, editorView.dispatch)(event);
       const setVisibility = isVisible => onSetVisibility(editorView)(isVisible);
       const setSelectedAnnotationFn = annotationId => {
@@ -121,7 +121,7 @@ export const 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() {
           editorView.root.removeEventListener('mouseup', mouseUp);

package/dist/es2019/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) {
   const 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/es2019/plugins/annotation/toolbar.js

@@ -6,7 +6,7 @@ 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 const buildToolbar = (state, intl, isToolbarAbove = false) => {
+export const buildToolbar = editorAnalyticsAPI => (state, intl, isToolbarAbove = false) => {
   const {
     schema
   } = state;
@@ -28,7 +28,7 @@ export const buildToolbar = (state, intl, isToolbarAbove = false) => {
     }),
     title: createCommentMessage,
     onClick: (state, dispatch) => {
-      return setInlineCommentDraftState(true)(state, dispatch);
+      return setInlineCommentDraftState(editorAnalyticsAPI)(true)(state, dispatch);
     }
   };
   const {

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

@@ -26,6 +26,7 @@ const findPosForDOM = sel => {
 export function InlineCommentView({
   providers,
   editorView,
+  editorAnalyticsAPI,
   dispatchAnalyticsEvent
 }) {
   // As inlineComment is the only annotation present, this function is not generic
@@ -93,11 +94,11 @@ export function InlineCommentView({
       dom: dom,
       textSelection: textSelection,
       onCreate: id => {
-        createAnnotation(id)(editorView.state, editorView.dispatch);
+        createAnnotation(editorAnalyticsAPI)(id)(editorView.state, editorView.dispatch);
         !editorView.hasFocus() && editorView.focus();
       },
       onClose: () => {
-        setInlineCommentDraftState(false)(editorView.state, editorView.dispatch);
+        setInlineCommentDraftState(editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
         !editorView.hasFocus() && editorView.focus();
       }
     }));
@@ -137,7 +138,7 @@ export function InlineCommentView({
     annotations: activeAnnotations,
     dom: dom,
     onDelete: id => removeInlineCommentNearSelection(id)(state, dispatch),
-    onResolve: id => updateInlineCommentResolvedState({
+    onResolve: id => updateInlineCommentResolvedState(editorAnalyticsAPI)({
       [id]: true
     }, RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch),
     onClose: () => {

package/dist/es2019/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/es2019/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/es2019/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';
@@ -93,6 +93,7 @@ export function createPlugin(dispatch, options, api) {
       return;
     },
     props: {
+      decorations: drawFakeTextCursor,
       handleDOMEvents: {
         beforeinput: (view, event) => {
           const {

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

@@ -1,5 +1,5 @@
 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 const placeholderTextStyles = css`
   .ProseMirror span[data-placeholder] {
@@ -26,4 +26,27 @@ export const placeholderTextStyles = css`
     content: attr(data-placeholder);
     display: inline;
   }
+
+  .ProseMirror {
+    .ProseMirror-fake-text-cursor {
+      display: inline;
+      pointer-events: none;
+      position: relative;
+    }
+
+    .ProseMirror-fake-text-cursor::after {
+      content: '';
+      display: inline;
+      top: 0;
+      position: absolute;
+      border-right: 1px solid ${"var(--ds-border, rgba(0, 0, 0, 0.4))"};
+    }
+
+    .ProseMirror-fake-text-selection {
+      display: inline;
+      pointer-events: none;
+      position: relative;
+      background-color: ${`var(--ds-background-selected, ${B75})`};
+    }
+  }
 `;

package/dist/es2019/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';
@@ -86,7 +85,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/es2019/presets/universal.js

@@ -1,4 +1,4 @@
-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';
@@ -8,6 +8,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';
@@ -388,7 +389,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
       return builder.add(plugin);
     }
     return builder;
-  }).maybeAdd(fragmentMarkPlugin, (plugin, builder) => {
+  }).maybeAdd(fragmentPlugin, (plugin, builder) => {
     if (props.allowFragmentMark) {
       return builder.add(plugin);
     }

package/dist/es2019/ui/ContentStyles/index.js

@@ -12,7 +12,6 @@ import { codeBlockStyles } from '../../plugins/code-block/styles';
 import { mediaStyles } from './media';
 import { layoutStyles } from '../../plugins/layout/styles';
 import { panelStyles } from '../../plugins/panel/styles';
-import { fakeCursorStyles } from '../../plugins/fake-text-cursor/styles';
 import { placeholderTextStyles } from '../../plugins/placeholder-text/styles';
 import { extensionStyles } from '../../plugins/extension/ui/styles';
 import { expandStyles } from '../../plugins/expand/ui/styles';
@@ -183,7 +182,6 @@ const contentStyles = props => css`
   ${gapCursorStyles};
   ${tableStyles(props)}
   ${panelStyles(props)}
-  ${fakeCursorStyles}
   ${mentionsStyles}
   ${emojiStyles}
   ${tasksAndDecisionsStyles}

package/dist/es2019/utils/document.js

@@ -12,31 +12,6 @@ export function processRawFragmentValue(schema, value, providerFactory, sanitize
   }
   return Fragment.from(adfEntities);
 }
-export function getChangedNodesIn({
-  tr,
-  doc
-}) {
-  const nodes = [];
-  const stepRange = getStepRange(tr);
-  if (!stepRange) {
-    return nodes;
-  }
-  const from = Math.min(doc.nodeSize - 2, stepRange.from);
-  const to = Math.min(doc.nodeSize - 2, stepRange.to);
-  doc.nodesBetween(from, to, (node, pos) => {
-    nodes.push({
-      node,
-      pos
-    });
-  });
-  return nodes;
-}
-export function getChangedNodes(tr) {
-  return getChangedNodesIn({
-    tr: tr,
-    doc: tr.doc
-  });
-}
 export function nodesBetweenChanged(tr, f, startPos) {
   const stepRange = getStepRange(tr);
   if (!stepRange) {