@atlaskit/editor-core 187.8.0 → 187.8.3

package/dist/cjs/plugins/list/actions/outdent-list-items-selected.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.outdentListItemsSelected = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorModel = require("prosemirror-model");
-var _prosemirrorTransform = require("prosemirror-transform");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils = require("@atlaskit/editor-common/utils");
 var _node = require("../utils/node");
 var _find = require("../utils/find");
@@ -106,13 +106,13 @@ var calculateNewSelection = function calculateNewSelection(_ref) {
     var nextSelectionFrom = tr.doc.resolve(from);
     return new _gapCursorSelection.GapCursorSelection(nextSelectionFrom, normalizedSelection.side);
   }
-  if (originalSelection instanceof _prosemirrorState.NodeSelection) {
-    return _prosemirrorState.NodeSelection.create(tr.doc, from);
+  if (originalSelection instanceof _state.NodeSelection) {
+    return _state.NodeSelection.create(tr.doc, from);
   }
   if (isCursorSelection) {
-    return _prosemirrorState.TextSelection.between(tr.doc.resolve(to), tr.doc.resolve(to), -1);
+    return _state.TextSelection.between(tr.doc.resolve(to), tr.doc.resolve(to), -1);
   }
-  return _prosemirrorState.TextSelection.between(tr.doc.resolve(from), tr.doc.resolve(to), -1);
+  return _state.TextSelection.between(tr.doc.resolve(from), tr.doc.resolve(to), -1);
 };
 var splitRangeSelection = function splitRangeSelection(selection) {
   var commonListRange = (0, _selection.createListNodeRange)({
@@ -163,12 +163,12 @@ var outdentRangeToParentList = function outdentRangeToParentList(_ref2) {
   var endOfList = range.$to.end(range.depth);
   var listItem = tr.doc.type.schema.nodes.listItem;
   if (end < endOfList) {
-    var slice = new _prosemirrorModel.Slice(_prosemirrorModel.Fragment.from(listItem.create(null, range.parent.copy())), 1, 0);
-    var step = new _prosemirrorTransform.ReplaceAroundStep(end - 1, endOfList, end, endOfList, slice, 1, true);
+    var slice = new _model.Slice(_model.Fragment.from(listItem.create(null, range.parent.copy())), 1, 0);
+    var step = new _transform.ReplaceAroundStep(end - 1, endOfList, end, endOfList, slice, 1, true);
     tr.step(step);
-    range = new _prosemirrorModel.NodeRange(tr.doc.resolve(range.$from.pos), tr.doc.resolve(endOfList), range.depth);
+    range = new _model.NodeRange(tr.doc.resolve(range.$from.pos), tr.doc.resolve(endOfList), range.depth);
   }
-  var target = (0, _prosemirrorTransform.liftTarget)(range);
+  var target = (0, _transform.liftTarget)(range);
   if (target) {
     tr.lift(range, target);
   }
@@ -185,7 +185,7 @@ var extractListItemsRangeFromList = function extractListItemsRangeFromList(_ref3
   var isAtTop = listStart === range.start;
   var isAtBottom = listEnd === range.end;
   var isTheEntireList = isAtTop && isAtBottom;
-  var listItemContent = isAtTop ? _prosemirrorModel.Fragment.empty : _prosemirrorModel.Fragment.from(list.copy(_prosemirrorModel.Fragment.empty));
+  var listItemContent = isAtTop ? _model.Fragment.empty : _model.Fragment.from(list.copy(_model.Fragment.empty));
   for (var i = range.startIndex; i < range.endIndex; i++) {
     listItemContent = listItemContent.append(list.child(i).content);
   }
@@ -198,7 +198,7 @@ var extractListItemsRangeFromList = function extractListItemsRangeFromList(_ref3
       }
     }
   }
-  var nextList = list.copy(_prosemirrorModel.Fragment.empty);
+  var nextList = list.copy(_model.Fragment.empty);
   var nextListStartNumber;
   if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
     // if splitting a numbered list, keep the splitted item
@@ -220,7 +220,7 @@ var extractListItemsRangeFromList = function extractListItemsRangeFromList(_ref3
       }
     }
   }
-  var nextListFragment = listItemContent.append(_prosemirrorModel.Fragment.from(nextList));
+  var nextListFragment = listItemContent.append(_model.Fragment.from(nextList));
   if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
     // if the split list with nextListStartNumber is below another list
     // with order (e.g due to multi-level indent items being lifted), track the
@@ -240,8 +240,8 @@ var extractListItemsRangeFromList = function extractListItemsRangeFromList(_ref3
     });
   }
   if (isTheEntireList) {
-    var slice = new _prosemirrorModel.Slice(listItemContent, 0, 0);
-    var step = new _prosemirrorTransform.ReplaceStep($start.pos - 1, range.end + 1, slice, false);
+    var slice = new _model.Slice(listItemContent, 0, 0);
+    var step = new _transform.ReplaceStep($start.pos - 1, range.end + 1, slice, false);
     if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
       (0, _analytics.storeRestartListsAttributes)(tr, {
         outdentScenario: undefined
@@ -249,12 +249,12 @@ var extractListItemsRangeFromList = function extractListItemsRangeFromList(_ref3
     }
     tr.step(step);
   } else if (isAtTop) {
-    var _slice = new _prosemirrorModel.Slice(nextListFragment, 0, 1);
-    var _step = new _prosemirrorTransform.ReplaceStep($start.pos - 1, range.end, _slice, false);
+    var _slice = new _model.Slice(nextListFragment, 0, 1);
+    var _step = new _transform.ReplaceStep($start.pos - 1, range.end, _slice, false);
     tr.step(_step);
   } else if (isAtBottom) {
-    var _slice2 = new _prosemirrorModel.Slice(listItemContent, 1, 0);
-    var _step2 = new _prosemirrorTransform.ReplaceStep($start.pos, listEnd + 1, _slice2, false);
+    var _slice2 = new _model.Slice(listItemContent, 1, 0);
+    var _step2 = new _transform.ReplaceStep($start.pos, listEnd + 1, _slice2, false);
     tr.step(_step2);
   } else {
     if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
@@ -262,8 +262,8 @@ var extractListItemsRangeFromList = function extractListItemsRangeFromList(_ref3
         outdentScenario: _analytics2.OUTDENT_SCENARIOS.SPLIT_LIST
       });
     }
-    var _slice3 = new _prosemirrorModel.Slice(nextListFragment, 1, 1);
-    var _step3 = new _prosemirrorTransform.ReplaceAroundStep($start.pos, listEnd, range.end, listEnd, _slice3, _slice3.size, false);
+    var _slice3 = new _model.Slice(nextListFragment, 1, 1);
+    var _step3 = new _transform.ReplaceAroundStep($start.pos, listEnd, range.end, listEnd, _slice3, _slice3.size, false);
     tr.step(_step3);
   }
 };
