@atlaskit/editor-core 182.0.2 → 182.1.0

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

@@ -0,0 +1,139 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.appearanceForLink = appearanceForLink;
+exports.findLinksAtPositions = void 0;
+exports.findLinksInNode = findLinksInNode;
+exports.getLinkUrl = getLinkUrl;
+exports.isLink = void 0;
+exports.isLinkNode = isLinkNode;
+exports.linkObjectFromNode = void 0;
+var _utils = require("@atlaskit/editor-common/utils");
+var _utils2 = require("../../utils");
+/**
+ * Whether a node is a "link" node, ie inline card, block card, embed card
+ * (but not a text node with a link mark)
+ */
+function isLinkNode(node) {
+  return !!(0, _utils2.appearanceForNodeType)(node.type);
+}
+
+/**
+ * Analytics appearance for link object
+ */
+function appearanceForLink(link) {
+  if (link.type === 'node') {
+    var appearance = (0, _utils2.appearanceForNodeType)(link.node.type);
+    if (appearance) {
+      return appearance;
+    }
+  }
+  return 'url';
+}
+var nodeHasLinkMark = function nodeHasLinkMark(schema, node) {
+  if (node.marks) {
+    for (var i = 0; i < node.marks.length; i++) {
+      var mark = node.marks[i];
+      if ((0, _utils.isLinkMark)(mark, schema)) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
+
+/**
+ * Determine if a node is considered to be a link
+ */
+var isLink = function isLink(schema, node) {
+  if (isLinkNode(node)) {
+    return true;
+  }
+  return nodeHasLinkMark(schema, node);
+};
+
+/**
+ * Given a node, find all nodes and marks that are considered "links"
+ * @param state EditorState
+ * @param fragment Fragment to search
+ * @returns Array of nodes and marks found in the fragment that are "links"
+ */
+exports.isLink = isLink;
+function findLinksInNode(schema, node, offset) {
+  var links = [];
+  node.descendants(function (node, pos) {
+    // Nodes
+    if (isLinkNode(node)) {
+      links.push({
+        type: 'node',
+        pos: pos + offset,
+        node: node
+      });
+    }
+
+    // Marks
+    if (node.marks) {
+      for (var i = 0; i < node.marks.length; i++) {
+        var mark = node.marks[i];
+        if ((0, _utils.isLinkMark)(mark, schema)) {
+          links.push({
+            type: 'mark',
+            pos: pos + offset,
+            mark: mark
+          });
+        }
+      }
+    }
+  });
+  return links;
+}
+function getLinkUrl(link) {
+  var _link$mark$attrs;
+  if (link.type === 'node') {
+    var _link$node$attrs;
+    return (_link$node$attrs = link.node.attrs) === null || _link$node$attrs === void 0 ? void 0 : _link$node$attrs.url;
+  }
+  return (_link$mark$attrs = link.mark.attrs) === null || _link$mark$attrs === void 0 ? void 0 : _link$mark$attrs.href;
+}
+var linkObjectFromNode = function linkObjectFromNode(schema, node, pos) {
+  if (isLinkNode(node)) {
+    return {
+      type: 'node',
+      pos: pos,
+      node: node
+    };
+  }
+  if (node.marks) {
+    for (var i = 0; i < node.marks.length; i++) {
+      var mark = node.marks[i];
+      if ((0, _utils.isLinkMark)(mark, schema)) {
+        return {
+          type: 'mark',
+          pos: pos,
+          mark: mark
+        };
+      }
+    }
+  }
+};
+exports.linkObjectFromNode = linkObjectFromNode;
+var findLinksAtPositions = function findLinksAtPositions(tr, positions) {
+  var schema = tr.doc.type.schema;
+  var links = [];
+  for (var i = 0; i < positions.length; i++) {
+    var pos = positions[i];
+    var node = tr.doc.nodeAt(pos);
+    if (!node) {
+      continue;
+    }
+    var link = linkObjectFromNode(schema, node, pos);
+    if (!link) {
+      continue;
+    }
+    links.push(link);
+  }
+  return links;
+};
+exports.findLinksAtPositions = findLinksAtPositions;

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

@@ -4,12 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateCard = exports.setSelectedCardAppearance = exports.replaceQueuedUrlWithCard = exports.queueCardsFromChangedTr = exports.handleFallbackWithAnalytics = exports.convertHyperlinkToSmartCard = exports.changeSelectedCardToText = exports.changeSelectedCardToLinkFallback = exports.changeSelectedCardToLink = void 0;
+exports.updateCard = exports.setSelectedCardAppearance = exports.replaceQueuedUrlWithCard = exports.queueCardsFromChangedTr = exports.queueCardFromChangedTr = exports.handleFallbackWithAnalytics = exports.convertHyperlinkToSmartCard = exports.changeSelectedCardToText = exports.changeSelectedCardToLinkFallback = exports.changeSelectedCardToLink = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _prosemirrorState = require("prosemirror-state");
 var _prosemirrorHistory = require("prosemirror-history");
 var _adfSchema = require("@atlaskit/adf-schema");
+var _card = require("@atlaskit/editor-common/card");
 var _analytics = require("../../../plugins/analytics");
 var _nodeEvents = require("../../../plugins/analytics/types/node-events");
 var _analytics2 = require("../../../plugins/hyperlink/analytics");
@@ -52,7 +53,7 @@ function replaceLinksToCards(tr, cardAdf, schema, request) {
   tr.replaceWith(pos, pos + (node.text || url).length, nodes);
   return $pos.node($pos.depth - 1).type.name;
 }
-var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData, analyticsAction, createAnalyticsEvent) {
+var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData, analyticsAction) {
   return function (editorState, dispatch) {
     var state = _pluginKey.pluginKey.getState(editorState);
     if (!state) {
@@ -90,15 +91,22 @@ var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData,
         if (state.smartLinkEvents) {
           state.smartLinkEvents.insertSmartLink(domainName, 'inline', state.createAnalyticsEvent);
         }
+
+        /**
+         * TODO:
+         * What if each request has a different source?
+         * Unlikely, but need to define behaviour.
+         * Ignore analytics event? take first? provide 'mixed' as well?
+         */
+        var inputMethod = requests[0].source;
+        var sourceEvent = requests[0].sourceEvent;
         (0, _analytics.addAnalytics)(editorState, tr, {
           action: analyticsAction || _analytics.ACTION.INSERTED,
           actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
           actionSubjectId: _analytics.ACTION_SUBJECT_ID.SMART_LINK,
           eventType: _analytics.EVENT_TYPE.TRACK,
           attributes: {
-            inputMethod: requests[0].source /* TODO: what if each request has a different source?
-                                             unlikely, but need to define behaviour.
-                                              ignore analytics event? take first? provide 'mixed' as well?*/,
+            inputMethod: inputMethod,
             nodeType: nodeType,
             nodeContext: nodeContext,
             fromCurrentDomain: (0, _utils2.isFromCurrentDomain)(url)
@@ -107,6 +115,12 @@ var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData,
             domainName: domainName
           }
         });
+        (0, _card.addLinkMetadata)(editorState.selection, tr, {
+          action: analyticsAction,
+          inputMethod: inputMethod,
+          cardAction: 'RESOLVE',
+          sourceEvent: sourceEvent
+        });
       }
     }
     if (dispatch) {
@@ -116,23 +130,30 @@ var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData,
   };
 };
 exports.replaceQueuedUrlWithCard = replaceQueuedUrlWithCard;
-var handleFallbackWithAnalytics = function handleFallbackWithAnalytics(url, source) {
-  return function (editorState, dispatch) {
-    var state = _pluginKey.pluginKey.getState(editorState);
-    if (!state) {
+var handleFallbackWithAnalytics = function handleFallbackWithAnalytics(request) {
+  return function (state, dispatch) {
+    var cardState = _pluginKey.pluginKey.getState(state);
+    if (!cardState) {
       return false;
     }
-    var tr = editorState.tr;
-    (0, _analytics.addAnalytics)(editorState, tr, (0, _analytics2.getLinkCreationAnalyticsEvent)(source, url));
+    var tr = state.tr;
+    if (request.source !== _analytics.INPUT_METHOD.FLOATING_TB) {
+      (0, _analytics.addAnalytics)(state, tr, (0, _analytics2.getLinkCreationAnalyticsEvent)(request.source, request.url));
+    }
+    (0, _card.addLinkMetadata)(state.selection, tr, {
+      action: request.analyticsAction,
+      inputMethod: request.source
+    });
     if (dispatch) {
-      dispatch((0, _actions.resolveCard)(url)(tr));
+      dispatch((0, _actions.resolveCard)(request.url)(tr));
     }
     return true;
   };
 };
 exports.handleFallbackWithAnalytics = handleFallbackWithAnalytics;
-var queueCardsFromChangedTr = function queueCardsFromChangedTr(state, tr, source) {
-  var normalizeLinkText = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+var queueCardsFromChangedTr = function queueCardsFromChangedTr(state, tr, source, analyticsAction) {
+  var normalizeLinkText = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
+  var sourceEvent = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : undefined;
   var schema = state.schema;
   var link = schema.marks.link;
   var requests = [];
@@ -152,14 +173,56 @@ var queueCardsFromChangedTr = function queueCardsFromChangedTr(state, tr, source
         pos: pos,
         appearance: 'inline',
         compareLinkText: normalizeLinkText,
-        source: source
+        source: source,
+        analyticsAction: analyticsAction,
+        sourceEvent: sourceEvent
       });
     }
     return false;
   });
+  (0, _card.addLinkMetadata)(state.selection, tr, {
+    action: analyticsAction
+  });
   return (0, _actions.queueCards)(requests)(tr);
 };
 exports.queueCardsFromChangedTr = queueCardsFromChangedTr;
+var queueCardFromChangedTr = function queueCardFromChangedTr(state, tr, source, analyticsAction) {
+  var normalizeLinkText = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
+  var sourceEvent = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : undefined;
+  var previousAppearance = arguments.length > 6 ? arguments[6] : undefined;
+  var schema = state.schema;
+  var link = schema.marks.link;
+  var requests = [];
+  (0, _utils.nodesBetweenChanged)(tr, function (node, pos) {
+    if (!node.isText) {
+      return true;
+    }
+    var linkMark = node.marks.find(function (mark) {
+      return mark.type === link;
+    });
+    if (linkMark) {
+      if (!(0, _shouldReplaceLink.shouldReplaceLink)(node, normalizeLinkText)) {
+        return false;
+      }
+      requests.push({
+        url: linkMark.attrs.href,
+        pos: pos,
+        appearance: 'inline',
+        previousAppearance: previousAppearance,
+        compareLinkText: normalizeLinkText,
+        source: source,
+        analyticsAction: analyticsAction,
+        sourceEvent: sourceEvent
+      });
+    }
+    return false;
+  });
+  (0, _card.addLinkMetadata)(state.selection, tr, {
+    action: analyticsAction
+  });
+  return (0, _actions.queueCards)(requests)(tr);
+};
+exports.queueCardFromChangedTr = queueCardFromChangedTr;
 var convertHyperlinkToSmartCard = function convertHyperlinkToSmartCard(state, source, appearance) {
   var normalizeLinkText = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   var schema = state.schema;
@@ -170,18 +233,21 @@ var convertHyperlinkToSmartCard = function convertHyperlinkToSmartCard(state, so
       return mark.type === link;
     });
     if (linkMark) {
-      var request = {
+      requests.push({
         url: linkMark.attrs.href,
         pos: pos,
         appearance: appearance,
+        previousAppearance: 'url',
         compareLinkText: normalizeLinkText,
         source: source,
         analyticsAction: _analytics.ACTION.CHANGED_TYPE,
         shouldReplaceLink: true
-      };
-      requests.push(request);
+      });
     }
   });
