@atlaskit/editor-core 189.0.14 → 189.1.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-core
 
+## 189.1.1
+
+### Patch Changes
+
+- [#42279](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42279) [`f4fd8d16522`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f4fd8d16522) - ED-20556 Extract Fragment plugin
+- [#42255](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42255) [`44cdc71165d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/44cdc71165d) - Decouple annotation plugin from deprecated analytics plugin.
+- Updated dependencies
+
+## 189.1.0
+
+### Minor Changes
+
+- [#42210](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42210) [`a00e52ea8b8`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a00e52ea8b8) - ED-20478: removes editor fake-text-cursor editor plugin and relocates it under placeholder-text plugin
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 189.0.14
 
 ### Patch Changes

package/dist/cjs/extensibility.js

@@ -26,14 +26,14 @@ Object.defineProperty(exports, "ExtensionNodeWrapper", {
 Object.defineProperty(exports, "getChangedNodes", {
   enumerable: true,
   get: function get() {
-    return _document.getChangedNodes;
+    return _utils.getChangedNodes;
   }
 });
 exports.tablePluginKey = void 0;
 Object.defineProperty(exports, "toJSON", {
   enumerable: true,
   get: function get() {
-    return _utils.toJSON;
+    return _utils2.toJSON;
   }
 });
 Object.defineProperty(exports, "validateNodes", {
@@ -42,9 +42,9 @@ Object.defineProperty(exports, "validateNodes", {
     return _nodes.validateNodes;
   }
 });
-var _document = require("./utils/document");
+var _utils = require("@atlaskit/editor-common/utils");
 var _nodes = require("./utils/nodes");
-var _utils = require("./utils");
+var _utils2 = require("./utils");
 var _Extension = _interopRequireDefault(require("./plugins/extension/ui/Extension"));
 var _ExtensionNodeWrapper = _interopRequireDefault(require("./plugins/extension/ui/Extension/ExtensionNodeWrapper"));
 var _extension = require("./plugins/extension/nodeviews/extension");

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

@@ -13,18 +13,20 @@ var _utils = require("../utils");
 var _types = require("../pm-plugins/types");
 var _transform = _interopRequireDefault(require("./transform"));
 var _types2 = require("../types");
-var updateInlineCommentResolvedState = exports.updateInlineCommentResolvedState = function updateInlineCommentResolvedState(partialNewState, resolveMethod) {
-  var command = {
-    type: _types.ACTIONS.UPDATE_INLINE_COMMENT_STATE,
-    data: partialNewState
+var updateInlineCommentResolvedState = exports.updateInlineCommentResolvedState = function updateInlineCommentResolvedState(editorAnalyticsAPI) {
+  return function (partialNewState, resolveMethod) {
+    var command = {
+      type: _types.ACTIONS.UPDATE_INLINE_COMMENT_STATE,
+      data: partialNewState
+    };
+    var allResolved = Object.values(partialNewState).every(function (state) {
+      return state;
+    });
+    if (resolveMethod && allResolved) {
+      return (0, _pluginFactory.createCommand)(command, _transform.default.addResolveAnalytics(editorAnalyticsAPI)(resolveMethod));
+    }
+    return (0, _pluginFactory.createCommand)(command);
   };
-  var allResolved = Object.values(partialNewState).every(function (state) {
-    return state;
-  });
-  if (resolveMethod && allResolved) {
-    return (0, _pluginFactory.createCommand)(command, _transform.default.addResolveAnalytics(resolveMethod));
-  }
-  return (0, _pluginFactory.createCommand)(command);
 };
 var closeComponent = exports.closeComponent = function closeComponent() {
   return (0, _pluginFactory.createCommand)({
@@ -74,29 +76,33 @@ var getDraftCommandAction = function getDraftCommandAction(drafting) {
     };
   };
 };
-var setInlineCommentDraftState = exports.setInlineCommentDraftState = function setInlineCommentDraftState(drafting) {
-  var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
-  var commandAction = getDraftCommandAction(drafting);
-  return (0, _pluginFactory.createCommand)(commandAction, _transform.default.addOpenCloseAnalytics(drafting, inputMethod));
+var setInlineCommentDraftState = exports.setInlineCommentDraftState = function setInlineCommentDraftState(editorAnalyticsAPI) {
+  return function (drafting) {
+    var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
+    var commandAction = getDraftCommandAction(drafting);
+    return (0, _pluginFactory.createCommand)(commandAction, _transform.default.addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, inputMethod));
+  };
 };
-var addInlineComment = exports.addInlineComment = function addInlineComment(id) {
-  var commandAction = function commandAction(editorState) {
-    return {
-      type: _types.ACTIONS.ADD_INLINE_COMMENT,
-      data: {
-        drafting: false,
-        inlineComments: (0, _defineProperty2.default)({}, id, false),
-        // Auto make the newly inserted comment selected.
-        // We move the selection to the head of the comment selection.
-        selectedAnnotations: [{
-          id: id,
-          type: _adfSchema.AnnotationTypes.INLINE_COMMENT
-        }],
-        editorState: editorState
-      }
+var addInlineComment = exports.addInlineComment = function addInlineComment(editorAnalyticsAPI) {
+  return function (id) {
+    var commandAction = function commandAction(editorState) {
+      return {
+        type: _types.ACTIONS.ADD_INLINE_COMMENT,
+        data: {
+          drafting: false,
+          inlineComments: (0, _defineProperty2.default)({}, id, false),
+          // Auto make the newly inserted comment selected.
+          // We move the selection to the head of the comment selection.
+          selectedAnnotations: [{
+            id: id,
+            type: _adfSchema.AnnotationTypes.INLINE_COMMENT
+          }],
+          editorState: editorState
+        }
+      };
     };
+    return (0, _pluginFactory.createCommand)(commandAction, _transform.default.addInlineComment(editorAnalyticsAPI)(id));
   };
-  return (0, _pluginFactory.createCommand)(commandAction, _transform.default.addInlineComment(id));
 };
 var updateMouseState = exports.updateMouseState = function updateMouseState(mouseData) {
   return (0, _pluginFactory.createCommand)({
@@ -117,19 +123,21 @@ var setSelectedAnnotation = exports.setSelectedAnnotation = function setSelected
     }
   });
 };
-var createAnnotation = exports.createAnnotation = function createAnnotation(id) {
-  var annotationType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _adfSchema.AnnotationTypes.INLINE_COMMENT;
-  return function (state, dispatch) {
-    // don't try to add if there are is no temp highlight bookmarked
-    var _ref = (0, _utils.getPluginState)(state) || {},
-      bookmark = _ref.bookmark;
-    if (!bookmark || !dispatch) {
+var createAnnotation = exports.createAnnotation = function createAnnotation(editorAnalyticsAPI) {
+  return function (id) {
+    var annotationType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _adfSchema.AnnotationTypes.INLINE_COMMENT;
+    return function (state, dispatch) {
+      // don't try to add if there are is no temp highlight bookmarked
+      var _ref = (0, _utils.getPluginState)(state) || {},
+        bookmark = _ref.bookmark;
+      if (!bookmark || !dispatch) {
+        return false;
+      }
+      if (annotationType === _adfSchema.AnnotationTypes.INLINE_COMMENT) {
+        return addInlineComment(editorAnalyticsAPI)(id)(state, dispatch);
+      }
       return false;
-    }
-    if (annotationType === _adfSchema.AnnotationTypes.INLINE_COMMENT) {
-      return addInlineComment(id)(state, dispatch);
-    }
-    return false;
+    };
   };
 };
 var setInlineCommentsVisibility = exports.setInlineCommentsVisibility = function setInlineCommentsVisibility(isVisible) {

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

@@ -7,13 +7,12 @@ exports.default = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _utils = require("../../analytics/utils");
-var _utils2 = require("../utils");
+var _utils = require("../utils");
 var _mark = require("@atlaskit/editor-common/mark");
 var addAnnotationMark = function addAnnotationMark(id) {
   return function (transaction, state) {
-    var inlineCommentState = (0, _utils2.getPluginState)(state);
-    var _getSelectionPosition = (0, _utils2.getSelectionPositions)(state, inlineCommentState),
+    var inlineCommentState = (0, _utils.getPluginState)(state);
+    var _getSelectionPosition = (0, _utils.getSelectionPositions)(state, inlineCommentState),
       from = _getSelectionPosition.from,
       to = _getSelectionPosition.to,
       head = _getSelectionPosition.head;
@@ -28,43 +27,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, _analytics.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, _analytics.INPUT_METHOD.TOOLBAR)(tr, state);
+      return tr;
+    };
   };
 };
-var addOpenCloseAnalytics = function addOpenCloseAnalytics(drafting) {
-  var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
-  return function (transaction, state) {
-    var draftingPayload = (0, _utils2.getDraftCommandAnalyticsPayload)(drafting, method)(state);
-    return (0, _utils.addAnalytics)(state, transaction, draftingPayload);
+var addOpenCloseAnalytics = function addOpenCloseAnalytics(editorAnalyticsAPI) {
+  return function (drafting) {
+    var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
+    return function (transaction, state) {
+      var draftingPayload = (0, _utils.getDraftCommandAnalyticsPayload)(drafting, method)(state);
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(draftingPayload)(transaction);
+      return transaction;
+    };
   };
 };
-var addInsertAnalytics = function addInsertAnalytics(transaction, state) {
-  return (0, _utils.addAnalytics)(state, transaction, {
-    action: _analytics.ACTION.INSERTED,
-    actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
-    eventType: _analytics.EVENT_TYPE.TRACK,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT
-  });
-};
-var addResolveAnalytics = function addResolveAnalytics(method) {
+var addInsertAnalytics = function addInsertAnalytics(editorAnalyticsAPI) {
   return function (transaction, state) {
-    var resolvedPayload = {
-      action: _analytics.ACTION.RESOLVED,
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
+      action: _analytics.ACTION.INSERTED,
       actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
       eventType: _analytics.EVENT_TYPE.TRACK,
-      attributes: {
-        method: method
-      }
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT
+    })(transaction);
+    return transaction;
+  };
+};
+var addResolveAnalytics = function addResolveAnalytics(editorAnalyticsAPI) {
+  return function (method) {
+    return function (transaction, state) {
+      var resolvedPayload = {
+        action: _analytics.ACTION.RESOLVED,
+        actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
+        actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
+        eventType: _analytics.EVENT_TYPE.TRACK,
+        attributes: {
+          method: method
+        }
+      };
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(resolvedPayload)(transaction);
+      return transaction;
     };
-    return (0, _utils.addAnalytics)(state, transaction, resolvedPayload);
   };
 };
 var _default = exports.default = {

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

@@ -46,11 +46,13 @@ var annotationPlugin = function annotationPlugin(_ref) {
             portalProviderAPI = _ref2.portalProviderAPI,
             eventDispatcher = _ref2.eventDispatcher;
           if (annotationProviders) {
+            var _api$analytics;
             return (0, _inlineComment.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;
@@ -59,7 +61,8 @@ var annotationPlugin = function annotationPlugin(_ref) {
         name: 'annotationKeymap',
         plugin: function plugin() {
           if (annotationProviders) {
-            return (0, _keymap.keymapPlugin)();
+            var _api$analytics2;
+            return (0, _keymap.keymapPlugin)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
           }
           return;
         }
@@ -72,8 +75,9 @@ var annotationPlugin = function annotationPlugin(_ref) {
         }
         var pluginState = (0, _utils.getPluginState)(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
+          var _api$analytics3;
           var isToolbarAbove = annotationProviders.inlineComment.isToolbarAbove;
-          return (0, _toolbar.buildToolbar)(state, intl, isToolbarAbove);
+          return (0, _toolbar.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) {
@@ -82,8 +86,9 @@ var annotationPlugin = function annotationPlugin(_ref) {
         }
         var pluginState = (0, _utils.getPluginState)(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
+          var _api$analytics4;
           var isToolbarAbove = annotationProviders.inlineComment.isToolbarAbove;
-          return (0, _toolbar.buildToolbar)(state, intl, isToolbarAbove);
+          return (0, _toolbar.buildToolbar)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(state, intl, isToolbarAbove);
         }
       }
     },
@@ -103,6 +108,7 @@ var annotationPlugin = function annotationPlugin(_ref) {
   };
 };
 function AnnotationContentComponent(_ref4) {
+  var _api$analytics5;
   var api = _ref4.api,
     editorView = _ref4.editorView,
     annotationProviders = _ref4.annotationProviders,
@@ -117,7 +123,8 @@ function AnnotationContentComponent(_ref4) {
   }, /*#__PURE__*/_react.default.createElement(_InlineCommentView.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
   }));
 }
 var _default = exports.default = annotationPlugin;

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

@@ -47,7 +47,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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(provider, annotationIds, editorView) {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(provider, annotationIds, editorView, editorAnalyticsAPI) {
     var inlineCommentStates;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -63,7 +63,7 @@ var fetchState = /*#__PURE__*/function () {
         case 4:
           inlineCommentStates = _context2.sent;
           if (editorView.dispatch) {
-            (0, _commands.updateInlineCommentResolvedState)(inlineCommentStates)(editorView.state, editorView.dispatch);
+            (0, _commands.updateInlineCommentResolvedState)(editorAnalyticsAPI)(inlineCommentStates)(editorView.state, editorView.dispatch);
           }
         case 6:
         case "end":
@@ -71,7 +71,7 @@ var fetchState = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function fetchState(_x3, _x4, _x5) {
+  return function fetchState(_x3, _x4, _x5, _x6) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -97,14 +97,18 @@ var hideToolbar = function hideToolbar(state, dispatch) {
 };
 
 // Subscribe to updates from consumer
-var onResolve = function onResolve(state, dispatch) {
-  return function (annotationId) {
-    (0, _commands.updateInlineCommentResolvedState)((0, _defineProperty2.default)({}, annotationId, true), _inlineCommentEvents.RESOLVE_METHOD.CONSUMER)(state, dispatch);
+var onResolve = function onResolve(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    return function (annotationId) {
+      (0, _commands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, annotationId, true), _inlineCommentEvents.RESOLVE_METHOD.CONSUMER)(state, dispatch);
+    };
   };
 };
-var onUnResolve = function onUnResolve(state, dispatch) {
-  return function (annotationId) {
-    (0, _commands.updateInlineCommentResolvedState)((0, _defineProperty2.default)({}, annotationId, false))(state, dispatch);
+var onUnResolve = function onUnResolve(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    return function (annotationId) {
+      (0, _commands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, annotationId, false))(state, dispatch);
+    };
   };
 };
 var onMouseUp = function onMouseUp(state, dispatch) {
@@ -142,12 +146,12 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
     view: function view(editorView) {
       // Get initial state
       // Need to pass `editorView` to mitigate editor state going stale
-      fetchState(provider, (0, _utils.getAllAnnotations)(editorView.state.doc), editorView);
+      fetchState(provider, (0, _utils.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);
@@ -175,7 +179,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
             return;
           }
           (0, _commands.clearDirtyMark)()(view.state, view.dispatch);
-          fetchState(provider, (0, _utils.getAllAnnotations)(view.state.doc), view);
+          fetchState(provider, (0, _utils.getAllAnnotations)(view.state.doc), view, options.editorAnalyticsAPI);
         },
         destroy: function destroy() {
           editorView.root.removeEventListener('mouseup', mouseUp);

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

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

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

@@ -13,45 +13,47 @@ var _types = require("./types");
 var _utils = require("./utils");
 var _messages = require("@atlaskit/editor-common/messages");
 var _utils2 = require("@atlaskit/editor-common/utils");
-var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl) {
-  var isToolbarAbove = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var schema = state.schema;
-  var selectionValid = (0, _utils.isSelectionValid)(state);
-  if (selectionValid === _types.AnnotationSelectionType.INVALID) {
-    return undefined;
-  }
-  var createCommentMessage = intl.formatMessage(_messages.annotationMessages.createComment);
-  var commentDisabledMessage = intl.formatMessage(_messages.annotationMessages.createCommentInvalid);
-  var createComment = {
-    type: 'button',
-    showTitle: true,
-    disabled: selectionValid === _types.AnnotationSelectionType.DISABLED,
-    testId: _types.AnnotationTestIds.floatingToolbarCreateButton,
-    icon: _comment.default,
-    tooltipContent: selectionValid === _types.AnnotationSelectionType.DISABLED ? commentDisabledMessage : /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
-      description: createCommentMessage,
-      keymap: _keymaps.addInlineComment
-    }),
-    title: createCommentMessage,
-    onClick: function onClick(state, dispatch) {
-      return (0, _commands.setInlineCommentDraftState)(true)(state, dispatch);
+var buildToolbar = exports.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 = (0, _utils.isSelectionValid)(state);
+    if (selectionValid === _types.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(_messages.annotationMessages.toolbar);
-  var calcToolbarPosition = isToolbarAbove ? _utils2.calculateToolbarPositionAboveSelection : _utils2.calculateToolbarPositionTrackHead;
-  var onPositionCalculated = calcToolbarPosition(toolbarTitle);
-  return {
-    title: toolbarTitle,
-    nodeType: validNodes,
-    items: [createComment],
-    onPositionCalculated: onPositionCalculated
+    var createCommentMessage = intl.formatMessage(_messages.annotationMessages.createComment);
+    var commentDisabledMessage = intl.formatMessage(_messages.annotationMessages.createCommentInvalid);
+    var createComment = {
+      type: 'button',
+      showTitle: true,
+      disabled: selectionValid === _types.AnnotationSelectionType.DISABLED,
+      testId: _types.AnnotationTestIds.floatingToolbarCreateButton,
+      icon: _comment.default,
+      tooltipContent: selectionValid === _types.AnnotationSelectionType.DISABLED ? commentDisabledMessage : /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
+        description: createCommentMessage,
+        keymap: _keymaps.addInlineComment
+      }),
+      title: createCommentMessage,
+      onClick: function onClick(state, dispatch) {
+        return (0, _commands.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(_messages.annotationMessages.toolbar);
+    var calcToolbarPosition = isToolbarAbove ? _utils2.calculateToolbarPositionAboveSelection : _utils2.calculateToolbarPositionTrackHead;
+    var onPositionCalculated = calcToolbarPosition(toolbarTitle);
+    return {
+      title: toolbarTitle,
+      nodeType: validNodes,
+      items: [createComment],
+      onPositionCalculated: onPositionCalculated
+    };
   };
 };

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

@@ -34,6 +34,7 @@ var findPosForDOM = function findPosForDOM(sel) {
 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;
@@ -93,11 +94,11 @@ function InlineCommentView(_ref) {
       dom: dom,
       textSelection: textSelection,
       onCreate: function onCreate(id) {
-        (0, _commands.createAnnotation)(id)(editorView.state, editorView.dispatch);
+        (0, _commands.createAnnotation)(editorAnalyticsAPI)(id)(editorView.state, editorView.dispatch);
         !editorView.hasFocus() && editorView.focus();
       },
       onClose: function onClose() {
-        (0, _commands.setInlineCommentDraftState)(false)(editorView.state, editorView.dispatch);
+        (0, _commands.setInlineCommentDraftState)(editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
         !editorView.hasFocus() && editorView.focus();
       }
     }));
@@ -142,7 +143,7 @@ function InlineCommentView(_ref) {
       return (0, _commands.removeInlineCommentNearSelection)(id)(state, dispatch);
     },
     onResolve: function onResolve(id) {
-      return (0, _commands.updateInlineCommentResolvedState)((0, _defineProperty2.default)({}, id, true), _inlineCommentEvents.RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch);
+      return (0, _commands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, id, true), _inlineCommentEvents.RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch);
     },
     onClose: function onClose() {
       (0, _commands.closeComponent)()(editorView.state, editorView.dispatch);

package/dist/cjs/plugins/index.js

@@ -89,12 +89,6 @@ Object.defineProperty(exports, "extensionPlugin", {
     return _extension.default;
   }
 });
-Object.defineProperty(exports, "fakeTextCursorPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _fakeTextCursor.default;
-  }
-});
 Object.defineProperty(exports, "feedbackDialogPlugin", {
   enumerable: true,
   get: function get() {
@@ -107,12 +101,6 @@ Object.defineProperty(exports, "findReplacePlugin", {
     return _findReplace.default;
   }
 });
-Object.defineProperty(exports, "fragmentMarkPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _fragment.default;
-  }
-});
 Object.defineProperty(exports, "indentationPlugin", {
   enumerable: true,
   get: function get() {
@@ -213,7 +201,6 @@ var _clearMarksOnChangeToEmptyDocument = _interopRequireDefault(require("./clear
 var _codeBlock = _interopRequireDefault(require("./code-block"));
 var _collabEdit = _interopRequireDefault(require("./collab-edit"));
 var _extension = _interopRequireDefault(require("./extension"));
-var _fakeTextCursor = _interopRequireDefault(require("./fake-text-cursor"));
 var _insertBlock = _interopRequireDefault(require("./insert-block"));
 var _jiraIssue = _interopRequireDefault(require("./jira-issue"));
 var _layout = _interopRequireDefault(require("./layout"));
@@ -227,7 +214,6 @@ var _tasksAndDecisions = _interopRequireDefault(require("./tasks-and-decisions")
 var _breakout = _interopRequireDefault(require("./breakout"));
 var _alignment = _interopRequireDefault(require("./alignment"));
 var _dataConsumer = _interopRequireDefault(require("./data-consumer"));
-var _fragment = _interopRequireDefault(require("./fragment"));
 var _indentation = _interopRequireDefault(require("./indentation"));
 var _annotation = _interopRequireDefault(require("./annotation"));
 var _analytics = _interopRequireDefault(require("./analytics"));

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

@@ -4,10 +4,17 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "FakeTextCursorSelection", {
+  enumerable: true,
+  get: function get() {
+    return _cursor.FakeTextCursorSelection;
+  }
+});
 Object.defineProperty(exports, "placeholderTextPlugin", {
   enumerable: true,
   get: function get() {
     return _plugin.default;
   }
 });
-var _plugin = _interopRequireDefault(require("./plugin"));
+var _plugin = _interopRequireDefault(require("./plugin"));
+var _cursor = require("./fake-text-cursor/cursor");

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

@@ -13,7 +13,7 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _text = _interopRequireDefault(require("@atlaskit/icon/glyph/media-services/text"));
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _utils = require("@atlaskit/editor-common/utils");
-var _cursor = require("../fake-text-cursor/cursor");
+var _cursor = require("./fake-text-cursor/cursor");
 var _PlaceholderFloatingToolbar = _interopRequireDefault(require("./ui/PlaceholderFloatingToolbar"));
 var _actions = require("./actions");
 var _placeholderTextNodeview = require("./placeholder-text-nodeview");
@@ -100,6 +100,7 @@ function createPlugin(dispatch, options, api) {
       return;
     },
     props: {
+      decorations: _cursor.drawFakeTextCursor,
       handleDOMEvents: {
         beforeinput: function beforeinput(view, event) {
           var state = view.state;

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

@@ -10,4 +10,4 @@ var _react = require("@emotion/react");
 var _colors = require("@atlaskit/theme/colors");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _templateObject;
-var placeholderTextStyles = exports.placeholderTextStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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(_colors.N200, ")"), "var(--ds-text-subtlest, ".concat(_colors.N200, ")"), "var(--ds-text-subtlest, ".concat(_colors.N200, ")"), _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.Background]), "var(--ds-text-subtlest, ".concat(_colors.N200, ")"));
+var placeholderTextStyles = exports.placeholderTextStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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(_colors.N200, ")"), "var(--ds-text-subtlest, ".concat(_colors.N200, ")"), "var(--ds-text-subtlest, ".concat(_colors.N200, ")"), _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.Background]), "var(--ds-text-subtlest, ".concat(_colors.N200, ")"), "var(--ds-border, rgba(0, 0, 0, 0.4))", "var(--ds-background-selected, ".concat(_colors.B75, ")"));