@atlaskit/editor-core 187.7.2 → 187.8.3

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

@@ -1,17 +1,17 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-import { Fragment, Slice } from 'prosemirror-model';
-import { NodeSelection, TextSelection } from 'prosemirror-state';
-import * as baseCommand from 'prosemirror-commands';
-import { hasParentNodeOfType, findPositionOfNodeBefore } from 'prosemirror-utils';
+import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import * as baseCommand from '@atlaskit/editor-prosemirror/commands';
+import { findPositionOfNodeBefore, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { hasVisibleContent } from '../../../utils/document';
 import { findCutBefore, isEmptySelectionAtStart, isFirstChildOfParent } from '../../../utils/commands';
 import { filterCommands as filter } from '@atlaskit/editor-common/utils';
 import { sanitiseMarksInSelection } from '../../../utils';
 import { liftFollowingList, liftTextSelectionList, liftNodeSelectionList } from '../transforms';
 import { GapCursorSelection } from '../../selection/gap-cursor-selection';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, addAnalytics } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { isInsideListItem, canJoinToPreviousListItem, selectionContainsList } from '../utils/selection';
 import { getCommonListAnalyticsAttributes } from '../utils/analytics';
 import { listBackspace } from './listBackspace';
@@ -22,42 +22,48 @@ import { outdentList } from './outdent-list';
 import { indentList } from './indent-list';
 import { moveTargetIntoList } from '../utils/replace-content';
 export { outdentList, indentList };
-export 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 = hasVisibleContent(wrapper);
-        if (!wrapperHasContent) {
-          return outdentList(INPUT_METHOD.KEYBOARD, featureFlags)(state, dispatch);
-        } else if (!hasParentNodeOfType(codeBlock)(selection)) {
-          return splitListItem(listItem)(state, dispatch);
+export 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 = hasVisibleContent(wrapper);
+          if (!wrapperHasContent) {
+            return outdentList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, featureFlags)(state, dispatch);
+          } else if (!hasParentNodeOfType(codeBlock)(selection)) {
+            return splitListItem(listItem)(state, dispatch);
+          }
         }
       }
-    }
-    return false;
+      return false;
+    };
   };
 };