+  (0, _card.addLinkMetadata)(state.selection, state.tr, {
+    action: _analytics.ACTION.CHANGED_TYPE
+  });
   return (0, _actions.queueCards)(requests)(state.tr);
 };
 exports.convertHyperlinkToSmartCard = convertHyperlinkToSmartCard;
@@ -239,14 +305,15 @@ var changeSelectedCardToLinkFallback = function changeSelectedCardToLinkFallback
   };
 };
 exports.changeSelectedCardToLinkFallback = changeSelectedCardToLinkFallback;
-var updateCard = function updateCard(href) {
+var updateCard = function updateCard(href, sourceEvent) {
   return function (state, dispatch) {
     var selectedNode = state.selection instanceof _prosemirrorState.NodeSelection && state.selection.node;
     if (!selectedNode) {
       return false;
     }
+    var cardAppearance = (0, _utils3.selectedCardAppearance)(state);
     var tr = cardToLinkWithTransaction(state, href, href);
-    queueCardsFromChangedTr(state, tr, _analytics.INPUT_METHOD.MANUAL);
+    queueCardFromChangedTr(state, tr, _analytics.INPUT_METHOD.MANUAL, _analytics.ACTION.UPDATED, undefined, sourceEvent, cardAppearance);
     if (dispatch) {
       dispatch(tr.scrollIntoView());
     }
@@ -281,7 +348,11 @@ var changeSelectedCardToText = function changeSelectedCardToText(text) {
     }
     var tr = state.tr.replaceSelectionWith(state.schema.text(text), false);
     if (dispatch) {
-      dispatch((0, _analytics.addAnalytics)(state, tr.scrollIntoView(), (0, _linkingUtils.unlinkPayload)(_analytics.ACTION_SUBJECT_ID.CARD_INLINE)));
+      (0, _card.addLinkMetadata)(state.selection, tr, {
+        action: _analytics.ACTION.UNLINK
+      });
+      (0, _analytics.addAnalytics)(state, tr.scrollIntoView(), (0, _linkingUtils.unlinkPayload)(_analytics.ACTION_SUBJECT_ID.CARD_INLINE));
+      dispatch(tr);
     }
     return true;
   };
@@ -294,8 +365,11 @@ var setSelectedCardAppearance = function setSelectedCardAppearance(appearance) {
     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.MANUAL, appearance);
+      var _tr = convertHyperlinkToSmartCard(state, _analytics.INPUT_METHOD.FLOATING_TB, appearance);
       if (dispatch) {
+        (0, _card.addLinkMetadata)(state.selection, _tr, {
+          action: _analytics.ACTION.CHANGED_TYPE
+        });
         dispatch(_tr.scrollIntoView());
       }
       return false;
@@ -332,6 +406,9 @@ var setSelectedCardAppearance = function setSelectedCardAppearance(appearance) {
         previousType: (0, _utils3.appearanceForNodeType)(selectedNode.type)
       }
     });