@@ -279,7 +279,7 @@ var findPreviousListItemSibling = function findPreviousListItemSibling($pos) {
     return doc.resolve(listItem.pos);
   }
   var resolved = doc.resolve(listItemPosition.pos);
-  var foundPosition = _prosemirrorState.Selection.findFrom(resolved, -1);
+  var foundPosition = _state.Selection.findFrom(resolved, -1);
   if (!foundPosition) {
     return null;
   }

package/dist/cjs/plugins/list/actions/wrap-and-join-lists.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.wrapInList = wrapInList;
 exports.wrapInListAndJoin = wrapInListAndJoin;
-var _prosemirrorModel = require("prosemirror-model");
-var _prosemirrorTransform = require("prosemirror-transform");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _autojoin = require("../../../utils/prosemirror/autojoin");
 var _gapCursorSelection = require("../../selection/gap-cursor-selection");
 var _selection = require("../utils/selection");
@@ -52,13 +52,13 @@ function wrapInList(listType, attrs) {
         return false;
       }
       var $insert = tr.doc.resolve(range.start - 2);
-      outerRange = new _prosemirrorModel.NodeRange($insert, $insert, range.depth);
+      outerRange = new _model.NodeRange($insert, $insert, range.depth);
       if (range.endIndex < range.parent.childCount) {
-        range = new _prosemirrorModel.NodeRange($from, tr.doc.resolve($to.end(range.depth)), range.depth);
+        range = new _model.NodeRange($from, tr.doc.resolve($to.end(range.depth)), range.depth);
       }
       doJoin = true;
     }
