@atlaskit/editor-plugin-list 1.0.0 → 1.1.2

package/dist/es2019/commands/outdent-list.js

@@ -1,5 +1,6 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, OUTDENT_SCENARIOS } from '@atlaskit/editor-common/analytics';
 import { getCommonListAnalyticsAttributes } from '@atlaskit/editor-common/lists';
+import { PassiveTransaction } from '@atlaskit/editor-common/preset';
 import { isBulletList } from '@atlaskit/editor-common/utils';
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 import { outdentListItemsSelected as outdentListAction } from '../actions/outdent-list-items-selected';
@@ -7,28 +8,30 @@ import { getRestartListsAttributes } from '../utils/analytics';
 import { findFirstParentListNode } from '../utils/find';
 import { isInsideListItem, isInsideTableCell } from '../utils/selection';
 export const outdentList = editorAnalyticsAPI => (inputMethod = INPUT_METHOD.KEYBOARD, featureFlags) => {
-  return function (state, dispatch) {
-    if (!isInsideListItem(state)) {
-      return false;
+  return function ({
+    tr
+  }) {
+    if (!isInsideListItem(tr)) {
+      return null;
     }
     const {
       $from
-    } = state.selection;
+    } = tr.selection;
     const 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;
+      return new PassiveTransaction();
     }
 
     // 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);
+    closeHistory(tr);
     const actionSubjectId = isBulletList(parentListNode.node) ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
-    let customTr = state.tr;
-    outdentListAction(customTr, state, featureFlags);
+    let customTr = tr;
+    outdentListAction(customTr, 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);
+      return !isInsideTableCell(customTr) ? new PassiveTransaction() : null;
     }
     const restartListsAttributes = {};
     if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
@@ -47,14 +50,11 @@ export const outdentList = editorAnalyticsAPI => (inputMethod = INPUT_METHOD.KEY
       actionSubjectId,
       eventType: EVENT_TYPE.TRACK,
       attributes: {
-        ...getCommonListAnalyticsAttributes(state),
+        ...getCommonListAnalyticsAttributes(customTr),
         ...restartListsAttributes,
         inputMethod
       }
     })(customTr);
-    if (dispatch) {
-      dispatch(customTr);
-    }
-    return true;
+    return customTr;
   };
 };

package/dist/es2019/plugin.js