+    (0, _card.addLinkMetadata)(state.selection, tr, {
+      action: _analytics.ACTION.CHANGED_TYPE
+    });
     if (dispatch) {
       dispatch(tr.scrollIntoView());
     }

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

@@ -11,6 +11,7 @@ Object.defineProperty(exports, "pluginKey", {
     return _pluginKey.pluginKey;
   }
 });
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _getInlineNodeViewProducer = require("../../../nodeviews/getInlineNodeViewProducer");
@@ -21,8 +22,11 @@ var _pluginKey = require("./plugin-key");
 var _reducers = _interopRequireDefault(require("./reducers"));
 var _resolve = require("./util/resolve");
 var _state = require("./util/state");
+var _analytics = require("./analytics");
 var createPlugin = function createPlugin(options) {
   return function (pmPluginFactoryParams) {
+    var lpAnalyticsEventsNext = pmPluginFactoryParams.featureFlags.lpAnalyticsEventsNext;
+    var analyticsQueue = (0, _analytics.createAnalyticsQueue)(!!lpAnalyticsEventsNext);
     var editorAppearance = options.editorAppearance,
       platform = options.platform,
       allowResizing = options.allowResizing,
@@ -39,25 +43,31 @@ var createPlugin = function createPlugin(options) {
             cards: [],
             showLinkingToolbar: false,
             smartLinkEvents: undefined,
+            smartLinkEventsNext: undefined,
             createAnalyticsEvent: createAnalyticsEvent,
             editorAppearance: editorAppearance
           };
         },
-        apply: function apply(tr, pluginState) {
+        apply: function apply(tr, pluginState, prevEditorState) {
           // Update all the positions of outstanding requests and
           // cards in the plugin state.
           var pluginStateWithUpdatedPos = (0, _state.getPluginStateWithUpdatedPos)(pluginState, tr);
+
           // 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 (meta) {
-            var nextPluginState = (0, _reducers.default)(pluginStateWithUpdatedPos, meta);
-            return nextPluginState;
+            var nextState = (0, _reducers.default)(pluginStateWithUpdatedPos, meta);
+            if (!pluginState.smartLinkEventsNext && nextState.smartLinkEventsNext) {
+              analyticsQueue.setCallbacks(nextState.smartLinkEventsNext);
+            }
+            return nextState;
           }
           return pluginStateWithUpdatedPos;
         }
       },
       view: function view(_view) {
-        var outstandingRequests = {};
         var subscriptionHandler = function subscriptionHandler(name, provider) {
           return (0, _resolve.handleProvider)(name, provider, _view);
         };
@@ -83,19 +93,15 @@ var createPlugin = function createPlugin(options) {
                  * other tasks as per common implementations of the JavaScript event loop in browsers.
                  */
                 var invoke = (0, _rafSchd.default)(function () {
-                  return (0, _resolve.resolveWithProvider)(view, outstandingRequests, provider, request, options);
+                  return (0, _resolve.resolveWithProvider)(view, provider, request, options);
                 });
                 rafCancellationCallbacks.push(invoke.cancel);
                 invoke();
               });
             }
