@atlaskit/editor-core 183.0.9 → 183.1.0

package/dist/esm/plugins/card/nodeviews/embedCard.js

@@ -1,5 +1,4 @@
 import _get from "@babel/runtime/helpers/get";
-import _extends from "@babel/runtime/helpers/extends";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
@@ -7,6 +6,7 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _extends from "@babel/runtime/helpers/extends";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -21,11 +21,76 @@ import { DEFAULT_EMBED_CARD_HEIGHT, DEFAULT_EMBED_CARD_WIDTH } from '@atlaskit/e
 import { SelectionBasedNodeView } from '../../../nodeviews/';
 import { registerCard } from '../pm-plugins/actions';
 import ResizableEmbedCard from '../ui/ResizableEmbedCard';
-import { createDisplayGrid } from '../../../plugins/grid';
-import WithPluginState from '../../../ui/WithPluginState';
-import { pluginKey as widthPluginKey } from '../../width';
 import { floatingLayouts, isRichMediaInsideOfBlockNode } from '../../../utils/rich-media-utils';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+var CardInner = function CardInner(_ref) {
+  var pluginInjectionApi = _ref.pluginInjectionApi,
+    getPosSafely = _ref.getPosSafely,
+    getLineLength = _ref.getLineLength,
+    view = _ref.view,
+    smartCard = _ref.smartCard,
+    eventDispatcher = _ref.eventDispatcher,
+    updateSize = _ref.updateSize,
+    getPos = _ref.getPos,
+    aspectRatio = _ref.aspectRatio,
+    allowResizing = _ref.allowResizing,
+    hasPreview = _ref.hasPreview,
+    heightAlone = _ref.heightAlone,
+    cardProps = _ref.cardProps,
+    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
+  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['width']),
+    widthState = _useSharedPluginState.widthState;
+  var widthStateLineLength = (widthState === null || widthState === void 0 ? void 0 : widthState.lineLength) || 0;
+  var widthStateWidth = (widthState === null || widthState === void 0 ? void 0 : widthState.width) || 0;
+  var pos = getPosSafely();
+  if (pos === undefined) {
+    return null;
+  }
+  var lineLength = getLineLength(view, pos, widthStateLineLength);
+  var containerWidth = isRichMediaInsideOfBlockNode(view, pos) ? lineLength : widthStateWidth;
+  if (!allowResizing || !hasPreview) {
+    // There are two ways `width` and `height` can be defined here:
+    // 1) Either as `heightAlone` as height value and no width
+    // 2) or as `1` for height and aspectRation (defined or a default one) as a width
+    // See above for how aspectRation is calculated.
+    var defaultAspectRatio = DEFAULT_EMBED_CARD_WIDTH / DEFAULT_EMBED_CARD_HEIGHT;
+    var richMediaWrapperHeight = 1;
+    var richMediaWrapperWidth = aspectRatio || defaultAspectRatio;
+    if (heightAlone) {
+      richMediaWrapperHeight = heightAlone;
+      richMediaWrapperWidth = undefined;
+    }
+    return /*#__PURE__*/React.createElement(RichMediaWrapper, _extends({}, cardProps, {
+      height: richMediaWrapperHeight,
+      width: richMediaWrapperWidth,
+      nodeType: "embedCard",
+      hasFallbackContainer: hasPreview,
+      lineLength: lineLength,
+      containerWidth: containerWidth
+    }), smartCard);
+  }
+  var displayGrid = function displayGrid(visible, gridType, highlight) {
+    var _pluginInjectionApi$d, _pluginInjectionApi$d2;
+    return pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.grid) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions.displayGrid(view)({
+      visible: visible,
+      gridType: gridType,
+      highlight: highlight
+    });
+  };
+  return /*#__PURE__*/React.createElement(ResizableEmbedCard, _extends({}, cardProps, {
+    height: heightAlone,
+    aspectRatio: aspectRatio,
+    view: view,
+    getPos: getPos,
+    lineLength: lineLength,
+    gridSize: 12,
+    containerWidth: containerWidth,
+    displayGrid: displayGrid,
+    updateSize: updateSize,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent
+  }), smartCard);
+};
 export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(EmbedCardComponent, _React$PureComponent);
   var _super = _createSuper(EmbedCardComponent);
