@atlaskit/editor-plugin-hyperlink 28.0.3 → 28.0.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-hyperlink
 
+## 28.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
+## 28.0.4
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 28.0.3
 
 ### Patch Changes

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

@@ -16,12 +16,15 @@ exports.showLinkToolbar = showLinkToolbar;
 exports.updateLink = updateLink;
 exports.updateLinkEditorCommand = updateLinkEditorCommand;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _linkingUtils = require("@atlaskit/editor-common/analytics/linking-utils");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _card = require("@atlaskit/editor-common/card");
-var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
+var _utils = require("@atlaskit/editor-common/card/utils");
 var _link = require("@atlaskit/editor-common/link");
-var _preset = require("@atlaskit/editor-common/preset");
-var _utils = require("@atlaskit/editor-common/utils");
+var _editorCommands = require("@atlaskit/editor-common/preset/editor-commands");
+var _utils2 = require("@atlaskit/editor-common/utils");
+var _hyperlink = require("@atlaskit/editor-common/utils/hyperlink");
+var _withAnalytics = require("@atlaskit/editor-common/withAnalytics");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _main = require("../pm-plugins/main");
 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; }
@@ -38,7 +41,7 @@ function setLinkHrefEditorCommand(href, pos, editorAnalyticsApi, to, isTabPresse
     var node = tr.doc.nodeAt(pos);
     var linkMark = tr.doc.type.schema.marks.link;
     var mark = linkMark.isInSet(node.marks);
-    var url = (0, _utils.normalizeUrl)(href);
+    var url = (0, _utils2.normalizeUrl)(href);
     if (mark && mark.attrs.href === url) {
       return null;
     }
@@ -49,7 +52,7 @@ function setLinkHrefEditorCommand(href, pos, editorAnalyticsApi, to, isTabPresse
         href: url
       })));
     } else {
-      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _analytics.unlinkPayload)(_analytics.ACTION_SUBJECT_ID.HYPERLINK))(tr);
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _linkingUtils.unlinkPayload)(_enums.ACTION_SUBJECT_ID.HYPERLINK))(tr);
     }
     if (!isTabPressed) {
       tr.setMeta(_main.stateKey, {
@@ -60,7 +63,7 @@ function setLinkHrefEditorCommand(href, pos, editorAnalyticsApi, to, isTabPresse
   };
 }
 function setLinkHref(href, pos, editorAnalyticsApi, to, isTabPressed) {
-  return (0, _preset.editorCommandToPMCommand)(setLinkHrefEditorCommand(href, pos, editorAnalyticsApi, to, isTabPressed));
+  return (0, _editorCommands.editorCommandToPMCommand)(setLinkHrefEditorCommand(href, pos, editorAnalyticsApi, to, isTabPressed));
 }
 function updateLinkEditorCommand(href, text, pos, to) {
   return function (_ref2) {
@@ -70,7 +73,7 @@ function updateLinkEditorCommand(href, text, pos, to) {
     if (!node) {
       return null;
     }
-    var url = (0, _utils.normalizeUrl)(href);
+    var url = (0, _utils2.normalizeUrl)(href);
     var mark = tr.doc.type.schema.marks.link.isInSet(node.marks);
     var linkMark = tr.doc.type.schema.marks.link;
     var rightBound = to && pos !== to ? to : pos - $pos.textOffset + node.nodeSize;
@@ -94,7 +97,7 @@ function updateLinkEditorCommand(href, text, pos, to) {
   };
 }
 function updateLink(href, text, pos, to) {
-  return (0, _preset.editorCommandToPMCommand)(updateLinkEditorCommand(href, text, pos, to));
+  return (0, _editorCommands.editorCommandToPMCommand)(updateLinkEditorCommand(href, text, pos, to));
 }
 function insertLink(from, to, incomingHref, incomingTitle, displayText, source, sourceEvent) {
   var appearance = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 'inline';
@@ -104,7 +107,7 @@ function insertLink(from, to, incomingHref, incomingTitle, displayText, source,
     var tr = state.tr;
     if (incomingHref.trim()) {
       var _stateKey$getState;
-      var normalizedUrl = (0, _utils.normalizeUrl)(incomingHref);
+      var normalizedUrl = (0, _utils2.normalizeUrl)(incomingHref);
       // NB: in this context, `currentText` represents text which has been
       // highlighted in the Editor, upon which a link is is being added.
       var currentText = (_stateKey$getState = _main.stateKey.getState(state)) === null || _stateKey$getState === void 0 ? void 0 : _stateKey$getState.activeText;
@@ -130,10 +133,10 @@ function insertLink(from, to, incomingHref, incomingTitle, displayText, source,
           queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 || queueCardsFromChangedTr(state, tr,
           // Ignored via go/ees005
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          source, _analytics.ACTION.INSERTED, false, sourceEvent, appearance);
+          source, _enums.ACTION.INSERTED, false, sourceEvent, appearance);
         } else {
           (0, _card.addLinkMetadata)(state.selection, tr, {
-            action: _analytics.ACTION.INSERTED,
+            action: _enums.ACTION.INSERTED,
             inputMethod: source,
             sourceEvent: sourceEvent
           });
@@ -143,7 +146,7 @@ function insertLink(from, to, incomingHref, incomingTitle, displayText, source,
          * Add link metadata because queue cards would have otherwise handled this for us
          */
         (0, _card.addLinkMetadata)(state.selection, tr, {
-          action: _analytics.ACTION.INSERTED,
+          action: _enums.ACTION.INSERTED,
           inputMethod: source,
           sourceEvent: sourceEvent
         });
@@ -173,13 +176,13 @@ var insertLinkWithAnalytics = exports.insertLinkWithAnalytics = function insertL
   if (cardsAvailable && !title && !displayText) {
     return insertLink(from, to, href, title, displayText, inputMethod, sourceEvent, appearance, cardActions);
   }
-  return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, function (state) {
-    return (0, _utils.getLinkCreationAnalyticsEvent)(inputMethod, href, from !== to ? state.tr : undefined);
+  return (0, _withAnalytics.withAnalytics)(editorAnalyticsApi, function (state) {
+    return (0, _hyperlink.getLinkCreationAnalyticsEvent)(inputMethod, href, from !== to ? state.tr : undefined);
   })(insertLink(from, to, href, title, displayText, inputMethod, sourceEvent, appearance, cardActions));
 };
 function removeLink(pos, editorAnalyticsApi) {
-  return (0, _card.commandWithMetadata)(setLinkHref('', pos, editorAnalyticsApi), {
-    action: _analytics.ACTION.UNLINK
+  return (0, _utils.commandWithMetadata)(setLinkHref('', pos, editorAnalyticsApi), {
+    action: _enums.ACTION.UNLINK
   });
 }
 function removeLinkEditorCommand(pos, editorAnalyticsApi) {
@@ -189,7 +192,7 @@ function removeLinkEditorCommand(pos, editorAnalyticsApi) {
       tr: tr
     });
     (0, _card.addLinkMetadata)(tr.selection, tr, {
-      action: _analytics.ACTION.UNLINK
+      action: _enums.ACTION.UNLINK
     });
     return tr;
   };
@@ -200,9 +203,9 @@ function editInsertedLink(editorAnalyticsApi) {
       var _tr = state.tr;
       _tr.setMeta(_main.stateKey, {
         type: _link.LinkAction.EDIT_INSERTED_TOOLBAR,
-        inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
+        inputMethod: _enums.INPUT_METHOD.FLOATING_TB
       });
-      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _analytics.buildEditLinkPayload)(_analytics.ACTION_SUBJECT_ID.HYPERLINK))(_tr);
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _linkingUtils.buildEditLinkPayload)(_enums.ACTION_SUBJECT_ID.HYPERLINK))(_tr);
       dispatch(_tr);
     }
     return true;
@@ -216,13 +219,13 @@ function showLinkToolbar(inputMethod, editorAnalyticsApi) {
       inputMethod: inputMethod
     });
     editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
-      action: _analytics.ACTION.INVOKED,
-      actionSubject: _analytics.ACTION_SUBJECT.TYPEAHEAD,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.TYPEAHEAD_LINK,
+      action: _enums.ACTION.INVOKED,
+      actionSubject: _enums.ACTION_SUBJECT.TYPEAHEAD,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.TYPEAHEAD_LINK,
       attributes: {
         inputMethod: inputMethod
       },
-      eventType: _analytics.EVENT_TYPE.UI
+      eventType: _enums.EVENT_TYPE.UI
     })(newTr);
     return newTr;
   };

package/dist/cjs/hyperlinkPlugin.js

@@ -8,12 +8,12 @@ exports.hyperlinkPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _link = require("@atlaskit/adf-schema/link");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _assets = require("@atlaskit/editor-common/assets");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _link2 = require("@atlaskit/editor-common/link");
-var _messages = require("@atlaskit/editor-common/messages");
-var _preset = require("@atlaskit/editor-common/preset");
-var _quickInsert = require("@atlaskit/editor-common/quick-insert");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
+var _editorCommands = require("@atlaskit/editor-common/preset/editor-commands");
 var _utils = require("@atlaskit/editor-common/utils");
 var _link3 = _interopRequireDefault(require("@atlaskit/icon/core/link"));
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
@@ -76,7 +76,7 @@ var hyperlinkPlugin = exports.hyperlinkPlugin = function hyperlinkPlugin(_ref) {
     commands: {
       showLinkToolbar: function showLinkToolbar() {
         var _api$analytics;
-        var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics.INPUT_METHOD.TOOLBAR;
+        var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _enums.INPUT_METHOD.TOOLBAR;
         return (0, _commands.showLinkToolbar)(inputMethod, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
       },
       updateLink: function updateLink(href, text) {
@@ -163,29 +163,29 @@ var hyperlinkPlugin = exports.hyperlinkPlugin = function hyperlinkPlugin(_ref) {
         var formatMessage = _ref4.formatMessage;
         return [{
           id: 'hyperlink',
-          title: formatMessage(_messages.toolbarInsertBlockMessages.link),
-          description: formatMessage(_messages.toolbarInsertBlockMessages.linkDescription),
+          title: formatMessage(_insertBlock.toolbarInsertBlockMessages.link),
+          description: formatMessage(_insertBlock.toolbarInsertBlockMessages.linkDescription),
           keywords: ['hyperlink', 'url'],
           priority: (0, _expValEquals.expValEquals)('confluence_quick_insert_embeds', 'cohort', 'prioritizeLinkInQIM', 'control') ? -300 : 1200,
           keyshortcut: (0, _keymaps.tooltip)(_keymaps.addLink),
           icon: function icon() {
-            return /*#__PURE__*/_react.default.createElement(_quickInsert.IconLink, null);
+            return /*#__PURE__*/_react.default.createElement(_assets.IconLink, null);
           },
           action: function action(insert, state) {
             var _api$analytics6, _api$analytics6$attac;
             var tr = insert(undefined);
             tr.setMeta(_main.stateKey, {
               type: _link2.LinkAction.SHOW_INSERT_TOOLBAR,
-              inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
+              inputMethod: _enums.INPUT_METHOD.QUICK_INSERT
             });
             var analyticsAttached = api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 || (_api$analytics6 = _api$analytics6.actions) === null || _api$analytics6 === void 0 || (_api$analytics6$attac = _api$analytics6.attachAnalyticsEvent) === null || _api$analytics6$attac === void 0 ? void 0 : _api$analytics6$attac.call(_api$analytics6, {
-              action: _analytics.ACTION.INVOKED,
-              actionSubject: _analytics.ACTION_SUBJECT.TYPEAHEAD,
-              actionSubjectId: _analytics.ACTION_SUBJECT_ID.TYPEAHEAD_LINK,
+              action: _enums.ACTION.INVOKED,
+              actionSubject: _enums.ACTION_SUBJECT.TYPEAHEAD,
+              actionSubjectId: _enums.ACTION_SUBJECT_ID.TYPEAHEAD_LINK,
               attributes: {
-                inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
+                inputMethod: _enums.INPUT_METHOD.QUICK_INSERT
               },
-              eventType: _analytics.EVENT_TYPE.UI
+              eventType: _enums.EVENT_TYPE.UI
             })(tr);
             return analyticsAttached !== false ? tr : false;
           }
@@ -206,7 +206,7 @@ var hyperlinkPlugin = exports.hyperlinkPlugin = function hyperlinkPlugin(_ref) {
               from = _state$selection.from,
               to = _state$selection.to;
             var isEnabled = (0, _utils.canLinkBeCreatedInRange)(from, to)(state);
-            var title = formatMessage(_messages.toolbarInsertBlockMessages.link);
+            var title = formatMessage(_insertBlock.toolbarInsertBlockMessages.link);
             return {
               type: 'button',
               disabled: !isEnabled,
@@ -217,7 +217,7 @@ var hyperlinkPlugin = exports.hyperlinkPlugin = function hyperlinkPlugin(_ref) {
               showTitle: false,
               onClick: function onClick(state, dispatch) {
                 var _api$analytics7;
-                return (0, _preset.editorCommandToPMCommand)((0, _commands.showLinkToolbar)(_analytics.INPUT_METHOD.FLOATING_TB, api === null || api === void 0 || (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions))(state, dispatch);
+                return (0, _editorCommands.editorCommandToPMCommand)((0, _commands.showLinkToolbar)(_enums.INPUT_METHOD.FLOATING_TB, api === null || api === void 0 || (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions))(state, dispatch);
               }
             };
           };

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

@@ -8,11 +8,13 @@ exports.createInputRulePlugin = createInputRulePlugin;
 exports.createLinkInputRule = createLinkInputRule;
 exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _card = require("@atlaskit/editor-common/card");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
-var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
+var _hyperlink = require("@atlaskit/editor-common/utils/hyperlink");
+var _shouldAutoLinkifyTld = require("@atlaskit/editor-common/utils/should-auto-linkify-tld");
+var _utils2 = require("@atlaskit/prosemirror-input-rules/utils");
 var _toolbarButtons = require("./toolbar-buttons");
 // [something](link) should convert to a hyperlink
 // eslint-disable-next-line require-unicode-regexp
@@ -36,7 +38,7 @@ function createLinkInputRule(regexp, editorAnalyticsApi) {
     if (link.url === undefined) {
       return null;
     }
-    if (!(0, _utils.shouldAutoLinkifyMatch)(link)) {
+    if (!(0, _shouldAutoLinkifyTld.shouldAutoLinkifyMatch)(link)) {
       return null;
     }
     var url = (0, _utils.normalizeUrl)(link.url);
@@ -56,11 +58,11 @@ function createLinkInputRule(regexp, editorAnalyticsApi) {
     if (!nodeBefore || !nodeBefore.isText || !nodeBefore.text) {
       return null;
     }
-    var filepaths = (0, _utils.findFilepaths)(nodeBefore.text,
+    var filepaths = (0, _hyperlink.findFilepaths)(nodeBefore.text,
     // The position referenced by 'start' is relative to the start of the document, findFilepaths deals with index in a node only.
     start - (nodeBefore.text.length - link.text.length) // (start of link match) - (whole node text length - link length) gets start of text node, which is used as offset
     );
-    if ((0, _utils.isLinkInMatches)(start, filepaths)) {
+    if ((0, _hyperlink.isLinkInMatches)(start, filepaths)) {
       var _tr = state.tr;
       return _tr;
     }
@@ -73,13 +75,13 @@ function createLinkInputRule(regexp, editorAnalyticsApi) {
       tr.insertText(' ');
     }
     (0, _card.addLinkMetadata)(state.selection, tr, {
-      inputMethod: _analytics.INPUT_METHOD.AUTO_DETECT
+      inputMethod: _enums.INPUT_METHOD.AUTO_DETECT
     });
     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;
     if (skipAnalytics) {
       return tr;
     }
-    editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _utils.getLinkCreationAnalyticsEvent)(_analytics.INPUT_METHOD.AUTO_DETECT, url))(tr);
+    editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _hyperlink.getLinkCreationAnalyticsEvent)(_enums.INPUT_METHOD.AUTO_DETECT, url))(tr);
     return tr;
   });
 }
@@ -106,16 +108,16 @@ function createInputRulePlugin(schema, editorAnalyticsApi) {
     });
     var tr = state.tr.replaceWith(start + prefix.length, end, schema.text((linkText || '').trim(), [markType]));
     (0, _card.addLinkMetadata)(state.selection, tr, {
-      inputMethod: _analytics.INPUT_METHOD.FORMATTING
+      inputMethod: _enums.INPUT_METHOD.FORMATTING
     });
     var skipAnalytics = (_toolbarKey$getState$2 = (_toolbarKey$getState2 = _toolbarButtons.toolbarKey.getState(state)) === null || _toolbarKey$getState2 === void 0 ? void 0 : _toolbarKey$getState2.skipAnalytics) !== null && _toolbarKey$getState$2 !== void 0 ? _toolbarKey$getState$2 : false;
     if (skipAnalytics) {
       return tr;
     }
-    editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _utils.getLinkCreationAnalyticsEvent)(_analytics.INPUT_METHOD.FORMATTING, url))(tr);
+    editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _hyperlink.getLinkCreationAnalyticsEvent)(_enums.INPUT_METHOD.FORMATTING, url))(tr);
     return tr;
   });
-  return new _safePlugin.SafePlugin((0, _prosemirrorInputRules.createPlugin)('hyperlink', [urlWithASpaceRule, markdownLinkRule], autoLinkOnBlur ? {
+  return new _safePlugin.SafePlugin((0, _utils2.createPlugin)('hyperlink', [urlWithASpaceRule, markdownLinkRule], autoLinkOnBlur ? {
     checkOnBlur: true,
     appendTextOnBlur: ' '
   } : undefined));

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

@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.createKeymapPlugin = createKeymapPlugin;
 exports.default = void 0;
 var _getLinkMatch = require("@atlaskit/adf-schema/get-link-match");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _card = require("@atlaskit/editor-common/card");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _utils = require("@atlaskit/editor-common/utils");
+var _hyperlink = require("@atlaskit/editor-common/utils/hyperlink");
+var _shouldAutoLinkifyTld = require("@atlaskit/editor-common/utils/should-auto-linkify-tld");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _commands = require("../editor-commands/commands");
 var _main = require("../pm-plugins/main");
@@ -19,7 +20,7 @@ function createKeymapPlugin(editorAnalyticsApi) {
   (0, _keymaps.bindKeymapWithEditorCommand)(
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  _keymaps.addLink.common, (0, _commands.showLinkToolbar)(_analytics.INPUT_METHOD.SHORTCUT, editorAnalyticsApi), list);
+  _keymaps.addLink.common, (0, _commands.showLinkToolbar)(_enums.INPUT_METHOD.SHORTCUT, editorAnalyticsApi), list);
 
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -63,7 +64,7 @@ var mayConvertLastWordToHyperlink = function mayConvertLastWordToHyperlink(edito
     var lastWord = words[words.length - 1];
     var match = (0, _getLinkMatch.getLinkMatch)(lastWord);
     if (match) {
-      if (!(0, _utils.shouldAutoLinkifyMatch)(match)) {
+      if (!(0, _shouldAutoLinkifyTld.shouldAutoLinkifyMatch)(match)) {
         return false;
       }
       var hyperlinkedText = match.raw;
@@ -76,20 +77,20 @@ var mayConvertLastWordToHyperlink = function mayConvertLastWordToHyperlink(edito
       var markType = state.schema.mark('link', {
         href: url
       });
-      var filepaths = (0, _utils.findFilepaths)(nodeBefore.text, start - (nodeBefore.text.length - hyperlinkedText.length) // The position referenced by 'start' is relative to the start of the document, findFilepaths deals with index in a node only.
+      var filepaths = (0, _hyperlink.findFilepaths)(nodeBefore.text, start - (nodeBefore.text.length - hyperlinkedText.length) // The position referenced by 'start' is relative to the start of the document, findFilepaths deals with index in a node only.
       );
-      if ((0, _utils.isLinkInMatches)(start, filepaths)) {
+      if ((0, _hyperlink.isLinkInMatches)(start, filepaths)) {
         return false;
       }
       var tr = state.tr.addMark(start, end, markType);
       if (dispatch) {
         (0, _card.addLinkMetadata)(state.selection, tr, {
-          inputMethod: _analytics.INPUT_METHOD.AUTO_DETECT
+          inputMethod: _enums.INPUT_METHOD.AUTO_DETECT
         });
         if (skipAnalytics) {
           dispatch(tr);
         } else {
-          editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _utils.getLinkCreationAnalyticsEvent)(_analytics.INPUT_METHOD.AUTO_DETECT, url))(tr);
+          editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _hyperlink.getLinkCreationAnalyticsEvent)(_enums.INPUT_METHOD.AUTO_DETECT, url))(tr);
           dispatch(tr);
         }
       }

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

@@ -9,8 +9,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _uuid = require("uuid");
 var _isSafeUrl = require("@atlaskit/adf-schema/is-safe-url");
 var _link3 = require("@atlaskit/editor-common/link");
+var _utils = require("@atlaskit/editor-common/link/utils");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _utils = require("@atlaskit/editor-common/utils");
+var _utils2 = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 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; } // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
@@ -51,7 +52,7 @@ var toState = function toState(state, action, editorState) {
           var _editorState$selectio = editorState.selection,
             from = _editorState$selectio.from,
             to = _editorState$selectio.to;
-          if ((0, _utils.canLinkBeCreatedInRange)(from, to)(editorState)) {
+          if ((0, _utils2.canLinkBeCreatedInRange)(from, to)(editorState)) {
             return {
               type: _link3.InsertStatus.INSERT_LINK_TOOLBAR,
               from: from,
@@ -62,7 +63,7 @@ var toState = function toState(state, action, editorState) {
         }
       case _link3.LinkAction.SELECTION_CHANGE:
         // If the user has moved their cursor, see if they're in a link
-        var link = (0, _link3.getActiveLinkMark)(editorState);
+        var link = (0, _utils.getActiveLinkMark)(editorState);
         if (link) {
           return _objectSpread(_objectSpread({}, link), {}, {
             type: _link3.InsertStatus.EDIT_LINK_TOOLBAR
@@ -78,7 +79,7 @@ var toState = function toState(state, action, editorState) {
     switch (action) {
       case _link3.LinkAction.EDIT_INSERTED_TOOLBAR:
         {
-          var _link = (0, _link3.getActiveLinkMark)(editorState);
+          var _link = (0, _utils.getActiveLinkMark)(editorState);
           if (_link) {
             if (_link.pos === state.pos && _link.node === state.node) {
               return _objectSpread(_objectSpread({}, state), {}, {
@@ -92,7 +93,7 @@ var toState = function toState(state, action, editorState) {
           return undefined;
         }
       case _link3.LinkAction.SELECTION_CHANGE:
-        var _link2 = (0, _link3.getActiveLinkMark)(editorState);
+        var _link2 = (0, _utils.getActiveLinkMark)(editorState);
         if (_link2) {
           if (_link2.pos === state.pos && _link2.node === state.node) {
             // Make sure we return the same object, if it's the same link
@@ -137,7 +138,7 @@ var plugin = exports.plugin = function plugin(dispatch, intl, editorAppearance,
   return new _safePlugin.SafePlugin({
     state: {
       init: function init(_, state) {
-        var canInsertLink = (0, _utils.canLinkBeCreatedInRange)(state.selection.from, state.selection.to)(state);
+        var canInsertLink = (0, _utils2.canLinkBeCreatedInRange)(state.selection.from, state.selection.to)(state);
         return {
           activeText: getActiveText(state.selection),
           canInsertLink: canInsertLink,
@@ -153,7 +154,7 @@ var plugin = exports.plugin = function plugin(dispatch, intl, editorAppearance,
         if (tr.docChanged) {
           state = {
             activeText: state.activeText,
-            canInsertLink: (0, _utils.canLinkBeCreatedInRange)(newState.selection.from, newState.selection.to)(newState),
+            canInsertLink: (0, _utils2.canLinkBeCreatedInRange)(newState.selection.from, newState.selection.to)(newState),
             timesViewed: state.timesViewed,
             inputMethod: inputMethod,
             activeLinkMark: mapTransactionToState(state.activeLinkMark, tr),
@@ -181,7 +182,7 @@ var plugin = exports.plugin = function plugin(dispatch, intl, editorAppearance,
         if (tr.selectionSet && hasPositionChanged) {
           state = {
             activeText: getActiveText(newState.selection),
-            canInsertLink: (0, _utils.canLinkBeCreatedInRange)(newState.selection.from, newState.selection.to)(newState),
+            canInsertLink: (0, _utils2.canLinkBeCreatedInRange)(newState.selection.from, newState.selection.to)(newState),
             activeLinkMark: toState(state.activeLinkMark, _link3.LinkAction.SELECTION_CHANGE, newState),
             timesViewed: state.timesViewed,
             searchSessionId: state.searchSessionId,
@@ -189,7 +190,7 @@ var plugin = exports.plugin = function plugin(dispatch, intl, editorAppearance,
             editorAppearance: editorAppearance
           };
         }
-        if (!(0, _utils.shallowEqual)(state, pluginState)) {
+        if (!(0, _utils2.shallowEqual)(state, pluginState)) {
           dispatch(stateKey, state);
         }
         return state;

package/dist/cjs/ui/PrimaryToolbarComponent.js

@@ -8,10 +8,10 @@ exports.PrimaryToolbarComponent = void 0;
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
+var _ToolbarButton = _interopRequireDefault(require("@atlaskit/editor-common/ui-menu/ToolbarButton"));
 var _link = _interopRequireDefault(require("@atlaskit/icon/core/link"));
 /* eslint-disable @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation */
 /**
@@ -25,12 +25,12 @@ var PrimaryToolbarComponentWithIntl = function PrimaryToolbarComponentWithIntl(_
   var api = _ref.api,
     intl = _ref.intl;
   var formatMessage = intl.formatMessage;
-  var content = formatMessage(_messages.toolbarInsertBlockMessages.link);
+  var content = formatMessage(_insertBlock.toolbarInsertBlockMessages.link);
   var onClick = (0, _react.useCallback)(function () {
     var _api$core, _api$hyperlink;
-    api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$hyperlink = api.hyperlink) === null || _api$hyperlink === void 0 ? void 0 : _api$hyperlink.commands.showLinkToolbar(_analytics.INPUT_METHOD.TOOLBAR));
+    api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$hyperlink = api.hyperlink) === null || _api$hyperlink === void 0 ? void 0 : _api$hyperlink.commands.showLinkToolbar(_enums.INPUT_METHOD.TOOLBAR));
   }, [api]);
-  return (0, _react2.jsx)(_uiMenu.ToolbarButton, {
+  return (0, _react2.jsx)(_ToolbarButton.default, {
     onClick: onClick,
     "aria-haspopup": "dialog",
     "aria-keyshortcuts": (0, _keymaps.getAriaKeyshortcuts)(_keymaps.addLink),

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

@@ -8,12 +8,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.HyperlinkQuickInsertMenuItem = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _link = require("@atlaskit/editor-common/link");
-var _messages = require("@atlaskit/editor-common/messages");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
 var _menuItem = require("@atlaskit/editor-common/quick-insert/menu-item");
-var _messages2 = require("@atlaskit/editor-common/quick-insert/messages");
+var _messages = require("@atlaskit/editor-common/quick-insert/messages");
 var _link2 = _interopRequireDefault(require("@atlaskit/icon/core/link"));
 var _main = require("../../pm-plugins/main");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -29,7 +29,7 @@ var HyperlinkQuickInsertMenuItem = exports.HyperlinkQuickInsertMenuItem = functi
     return {
       image: previewImageUrls,
       attribution: {
-        name: formatMessage(_messages2.messages.previewAttributionAtlassian)
+        name: formatMessage(_messages.messages.previewAttributionAtlassian)
       }
     };
   }, [formatMessage]);
@@ -39,27 +39,27 @@ var HyperlinkQuickInsertMenuItem = exports.HyperlinkQuickInsertMenuItem = functi
     var tr = insert(undefined);
     tr.setMeta(_main.stateKey, {
       type: _link.LinkAction.SHOW_INSERT_TOOLBAR,
-      inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
+      inputMethod: _enums.INPUT_METHOD.QUICK_INSERT
     });
     var analyticsAttached = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || (_api$analytics$attach = _api$analytics.attachAnalyticsEvent) === null || _api$analytics$attach === void 0 ? void 0 : _api$analytics$attach.call(_api$analytics, {
-      action: _analytics.ACTION.INVOKED,
-      actionSubject: _analytics.ACTION_SUBJECT.TYPEAHEAD,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.TYPEAHEAD_LINK,
+      action: _enums.ACTION.INVOKED,
+      actionSubject: _enums.ACTION_SUBJECT.TYPEAHEAD,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.TYPEAHEAD_LINK,
       attributes: {
-        inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
+        inputMethod: _enums.INPUT_METHOD.QUICK_INSERT
       },
-      eventType: _analytics.EVENT_TYPE.UI
+      eventType: _enums.EVENT_TYPE.UI
     })(tr);
     return analyticsAttached !== false ? tr : false;
   }, [api]);
   return /*#__PURE__*/_react.default.createElement(_menuItem.QuickInsertMenuItem, {
-    description: formatMessage(_messages.toolbarInsertBlockMessages.linkDescription),
+    description: formatMessage(_insertBlock.toolbarInsertBlockMessages.linkDescription),
     iconBefore: /*#__PURE__*/_react.default.createElement(_link2.default, {
       label: ""
     }),
     onSelect: onSelect,
     preview: preview,
     shortcut: (0, _keymaps.tooltip)(_keymaps.addLink),
-    title: formatMessage(_messages.toolbarInsertBlockMessages.link)
+    title: formatMessage(_insertBlock.toolbarInsertBlockMessages.link)
   });
 };

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

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getHyperlinkQuickInsertComponents = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
 var _createQuickInsertMatcher = require("@atlaskit/editor-common/quick-insert/create-quick-insert-matcher");
 var _keys = require("@atlaskit/editor-common/quick-insert/keys");
 var _rank = require("@atlaskit/editor-common/quick-insert/rank");
@@ -25,10 +25,10 @@ var getHyperlinkQuickInsertComponents = exports.getHyperlinkQuickInsertComponent
     match: (0, _createQuickInsertMatcher.createQuickInsertMatcher)(function (_ref2) {
       var formatMessage = _ref2.formatMessage;
       return {
-        description: formatMessage(_messages.toolbarInsertBlockMessages.linkDescription),
+        description: formatMessage(_insertBlock.toolbarInsertBlockMessages.linkDescription),
         keywords: ['hyperlink', 'url'],
         shortcut: (0, _keymaps.tooltip)(_keymaps.addLink),
-        title: formatMessage(_messages.toolbarInsertBlockMessages.link)
+        title: formatMessage(_insertBlock.toolbarInsertBlockMessages.link)
       };
     }),
     component: function component() {

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

@@ -7,31 +7,33 @@ Object.defineProperty(exports, "__esModule", {
 exports.LinkButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _hooks = require("@atlaskit/editor-common/hooks");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _linkIcon = require("@atlaskit/editor-toolbar/link-icon");
+var _toolbarButton = require("@atlaskit/editor-toolbar/toolbar-button");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
 var LinkButton = exports.LinkButton = function LinkButton(_ref) {
   var api = _ref.api;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var canInsertLink = (0, _hooks.useSharedPluginStateWithSelector)(api, ['hyperlink'], function (state) {
+  var canInsertLink = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['hyperlink'], function (state) {
     var _state$hyperlinkState, _state$hyperlinkState2;
     return (_state$hyperlinkState = state === null || state === void 0 || (_state$hyperlinkState2 = state.hyperlinkState) === null || _state$hyperlinkState2 === void 0 ? void 0 : _state$hyperlinkState2.canInsertLink) !== null && _state$hyperlinkState !== void 0 ? _state$hyperlinkState : true;
   });
   var onClick = function onClick() {
-    api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.hyperlink.commands.showLinkToolbar(_analytics.INPUT_METHOD.FLOATING_TB));
+    api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.hyperlink.commands.showLinkToolbar(_enums.INPUT_METHOD.FLOATING_TB));
   };
   var isEnabled = canInsertLink;
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
     content: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
-      description: formatMessage(_messages.toolbarInsertBlockMessages.link),
+      description: formatMessage(_insertBlock.toolbarInsertBlockMessages.link),
       keymap: _keymaps.addLink
     })
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.LinkIcon, {
-      label: formatMessage(_messages.toolbarInsertBlockMessages.link),
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_linkIcon.LinkIcon, {
+      label: formatMessage(_insertBlock.toolbarInsertBlockMessages.link),
       size: "small"
     }),
     onClick: onClick,