+            analyticsQueue.flush();
           },
           destroy: function destroy() {
-            // Cancel all outstanding requests
-            Object.keys(outstandingRequests).forEach(function (url) {
-              return Promise.reject(outstandingRequests[url]);
-            });
-
             // Cancel any outstanding raf callbacks.
             rafCancellationCallbacks.forEach(function (cancellationCallback) {
               return cancellationCallback();

package/dist/cjs/plugins/card/pm-plugins/reducers.js

@@ -41,6 +41,11 @@ var registerEvents = function registerEvents(state, action) {
     smartLinkEvents: action.smartLinkEvents
   });
 };
+var registerEventsNext = function registerEventsNext(state, action) {
+  return _objectSpread(_objectSpread({}, state), {}, {
+    smartLinkEventsNext: action.smartLinkEvents
+  });
+};
 var setLinkToolbar = function setLinkToolbar(state, action) {
   return _objectSpread(_objectSpread({}, state), {}, {
     showLinkingToolbar: action.type === 'SHOW_LINK_TOOLBAR'
@@ -58,6 +63,8 @@ var _default = function _default(state, action) {
       return register(state, action);
     case 'REGISTER_EVENTS':
       return registerEvents(state, action);
+    case 'REGISTER_EVENTS_NEXT':
+      return registerEventsNext(state, action);
     case 'SHOW_LINK_TOOLBAR':
     case 'HIDE_LINK_TOOLBAR':
       return setLinkToolbar(state, action);

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

@@ -11,18 +11,14 @@ var _doc = require("../doc");
 // ============================================================================ //
 // Used for all interactions with the EditorCardProvider.
 // ============================================================================ //
-var resolveWithProvider = function resolveWithProvider(view, outstandingRequests, provider, request, options) {
+var resolveWithProvider = function resolveWithProvider(view, provider, request, options) {
   // When user manually changes appearance from blue link to smart link, we should respect that,
   var shouldForceAppearance =
   // This flag is set to true only in one place atm:
   // packages/editor/editor-core/src/plugins/card/pm-plugins/doc.ts @ convertHyperlinkToSmartCard
   // Which is used when user switching from URL to smart link appearance.
   !!request.shouldReplaceLink;
-  var handleResolve = provider.resolve(request.url, request.appearance, shouldForceAppearance).then(function (resolvedCard) {
-    delete outstandingRequests[request.url];
-    return resolvedCard;
-  }).then(handleResolved(view, request, options), handleRejected(view, request));
-  outstandingRequests[request.url] = handleResolve;
+  var handleResolve = provider.resolve(request.url, request.appearance, shouldForceAppearance).then(handleResolved(view, request, options), handleRejected(view, request));
   return handleResolve;
 };
 exports.resolveWithProvider = resolveWithProvider;
@@ -44,7 +40,7 @@ var handleResolved = function handleResolved(view, request, options) {
 };
 var handleRejected = function handleRejected(view, request) {
   return function () {
-    (0, _doc.handleFallbackWithAnalytics)(request.url, request.source)(view.state, view.dispatch);
+    (0, _doc.handleFallbackWithAnalytics)(request)(view.state, view.dispatch);
   };
 };
 

package/dist/cjs/plugins/card/toolbar.js

@@ -19,6 +19,7 @@ var _analytics = require("../analytics");
 var _messages = _interopRequireWildcard(require("../../messages"));
 var _decoration = require("../base/pm-plugins/decoration");
 var _doc = require("./pm-plugins/doc");
+var _card = require("@atlaskit/editor-common/card");
 var _main = require("./pm-plugins/main");
 var _styles = require("@atlaskit/editor-common/styles");
 var _EditLinkToolbar = require("./ui/EditLinkToolbar");
@@ -33,7 +34,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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 removeCard = function removeCard(state, dispatch) {
+var removeCard = (0, _card.commandWithMetadata)(function (state, dispatch) {
   if (!(state.selection instanceof _prosemirrorState.NodeSelection)) {
     return false;
   }
@@ -52,7 +53,9 @@ var removeCard = function removeCard(state, dispatch) {
     dispatch((0, _analytics.addAnalytics)(state, (0, _prosemirrorUtils.removeSelectedNode)(state.tr), payload));
   }
   return true;
-};
+}, {
+  action: _analytics.ACTION.DELETED
+});
 exports.removeCard = removeCard;
 var visitCardLink = function visitCardLink(state, dispatch) {
   if (!(state.selection instanceof _prosemirrorState.NodeSelection)) {
@@ -143,14 +146,21 @@ var unlinkCard = function unlinkCard(node, state) {
   var displayInfo = (0, _utils.displayInfoForCard)(node, (0, _utils.findCardInfo)(state));
   var text = displayInfo.title || displayInfo.url;
   if (text) {
-    return (0, _doc.changeSelectedCardToText)(text);
+    return (0, _card.commandWithMetadata)((0, _doc.changeSelectedCardToText)(text), {
+      action: _analytics.ACTION.UNLINK
+    });
   }
   return function () {
     return false;
   };
 };
-var buildAlignmentOptions = function buildAlignmentOptions(state, intl) {
-  return (0, _MediaAndEmbedsToolbar.default)(state, intl, state.schema.nodes.embedCard, true, true);
+var buildAlignmentOptions = function buildAlignmentOptions(state, intl, cardOptions) {
+  return (0, _MediaAndEmbedsToolbar.default)(state, intl, state.schema.nodes.embedCard, true, true, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowWrapping, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowAlignment);
+};
+var withToolbarMetadata = function withToolbarMetadata(command) {
+  return (0, _card.commandWithMetadata)(command, {
+    inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
+  });
 };
 var generateToolbarItems = function generateToolbarItems(state, featureFlags, intl, providerFactory, cardOptions, platform, linkPicker) {
   return function (node) {
@@ -221,10 +231,10 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
         onFocus: (0, _decoration.hoverDecoration)(node.type, true),
         onBlur: (0, _decoration.hoverDecoration)(node.type, false),
         title: intl.formatMessage(_messages.default.remove),
-        onClick: removeCard
+        onClick: withToolbarMetadata(removeCard)
       }]);
       if (currentAppearance === 'embed') {
-        var alignmentOptions = buildAlignmentOptions(state, intl);
+        var alignmentOptions = buildAlignmentOptions(state, intl, cardOptions);
         if (alignmentOptions.length) {
           alignmentOptions.push({
             type: 'separator'
@@ -269,7 +279,7 @@ var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inli
     type: 'button',
     title: intl.formatMessage(_messages.linkToolbarMessages.unlink),
     icon: _unlink.default,
-    onClick: unlinkCard(node, state)
+    onClick: withToolbarMetadata(unlinkCard(node, state))
   }, {
     type: 'separator'
   }] : [];

package/dist/cjs/plugins/card/ui/EditLinkToolbar.js

@@ -13,6 +13,8 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
+var _ui = require("@atlaskit/editor-common/ui");
+var _card = require("@atlaskit/editor-common/card");
 var _HyperlinkAddToolbar = _interopRequireDefault(require("../../hyperlink/ui/HyperlinkAddToolbar"));
 var _actions = require("../pm-plugins/actions");
 var _analytics = require("../../analytics");
@@ -22,7 +24,6 @@ var _utils = require("../utils");
 var _prosemirrorState = require("prosemirror-state");
 var _linkingUtils = require("../../../utils/linking-utils");
 var _forceFocus = require("../../floating-toolbar/pm-plugins/force-focus");
-var _ui = require("@atlaskit/editor-common/ui");
 var _messages = require("../../../messages");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -88,10 +89,10 @@ var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
         ,
         invokeMethod: _analytics.INPUT_METHOD.FLOATING_TB,
         featureFlags: featureFlags,
-        onSubmit: function onSubmit(href, title, displayText) {
+        onSubmit: function onSubmit(href, title, displayText, _, analytic) {
           _this2.hideLinkToolbar();
           if (_onSubmit) {
-            _onSubmit(href, displayText || title);
+            _onSubmit(href, displayText || title, analytic);
           }
         }
       });
@@ -135,19 +136,22 @@ var buildEditLinkToolbar = function buildEditLinkToolbar(_ref) {
         text: displayInfo.title || '',
         node: node,
         featureFlags: featureFlags,
-        onSubmit: function onSubmit(newHref, newText) {
+        onSubmit: function onSubmit(newHref, newText, analytic) {
           var urlChanged = newHref !== displayInfo.url;
           var titleChanged = newText !== displayInfo.title;
 
           // If the title is changed in a smartlink, convert to standard blue hyperlink
           // (even if the url was also changed) - we don't want to lose the custom title.
           if (titleChanged) {
-            return (0, _doc.changeSelectedCardToLink)(newText, newHref)(view.state, view.dispatch);
-          } else if (urlChanged) {
+            return (0, _card.commandWithMetadata)((0, _doc.changeSelectedCardToLink)(newText, newHref), {
+              action: _analytics.ACTION.UPDATED,
+              sourceEvent: analytic
+            })(view.state, view.dispatch);
+          }
+          if (urlChanged) {
             // If *only* the url is changed in a smart link, reresolve
-            return (0, _doc.updateCard)(newHref)(view.state, view.dispatch);
+            return (0, _doc.updateCard)(newHref, analytic)(view.state, view.dispatch);
           }
-          return;
         }
       });
     }