@@ -180,7 +245,6 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
   }, {
     key: "render",
     value: function render() {
-      var _this2 = this;
       var _this$props = this.props,
         node = _this$props.node,
         cardContext = _this$props.cardContext,
@@ -189,7 +253,8 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         fullWidthMode = _this$props.fullWidthMode,
         view = _this$props.view,
         dispatchAnalyticsEvent = _this$props.dispatchAnalyticsEvent,
-        getPos = _this$props.getPos;
+        getPos = _this$props.getPos,
+        pluginInjectionApi = _this$props.pluginInjectionApi;
       var _node$attrs = node.attrs,
         url = _node$attrs.url,
         pctWidth = _node$attrs.width,
@@ -216,71 +281,37 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         pctWidth: pctWidth,
         fullWidthMode: fullWidthMode
       };
+      var smartCard = /*#__PURE__*/React.createElement(SmartCard, {
+        key: url,
+        url: url,
+        appearance: "embed",
+        onClick: this.onClick,
+        onResolve: this.onResolve,
+        showActions: platform === 'web',
+        isFrameVisible: true,
+        inheritDimensions: true,
+        platform: platform,
+        container: this.scrollContainer,
+        embedIframeRef: this.embedIframeRef
+      });
       var cardInner = /*#__PURE__*/React.createElement(EmbedResizeMessageListener, {
         embedIframeRef: this.embedIframeRef,
         onHeightUpdate: this.onHeightUpdate
-      }, /*#__PURE__*/React.createElement(WithPluginState, {
-        editorView: view,
-        plugins: {
-          widthState: widthPluginKey
-        },
-        render: function render(_ref) {
-          var widthState = _ref.widthState;
-          var widthStateLineLength = (widthState === null || widthState === void 0 ? void 0 : widthState.lineLength) || 0;
-          var widthStateWidth = (widthState === null || widthState === void 0 ? void 0 : widthState.width) || 0;
-          var pos = _this2.getPosSafely();
-          if (pos === undefined) {
-            return null;
-          }
-          var lineLength = _this2.getLineLength(view, pos, widthStateLineLength);
-          var containerWidth = isRichMediaInsideOfBlockNode(view, pos) ? lineLength : widthStateWidth;
-          var smartCard = /*#__PURE__*/React.createElement(SmartCard, {
-            key: url,
-            url: url,
-            appearance: "embed",
-            onClick: _this2.onClick,
-            onResolve: _this2.onResolve,
-            showActions: platform === 'web',
-            isFrameVisible: true,
-            inheritDimensions: true,
-            platform: platform,
-            container: _this2.scrollContainer,
-            embedIframeRef: _this2.embedIframeRef
-          });
-          if (!allowResizing || !hasPreview) {
-            // There are two ways `width` and `height` can be defined here:
-            // 1) Either as `heightAlone` as height value and no width
-            // 2) or as `1` for height and aspectRation (defined or a default one) as a width
-            // See above for how aspectRation is calculated.
-            var defaultAspectRatio = DEFAULT_EMBED_CARD_WIDTH / DEFAULT_EMBED_CARD_HEIGHT;
-            var richMediaWrapperHeight = 1;
-            var richMediaWrapperWidth = aspectRatio || defaultAspectRatio;
-            if (heightAlone) {
-              richMediaWrapperHeight = heightAlone;
-              richMediaWrapperWidth = undefined;
-            }
-            return /*#__PURE__*/React.createElement(RichMediaWrapper, _extends({}, cardProps, {
-              height: richMediaWrapperHeight,
-              width: richMediaWrapperWidth,
-              nodeType: "embedCard",
-              hasFallbackContainer: hasPreview,
-              lineLength: lineLength,
-              containerWidth: containerWidth
-            }), smartCard);
-          }
-          return /*#__PURE__*/React.createElement(ResizableEmbedCard, _extends({}, cardProps, {
-            height: heightAlone,
-            aspectRatio: aspectRatio,
-            view: _this2.props.view,
-            getPos: getPos,
-            lineLength: lineLength,
-            gridSize: 12,
-            containerWidth: containerWidth,
-            displayGrid: createDisplayGrid(_this2.props.eventDispatcher),
-            updateSize: _this2.updateSize,
-            dispatchAnalyticsEvent: dispatchAnalyticsEvent
-          }), smartCard);
-        }
+      }, /*#__PURE__*/React.createElement(CardInner, {
+        pluginInjectionApi: pluginInjectionApi,
+        smartCard: smartCard,
+        hasPreview: hasPreview,
+        getPosSafely: this.getPosSafely,
+        view: view,
+        getLineLength: this.getLineLength,
+        eventDispatcher: this.props.eventDispatcher,
+        updateSize: this.updateSize,
+        getPos: getPos,
+        aspectRatio: aspectRatio,
+        allowResizing: allowResizing,
+        heightAlone: heightAlone,
+        cardProps: cardProps,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent
       }));
 
       // [WS-2307]: we only render card wrapped into a Provider when the value is ready
@@ -330,7 +361,8 @@ export var EmbedCard = /*#__PURE__*/function (_SelectionBasedNodeVi) {
         allowResizing = _this$reactComponentP.allowResizing,
         platform = _this$reactComponentP.platform,
         fullWidthMode = _this$reactComponentP.fullWidthMode,
-        dispatchAnalyticsEvent = _this$reactComponentP.dispatchAnalyticsEvent;
+        dispatchAnalyticsEvent = _this$reactComponentP.dispatchAnalyticsEvent,
+        pluginInjectionApi = _this$reactComponentP.pluginInjectionApi;
       return /*#__PURE__*/React.createElement(WrappedBlockCard, {
         node: this.node,
         view: this.view,
@@ -339,7 +371,8 @@ export var EmbedCard = /*#__PURE__*/function (_SelectionBasedNodeVi) {
         allowResizing: allowResizing,
         platform: platform,
         fullWidthMode: fullWidthMode,
-        dispatchAnalyticsEvent: dispatchAnalyticsEvent
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        pluginInjectionApi: pluginInjectionApi
       });
     }
   }]);

