@atlaskit/editor-plugin-card 0.3.4 → 0.3.5

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-card
 
+## 0.3.5
+
+### Patch Changes
+
+- [`f9cdc991f20`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f9cdc991f20) - Updates analytics to better support datasources
+- Updated dependencies
+
 ## 0.3.4
 
 ### Patch Changes

package/dist/cjs/analytics/create-events-queue.js

@@ -0,0 +1,55 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createEventsQueue = void 0;
+/**
+ * Simple mechanism to defer event related callbacks
+ *
+ * Probably think twice whether your event should use this instead of
+ * editor's built-in `editor-plugin-analytics`
+ *
+ * Editor-Plugin-Analytics provides methods methods to dispatch events, and attach events into prosemiror transactions
+ * However we do not have access to the smart card context in prosemirror
+ *
+ * We are using this queue to relay events occurring in prosemirror (which does not have access to the react context)
+ * to be subscribed to elsewhere where the react context is available (contentComponent or otherwise) (smart card context)
+ * in order to be able to annotate events with additional attributes to events
+ */
+var createEventsQueue = function createEventsQueue() {
+  var queue = [];
+  var subscribers = new Set();
+  var subscribe = function subscribe(subscriber) {
+    subscribers.add(subscriber);
+    return function () {
+      subscribers.delete(subscriber);
+    };
+  };
+  var push = function push() {
+    queue.push.apply(queue, arguments);
+  };
+  var flush = function flush() {
+    var _loop = function _loop() {
+      var event = queue.shift();
+      if (event) {
+        subscribers.forEach(function (subscriber) {
+          subscriber(event);
+        });
+      }
+    };
+    while (queue.length) {
+      _loop();
+    }
+  };
+  var getSize = function getSize() {
+    return queue.length;
+  };
+  return {
+    push: push,
+    flush: flush,
+    subscribe: subscribe,
+    getSize: getSize
+  };
+};
+exports.createEventsQueue = createEventsQueue;

package/dist/cjs/{pm-plugins/analytics → analytics}/events-from-tr.js

@@ -5,8 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.eventsFromTransaction = eventsFromTransaction;
-exports.findChangedLinks = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+exports.findChanged = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _steps = require("@atlaskit/adf-schema/steps");
@@ -14,30 +13,23 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _card = require("@atlaskit/editor-common/card");
 var _utils = require("@atlaskit/editor-common/utils");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _pluginKey = require("../plugin-key");
-var _state = require("../util/state");
+var _pluginKey = require("../pm-plugins/plugin-key");
+var _state = require("../pm-plugins/util/state");
+var _types = require("./types");
 var _utils2 = require("./utils");
