@atlaskit/editor-core 187.7.2 → 187.8.3

package/dist/cjs/plugins/list/commands/index.js

@@ -18,22 +18,19 @@ Object.defineProperty(exports, "outdentList", {
     return _outdentList.outdentList;
   }
 });
-exports.rootListDepth = void 0;
-exports.toggleBulletList = toggleBulletList;
-exports.toggleList = toggleList;
-exports.toggleOrderedList = toggleOrderedList;
+exports.toggleOrderedList = exports.toggleList = exports.toggleBulletList = exports.rootListDepth = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorModel = require("prosemirror-model");
-var _prosemirrorState = require("prosemirror-state");
-var baseCommand = _interopRequireWildcard(require("prosemirror-commands"));
-var _prosemirrorUtils = require("prosemirror-utils");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var baseCommand = _interopRequireWildcard(require("@atlaskit/editor-prosemirror/commands"));
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _document = require("../../../utils/document");
-var _commands = require("../../../utils/commands");
-var _utils = require("@atlaskit/editor-common/utils");
-var _utils2 = require("../../../utils");
+var _commands2 = require("../../../utils/commands");
+var _utils2 = require("@atlaskit/editor-common/utils");
+var _utils3 = require("../../../utils");
 var _transforms = require("../transforms");
 var _gapCursorSelection = require("../../selection/gap-cursor-selection");
