@atlaskit/editor-plugin-card 32.1.3 → 32.1.6

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

@@ -10,10 +10,15 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _isSafeUrl = require("@atlaskit/adf-schema/is-safe-url");
-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 _nodeEvents = require("@atlaskit/editor-common/analytics/types/node-events");
 var _card = require("@atlaskit/editor-common/card");
-var _link = require("@atlaskit/editor-common/link");
-var _utils = require("@atlaskit/editor-common/utils");
+var _utils = require("@atlaskit/editor-common/link/utils");
+var _processRawValue3 = require("@atlaskit/editor-common/process-raw-value");
+var _annotation = require("@atlaskit/editor-common/utils/annotation");
+var _document = require("@atlaskit/editor-common/utils/document");
+var _hyperlink = require("@atlaskit/editor-common/utils/hyperlink");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _closeHistory = require("@atlaskit/prosemirror-history/closeHistory");
@@ -53,7 +58,7 @@ function replaceLinksToCards(tr, cardAdf, schema, request) {
     nodes.push(schema.text(' '));
   }
   tr.replaceWith(pos, pos + (node.text || url).length, nodes);
-  var annotationMarksForPos = (0, _utils.getAnnotationMarksForPos)($head);
+  var annotationMarksForPos = (0, _annotation.getAnnotationMarksForPos)($head);
   if (annotationMarksForPos && annotationMarksForPos.length > 0) {
     annotationMarksForPos.forEach(function (annotationMark) {
       // Add the annotation mark on to the inlineCard node and the trailing space node.
@@ -99,7 +104,7 @@ var replaceQueuedUrlWithCard = exports.replaceQueuedUrlWithCard = function repla
           // Build a fresh transaction (editorState is the snapshot at call-time; positions
           // are mapped through it). For the async case we fall back to cardData if the
           // transform returned nothing, mirroring what the sync path would do.
-          var asyncCardAdf = resolvedNode ? resolvedNode : (_processRawValue = (0, _utils.processRawValue)(schema, cardData)) !== null && _processRawValue !== void 0 ? _processRawValue : null;
+          var asyncCardAdf = resolvedNode ? resolvedNode : (_processRawValue = (0, _processRawValue3.processRawValue)(schema, cardData)) !== null && _processRawValue !== void 0 ? _processRawValue : null;
           var asyncTr = editorState.tr;
           if (asyncCardAdf) {
             pendingRequests.forEach(function (request) {
@@ -114,7 +119,7 @@ var replaceQueuedUrlWithCard = exports.replaceQueuedUrlWithCard = function repla
     }
     if (!cardAdf) {
       var _processRawValue2;
-      cardAdf = (_processRawValue2 = (0, _utils.processRawValue)(schema, cardData)) !== null && _processRawValue2 !== void 0 ? _processRawValue2 : null;
+      cardAdf = (_processRawValue2 = (0, _processRawValue3.processRawValue)(schema, cardData)) !== null && _processRawValue2 !== void 0 ? _processRawValue2 : null;
     }
     var tr = editorState.tr;
     if (cardAdf) {
@@ -150,15 +155,15 @@ var replaceQueuedUrlWithCard = exports.replaceQueuedUrlWithCard = function repla
         var sourceEvent = requests[0].sourceEvent;
         editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          action: analyticsAction || _analytics.ACTION.INSERTED,
-          actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-          actionSubjectId: _analytics.ACTION_SUBJECT_ID.SMART_LINK,
-          eventType: _analytics.EVENT_TYPE.TRACK,
+          action: analyticsAction || _enums.ACTION.INSERTED,
+          actionSubject: _enums.ACTION_SUBJECT.DOCUMENT,
+          actionSubjectId: _enums.ACTION_SUBJECT_ID.SMART_LINK,
+          eventType: _enums.EVENT_TYPE.TRACK,
           attributes: {
             inputMethod: inputMethod,
             nodeType: nodeType,
             nodeContext: nodeContext,
-            fromCurrentDomain: (0, _utils.isFromCurrentDomain)(url)
+            fromCurrentDomain: (0, _hyperlink.isFromCurrentDomain)(url)
           },
           nonPrivacySafeAttributes: {
             domainName: domainName
@@ -185,8 +190,8 @@ var handleFallbackWithAnalytics = exports.handleFallbackWithAnalytics = function
       return false;
     }
     var tr = state.tr;
-    if (request.source !== _analytics.INPUT_METHOD.FLOATING_TB) {
-      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _utils.getLinkCreationAnalyticsEvent)(request.source, request.url))(tr);
+    if (request.source !== _enums.INPUT_METHOD.FLOATING_TB) {
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _hyperlink.getLinkCreationAnalyticsEvent)(request.source, request.url))(tr);
     }
     (0, _card.addLinkMetadata)(state.selection, tr, {
       action: request.analyticsAction,
@@ -253,7 +258,7 @@ var queueCardsFromChangedTr = exports.queueCardsFromChangedTr = function queueCa
     source: source,
     sourceEvent: sourceEvent
   };
-  (0, _utils.nodesBetweenChanged)(tr, function (node, pos) {
+  (0, _document.nodesBetweenChanged)(tr, function (node, pos) {
     return collectLinkRequest(requests, node, pos, options);
   });
   if (analyticsAction) {
@@ -308,7 +313,7 @@ var queueCardFromChangedTr = exports.queueCardFromChangedTr = function queueCard
   var schema = state.schema;
   var link = schema.marks.link;
   var requests = [];
-  (0, _utils.nodesBetweenChanged)(tr, function (node, pos) {
+  (0, _document.nodesBetweenChanged)(tr, function (node, pos) {
     if (!node.isText) {
       return true;
     }
@@ -350,12 +355,12 @@ var convertHyperlinkToSmartCard = exports.convertHyperlinkToSmartCard = function
       previousAppearance: 'url',
       compareLinkText: normalizeLinkText,
       source: source,
-      analyticsAction: _analytics.ACTION.CHANGED_TYPE,
+      analyticsAction: _enums.ACTION.CHANGED_TYPE,
       shouldReplaceLink: true
     };
   };
   if ((0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1')) {
-    var activeLinkMark = (0, _link.getActiveLinkMark)(state);
+    var activeLinkMark = (0, _utils.getActiveLinkMark)(state);
     if (activeLinkMark) {
       var linkMark = activeLinkMark.node.marks.find(function (mark) {
         return mark.type === link;
@@ -375,7 +380,7 @@ var convertHyperlinkToSmartCard = exports.convertHyperlinkToSmartCard = function
     });
   }
   (0, _card.addLinkMetadata)(state.selection, state.tr, {
-    action: _analytics.ACTION.CHANGED_TYPE
+    action: _enums.ACTION.CHANGED_TYPE
   });
   return (0, _actions.queueCards)(requests)(state.tr);
 };
@@ -392,11 +397,11 @@ var changeSelectedCardToLink = exports.changeSelectedCardToLink = function chang
     if (sendAnalytics) {
       if (selectedNode) {
         editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
-          action: _analytics.ACTION.CHANGED_TYPE,
-          actionSubject: _analytics.ACTION_SUBJECT.SMART_LINK,
-          eventType: _analytics.EVENT_TYPE.TRACK,
+          action: _enums.ACTION.CHANGED_TYPE,
+          actionSubject: _enums.ACTION_SUBJECT.SMART_LINK,
+          eventType: _enums.EVENT_TYPE.TRACK,
           attributes: {
-            newType: _analytics.SMART_LINK_TYPE.URL,
+            newType: _nodeEvents.SMART_LINK_TYPE.URL,
             previousType: (0, _utils2.appearanceForNodeType)(selectedNode.type)
           }
         })(tr);
@@ -418,9 +423,9 @@ var changeSelectedCardToLinkFallback = exports.changeSelectedCardToLinkFallback
     }
     if (sendAnalytics) {
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
-        action: _analytics.ACTION.ERRORED,
-        actionSubject: _analytics.ACTION_SUBJECT.SMART_LINK,
-        eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+        action: _enums.ACTION.ERRORED,
+        actionSubject: _enums.ACTION_SUBJECT.SMART_LINK,
+        eventType: _enums.EVENT_TYPE.OPERATIONAL,
         attributes: {
           error: 'Smart card falling back to link.'
         }
@@ -440,7 +445,7 @@ var updateCard = exports.updateCard = function updateCard(href, sourceEvent) {
     }
     var cardAppearance = (0, _utils2.selectedCardAppearance)(state);
     var tr = cardToLinkWithTransaction(state, href, href);
-    queueCardFromChangedTr(state, tr, _analytics.INPUT_METHOD.MANUAL, _analytics.ACTION.UPDATED, undefined, sourceEvent, cardAppearance);
+    queueCardFromChangedTr(state, tr, _enums.INPUT_METHOD.MANUAL, _enums.ACTION.UPDATED, undefined, sourceEvent, cardAppearance);
     if (dispatch) {
       dispatch(tr.scrollIntoView());
     }
@@ -475,10 +480,10 @@ var changeSelectedCardToText = exports.changeSelectedCardToText = function chang
     var tr = state.tr.replaceSelectionWith(state.schema.text(text), false);
     if (dispatch) {
       (0, _card.addLinkMetadata)(state.selection, tr, {
-        action: _analytics.ACTION.UNLINK
+        action: _enums.ACTION.UNLINK
       });
       tr.scrollIntoView();
-      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _analytics.unlinkPayload)(_analytics.ACTION_SUBJECT_ID.CARD_INLINE))(tr);
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _linkingUtils.unlinkPayload)(_enums.ACTION_SUBJECT_ID.CARD_INLINE))(tr);
       dispatch(tr);
     }
     return true;
@@ -491,10 +496,10 @@ var setSelectedCardAppearance = exports.setSelectedCardAppearance = function set
     if (!selectedNode) {
       // When there is no selected node, we insert a new one
       // and replace the existing blue link
-      var _tr = convertHyperlinkToSmartCard(state, _analytics.INPUT_METHOD.FLOATING_TB, appearance);
+      var _tr = convertHyperlinkToSmartCard(state, _enums.INPUT_METHOD.FLOATING_TB, appearance);
       if (dispatch) {
         (0, _card.addLinkMetadata)(state.selection, _tr, {
-          action: _analytics.ACTION.CHANGED_TYPE
+          action: _enums.ACTION.CHANGED_TYPE
         });
         dispatch(_tr.scrollIntoView());
       }
@@ -522,16 +527,16 @@ var setSelectedCardAppearance = exports.setSelectedCardAppearance = function set
           augmentTransaction: function augmentTransaction(augmentTr) {
             updateDatasourceStash(augmentTr, selectedNode);
             editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
-              action: _analytics.ACTION.CHANGED_TYPE,
-              actionSubject: _analytics.ACTION_SUBJECT.SMART_LINK,
-              eventType: _analytics.EVENT_TYPE.TRACK,
+              action: _enums.ACTION.CHANGED_TYPE,
+              actionSubject: _enums.ACTION_SUBJECT.SMART_LINK,
+              eventType: _enums.EVENT_TYPE.TRACK,
               attributes: {
                 newType: appearance,
                 previousType: (0, _utils2.appearanceForNodeType)(selectedNode.type)
               }
             })(augmentTr);
             (0, _card.addLinkMetadata)(state.selection, augmentTr, {
-              action: _analytics.ACTION.CHANGED_TYPE
+              action: _enums.ACTION.CHANGED_TYPE
             });
           }
         });
@@ -553,16 +558,16 @@ var setSelectedCardAppearance = exports.setSelectedCardAppearance = function set
       tr.delete(previousNodePos, from);
     }
     editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
-      action: _analytics.ACTION.CHANGED_TYPE,
-      actionSubject: _analytics.ACTION_SUBJECT.SMART_LINK,
-      eventType: _analytics.EVENT_TYPE.TRACK,
+      action: _enums.ACTION.CHANGED_TYPE,
+      actionSubject: _enums.ACTION_SUBJECT.SMART_LINK,
+      eventType: _enums.EVENT_TYPE.TRACK,
       attributes: {
         newType: appearance,
         previousType: (0, _utils2.appearanceForNodeType)(selectedNode.type)
       }
     })(tr);
     (0, _card.addLinkMetadata)(state.selection, tr, {
-      action: _analytics.ACTION.CHANGED_TYPE
+      action: _enums.ACTION.CHANGED_TYPE
     });
     if (dispatch) {
       dispatch(tr.scrollIntoView());
@@ -643,7 +648,7 @@ var updateCardViaDatasource = exports.updateCardViaDatasource = function updateC
     tr.setNodeMarkup(from, schemaNodes.inlineCard, newAdf.attrs);
   }
   (0, _card.addLinkMetadata)(state.selection, tr, {
-    action: _analytics.ACTION.UPDATED,
+    action: _enums.ACTION.UPDATED,
     sourceEvent: sourceEvent,
     inputMethod: inputMethod
   });
