@atlaskit/editor-plugin-hyperlink 28.0.3 → 28.0.5

package/dist/cjs/ui/toolbar/Toolbar.js

@@ -11,18 +11,20 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _isSafeUrl = require("@atlaskit/adf-schema/is-safe-url");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _card = require("@atlaskit/editor-common/card");
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _link2 = require("@atlaskit/editor-common/link");
-var _messages = require("@atlaskit/editor-common/messages");
+var _linkingUtils = require("@atlaskit/editor-common/analytics/linking-utils");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _utils = require("@atlaskit/editor-common/card/utils");
+var _isOfflineMode = require("@atlaskit/editor-common/connectivity/isOfflineMode");
+var _linkSearchConstants = require("@atlaskit/editor-common/link-search-constants");
+var _HyperlinkAddToolbar = require("@atlaskit/editor-common/link/HyperlinkAddToolbar");
+var _link2 = require("@atlaskit/editor-common/messages/link");
+var _linkToolbar = require("@atlaskit/editor-common/messages/link-toolbar");
 var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
-var _ui = require("@atlaskit/editor-common/ui");
-var _userIntent = require("@atlaskit/editor-common/user-intent");
-var _utils = require("@atlaskit/editor-common/utils");
-var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
+var _UserIntentPopupWrapper = require("@atlaskit/editor-common/UserIntentPopupWrapper");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _utils2 = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _utils3 = require("@atlaskit/editor-prosemirror/utils");
 var _edit = _interopRequireDefault(require("@atlaskit/icon/core/edit"));
 var _linkBroken = _interopRequireDefault(require("@atlaskit/icon/core/link-broken"));
 var _linkExternal = _interopRequireDefault(require("@atlaskit/icon/core/link-external"));
