@atlaskit/editor-plugin-annotation 26.0.4 → 26.0.5

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.keymapPlugin = keymapPlugin;
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _editorCommands = require("../editor-commands");
@@ -14,6 +14,6 @@ function keymapPlugin(api) {
   (0, _keymaps.bindKeymapWithCommand)(
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  _keymaps.addInlineComment.common, (0, _editorCommands.setInlineCommentDraftState)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, undefined, api)(true, _analytics.INPUT_METHOD.SHORTCUT), list);
+  _keymaps.addInlineComment.common, (0, _editorCommands.setInlineCommentDraftState)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, undefined, api)(true, _enums.INPUT_METHOD.SHORTCUT), list);
   return (0, _keymap.keymap)(list);
 }

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

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.shouldClearBookMarkCheck = exports.createPluginState = exports.createCommand = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _utils = require("@atlaskit/editor-common/utils");
+var _pluginStateFactory = require("@atlaskit/editor-common/utils/plugin-state-factory");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _reducer = _interopRequireDefault(require("./reducer"));
-var _utils2 = require("./utils");
+var _utils = require("./utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
@@ -119,12 +119,12 @@ var getSelectionChangeHandlerOld = function getSelectionChangeHandlerOld(reopenC
     if (
     // If pluginState.selectedAnnotations is annotations of block node, i.e. when a new comment is created,
     // we keep it as it is so that we can show comment view component with the newly created comment
-    (0, _utils2.isBlockNodeAnnotationsSelected)(tr.selection, pluginState.selectedAnnotations)) {
+    (0, _utils.isBlockNodeAnnotationsSelected)(tr.selection, pluginState.selectedAnnotations)) {
       return _objectSpread(_objectSpread({}, pluginState), reopenCommentView && {
         isInlineCommentViewClosed: false
       });
     }
-    var selectedAnnotations = (0, _utils2.findAnnotationsInSelection)(tr.selection, tr.doc);
+    var selectedAnnotations = (0, _utils.findAnnotationsInSelection)(tr.selection, tr.doc);
     if (selectedAnnotations.length === 0) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         selectedAnnotations: selectedAnnotations,
@@ -132,7 +132,7 @@ var getSelectionChangeHandlerOld = function getSelectionChangeHandlerOld(reopenC
         selectAnnotationMethod: undefined
       });
     }
-    if ((0, _utils2.isSelectedAnnotationsChanged)(selectedAnnotations, pluginState.selectedAnnotations)) {
+    if ((0, _utils.isSelectedAnnotationsChanged)(selectedAnnotations, pluginState.selectedAnnotations)) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         selectedAnnotations: selectedAnnotations,
         selectAnnotationMethod: undefined
@@ -156,7 +156,7 @@ var getSelectionChangeHandlerNew = function getSelectionChangeHandlerNew(reopenC
         isInlineCommentViewClosed: false
       });
     }
-    var selectedAnnotations = (0, _utils2.findAnnotationsInSelection)(tr.selection, tr.doc);
+    var selectedAnnotations = (0, _utils.findAnnotationsInSelection)(tr.selection, tr.doc);
 
     // NOTE: I've left this commented code here as a reference that the previous old code would reset the selected annotations
     // if the selection is empty. If this is no longer needed, we can remove this code.