-var _analytics = require("../../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _selection = require("../utils/selection");
 var _analytics2 = require("../utils/analytics");
 var _listBackspace = require("./listBackspace");
@@ -47,44 +44,50 @@ 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 enterKeyCommand = function enterKeyCommand(featureFlags) {
-  return function (state, dispatch) {
-    var selection = state.selection;
-    if (selection.empty) {
-      var $from = selection.$from;
-      var _state$schema$nodes = state.schema.nodes,
-        listItem = _state$schema$nodes.listItem,
-        codeBlock = _state$schema$nodes.codeBlock;
-      var wrapper = $from.node($from.depth - 1);
-      if (wrapper && wrapper.type === listItem) {
-        /** Check if the wrapper has any visible content */
-        var wrapperHasContent = (0, _document.hasVisibleContent)(wrapper);
-        if (!wrapperHasContent) {
-          return (0, _outdentList.outdentList)(_analytics.INPUT_METHOD.KEYBOARD, featureFlags)(state, dispatch);
-        } else if (!(0, _prosemirrorUtils.hasParentNodeOfType)(codeBlock)(selection)) {
-          return splitListItem(listItem)(state, dispatch);
+var enterKeyCommand = function enterKeyCommand(editorAnalyticsAPI) {
+  return function (featureFlags) {
+    return function (state, dispatch) {
+      var selection = state.selection;
+      if (selection.empty) {
+        var $from = selection.$from;
+        var _state$schema$nodes = state.schema.nodes,
+          listItem = _state$schema$nodes.listItem,
+          codeBlock = _state$schema$nodes.codeBlock;
+        var wrapper = $from.node($from.depth - 1);
+        if (wrapper && wrapper.type === listItem) {
+          /** Check if the wrapper has any visible content */
+          var wrapperHasContent = (0, _document.hasVisibleContent)(wrapper);
+          if (!wrapperHasContent) {
+            return (0, _outdentList.outdentList)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.KEYBOARD, featureFlags)(state, dispatch);
+          } else if (!(0, _utils.hasParentNodeOfType)(codeBlock)(selection)) {
+            return splitListItem(listItem)(state, dispatch);
+          }
         }
       }
-    }
-    return false;
+      return false;
+    };
   };
 };
 exports.enterKeyCommand = enterKeyCommand;
-var backspaceKeyCommand = function backspaceKeyCommand(featureFlags) {
-  return function (state, dispatch) {
-    return baseCommand.chainCommands(_listBackspace.listBackspace,
-    // if we're at the start of a list item, we need to either backspace
-    // directly to an empty list item above, or outdent this node
-    (0, _utils.filterCommands)([_commands.isEmptySelectionAtStart,
-    // list items might have multiple paragraphs; only do this at the first one
-    _commands.isFirstChildOfParent, _selection.isInsideListItem], baseCommand.chainCommands(deletePreviousEmptyListItem, (0, _outdentList.outdentList)(_analytics.INPUT_METHOD.KEYBOARD, featureFlags))),
-    // if we're just inside a paragraph node (or gapcursor is shown) and backspace, then try to join
-    // the text to the previous list item, if one exists
-    (0, _utils.filterCommands)([_commands.isEmptySelectionAtStart, _selection.canJoinToPreviousListItem], joinToPreviousListItem))(state, dispatch);
+var backspaceKeyCommand = function backspaceKeyCommand(editorAnalyticsAPI) {
+  return function (featureFlags) {
+    return function (state, dispatch) {
+      return baseCommand.chainCommands((0, _listBackspace.listBackspace)(editorAnalyticsAPI),
+      // if we're at the start of a list item, we need to either backspace
+      // directly to an empty list item above, or outdent this node
+      (0, _utils2.filterCommands)([_commands2.isEmptySelectionAtStart,
+      // list items might have multiple paragraphs; only do this at the first one
+      _commands2.isFirstChildOfParent, _selection.isInsideListItem], baseCommand.chainCommands(deletePreviousEmptyListItem, (0, _outdentList.outdentList)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.KEYBOARD, featureFlags))),
+      // if we're just inside a paragraph node (or gapcursor is shown) and backspace, then try to join
+      // the text to the previous list item, if one exists
+      (0, _utils2.filterCommands)([_commands2.isEmptySelectionAtStart, _selection.canJoinToPreviousListItem], joinToPreviousListItem))(state, dispatch);
+    };
   };
 };
 exports.backspaceKeyCommand = backspaceKeyCommand;
-var deleteKeyCommand = _joinListItemForward.joinListItemForward;
+var deleteKeyCommand = function deleteKeyCommand(editorAnalyticsAPI) {
+  return (0, _joinListItemForward.joinListItemForward)(editorAnalyticsAPI);
+};
 
 // Get the depth of the nearest ancestor list
 exports.deleteKeyCommand = deleteKeyCommand;
@@ -110,99 +113,108 @@ function untoggleSelectedList(tr) {
     selection = _tr.selection;
   var depth = rootListDepth(selection.$to, tr.doc.type.schema.nodes);
   tr = (0, _transforms.liftFollowingList)(selection.$to.pos, selection.$to.end(depth), depth || 0, tr);
-  if (selection instanceof _prosemirrorState.NodeSelection || selection instanceof _gapCursorSelection.GapCursorSelection) {
+  if (selection instanceof _state.NodeSelection || selection instanceof _gapCursorSelection.GapCursorSelection) {
     return (0, _transforms.liftNodeSelectionList)(selection, tr);
   }
   return (0, _transforms.liftTextSelectionList)(selection, tr);
 }
-function toggleList(inputMethod, listType) {
-  return function (state, dispatch) {
-    var tr = state.tr;
-    var listInsideSelection = (0, _selection.selectionContainsList)(tr);
-    var listNodeType = state.schema.nodes[listType];
-    var actionSubjectId = listType === 'bulletList' ? _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
-    if (listInsideSelection) {
-      var selection = state.selection;
+var toggleList = function toggleList(editorAnalyticsAPI) {
+  return function (inputMethod, listType) {
+    return function (state, dispatch) {
+      var tr = state.tr;
+      var listInsideSelection = (0, _selection.selectionContainsList)(tr);
+      var listNodeType = state.schema.nodes[listType];
+      var actionSubjectId = listType === 'bulletList' ? _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
+      if (listInsideSelection) {
+        var selection = state.selection;
 
-      // for gap cursor or node selection - list is expected 1 level up (listItem -> list)
-      // for text selection - list is expected 2 levels up (paragraph -> listItem -> list)
-      var positionDiff = selection instanceof _gapCursorSelection.GapCursorSelection || selection instanceof _prosemirrorState.NodeSelection ? 1 : 2;
-      var fromNode = selection.$from.node(selection.$from.depth - positionDiff);
-      var toNode = selection.$to.node(selection.$to.depth - positionDiff);
-      var transformedFrom = listInsideSelection.type.name === 'bulletList' ? _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
-      if ((fromNode === null || fromNode === void 0 ? void 0 : fromNode.type.name) === listType && (toNode === null || toNode === void 0 ? void 0 : toNode.type.name) === listType) {
-        var _tr2 = state.tr;
-        untoggleSelectedList(_tr2);
-        (0, _analytics.addAnalytics)(state, _tr2, {
+        // for gap cursor or node selection - list is expected 1 level up (listItem -> list)
+        // for text selection - list is expected 2 levels up (paragraph -> listItem -> list)
+        var positionDiff = selection instanceof _gapCursorSelection.GapCursorSelection || selection instanceof _state.NodeSelection ? 1 : 2;
+        var fromNode = selection.$from.node(selection.$from.depth - positionDiff);
+        var toNode = selection.$to.node(selection.$to.depth - positionDiff);
+        var transformedFrom = listInsideSelection.type.name === 'bulletList' ? _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
+        if ((fromNode === null || fromNode === void 0 ? void 0 : fromNode.type.name) === listType && (toNode === null || toNode === void 0 ? void 0 : toNode.type.name) === listType) {
+          var _tr2 = state.tr;
+          untoggleSelectedList(_tr2);
+          editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+            action: _analytics.ACTION.CONVERTED,
+            actionSubject: _analytics.ACTION_SUBJECT.LIST,
+            actionSubjectId: _analytics.ACTION_SUBJECT_ID.TEXT,
+            eventType: _analytics.EVENT_TYPE.TRACK,
+            attributes: _objectSpread(_objectSpread({}, (0, _analytics2.getCommonListAnalyticsAttributes)(state)), {}, {
+              transformedFrom: transformedFrom,
+              inputMethod: inputMethod
+            })
+          })(_tr2);
+          if (dispatch) {
+            dispatch(_tr2);
+          }
+          return true;
+        }
+        (0, _conversions.convertListType)({
+          tr: tr,
+          nextListNodeType: listNodeType
+        });
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
           action: _analytics.ACTION.CONVERTED,
           actionSubject: _analytics.ACTION_SUBJECT.LIST,
-          actionSubjectId: _analytics.ACTION_SUBJECT_ID.TEXT,
+          actionSubjectId: actionSubjectId,
           eventType: _analytics.EVENT_TYPE.TRACK,
           attributes: _objectSpread(_objectSpread({}, (0, _analytics2.getCommonListAnalyticsAttributes)(state)), {}, {
             transformedFrom: transformedFrom,
             inputMethod: inputMethod
           })
-        });
-        if (dispatch) {
-          dispatch(_tr2);
-        }
-        return true;
+        })(tr);
+      } else {
+        // Need to have this before wrapInList so the wrapping is done with valid content
+        // For example, if trying to convert centre or right aligned paragraphs to lists
+        (0, _utils3.sanitiseMarksInSelection)(tr, listNodeType);
+        (0, _wrapAndJoinLists.wrapInListAndJoin)(listNodeType, tr);
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+          action: _analytics.ACTION.INSERTED,
+          actionSubject: _analytics.ACTION_SUBJECT.LIST,
+          actionSubjectId: actionSubjectId,
+          eventType: _analytics.EVENT_TYPE.TRACK,
+          attributes: {
+            inputMethod: inputMethod
+          }
+        })(tr);
       }
-      (0, _conversions.convertListType)({
-        tr: tr,
-        nextListNodeType: listNodeType
-      });
-      (0, _analytics.addAnalytics)(state, tr, {
-        action: _analytics.ACTION.CONVERTED,
-        actionSubject: _analytics.ACTION_SUBJECT.LIST,
-        actionSubjectId: actionSubjectId,
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        attributes: _objectSpread(_objectSpread({}, (0, _analytics2.getCommonListAnalyticsAttributes)(state)), {}, {
-          transformedFrom: transformedFrom,
-          inputMethod: inputMethod
-        })
-      });
-    } else {
-      // Need to have this before wrapInList so the wrapping is done with valid content
-      // For example, if trying to convert centre or right aligned paragraphs to lists
-      (0, _utils2.sanitiseMarksInSelection)(tr, listNodeType);
-      (0, _wrapAndJoinLists.wrapInListAndJoin)(listNodeType, tr);
-      (0, _analytics.addAnalytics)(state, tr, {
-        action: _analytics.ACTION.INSERTED,
-        actionSubject: _analytics.ACTION_SUBJECT.LIST,
-        actionSubjectId: actionSubjectId,
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        attributes: {
-          inputMethod: inputMethod
-        }
-      });
-    }
 
-    // If document wasn't changed, return false from the command to indicate that the
-    // editing action failed
-    if (!tr.docChanged) {
-      return false;
-    }
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
+      // If document wasn't changed, return false from the command to indicate that the
+      // editing action failed
+      if (!tr.docChanged) {
+        return false;
+      }
+      if (dispatch) {
+        dispatch(tr);
+      }
+      return true;
+    };
   };
-}
-function toggleBulletList(view) {
-  var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
-  return toggleList(inputMethod, 'bulletList')(view.state, view.dispatch);
-}
-function toggleOrderedList(view) {
-  var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
-  return toggleList(inputMethod, 'orderedList')(view.state, view.dispatch);
-}
+};
+exports.toggleList = toggleList;
+var toggleBulletList = function toggleBulletList(editorAnalyticsAPI) {
+  return function (view) {
+    var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
+    return toggleList(editorAnalyticsAPI)(inputMethod, 'bulletList')(view.state, view.dispatch);
+  };
+};
+exports.toggleBulletList = toggleBulletList;
+var toggleOrderedList = function toggleOrderedList(editorAnalyticsAPI) {
+  return function (view) {
+    var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
+    return toggleList(editorAnalyticsAPI)(inputMethod, 'orderedList')(view.state, view.dispatch);
+  };
+};
 
 /**
  * Implementation taken and modified for our needs from PM
  * @param itemType Node
  * Splits the list items, specific implementation take from PM
  */
+exports.toggleOrderedList = toggleOrderedList;
 function splitListItem(itemType) {
   return function (state, dispatch) {
     var ref = state.selection;
@@ -225,16 +237,16 @@ function splitListItem(itemType) {
         return false;
       }
       if (dispatch) {
-        var wrap = _prosemirrorModel.Fragment.empty;
+        var wrap = _model.Fragment.empty;
         var keepItem = $from.index(-1) > 0;
         // Build a fragment containing empty versions of the structure
         // from the outer list item to the parent node of the cursor
         for (var d = $from.depth - (keepItem ? 1 : 2); d >= $from.depth - 3; d--) {
-          wrap = _prosemirrorModel.Fragment.from($from.node(d).copy(wrap));
+          wrap = _model.Fragment.from($from.node(d).copy(wrap));
         }
         // Add a second list item with an empty default start node
-        wrap = wrap.append(_prosemirrorModel.Fragment.from(itemType.createAndFill()));
-        var tr$1 = state.tr.replace($from.before(keepItem ? undefined : -1), $from.after(-3), new _prosemirrorModel.Slice(wrap, keepItem ? 3 : 2, 2));
+        wrap = wrap.append(_model.Fragment.from(itemType.createAndFill()));
+        var tr$1 = state.tr.replace($from.before(keepItem ? undefined : -1), $from.after(-3), new _model.Slice(wrap, keepItem ? 3 : 2, 2));
         tr$1.setSelection(state.selection.constructor.near(tr$1.doc.resolve($from.pos + (keepItem ? 3 : 2))));
         dispatch(tr$1.scrollIntoView());
       }
@@ -254,7 +266,7 @@ function splitListItem(itemType) {
 var deletePreviousEmptyListItem = function deletePreviousEmptyListItem(state, dispatch) {
   var $from = state.selection.$from;
   var listItem = state.schema.nodes.listItem;
-  var $cut = (0, _commands.findCutBefore)($from);
+  var $cut = (0, _commands2.findCutBefore)($from);
   if (!$cut || !$cut.nodeBefore || !($cut.nodeBefore.type === listItem)) {
     return false;
   }
@@ -278,7 +290,7 @@ var joinToPreviousListItem = function joinToPreviousListItem(state, dispatch) {
     orderedList = _state$schema$nodes2.orderedList;
   var isGapCursorShown = state.selection instanceof _gapCursorSelection.GapCursorSelection;
   var $cutPos = isGapCursorShown ? state.doc.resolve($from.pos + 1) : $from;
-  var $cut = (0, _commands.findCutBefore)($cutPos);
+  var $cut = (0, _commands2.findCutBefore)($cutPos);
   if (!$cut) {
     return false;
   }
@@ -294,12 +306,12 @@ var joinToPreviousListItem = function joinToPreviousListItem(state, dispatch) {
       }
       var tr = state.tr;
       if (isGapCursorShown) {
-        var nodeBeforePos = (0, _prosemirrorUtils.findPositionOfNodeBefore)(tr.selection);
+        var nodeBeforePos = (0, _utils.findPositionOfNodeBefore)(tr.selection);
         if (typeof nodeBeforePos !== 'number') {
           return false;
         }
         // append the codeblock to the list node
-        var list = $cut.nodeBefore.copy($cut.nodeBefore.content.append(_prosemirrorModel.Fragment.from(listItem.createChecked({}, $cut.nodeAfter))));
+        var list = $cut.nodeBefore.copy($cut.nodeBefore.content.append(_model.Fragment.from(listItem.createChecked({}, $cut.nodeAfter))));
         tr.replaceWith(nodeBeforePos, $from.pos + $cut.nodeAfter.nodeSize, list);
       } else {
         var step = (0, _replaceContent.moveTargetIntoList)({
@@ -327,7 +339,7 @@ var joinToPreviousListItem = function joinToPreviousListItem(state, dispatch) {
       if (dispatch) {
         var _tr$doc$resolve$nodeB;
         if (!((_tr$doc$resolve$nodeB = tr.doc.resolve($lastNode.pos).nodeBefore) !== null && _tr$doc$resolve$nodeB !== void 0 && _tr$doc$resolve$nodeB.isBlock) || tr.doc.resolve($lastNode.pos).nodeBefore === null) {
-          tr = tr.setSelection(_prosemirrorState.TextSelection.near(tr.doc.resolve(tr.mapping.map($cut.pos)), -1));
+          tr = tr.setSelection(_state.TextSelection.near(tr.doc.resolve(tr.mapping.map($cut.pos)), -1));
         }
         dispatch(tr.scrollIntoView());
       }

package/dist/cjs/plugins/list/commands/join-list-item-forward.js

@@ -7,53 +7,55 @@ Object.defineProperty(exports, "__esModule", {
 exports.joinListItemForward = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _commands = require("../../../utils/commands");
-var _analytics = require("../../analytics");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _joinListItemsForward = require("../actions/join-list-items-forward");
-var joinListItemForward = function joinListItemForward(state, dispatch) {
-  var tr = state.tr,
-    $head = state.selection.$head;
-  var walkNode = (0, _commands.walkNextNode)($head);
-  if (!(0, _commands.isEmptySelectionAtEnd)(state)) {
-    return false;
-  }
-  var scenarios = (0, _joinListItemsForward.calcJoinListScenario)(walkNode, $head);
-  if (!scenarios) {
-    return false;
-  }
-  var _scenarios = (0, _slicedToArray2.default)(scenarios, 2),
-    scenario = _scenarios[0],
-    action = _scenarios[1];
-  var result = action({
-    tr: tr,
-    $next: walkNode.$pos,
-    $head: $head
-  });
-  if (!result) {
-    return false;
-  }
-  var _state$schema$nodes = state.schema.nodes,
-    bulletList = _state$schema$nodes.bulletList,
-    orderedList = _state$schema$nodes.orderedList;
-  var listParent = (0, _prosemirrorUtils.findParentNodeOfType)([bulletList, orderedList])(tr.selection);
-  var actionSubjectId = _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_BULLET;
-  if (listParent && listParent.node.type === orderedList) {
-    actionSubjectId = _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
-  }
-  (0, _analytics.addAnalytics)(state, tr, {
-    action: _analytics.ACTION.LIST_ITEM_JOINED,
-    actionSubject: _analytics.ACTION_SUBJECT.LIST,
-    actionSubjectId: actionSubjectId,
-    eventType: _analytics.EVENT_TYPE.TRACK,
-    attributes: {
-      inputMethod: _analytics.INPUT_METHOD.KEYBOARD,
-      direction: _analytics.DELETE_DIRECTION.FORWARD,
-      scenario: scenario
+var joinListItemForward = function joinListItemForward(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    var tr = state.tr,
+      $head = state.selection.$head;
+    var walkNode = (0, _commands.walkNextNode)($head);
+    if (!(0, _commands.isEmptySelectionAtEnd)(state)) {
+      return false;
     }
-  });
-  if (dispatch) {
-    dispatch(tr);
-  }
-  return true;
+    var scenarios = (0, _joinListItemsForward.calcJoinListScenario)(walkNode, $head);
+    if (!scenarios) {
+      return false;
+    }
+    var _scenarios = (0, _slicedToArray2.default)(scenarios, 2),
+      scenario = _scenarios[0],
+      action = _scenarios[1];
+    var result = action({
+      tr: tr,
+      $next: walkNode.$pos,
+      $head: $head
+    });
+    if (!result) {
+      return false;
+    }
+    var _state$schema$nodes = state.schema.nodes,
+      bulletList = _state$schema$nodes.bulletList,
+      orderedList = _state$schema$nodes.orderedList;
+    var listParent = (0, _utils.findParentNodeOfType)([bulletList, orderedList])(tr.selection);
+    var actionSubjectId = _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_BULLET;
+    if (listParent && listParent.node.type === orderedList) {
+      actionSubjectId = _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
+    }
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+      action: _analytics.ACTION.LIST_ITEM_JOINED,
+      actionSubject: _analytics.ACTION_SUBJECT.LIST,
+      actionSubjectId: actionSubjectId,
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      attributes: {
+        inputMethod: _analytics.INPUT_METHOD.KEYBOARD,
+        direction: _analytics.DELETE_DIRECTION.FORWARD,
+        scenario: scenario
+      }
+    })(tr);
+    if (dispatch) {
+      dispatch(tr);
+    }
+    return true;
+  };
 };
 exports.joinListItemForward = joinListItemForward;

package/dist/cjs/plugins/list/commands/listBackspace.js

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.listBackspace = exports.calcJoinListScenario = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _commands = require("../../../utils/commands");
-var _analytics = require("../../analytics");
-var _prosemirrorUtils = require("prosemirror-utils");
-var _utils = require("@atlaskit/editor-common/utils");
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _utils2 = require("@atlaskit/editor-common/utils");
 var _selection = require("../utils/selection");
 var _BACKSPACE_COMMANDS;
 //Cases below refer to the cases found in this document: https://product-fabric.atlassian.net/wiki/spaces/E/pages/1146954996/List+Backspace+and+Delete+Behaviour
@@ -109,7 +109,7 @@ var listBackspaceCase3 = function listBackspaceCase3(tr, dispatch, $prev, $head)
   var afterListE = $head.after(-2);
   var afterListItemF = $head.after(-1);
   var startListE = $head.start(-2);
-  var containsChildrenJ = (0, _utils.isListNode)(listItemF.lastChild);
+  var containsChildrenJ = (0, _utils2.isListNode)(listItemF.lastChild);
   var shouldRemoveListE = listE.childCount === 1 && !containsChildrenJ; //Assures no Children J and K
   var textInsertPos = $prev.pos;
   var childrenHInsertPos = afterParagraphD;
@@ -193,7 +193,7 @@ var listBackspaceCase4 = function listBackspaceCase4(tr, dispatch, $prev, $head,
   var beforeListItemK = $head.before(-1);
   var afterParagraphJ = $last.after();
   var afterListItemK = $head.after(-1);
-  var containsChildrenO = (0, _utils.isListNode)(listItemK.lastChild);
+  var containsChildrenO = (0, _utils2.isListNode)(listItemK.lastChild);
   var textInsertPos = $last.pos;
   var childrenMInsertPos = afterParagraphJ;
   var childrenOInsertPos = $prev.pos - 1; //Last item of listItem B must be a list therefore we can simply decrement $prev to get there
@@ -227,8 +227,8 @@ var calcJoinListScenario = function calcJoinListScenario(walkNode, $head, tr) {
   if (prevInParagraph) {
     return [_analytics.LIST_TEXT_SCENARIOS.JOIN_DESCENDANT_TO_PARENT, null];
   }
-  var prevParentLastChildIsList = $prev.parent.lastChild && (0, _utils.isListNode)($prev.parent.lastChild);
-  var prevParentLastChildIsParagraph = (0, _utils.isParagraphNode)($prev.parent.lastChild);
+  var prevParentLastChildIsList = $prev.parent.lastChild && (0, _utils2.isListNode)($prev.parent.lastChild);
+  var prevParentLastChildIsParagraph = (0, _utils2.isParagraphNode)($prev.parent.lastChild);
 
   // Will search for the possible last node for case 4 (where the list could be indented multiple times)
   // $last is required to determine whether we are in case 2 or 4
@@ -248,36 +248,38 @@ var calcJoinListScenario = function calcJoinListScenario(walkNode, $head, tr) {
   return false;
 };
 exports.calcJoinListScenario = calcJoinListScenario;
-var listBackspace = function listBackspace(state, dispatch) {
-  var tr = state.tr,
-    $head = state.selection.$head;
-  var walkNode = (0, _commands.walkPrevNode)($head);
-  if (!(0, _commands.isEmptySelectionAtStart)(state)) {
-    return false;
-  }
-  var scenario = calcJoinListScenario(walkNode, $head, tr);
-  if (!scenario) {
-    return false;
-  }
-  var _state$schema$nodes = state.schema.nodes,
-    bulletList = _state$schema$nodes.bulletList,
-    orderedList = _state$schema$nodes.orderedList;
-  var listParent = (0, _prosemirrorUtils.findParentNodeOfType)([bulletList, orderedList])(tr.selection);
-  var actionSubjectId = _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_BULLET;
-  if (listParent && listParent.node.type === orderedList) {
-    actionSubjectId = _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
-  }
-  (0, _analytics.addAnalytics)(state, tr, {
-    action: _analytics.ACTION.LIST_ITEM_JOINED,
-    actionSubject: _analytics.ACTION_SUBJECT.LIST,
-    actionSubjectId: actionSubjectId,
-    eventType: _analytics.EVENT_TYPE.TRACK,
-    attributes: {
-      inputMethod: _analytics.INPUT_METHOD.KEYBOARD,
-      direction: _analytics.DELETE_DIRECTION.BACKWARD,
-      scenario: scenario[0]
+var listBackspace = function listBackspace(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    var tr = state.tr,
+      $head = state.selection.$head;
+    var walkNode = (0, _commands.walkPrevNode)($head);
+    if (!(0, _commands.isEmptySelectionAtStart)(state)) {
+      return false;
+    }
+    var scenario = calcJoinListScenario(walkNode, $head, tr);
+    if (!scenario) {
+      return false;
+    }
+    var _state$schema$nodes = state.schema.nodes,
+      bulletList = _state$schema$nodes.bulletList,
+      orderedList = _state$schema$nodes.orderedList;
+    var listParent = (0, _utils.findParentNodeOfType)([bulletList, orderedList])(tr.selection);
+    var actionSubjectId = _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_BULLET;
+    if (listParent && listParent.node.type === orderedList) {
+      actionSubjectId = _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
     }
-  });
-  return BACKSPACE_COMMANDS[scenario[0]](tr, dispatch, walkNode.$pos, $head, scenario[1]);
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+      action: _analytics.ACTION.LIST_ITEM_JOINED,
+      actionSubject: _analytics.ACTION_SUBJECT.LIST,
+      actionSubjectId: actionSubjectId,
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      attributes: {
+        inputMethod: _analytics.INPUT_METHOD.KEYBOARD,
+        direction: _analytics.DELETE_DIRECTION.BACKWARD,
+        scenario: scenario[0]
+      }
+    })(tr);
+    return BACKSPACE_COMMANDS[scenario[0]](tr, dispatch, walkNode.$pos, $head, scenario[1]);
+  };
 };
 exports.listBackspace = listBackspace;