-    var wrap = (0, _prosemirrorTransform.findWrapping)(outerRange, listType, attrs, range);
+    var wrap = (0, _transform.findWrapping)(outerRange, listType, attrs, range);
     if (!wrap) {
       return false;
     }
@@ -73,11 +73,11 @@ function wrapInList(listType, attrs) {
  * Adapted from https://github.com/ProseMirror/prosemirror-schema-list/blob/master/src/schema-list.js#L91-L112
  */
 function doWrapInList(tr, range, wrappers, joinBefore, listType) {
-  var content = _prosemirrorModel.Fragment.empty;
+  var content = _model.Fragment.empty;
   for (var i = wrappers.length - 1; i >= 0; i--) {
-    content = _prosemirrorModel.Fragment.from(wrappers[i].type.create(wrappers[i].attrs, content));
+    content = _model.Fragment.from(wrappers[i].type.create(wrappers[i].attrs, content));
   }
-  tr.step(new _prosemirrorTransform.ReplaceAroundStep(range.start - (joinBefore ? 2 : 0), range.end, range.start, range.end, new _prosemirrorModel.Slice(content, 0, 0), wrappers.length, true));
+  tr.step(new _transform.ReplaceAroundStep(range.start - (joinBefore ? 2 : 0), range.end, range.start, range.end, new _model.Slice(content, 0, 0), wrappers.length, true));
   var found = 0;
   for (var _i = 0; _i < wrappers.length; _i++) {
     if (wrappers[_i].type === listType) {
@@ -88,7 +88,7 @@ function doWrapInList(tr, range, wrappers, joinBefore, listType) {
   var splitPos = range.start + wrappers.length - (joinBefore ? 2 : 0);
   var parent = range.parent;
   for (var _i2 = range.startIndex, e = range.endIndex, first = true; _i2 < e; _i2++, first = false) {
-    if (!first && (0, _prosemirrorTransform.canSplit)(tr.doc, splitPos, splitDepth)) {
+    if (!first && (0, _transform.canSplit)(tr.doc, splitPos, splitDepth)) {
       tr.split(splitPos, splitDepth);
       splitPos += 2 * splitDepth;
     }

package/dist/cjs/plugins/list/commands/indent-list.js

@@ -14,7 +14,7 @@ var _find = require("../utils/find");
 var _types = require("../types");
 var _selection = require("../utils/selection");
 var _analytics2 = require("../utils/analytics");
-var _prosemirrorHistory = require("prosemirror-history");
+var _history = require("@atlaskit/editor-prosemirror/history");
 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 indentList = function indentList(editorAnalyticsAPI) {
@@ -30,7 +30,7 @@ var indentList = function indentList(editorAnalyticsAPI) {
       }
 
       // Save the history, so it could undo/revert to the same state before the indent, see https://product-fabric.atlassian.net/browse/ED-14753
-      (0, _prosemirrorHistory.closeHistory)(tr);
+      (0, _history.closeHistory)(tr);
       var firstListItemSelectedAttributes = (0, _selection.getListItemAttributes)($from);
       var parentListNode = (0, _find.findFirstParentListNode)($from);
       if (!parentListNode || firstListItemSelectedAttributes && firstListItemSelectedAttributes.indentLevel === 0 && firstListItemSelectedAttributes.itemIndex === 0) {

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

@@ -20,13 +20,14 @@ Object.defineProperty(exports, "outdentList", {
 });
 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 _utils = require("../../../utils");
-var _commands = require("../../../utils/commands");
+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 _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("@atlaskit/editor-common/analytics");
@@ -55,10 +56,10 @@ var enterKeyCommand = function enterKeyCommand(editorAnalyticsAPI) {
         var wrapper = $from.node($from.depth - 1);
         if (wrapper && wrapper.type === listItem) {
           /** Check if the wrapper has any visible content */
-          var wrapperHasContent = (0, _utils.hasVisibleContent)(wrapper);
+          var wrapperHasContent = (0, _document.hasVisibleContent)(wrapper);
           if (!wrapperHasContent) {
             return (0, _outdentList.outdentList)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.KEYBOARD, featureFlags)(state, dispatch);
-          } else if (!(0, _prosemirrorUtils.hasParentNodeOfType)(codeBlock)(selection)) {
+          } else if (!(0, _utils.hasParentNodeOfType)(codeBlock)(selection)) {
             return splitListItem(listItem)(state, dispatch);
           }
         }
@@ -74,12 +75,12 @@ var backspaceKeyCommand = function backspaceKeyCommand(editorAnalyticsAPI) {
       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)([_commands.isEmptySelectionAtStart,
+      (0, _utils2.filterCommands)([_commands2.isEmptySelectionAtStart,
       // list items might have multiple paragraphs; only do this at the first one
-      _commands.isFirstChildOfParent, _selection.isInsideListItem], baseCommand.chainCommands(deletePreviousEmptyListItem, (0, _outdentList.outdentList)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.KEYBOARD, featureFlags))),
+      _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)([_commands.isEmptySelectionAtStart, _selection.canJoinToPreviousListItem], joinToPreviousListItem))(state, dispatch);
+      (0, _utils2.filterCommands)([_commands2.isEmptySelectionAtStart, _selection.canJoinToPreviousListItem], joinToPreviousListItem))(state, dispatch);
     };
   };
 };
@@ -112,7 +113,7 @@ 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);
@@ -129,7 +130,7 @@ var toggleList = function toggleList(editorAnalyticsAPI) {
 
         // 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 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;
@@ -168,7 +169,7 @@ var toggleList = function toggleList(editorAnalyticsAPI) {
       } 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, _utils.sanitiseMarksInSelection)(tr, listNodeType);
+        (0, _utils3.sanitiseMarksInSelection)(tr, listNodeType);
         (0, _wrapAndJoinLists.wrapInListAndJoin)(listNodeType, tr);
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
           action: _analytics.ACTION.INSERTED,
@@ -236,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());
       }
@@ -265,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;
   }
