@atlaskit/editor-plugin-annotation 26.0.4 → 26.0.7

package/dist/cjs/ui/InlineCommentView.js

@@ -8,16 +8,17 @@ exports.InlineCommentView = InlineCommentView;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _annotation = require("@atlaskit/adf-schema/annotation");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
-var _utils = require("@atlaskit/editor-common/utils");
-var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _inlineCommentEvents = require("@atlaskit/editor-common/analytics/types/inline-comment-events");
+var _isOfflineMode = require("@atlaskit/editor-common/connectivity/isOfflineMode");
+var _useSharedPluginStateSelector = require("@atlaskit/editor-common/useSharedPluginStateSelector");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _annotation2 = require("@atlaskit/editor-common/utils/annotation");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _editorCommands = require("../editor-commands");
-var _utils3 = require("../pm-plugins/utils");
+var _utils2 = require("../pm-plugins/utils");
 var _types = require("../types");
 var _AnnotationViewWrapper = require("./AnnotationViewWrapper");
 var findPosForDOM = function findPosForDOM(sel) {
@@ -60,7 +61,7 @@ function InlineCommentView(_ref) {
     dispatch = editorView.dispatch;
   var CreateComponent = inlineCommentProvider.createComponent,
     ViewComponent = inlineCommentProvider.viewComponent;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(editorAPI, ['annotation'], selector),
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(editorAPI, ['annotation'], selector),
     annotations = _useSharedPluginState.annotations,
     bookmark = _useSharedPluginState.bookmark,
     isInlineCommentViewClosed = _useSharedPluginState.isInlineCommentViewClosed,
@@ -68,14 +69,14 @@ function InlineCommentView(_ref) {
     selectAnnotationMethod = _useSharedPluginState.selectAnnotationMethod,
     selectedAnnotations = _useSharedPluginState.selectedAnnotations,
     isAnnotationManagerEnabled = _useSharedPluginState.isAnnotationManagerEnabled;
-  var annotationsList = (0, _utils3.getAllAnnotations)(editorView.state.doc);
-  var selection = (0, _utils3.getSelectionPositions)(state, bookmark);
+  var annotationsList = (0, _utils2.getAllAnnotations)(editorView.state.doc);
+  var selection = (0, _utils2.getSelectionPositions)(state, bookmark);
   var position = findPosForDOM(selection);
   var isExtensionSelection = selection instanceof _state.NodeSelection && selection.node.type.name === 'extension';
   var dom;
   var domLookupError;
   try {
-    var domRef = (0, _utils2.findDomRefAtPos)(position, editorView.domAtPos.bind(editorView));
+    var domRef = (0, _utils.findDomRefAtPos)(position, editorView.domAtPos.bind(editorView));
     if ((0, _fg.fg)('cc_maui_annotations_on_extensions') && isExtensionSelection) {
       if (domRef instanceof HTMLElement) {
         dom = domRef;
@@ -103,11 +104,11 @@ function InlineCommentView(_ref) {
     console.warn(domLookupError);
     if (dispatchAnalyticsEvent) {
       var payload = {
-        action: _analytics.ACTION.ERRORED,
-        actionSubject: _analytics.ACTION_SUBJECT.CONTENT_COMPONENT,
-        eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+        action: _enums.ACTION.ERRORED,
+        actionSubject: _enums.ACTION_SUBJECT.CONTENT_COMPONENT,
+        eventType: _enums.EVENT_TYPE.OPERATIONAL,
         attributes: {
-          component: _analytics.CONTENT_COMPONENT.INLINE_COMMENT,
+          component: _enums.CONTENT_COMPONENT.INLINE_COMMENT,
           selection: selection.toJSON(),
           position: position,
           docSize: editorView.state.doc.nodeSize,
@@ -129,7 +130,7 @@ function InlineCommentView(_ref) {
     if (!CreateComponent) {
       return null;
     }
-    var inlineNodeTypes = (0, _utils.getRangeInlineNodeNames)({
+    var inlineNodeTypes = (0, _annotation2.getRangeInlineNodeNames)({
       doc: state.doc,
       pos: selection
     });
@@ -172,7 +173,7 @@ function InlineCommentView(_ref) {
       },
       inlineNodeTypes: inlineNodeTypes,
       isOpeningMediaCommentFromToolbar: isOpeningMediaCommentFromToolbar,
-      isOffline: (0, _editorPluginConnectivity.isOfflineMode)(networkStatusSelector)
+      isOffline: (0, _isOfflineMode.isOfflineMode)(networkStatusSelector)
     }));
   }
 
@@ -193,10 +194,10 @@ function InlineCommentView(_ref) {
 
     // fire analytics
     var payload = {
-      action: _analytics.ACTION.VIEWED,
-      actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
-      eventType: _analytics.EVENT_TYPE.TRACK,
+      action: _enums.ACTION.VIEWED,
+      actionSubject: _enums.ACTION_SUBJECT.ANNOTATION,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.INLINE_COMMENT,
+      eventType: _enums.EVENT_TYPE.TRACK,
       attributes: {
         overlap: activeAnnotations.length ? activeAnnotations.length - 1 : 0,
         targetNodeType: (_editorView$state$doc = editorView.state.doc.nodeAt(position)) === null || _editorView$state$doc === void 0 ? void 0 : _editorView$state$doc.type.name,
@@ -213,12 +214,12 @@ function InlineCommentView(_ref) {
   // that's why we will not provide it as a `inlineNodeTypes` props to the view component,
   // to speed up the rendering process.
   var getInlineNodeTypes = function getInlineNodeTypes(annotationId) {
-    return (0, _utils.getAnnotationInlineNodeTypes)(editorView.state, annotationId);
+    return (0, _annotation2.getAnnotationInlineNodeTypes)(editorView.state, annotationId);
   };
   return /*#__PURE__*/_react.default.createElement(_AnnotationViewWrapper.AnnotationViewWrapper, {
     "data-editor-popup": "true",
     "data-testid": _types.AnnotationTestIds.floatingComponent,
-    key: (0, _utils3.getAnnotationViewKey)(activeAnnotations),
+    key: (0, _utils2.getAnnotationViewKey)(activeAnnotations),
     onViewed: onAnnotationViewed
   }, /*#__PURE__*/_react.default.createElement(ViewComponent, {
     annotationsList: annotationsList,
@@ -233,7 +234,7 @@ function InlineCommentView(_ref) {
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     ,
     onResolve: function onResolve(id) {
-      return (0, _editorCommands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, id, true), _analytics.RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch);
+      return (0, _editorCommands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, id, true), _inlineCommentEvents.RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch);
     }
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     ,
@@ -241,6 +242,6 @@ function InlineCommentView(_ref) {
       (0, _editorCommands.closeComponent)()(editorView.state, editorView.dispatch);
     },
     isOpeningMediaCommentFromToolbar: isOpeningMediaCommentFromToolbar,
-    isOffline: (0, _editorPluginConnectivity.isOfflineMode)(networkStatusSelector)
+    isOffline: (0, _isOfflineMode.isOfflineMode)(networkStatusSelector)
   }));
 }

package/dist/cjs/ui/toolbar-components.js

@@ -6,32 +6,33 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getToolbarComponents = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _toolbar = require("@atlaskit/editor-common/toolbar");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _rank = require("@atlaskit/editor-common/toolbar/rank");
 var _CommentButton = require("./CommentButton/CommentButton");
 var getToolbarComponents = exports.getToolbarComponents = function getToolbarComponents(api, annotationProviders) {
   return [{
-    type: _toolbar.COLLAB_SECTION.type,
-    key: _toolbar.COLLAB_SECTION.key,
+    type: _keys.COLLAB_SECTION.type,
+    key: _keys.COLLAB_SECTION.key,
     parents: [{
       type: 'toolbar',
-      key: _toolbar.TOOLBARS.INLINE_TEXT_TOOLBAR,
-      rank: _toolbar.TOOLBAR_RANK[_toolbar.COLLAB_SECTION.key]
+      key: _keys.TOOLBARS.INLINE_TEXT_TOOLBAR,
+      rank: _rank.TOOLBAR_RANK[_keys.COLLAB_SECTION.key]
     }]
   }, {
-    type: _toolbar.COMMENT_GROUP.type,
-    key: _toolbar.COMMENT_GROUP.key,
+    type: _keys.COMMENT_GROUP.type,
+    key: _keys.COMMENT_GROUP.key,
     parents: [{
-      type: _toolbar.COLLAB_SECTION.type,
-      key: _toolbar.COLLAB_SECTION.key,
-      rank: _toolbar.TOOLBAR_RANK[_toolbar.COLLAB_SECTION.key]
+      type: _keys.COLLAB_SECTION.type,
+      key: _keys.COLLAB_SECTION.key,
+      rank: _rank.TOOLBAR_RANK[_keys.COLLAB_SECTION.key]
     }]
   }, {
-    type: _toolbar.COMMENT_HERO_BUTTON.type,
-    key: _toolbar.COMMENT_HERO_BUTTON.key,
+    type: _keys.COMMENT_HERO_BUTTON.type,
+    key: _keys.COMMENT_HERO_BUTTON.key,
     parents: [{
-      type: _toolbar.COMMENT_GROUP.type,
-      key: _toolbar.COMMENT_GROUP.key,
-      rank: _toolbar.COLLAB_SECTION_RANK[_toolbar.COMMENT_GROUP.key]
+      type: _keys.COMMENT_GROUP.type,
+      key: _keys.COMMENT_GROUP.key,
+      rank: _rank.COLLAB_SECTION_RANK[_keys.COMMENT_GROUP.key]
     }],
     component: function component() {
       return /*#__PURE__*/_react.default.createElement(_CommentButton.CommentButton, {

package/dist/es2019/annotationPlugin.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
-import { isSSR } from '@atlaskit/editor-common/core-utils';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { isSSR } from '@atlaskit/editor-common/is-ssr';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { createAnnotation, removeInlineCommentFromDoc, setInlineCommentDraftState, setSelectedAnnotation, setPendingSelectedAnnotation, showInlineCommentForBlockNode } from './editor-commands';

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

@@ -1,7 +1,8 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
 // oxlint-disable-next-line import/no-duplicates
 
-import { INPUT_METHOD, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics/types/inline-comment-events';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { createCommand } from '../pm-plugins/plugin-factory';
 import { ACTIONS } from '../pm-plugins/types';

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

@@ -1,7 +1,7 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
-import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { applyMarkOnRange } from '@atlaskit/editor-common/mark/commands';
+import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils/annotation';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { AddMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { fg } from '@atlaskit/platform-feature-flags/fg';

package/dist/es2019/nodeviews/index.js

@@ -1,4 +1,4 @@
-import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
+import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles/annotation';
 export const getAnnotationViewClassname = (isUnresolved, hasFocus, isHovered) => {
   if (!isUnresolved) {
     return;

package/dist/es2019/pm-plugins/annotation-manager-hooks.js

@@ -1,5 +1,5 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
-import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
+import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils/annotation';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { setInlineCommentDraftState, createAnnotation, setSelectedAnnotation, closeComponent, setHoveredAnnotation, removeInlineCommentFromDoc } from '../editor-commands';
 import { AnnotationSelectionType } from '../types';

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

@@ -1,7 +1,7 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
-import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
+import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics/types/inline-comment-events';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { getAnnotationInlineNodeTypes } from '@atlaskit/editor-common/utils';
+import { getAnnotationInlineNodeTypes } from '@atlaskit/editor-common/utils/annotation';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { clearDirtyMark, closeComponent, setHoveredAnnotation, setInlineCommentsVisibility, setSelectedAnnotation, flushPendingSelections, updateInlineCommentResolvedState, updateMouseState, setPendingSelectedAnnotation, setInlineCommentDraftState, setInlineCommentsFetched } from '../editor-commands';

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

@@ -1,4 +1,4 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { addInlineComment, bindKeymapWithCommand } from '@atlaskit/editor-common/keymaps';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { setInlineCommentDraftState } from '../editor-commands';

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

@@ -1,4 +1,4 @@
-import { pluginFactory } from '@atlaskit/editor-common/utils';
+import { pluginFactory } from '@atlaskit/editor-common/utils/plugin-state-factory';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import reducer from './reducer';

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

@@ -1,10 +1,12 @@
 import React from 'react';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MODE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { MODE } from '@atlaskit/editor-common/analytics/types/general-events';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
 import { ToolTipContent, addInlineComment } from '@atlaskit/editor-common/keymaps';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
-import { annotationMessages } from '@atlaskit/editor-common/messages';
-import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
+import { annotationMessages } from '@atlaskit/editor-common/messages/annotation';
+import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils/annotation';
+import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils/calculate-toolbar-position';
 import CommentIcon from '@atlaskit/icon/core/comment';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { setInlineCommentDraftState } from '../editor-commands';

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

@@ -1,8 +1,9 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
-import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
-import { canApplyAnnotationOnRange, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isEmptyTextSelection, isParagraph, isText } from '@atlaskit/editor-common/utils';
+import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles/annotation';
+import { canApplyAnnotationOnRange, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isEmptyTextSelection } from '@atlaskit/editor-common/utils/annotation';
+import { isParagraph, isText } from '@atlaskit/editor-common/utils/nodes';
 import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';

package/dist/es2019/ui/CommentButton/CommentButton.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ToolTipContent, addInlineComment } from '@atlaskit/editor-common/keymaps';
-import { annotationMessages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { ToolbarButton, CommentIcon as NewCommentIcon, ToolbarTooltip } from '@atlaskit/editor-toolbar';
+import { annotationMessages } from '@atlaskit/editor-common/messages/annotation';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { CommentIcon as NewCommentIcon } from '@atlaskit/editor-toolbar/comment-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { isSelectionValid } from '../../pm-plugins/utils';
 import { AnnotationSelectionType, AnnotationTestIds } from '../../types';

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

@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
+import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils/annotation';
 import { resolveDraftBookmark } from '../../pm-plugins/utils';
 // oxlint-disable-next-line import/no-duplicates
 

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

@@ -1,6 +1,7 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MODE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { MODE } from '@atlaskit/editor-common/analytics/types/general-events';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { setInlineCommentDraftState } from '../../editor-commands';
 import { inlineCommentPluginKey, isSelectionValid } from '../../pm-plugins/utils';
 import { AnnotationSelectionType } from '../../types';

package/dist/es2019/ui/InlineCommentView.js

@@ -1,10 +1,11 @@
 import React from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
+import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics/types/inline-comment-events';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/useSharedPluginStateSelector';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils/annotation';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags/fg';

package/dist/es2019/ui/toolbar-components.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import { TOOLBARS, COLLAB_SECTION, TOOLBAR_RANK, COMMENT_GROUP, COLLAB_SECTION_RANK, COMMENT_HERO_BUTTON } from '@atlaskit/editor-common/toolbar';
+import { TOOLBARS, COLLAB_SECTION, COMMENT_GROUP, COMMENT_HERO_BUTTON } from '@atlaskit/editor-common/toolbar/keys';
+import { TOOLBAR_RANK, COLLAB_SECTION_RANK } from '@atlaskit/editor-common/toolbar/rank';
 import { CommentButton } from './CommentButton/CommentButton';
 export const getToolbarComponents = (api, annotationProviders) => {
   return [{

package/dist/esm/annotationPlugin.js

@@ -5,8 +5,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
-import { isSSR } from '@atlaskit/editor-common/core-utils';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { isSSR } from '@atlaskit/editor-common/is-ssr';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { createAnnotation, removeInlineCommentFromDoc, setInlineCommentDraftState, setSelectedAnnotation, setPendingSelectedAnnotation, showInlineCommentForBlockNode } from './editor-commands';

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

@@ -2,7 +2,8 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
 // oxlint-disable-next-line import/no-duplicates
 
-import { INPUT_METHOD, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics/types/inline-comment-events';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { createCommand } from '../pm-plugins/plugin-factory';
 import { ACTIONS } from '../pm-plugins/types';

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

@@ -1,7 +1,7 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
-import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { applyMarkOnRange } from '@atlaskit/editor-common/mark/commands';
+import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils/annotation';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { AddMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { fg } from '@atlaskit/platform-feature-flags/fg';

package/dist/esm/nodeviews/index.js

@@ -1,4 +1,4 @@
-import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
+import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles/annotation';
 export var getAnnotationViewClassname = function getAnnotationViewClassname(isUnresolved, hasFocus, isHovered) {
   if (!isUnresolved) {
     return;

package/dist/esm/pm-plugins/annotation-manager-hooks.js

@@ -1,5 +1,5 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
-import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
+import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils/annotation';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { setInlineCommentDraftState, createAnnotation, setSelectedAnnotation, closeComponent, setHoveredAnnotation, removeInlineCommentFromDoc } from '../editor-commands';
 import { AnnotationSelectionType } from '../types';

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

@@ -2,9 +2,9 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
-import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
+import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics/types/inline-comment-events';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { getAnnotationInlineNodeTypes } from '@atlaskit/editor-common/utils';
+import { getAnnotationInlineNodeTypes } from '@atlaskit/editor-common/utils/annotation';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { clearDirtyMark, closeComponent, setHoveredAnnotation, setInlineCommentsVisibility, setSelectedAnnotation, flushPendingSelections, updateInlineCommentResolvedState, updateMouseState, setPendingSelectedAnnotation, setInlineCommentDraftState, setInlineCommentsFetched } from '../editor-commands';

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

@@ -1,4 +1,4 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { addInlineComment, bindKeymapWithCommand } from '@atlaskit/editor-common/keymaps';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { setInlineCommentDraftState } from '../editor-commands';

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

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { pluginFactory } from '@atlaskit/editor-common/utils';
+import { pluginFactory } from '@atlaskit/editor-common/utils/plugin-state-factory';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import reducer from './reducer';

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

@@ -1,10 +1,12 @@
 import React from 'react';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MODE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { MODE } from '@atlaskit/editor-common/analytics/types/general-events';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
 import { ToolTipContent, addInlineComment } from '@atlaskit/editor-common/keymaps';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
-import { annotationMessages } from '@atlaskit/editor-common/messages';
-import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
+import { annotationMessages } from '@atlaskit/editor-common/messages/annotation';
+import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils/annotation';
+import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils/calculate-toolbar-position';
 import CommentIcon from '@atlaskit/icon/core/comment';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { setInlineCommentDraftState } from '../editor-commands';

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

@@ -1,9 +1,10 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
-import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
-import { canApplyAnnotationOnRange, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isEmptyTextSelection, isParagraph, isText } from '@atlaskit/editor-common/utils';
+import { AnnotationSharedClassNames, BlockAnnotationSharedClassNames } from '@atlaskit/editor-common/styles/annotation';
+import { canApplyAnnotationOnRange, getAnnotationIdsFromRange, getRangeInlineNodeNames, hasAnnotationMark, isEmptyTextSelection } from '@atlaskit/editor-common/utils/annotation';
+import { isParagraph, isText } from '@atlaskit/editor-common/utils/nodes';
 import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';

package/dist/esm/ui/CommentButton/CommentButton.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ToolTipContent, addInlineComment } from '@atlaskit/editor-common/keymaps';
-import { annotationMessages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { ToolbarButton, CommentIcon as NewCommentIcon, ToolbarTooltip } from '@atlaskit/editor-toolbar';
+import { annotationMessages } from '@atlaskit/editor-common/messages/annotation';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { CommentIcon as NewCommentIcon } from '@atlaskit/editor-toolbar/comment-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { isSelectionValid } from '../../pm-plugins/utils';
 import { AnnotationSelectionType, AnnotationTestIds } from '../../types';

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

@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
+import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils/annotation';
 import { resolveDraftBookmark } from '../../pm-plugins/utils';
 // oxlint-disable-next-line import/no-duplicates
 

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

@@ -1,6 +1,7 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MODE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { MODE } from '@atlaskit/editor-common/analytics/types/general-events';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { setInlineCommentDraftState } from '../../editor-commands';
 import { inlineCommentPluginKey, isSelectionValid } from '../../pm-plugins/utils';
 import { AnnotationSelectionType } from '../../types';

package/dist/esm/ui/InlineCommentView.js

@@ -1,11 +1,12 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
+import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics/types/inline-comment-events';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/useSharedPluginStateSelector';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils/annotation';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags/fg';

package/dist/esm/ui/toolbar-components.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import { TOOLBARS, COLLAB_SECTION, TOOLBAR_RANK, COMMENT_GROUP, COLLAB_SECTION_RANK, COMMENT_HERO_BUTTON } from '@atlaskit/editor-common/toolbar';
+import { TOOLBARS, COLLAB_SECTION, COMMENT_GROUP, COMMENT_HERO_BUTTON } from '@atlaskit/editor-common/toolbar/keys';
+import { TOOLBAR_RANK, COLLAB_SECTION_RANK } from '@atlaskit/editor-common/toolbar/rank';
 import { CommentButton } from './CommentButton/CommentButton';
 export var getToolbarComponents = function getToolbarComponents(api, annotationProviders) {
   return [{

package/dist/types/annotationPluginType.d.ts

@@ -1,11 +1,12 @@
-import type { Command, ExtractInjectionAPI, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
-import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { ConnectivityPlugin } from '@atlaskit/editor-plugin-connectivity';
-import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
-import type { EditorViewModeEffectsPlugin } from '@atlaskit/editor-plugin-editor-viewmode-effects';
-import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
-import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
-import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
+import type { Command } from '@atlaskit/editor-common/types/command';
+import type { ExtractInjectionAPI, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types/next-editor-plugin';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics/analyticsPluginType';
+import type { ConnectivityPlugin } from '@atlaskit/editor-plugin-connectivity/connectivityPluginType';
+import type { EditorViewModeEffectsPlugin } from '@atlaskit/editor-plugin-editor-viewmode-effects/editorViewmodeEffectsPluginType';
+import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode/editorViewmodePluginType';
+import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags/featureFlagsPluginType';
+import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar/toolbar-plugin-type';
+import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent/user-intent-plugin-type';
 import type { Node, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { showInlineCommentForBlockNode } from './editor-commands';

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

@@ -1,7 +1,8 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
-import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import { RESOLVE_METHOD, type VIEW_METHOD } from '@atlaskit/editor-common/analytics';
-import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics/api';
+import { RESOLVE_METHOD, type VIEW_METHOD } from '@atlaskit/editor-common/analytics/types/inline-comment-events';
+import type { Command } from '@atlaskit/editor-common/types/command';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { AnnotationPlugin } from '../annotationPluginType';
 import type { InlineCommentMap, InlineCommentMouseData } from '../pm-plugins/types';

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

@@ -1,5 +1,6 @@
-import type { EditorAnalyticsAPI, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics/api';
+import type { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics/types/inline-comment-events';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { AnnotationPlugin } from '../annotationPluginType';
 import type { InlineCommentAnnotationProvider, InlineCommentInputMethod } from '../types';