@atlaskit/editor-core 187.7.2 → 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

@@ -4,9 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.indentList = indentList;
+exports.indentList = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _analytics = require("../../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _indentation = require("../utils/indentation");
 var _indentListItemsSelected = require("../actions/indent-list-items-selected");
 var _node = require("../utils/node");
@@ -14,56 +14,59 @@ 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; }
-function indentList() {
-  var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics.INPUT_METHOD.KEYBOARD;
-  return function (state, dispatch) {
-    var tr = state.tr,
-      $from = state.selection.$from;
+var indentList = function indentList(editorAnalyticsAPI) {
+  return function () {
+    var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics.INPUT_METHOD.KEYBOARD;
+    return function (state, dispatch) {
+      var tr = state.tr,
+        $from = state.selection.$from;
 
-    // don't indent if selection is not inside a list
-    if (!(0, _selection.isInsideListItem)(state)) {
-      return false;
-    }
-
-    // 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);
-    var firstListItemSelectedAttributes = (0, _selection.getListItemAttributes)($from);
-    var parentListNode = (0, _find.findFirstParentListNode)($from);
-    if (!parentListNode || firstListItemSelectedAttributes && firstListItemSelectedAttributes.indentLevel === 0 && firstListItemSelectedAttributes.itemIndex === 0) {
-      if ((0, _selection.isInsideTableCell)(state)) {
-        // dont consume tab, as table-keymap should move cursor to next cell
+      // don't indent if selection is not inside a list
+      if (!(0, _selection.isInsideListItem)(state)) {
         return false;
-      } else {
+      }
+
+      // 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, _history.closeHistory)(tr);
+      var firstListItemSelectedAttributes = (0, _selection.getListItemAttributes)($from);
+      var parentListNode = (0, _find.findFirstParentListNode)($from);
+      if (!parentListNode || firstListItemSelectedAttributes && firstListItemSelectedAttributes.indentLevel === 0 && firstListItemSelectedAttributes.itemIndex === 0) {
+        if ((0, _selection.isInsideTableCell)(state)) {
+          // dont consume tab, as table-keymap should move cursor to next cell
+          return false;
+        } 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;
+        }
+      }
+      var currentListNode = parentListNode.node;
+      var actionSubjectId = (0, _node.isBulletList)(currentListNode) ? _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
+      (0, _indentListItemsSelected.indentListItemsSelected)(tr);
+      var maximimunNestedLevelReached = !(0, _indentation.hasValidListIndentationLevel)({
+        tr: tr,
+        maxIndentation: _types.MAX_NESTED_LIST_INDENTATION
+      });
+      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;
       }
-    }
-    var currentListNode = parentListNode.node;
-    var actionSubjectId = (0, _node.isBulletList)(currentListNode) ? _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
-    (0, _indentListItemsSelected.indentListItemsSelected)(tr);
-    var maximimunNestedLevelReached = !(0, _indentation.hasValidListIndentationLevel)({
-      tr: tr,
-      maxIndentation: _types.MAX_NESTED_LIST_INDENTATION
-    });
-    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
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+        action: _analytics.ACTION.INDENTED,
+        actionSubject: _analytics.ACTION_SUBJECT.LIST,
+        actionSubjectId: actionSubjectId,
+        eventType: _analytics.EVENT_TYPE.TRACK,
+        attributes: _objectSpread(_objectSpread({}, (0, _analytics2.getCommonListAnalyticsAttributes)(state)), {}, {
+          inputMethod: inputMethod
+        })
+      })(tr);
+      if (dispatch) {
+        dispatch(tr);
+      }
       return true;
-    }
-    (0, _analytics.addAnalytics)(state, tr, {
-      action: _analytics.ACTION.INDENTED,
-      actionSubject: _analytics.ACTION_SUBJECT.LIST,
-      actionSubjectId: actionSubjectId,
-      eventType: _analytics.EVENT_TYPE.TRACK,
-      attributes: _objectSpread(_objectSpread({}, (0, _analytics2.getCommonListAnalyticsAttributes)(state)), {}, {
-        inputMethod: inputMethod
-      })
-    });
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
+    };
   };
-}
+};
+exports.indentList = indentList;