@@ -669,7 +674,7 @@ var insertDatasource = exports.insertDatasource = function insertDatasource(stat
   newNode && tr.insert(from, newNode);
   (0, _actions.hideDatasourceModal)(tr);
   (0, _card.addLinkMetadata)(state.selection, tr, {
-    action: _analytics.ACTION.INSERTED,
+    action: _enums.ACTION.INSERTED,
     sourceEvent: sourceEvent
   });
   view.dispatch(tr.scrollIntoView());

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

@@ -8,10 +8,10 @@ exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
-var _coreUtils = require("@atlaskit/editor-common/core-utils");
-var _reactNodeView = require("@atlaskit/editor-common/react-node-view");
+var _getInlineNodeViewProducer = require("@atlaskit/editor-common/getInlineNodeViewProducer");
+var _isSsr = require("@atlaskit/editor-common/is-ssr");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _styles = require("@atlaskit/editor-common/styles");
+var _smartCard = require("@atlaskit/editor-common/styles/smartCard");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _constants = require("@atlaskit/linking-common/constants");
@@ -63,7 +63,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
       embedCardTransformers = options.embedCardTransformers;
     var intl = pmPluginFactoryParams.getIntl();
     var enableInlineUpgradeFeatures = !!showUpgradeDiscoverability;
-    var inlineCardViewProducer = (0, _reactNodeView.getInlineNodeViewProducer)({
+    var inlineCardViewProducer = (0, _getInlineNodeViewProducer.getInlineNodeViewProducer)({
       pmPluginFactoryParams: pmPluginFactoryParams,
       Component: _inlineCard.InlineCardNodeView,
       extraComponentProps: {
@@ -76,7 +76,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
         onClickCallback: onClickCallback,
         isPageSSRed: isPageSSRed,
         provider: provider,
-        CompetitorPrompt: (0, _coreUtils.isSSR)() ? undefined : CompetitorPrompt,
+        CompetitorPrompt: (0, _isSsr.isSSR)() ? undefined : CompetitorPrompt,
         intl: intl,
         smartCardContext: smartCardContext
       }
@@ -199,7 +199,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
               // eslint-disable-next-line @atlaskit/editor/no-as-casting
               var datasourceTableRef = // Ignored via go/ees005
               // eslint-disable-next-line @atlaskit/editor/no-as-casting
-              (_findDomRefAtPos = (0, _utils.findDomRefAtPos)(selection.from, domAtPos)) === null || _findDomRefAtPos === void 0 ? void 0 : _findDomRefAtPos.querySelector(".".concat(_styles.DATASOURCE_INNER_CONTAINER_CLASSNAME));
+              (_findDomRefAtPos = (0, _utils.findDomRefAtPos)(selection.from, domAtPos)) === null || _findDomRefAtPos === void 0 ? void 0 : _findDomRefAtPos.querySelector(".".concat(_smartCard.DATASOURCE_INNER_CONTAINER_CLASSNAME));
               var node = selection.node;
               var isDatasource = !!(node !== null && node !== void 0 && (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.datasource);
               var shouldUpdateTableRef = datasourceTableRef && (currentState === null || currentState === void 0 ? void 0 : currentState.datasourceTableRef) !== datasourceTableRef;
@@ -277,7 +277,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
             inlineCardViewProducer: inlineCardViewProducer,
             isPageSSRed: isPageSSRed,
             provider: provider,
-            CompetitorPrompt: (0, _coreUtils.isSSR)() ? undefined : options.CompetitorPrompt,
+            CompetitorPrompt: (0, _isSsr.isSSR)() ? undefined : options.CompetitorPrompt,
             intl: intl,
             smartCardContext: smartCardContext
           }),
@@ -290,7 +290,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
             onClickCallback: options.onClickCallback,
             isPageSSRed: isPageSSRed,
             provider: provider,
-            CompetitorPrompt: (0, _coreUtils.isSSR)() ? undefined : options.CompetitorPrompt,
+            CompetitorPrompt: (0, _isSsr.isSSR)() ? undefined : options.CompetitorPrompt,
             intl: intl,
             smartCardContext: smartCardContext
           })

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.shouldReplaceLink = shouldReplaceLink;
 var _normalizeUrl = require("@atlaskit/adf-schema/normalize-url");
-var _paste = require("@atlaskit/editor-common/paste");
+var _md = require("@atlaskit/editor-common/paste/md");
 function shouldReplaceLink(node) {
   var compareLinkText = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   var compareToUrl = arguments.length > 2 ? arguments[2] : undefined;
@@ -20,13 +20,13 @@ function shouldReplaceLink(node) {
   // ED-6041: compare normalised link text after linkfy from Markdown transformer
   // instead, since it always decodes URL ('%20' -> ' ') on the link text
 
-  var normalisedHref = (0, _normalizeUrl.normalizeUrl)(_paste.md.normalizeLinkText(linkMark.attrs.href));
-  var normalizedLinkText = (0, _normalizeUrl.normalizeUrl)(_paste.md.normalizeLinkText(node.text || ''));
+  var normalisedHref = (0, _normalizeUrl.normalizeUrl)(_md.md.normalizeLinkText(linkMark.attrs.href));
+  var normalizedLinkText = (0, _normalizeUrl.normalizeUrl)(_md.md.normalizeLinkText(node.text || ''));
   if (compareLinkText && normalisedHref !== normalizedLinkText) {
     return false;
   }
   if (compareToUrl) {
-    var normalizedUrl = (0, _normalizeUrl.normalizeUrl)(_paste.md.normalizeLinkText(compareToUrl));
+    var normalizedUrl = (0, _normalizeUrl.normalizeUrl)(_md.md.normalizeLinkText(compareToUrl));
     if (normalizedUrl !== normalisedHref) {
       return false;
     }

package/dist/cjs/pm-plugins/util/resolve.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.resolveWithProvider = exports.handleProvider = void 0;
 var _utils = require("@atlaskit/editor-common/utils");
+var _datasource = require("@atlaskit/editor-common/utils/datasource");
 var _actions = require("../actions");
 var _doc = require("../doc");
 var isFreshlyPastedOnNewLine = function isFreshlyPastedOnNewLine(view) {
@@ -48,7 +49,7 @@ var resolveWithProvider = exports.resolveWithProvider = function resolveWithProv
 var updateCardType = function updateCardType(resolvedCard, options) {
   if (resolvedCard.type === 'blockCard' && 'datasource' in resolvedCard.attrs) {
     var datasourceId = resolvedCard.attrs.datasource.id;
-    if (!options.allowDatasource || !(0, _utils.canRenderDatasource)(datasourceId)) {
+    if (!options.allowDatasource || !(0, _datasource.canRenderDatasource)(datasourceId)) {
       delete resolvedCard.attrs.datasource;
       resolvedCard.type = 'inlineCard';
       return;

package/dist/cjs/ui/ConfigureOverlay/index.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
-var _link = require("@atlaskit/editor-common/link");
+var _ConfigureLinkOverlay = require("@atlaskit/editor-common/link/ConfigureLinkOverlay");
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -59,7 +59,7 @@ var OverlayWrapper = function OverlayWrapper(_ref) {
     "data-testid": "inline-card-overlay-wrapper"
   }, (0, _react2.jsx)("span", {
     css: ConfigureOverlayWrapperStyles
-  }, showConfigureButton && (0, _react2.jsx)(_link.OverlayButton, {
+  }, showConfigureButton && (0, _react2.jsx)(_ConfigureLinkOverlay.OverlayButton, {
     editorView: view,
     targetElementPos: targetElementPos,
     onDropdownChange: onDropdownChange,

package/dist/cjs/ui/DatasourceAppearanceButton.js

@@ -1,14 +1,15 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DatasourceAppearanceButton = void 0;
 var _react = require("react");
 var _react2 = require("@emotion/react");
-var _messages = require("@atlaskit/editor-common/messages");
-var _ui = require("@atlaskit/editor-common/ui");
-var _utils = require("@atlaskit/editor-common/utils");
+var _Button = _interopRequireDefault(require("@atlaskit/editor-common/FloatingToolbar/Button"));
+var _card = require("@atlaskit/editor-common/messages/card");
+var _datasource = require("@atlaskit/editor-common/utils/datasource");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _schema = require("@atlaskit/link-datasource/utils/schema");
 var _useSmartLinkContext = require("@atlaskit/link-provider/use-smart-link-context");
@@ -83,7 +84,7 @@ var DatasourceAppearanceButtonWithCardContext = function DatasourceAppearanceBut
       });
     }
   }, [parameters, datasourceId, inputMethod, editorState, editorView, url]);
-  if (!parameters || !datasourceId || !(0, _utils.canRenderDatasource)(datasourceId)) {
+  if (!parameters || !datasourceId || !(0, _datasource.canRenderDatasource)(datasourceId)) {
     return null;
   }
   if (url) {
@@ -93,8 +94,8 @@ var DatasourceAppearanceButtonWithCardContext = function DatasourceAppearanceBut
       return null;
     }
   }
-  var buttonLabel = intl.formatMessage(_messages.cardMessages.datasourceAppearanceTitle);
-  return (0, _react2.jsx)(_compiled.Flex, null, (0, _react2.jsx)(_ui.FloatingToolbarButton, {
+  var buttonLabel = intl.formatMessage(_card.messages.datasourceAppearanceTitle);
+  return (0, _react2.jsx)(_compiled.Flex, null, (0, _react2.jsx)(_Button.default, {
     css: buttonStyles,
     title: buttonLabel,
     icon: (0, _react2.jsx)(_DatasourceIcon.DatasourceIcon, {

package/dist/cjs/ui/DatasourceDropdownOption.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.datasourceDisplayInformation = exports.DatasourceDropdownOption = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _messages = require("@atlaskit/editor-common/messages");
+var _card = require("@atlaskit/editor-common/messages/card");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _smartLinkList = _interopRequireDefault(require("@atlaskit/icon/core/smart-link-list"));
 var _schema = require("@atlaskit/link-datasource/utils/schema");
@@ -16,7 +16,7 @@ var _doc = require("../pm-plugins/doc");
 var _pluginKey = require("../pm-plugins/plugin-key");
 var _useFetchDatasourceInfo = require("./useFetchDatasourceInfo");
 var datasourceDisplayInformation = exports.datasourceDisplayInformation = {
-  title: _messages.cardMessages.datasourceAppearanceTitle,
+  title: _card.messages.datasourceAppearanceTitle,
   icon: _smartLinkList.default,
   // eslint-disable-next-line @atlaskit/editor/no-re-export
   iconFallback: _smartLinkList.default
@@ -89,9 +89,9 @@ var DatasourceDropdownOption = exports.DatasourceDropdownOption = function Datas
     }
   }
   return /*#__PURE__*/_react.default.createElement(_buttonItem.default, {
-    key: intl.formatMessage(_messages.cardMessages.datasourceAppearanceTitle),
+    key: intl.formatMessage(_card.messages.datasourceAppearanceTitle),
     iconBefore: (0, _smartLinkList.default)({
-      label: intl.formatMessage(_messages.cardMessages.datasourceAppearanceTitle)
+      label: intl.formatMessage(_card.messages.datasourceAppearanceTitle)
     })
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     ,
@@ -99,5 +99,5 @@ var DatasourceDropdownOption = exports.DatasourceDropdownOption = function Datas
       return dispatchCommand(onChangeAppearance);
     },
     isSelected: selected
-  }, intl.formatMessage(_messages.cardMessages.datasourceAppearanceTitle));
+  }, intl.formatMessage(_card.messages.datasourceAppearanceTitle));
 };

package/dist/cjs/ui/DatasourceModal/ModalWithState.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.modalTypeToComponentMap = exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _hooks = require("@atlaskit/editor-common/hooks");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
 var _assetsConfigModalWithWrappers = require("@atlaskit/link-datasource/assets-config-modal-with-wrappers");
 var _assetsModal = require("@atlaskit/link-datasource/assets-modal");
 var _confluenceSearchConfigModalWithWrappers = require("@atlaskit/link-datasource/confluence-search-config-modal-with-wrappers");
@@ -28,7 +28,7 @@ var ModalWithState = function ModalWithState(_ref) {
   var api = _ref.api,
     editorView = _ref.editorView;
   var cardContext = (0, _useSmartLinkContext.useSmartLinkContext)();
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['card'], selector),
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['card'], selector),
     showDatasourceModal = _useSharedPluginState.showDatasourceModal,
     datasourceModalType = _useSharedPluginState.datasourceModalType;
   if (!showDatasourceModal || !datasourceModalType) {

package/dist/cjs/ui/EditLinkToolbar.js

@@ -13,15 +13,16 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _react = _interopRequireDefault(require("react"));
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _card = require("@atlaskit/editor-common/card");
-var _link = require("@atlaskit/editor-common/link");
-var _messages = require("@atlaskit/editor-common/messages");
-var _ui = require("@atlaskit/editor-common/ui");
+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 _linkSearchConstants = require("@atlaskit/editor-common/link-search-constants");
+var _HyperlinkAddToolbar = require("@atlaskit/editor-common/link/HyperlinkAddToolbar");
+var _linkToolbar = require("@atlaskit/editor-common/messages/link-toolbar");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _actions = require("../pm-plugins/actions");
 var _doc = require("../pm-plugins/doc");
-var _utils = require("../pm-plugins/utils");
+var _utils2 = require("../pm-plugins/utils");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function HyperlinkAddToolbarWithState(_ref) {
@@ -38,7 +39,7 @@ function HyperlinkAddToolbarWithState(_ref) {
     onClose = _ref.onClose,
     onEscapeCallback = _ref.onEscapeCallback,
     onClickAwayCallback = _ref.onClickAwayCallback;
-  return /*#__PURE__*/_react.default.createElement(_link.HyperlinkAddToolbar, {
+  return /*#__PURE__*/_react.default.createElement(_HyperlinkAddToolbar.HyperlinkAddToolbar, {
     linkPickerOptions: linkPickerOptions,
     onSubmit: onSubmit,
     displayText: displayText,
@@ -101,7 +102,7 @@ var EditLinkToolbar = exports.EditLinkToolbar = /*#__PURE__*/function (_React$Co
         // Assumes that the smart card link picker can only ever be invoked by clicking "edit"
         // via the floating toolbar
         ,
-        invokeMethod: _analytics.INPUT_METHOD.FLOATING_TB,
+        invokeMethod: _enums.INPUT_METHOD.FLOATING_TB,
         lpLinkPicker: lpLinkPicker
         // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
         ,
@@ -116,7 +117,7 @@ var EditLinkToolbar = exports.EditLinkToolbar = /*#__PURE__*/function (_React$Co
         onEscapeCallback: function onEscapeCallback(state, dispatch) {
           var tr = state.tr;
           (0, _actions.hideLinkToolbar)(tr);
-          forceFocusSelector === null || forceFocusSelector === void 0 || forceFocusSelector("[aria-label=\"".concat(_messages.linkToolbarMessages.editLink.defaultMessage, "\"]"))(tr);
+          forceFocusSelector === null || forceFocusSelector === void 0 || forceFocusSelector("[aria-label=\"".concat(_linkToolbar.linkToolbarMessages.editLink.defaultMessage, "\"]"))(tr);
           if (dispatch) {
             dispatch(tr);
             return true;
@@ -146,7 +147,7 @@ var getEditLinkCallback = exports.getEditLinkCallback = function getEditLinkCall
     if (dispatch) {
       var tr = state.tr;
       (0, _actions.showLinkToolbar)(tr);
-      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _analytics.buildEditLinkPayload)(type))(tr);
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent((0, _linkingUtils.buildEditLinkPayload)(type))(tr);
       tr.setMeta('scrollIntoView', scrollIntoView);
       dispatch(tr);
       return true;
@@ -169,7 +170,7 @@ var buildEditLinkToolbar = exports.buildEditLinkToolbar = function buildEditLink
       if (!view || !providerFactory) {
         return null;
       }
-      var displayInfo = (0, _utils.displayInfoForCard)(node, (0, _utils.findCardInfo)(view.state));
+      var displayInfo = (0, _utils2.displayInfoForCard)(node, (0, _utils2.findCardInfo)(view.state));
       return /*#__PURE__*/_react.default.createElement(EditLinkToolbar, {
         key: idx,
         view: view,
@@ -190,8 +191,8 @@ var buildEditLinkToolbar = exports.buildEditLinkToolbar = function buildEditLink
           // (even if the url was also changed) - we don't want to lose the custom title.
           if (titleChanged) {
             var _pluginInjectionApi$a;
-            return (0, _card.commandWithMetadata)((0, _doc.changeSelectedCardToLink)(newText, newHref, undefined, undefined, undefined, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions), {
-              action: _analytics.ACTION.UPDATED,
+            return (0, _utils.commandWithMetadata)((0, _doc.changeSelectedCardToLink)(newText, newHref, undefined, undefined, undefined, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions), {
+              action: _enums.ACTION.UPDATED,
               inputMethod: inputMethod,
               sourceEvent: analytic
             })(view.state, view.dispatch);
@@ -211,8 +212,8 @@ var editLinkToolbarConfig = exports.editLinkToolbarConfig = function editLinkToo
     return {};
   }
   return {
-    height: (_linkPickerOptions$po = linkPickerOptions === null || linkPickerOptions === void 0 ? void 0 : linkPickerOptions.popupHeight) !== null && _linkPickerOptions$po !== void 0 ? _linkPickerOptions$po : lpLinkPicker ? _ui.LINKPICKER_HEIGHT_IN_PX : _ui.RECENT_SEARCH_HEIGHT_IN_PX,
-    width: (_linkPickerOptions$po2 = linkPickerOptions === null || linkPickerOptions === void 0 ? void 0 : linkPickerOptions.popupWidth) !== null && _linkPickerOptions$po2 !== void 0 ? _linkPickerOptions$po2 : _ui.RECENT_SEARCH_WIDTH_IN_PX,
+    height: (_linkPickerOptions$po = linkPickerOptions === null || linkPickerOptions === void 0 ? void 0 : linkPickerOptions.popupHeight) !== null && _linkPickerOptions$po !== void 0 ? _linkPickerOptions$po : lpLinkPicker ? _linkSearchConstants.LINKPICKER_HEIGHT_IN_PX : _linkSearchConstants.RECENT_SEARCH_HEIGHT_IN_PX,
+    width: (_linkPickerOptions$po2 = linkPickerOptions === null || linkPickerOptions === void 0 ? void 0 : linkPickerOptions.popupWidth) !== null && _linkPickerOptions$po2 !== void 0 ? _linkPickerOptions$po2 : _linkSearchConstants.RECENT_SEARCH_WIDTH_IN_PX,
     // forcePlacement is always true to prevent the popup from rendering off-screen
     forcePlacement: true
   };