@atlaskit/editor-core 172.3.1 → 173.0.0

package/dist/cjs/plugins/paste/commands.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.stopTrackingPastedMacroPositions = exports.startTrackingPastedMacroPositions = void 0;
+
+var _pluginFactory = require("./pm-plugins/plugin-factory");
+
+var _actions = require("./actions");
+
+/**
+ * Use this to register macro link positions during a paste operation, that you
+ * want to track in a document over time, through any document changes.
+ *
+ * @param positions a map of string keys (custom position references) and position values e.g. { ['my-key-1']: 11 }
+ *
+ * **Context**: This is neccessary if there is an async process or an unknown period of time
+ * between obtaining an original position, and wanting to know about what its final eventual
+ * value. In that scenario, positions will need to be actively tracked and mapped in plugin
+ * state so that they can be mapped through any other independent document change transactions being
+ * dispatched to the editor that could affect their value.
+ */
+var startTrackingPastedMacroPositions = function startTrackingPastedMacroPositions(pastedMacroPositions) {
+  return (0, _pluginFactory.createCommand)(function () {
+    return {
+      type: _actions.PastePluginActionTypes.START_TRACKING_PASTED_MACRO_POSITIONS,
+      pastedMacroPositions: pastedMacroPositions
+    };
+  });
+};
+
+exports.startTrackingPastedMacroPositions = startTrackingPastedMacroPositions;
+
+var stopTrackingPastedMacroPositions = function stopTrackingPastedMacroPositions(pastedMacroPositionKeys) {
+  return (0, _pluginFactory.createCommand)(function () {
+    return {
+      type: _actions.PastePluginActionTypes.STOP_TRACKING_PASTED_MACRO_POSITIONS,
+      pastedMacroPositionKeys: pastedMacroPositionKeys
+    };
+  });
+};
+
+exports.stopTrackingPastedMacroPositions = stopTrackingPastedMacroPositions;

package/dist/cjs/plugins/paste/handlers.js

@@ -37,6 +37,8 @@ var _prosemirrorState = require("prosemirror-state");
 
 var _prosemirrorUtils = require("prosemirror-utils");
 
+var _v = _interopRequireDefault(require("uuid/v4"));
+
 var _utils = require("@atlaskit/editor-tables/utils");
 
 var _utils2 = require("../../utils");
@@ -65,6 +67,10 @@ var _main2 = require("../hyperlink/pm-plugins/main");
 
 var _edgeCases = require("./edge-cases");
 
+var _commands = require("./commands");
+
+var _pluginFactory = require("./pm-plugins/plugin-factory");
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -376,12 +382,21 @@ function _getSmartLinkAdf() {
   return _getSmartLinkAdf.apply(this, arguments);
 }
 