@@ -171,7 +171,7 @@ var getSelectionChangeHandlerNew = function getSelectionChangeHandlerNew(reopenC
     // 	};
     // }
 
-    if ((0, _utils2.isSelectedAnnotationsChanged)(selectedAnnotations, pluginState.pendingSelectedAnnotations)) {
+    if ((0, _utils.isSelectedAnnotationsChanged)(selectedAnnotations, pluginState.pendingSelectedAnnotations)) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         pendingSelectedAnnotations: selectedAnnotations,
         pendingSelectedAnnotationsUpdateCount: pluginState.pendingSelectedAnnotationsUpdateCount + 1
@@ -198,7 +198,7 @@ var getSelectionChangedHandler = function getSelectionChangedHandler(reopenComme
 
 // Create the handler with cache once at module level
 var handleDocChangedWithSync = createHandleDocChanged();
-var dest = (0, _utils.pluginFactory)(_utils2.inlineCommentPluginKey, _reducer.default, {
+var dest = (0, _pluginStateFactory.pluginFactory)(_utils.inlineCommentPluginKey, _reducer.default, {
   onSelectionChanged: getSelectionChangedHandler(true),
   onDocChanged: handleDocChangedWithSync,
   mapping: function mapping(tr, pluginState, editorState) {
@@ -211,7 +211,7 @@ var dest = (0, _utils.pluginFactory)(_utils2.inlineCommentPluginKey, _reducer.de
       mappedDecorationSet = draftDecorationSet.map(tr.mapping, tr.doc);
     }
     hasMappedDecorations = mappedDecorationSet.find(undefined, undefined, function (spec) {
-      return Object.values(_utils2.decorationKey).includes(spec.key);
+      return Object.values(_utils.decorationKey).includes(spec.key);
     }).length > 0;
 
     // When changes to decoration target make decoration invalid (e.g. delete text, add mark to node),

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

@@ -6,17 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.shouldSuppressFloatingToolbar = exports.buildToolbar = exports.buildSuppressedToolbar = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _generalEvents = require("@atlaskit/editor-common/analytics/types/general-events");
+var _isOfflineMode = require("@atlaskit/editor-common/connectivity/isOfflineMode");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _mediaSingle = require("@atlaskit/editor-common/media-single");
-var _messages = require("@atlaskit/editor-common/messages");
-var _utils = require("@atlaskit/editor-common/utils");
-var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
+var _annotation = require("@atlaskit/editor-common/messages/annotation");
+var _annotation2 = require("@atlaskit/editor-common/utils/annotation");
+var _calculateToolbarPosition = require("@atlaskit/editor-common/utils/calculate-toolbar-position");
 var _comment = _interopRequireDefault(require("@atlaskit/icon/core/comment"));
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _editorCommands = require("../editor-commands");
 var _types = require("../types");
-var _utils2 = require("./utils");
+var _utils = require("./utils");
 var getValidNodes = function getValidNodes(state) {
   var schema = state.schema;
   var annotation = schema.marks.annotation;
@@ -74,24 +76,24 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
         return true;
       } : _ref2$getCanAddCommen,
       contentType = _ref2.contentType;
-    var selectionValid = (0, _utils2.isSelectionValid)(state);
+    var selectionValid = (0, _utils.isSelectionValid)(state);
     var isMediaSelected = (0, _mediaSingle.currentMediaNodeWithPos)(state);
 
     // comments on media can only be added via media floating toolbar
     if (isMediaSelected || selectionValid === _types.AnnotationSelectionType.INVALID) {
       return undefined;
     }
-    var createCommentMessage = intl.formatMessage(_messages.annotationMessages.createComment);
-    var commentDisabledMessage = intl.formatMessage((0, _fg.fg)('editor_inline_comments_on_inline_nodes') ? _messages.annotationMessages.createCommentDisabled : _messages.annotationMessages.createCommentInvalid);
+    var createCommentMessage = intl.formatMessage(_annotation.annotationMessages.createComment);
+    var commentDisabledMessage = intl.formatMessage((0, _fg.fg)('editor_inline_comments_on_inline_nodes') ? _annotation.annotationMessages.createCommentDisabled : _annotation.annotationMessages.createCommentInvalid);
     var canAddComments = getCanAddComments();
     var isCommentButtonDisabled = !canAddComments || selectionValid === _types.AnnotationSelectionType.DISABLED;
-    var disabledTooltipContent = !canAddComments ? intl.formatMessage(_messages.annotationMessages.noPermissionToAddComment, {
+    var disabledTooltipContent = !canAddComments ? intl.formatMessage(_annotation.annotationMessages.noPermissionToAddComment, {
       contentType: contentType
     }) : commentDisabledMessage;
     var createComment = {
       type: 'button',
       showTitle: true,
-      disabled: isCommentButtonDisabled || (0, _editorPluginConnectivity.isOfflineMode)(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode),
+      disabled: isCommentButtonDisabled || (0, _isOfflineMode.isOfflineMode)(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode),
       testId: _types.AnnotationTestIds.floatingToolbarCreateButton,
       interactionName: 'start-inline-comment-action',
       icon: _comment.default,
@@ -106,35 +108,35 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
         onCommentButtonMount && onCommentButtonMount();
 
         // Check if the selection includes an non-text inline node
-        var inlineCommentPluginState = (0, _utils2.getPluginState)(state);
-        var inlineNodeNames = (_getRangeInlineNodeNa = (0, _utils.getRangeInlineNodeNames)({
+        var inlineCommentPluginState = (0, _utils.getPluginState)(state);
+        var inlineNodeNames = (_getRangeInlineNodeNa = (0, _annotation2.getRangeInlineNodeNames)({
           doc: state.doc,
-          pos: (0, _utils2.resolveDraftBookmark)(state, inlineCommentPluginState === null || inlineCommentPluginState === void 0 ? void 0 : inlineCommentPluginState.bookmark)
+          pos: (0, _utils.resolveDraftBookmark)(state, inlineCommentPluginState === null || inlineCommentPluginState === void 0 ? void 0 : inlineCommentPluginState.bookmark)
         })) !== null && _getRangeInlineNodeNa !== void 0 ? _getRangeInlineNodeNa : [];
         var isNonTextInlineNodeInludedInComment = inlineNodeNames.filter(function (nodeName) {
           return nodeName !== 'text';
         }).length > 0;
         if (editorAnalyticsAPI) {
           editorAnalyticsAPI.fireAnalyticsEvent({
-            action: _analytics.ACTION.VIEWED,
-            actionSubject: _analytics.ACTION_SUBJECT.BUTTON,
-            actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
-            eventType: _analytics.EVENT_TYPE.UI,
+            action: _enums.ACTION.VIEWED,
+            actionSubject: _enums.ACTION_SUBJECT.BUTTON,
+            actionSubjectId: _enums.ACTION_SUBJECT_ID.INLINE_COMMENT,
+            eventType: _enums.EVENT_TYPE.UI,
             attributes: {
               isNonTextInlineNodeInludedInComment: isNonTextInlineNodeInludedInComment,
               isDisabled: selectionValid === _types.AnnotationSelectionType.DISABLED,
-              inputMethod: _analytics.INPUT_METHOD.FLOATING_TB,
-              mode: _analytics.MODE.EDITOR
+              inputMethod: _enums.INPUT_METHOD.FLOATING_TB,
+              mode: _generalEvents.MODE.EDITOR
             }
           });
         }
       },
       onClick: function onClick(state, dispatch) {
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.fireAnalyticsEvent({
-          action: _analytics.ACTION.CLICKED,
-          actionSubject: _analytics.ACTION_SUBJECT.BUTTON,
-          actionSubjectId: _analytics.ACTION_SUBJECT_ID.CREATE_INLINE_COMMENT_FROM_HIGHLIGHT_ACTIONS_MENU,
-          eventType: _analytics.EVENT_TYPE.UI,
+          action: _enums.ACTION.CLICKED,
+          actionSubject: _enums.ACTION_SUBJECT.BUTTON,
+          actionSubjectId: _enums.ACTION_SUBJECT_ID.CREATE_INLINE_COMMENT_FROM_HIGHLIGHT_ACTIONS_MENU,
+          eventType: _enums.EVENT_TYPE.UI,
           attributes: {
             source: 'highlightActionsMenu',
             pageMode: 'edit'
@@ -156,10 +158,10 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
                 // Fire an analytics event to indicate that the user has clicked the button
                 // but the action was not completed, the result should contain a reason.
                 editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.fireAnalyticsEvent({
-                  action: _analytics.ACTION.ERROR,
-                  actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
-                  actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
-                  eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+                  action: _enums.ACTION.ERROR,
+                  actionSubject: _enums.ACTION_SUBJECT.ANNOTATION,
+                  actionSubjectId: _enums.ACTION_SUBJECT_ID.INLINE_COMMENT,
+                  eventType: _enums.EVENT_TYPE.OPERATIONAL,
                   attributes: {
                     errorReason: "toolbar-start-draft-failed/".concat(result.reason)
                   }
@@ -168,10 +170,10 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
             }
           }).catch(function () {
             editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.fireAnalyticsEvent({
-              action: _analytics.ACTION.ERROR,
-              actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
-              actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
-              eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+              action: _enums.ACTION.ERROR,
+              actionSubject: _enums.ACTION_SUBJECT.ANNOTATION,
+              actionSubjectId: _enums.ACTION_SUBJECT_ID.INLINE_COMMENT,
+              eventType: _enums.EVENT_TYPE.OPERATIONAL,
               attributes: {
                 errorReason: "toolbar-start-draft-preemptive-gate-error"
               }
@@ -192,8 +194,8 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
       },
       supportsViewMode: true // TODO: MODES-3950 - Clean up this floating toolbar view mode logic,
     };
-    var toolbarTitle = intl.formatMessage(_messages.annotationMessages.toolbar);
-    var calcToolbarPosition = isToolbarAbove ? _utils.calculateToolbarPositionAboveSelection : _utils.calculateToolbarPositionTrackHead;
+    var toolbarTitle = intl.formatMessage(_annotation.annotationMessages.toolbar);
+    var calcToolbarPosition = isToolbarAbove ? _calculateToolbarPosition.calculateToolbarPositionAboveSelection : _calculateToolbarPosition.calculateToolbarPositionTrackHead;
     var onPositionCalculated = calcToolbarPosition(toolbarTitle);
     return {
       title: toolbarTitle,

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

@@ -17,10 +17,11 @@ exports.stripNonExistingAnnotations = stripNonExistingAnnotations;
 exports.surroundingMarks = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _annotation = require("@atlaskit/adf-schema/annotation");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _mediaSingle = require("@atlaskit/editor-common/media-single");
-var _styles = require("@atlaskit/editor-common/styles");
-var _utils = require("@atlaskit/editor-common/utils");
+var _annotation2 = require("@atlaskit/editor-common/styles/annotation");
+var _annotation3 = require("@atlaskit/editor-common/utils/annotation");
+var _nodes = require("@atlaskit/editor-common/utils/nodes");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
@@ -128,13 +129,13 @@ var addDraftDecoration = exports.addDraftDecoration = function addDraftDecoratio
   var targetType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'inline';
   if (targetType === 'block') {
     return _view.Decoration.node(start, end, {
-      class: "".concat(_styles.BlockAnnotationSharedClassNames.draft)
+      class: "".concat(_annotation2.BlockAnnotationSharedClassNames.draft)
     }, {
       key: decorationKey.block
     });
   }
   return _view.Decoration.inline(start, end, {
-    class: "".concat(_styles.AnnotationSharedClassNames.draft)
+    class: "".concat(_annotation2.AnnotationSharedClassNames.draft)
   }, {
     key: decorationKey.inline
   });
@@ -268,7 +269,7 @@ var getAnnotationsInSelectionCount = function getAnnotationsInSelectionCount(sta
   var _state$selection = state.selection,
     from = _state$selection.from,
     to = _state$selection.to;
-  var annotations = (0, _utils.getAnnotationIdsFromRange)({
+  var annotations = (0, _annotation3.getAnnotationIdsFromRange)({
     from: from,
     to: to
   }, state.doc, state.schema);
@@ -290,16 +291,16 @@ var getDraftCommandAnalyticsPayload = exports.getDraftCommandAnalyticsPayload =
     if ((0, _fg.fg)('editor_inline_comments_on_inline_nodes')) {
       var _ref2 = getPluginState(state) || {},
         bookmark = _ref2.bookmark;
-      attributes.inlineNodeNames = (0, _utils.getRangeInlineNodeNames)({
+      attributes.inlineNodeNames = (0, _annotation3.getRangeInlineNodeNames)({
         doc: state.doc,
         pos: resolveDraftBookmark(state, bookmark)
       });
     }
     return {
-      action: drafting ? _analytics.ACTION.OPENED : _analytics.ACTION.CLOSED,
-      actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
-      eventType: _analytics.EVENT_TYPE.TRACK,
+      action: drafting ? _enums.ACTION.OPENED : _enums.ACTION.CLOSED,
+      actionSubject: _enums.ACTION_SUBJECT.ANNOTATION,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.INLINE_COMMENT,
+      eventType: _enums.EVENT_TYPE.TRACK,
       attributes: attributes
     };
   };
@@ -343,7 +344,7 @@ var isSelectionValid = exports.isSelectionValid = function isSelectionValid(stat
   if (disallowOnWhitespace && !isSupportedExtensionSelection && hasInvalidWhitespaceNode(selection, state.schema)) {
     return _types.AnnotationSelectionType.INVALID;
   }
-  if (!(selection instanceof _state.NodeSelection) && (0, _utils.isEmptyTextSelection)(selection, state.schema)) {
+  if (!(selection instanceof _state.NodeSelection) && (0, _annotation3.isEmptyTextSelection)(selection, state.schema)) {
     return _types.AnnotationSelectionType.INVALID;
   }
   return _types.AnnotationSelectionType.VALID;
@@ -352,7 +353,7 @@ var hasInvalidNodes = exports.hasInvalidNodes = function hasInvalidNodes(state)
   var selection = state.selection,
     doc = state.doc,
     schema = state.schema;
-  return !(0, _utils.canApplyAnnotationOnRange)({
+  return !(0, _annotation3.canApplyAnnotationOnRange)({
     from: selection.from,
     to: selection.to
   }, doc, schema);
@@ -383,7 +384,7 @@ function hasInvalidWhitespaceNode(selection, schema) {
     if (node.type === schema.nodes.inlineCard && (0, _fg.fg)('editor_inline_comments_on_inline_nodes')) {
       return false;
     }
-    if ((0, _utils.isText)(node, schema)) {
+    if ((0, _nodes.isText)(node, schema)) {
       if ((0, _fg.fg)('editor_inline_comments_on_inline_nodes')) {
         if (node.textContent.trim() !== '') {
           hasCommentableTextNodeDescendants = true;
@@ -406,7 +407,7 @@ function hasInvalidWhitespaceNode(selection, schema) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         !node.eq(content.firstChild) &&
         // and it is a paragraph node
-        (0, _utils.isParagraph)(node, schema);
+        (0, _nodes.isParagraph)(node, schema);
         if (!nodeIsTrailingNewLine) {
           foundInvalidWhitespace = true;
         }
@@ -452,7 +453,7 @@ function stripNonExistingAnnotations(slice, state) {
  * from node
  */
 function stripNonExistingAnnotationsFromNode(node, state) {
-  if ((0, _utils.hasAnnotationMark)(node, state)) {
+  if ((0, _annotation3.hasAnnotationMark)(node, state)) {
     node.marks = node.marks.filter(function (mark) {
       if (mark.type.name === 'annotation') {
         return annotationExists(mark.attrs.id, state);

package/dist/cjs/ui/CommentButton/CommentButton.js

@@ -7,21 +7,23 @@ Object.defineProperty(exports, "__esModule", {
 exports.CommentButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _annotation = require("@atlaskit/editor-common/messages/annotation");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _commentIcon = require("@atlaskit/editor-toolbar/comment-icon");
+var _toolbarButton = require("@atlaskit/editor-toolbar/toolbar-button");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _utils = require("../../pm-plugins/utils");
 var _types = require("../../types");
-var _hooks2 = require("./hooks");
+var _hooks = require("./hooks");
 var _utils2 = require("./utils");
 var CommentButton = exports.CommentButton = function CommentButton(_ref) {
   var _annotationProviders$;
   var api = _ref.api,
     annotationProviders = _ref.annotationProviders;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['annotation'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['annotation'], function (states) {
       var _states$annotationSta, _states$annotationSta2;
       return {
         isVisible: (_states$annotationSta = states.annotationState) === null || _states$annotationSta === void 0 ? void 0 : _states$annotationSta.isVisible,
@@ -30,13 +32,13 @@ var CommentButton = exports.CommentButton = function CommentButton(_ref) {
     }),
     isVisible = _useSharedPluginState.isVisible,
     bookmark = _useSharedPluginState.bookmark;
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorView = _useEditorToolbar.editorView;
   var annotationSelectionType = editorView !== null && editorView !== void 0 && editorView.state ? (0, _utils.isSelectionValid)(editorView.state) : _types.AnnotationSelectionType.INVALID;
   var _ref2 = (_annotationProviders$ = annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment) !== null && _annotationProviders$ !== void 0 ? _annotationProviders$ : {},
     getCanAddComments = _ref2.getCanAddComments,
     contentType = _ref2.contentType;
-  (0, _hooks2.useCommentButtonMount)({
+  (0, _hooks.useCommentButtonMount)({
     state: editorView === null || editorView === void 0 ? void 0 : editorView.state,
     annotationProviders: annotationProviders,
     api: api,
@@ -66,9 +68,9 @@ var CommentButton = exports.CommentButton = function CommentButton(_ref) {
     return null;
   }
   var canAddComments = getCanAddComments ? getCanAddComments() : true;
-  var commentMessage = intl.formatMessage(_messages.annotationMessages.createComment);
-  var commentDisabledMessage = intl.formatMessage((0, _fg.fg)('editor_inline_comments_on_inline_nodes') ? _messages.annotationMessages.createCommentDisabled : _messages.annotationMessages.createCommentInvalid);
-  var noPermissionToAddCommentMessage = intl.formatMessage(_messages.annotationMessages.noPermissionToAddComment, {
+  var commentMessage = intl.formatMessage(_annotation.annotationMessages.createComment);
+  var commentDisabledMessage = intl.formatMessage((0, _fg.fg)('editor_inline_comments_on_inline_nodes') ? _annotation.annotationMessages.createCommentDisabled : _annotation.annotationMessages.createCommentInvalid);
+  var noPermissionToAddCommentMessage = intl.formatMessage(_annotation.annotationMessages.noPermissionToAddComment, {
     contentType: contentType
   });
   var _isButtonDisabled = (0, _utils2.isButtonDisabled)({
@@ -88,13 +90,13 @@ var CommentButton = exports.CommentButton = function CommentButton(_ref) {
       return undefined;
     }
   };
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
     content: isDisabled ? tooltipContentWhenDisabled() : /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
       description: commentMessage,
       keymap: _keymaps.addInlineComment
     })
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.CommentIcon, {
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_commentIcon.CommentIcon, {
       label: "",
       size: "small"
     }),

package/dist/cjs/ui/CommentButton/hooks.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useCommentButtonMount = void 0;
 var _react = require("react");
-var _utils = require("@atlaskit/editor-common/utils");
-var _utils2 = require("../../pm-plugins/utils");
-var _utils3 = require("./utils");
+var _annotation = require("@atlaskit/editor-common/utils/annotation");
+var _utils = require("../../pm-plugins/utils");
+var _utils2 = require("./utils");
 // oxlint-disable-next-line import/no-duplicates
 
 var useCommentButtonMount = exports.useCommentButtonMount = function useCommentButtonMount(_ref) {
@@ -26,16 +26,16 @@ var useCommentButtonMount = exports.useCommentButtonMount = function useCommentB
       (_annotationProviders$ = (_annotationProviders$2 = annotationProviders.inlineComment).onCommentButtonMount) === null || _annotationProviders$ === void 0 || _annotationProviders$.call(_annotationProviders$2);
     }
     // Check if the selection includes an non-text inline node
-    var inlineNodeNames = (_getRangeInlineNodeNa = (0, _utils.getRangeInlineNodeNames)({
+    var inlineNodeNames = (_getRangeInlineNodeNa = (0, _annotation.getRangeInlineNodeNames)({
       doc: state.doc,
-      pos: (0, _utils2.resolveDraftBookmark)(state, bookmark)
+      pos: (0, _utils.resolveDraftBookmark)(state, bookmark)
     })) !== null && _getRangeInlineNodeNa !== void 0 ? _getRangeInlineNodeNa : [];
     var isNonTextInlineNodeInludedInComment =
     // eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
     inlineNodeNames.filter(function (nodeName) {
       return nodeName !== 'text';
     }).length > 0;
-    (0, _utils3.fireCommentButtonViewedAnalyticsEvent)({
+    (0, _utils2.fireCommentButtonViewedAnalyticsEvent)({
       api: api,
       isNonTextInlineNodeInludedInComment: isNonTextInlineNodeInludedInComment,
       annotationSelectionType: annotationSelectionType

package/dist/cjs/ui/CommentButton/utils.js

@@ -4,9 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.startCommentExperience = exports.shouldShowCommentButton = exports.isButtonDisabled = exports.fireOnClickAnalyticsEvent = exports.fireCommentButtonViewedAnalyticsEvent = void 0;
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _generalEvents = require("@atlaskit/editor-common/analytics/types/general-events");
+var _isOfflineMode = require("@atlaskit/editor-common/connectivity/isOfflineMode");
 var _mediaSingle = require("@atlaskit/editor-common/media-single");
-var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _editorCommands = require("../../editor-commands");
 var _utils = require("../../pm-plugins/utils");
 var _types = require("../../types");
@@ -17,7 +18,7 @@ var isButtonDisabled = exports.isButtonDisabled = function isButtonDisabled(_ref
     canAddComments = _ref.canAddComments;
   var annotationSelectionType = state ? (0, _utils.isSelectionValid)(state) : _types.AnnotationSelectionType.INVALID;
   var isAnnotationSelectionInvalid = annotationSelectionType === _types.AnnotationSelectionType.DISABLED;
-  var isOffline = (0, _editorPluginConnectivity.isOfflineMode)(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode);
+  var isOffline = (0, _isOfflineMode.isOfflineMode)(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode);
   return {
     isAnnotationSelectionInvalid: isAnnotationSelectionInvalid,
     isOffline: isOffline,
@@ -46,10 +47,10 @@ var fireOnClickAnalyticsEvent = exports.fireOnClickAnalyticsEvent = function fir
   var _api$analytics;
   var api = _ref3.api;
   (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.fireAnalyticsEvent({
-    action: _analytics.ACTION.CLICKED,
-    actionSubject: _analytics.ACTION_SUBJECT.BUTTON,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.CREATE_INLINE_COMMENT_FROM_HIGHLIGHT_ACTIONS_MENU,
-    eventType: _analytics.EVENT_TYPE.UI,
+    action: _enums.ACTION.CLICKED,
+    actionSubject: _enums.ACTION_SUBJECT.BUTTON,
+    actionSubjectId: _enums.ACTION_SUBJECT_ID.CREATE_INLINE_COMMENT_FROM_HIGHLIGHT_ACTIONS_MENU,
+    eventType: _enums.EVENT_TYPE.UI,
     attributes: {
       source: 'highlightActionsMenu',
       pageMode: 'edit'
@@ -61,10 +62,10 @@ var fireAnnotationErrorAnalyticsEvent = function fireAnnotationErrorAnalyticsEve
   var api = _ref4.api,
     errorReason = _ref4.errorReason;
   (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.fireAnalyticsEvent({
-    action: _analytics.ACTION.ERROR,
-    actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
-    eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+    action: _enums.ACTION.ERROR,
+    actionSubject: _enums.ACTION_SUBJECT.ANNOTATION,
+    actionSubjectId: _enums.ACTION_SUBJECT_ID.INLINE_COMMENT,
+    eventType: _enums.EVENT_TYPE.OPERATIONAL,
     attributes: {
       errorReason: errorReason
     }
@@ -76,15 +77,15 @@ var fireCommentButtonViewedAnalyticsEvent = exports.fireCommentButtonViewedAnaly
     isNonTextInlineNodeInludedInComment = _ref5.isNonTextInlineNodeInludedInComment,
     annotationSelectionType = _ref5.annotationSelectionType;
   api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || _api$analytics3.actions.fireAnalyticsEvent({
-    action: _analytics.ACTION.VIEWED,
-    actionSubject: _analytics.ACTION_SUBJECT.BUTTON,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
-    eventType: _analytics.EVENT_TYPE.UI,
+    action: _enums.ACTION.VIEWED,
+    actionSubject: _enums.ACTION_SUBJECT.BUTTON,
+    actionSubjectId: _enums.ACTION_SUBJECT_ID.INLINE_COMMENT,
+    eventType: _enums.EVENT_TYPE.UI,
     attributes: {
       isNonTextInlineNodeInludedInComment: isNonTextInlineNodeInludedInComment,
       isDisabled: annotationSelectionType === _types.AnnotationSelectionType.DISABLED,
-      inputMethod: _analytics.INPUT_METHOD.FLOATING_TB,
-      mode: _analytics.MODE.EDITOR
+      inputMethod: _enums.INPUT_METHOD.FLOATING_TB,
+      mode: _generalEvents.MODE.EDITOR
     }
   });
 };