package/dist/esm/plugins/card/nodeviews/genericCard.js

@@ -86,13 +86,14 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
           var _this$props = this.props,
             view = _this$props.view,
             node = _this$props.node,
-            getPos = _this$props.getPos;
+            getPos = _this$props.getPos,
+            pluginInjectionApi = _this$props.pluginInjectionApi;
           var _titleUrlPairFromNode2 = titleUrlPairFromNode(node),
             url = _titleUrlPairFromNode2.url;
           if (!getPos || typeof getPos === 'boolean') {
             return;
           }
-          changeSelectedCardToLinkFallback(undefined, url, true, node, getPos())(view.state, view.dispatch);
+          changeSelectedCardToLinkFallback(undefined, url, true, node, getPos(), pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.analytics.actions)(view.state, view.dispatch);
           return null;
         } else {
           // Otherwise, render a blue link as fallback (above in render()).

package/dist/esm/plugins/card/pm-plugins/analytics/events-from-tr.js

@@ -5,20 +5,19 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import { AddMarkStep, RemoveMarkStep } from 'prosemirror-transform';
 import { ACTION } from '@atlaskit/editor-common/analytics';
-import { isLinkMark } from '@atlaskit/editor-common/utils';
+import { isLinkMark, pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
 import { getLinkMetadataFromTransaction } from '@atlaskit/editor-common/card';
 import { LinkMetaStep } from '@atlaskit/adf-schema/steps';
-import { pmHistoryPluginKey } from '../../../history/pm-history-types';
 import { getPluginState } from '../util/state';
 import { pluginKey } from '../plugin-key';
-import { isLink, linkObjectFromNode, getLinkUrl, appearanceForLink, findLinksAtPositions } from './utils';
-var findLinksInNodeRange = function findLinksInNodeRange(node, schema, from, to) {
+import { isLink, linkObjectFromNode, getLinkUrl, getLinkNodeContext, appearanceForLink, findLinksAtPositions, areSameLinks } from './utils';
+var findLinksInNodeRange = function findLinksInNodeRange(doc, schema, from, to) {
   var links = [];
-  node.nodesBetween(from, to, function (node, pos) {
+  doc.nodesBetween(from, to, function (node, pos) {
     if (isLink(schema, node)) {
       var entireLinkInRange = pos >= from && pos + node.nodeSize <= to;
       if (entireLinkInRange) {
-        var link = linkObjectFromNode(schema, node, pos);
+        var link = linkObjectFromNode(doc, schema, node, pos);
         if (link) {
           links.push(link);
         }
@@ -41,10 +40,13 @@ export var findChangedLinks = function findChangedLinks(tr, state) {
   var isRedo = isHistoryMeta(historyMeta) && historyMeta.redo === true;
   var isUpdate = isUpdateTr(tr, isUndo || isRedo);
   var _loop = function _loop(i) {
+    var _tr$docs$i, _tr$docs;
     var step = tr.steps[i];
     var stepMap = step.getMap();
     var removedInStep = [];
     var insertedInStep = [];
+    var before = (_tr$docs$i = tr.docs[i]) !== null && _tr$docs$i !== void 0 ? _tr$docs$i : tr.before;
+    var after = (_tr$docs = tr.docs[i + 1]) !== null && _tr$docs !== void 0 ? _tr$docs : tr.doc;
 
     /**
      * AddMarkStep and RemoveMarkSteps don't produce stepMap ranges
@@ -60,27 +62,26 @@ export var findChangedLinks = function findChangedLinks(tr, state) {
         insertedInStep.push({
           type: 'mark',
           pos: addMarkStep.from,
-          mark: addMarkStep.mark
+          mark: addMarkStep.mark,
+          nodeContext: getLinkNodeContext(after, addMarkStep.from)
         });
       }
     }
     if (step instanceof RemoveMarkStep) {
       var removeMarkStep = step;
       if (isLinkMark(removeMarkStep.mark, schema)) {
-        /**
-         * For url text pasted on plain text
-         */
         removedInStep.push({
           type: 'mark',
           pos: removeMarkStep.from,
-          mark: removeMarkStep.mark
+          mark: removeMarkStep.mark,
+          nodeContext: getLinkNodeContext(before, removeMarkStep.from)
         });
       }
     }
     stepMap.forEach(function (oldStart, oldEnd, newStart, newEnd) {
-      var _tr$docs;
+      var _tr$docs2;
       var before = tr.docs[i];
-      var after = (_tr$docs = tr.docs[i + 1]) !== null && _tr$docs !== void 0 ? _tr$docs : tr.doc;
+      var after = (_tr$docs2 = tr.docs[i + 1]) !== null && _tr$docs2 !== void 0 ? _tr$docs2 : tr.doc;
       var removedInRange = [];
       var insertedInRange = [];
 
@@ -129,6 +130,19 @@ export var findChangedLinks = function findChangedLinks(tr, state) {
     inserted.push.apply(inserted, _toConsumableArray(findLinksAtPositions(tr, positions)));
   }
   if (!isUpdate) {
+    var _getLinkMetadataFromT = getLinkMetadataFromTransaction(tr),
+      inputMethod = _getLinkMetadataFromT.inputMethod;
+    /**
+     * If there is no identifiable input method, and the links inserted and removed appear to be the same,
+     * then this transaction likely is not intended to be consided to be the insertion and removal of links
+     */
+    if (!inputMethod && areSameLinks(removed, inserted)) {
+      return {
+        removed: [],
+        inserted: [],
+        updated: updated
+      };
+    }
     return {
       removed: removed,
       inserted: inserted,
@@ -264,10 +278,10 @@ export function eventsFromTransaction(tr, state) {
     /**
      * Retrieve metadata from the LinkMetaStep(s) in the transaction
      */
-    var _getLinkMetadataFromT = getLinkMetadataFromTransaction(tr),
-      action = _getLinkMetadataFromT.action,
-      inputMethod = _getLinkMetadataFromT.inputMethod,
-      sourceEvent = _getLinkMetadataFromT.sourceEvent;
+    var _getLinkMetadataFromT2 = getLinkMetadataFromTransaction(tr),
+      action = _getLinkMetadataFromT2.action,
+      inputMethod = _getLinkMetadataFromT2.inputMethod,
+      sourceEvent = _getLinkMetadataFromT2.sourceEvent;
     var contextualData = {
       action: action,
       inputMethod: inputMethod,
@@ -279,7 +293,7 @@ export function eventsFromTransaction(tr, state) {
       removed = _findChangedLinks.removed,
       inserted = _findChangedLinks.inserted,
       updated = _findChangedLinks.updated;
-    var MAX_LINK_EVENTS = 10;
+    var MAX_LINK_EVENTS = 50;
     if ([removed, inserted, updated].some(function (arr) {
       return arr.length > MAX_LINK_EVENTS;
     })) {
@@ -298,7 +312,8 @@ export function eventsFromTransaction(tr, state) {
           data: _objectSpread(_objectSpread({}, contextualData), {}, {
             url: url,
             display: display,
-            previousDisplay: previousDisplay
+            previousDisplay: previousDisplay,
+            nodeContext: link.nodeContext
           })
         });
       }
@@ -313,7 +328,8 @@ export function eventsFromTransaction(tr, state) {
             type: type,
             data: _objectSpread(_objectSpread({}, contextualData), {}, {
               url: _url,
-              display: _display
+              display: _display,
+              nodeContext: _link.nodeContext
             })
           });
         }

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

@@ -48,15 +48,18 @@ export var isLink = function isLink(schema, node) {
  * @param fragment Fragment to search
  * @returns Array of nodes and marks found in the fragment that are "links"
  */
-export function findLinksInNode(schema, node, offset) {
+export function findLinksInNode(doc, schema, node, offset) {
   var links = [];
   node.descendants(function (node, pos) {
+    var nodeContext = getLinkNodeContext(doc, pos);
+
     // Nodes
     if (isLinkNode(node)) {
       links.push({
         type: 'node',
         pos: pos + offset,
-        node: node
+        node: node,
+        nodeContext: nodeContext
       });
     }
 
@@ -68,7 +71,8 @@ export function findLinksInNode(schema, node, offset) {
           links.push({
             type: 'mark',
             pos: pos + offset,
-            mark: mark
+            mark: mark,
+            nodeContext: nodeContext
           });
         }
       }
@@ -84,12 +88,25 @@ export function getLinkUrl(link) {
   }
   return (_link$mark$attrs = link.mark.attrs) === null || _link$mark$attrs === void 0 ? void 0 : _link$mark$attrs.href;
 }
-export var linkObjectFromNode = function linkObjectFromNode(schema, node, pos) {
+export var getLinkNodeContext = function getLinkNodeContext(doc, pos) {
+  var $pos = doc.resolve(pos);
+  var maxDepth = 3;
+  for (var i = 0; i <= maxDepth; i++) {
+    var node = $pos.node($pos.depth - i);
+    if (node && node.type.name !== 'paragraph') {
+      return node.type.name;
+    }
+  }
+  return 'unknown';
+};
+export var linkObjectFromNode = function linkObjectFromNode(doc, schema, node, pos) {
+  var nodeContext = getLinkNodeContext(doc, pos);
   if (isLinkNode(node)) {
     return {
       type: 'node',
       pos: pos,
-      node: node
+      node: node,
+      nodeContext: nodeContext
     };
   }
   if (node.marks) {
@@ -99,7 +116,8 @@ export var linkObjectFromNode = function linkObjectFromNode(schema, node, pos) {
         return {
           type: 'mark',
           pos: pos,
-          mark: mark
+          mark: mark,
+          nodeContext: nodeContext
         };
       }
     }
@@ -114,11 +132,29 @@ export var findLinksAtPositions = function findLinksAtPositions(tr, positions) {
     if (!node) {
       continue;
     }
-    var link = linkObjectFromNode(schema, node, pos);
+    var link = linkObjectFromNode(tr.doc, schema, node, pos);
     if (!link) {
       continue;
     }
     links.push(link);
   }
   return links;
+};
+
+/**
+ * Returns whether or not two sets of links appear to likely be the same set of links
+ * That they are in the same order and that both their hrefs and appearances match
+ */
+export var areSameLinks = function areSameLinks(linksA, linksB) {
+  if (linksA.length !== linksB.length) {
+    return false;
+  }
+  for (var i = 0; i < linksA.length; i++) {
+    var linkA = linksA[i];
+    var linkB = linksB[i];
+    if (getLinkUrl(linkA) !== getLinkUrl(linkB) || appearanceForLink(linkA) !== appearanceForLink(linkB)) {
+      return false;
+    }
+  }
+  return true;
 };

package/dist/esm/plugins/card/pm-plugins/doc.js

@@ -6,12 +6,11 @@ import { NodeSelection, TextSelection } from 'prosemirror-state';
 import { closeHistory } from 'prosemirror-history';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../../../plugins/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { SMART_LINK_TYPE } from '../../../plugins/analytics/types/node-events';
-import { getLinkCreationAnalyticsEvent } from '../../../plugins/hyperlink/analytics';
 import { nodesBetweenChanged, processRawValue } from '../../../utils';
 import { unlinkPayload } from '../../../utils/linking-utils';
-import { isFromCurrentDomain } from '../../hyperlink/utils';
+import { isFromCurrentDomain, getLinkCreationAnalyticsEvent } from '@atlaskit/editor-common/utils';
 import { appearanceForNodeType, selectedCardAppearance } from '../utils';
 import { queueCards, resolveCard } from './actions';
 import { pluginKey } from './plugin-key';
@@ -47,7 +46,7 @@ function replaceLinksToCards(tr, cardAdf, schema, request) {
   tr.replaceWith(pos, pos + (node.text || url).length, nodes);
   return $pos.node($pos.depth - 1).type.name;
 }
-export var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData, analyticsAction) {
+export var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData, analyticsAction, editorAnalyticsApi) {
   return function (editorState, dispatch) {
     var state = pluginKey.getState(editorState);
     if (!state) {
@@ -94,7 +93,7 @@ export var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, car
          */
         var inputMethod = requests[0].source;
         var sourceEvent = requests[0].sourceEvent;
-        addAnalytics(editorState, tr, {
+        editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
           action: analyticsAction || ACTION.INSERTED,
           actionSubject: ACTION_SUBJECT.DOCUMENT,
           actionSubjectId: ACTION_SUBJECT_ID.SMART_LINK,
@@ -108,7 +107,7 @@ export var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, car
           nonPrivacySafeAttributes: {
             domainName: domainName
           }
-        });
+        })(tr);
         addLinkMetadata(editorState.selection, tr, {
           action: analyticsAction,
           inputMethod: inputMethod,
@@ -123,7 +122,7 @@ export var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, car
     return true;
   };
 };
-export var handleFallbackWithAnalytics = function handleFallbackWithAnalytics(request) {
+export var handleFallbackWithAnalytics = function handleFallbackWithAnalytics(request, editorAnalyticsApi) {
   return function (state, dispatch) {
     var cardState = pluginKey.getState(state);
     if (!cardState) {
@@ -131,7 +130,7 @@ export var handleFallbackWithAnalytics = function handleFallbackWithAnalytics(re
     }
     var tr = state.tr;
     if (request.source !== INPUT_METHOD.FLOATING_TB) {
-      addAnalytics(state, tr, getLinkCreationAnalyticsEvent(request.source, request.url));
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent(getLinkCreationAnalyticsEvent(request.source, request.url))(tr);
     }
     addLinkMetadata(state.selection, tr, {
       action: request.analyticsAction,
@@ -172,9 +171,11 @@ export var queueCardsFromChangedTr = function queueCardsFromChangedTr(state, tr,
     }
     return false;
   });
-  addLinkMetadata(state.selection, tr, {
-    action: analyticsAction
-  });
+  if (analyticsAction) {
+    addLinkMetadata(state.selection, tr, {
+      action: analyticsAction
+    });
+  }
   return queueCards(requests)(tr);
 };
 export var queueCardFromChangedTr = function queueCardFromChangedTr(state, tr, source, analyticsAction) {
@@ -240,7 +241,7 @@ export var convertHyperlinkToSmartCard = function convertHyperlinkToSmartCard(st
   });
   return queueCards(requests)(state.tr);
 };
-export var changeSelectedCardToLink = function changeSelectedCardToLink(text, href, sendAnalytics, node, pos) {
+export var changeSelectedCardToLink = function changeSelectedCardToLink(text, href, sendAnalytics, node, pos, editorAnalyticsApi) {
   return function (state, dispatch) {
     var tr;
     if (node && pos) {
@@ -251,7 +252,7 @@ export var changeSelectedCardToLink = function changeSelectedCardToLink(text, hr
     var selectedNode = state.selection instanceof NodeSelection && state.selection.node;
     if (sendAnalytics) {
       if (selectedNode) {
-        addAnalytics(state, tr, {
+        editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
           action: ACTION.CHANGED_TYPE,
           actionSubject: ACTION_SUBJECT.SMART_LINK,
           eventType: EVENT_TYPE.TRACK,
@@ -259,7 +260,7 @@ export var changeSelectedCardToLink = function changeSelectedCardToLink(text, hr
             newType: SMART_LINK_TYPE.URL,
             previousType: appearanceForNodeType(selectedNode.type)
           }
-        });
+        })(tr);
       }
     }
     if (dispatch) {
@@ -268,7 +269,7 @@ export var changeSelectedCardToLink = function changeSelectedCardToLink(text, hr
     return true;
   };
 };
-export var changeSelectedCardToLinkFallback = function changeSelectedCardToLinkFallback(text, href, sendAnalytics, node, pos) {
+export var changeSelectedCardToLinkFallback = function changeSelectedCardToLinkFallback(text, href, sendAnalytics, node, pos, editorAnalyticsApi) {
   return function (state, dispatch) {
     var tr;
     if (node && pos) {
@@ -277,14 +278,14 @@ export var changeSelectedCardToLinkFallback = function changeSelectedCardToLinkF
       tr = cardToLinkWithTransaction(state, text, href);
     }
     if (sendAnalytics) {
-      addAnalytics(state, tr, {
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
         action: ACTION.ERRORED,
         actionSubject: ACTION_SUBJECT.SMART_LINK,
         eventType: EVENT_TYPE.OPERATIONAL,
         attributes: {
           error: 'Smart card falling back to link.'
         }
-      });
+      })(tr);
     }
     if (dispatch) {
       dispatch(tr.scrollIntoView());
@@ -326,7 +327,7 @@ function cardNodeToLinkWithTransaction(state, text, href, node, pos) {
     href: href || url
   })]));
 }
-export var changeSelectedCardToText = function changeSelectedCardToText(text) {
+export var changeSelectedCardToText = function changeSelectedCardToText(text, editorAnalyticsApi) {
   return function (state, dispatch) {
     var selectedNode = state.selection instanceof NodeSelection && state.selection.node;
     if (!selectedNode) {
@@ -337,13 +338,14 @@ export var changeSelectedCardToText = function changeSelectedCardToText(text) {
       addLinkMetadata(state.selection, tr, {
         action: ACTION.UNLINK
       });
-      addAnalytics(state, tr.scrollIntoView(), unlinkPayload(ACTION_SUBJECT_ID.CARD_INLINE));
+      tr.scrollIntoView();
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent(unlinkPayload(ACTION_SUBJECT_ID.CARD_INLINE))(tr);
       dispatch(tr);
     }
     return true;
   };
 };
-export var setSelectedCardAppearance = function setSelectedCardAppearance(appearance) {
+export var setSelectedCardAppearance = function setSelectedCardAppearance(appearance, editorAnalyticsApi) {
   return function (state, dispatch) {
     var _previousNode$type;
     var selectedNode = state.selection instanceof NodeSelection && state.selection.node;
@@ -382,7 +384,7 @@ export var setSelectedCardAppearance = function setSelectedCardAppearance(appear
     if ((previousNode === null || previousNode === void 0 ? void 0 : (_previousNode$type = previousNode.type) === null || _previousNode$type === void 0 ? void 0 : _previousNode$type.name) === 'paragraph') {
       tr.delete(previousNodePos, from);
     }
-    addAnalytics(state, tr, {
+    editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
       action: ACTION.CHANGED_TYPE,
       actionSubject: ACTION_SUBJECT.SMART_LINK,
       eventType: EVENT_TYPE.TRACK,
@@ -390,7 +392,7 @@ export var setSelectedCardAppearance = function setSelectedCardAppearance(appear
         newType: appearance,
         previousType: appearanceForNodeType(selectedNode.type)
       }
-    });
+    })(tr);
     addLinkMetadata(state.selection, tr, {
       action: ACTION.CHANGED_TYPE
     });