-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) { (0, _defineProperty2.default)(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; }
-var findLinksInNodeRange = function findLinksInNodeRange(doc, schema, from, to) {
-  var links = [];
-  doc.nodesBetween(from, to, function (node, pos) {
-    if ((0, _utils2.isLink)(schema, node)) {
-      var entireLinkInRange = pos >= from && pos + node.nodeSize <= to;
-      if (entireLinkInRange) {
-        var link = (0, _utils2.linkObjectFromNode)(doc, schema, node, pos);
-        if (link) {
-          links.push(link);
-        }
-      }
-    }
-  });
-  return links;
-};
-var findChangedLinks = function findChangedLinks(tr, state) {
+/**
+ * Find the links, smartLinks, datasources that were changed in a transaction
+ */
+var findChanged = function findChanged(tr, state) {
   var schema = tr.doc.type.schema;
   var removed = [];
   var inserted = [];
+  /**
+   * Ideally we have the "before" and "after" states of the "entity"
+   * being updated, but if the update is via a "queue for upgrade"
+   * then we no longer have access to the "before" state, because the "before"
+   * state was replaced with a blue link to be upgraded
+   */
   var updated = [];
   var queuedForUpgrade = isTransactionQueuedForUpgrade(tr);
   var isResolveReplace = isTransactionResolveReplace(tr);
@@ -64,26 +56,30 @@ var findChangedLinks = function findChangedLinks(tr, state) {
     if (step instanceof _transform.AddMarkStep) {
       var addMarkStep = step;
       if ((0, _utils.isLinkMark)(addMarkStep.mark, schema)) {
-        /**
-         * For url text pasted on plain text
-         */
-        insertedInStep.push({
-          type: 'mark',
-          pos: addMarkStep.from,
-          mark: addMarkStep.mark,
-          nodeContext: (0, _utils2.getLinkNodeContext)(after, addMarkStep.from)
-        });
+        var node = after.nodeAt(addMarkStep.from);
+        if (node) {
+          /**
+           * For url text pasted on plain text
+           */
+          insertedInStep.push({
+            pos: addMarkStep.from,
+            node: node,
+            nodeContext: (0, _utils2.getNodeContext)(after, addMarkStep.from)
+          });
+        }
       }
     }
     if (step instanceof _transform.RemoveMarkStep) {
       var removeMarkStep = step;
       if ((0, _utils.isLinkMark)(removeMarkStep.mark, schema)) {
-        removedInStep.push({
-          type: 'mark',
-          pos: removeMarkStep.from,
-          mark: removeMarkStep.mark,
-          nodeContext: (0, _utils2.getLinkNodeContext)(before, removeMarkStep.from)
-        });
+        var _node = before.nodeAt(removeMarkStep.from);
+        if (_node) {
+          removedInStep.push({
+            pos: removeMarkStep.from,
+            node: _node,
+            nodeContext: (0, _utils2.getNodeContext)(before, removeMarkStep.from)
+          });
+        }
       }
     }
     stepMap.forEach(function (oldStart, oldEnd, newStart, newEnd) {
@@ -94,13 +90,17 @@ var findChangedLinks = function findChangedLinks(tr, state) {
       var insertedInRange = [];
 
       // Removed
-      removedInRange.push.apply(removedInRange, (0, _toConsumableArray2.default)(findLinksInNodeRange(before, schema, oldStart, oldEnd)));
+      removedInRange.push.apply(removedInRange, (0, _toConsumableArray2.default)((0, _utils2.findInNodeRange)(before, oldStart, oldEnd, function (node) {
+        return !!(0, _utils2.getNodeSubject)(node);
+      })));
       // Inserted
-      insertedInRange.push.apply(insertedInRange, (0, _toConsumableArray2.default)(findLinksInNodeRange(after, schema, newStart, newEnd)));
+      insertedInRange.push.apply(insertedInRange, (0, _toConsumableArray2.default)((0, _utils2.findInNodeRange)(after, newStart, newEnd, function (node) {
+        return !!(0, _utils2.getNodeSubject)(node);
+      })));
       removedInStep.push.apply(removedInStep, removedInRange);
       insertedInStep.push.apply(insertedInStep, insertedInRange);
     });
-    var omitQueuedLinks = function omitQueuedLinks(links) {
+    var omitRequestsForUpgrade = function omitRequestsForUpgrade(links) {
       if (!queuedForUpgrade) {
         return links;
       }
@@ -122,7 +122,7 @@ var findChangedLinks = function findChangedLinks(tr, state) {
     if (!isResolveReplace) {
       removed.push.apply(removed, removedInStep);
     }
-    inserted.push.apply(inserted, (0, _toConsumableArray2.default)(omitQueuedLinks(insertedInStep)));
+    inserted.push.apply(inserted, (0, _toConsumableArray2.default)(omitRequestsForUpgrade(insertedInStep)));
   };
   for (var i = 0; i < tr.steps.length; i++) {
     _loop(i);
@@ -135,7 +135,7 @@ var findChangedLinks = function findChangedLinks(tr, state) {
    */
   if (inserted.length === 0 && isResolveReplace) {
     var positions = getResolvePositions(tr, state);
-    inserted.push.apply(inserted, (0, _toConsumableArray2.default)((0, _utils2.findLinksAtPositions)(tr, positions)));
+    inserted.push.apply(inserted, (0, _toConsumableArray2.default)((0, _utils2.findAtPositions)(tr, positions)));
   }
   if (!isUpdate) {
     var _getLinkMetadataFromT = (0, _card.getLinkMetadataFromTransaction)(tr),
@@ -144,7 +144,7 @@ var findChangedLinks = function findChangedLinks(tr, state) {
      * 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 && (0, _utils2.areSameLinks)(removed, inserted)) {
+    if (!inputMethod && (0, _utils2.areSameNodes)(removed, inserted)) {
       return {
         removed: [],
         inserted: [],
@@ -189,7 +189,7 @@ var findChangedLinks = function findChangedLinks(tr, state) {
 /**
  * List of actions to be considered link "updates"
  */
-exports.findChangedLinks = findChangedLinks;
+exports.findChanged = findChanged;
 var UPDATE_ACTIONS = [_analytics.ACTION.CHANGED_TYPE, _analytics.ACTION.UPDATED];
 
 /**
@@ -300,17 +300,10 @@ function eventsFromTransaction(tr, state) {
       action = _getLinkMetadataFromT2.action,
       inputMethod = _getLinkMetadataFromT2.inputMethod,
       sourceEvent = _getLinkMetadataFromT2.sourceEvent;
-    var contextualData = {
-      action: action,
-      inputMethod: inputMethod,
-      sourceEvent: sourceEvent,
-      isUndo: isUndo,
-      isRedo: isRedo
-    };
-    var _findChangedLinks = findChangedLinks(tr, state),
-      removed = _findChangedLinks.removed,
-      inserted = _findChangedLinks.inserted,
-      updated = _findChangedLinks.updated;
+    var _findChanged = findChanged(tr, state),
+      removed = _findChanged.removed,
+      inserted = _findChanged.inserted,
+      updated = _findChanged.updated;
     var MAX_LINK_EVENTS = 50;
     if ([removed, inserted, updated].some(function (arr) {
       return arr.length > MAX_LINK_EVENTS;
@@ -320,41 +313,57 @@ function eventsFromTransaction(tr, state) {
     for (var i = 0; i < updated.length; i++) {
       var _update$previous$disp;
       var update = updated[i];
-      var link = update.inserted;
-      var url = (0, _utils2.getLinkUrl)(link);
-      var display = (0, _utils2.appearanceForLink)(link);
-      var previousDisplay = 'removed' in update ? (0, _utils2.appearanceForLink)(update.removed) : (_update$previous$disp = update.previous.display) !== null && _update$previous$disp !== void 0 ? _update$previous$disp : 'unknown';
-      if (url) {
+      var _inserted = update.inserted;
+      var node = _inserted.node,
+        nodeContext = _inserted.nodeContext;
+      var subject = (0, _utils2.getNodeSubject)(node);
+
+      /**
+       * Not great, wish we had the previous node but we never stored it
+       */
+      var previousDisplay = 'removed' in update ? (0, _utils2.appearanceForLink)(update.removed.node) : (_update$previous$disp = update.previous.display) !== null && _update$previous$disp !== void 0 ? _update$previous$disp : 'unknown';
+      if (subject) {
         events.push({
-          type: 'updated',
-          data: _objectSpread(_objectSpread({}, contextualData), {}, {
-            url: url,
-            display: display,
-            previousDisplay: previousDisplay,
-            nodeContext: link.nodeContext
-          })
+          event: _types.EVENT.UPDATED,
+          subject: subject,
+          data: {
+            node: node,
+            nodeContext: nodeContext,
+            action: action,
+            inputMethod: inputMethod,
+            sourceEvent: sourceEvent,
+            isUndo: isUndo,
+            isRedo: isRedo,
+            previousDisplay: previousDisplay
+          }
         });
       }
     }
-    var pushEvents = function pushEvents(links, type) {
-      for (var _i2 = 0; _i2 < links.length; _i2++) {
-        var _link = links[_i2];
-        var _url = (0, _utils2.getLinkUrl)(_link);
-        var _display = (0, _utils2.appearanceForLink)(_link);
-        if (_url) {
+    var pushEvents = function pushEvents(entities, event) {
+      for (var _i2 = 0; _i2 < entities.length; _i2++) {
+        var _entities$_i = entities[_i2],
+          _node2 = _entities$_i.node,
+          _nodeContext = _entities$_i.nodeContext;
+        var _subject = (0, _utils2.getNodeSubject)(_node2);
+        if (_subject) {
           events.push({
-            type: type,
-            data: _objectSpread(_objectSpread({}, contextualData), {}, {
-              url: _url,
-              display: _display,
-              nodeContext: _link.nodeContext
-            })
+            event: event,
+            subject: _subject,
+            data: {
+              node: _node2,
+              nodeContext: _nodeContext,
+              action: action,
+              inputMethod: inputMethod,
+              sourceEvent: sourceEvent,
+              isUndo: isUndo,
+              isRedo: isRedo
+            }
           });
         }
       }
     };
-    pushEvents(removed, 'deleted');
-    pushEvents(inserted, 'created');
+    pushEvents(removed, _types.EVENT.DELETED);
+    pushEvents(inserted, _types.EVENT.CREATED);
     return events;
   } catch (err) {
     return events;

package/dist/cjs/{pm-plugins/analytics → analytics}/index.js

@@ -3,10 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "createAnalyticsQueue", {
+Object.defineProperty(exports, "createEventsQueue", {
   enumerable: true,
   get: function get() {
-    return _createAnalyticsQueue.createAnalyticsQueue;
+    return _createEventsQueue.createEventsQueue;
   }
 });
 Object.defineProperty(exports, "eventsFromTransaction", {
@@ -15,5 +15,5 @@ Object.defineProperty(exports, "eventsFromTransaction", {
     return _eventsFromTr.eventsFromTransaction;
   }
 });
-var _createAnalyticsQueue = require("./create-analytics-queue");
+var _createEventsQueue = require("./create-events-queue");
 var _eventsFromTr = require("./events-from-tr");

package/dist/cjs/analytics/types.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EVENT_SUBJECT = exports.EVENT = void 0;
+var EVENT = /*#__PURE__*/function (EVENT) {
+  EVENT["CREATED"] = "created";
+  EVENT["UPDATED"] = "updated";
+  EVENT["DELETED"] = "deleted";
+  return EVENT;
+}({});
+exports.EVENT = EVENT;
+var EVENT_SUBJECT = /*#__PURE__*/function (EVENT_SUBJECT) {
+  EVENT_SUBJECT["LINK"] = "link";
+  EVENT_SUBJECT["DATASOURCE"] = "datasource";
+  return EVENT_SUBJECT;
+}({});
+/**
+ * These are not GASv3 events
+ * But they share a similar in shape so that GASv3
+ * events can be derived from them / think of them in the same way
+ */
+exports.EVENT_SUBJECT = EVENT_SUBJECT;

package/dist/cjs/analytics/utils.js

@@ -0,0 +1,134 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.appearanceForLink = appearanceForLink;
+exports.getNodeContext = exports.findInNodeRange = exports.findAtPositions = exports.areSameNodes = void 0;
+exports.getNodeSubject = getNodeSubject;
+exports.getUrl = getUrl;
+exports.isDatasourceNode = isDatasourceNode;
+exports.isLinkNode = void 0;
+var _utils = require("../utils");
+var _types = require("./types");
+function isDatasourceNode(node) {
+  return 'datasource' in node.attrs && !!node.attrs.datasource;
+}
+
+/**
+ * Determine if a node is considered to be a link
+ */
+var isLinkNode = function isLinkNode(node) {
+  if (isDatasourceNode(node)) {
+    return false;
+  }
+  if (!!(0, _utils.appearanceForNodeType)(node.type)) {
+    return true;
+  }
+  return hasLinkMark(node);
+};
+exports.isLinkNode = isLinkNode;
+function getNodeSubject(node) {
+  if (isDatasourceNode(node)) {
+    return _types.EVENT_SUBJECT.DATASOURCE;
+  }
+  if (isLinkNode(node)) {
+    return _types.EVENT_SUBJECT.LINK;
+  }
+  return null;
+}
+
+/**
+ * Analytics appearance for link object
+ */
+function appearanceForLink(node) {
+  var appearance = (0, _utils.appearanceForNodeType)(node.type);
+  if (appearance) {
+    return appearance;
+  }
+  return 'url';
+}
+var getLinkMark = function getLinkMark(node) {
+  if (node.marks) {
+    for (var i = 0; i < node.marks.length; i++) {
+      var mark = node.marks[i];
+      if (mark.type.name === 'link') {
+        return mark;
+      }
+    }
+  }
+};
+var hasLinkMark = function hasLinkMark(node) {
+  return !!getLinkMark(node);
+};
+function getUrl(node) {
+  var _node$attrs$url, _node$attrs, _getLinkMark, _getLinkMark$attrs;
+  return (_node$attrs$url = (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url) !== null && _node$attrs$url !== void 0 ? _node$attrs$url : (_getLinkMark = getLinkMark(node)) === null || _getLinkMark === void 0 ? void 0 : (_getLinkMark$attrs = _getLinkMark.attrs) === null || _getLinkMark$attrs === void 0 ? void 0 : _getLinkMark$attrs.href;
+}
+var getNodeContext = function getNodeContext(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';
+};
+exports.getNodeContext = getNodeContext;
+var findAtPositions = function findAtPositions(tr, positions) {
+  var entities = [];
+  for (var i = 0; i < positions.length; i++) {
+    var pos = positions[i];
+    var _node2 = tr.doc.nodeAt(pos);
+    if (!_node2) {
+      continue;
+    }
+    var nodeContext = getNodeContext(tr.doc, pos);
+    entities.push({
+      pos: pos,
+      node: _node2,
+      nodeContext: nodeContext
+    });
+  }
+  return entities;
+};
+exports.findAtPositions = findAtPositions;
+var findInNodeRange = function findInNodeRange(doc, from, to, predicate) {
+  var entities = [];
+  doc.nodesBetween(from, to, function (node, pos) {
+    if (predicate(node)) {
+      var entirelyInRange = pos >= from && pos + node.nodeSize <= to;
+      if (entirelyInRange) {
+        var nodeContext = getNodeContext(doc, pos);
+        entities.push({
+          pos: pos,
+          node: node,
+          nodeContext: nodeContext
+        });
+      }
+    }
+  });
+  return entities;
+};
+
+/**
+ * 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
+ */
+exports.findInNodeRange = findInNodeRange;
+var areSameNodes = function areSameNodes(setA, setB) {
+  if (setA.length !== setB.length) {
+    return false;
+  }
+  for (var i = 0; i < setA.length; i++) {
+    var a = setA[i];
+    var b = setB[i];
+    if (getUrl(a.node) !== getUrl(b.node) || appearanceForLink(a.node) !== appearanceForLink(b.node)) {
+      return false;
+    }
+  }
+  return true;
+};
+exports.areSameNodes = areSameNodes;

package/dist/cjs/plugin.js

@@ -11,6 +11,7 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _utils = require("@atlaskit/editor-common/utils");
 var _linkDatasource = require("@atlaskit/link-datasource");
+var _createEventsQueue = require("./analytics/create-events-queue");
 var _messages = require("./messages");
 var _actions = require("./pm-plugins/actions");
 var _doc = require("./pm-plugins/doc");
@@ -20,14 +21,15 @@ var _mountHyperlink = require("./pm-plugins/mountHyperlink");
 var _pluginKey = require("./pm-plugins/plugin-key");
 var _toolbar = require("./toolbar");
 var _ModalWithState = _interopRequireDefault(require("./ui/DatasourceModal/ModalWithState"));
+var _EditorLinkingPlatformAnalytics = require("./ui/EditorLinkingPlatformAnalytics");
 var _EditorSmartCardEvents = require("./ui/EditorSmartCardEvents");
-var _EditorSmartCardEventsNext = require("./ui/EditorSmartCardEventsNext");
 var _LayoutButton = _interopRequireDefault(require("./ui/LayoutButton"));
 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) { (0, _defineProperty2.default)(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; }
 var cardPlugin = function cardPlugin(options, api) {
   var _api$dependencies, _api$dependencies$fea;
   var featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$fea = _api$dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
+  var cardPluginEvents = featureFlags !== null && featureFlags !== void 0 && featureFlags.lpAnalyticsEventsNext ? (0, _createEventsQueue.createEventsQueue)() : undefined;
   return {
     name: 'card',
     getSharedState: function getSharedState(editorState) {
@@ -68,7 +70,8 @@ var cardPlugin = function cardPlugin(options, api) {
           useAlternativePreloader: useAlternativePreloader,
           allowWrapping: allowWrapping,
           allowAlignment: allowAlignment,
-          allowDatasource: allowDatasource
+          allowDatasource: allowDatasource,
+          cardPluginEvents: cardPluginEvents
         }), api)
       }, {
         name: 'cardHyperlink',
@@ -90,10 +93,10 @@ var cardPlugin = function cardPlugin(options, api) {
         popupsMountPoint = _ref2.popupsMountPoint,
         popupsScrollableElement = _ref2.popupsScrollableElement,
         popupsBoundariesElement = _ref2.popupsBoundariesElement;
-      var lpAnalyticsEventsNext = featureFlags.lpAnalyticsEventsNext;
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_EditorSmartCardEvents.EditorSmartCardEvents, {
         editorView: editorView
-      }), lpAnalyticsEventsNext && /*#__PURE__*/_react.default.createElement(_EditorSmartCardEventsNext.EditorSmartCardEventsNext, {
+      }), cardPluginEvents && /*#__PURE__*/_react.default.createElement(_EditorLinkingPlatformAnalytics.EditorLinkingPlatformAnalytics, {
+        cardPluginEvents: cardPluginEvents,
         editorView: editorView
       }), /*#__PURE__*/_react.default.createElement(_LayoutButton.default, {
         api: api,

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.showLinkToolbar = exports.showDatasourceModal = exports.setProvider = exports.setDatasourceTableRef = exports.setCardLayoutAndDatasourceTableRef = exports.setCardLayout = exports.resolveCard = exports.registerSmartCardEventsNext = exports.registerSmartCardEvents = exports.registerCard = exports.queueCards = exports.hideLinkToolbar = exports.hideDatasourceModal = exports.cardAction = void 0;
+exports.showLinkToolbar = exports.showDatasourceModal = exports.setProvider = exports.setDatasourceTableRef = exports.setCardLayoutAndDatasourceTableRef = exports.setCardLayout = exports.resolveCard = exports.registerSmartCardEvents = exports.registerCard = exports.queueCards = exports.hideLinkToolbar = exports.hideDatasourceModal = exports.cardAction = void 0;
 var _pluginKey = require("./plugin-key");
 var cardAction = function cardAction(tr, action) {
   return tr.setMeta(_pluginKey.pluginKey, action);
@@ -45,15 +45,6 @@ var registerSmartCardEvents = function registerSmartCardEvents(smartLinkEvents)
   };
 };
 exports.registerSmartCardEvents = registerSmartCardEvents;
-var registerSmartCardEventsNext = function registerSmartCardEventsNext(smartLinkEvents) {
-  return function (tr) {
-    return cardAction(tr, {
-      type: 'REGISTER_EVENTS_NEXT',
-      smartLinkEvents: smartLinkEvents
-    });
-  };
-};
-exports.registerSmartCardEventsNext = registerSmartCardEventsNext;
 var setProvider = function setProvider(cardProvider) {
   return function (tr) {
     return cardAction(tr, {

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

@@ -453,6 +453,9 @@ var updateExistingDatasource = function updateExistingDatasource(state, node, ne
     var isUrlChange = ((_newAdf$attrs = newAdf.attrs) === null || _newAdf$attrs === void 0 ? void 0 : _newAdf$attrs.url) !== ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url);
     if (isColumnChange || isUrlChange) {
       tr.setNodeMarkup(from, schemaNodes.blockCard, _objectSpread(_objectSpread({}, node.attrs), newAdf.attrs));
+      (0, _card.addLinkMetadata)(state.selection, tr, {
+        action: _analytics.ACTION.UPDATED
+      });
     }
   } else if (newAdf.type === 'inlineCard') {
     // datasource to inline

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

@@ -19,26 +19,25 @@ var _styles = require("@atlaskit/editor-common/styles");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _eventsFromTr = require("../analytics/events-from-tr");
 var _blockCard = require("../nodeviews/blockCard");
 var _datasource = require("../nodeviews/datasource");
 var _embedCard = require("../nodeviews/embedCard");
 var _inlineCard = require("../nodeviews/inlineCard");
 var _actions = require("./actions");
-var _analytics = require("./analytics");
 var _pluginKey = require("./plugin-key");
 var _reducers = _interopRequireDefault(require("./reducers"));
 var _resolve = require("./util/resolve");
 var _state2 = require("./util/state");
 var createPlugin = function createPlugin(options, pluginInjectionApi) {
   return function (pmPluginFactoryParams) {
-    var lpAnalyticsEventsNext = pmPluginFactoryParams.featureFlags.lpAnalyticsEventsNext;
-    var analyticsQueue = (0, _analytics.createAnalyticsQueue)(!!lpAnalyticsEventsNext);
     var editorAppearance = options.editorAppearance,
       platform = options.platform,
       allowResizing = options.allowResizing,
       useAlternativePreloader = options.useAlternativePreloader,
       fullWidthMode = options.fullWidthMode,
-      showServerActions = options.showServerActions;
+      showServerActions = options.showServerActions,
+      cardPluginEvents = options.cardPluginEvents;
     var inlineCardViewProducer = (0, _reactNodeView.getInlineNodeViewProducer)({
       pmPluginFactoryParams: pmPluginFactoryParams,
       Component: _inlineCard.InlineCardNodeView,
@@ -56,7 +55,6 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
             cards: [],
             showLinkingToolbar: false,
             smartLinkEvents: undefined,
-            smartLinkEventsNext: undefined,
             editorAppearance: editorAppearance,
             showDatasourceModal: false,
             datasourceModalType: undefined,
@@ -71,14 +69,12 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
 
           // apply any actions
           var meta = tr.getMeta(_pluginKey.pluginKey);
-          var events = (0, _analytics.eventsFromTransaction)(tr, prevEditorState);
-          analyticsQueue.push.apply(analyticsQueue, (0, _toConsumableArray2.default)(events));
+          if (cardPluginEvents) {
+            var events = (0, _eventsFromTr.eventsFromTransaction)(tr, prevEditorState);
+            cardPluginEvents.push.apply(cardPluginEvents, (0, _toConsumableArray2.default)(events));
+          }
           if (meta) {
-            var nextState = (0, _reducers.default)(pluginStateWithUpdatedPos, meta);
-            if (!pluginState.smartLinkEventsNext && nextState.smartLinkEventsNext) {
-              analyticsQueue.setCallbacks(nextState.smartLinkEventsNext);
-            }
-            return nextState;
+            return (0, _reducers.default)(pluginStateWithUpdatedPos, meta);
           }
           return pluginStateWithUpdatedPos;
         }
@@ -146,7 +142,13 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
                 invoke();
               });
             }
-            analyticsQueue.flush();
+
+            /**
+             * If there have been any events queued, flush them
+             * so subscribers can now be notified and dispatch
+             * analytics events
+             */
+            cardPluginEvents === null || cardPluginEvents === void 0 ? void 0 : cardPluginEvents.flush();
           },
           destroy: function destroy() {
             // Cancel any outstanding raf callbacks.