@@ -22,13 +22,15 @@ export const listPlugin = (options, api) => {
   return {
     name: 'list',
     actions: {
-      indentList: indentList(editorAnalyticsAPI),
-      outdentList: outdentList(editorAnalyticsAPI),
-      toggleOrderedList: toggleOrderedListCommand(editorAnalyticsAPI),
-      toggleBulletList: toggleBulletListCommand(editorAnalyticsAPI),
       isInsideListItem,
       findRootParentListNode
     },
+    commands: {
+      indentList: indentList(editorAnalyticsAPI),
+      outdentList: inputMethod => outdentList(editorAnalyticsAPI)(inputMethod, featureFlags),
+      toggleOrderedList: toggleOrderedListCommand(editorAnalyticsAPI),
+      toggleBulletList: toggleBulletListCommand(editorAnalyticsAPI)
+    },
     getSharedState: editorState => {
       if (!editorState) {
         return undefined;

package/dist/es2019/pm-plugins/keymap.js

@@ -1,13 +1,13 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { backspace, bindKeymapWithCommand, deleteKey, enter, findKeyMapForBrowser, findShortcutByKeymap, forwardDelete, indentList, outdentList, toggleBulletList, toggleOrderedList } from '@atlaskit/editor-common/keymaps';
+import { backspace, bindKeymapWithCommand, bindKeymapWithEditorCommand, deleteKey, enter, findKeyMapForBrowser, findShortcutByKeymap, forwardDelete, indentList, outdentList, toggleBulletList, toggleOrderedList } from '@atlaskit/editor-common/keymaps';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { backspaceKeyCommand, deleteKeyCommand, enterKeyCommand, indentList as indentListCommand, outdentList as outdentListCommand, toggleList } from '../commands';
 export function keymapPlugin(featureFlags, editorAnalyticsAPI) {
   const list = {};
-  bindKeymapWithCommand(findShortcutByKeymap(toggleOrderedList), toggleList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, 'orderedList'), list);
-  bindKeymapWithCommand(findShortcutByKeymap(toggleBulletList), toggleList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, 'bulletList'), list);
-  bindKeymapWithCommand(indentList.common, indentListCommand(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD), list);
-  bindKeymapWithCommand(outdentList.common, outdentListCommand(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, featureFlags), list);
+  bindKeymapWithEditorCommand(findShortcutByKeymap(toggleOrderedList), toggleList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, 'orderedList'), list);
+  bindKeymapWithEditorCommand(findShortcutByKeymap(toggleBulletList), toggleList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, 'bulletList'), list);
+  bindKeymapWithEditorCommand(indentList.common, indentListCommand(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD), list);
+  bindKeymapWithEditorCommand(outdentList.common, outdentListCommand(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, featureFlags), list);
   bindKeymapWithCommand(enter.common, enterKeyCommand(editorAnalyticsAPI)(featureFlags), list);
   bindKeymapWithCommand(backspace.common, backspaceKeyCommand(editorAnalyticsAPI)(featureFlags), list);
   bindKeymapWithCommand(deleteKey.common, deleteKeyCommand(editorAnalyticsAPI), list);

package/dist/es2019/utils/selection.js

@@ -32,32 +32,32 @@ export const isWrappingPossible = (nodeType, selection) => {
 };
 
 // canOutdent
-export const isInsideListItem = state => {
+export const isInsideListItem = tr => {
   const {
     parent
-  } = state.selection.$from;
+  } = tr.selection.$from;
   const {
     listItem
-  } = state.schema.nodes;
-  if (state.selection instanceof GapCursorSelection) {
+  } = tr.doc.type.schema.nodes;
+  if (tr.selection instanceof GapCursorSelection) {
     return isListItemNode(parent);
   }
-  return hasParentNodeOfType(listItem)(state.selection) && isParagraphNode(parent);
+  return hasParentNodeOfType(listItem)(tr.selection) && isParagraphNode(parent);
 };
-export const isInsideTableCell = state => {
+export const isInsideTableCell = tr => {
   const {
     tableCell,
     tableHeader
-  } = state.schema.nodes;
-  return !!findParentNodeOfType([tableCell, tableHeader])(state.selection);
+  } = tr.doc.type.schema.nodes;
+  return !!findParentNodeOfType([tableCell, tableHeader])(tr.selection);
 };
-export const canJoinToPreviousListItem = state => {
+export const canJoinToPreviousListItem = tr => {
   const {
     $from
-  } = state.selection;
-  const $before = state.doc.resolve($from.pos - 1);
+  } = tr.selection;
+  const $before = tr.doc.resolve($from.pos - 1);
   let nodeBefore = $before ? $before.nodeBefore : null;
-  if (state.selection instanceof GapCursorSelection) {
+  if (tr.selection instanceof GapCursorSelection) {
     nodeBefore = $from.nodeBefore;
   }
   return isListNode(nodeBefore);

package/dist/esm/actions/outdent-list-items-selected.js

@@ -11,7 +11,7 @@ import { liftTarget, ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-pro
 import { getRestartListsAttributes, storeRestartListsAttributes } from '../utils/analytics';
 import { findFirstParentListItemNode, findRootParentListNode } from '../utils/find';
 import { createListNodeRange } from '../utils/selection';
-export var outdentListItemsSelected = function outdentListItemsSelected(tr, state, featureFlags) {
+export var outdentListItemsSelected = function outdentListItemsSelected(tr, featureFlags) {
   var originalSelection = tr.selection;
   var normalizedSelection = normalizeListItemsSelection({
     selection: tr.selection,
@@ -46,7 +46,6 @@ export var outdentListItemsSelected = function outdentListItemsSelected(tr, stat
       extractListItemsRangeFromList({
         tr: tr,
         range: mappedRange,
-        state: state,
         featureFlags: featureFlags
       });
       hasNormalizedToPositionLiftedOut = hasNormalizedToPositionLiftedOut || oldTo >= range.from && oldTo < range.to;
@@ -168,7 +167,6 @@ var outdentRangeToParentList = function outdentRangeToParentList(_ref2) {
 var extractListItemsRangeFromList = function extractListItemsRangeFromList(_ref3) {
   var tr = _ref3.tr,
     range = _ref3.range,
-    state = _ref3.state,
     featureFlags = _ref3.featureFlags;
   var list = range.parent;
   var $start = tr.doc.resolve(range.start);

package/dist/esm/commands/indent-list.js

@@ -3,6 +3,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { getCommonListAnalyticsAttributes, getListItemAttributes, hasValidListIndentationLevel } from '@atlaskit/editor-common/lists';
+import { PassiveTransaction } from '@atlaskit/editor-common/preset';
 import { isBulletList } from '@atlaskit/editor-common/utils';
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 import { indentListItemsSelected as indentListAction } from '../actions/indent-list-items-selected';
@@ -12,13 +13,13 @@ import { isInsideListItem, isInsideTableCell } from '../utils/selection';
 export var indentList = function indentList(editorAnalyticsAPI) {
   return function () {
     var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INPUT_METHOD.KEYBOARD;
-    return function (state, dispatch) {
-      var tr = state.tr,
-        $from = state.selection.$from;
+    return function (_ref) {
+      var tr = _ref.tr;
+      var $from = tr.selection.$from;
 
       // don't indent if selection is not inside a list
-      if (!isInsideListItem(state)) {
-        return false;
+      if (!isInsideListItem(tr)) {
+        return null;
       }
 
       // Save the history, so it could undo/revert to the same state before the indent, see https://product-fabric.atlassian.net/browse/ED-14753
@@ -26,12 +27,12 @@ export var indentList = function indentList(editorAnalyticsAPI) {
       var firstListItemSelectedAttributes = getListItemAttributes($from);
       var parentListNode = findFirstParentListNode($from);
       if (!parentListNode || firstListItemSelectedAttributes && firstListItemSelectedAttributes.indentLevel === 0 && firstListItemSelectedAttributes.itemIndex === 0) {
-        if (isInsideTableCell(state)) {
+        if (isInsideTableCell(tr)) {
           // dont consume tab, as table-keymap should move cursor to next cell
-          return false;
+          return null;
         } else {
           // 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;
+          return new PassiveTransaction();
         }
       }
       var currentListNode = parentListNode.node;
@@ -43,21 +44,18 @@ export var indentList = function indentList(editorAnalyticsAPI) {
       });
       if (maximimunNestedLevelReached || !tr.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
-        return true;
+        return new PassiveTransaction();
       }
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
         action: ACTION.INDENTED,
         actionSubject: ACTION_SUBJECT.LIST,
         actionSubjectId: actionSubjectId,
         eventType: EVENT_TYPE.TRACK,
-        attributes: _objectSpread(_objectSpread({}, getCommonListAnalyticsAttributes(state)), {}, {
+        attributes: _objectSpread(_objectSpread({}, getCommonListAnalyticsAttributes(tr)), {}, {
           inputMethod: inputMethod
         })
       })(tr);
-      if (dispatch) {
-        dispatch(tr);
-      }
-      return true;
+      return tr;
     };
   };
 };

package/dist/esm/commands/index.js

@@ -4,6 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { findCutBefore } from '@atlaskit/editor-common/commands';
 import { getCommonListAnalyticsAttributes, moveTargetIntoList } from '@atlaskit/editor-common/lists';
+import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
 import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { filterCommand as filter, hasVisibleContent, isEmptySelectionAtStart } from '@atlaskit/editor-common/utils';
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
@@ -35,7 +36,7 @@ export var enterKeyCommand = function enterKeyCommand(editorAnalyticsAPI) {
           /** Check if the wrapper has any visible content */
           var wrapperHasContent = hasVisibleContent(wrapper);
           if (!wrapperHasContent) {
-            return outdentList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, featureFlags)(state, dispatch);
+            return editorCommandToPMCommand(outdentList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, featureFlags))(state, dispatch);
           } else if (!hasParentNodeOfType(codeBlock)(selection)) {
             return splitListItem(listItem)(state, dispatch);
           }
@@ -53,10 +54,14 @@ export var backspaceKeyCommand = function backspaceKeyCommand(editorAnalyticsAPI
       // 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], chainCommands(deletePreviousEmptyListItem, outdentList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, featureFlags))),
+      isFirstChildOfParent, function (state) {
+        return isInsideListItem(state.tr);
+      }], chainCommands(deletePreviousEmptyListItem, editorCommandToPMCommand(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);
+      filter([isEmptySelectionAtStart, function (state) {
+        return canJoinToPreviousListItem(state.tr);
+      }], joinToPreviousListItem))(state, dispatch);
     };
   };
 };
@@ -93,13 +98,13 @@ function untoggleSelectedList(tr) {
 }
 export var toggleList = function toggleList(editorAnalyticsAPI) {
   return function (inputMethod, listType) {
-    return function (state, dispatch) {
-      var tr = state.tr;
+    return function (_ref) {
+      var tr = _ref.tr;
       var listInsideSelection = selectionContainsList(tr);
-      var listNodeType = state.schema.nodes[listType];
+      var listNodeType = tr.doc.type.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;
+        var selection = tr.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)
@@ -108,22 +113,19 @@ export var toggleList = function toggleList(editorAnalyticsAPI) {
         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);
+          var commonAttributes = getCommonListAnalyticsAttributes(tr);
+          untoggleSelectedList(tr);
           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)), {}, {
+            attributes: _objectSpread(_objectSpread({}, commonAttributes), {}, {
               transformedFrom: transformedFrom,
               inputMethod: inputMethod
             })
-          })(_tr2);
-          if (dispatch) {
-            dispatch(_tr2);
-          }
-          return true;
+          })(tr);
+          return tr;
         }
         convertListType({
           tr: tr,
@@ -134,7 +136,7 @@ export var toggleList = function toggleList(editorAnalyticsAPI) {
           actionSubject: ACTION_SUBJECT.LIST,
           actionSubjectId: actionSubjectId,
           eventType: EVENT_TYPE.TRACK,
-          attributes: _objectSpread(_objectSpread({}, getCommonListAnalyticsAttributes(state)), {}, {
+          attributes: _objectSpread(_objectSpread({}, getCommonListAnalyticsAttributes(tr)), {}, {
             transformedFrom: transformedFrom,
             inputMethod: inputMethod
           })
@@ -158,25 +160,22 @@ export var toggleList = function toggleList(editorAnalyticsAPI) {
       // If document wasn't changed, return false from the command to indicate that the
       // editing action failed
       if (!tr.docChanged) {
-        return false;
+        return null;
       }
-      if (dispatch) {
-        dispatch(tr);
-      }
-      return true;
+      return tr;
     };
   };
 };
 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);
+  return function () {
+    var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INPUT_METHOD.TOOLBAR;
+    return toggleList(editorAnalyticsAPI)(inputMethod, 'bulletList');
   };
 };
 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);
+  return function () {
+    var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INPUT_METHOD.TOOLBAR;
+    return toggleList(editorAnalyticsAPI)(inputMethod, 'orderedList');
   };
 };
 

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

@@ -3,6 +3,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, OUTDENT_SCENARIOS } from '@atlaskit/editor-common/analytics';
 import { getCommonListAnalyticsAttributes } from '@atlaskit/editor-common/lists';
+import { PassiveTransaction } from '@atlaskit/editor-common/preset';
 import { isBulletList } from '@atlaskit/editor-common/utils';
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 import { outdentListItemsSelected as outdentListAction } from '../actions/outdent-list-items-selected';
@@ -13,26 +14,27 @@ 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;
+    return function (_ref) {
+      var tr = _ref.tr;
+      if (!isInsideListItem(tr)) {
+        return null;
       }
-      var $from = state.selection.$from;
+      var $from = tr.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;
+        return new PassiveTransaction();
       }
 
       // 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);
+      closeHistory(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);
+      var customTr = tr;
+      outdentListAction(customTr, 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);
+        return !isInsideTableCell(customTr) ? new PassiveTransaction() : null;
       }
       var restartListsAttributes = {};
       if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
@@ -49,14 +51,11 @@ export var outdentList = function outdentList(editorAnalyticsAPI) {
         actionSubject: ACTION_SUBJECT.LIST,
         actionSubjectId: actionSubjectId,
         eventType: EVENT_TYPE.TRACK,
-        attributes: _objectSpread(_objectSpread(_objectSpread({}, getCommonListAnalyticsAttributes(state)), restartListsAttributes), {}, {
+        attributes: _objectSpread(_objectSpread(_objectSpread({}, getCommonListAnalyticsAttributes(customTr)), restartListsAttributes), {}, {
           inputMethod: inputMethod
         })
       })(customTr);
-      if (dispatch) {
-        dispatch(customTr);
-      }
-      return true;
+      return customTr;
     };
   };
 };

package/dist/esm/plugin.js

@@ -4,7 +4,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { toggleBulletList, toggleOrderedList, tooltip } from '@atlaskit/editor-common/keymaps';
 import { listMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconList, IconListNumber } from '@atlaskit/editor-common/quick-insert';
-import { indentList, outdentList, toggleBulletList as toggleBulletListCommand, toggleOrderedList as toggleOrderedListCommand } from './commands';
+import { indentList, outdentList as _outdentList, toggleBulletList as toggleBulletListCommand, toggleOrderedList as toggleOrderedListCommand } from './commands';
 import inputRulePlugin from './pm-plugins/input-rules';
 import keymapPlugin from './pm-plugins/keymap';
 import { createPlugin, pluginKey as listPluginKey } from './pm-plugins/main';
@@ -22,13 +22,17 @@ export var listPlugin = function listPlugin(options, api) {
   return {
     name: 'list',
     actions: {
-      indentList: indentList(editorAnalyticsAPI),
-      outdentList: outdentList(editorAnalyticsAPI),
-      toggleOrderedList: toggleOrderedListCommand(editorAnalyticsAPI),
-      toggleBulletList: toggleBulletListCommand(editorAnalyticsAPI),
       isInsideListItem: isInsideListItem,
       findRootParentListNode: findRootParentListNode
     },
+    commands: {
+      indentList: indentList(editorAnalyticsAPI),
+      outdentList: function outdentList(inputMethod) {
+        return _outdentList(editorAnalyticsAPI)(inputMethod, featureFlags);
+      },
+      toggleOrderedList: toggleOrderedListCommand(editorAnalyticsAPI),
+      toggleBulletList: toggleBulletListCommand(editorAnalyticsAPI)
+    },
     getSharedState: function getSharedState(editorState) {
       if (!editorState) {
         return undefined;

package/dist/esm/pm-plugins/keymap.js

@@ -1,13 +1,13 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { backspace, bindKeymapWithCommand, deleteKey, enter, findKeyMapForBrowser, findShortcutByKeymap, forwardDelete, indentList, outdentList, toggleBulletList, toggleOrderedList } from '@atlaskit/editor-common/keymaps';
+import { backspace, bindKeymapWithCommand, bindKeymapWithEditorCommand, deleteKey, enter, findKeyMapForBrowser, findShortcutByKeymap, forwardDelete, indentList, outdentList, toggleBulletList, toggleOrderedList } from '@atlaskit/editor-common/keymaps';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { backspaceKeyCommand, deleteKeyCommand, enterKeyCommand, indentList as indentListCommand, outdentList as outdentListCommand, toggleList } from '../commands';
 export function keymapPlugin(featureFlags, editorAnalyticsAPI) {
   var list = {};
-  bindKeymapWithCommand(findShortcutByKeymap(toggleOrderedList), toggleList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, 'orderedList'), list);
-  bindKeymapWithCommand(findShortcutByKeymap(toggleBulletList), toggleList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, 'bulletList'), list);
-  bindKeymapWithCommand(indentList.common, indentListCommand(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD), list);
-  bindKeymapWithCommand(outdentList.common, outdentListCommand(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, featureFlags), list);
+  bindKeymapWithEditorCommand(findShortcutByKeymap(toggleOrderedList), toggleList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, 'orderedList'), list);
+  bindKeymapWithEditorCommand(findShortcutByKeymap(toggleBulletList), toggleList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, 'bulletList'), list);
+  bindKeymapWithEditorCommand(indentList.common, indentListCommand(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD), list);
+  bindKeymapWithEditorCommand(outdentList.common, outdentListCommand(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, featureFlags), list);
   bindKeymapWithCommand(enter.common, enterKeyCommand(editorAnalyticsAPI)(featureFlags), list);
   bindKeymapWithCommand(backspace.common, backspaceKeyCommand(editorAnalyticsAPI)(featureFlags), list);
   bindKeymapWithCommand(deleteKey.common, deleteKeyCommand(editorAnalyticsAPI), list);

package/dist/esm/utils/selection.js

@@ -30,25 +30,25 @@ export var isWrappingPossible = function isWrappingPossible(nodeType, selection)
 };
 
 // canOutdent
-export var isInsideListItem = function isInsideListItem(state) {
-  var parent = state.selection.$from.parent;
-  var listItem = state.schema.nodes.listItem;
-  if (state.selection instanceof GapCursorSelection) {
+export var isInsideListItem = function isInsideListItem(tr) {
+  var parent = tr.selection.$from.parent;
+  var listItem = tr.doc.type.schema.nodes.listItem;
+  if (tr.selection instanceof GapCursorSelection) {
     return isListItemNode(parent);
   }
-  return hasParentNodeOfType(listItem)(state.selection) && isParagraphNode(parent);
+  return hasParentNodeOfType(listItem)(tr.selection) && isParagraphNode(parent);
 };
-export var isInsideTableCell = function isInsideTableCell(state) {
-  var _state$schema$nodes = state.schema.nodes,
-    tableCell = _state$schema$nodes.tableCell,
-    tableHeader = _state$schema$nodes.tableHeader;
-  return !!findParentNodeOfType([tableCell, tableHeader])(state.selection);
+export var isInsideTableCell = function isInsideTableCell(tr) {
+  var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
+    tableCell = _tr$doc$type$schema$n.tableCell,
+    tableHeader = _tr$doc$type$schema$n.tableHeader;
+  return !!findParentNodeOfType([tableCell, tableHeader])(tr.selection);
 };
-export var canJoinToPreviousListItem = function canJoinToPreviousListItem(state) {
-  var $from = state.selection.$from;
-  var $before = state.doc.resolve($from.pos - 1);
+export var canJoinToPreviousListItem = function canJoinToPreviousListItem(tr) {
+  var $from = tr.selection.$from;
+  var $before = tr.doc.resolve($from.pos - 1);
   var nodeBefore = $before ? $before.nodeBefore : null;
-  if (state.selection instanceof GapCursorSelection) {
+  if (tr.selection instanceof GapCursorSelection) {
     nodeBefore = $from.nodeBefore;
   }
   return isListNode(nodeBefore);

package/dist/types/actions/outdent-list-items-selected.d.ts

@@ -1,3 +1,3 @@
 import type { FeatureFlags } from '@atlaskit/editor-common/types';
-import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const outdentListItemsSelected: (tr: Transaction, state: EditorState, featureFlags: FeatureFlags) => void;
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare const outdentListItemsSelected: (tr: Transaction, featureFlags: FeatureFlags) => void;

package/dist/types/commands/indent-list.d.ts

@@ -1,6 +1,6 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { Command } from '@atlaskit/editor-common/types';
+import type { EditorCommand } from '@atlaskit/editor-common/types';
 type InputMethod = INPUT_METHOD.KEYBOARD | INPUT_METHOD.TOOLBAR;
-export declare const indentList: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod?: InputMethod) => Command;
+export declare const indentList: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod?: InputMethod) => EditorCommand;
 export {};

package/dist/types/commands/index.d.ts

@@ -1,8 +1,7 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { Command, FeatureFlags } from '@atlaskit/editor-common/types';
+import type { Command, EditorCommand, FeatureFlags } from '@atlaskit/editor-common/types';
 import type { NodeType, ResolvedPos } from '@atlaskit/editor-prosemirror/model';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { indentList } from './indent-list';
 import { outdentList } from './outdent-list';
 export { outdentList, indentList };
@@ -11,6 +10,6 @@ export declare const enterKeyCommand: (editorAnalyticsAPI: EditorAnalyticsAPI |
 export declare const backspaceKeyCommand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (featureFlags: FeatureFlags) => Command;
 export declare const deleteKeyCommand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const rootListDepth: (pos: ResolvedPos, nodes: Record<string, NodeType>) => number | undefined;
-export declare const toggleList: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: InputMethod, listType: 'bulletList' | 'orderedList') => Command;
-export declare const toggleBulletList: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, inputMethod?: InputMethod) => boolean;
-export declare const toggleOrderedList: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, inputMethod?: InputMethod) => boolean;
+export declare const toggleList: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: InputMethod, listType: 'bulletList' | 'orderedList') => EditorCommand;
+export declare const toggleBulletList: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod?: InputMethod) => EditorCommand;
+export declare const toggleOrderedList: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod?: InputMethod) => EditorCommand;

package/dist/types/commands/outdent-list.d.ts

@@ -1,6 +1,6 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { Command, FeatureFlags } from '@atlaskit/editor-common/types';
+import type { EditorCommand, FeatureFlags } from '@atlaskit/editor-common/types';
 type InputMethod = INPUT_METHOD.KEYBOARD | INPUT_METHOD.TOOLBAR;
-export declare const outdentList: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: InputMethod | undefined, featureFlags: FeatureFlags) => Command;
+export declare const outdentList: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: InputMethod | undefined, featureFlags: FeatureFlags) => EditorCommand;
 export {};