@@ -40,13 +42,13 @@ function isEditLink(linkMark) {
 var dispatchAnalytics = function dispatchAnalytics(dispatch, state, analyticsBuilder, editorAnalyticsApi) {
   if (dispatch) {
     var tr = state.tr;
-    editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent(analyticsBuilder(_analytics.ACTION_SUBJECT_ID.HYPERLINK))(tr);
+    editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent(analyticsBuilder(_enums.ACTION_SUBJECT_ID.HYPERLINK))(tr);
     dispatch(tr);
   }
 };
 var visitHyperlink = function visitHyperlink(editorAnalyticsApi) {
   return function (state, dispatch) {
-    dispatchAnalytics(dispatch, state, _analytics.buildVisitedLinkPayload, editorAnalyticsApi);
+    dispatchAnalytics(dispatch, state, _linkingUtils.buildVisitedLinkPayload, editorAnalyticsApi);
     return true;
   };
 };
@@ -54,7 +56,7 @@ function getLinkText(activeLinkMark, state) {
   if (!activeLinkMark.node) {
     return undefined;
   }
-  var textToUrl = (0, _utils.normalizeUrl)(activeLinkMark.node.text);
+  var textToUrl = (0, _utils2.normalizeUrl)(activeLinkMark.node.text);
   var linkMark = activeLinkMark.node.marks.find(function (mark) {
     return mark.type === state.schema.marks.link;
   });
@@ -88,7 +90,7 @@ function HyperlinkAddToolbarWithState(_ref) {
     onEscapeCallback = _ref.onEscapeCallback,
     onClickAwayCallback = _ref.onClickAwayCallback,
     pluginInjectionApi = _ref.pluginInjectionApi;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['hyperlink'], selector),
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(pluginInjectionApi, ['hyperlink'], selector),
     timesViewed = _useSharedPluginState.timesViewed,
     inputMethod = _useSharedPluginState.inputMethod,
     searchSessionId = _useSharedPluginState.searchSessionId;
@@ -96,8 +98,8 @@ function HyperlinkAddToolbarWithState(_ref) {
   // This is constant rather than dynamic - because if someone's already got a hyperlink toolbar open,
   // we don't want to dynamically change it on them as this would cause data loss if they've already
   // started typing in the fields.
-  var isOffline = (0, _react.useRef)((0, _editorPluginConnectivity.isOfflineMode)(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.connectivity) === null || _pluginInjectionApi$c === void 0 || (_pluginInjectionApi$c = _pluginInjectionApi$c.sharedState.currentState()) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.mode));
-  return /*#__PURE__*/_react.default.createElement(_link2.HyperlinkAddToolbar, {
+  var isOffline = (0, _react.useRef)((0, _isOfflineMode.isOfflineMode)(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.connectivity) === null || _pluginInjectionApi$c === void 0 || (_pluginInjectionApi$c = _pluginInjectionApi$c.sharedState.currentState()) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.mode));
+  return /*#__PURE__*/_react.default.createElement(_HyperlinkAddToolbar.HyperlinkAddToolbar, {
     linkPickerOptions: linkPickerOptions,
     onSubmit: onSubmit,
     displayText: displayText,
@@ -148,7 +150,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
         // However, when the user clicks in right after the link the view.state.selection.from references to the dom after the selection.
         // So instead we want to use the activeLinkMark.pos which has been calculated as the position before the click so that would be the link node
         getDomRef: activeLinkMark && (activeLinkMark.type === 'EDIT_INSERTED' || activeLinkMark.type === 'EDIT') && (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') ? function (view) {
-          var domRef = (0, _utils2.findDomRefAtPos)(activeLinkMark.pos, view.domAtPos.bind(view));
+          var domRef = (0, _utils3.findDomRefAtPos)(activeLinkMark.pos, view.domAtPos.bind(view));
           return domRef instanceof HTMLElement ? domRef : undefined;
         } : undefined
       };
@@ -163,10 +165,10 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
             });
             var link = linkMark[0] && linkMark[0].attrs.href;
             var isValidUrl = (0, _isSafeUrl.isSafeUrl)(link);
-            var labelOpenLink = formatMessage(isValidUrl ? _messages.linkMessages.openLink : _messages.linkToolbarMessages.unableToOpenLink);
+            var labelOpenLink = formatMessage(isValidUrl ? _link2.linkMessages.openLink : _linkToolbar.linkToolbarMessages.unableToOpenLink);
             // TODO: ED-14403 - investigate why these are not translating?
-            var labelUnlink = formatMessage(_messages.linkToolbarMessages.unlink);
-            var editLink = formatMessage(_messages.linkToolbarMessages.editLink);
+            var labelUnlink = formatMessage(_linkToolbar.linkToolbarMessages.unlink);
+            var editLink = formatMessage(_linkToolbar.linkToolbarMessages.editLink);
             var metadata = {
               url: link,
               title: ''
@@ -206,8 +208,8 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
               id: 'editor.link.unlink',
               testId: 'editor.link.unlink',
               type: 'button',
-              onClick: (0, _card.commandWithMetadata)((0, _commands.removeLink)(pos, editorAnalyticsApi), {
-                inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
+              onClick: (0, _utils.commandWithMetadata)((0, _commands.removeLink)(pos, editorAnalyticsApi), {
+                inputMethod: _enums.INPUT_METHOD.FLOATING_TB
               }),
               title: labelUnlink,
               icon: _linkBroken.default,
@@ -250,8 +252,8 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
               _link = _linkMark[0] && _linkMark[0].attrs.href;
             }
             var displayText = isEditLink(activeLinkMark) ? getLinkText(activeLinkMark, state) : linkState.activeText;
-            var popupHeight = (_options$linkPicker$p = options === null || options === void 0 || (_options$linkPicker = options.linkPicker) === null || _options$linkPicker === void 0 ? void 0 : _options$linkPicker.popupHeight) !== null && _options$linkPicker$p !== void 0 ? _options$linkPicker$p : lpLinkPicker ? _ui.LINKPICKER_HEIGHT_IN_PX : _ui.RECENT_SEARCH_HEIGHT_IN_PX;
-            var popupWidth = (_options$linkPicker$p2 = options === null || options === void 0 || (_options$linkPicker2 = options.linkPicker) === null || _options$linkPicker2 === void 0 ? void 0 : _options$linkPicker2.popupWidth) !== null && _options$linkPicker$p2 !== void 0 ? _options$linkPicker$p2 : !lpLinkPicker ? undefined : _ui.RECENT_SEARCH_WIDTH_IN_PX;
+            var popupHeight = (_options$linkPicker$p = options === null || options === void 0 || (_options$linkPicker = options.linkPicker) === null || _options$linkPicker === void 0 ? void 0 : _options$linkPicker.popupHeight) !== null && _options$linkPicker$p !== void 0 ? _options$linkPicker$p : lpLinkPicker ? _linkSearchConstants.LINKPICKER_HEIGHT_IN_PX : _linkSearchConstants.RECENT_SEARCH_HEIGHT_IN_PX;
+            var popupWidth = (_options$linkPicker$p2 = options === null || options === void 0 || (_options$linkPicker2 = options.linkPicker) === null || _options$linkPicker2 === void 0 ? void 0 : _options$linkPicker2.popupWidth) !== null && _options$linkPicker$p2 !== void 0 ? _options$linkPicker$p2 : !lpLinkPicker ? undefined : _linkSearchConstants.RECENT_SEARCH_WIDTH_IN_PX;
             return _objectSpread(_objectSpread({}, hyperLinkToolbar), {}, {
               preventPopupOverflow: true,
               height: popupHeight,
@@ -291,9 +293,9 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
                       var analytic = arguments.length > 4 ? arguments[4] : undefined;
                       var appearance = arguments.length > 5 ? arguments[5] : undefined;
                       var isEdit = isEditLink(activeLinkMark);
-                      var action = isEdit ? _analytics.ACTION.UPDATED : _analytics.ACTION.INSERTED;
+                      var action = isEdit ? _enums.ACTION.UPDATED : _enums.ACTION.INSERTED;
                       var skipAnalytics = (_toolbarKey$getState$ = (_toolbarKey$getState = _toolbarButtons.toolbarKey.getState(state)) === null || _toolbarKey$getState === void 0 ? void 0 : _toolbarKey$getState.skipAnalytics) !== null && _toolbarKey$getState$ !== void 0 ? _toolbarKey$getState$ : false;
-                      var command = isEdit ? (0, _card.commandWithMetadata)((0, _commands.updateLink)(href, displayText || title, activeLinkMark.pos), {
+                      var command = isEdit ? (0, _utils.commandWithMetadata)((0, _commands.updateLink)(href, displayText || title, activeLinkMark.pos), {
                         action: action,
                         inputMethod: inputMethod,
                         sourceEvent: analytic
@@ -302,7 +304,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
                       view.focus();
                     }
                   });
-                  return isToolbarAIFCEnabled ? /*#__PURE__*/_react.default.createElement(_userIntent.UserIntentPopupWrapper, {
+                  return isToolbarAIFCEnabled ? /*#__PURE__*/_react.default.createElement(_UserIntentPopupWrapper.UserIntentPopupWrapper, {
                     api: pluginInjectionApi
                   }, Toolbar) : Toolbar;
                 }

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

@@ -6,24 +6,25 @@ 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 _LinkButton = require("./toolbar/LinkButton");
 var getToolbarComponents = exports.getToolbarComponents = function getToolbarComponents(api) {
   var toolbarComponents = [{
-    type: _toolbar.LINKING_GROUP.type,
-    key: _toolbar.LINKING_GROUP.key,
+    type: _keys.LINKING_GROUP.type,
+    key: _keys.LINKING_GROUP.key,
     parents: [{
-      type: _toolbar.LINKING_SECTION.type,
-      key: _toolbar.LINKING_SECTION.key,
-      rank: _toolbar.LINKING_SECTION_RANK[_toolbar.LINKING_GROUP.key]
+      type: _keys.LINKING_SECTION.type,
+      key: _keys.LINKING_SECTION.key,
+      rank: _rank.LINKING_SECTION_RANK[_keys.LINKING_GROUP.key]
     }]
   }, {
-    type: _toolbar.LINKING_BUTTON.type,
-    key: _toolbar.LINKING_BUTTON.key,
+    type: _keys.LINKING_BUTTON.type,
+    key: _keys.LINKING_BUTTON.key,
     parents: [{
-      type: _toolbar.LINKING_GROUP.type,
-      key: _toolbar.LINKING_GROUP.key,
-      rank: _toolbar.LINKING_GROUP_RANK[_toolbar.LINKING_BUTTON.key]
+      type: _keys.LINKING_GROUP.type,
+      key: _keys.LINKING_GROUP.key,
+      rank: _rank.LINKING_GROUP_RANK[_keys.LINKING_BUTTON.key]
     }],
     component: function component() {
       return /*#__PURE__*/_react.default.createElement(_LinkButton.LinkButton, {

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

@@ -1,9 +1,12 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, buildEditLinkPayload, EVENT_TYPE, INPUT_METHOD, unlinkPayload } from '@atlaskit/editor-common/analytics';
-import { addLinkMetadata, commandWithMetadata } from '@atlaskit/editor-common/card';
-import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
+import { buildEditLinkPayload, unlinkPayload } from '@atlaskit/editor-common/analytics/linking-utils';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { addLinkMetadata } from '@atlaskit/editor-common/card';
+import { commandWithMetadata } from '@atlaskit/editor-common/card/utils';
 import { isTextAtPos, LinkAction } from '@atlaskit/editor-common/link';
-import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
-import { getLinkCreationAnalyticsEvent, normalizeUrl } from '@atlaskit/editor-common/utils';
+import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset/editor-commands';
+import { normalizeUrl } from '@atlaskit/editor-common/utils';
+import { getLinkCreationAnalyticsEvent } from '@atlaskit/editor-common/utils/hyperlink';
+import { withAnalytics } from '@atlaskit/editor-common/withAnalytics';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { stateKey } from '../pm-plugins/main';
 function setLinkHrefEditorCommand(href, pos, editorAnalyticsApi, to, isTabPressed) {

package/dist/es2019/hyperlinkPlugin.js

@@ -1,11 +1,11 @@
 import React from 'react';
 import { link } from '@atlaskit/adf-schema/link';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { IconLink } from '@atlaskit/editor-common/assets';
 import { addLink, tooltip } from '@atlaskit/editor-common/keymaps';
 import { LinkAction } from '@atlaskit/editor-common/link';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
-import { IconLink } from '@atlaskit/editor-common/quick-insert';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset/editor-commands';
 import { canLinkBeCreatedInRange } from '@atlaskit/editor-common/utils';
 import LinkIcon from '@atlaskit/icon/core/link';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';

package/dist/es2019/pm-plugins/input-rule.js

@@ -1,8 +1,10 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { createRule, findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches, LinkMatcher, normalizeUrl, shouldAutoLinkifyMatch } from '@atlaskit/editor-common/utils';
-import { createPlugin } from '@atlaskit/prosemirror-input-rules';
+import { createRule, LinkMatcher, normalizeUrl } from '@atlaskit/editor-common/utils';
+import { findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches } from '@atlaskit/editor-common/utils/hyperlink';
+import { shouldAutoLinkifyMatch } from '@atlaskit/editor-common/utils/should-auto-linkify-tld';
+import { createPlugin } from '@atlaskit/prosemirror-input-rules/utils';
 import { toolbarKey } from './toolbar-buttons';
 
 // [something](link) should convert to a hyperlink

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

@@ -1,8 +1,9 @@
 import { getLinkMatch } from '@atlaskit/adf-schema/get-link-match';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { addLink, bindKeymapWithCommand, bindKeymapWithEditorCommand, enter, escape, insertNewLine } from '@atlaskit/editor-common/keymaps';
-import { findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches, shouldAutoLinkifyMatch } from '@atlaskit/editor-common/utils';
+import { findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches } from '@atlaskit/editor-common/utils/hyperlink';
+import { shouldAutoLinkifyMatch } from '@atlaskit/editor-common/utils/should-auto-linkify-tld';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { hideLinkToolbar, showLinkToolbar } from '../editor-commands/commands';
 import { stateKey } from '../pm-plugins/main';

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

@@ -1,7 +1,8 @@
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import { v4 as uuid } from 'uuid';
 import { isSafeUrl } from '@atlaskit/adf-schema/is-safe-url';
-import { InsertStatus, LinkAction, getActiveLinkMark } from '@atlaskit/editor-common/link';
+import { InsertStatus, LinkAction } from '@atlaskit/editor-common/link';
+import { getActiveLinkMark } from '@atlaskit/editor-common/link/utils';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { canLinkBeCreatedInRange, shallowEqual } from '@atlaskit/editor-common/utils';
 import { PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';

package/dist/es2019/ui/PrimaryToolbarComponent.js

@@ -9,10 +9,10 @@ import { useCallback } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { addLink, getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
 import LinkIcon from '@atlaskit/icon/core/link';
 const PrimaryToolbarComponentWithIntl = ({
   api,

package/dist/es2019/ui/quick-insert/HyperlinkQuickInsertMenuItem.js

@@ -1,9 +1,9 @@
 import React, { useCallback, useMemo } from 'react';
 import { useIntl } from 'react-intl';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { addLink, tooltip } from '@atlaskit/editor-common/keymaps';
 import { LinkAction } from '@atlaskit/editor-common/link';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
 import { QuickInsertMenuItem } from '@atlaskit/editor-common/quick-insert/menu-item';
 import { messages as quickInsertMessages } from '@atlaskit/editor-common/quick-insert/messages';
 import LinkIcon from '@atlaskit/icon/core/link';

package/dist/es2019/ui/quick-insert/getHyperlinkQuickInsertComponents.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { addLink, tooltip } from '@atlaskit/editor-common/keymaps';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
 import { createQuickInsertMatcher } from '@atlaskit/editor-common/quick-insert/create-quick-insert-matcher';
 import { HYPERLINK_MENU_ITEM, MEDIA_SECTION } from '@atlaskit/editor-common/quick-insert/keys';
 import { MEDIA_SECTION_RANK } from '@atlaskit/editor-common/quick-insert/rank';

package/dist/es2019/ui/toolbar/LinkButton.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { ToolTipContent, addLink } from '@atlaskit/editor-common/keymaps';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { LinkIcon, ToolbarButton, ToolbarTooltip } from '@atlaskit/editor-toolbar';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { LinkIcon } from '@atlaskit/editor-toolbar/link-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 export const LinkButton = ({
   api
 }) => {

package/dist/es2019/ui/toolbar/Toolbar.js

@@ -1,15 +1,17 @@
 import React, { useRef } from 'react';
 import { isSafeUrl } from '@atlaskit/adf-schema/is-safe-url';
-import { ACTION, ACTION_SUBJECT_ID, INPUT_METHOD, buildVisitedLinkPayload } from '@atlaskit/editor-common/analytics';
-import { commandWithMetadata } from '@atlaskit/editor-common/card';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { HyperlinkAddToolbar } from '@atlaskit/editor-common/link';
-import { linkMessages, linkToolbarMessages as linkToolbarCommonMessages } from '@atlaskit/editor-common/messages';
+import { buildVisitedLinkPayload } from '@atlaskit/editor-common/analytics/linking-utils';
+import { ACTION, ACTION_SUBJECT_ID, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { commandWithMetadata } from '@atlaskit/editor-common/card/utils';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
+import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/link-search-constants';
+import { HyperlinkAddToolbar } from '@atlaskit/editor-common/link/HyperlinkAddToolbar';
+import { linkMessages } from '@atlaskit/editor-common/messages/link';
+import { linkToolbarMessages as linkToolbarCommonMessages } from '@atlaskit/editor-common/messages/link-toolbar';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
-import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
-import { UserIntentPopupWrapper } from '@atlaskit/editor-common/user-intent';
+import { UserIntentPopupWrapper } from '@atlaskit/editor-common/UserIntentPopupWrapper';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { normalizeUrl } from '@atlaskit/editor-common/utils';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import EditIcon from '@atlaskit/icon/core/edit';

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

@@ -1,5 +1,6 @@
 import React from 'react';
-import { LINKING_BUTTON, LINKING_GROUP, LINKING_GROUP_RANK, LINKING_SECTION, LINKING_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
+import { LINKING_BUTTON, LINKING_GROUP, LINKING_SECTION } from '@atlaskit/editor-common/toolbar/keys';
+import { LINKING_GROUP_RANK, LINKING_SECTION_RANK } from '@atlaskit/editor-common/toolbar/rank';
 import { LinkButton } from './toolbar/LinkButton';
 export const getToolbarComponents = api => {
   const toolbarComponents = [{

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

@@ -1,12 +1,15 @@
 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 { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, buildEditLinkPayload, EVENT_TYPE, INPUT_METHOD, unlinkPayload } from '@atlaskit/editor-common/analytics';
-import { addLinkMetadata, commandWithMetadata } from '@atlaskit/editor-common/card';
-import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
+import { buildEditLinkPayload, unlinkPayload } from '@atlaskit/editor-common/analytics/linking-utils';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { addLinkMetadata } from '@atlaskit/editor-common/card';
+import { commandWithMetadata } from '@atlaskit/editor-common/card/utils';
 import { isTextAtPos, LinkAction } from '@atlaskit/editor-common/link';
-import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
-import { getLinkCreationAnalyticsEvent, normalizeUrl } from '@atlaskit/editor-common/utils';
+import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset/editor-commands';
+import { normalizeUrl } from '@atlaskit/editor-common/utils';
+import { getLinkCreationAnalyticsEvent } from '@atlaskit/editor-common/utils/hyperlink';
+import { withAnalytics } from '@atlaskit/editor-common/withAnalytics';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { stateKey } from '../pm-plugins/main';
 function setLinkHrefEditorCommand(href, pos, editorAnalyticsApi, to, isTabPressed) {

package/dist/esm/hyperlinkPlugin.js

@@ -3,12 +3,12 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 React from 'react';
 import { link } from '@atlaskit/adf-schema/link';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { IconLink } from '@atlaskit/editor-common/assets';
 import { addLink, tooltip } from '@atlaskit/editor-common/keymaps';
 import { LinkAction } from '@atlaskit/editor-common/link';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
-import { IconLink } from '@atlaskit/editor-common/quick-insert';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset/editor-commands';
 import { canLinkBeCreatedInRange } from '@atlaskit/editor-common/utils';
 import LinkIcon from '@atlaskit/icon/core/link';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';

package/dist/esm/pm-plugins/input-rule.js

@@ -1,9 +1,11 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { createRule, findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches, LinkMatcher, normalizeUrl, shouldAutoLinkifyMatch } from '@atlaskit/editor-common/utils';
-import { createPlugin } from '@atlaskit/prosemirror-input-rules';
+import { createRule, LinkMatcher, normalizeUrl } from '@atlaskit/editor-common/utils';
+import { findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches } from '@atlaskit/editor-common/utils/hyperlink';
+import { shouldAutoLinkifyMatch } from '@atlaskit/editor-common/utils/should-auto-linkify-tld';
+import { createPlugin } from '@atlaskit/prosemirror-input-rules/utils';
 import { toolbarKey } from './toolbar-buttons';
 
 // [something](link) should convert to a hyperlink

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

@@ -1,8 +1,9 @@
 import { getLinkMatch } from '@atlaskit/adf-schema/get-link-match';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { addLink, bindKeymapWithCommand, bindKeymapWithEditorCommand, enter, escape, insertNewLine } from '@atlaskit/editor-common/keymaps';
-import { findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches, shouldAutoLinkifyMatch } from '@atlaskit/editor-common/utils';
+import { findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches } from '@atlaskit/editor-common/utils/hyperlink';
+import { shouldAutoLinkifyMatch } from '@atlaskit/editor-common/utils/should-auto-linkify-tld';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { hideLinkToolbar, showLinkToolbar } from '../editor-commands/commands';
 import { stateKey } from '../pm-plugins/main';

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

@@ -4,7 +4,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import { v4 as uuid } from 'uuid';
 import { isSafeUrl } from '@atlaskit/adf-schema/is-safe-url';
-import { InsertStatus, LinkAction, getActiveLinkMark } from '@atlaskit/editor-common/link';
+import { InsertStatus, LinkAction } from '@atlaskit/editor-common/link';
+import { getActiveLinkMark } from '@atlaskit/editor-common/link/utils';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { canLinkBeCreatedInRange, shallowEqual } from '@atlaskit/editor-common/utils';
 import { PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';

package/dist/esm/ui/PrimaryToolbarComponent.js

@@ -9,10 +9,10 @@ import { useCallback } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { addLink, getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
 import LinkIcon from '@atlaskit/icon/core/link';
 var PrimaryToolbarComponentWithIntl = function PrimaryToolbarComponentWithIntl(_ref) {
   var api = _ref.api,

package/dist/esm/ui/quick-insert/HyperlinkQuickInsertMenuItem.js

@@ -1,9 +1,9 @@
 import React, { useCallback, useMemo } from 'react';
 import { useIntl } from 'react-intl';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { addLink, tooltip } from '@atlaskit/editor-common/keymaps';
 import { LinkAction } from '@atlaskit/editor-common/link';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
 import { QuickInsertMenuItem } from '@atlaskit/editor-common/quick-insert/menu-item';
 import { messages as quickInsertMessages } from '@atlaskit/editor-common/quick-insert/messages';
 import LinkIcon from '@atlaskit/icon/core/link';

package/dist/esm/ui/quick-insert/getHyperlinkQuickInsertComponents.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { addLink, tooltip } from '@atlaskit/editor-common/keymaps';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
 import { createQuickInsertMatcher } from '@atlaskit/editor-common/quick-insert/create-quick-insert-matcher';
 import { HYPERLINK_MENU_ITEM, MEDIA_SECTION } from '@atlaskit/editor-common/quick-insert/keys';
 import { MEDIA_SECTION_RANK } from '@atlaskit/editor-common/quick-insert/rank';

package/dist/esm/ui/toolbar/LinkButton.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { ToolTipContent, addLink } from '@atlaskit/editor-common/keymaps';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { LinkIcon, ToolbarButton, ToolbarTooltip } from '@atlaskit/editor-toolbar';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { LinkIcon } from '@atlaskit/editor-toolbar/link-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 export var LinkButton = function LinkButton(_ref) {
   var api = _ref.api;
   var _useIntl = useIntl(),

package/dist/esm/ui/toolbar/Toolbar.js

@@ -4,16 +4,18 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 React, { useRef } from 'react';
 import { isSafeUrl } from '@atlaskit/adf-schema/is-safe-url';
-import { ACTION, ACTION_SUBJECT_ID, INPUT_METHOD, buildVisitedLinkPayload } from '@atlaskit/editor-common/analytics';
-import { commandWithMetadata } from '@atlaskit/editor-common/card';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { HyperlinkAddToolbar } from '@atlaskit/editor-common/link';
-import { linkMessages, linkToolbarMessages as linkToolbarCommonMessages } from '@atlaskit/editor-common/messages';
+import { buildVisitedLinkPayload } from '@atlaskit/editor-common/analytics/linking-utils';
+import { ACTION, ACTION_SUBJECT_ID, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { commandWithMetadata } from '@atlaskit/editor-common/card/utils';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
+import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/link-search-constants';
+import { HyperlinkAddToolbar } from '@atlaskit/editor-common/link/HyperlinkAddToolbar';
+import { linkMessages } from '@atlaskit/editor-common/messages/link';
+import { linkToolbarMessages as linkToolbarCommonMessages } from '@atlaskit/editor-common/messages/link-toolbar';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
-import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
-import { UserIntentPopupWrapper } from '@atlaskit/editor-common/user-intent';
+import { UserIntentPopupWrapper } from '@atlaskit/editor-common/UserIntentPopupWrapper';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { normalizeUrl } from '@atlaskit/editor-common/utils';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import EditIcon from '@atlaskit/icon/core/edit';

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

@@ -1,5 +1,6 @@
 import React from 'react';
-import { LINKING_BUTTON, LINKING_GROUP, LINKING_GROUP_RANK, LINKING_SECTION, LINKING_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
+import { LINKING_BUTTON, LINKING_GROUP, LINKING_SECTION } from '@atlaskit/editor-common/toolbar/keys';
+import { LINKING_GROUP_RANK, LINKING_SECTION_RANK } from '@atlaskit/editor-common/toolbar/rank';
 import { LinkButton } from './toolbar/LinkButton';
 export var getToolbarComponents = function getToolbarComponents(api) {
   var toolbarComponents = [{

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

@@ -1,9 +1,11 @@
 import type UIAnalyticsEvent from '@atlaskit/analytics-next/UIAnalyticsEvent';
-import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { type CardPluginActions } from '@atlaskit/editor-common/card';
-import type { CardAppearance } from '@atlaskit/editor-common/provider-factory';
-import type { Command, EditorCommand, LinkInputType } from '@atlaskit/editor-common/types';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics/api';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import type { CardPluginActions } from '@atlaskit/editor-common/card/types';
+import type { CardAppearance } from '@atlaskit/editor-common/provider-factory/card-provider';
+import type { Command } from '@atlaskit/editor-common/types/command';
+import type { EditorCommand } from '@atlaskit/editor-common/types/editor-command';
+import type { LinkInputType } from '@atlaskit/editor-common/types/hyperlink';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare function setLinkHref(href: string, pos: number, editorAnalyticsApi: EditorAnalyticsAPI | undefined, to?: number, isTabPressed?: boolean): Command;
 export type UpdateLink = (href: string, text: string, pos: number, to?: number) => Command;

package/dist/types/hyperlinkPluginType.d.ts

@@ -1,15 +1,17 @@
-import type { HyperlinkState } from '@atlaskit/editor-common/link';
-import type { EditorCommand, HyperlinkPluginOptions as CommonHyperlinkPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
-import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { CardPlugin } from '@atlaskit/editor-plugin-card';
+import type { HyperlinkState } from '@atlaskit/editor-common/link/types';
+import type { EditorCommand } from '@atlaskit/editor-common/types/editor-command';
+import type { HyperlinkPluginOptions as CommonHyperlinkPluginOptions } from '@atlaskit/editor-common/types/hyperlink';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types/next-editor-plugin';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics/analyticsPluginType';
+import type { CardPlugin } from '@atlaskit/editor-plugin-card/cardPluginType';
 import type { ConnectivityPlugin } from '@atlaskit/editor-plugin-connectivity/connectivityPluginType';
-import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
-import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
-import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugin-selection-toolbar';
-import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
+import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode/editorViewmodePluginType';
+import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar/primary-toolbar-plugin-type';
+import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugin-selection-toolbar/selection-toolbar-plugin-type';
+import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar/toolbar-plugin-type';
 import type { UiControlRegistryPlugin } from '@atlaskit/editor-plugin-ui-control-registry/ui-control-registry-plugin-type';
-import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
-import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences';
+import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent/user-intent-plugin-type';
+import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences/user-preferences-plugin-type';
 import type { HideLinkToolbar, InsertLink, ShowLinkToolbar, UpdateLink } from './editor-commands/commands';
 type HyperlinkPluginCommands = {
     /**

package/dist/types/pm-plugins/input-rule.d.ts

@@ -1,6 +1,6 @@
-import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics/api';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { InputRuleWrapper } from '@atlaskit/editor-common/types';
+import type { InputRuleWrapper } from '@atlaskit/editor-common/types/input-rules';
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
 /**
  * Called when space after link, but not on enter