-export var backspaceKeyCommand = function backspaceKeyCommand(featureFlags) {
-  return function (state, dispatch) {
-    return baseCommand.chainCommands(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
-    filter([isEmptySelectionAtStart,
-    // list items might have multiple paragraphs; only do this at the first one
-    isFirstChildOfParent, isInsideListItem], baseCommand.chainCommands(deletePreviousEmptyListItem, outdentList(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
-    filter([isEmptySelectionAtStart, canJoinToPreviousListItem], joinToPreviousListItem))(state, dispatch);
+export var backspaceKeyCommand = function backspaceKeyCommand(editorAnalyticsAPI) {
+  return function (featureFlags) {
+    return function (state, dispatch) {
+      return baseCommand.chainCommands(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
+      filter([isEmptySelectionAtStart,
+      // list items might have multiple paragraphs; only do this at the first one
+      isFirstChildOfParent, isInsideListItem], baseCommand.chainCommands(deletePreviousEmptyListItem, outdentList(editorAnalyticsAPI)(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
+      filter([isEmptySelectionAtStart, canJoinToPreviousListItem], joinToPreviousListItem))(state, dispatch);
+    };
   };
 };
-export var deleteKeyCommand = joinListItemForward;
+export var deleteKeyCommand = function deleteKeyCommand(editorAnalyticsAPI) {
+  return joinListItemForward(editorAnalyticsAPI);
+};
 
 // Get the depth of the nearest ancestor list
 export var rootListDepth = function rootListDepth(pos, nodes) {
@@ -86,88 +92,94 @@ function untoggleSelectedList(tr) {
   }
   return liftTextSelectionList(selection, tr);
 }
-export function toggleList(inputMethod, listType) {
-  return function (state, dispatch) {
-    var tr = state.tr;
-    var listInsideSelection = selectionContainsList(tr);
-    var listNodeType = state.schema.nodes[listType];
-    var actionSubjectId = listType === 'bulletList' ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
-    if (listInsideSelection) {
-      var selection = state.selection;
+export var toggleList = function toggleList(editorAnalyticsAPI) {
+  return function (inputMethod, listType) {
+    return function (state, dispatch) {
+      var tr = state.tr;
+      var listInsideSelection = selectionContainsList(tr);
+      var listNodeType = state.schema.nodes[listType];
+      var actionSubjectId = listType === 'bulletList' ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : 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 || selection instanceof 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' ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : 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);
-        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 || selection instanceof 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' ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : 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: ACTION.CONVERTED,
+            actionSubject: ACTION_SUBJECT.LIST,
+            actionSubjectId: ACTION_SUBJECT_ID.TEXT,
+            eventType: EVENT_TYPE.TRACK,
+            attributes: _objectSpread(_objectSpread({}, getCommonListAnalyticsAttributes(state)), {}, {
+              transformedFrom: transformedFrom,
+              inputMethod: inputMethod
+            })
+          })(_tr2);
+          if (dispatch) {
+            dispatch(_tr2);
+          }
+          return true;
+        }
+        convertListType({
+          tr: tr,
+          nextListNodeType: listNodeType
+        });
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
           action: ACTION.CONVERTED,
           actionSubject: ACTION_SUBJECT.LIST,
-          actionSubjectId: ACTION_SUBJECT_ID.TEXT,
+          actionSubjectId: actionSubjectId,
           eventType: EVENT_TYPE.TRACK,
           attributes: _objectSpread(_objectSpread({}, 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
+        sanitiseMarksInSelection(tr, listNodeType);
+        wrapInListAndJoin(listNodeType, tr);
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+          action: ACTION.INSERTED,
+          actionSubject: ACTION_SUBJECT.LIST,
+          actionSubjectId: actionSubjectId,
+          eventType: EVENT_TYPE.TRACK,
+          attributes: {
+            inputMethod: inputMethod
+          }
+        })(tr);
       }
-      convertListType({
-        tr: tr,
-        nextListNodeType: listNodeType
-      });
-      addAnalytics(state, tr, {
-        action: ACTION.CONVERTED,
-        actionSubject: ACTION_SUBJECT.LIST,
-        actionSubjectId: actionSubjectId,
-        eventType: EVENT_TYPE.TRACK,
-        attributes: _objectSpread(_objectSpread({}, 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
-      sanitiseMarksInSelection(tr, listNodeType);
-      wrapInListAndJoin(listNodeType, tr);
-      addAnalytics(state, tr, {
-        action: ACTION.INSERTED,
-        actionSubject: ACTION_SUBJECT.LIST,
-        actionSubjectId: actionSubjectId,
-        eventType: 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;
+    };
   };
-}
-export function toggleBulletList(view) {
-  var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.TOOLBAR;
-  return toggleList(inputMethod, 'bulletList')(view.state, view.dispatch);
-}
-export function toggleOrderedList(view) {
-  var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.TOOLBAR;
-  return toggleList(inputMethod, 'orderedList')(view.state, view.dispatch);
-}
+};
+export var toggleBulletList = function toggleBulletList(editorAnalyticsAPI) {
+  return function (view) {
+    var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.TOOLBAR;
+    return toggleList(editorAnalyticsAPI)(inputMethod, 'bulletList')(view.state, view.dispatch);
+  };
+};
+export var toggleOrderedList = function toggleOrderedList(editorAnalyticsAPI) {
+  return function (view) {
+    var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.TOOLBAR;
+    return toggleList(editorAnalyticsAPI)(inputMethod, 'orderedList')(view.state, view.dispatch);
+  };
+};
 
 /**
  * Implementation taken and modified for our needs from PM

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

@@ -1,51 +1,53 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { isEmptySelectionAtEnd, walkNextNode } from '../../../utils/commands';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, DELETE_DIRECTION, addAnalytics } from '../../analytics';
-import { findParentNodeOfType } from 'prosemirror-utils';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, DELETE_DIRECTION } from '@atlaskit/editor-common/analytics';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { calcJoinListScenario } from '../actions/join-list-items-forward';
-export var joinListItemForward = function joinListItemForward(state, dispatch) {
-  var tr = state.tr,
-    $head = state.selection.$head;
-  var walkNode = walkNextNode($head);
-  if (!isEmptySelectionAtEnd(state)) {
-    return false;
-  }
-  var scenarios = calcJoinListScenario(walkNode, $head);
-  if (!scenarios) {
-    return false;
-  }
-  var _scenarios = _slicedToArray(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 = findParentNodeOfType([bulletList, orderedList])(tr.selection);
-  var actionSubjectId = ACTION_SUBJECT_ID.FORMAT_LIST_BULLET;
-  if (listParent && listParent.node.type === orderedList) {
-    actionSubjectId = ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
-  }
-  addAnalytics(state, tr, {
-    action: ACTION.LIST_ITEM_JOINED,
-    actionSubject: ACTION_SUBJECT.LIST,
-    actionSubjectId: actionSubjectId,
-    eventType: EVENT_TYPE.TRACK,
-    attributes: {
-      inputMethod: INPUT_METHOD.KEYBOARD,
-      direction: DELETE_DIRECTION.FORWARD,
-      scenario: scenario
+export var joinListItemForward = function joinListItemForward(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    var tr = state.tr,
+      $head = state.selection.$head;
+    var walkNode = walkNextNode($head);
+    if (!isEmptySelectionAtEnd(state)) {
+      return false;
     }
-  });
-  if (dispatch) {
-    dispatch(tr);
-  }
-  return true;
+    var scenarios = calcJoinListScenario(walkNode, $head);
+    if (!scenarios) {
+      return false;
+    }
+    var _scenarios = _slicedToArray(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 = findParentNodeOfType([bulletList, orderedList])(tr.selection);
+    var actionSubjectId = ACTION_SUBJECT_ID.FORMAT_LIST_BULLET;
+    if (listParent && listParent.node.type === orderedList) {
+      actionSubjectId = ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
+    }
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+      action: ACTION.LIST_ITEM_JOINED,
+      actionSubject: ACTION_SUBJECT.LIST,
+      actionSubjectId: actionSubjectId,
+      eventType: EVENT_TYPE.TRACK,
+      attributes: {
+        inputMethod: INPUT_METHOD.KEYBOARD,
+        direction: DELETE_DIRECTION.FORWARD,
+        scenario: scenario
+      }
+    })(tr);
+    if (dispatch) {
+      dispatch(tr);
+    }
+    return true;
+  };
 };

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

@@ -1,8 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _BACKSPACE_COMMANDS;
 import { insertContentDeleteRange, isEmptySelectionAtStart, walkPrevNode } from '../../../utils/commands';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, DELETE_DIRECTION, LIST_TEXT_SCENARIOS, addAnalytics } from '../../analytics';
-import { findParentNodeOfType } from 'prosemirror-utils';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, DELETE_DIRECTION, LIST_TEXT_SCENARIOS } from '@atlaskit/editor-common/analytics';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { isListNode, isParagraphNode } from '@atlaskit/editor-common/utils';
 import { isPosInsideList, isPosInsideParagraph } from '../utils/selection';
 //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
@@ -240,35 +240,37 @@ export var calcJoinListScenario = function calcJoinListScenario(walkNode, $head,
   }
   return false;
 };
-export var listBackspace = function listBackspace(state, dispatch) {
-  var tr = state.tr,
-    $head = state.selection.$head;
-  var walkNode = walkPrevNode($head);
-  if (!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 = findParentNodeOfType([bulletList, orderedList])(tr.selection);
-  var actionSubjectId = ACTION_SUBJECT_ID.FORMAT_LIST_BULLET;
-  if (listParent && listParent.node.type === orderedList) {
-    actionSubjectId = ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
-  }
-  addAnalytics(state, tr, {
-    action: ACTION.LIST_ITEM_JOINED,
-    actionSubject: ACTION_SUBJECT.LIST,
-    actionSubjectId: actionSubjectId,
-    eventType: EVENT_TYPE.TRACK,
-    attributes: {
-      inputMethod: INPUT_METHOD.KEYBOARD,
-      direction: DELETE_DIRECTION.BACKWARD,
-      scenario: scenario[0]
+export var listBackspace = function listBackspace(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    var tr = state.tr,
+      $head = state.selection.$head;
+    var walkNode = walkPrevNode($head);
+    if (!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 = findParentNodeOfType([bulletList, orderedList])(tr.selection);
+    var actionSubjectId = ACTION_SUBJECT_ID.FORMAT_LIST_BULLET;
+    if (listParent && listParent.node.type === orderedList) {
+      actionSubjectId = 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: ACTION.LIST_ITEM_JOINED,
+      actionSubject: ACTION_SUBJECT.LIST,
+      actionSubjectId: actionSubjectId,
+      eventType: EVENT_TYPE.TRACK,
+      attributes: {
+        inputMethod: INPUT_METHOD.KEYBOARD,
+        direction: DELETE_DIRECTION.BACKWARD,
+        scenario: scenario[0]
+      }
+    })(tr);
+    return BACKSPACE_COMMANDS[scenario[0]](tr, dispatch, walkNode.$pos, $head, scenario[1]);
+  };
 };

package/dist/esm/plugins/list/commands/outdent-list.js

@@ -1,60 +1,61 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-import { OUTDENT_SCENARIOS } from '@atlaskit/editor-common/analytics';
-import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, OUTDENT_SCENARIOS } from '@atlaskit/editor-common/analytics';
 import { isInsideListItem, isInsideTableCell } from '../utils/selection';
 import { isBulletList } from '../utils/node';
 import { findFirstParentListNode } from '../utils/find';
 import { getCommonListAnalyticsAttributes, getRestartListsAttributes } from '../utils/analytics';
 import { outdentListItemsSelected as outdentListAction } from '../actions/outdent-list-items-selected';
-import { closeHistory } from 'prosemirror-history';
-export function outdentList() {
-  var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INPUT_METHOD.KEYBOARD;
-  var featureFlags = arguments.length > 1 ? arguments[1] : undefined;
-  return function (state, dispatch) {
-    if (!isInsideListItem(state)) {
-      return false;
-    }
-    var $from = state.selection.$from;
-    var parentListNode = findFirstParentListNode($from);
-    if (!parentListNode) {
-      // Even though this is a non-operation, we don't want to send this event to the browser. Because if we return false, the browser will move the focus to another place
-      return true;
-    }
+import { closeHistory } from '@atlaskit/editor-prosemirror/history';
+export var outdentList = function outdentList(editorAnalyticsAPI) {
+  return function () {
+    var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INPUT_METHOD.KEYBOARD;
+    var featureFlags = arguments.length > 1 ? arguments[1] : undefined;
+    return function (state, dispatch) {
+      if (!isInsideListItem(state)) {
+        return false;
+      }
+      var $from = state.selection.$from;
+      var parentListNode = findFirstParentListNode($from);
+      if (!parentListNode) {
+        // Even though this is a non-operation, we don't want to send this event to the browser. Because if we return false, the browser will move the focus to another place
+        return true;
+      }
 
-    // Save the history, so it could undo/revert to the same state before the outdent, see https://product-fabric.atlassian.net/browse/ED-14753
-    closeHistory(state.tr);
-    var actionSubjectId = isBulletList(parentListNode.node) ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
-    var customTr = state.tr;
-    outdentListAction(customTr, state, featureFlags);
-    if (!customTr || !customTr.docChanged) {
-      // Even though this is a non-operation, we don't want to send this event to the browser. Because if we return false, the browser will move the focus to another place
-      // If inside table cell and can't outdent list, then let it handle by table keymap
-      return !isInsideTableCell(state);
-    }
-    var restartListsAttributes = {};
-    if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
-      var _getRestartListsAttri = getRestartListsAttributes(customTr),
-        outdentScenario = _getRestartListsAttri.outdentScenario,
-        splitListStartNumber = _getRestartListsAttri.splitListStartNumber;
-      if (outdentScenario === OUTDENT_SCENARIOS.SPLIT_LIST) {
-        restartListsAttributes.outdentScenario = outdentScenario;
-        restartListsAttributes.splitListStartNumber = splitListStartNumber;
+      // Save the history, so it could undo/revert to the same state before the outdent, see https://product-fabric.atlassian.net/browse/ED-14753
+      closeHistory(state.tr);
+      var actionSubjectId = isBulletList(parentListNode.node) ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
+      var customTr = state.tr;
+      outdentListAction(customTr, state, featureFlags);
+      if (!customTr || !customTr.docChanged) {
+        // Even though this is a non-operation, we don't want to send this event to the browser. Because if we return false, the browser will move the focus to another place
+        // If inside table cell and can't outdent list, then let it handle by table keymap
+        return !isInsideTableCell(state);
       }
-    }
-    addAnalytics(state, customTr, {
-      action: ACTION.OUTDENTED,
-      actionSubject: ACTION_SUBJECT.LIST,
-      actionSubjectId: actionSubjectId,
-      eventType: EVENT_TYPE.TRACK,
-      attributes: _objectSpread(_objectSpread(_objectSpread({}, getCommonListAnalyticsAttributes(state)), restartListsAttributes), {}, {
-        inputMethod: inputMethod
-      })
-    });
-    if (dispatch) {
-      dispatch(customTr);
-    }
-    return true;
+      var restartListsAttributes = {};
+      if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
+        var _getRestartListsAttri = getRestartListsAttributes(customTr),
+          outdentScenario = _getRestartListsAttri.outdentScenario,
+          splitListStartNumber = _getRestartListsAttri.splitListStartNumber;
+        if (outdentScenario === OUTDENT_SCENARIOS.SPLIT_LIST) {
+          restartListsAttributes.outdentScenario = outdentScenario;
+          restartListsAttributes.splitListStartNumber = splitListStartNumber;
+        }
+      }
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+        action: ACTION.OUTDENTED,
+        actionSubject: ACTION_SUBJECT.LIST,
+        actionSubjectId: actionSubjectId,
+        eventType: EVENT_TYPE.TRACK,
+        attributes: _objectSpread(_objectSpread(_objectSpread({}, getCommonListAnalyticsAttributes(state)), restartListsAttributes), {}, {
+          inputMethod: inputMethod
+        })
+      })(customTr);
+      if (dispatch) {
+        dispatch(customTr);
+      }
+      return true;
+    };
   };
-}
+};

package/dist/esm/plugins/list/index.js

@@ -4,7 +4,7 @@ import { createPlugin } from './pm-plugins/main';
 import inputRulePlugin from './pm-plugins/input-rules';
 import keymapPlugin from './pm-plugins/keymap';
 import { messages } from './messages';
-import { addAnalytics, ACTION, EVENT_TYPE, INPUT_METHOD, ACTION_SUBJECT, ACTION_SUBJECT_ID } from '../analytics';
+import { ACTION, EVENT_TYPE, INPUT_METHOD, ACTION_SUBJECT, ACTION_SUBJECT_ID } from '../analytics';
 import { tooltip, toggleBulletList, toggleOrderedList } from '../../keymaps';
 import { IconList, IconListNumber } from '@atlaskit/editor-common/quick-insert';
 /*
@@ -12,7 +12,9 @@ import { IconList, IconListNumber } from '@atlaskit/editor-common/quick-insert';
   packages/editor/editor-core/src/plugins/toolbar-lists-indentation/ui/Toolbar.tsx
  */
 var listPlugin = function listPlugin(options, api) {
+  var _api$dependencies$ana;
   var featureFlags = (api === null || api === void 0 ? void 0 : api.dependencies.featureFlags.sharedState.currentState()) || {};
+  var editorAnalyticsAPI = api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions;
   return {
     name: 'list',
     nodes: function nodes() {
@@ -44,7 +46,8 @@ var listPlugin = function listPlugin(options, api) {
       }, {
         name: 'listKeymap',
         plugin: function plugin() {
-          return keymapPlugin(featureFlags);
+          var _api$dependencies$ana2;
+          return keymapPlugin(featureFlags, api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions);
         }
       }];
     },
@@ -63,7 +66,7 @@ var listPlugin = function listPlugin(options, api) {
           },
           action: function action(insert, state) {
             var tr = insert(state.schema.nodes.bulletList.createChecked({}, state.schema.nodes.listItem.createChecked({}, state.schema.nodes.paragraph.createChecked())));
-            return addAnalytics(state, tr, {
+            editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
               action: ACTION.INSERTED,
               actionSubject: ACTION_SUBJECT.LIST,
               actionSubjectId: ACTION_SUBJECT_ID.FORMAT_LIST_BULLET,
@@ -71,7 +74,8 @@ var listPlugin = function listPlugin(options, api) {
               attributes: {
                 inputMethod: INPUT_METHOD.QUICK_INSERT
               }
-            });
+            })(tr);
+            return tr;
           }
         }, {
           id: 'orderedList',
@@ -85,7 +89,7 @@ var listPlugin = function listPlugin(options, api) {
           },
           action: function action(insert, state) {
             var tr = insert(state.schema.nodes.orderedList.createChecked({}, state.schema.nodes.listItem.createChecked({}, state.schema.nodes.paragraph.createChecked())));
-            return addAnalytics(state, tr, {
+            editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
               action: ACTION.INSERTED,
               actionSubject: ACTION_SUBJECT.LIST,
               actionSubjectId: ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER,
@@ -93,7 +97,8 @@ var listPlugin = function listPlugin(options, api) {
               attributes: {
                 inputMethod: INPUT_METHOD.QUICK_INSERT
               }
-            });
+            })(tr);
+            return tr;
           }
         }];
       }

package/dist/esm/plugins/list/pm-plugins/input-rules/create-list-input-rule.js

@@ -1,6 +1,6 @@
 import { ruleWithAnalytics } from '../../../../utils/input-rules';
 import { createWrappingJoinRule } from './wrapping-join-rule';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '../../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST } from '@atlaskit/editor-common/analytics';
 var getOrder = function getOrder(matchResult) {
   return Number(matchResult[1]);