-function insertAutoMacro(slice, macro, view) {
+function insertAutoMacro(slice, macro, view, from, to) {
   if (view) {
     // insert the text or linkified/md-converted clipboard data
     var selection = view.state.tr.selection;
-    var tr = view.state.tr.replaceSelection(slice);
-    var before = tr.mapping.map(selection.from, -1);
+    var tr;
+    var before;
+
+    if (typeof from === 'number' && typeof to === 'number') {
+      tr = view.state.tr.replaceRange(from, to, slice);
+      before = tr.mapping.map(from, -1);
+    } else {
+      tr = view.state.tr.replaceSelection(slice);
+      before = tr.mapping.map(selection.from, -1);
+    }
+
     view.dispatch(tr); // replace the text with the macro as a separate transaction
     // so the autoconversion generates 2 undo steps
 
@@ -414,16 +429,36 @@ function handleMacroAutoConvert(text, slice, cardsOptions, extensionAutoConverte
        * if FF enabled, run through smart links and check for result
        */
       if (cardsOptions && cardsOptions.resolveBeforeMacros && cardsOptions.resolveBeforeMacros.length) {
+        var _startTrackingPastedM;
+
         if (cardsOptions.resolveBeforeMacros.indexOf(macro.attrs.extensionKey) < 0) {
           return insertAutoMacro(slice, macro, view);
         }
 
+        if (!view) {
+          throw new Error('View is missing');
+        }
+
+        var trackingId = (0, _v.default)();
+        var trackingFrom = "handleMacroAutoConvert-from-".concat(trackingId);
+        var trackingTo = "handleMacroAutoConvert-to-".concat(trackingId);
+        (0, _commands.startTrackingPastedMacroPositions)((_startTrackingPastedM = {}, (0, _defineProperty2.default)(_startTrackingPastedM, trackingFrom, state.selection.from), (0, _defineProperty2.default)(_startTrackingPastedM, trackingTo, state.selection.to), _startTrackingPastedM))(state, dispatch);
         getSmartLinkAdf(text, 'inline', cardsOptions).then(function () {
+          // we use view.state rather than state because state becomes a stale
+          // state reference after getSmartLinkAdf's async work
+          var _getPastePluginState = (0, _pluginFactory.getPluginState)(view.state),
+              pastedMacroPositions = _getPastePluginState.pastedMacroPositions;
+
           if (dispatch) {
-            handleMarkdown(slice)(state, dispatch);
+            handleMarkdown(slice, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo])(view.state, dispatch);
           }
         }).catch(function () {
-          return insertAutoMacro(slice, macro, view);
+          var _getPastePluginState2 = (0, _pluginFactory.getPluginState)(view.state),
+              pastedMacroPositions = _getPastePluginState2.pastedMacroPositions;
+
+          insertAutoMacro(slice, macro, view, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo]);
+        }).finally(function () {
+          (0, _commands.stopTrackingPastedMacroPositions)([trackingFrom, trackingTo])(view.state, dispatch);
         });
         return true;
       }
@@ -545,10 +580,16 @@ function handleExpandPasteInTable(slice) {
   };
 }
 
-function handleMarkdown(markdownSlice) {
+function handleMarkdown(markdownSlice, from, to) {
   return function (state, dispatch) {
     var tr = (0, _prosemirrorHistory.closeHistory)(state.tr);
-    tr.replaceSelection(markdownSlice);
+
+    if (typeof from === 'number' && typeof to === 'number') {
+      tr.replaceRange(from, to, markdownSlice);
+    } else {
+      tr.replaceSelection(markdownSlice);
+    }
+
     (0, _doc.queueCardsFromChangedTr)(state, tr, _analytics.INPUT_METHOD.CLIPBOARD);
 
     if (dispatch) {

package/dist/cjs/plugins/paste/index.js

@@ -19,8 +19,9 @@ var pastePlugin = function pastePlugin(_ref) {
         plugin: function plugin(_ref2) {
           var schema = _ref2.schema,
               providerFactory = _ref2.providerFactory,
-              dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
-          return (0, _main.createPlugin)(schema, dispatchAnalyticsEvent, plainTextPasteLinkification, cardOptions, sanitizePrivateContent, providerFactory);
+              dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
+              dispatch = _ref2.dispatch;
+          return (0, _main.createPlugin)(schema, dispatchAnalyticsEvent, dispatch, plainTextPasteLinkification, cardOptions, sanitizePrivateContent, providerFactory);
         }
       }];
     }

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

@@ -14,7 +14,12 @@ Object.defineProperty(exports, "md", {
     return _md.md;
   }
 });
-exports.stateKey = void 0;
+Object.defineProperty(exports, "stateKey", {
+  enumerable: true,
+  get: function get() {
+    return _pluginFactory.pluginKey;
+  }
+});
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -24,12 +29,12 @@ var _prosemirrorModel = require("prosemirror-model");
 
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
-var _prosemirrorState = require("prosemirror-state");
-
 var _uuid = _interopRequireDefault(require("uuid"));
 
 var _editorMarkdownTransformer = require("@atlaskit/editor-markdown-transformer");
 
+var _slice = require("../../../utils/slice");
+
 var _extensions = require("@atlaskit/editor-common/extensions");
 
 var clipboard = _interopRequireWildcard(require("../../../utils/clipboard"));
@@ -76,22 +81,22 @@ var _utils9 = require("@atlaskit/editor-tables/utils");
 
 var _step = require("../../../utils/step");
 
+var _pluginFactory = require("./plugin-factory");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 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; }
 
 _analytics.sendPasteAnalyticsEvent;
-var stateKey = new _prosemirrorState.PluginKey('pastePlugin');
-exports.stateKey = stateKey;
 
-function createPlugin(schema, dispatchAnalyticsEvent, plainTextPasteLinkification, cardOptions, sanitizePrivateContent, providerFactory) {
+function createPlugin(schema, dispatchAnalyticsEvent, dispatch, plainTextPasteLinkification, cardOptions, sanitizePrivateContent, providerFactory) {
   var atlassianMarkDownParser = new _editorMarkdownTransformer.MarkdownTransformer(schema, _md.md);
 
   function getMarkdownSlice(text, openStart, openEnd) {
     var textInput = text;
 
-    if (textInput.includes(':\\\\')) {
-      textInput = textInput.replace(/:\\\\/g, ':\\\\\\\\');
+    if (textInput.includes('\\')) {
+      textInput = textInput.replace(/\\/g, '\\\\');
     }
 
     var doc = atlassianMarkDownParser.parse((0, _util.escapeLinks)(textInput));
@@ -155,7 +160,10 @@ function createPlugin(schema, dispatchAnalyticsEvent, plainTextPasteLinkificatio
   var mostRecentPasteEvent;
   var pastedFromBitBucket = false;
   return new _safePlugin.SafePlugin({
-    key: stateKey,
+    key: _pluginFactory.pluginKey,
+    state: (0, _pluginFactory.createPluginState)(dispatch, {
+      pastedMacroPositions: {}
+    }),
     props: {
       // For serialising to plain text
       clipboardTextSerializer: _clipboardTextSerializer.clipboardTextSerializer,
@@ -350,6 +358,23 @@ function createPlugin(schema, dispatchAnalyticsEvent, plainTextPasteLinkificatio
           }
 
           return (0, _analytics.handleMarkdownWithAnalytics)(view, event, markdownSlice)(state, dispatch);
+        }
+
+        if (isRichText && (0, _utils4.isInsideBlockQuote)(state)) {
+          //If pasting inside blockquote
+          //Skip the blockquote node and keep remaining nodes as they are
+          var blockquote = schema.nodes.blockquote;
+          var children = [];
+          (0, _slice.mapChildren)(slice.content, function (node) {
+            if (node.type === blockquote) {
+              for (var i = 0; i < node.childCount; i++) {
+                children.push(node.child(i));
+              }
+            } else {
+              children.push(node);
+            }
+          });
+          slice = new _prosemirrorModel.Slice(_prosemirrorModel.Fragment.fromArray(children), slice.openStart, slice.openEnd);
         } // finally, handle rich-text copy-paste
 
 

package/dist/cjs/plugins/paste/pm-plugins/plugin-factory.js

@@ -0,0 +1,62 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.pluginKey = exports.getPluginState = exports.createPluginState = exports.createCommand = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _prosemirrorState = require("prosemirror-state");
+
+var _pluginStateFactory = require("../../../utils/plugin-state-factory");
+
+var _reducer = require("../reducer");
+
+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 pluginKey = new _prosemirrorState.PluginKey('pastePlugin');
+exports.pluginKey = pluginKey;
+
+var _pluginFactory = (0, _pluginStateFactory.pluginFactory)(pluginKey, _reducer.reducer, {
+  mapping: function mapping(tr, pluginState) {
+    if (tr.docChanged) {
+      var atLeastOnePositionChanged = false;
+      var positionsMappedThroughChanges = Object.entries(pluginState.pastedMacroPositions).reduce(function (acc, _ref) {
+        var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
+            key = _ref2[0],
+            position = _ref2[1];
+
+        var mappedPosition = tr.mapping.map(position);
+
+        if (position !== mappedPosition) {
+          atLeastOnePositionChanged = true;
+        }
+
+        acc[key] = tr.mapping.map(position);
+        return acc;
+      }, {});
+
+      if (atLeastOnePositionChanged) {
+        return _objectSpread(_objectSpread({}, pluginState), {}, {
+          pastedMacroPositions: positionsMappedThroughChanges
+        });
+      }
+    }
+
+    return pluginState;
+  }
+}),
+    createPluginState = _pluginFactory.createPluginState,
+    createCommand = _pluginFactory.createCommand,
+    getPluginState = _pluginFactory.getPluginState;
+
+exports.getPluginState = getPluginState;
+exports.createCommand = createCommand;
+exports.createPluginState = createPluginState;

package/dist/cjs/plugins/paste/reducer.js

@@ -0,0 +1,47 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.reducer = void 0;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _actions = require("./actions");
+
+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 reducer = function reducer(state, action) {
+  switch (action.type) {
+    case _actions.PastePluginActionTypes.START_TRACKING_PASTED_MACRO_POSITIONS:
+      {
+        return _objectSpread(_objectSpread({}, state), {}, {
+          pastedMacroPositions: _objectSpread(_objectSpread({}, state.pastedMacroPositions), action.pastedMacroPositions)
+        });
+      }
+
+    case _actions.PastePluginActionTypes.STOP_TRACKING_PASTED_MACRO_POSITIONS:
+      {
+        var filteredMacroPositions = Object.fromEntries(Object.entries(state.pastedMacroPositions).filter(function (_ref) {
+          var _ref2 = (0, _slicedToArray2.default)(_ref, 1),
+              key = _ref2[0];
+
+          return !action.pastedMacroPositionKeys.includes(key);
+        }));
+        return _objectSpread(_objectSpread({}, state), {}, {
+          pastedMacroPositions: filteredMacroPositions
+        });
+      }
+
+    default:
+      return state;
+  }
+};
+
+exports.reducer = reducer;

package/dist/cjs/plugins/paste/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/plugins/placeholder/index.js

@@ -25,6 +25,8 @@ var _focusHandler = require("../base/pm-plugins/focus-handler");
 
 var _utils2 = require("../type-ahead/utils");
 
+var _composition = require("../base/pm-plugins/composition");
+
 var pluginKey = new _prosemirrorState.PluginKey('placeholderPlugin');
 exports.pluginKey = pluginKey;
 
@@ -154,7 +156,7 @@ function createPlugin(defaultPlaceholderText, placeholderHints, bracketPlacehold
             placeholderText = _getPlaceholderState.placeholderText,
             pos = _getPlaceholderState.pos;
 
-        if (hasPlaceholder && placeholderText && pos !== undefined) {
+        if (hasPlaceholder && placeholderText && pos !== undefined && !(0, _composition.isComposing)(editorState)) {
           return createPlaceholderDecoration(editorState, placeholderText, pos);
         }
 

package/dist/cjs/plugins/placeholder-text/index.js

@@ -97,10 +97,16 @@ function createPlugin(dispatch, options) {
         var placeholderNodeType = newState.schema.nodes.placeholder;
 
         if (adjacentNode && adjacentNode.type === placeholderNodeType && didPlaceholderExistBeforeTxn) {
-          // Check that cursor has moved forward in the document **and** that there is content before the cursor
-          var wasContentAdded = oldState.selection.$head.pos < newState.selection.$head.pos && !(0, _utils.isNodeEmpty)(newState.selection.$head.nodeBefore);
+          var _$newHead$nodeBefore;
 
-          if (wasContentAdded) {
+          var $newHead = newState.selection.$head;
+          var $oldHead = oldState.selection.$head; // Check that cursor has moved forward in the document **and** that there is content before the cursor
+
+          var cursorMoved = $oldHead.pos < $newHead.pos;
+          var nodeBeforeHasContent = !(0, _utils.isNodeEmpty)($newHead.nodeBefore);
+          var nodeBeforeIsInline = (_$newHead$nodeBefore = $newHead.nodeBefore) === null || _$newHead$nodeBefore === void 0 ? void 0 : _$newHead$nodeBefore.type.isInline;
+
+          if (cursorMoved && (nodeBeforeHasContent || nodeBeforeIsInline)) {
             var _NodeSelection$create = _prosemirrorState.NodeSelection.create(newState.doc, adjacentNodePos),
                 $from = _NodeSelection$create.$from,
                 $to = _NodeSelection$create.$to;

package/dist/cjs/plugins/status/ui/statusPicker.js

@@ -78,8 +78,11 @@ var StatusPickerWithoutAnalytcs = /*#__PURE__*/function (_React$Component) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleClickOutside", function (event) {
       event.preventDefault();
       _this.inputMethod = InputMethod.blur;
+      var selectedText = window.getSelection();
 
-      _this.props.closeStatusPicker();
+      if (!selectedText) {
+        _this.props.closeStatusPicker();
+      }
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleEscapeKeydown", function (event) {
       event.preventDefault();

package/dist/cjs/plugins/table/commands-with-analytics.js

@@ -84,77 +84,83 @@ var emptyMultipleCellsWithAnalytics = function emptyMultipleCellsWithAnalytics(e
 exports.emptyMultipleCellsWithAnalytics = emptyMultipleCellsWithAnalytics;
 
 var mergeCellsWithAnalytics = function mergeCellsWithAnalytics(editorAnalyticsAPI) {
-  return (0, _analytics2.withEditorAnalyticsAPI)(function (_ref2) {
-    var selection = _ref2.selection;
-
-    var _getSelectedCellInfo2 = (0, _utils2.getSelectedCellInfo)(selection),
-        horizontalCells = _getSelectedCellInfo2.horizontalCells,
-        verticalCells = _getSelectedCellInfo2.verticalCells,
-        totalCells = _getSelectedCellInfo2.totalCells,
-        totalRowCount = _getSelectedCellInfo2.totalRowCount,
-        totalColumnCount = _getSelectedCellInfo2.totalColumnCount;
-
-    return {
-      action: _analytics.TABLE_ACTION.MERGED,
-      actionSubject: _analytics.ACTION_SUBJECT.TABLE,
-      actionSubjectId: null,
-      attributes: {
-        horizontalCells: horizontalCells,
-        verticalCells: verticalCells,
-        totalCells: totalCells,
-        totalRowCount: totalRowCount,
-        totalColumnCount: totalColumnCount
-      },
-      eventType: _analytics.EVENT_TYPE.TRACK
-    };
-  })(editorAnalyticsAPI)(function (state, dispatch) {
-    if (dispatch) {
-      dispatch((0, _transforms.mergeCells)(state.tr));
-    }
-
-    return true;
-  });
-};
-
-exports.mergeCellsWithAnalytics = mergeCellsWithAnalytics;
-
-var splitCellWithAnalytics = function splitCellWithAnalytics(editorAnalyticsAPI) {
-  return (0, _analytics2.withEditorAnalyticsAPI)(function (_ref3) {
-    var selection = _ref3.selection;
-
-    var _getSelectedCellInfo3 = (0, _utils2.getSelectedCellInfo)(selection),
-        totalRowCount = _getSelectedCellInfo3.totalRowCount,
-        totalColumnCount = _getSelectedCellInfo3.totalColumnCount;
+  return function (inputMethod) {
+    return (0, _analytics2.withEditorAnalyticsAPI)(function (_ref2) {
+      var selection = _ref2.selection;
 
-    var cell = (0, _utils.findCellClosestToPos)(selection.$anchor);
+      var _getSelectedCellInfo2 = (0, _utils2.getSelectedCellInfo)(selection),
+          horizontalCells = _getSelectedCellInfo2.horizontalCells,
+          verticalCells = _getSelectedCellInfo2.verticalCells,
+          totalCells = _getSelectedCellInfo2.totalCells,
+          totalRowCount = _getSelectedCellInfo2.totalRowCount,
+          totalColumnCount = _getSelectedCellInfo2.totalColumnCount;
 
-    if (cell) {
-      var _cell$node$attrs = cell.node.attrs,
-          verticalCells = _cell$node$attrs.rowspan,
-          horizontalCells = _cell$node$attrs.colspan;
       return {
-        action: _analytics.TABLE_ACTION.SPLIT,
+        action: _analytics.TABLE_ACTION.MERGED,
         actionSubject: _analytics.ACTION_SUBJECT.TABLE,
         actionSubjectId: null,
         attributes: {
+          inputMethod: inputMethod,
           horizontalCells: horizontalCells,
           verticalCells: verticalCells,
-          totalCells: horizontalCells * verticalCells,
+          totalCells: totalCells,
           totalRowCount: totalRowCount,
           totalColumnCount: totalColumnCount
         },
         eventType: _analytics.EVENT_TYPE.TRACK
       };
-    }
+    })(editorAnalyticsAPI)(function (state, dispatch) {
+      if (dispatch) {
+        dispatch((0, _transforms.mergeCells)(state.tr));
+      }
 
-    return;
-  })(editorAnalyticsAPI)(_splitCell.splitCell);
+      return true;
+    });
+  };
+};
+
+exports.mergeCellsWithAnalytics = mergeCellsWithAnalytics;
+
+var splitCellWithAnalytics = function splitCellWithAnalytics(editorAnalyticsAPI) {
+  return function (inputMethod) {
+    return (0, _analytics2.withEditorAnalyticsAPI)(function (_ref3) {
+      var selection = _ref3.selection;
+
+      var _getSelectedCellInfo3 = (0, _utils2.getSelectedCellInfo)(selection),
+          totalRowCount = _getSelectedCellInfo3.totalRowCount,
+          totalColumnCount = _getSelectedCellInfo3.totalColumnCount;
+
+      var cell = (0, _utils.findCellClosestToPos)(selection.$anchor);
+
+      if (cell) {
+        var _cell$node$attrs = cell.node.attrs,
+            verticalCells = _cell$node$attrs.rowspan,
+            horizontalCells = _cell$node$attrs.colspan;
+        return {
+          action: _analytics.TABLE_ACTION.SPLIT,
+          actionSubject: _analytics.ACTION_SUBJECT.TABLE,
+          actionSubjectId: null,
+          attributes: {
+            inputMethod: inputMethod,
+            horizontalCells: horizontalCells,
+            verticalCells: verticalCells,
+            totalCells: horizontalCells * verticalCells,
+            totalRowCount: totalRowCount,
+            totalColumnCount: totalColumnCount
+          },
+          eventType: _analytics.EVENT_TYPE.TRACK
+        };
+      }
+
+      return;
+    })(editorAnalyticsAPI)(_splitCell.splitCell);
+  };
 };
 
 exports.splitCellWithAnalytics = splitCellWithAnalytics;
 
 var setColorWithAnalytics = function setColorWithAnalytics(editorAnalyticsAPI) {
-  return function (cellColor, targetCellPosition) {
+  return function (inputMethod, cellColor, targetCellPosition) {
     return (0, _analytics2.withEditorAnalyticsAPI)(function (_ref4) {
       var selection = _ref4.selection;
 
@@ -170,6 +176,7 @@ var setColorWithAnalytics = function setColorWithAnalytics(editorAnalyticsAPI) {
         actionSubject: _analytics.ACTION_SUBJECT.TABLE,
         actionSubjectId: null,
         attributes: {
+          inputMethod: inputMethod,
           cellColor: (_adfSchema.tableBackgroundColorPalette.get(cellColor.toLowerCase()) || cellColor).toLowerCase(),
           horizontalCells: horizontalCells,
           verticalCells: verticalCells,