package/dist/types/types.d.ts

@@ -1,18 +1,18 @@
 import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { Command, FeatureFlags, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
-import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
+import type { EditorCommand, FeatureFlags, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { ResolvedPos } from '@atlaskit/editor-prosemirror/model';
-import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-import type { DecorationSet, EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 export type InputMethod = INPUT_METHOD.KEYBOARD | INPUT_METHOD.TOOLBAR;
 export declare const MAX_NESTED_LIST_INDENTATION = 6;
 export type ListPluginOptions = Pick<FeatureFlags, 'restartNumberedLists'>;
-export type IndentList = (inputMethod: InputMethod) => Command;
-export type OutdentList = (inputMethod: InputMethod, featureFlags: FeatureFlags) => Command;
-export type ToggleOrderedList = (view: EditorView, inputMethod: InputMethod) => boolean;
-export type ToggleBulletList = (view: EditorView, inputMethod: InputMethod) => boolean;
-export type IsInsideListItem = (state: EditorState) => boolean;
+export type IndentList = (inputMethod: InputMethod) => EditorCommand;
+export type OutdentList = (inputMethod: InputMethod) => EditorCommand;
+export type ToggleOrderedList = (inputMethod: InputMethod) => EditorCommand;
+export type ToggleBulletList = (inputMethod: InputMethod) => EditorCommand;
+export type IsInsideListItem = (tr: Transaction) => boolean;
 export type FindRootParentListNode = ($pos: ResolvedPos) => ResolvedPos | null;
 export interface ListState {
     bulletListActive: boolean;
@@ -23,17 +23,16 @@ export interface ListState {
 }
 export type ListPlugin = NextEditorPlugin<'list', {
     pluginConfiguration: ListPluginOptions | undefined;
-    dependencies: [
-        typeof featureFlagsPlugin,
-        OptionalPlugin<typeof analyticsPlugin>
-    ];
+    dependencies: [FeatureFlagsPlugin, OptionalPlugin<AnalyticsPlugin>];
     actions: {
+        isInsideListItem: IsInsideListItem;
+        findRootParentListNode: FindRootParentListNode;
+    };
+    commands: {
         indentList: IndentList;
         outdentList: OutdentList;
         toggleOrderedList: ToggleOrderedList;
         toggleBulletList: ToggleBulletList;
-        isInsideListItem: IsInsideListItem;
-        findRootParentListNode: FindRootParentListNode;
     };
     sharedState: ListState | undefined;
 }>;