@@ -289,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;
   }
@@ -305,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)({
@@ -338,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

@@ -8,7 +8,7 @@ exports.joinListItemForward = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _commands = require("../../../utils/commands");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _joinListItemsForward = require("../actions/join-list-items-forward");
 var joinListItemForward = function joinListItemForward(editorAnalyticsAPI) {
   return function (state, dispatch) {
@@ -36,7 +36,7 @@ var joinListItemForward = function joinListItemForward(editorAnalyticsAPI) {
     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 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;

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

@@ -8,8 +8,8 @@ exports.listBackspace = exports.calcJoinListScenario = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _commands = require("../../../utils/commands");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _prosemirrorUtils = require("prosemirror-utils");
-var _utils = require("@atlaskit/editor-common/utils");
+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
@@ -263,7 +263,7 @@ var listBackspace = function listBackspace(editorAnalyticsAPI) {
     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 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;

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

@@ -12,7 +12,7 @@ var _node = require("../utils/node");
 var _find = require("../utils/find");
 var _analytics2 = require("../utils/analytics");
 var _outdentListItemsSelected = require("../actions/outdent-list-items-selected");
-var _prosemirrorHistory = require("prosemirror-history");
+var _history = require("@atlaskit/editor-prosemirror/history");
 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 outdentList = function outdentList(editorAnalyticsAPI) {
@@ -31,7 +31,7 @@ var outdentList = function outdentList(editorAnalyticsAPI) {
       }
 
       // Save the history, so it could undo/revert to the same state before the outdent, see https://product-fabric.atlassian.net/browse/ED-14753
-      (0, _prosemirrorHistory.closeHistory)(state.tr);
+      (0, _history.closeHistory)(state.tr);
       var actionSubjectId = (0, _node.isBulletList)(parentListNode.node) ? _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
       var customTr = state.tr;
       (0, _outdentListItemsSelected.outdentListItemsSelected)(customTr, state, featureFlags);

package/dist/cjs/plugins/list/pm-plugins/input-rules/wrapping-join-rule.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createWrappingJoinRule = void 0;
-var _prosemirrorTransform = require("prosemirror-transform");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var createWrappingJoinRule = function createWrappingJoinRule(_ref) {
@@ -21,7 +21,7 @@ var createWrappingJoinRule = function createWrappingJoinRule(_ref) {
     tr.delete(fixedStart, end);
     var $start = tr.doc.resolve(fixedStart);
     var range = $start.blockRange();
-    var wrapping = range && (0, _prosemirrorTransform.findWrapping)(range, nodeType, attrs);
+    var wrapping = range && (0, _transform.findWrapping)(range, nodeType, attrs);
     if (!wrapping || !range) {
       return null;
     }
@@ -38,17 +38,17 @@ var createWrappingJoinRule = function createWrappingJoinRule(_ref) {
       // that orderedList node is being added directly before another orderedList
       // node, then join those nodes
       var $end = tr.doc.resolve(tr.mapping.map(end));
-      var _node = (0, _prosemirrorUtils.findParentNodeOfTypeClosestToPos)($end, nodeType);
+      var _node = (0, _utils.findParentNodeOfTypeClosestToPos)($end, nodeType);
       if (_node) {
         var nodeEnd = _node.pos + _node.node.nodeSize;
         var after = tr.doc.resolve(nodeEnd).nodeAfter;
-        if (after && after.type === nodeType && (0, _prosemirrorTransform.canJoin)(tr.doc, nodeEnd) && (!joinPredicate || joinPredicate(match, after, _analytics.JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST.JOINED_TO_LIST_BELOW))) {
+        if (after && after.type === nodeType && (0, _transform.canJoin)(tr.doc, nodeEnd) && (!joinPredicate || joinPredicate(match, after, _analytics.JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST.JOINED_TO_LIST_BELOW))) {
           tr.join(nodeEnd);
         }
       }
     }
     var before = tr.doc.resolve(fixedStart - 1).nodeBefore;
-    if (before && before.type === nodeType && (0, _prosemirrorTransform.canJoin)(tr.doc, fixedStart - 1) && (!joinPredicate || joinPredicate(match, before, _analytics.JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST.JOINED_TO_LIST_ABOVE))) {
+    if (before && before.type === nodeType && (0, _transform.canJoin)(tr.doc, fixedStart - 1) && (!joinPredicate || joinPredicate(match, before, _analytics.JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST.JOINED_TO_LIST_ABOVE))) {
       tr.join(fixedStart - 1);
     }
     return tr;

package/dist/cjs/plugins/list/pm-plugins/keymap.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 exports.keymapPlugin = keymapPlugin;
-var _prosemirrorKeymap = require("prosemirror-keymap");
+var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var keymaps = _interopRequireWildcard(require("../../../keymaps"));
 var _commands = require("../commands");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -24,7 +24,7 @@ function keymapPlugin(featureFlags, editorAnalyticsAPI) {
 
   // This shortcut is Mac only
   keymaps.bindKeymapWithCommand(keymaps.findKeyMapForBrowser(keymaps.forwardDelete), (0, _commands.deleteKeyCommand)(editorAnalyticsAPI), list);
-  return (0, _prosemirrorKeymap.keymap)(list);
+  return (0, _keymap.keymap)(list);
 }
 var _default = keymapPlugin;
 exports.default = _default;

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

@@ -7,19 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.pluginKey = exports.getDecorations = exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorView = require("prosemirror-view");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _view = require("@atlaskit/editor-prosemirror/view");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _selection = require("../utils/selection");
 var _node = require("../utils/node");
 var _pluginStateFactory = require("../../../utils/plugin-state-factory");
-var _utils = require("../../../utils");
+var _utils2 = require("../../../utils");
 var _selection2 = require("@atlaskit/editor-common/selection");
 var _styles = require("@atlaskit/editor-common/styles");
-var _utils2 = require("@atlaskit/editor-common/utils");
+var _utils3 = require("@atlaskit/editor-common/utils");
 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 listPluginKey = new _prosemirrorState.PluginKey('listPlugin');
+var listPluginKey = new _state.PluginKey('listPlugin');
 var pluginKey = listPluginKey;
 exports.pluginKey = pluginKey;
 var initialState = {
@@ -27,7 +27,7 @@ var initialState = {
   bulletListDisabled: false,
   orderedListActive: false,
   orderedListDisabled: false,
-  decorationSet: _prosemirrorView.DecorationSet.empty
+  decorationSet: _view.DecorationSet.empty
 };
 var getDecorations = function getDecorations(doc, state, featureFlags) {
   var decorations = [];
@@ -56,32 +56,32 @@ var getDecorations = function getDecorations(doc, state, featureFlags) {
       var from = currentNodeStartPos;
       var to = currentNodeStartPos + node.nodeSize;
       var depth = processedListsStack.length;
-      decorations.push(_prosemirrorView.Decoration.node(from, to, {
+      decorations.push(_view.Decoration.node(from, to, {
         'data-indent-level': "".concat(depth)
       }));
       if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
         var _node$attrs;
         // If a numbered list has item counters numbering >= 100, we'll need to add special
         // spacing to account for the extra digit chars
-        var digitsSize = (0, _utils2.getItemCounterDigitsSize)({
+        var digitsSize = (0, _utils3.getItemCounterDigitsSize)({
           itemsCount: node === null || node === void 0 ? void 0 : node.childCount,
           order: node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.order
         });
         if (digitsSize) {
-          decorations.push(_prosemirrorView.Decoration.node(from, to, {
+          decorations.push(_view.Decoration.node(from, to, {
             style: (0, _styles.getOrderedListInlineStyles)(digitsSize, 'string')
           }));
         }
       } else {
         if (node.childCount >= 100) {
-          decorations.push(_prosemirrorView.Decoration.node(from, to, {
+          decorations.push(_view.Decoration.node(from, to, {
             'data-child-count': '100+'
           }));
         }
       }
     }
   });
-  return _prosemirrorView.DecorationSet.empty.add(doc, decorations);
+  return _view.DecorationSet.empty.add(doc, decorations);
 };
 exports.getDecorations = getDecorations;
 var handleDocChanged = function handleDocChanged(featureFlags) {
@@ -97,7 +97,7 @@ var handleSelectionChanged = function handleSelectionChanged(tr, pluginState) {
   var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
     bulletList = _tr$doc$type$schema$n.bulletList,
     orderedList = _tr$doc$type$schema$n.orderedList;
-  var listParent = (0, _prosemirrorUtils.findParentNodeOfType)([bulletList, orderedList])(tr.selection);
+  var listParent = (0, _utils.findParentNodeOfType)([bulletList, orderedList])(tr.selection);
   var bulletListActive = !!listParent && listParent.node.type === bulletList;
   var orderedListActive = !!listParent && listParent.node.type === orderedList;
   var bulletListDisabled = !(bulletListActive || orderedListActive || (0, _selection.isWrappingPossible)(bulletList, tr.selection));
@@ -156,7 +156,7 @@ var createPlugin = function createPlugin(eventDispatch, featureFlags) {
             if (isCodeBlockNextToListMarker) {
               // +1 needed to put cursor inside li
               // otherwise gap cursor markup will be injected as immediate child of ul resulting in invalid html
-              (0, _utils.setGapCursorSelection)(view, pos + 1, _selection2.Side.LEFT);
+              (0, _utils2.setGapCursorSelection)(view, pos + 1, _selection2.Side.LEFT);
               return true;
             }
           }