@atlaskit/editor-plugin-list 10.0.12 → 10.1.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-list
 
+## 10.1.0
+
+### Minor Changes
+
+- [`65cb641586cc0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/65cb641586cc0) -
+  Refactor list indentation to use shared utilities from editor-common
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 10.0.12
 
 ### Patch Changes

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

@@ -4,13 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.moveSelectedListItems = moveSelectedListItems;
+var _lists = require("@atlaskit/editor-common/lists");
 var _types = require("../../types");
 var _find = require("../utils/find");
 var _listIndentation = require("../utils/list-indentation");
 /**
  * Moves the selected list items n levels up (negative delta) or down (positive delta).
  */
-function moveSelectedListItems(tr, delta) {
+function moveSelectedListItems(tr, indentDelta) {
   var originalSelection = tr.selection;
 
   // Find the root list so depth adjustments are absolute
@@ -30,36 +31,40 @@ function moveSelectedListItems(tr, delta) {
     rootListEnd: rootListEnd,
     selectionFrom: originalSelection.from,
     selectionTo: originalSelection.to,
-    delta: delta
+    indentDelta: indentDelta,
+    maxDepth: _types.MAX_NESTED_LIST_INDENTATION
   });
-  if (!result || result.maxDepth >= _types.MAX_NESTED_LIST_INDENTATION) {
+  if (!result) {
     return;
   }
-  var elements = result.elements,
+  var items = result.items,
     startIndex = result.startIndex,
     endIndex = result.endIndex;
 
   // Build replacement — handles both indent (all depths >= 0)
   // and outdent (some depths may be < 0, producing extracted paragraphs).
-  var _buildReplacementFrag = (0, _listIndentation.buildReplacementFragment)(elements, tr.doc.type.schema),
+  var _buildReplacementFrag = (0, _listIndentation.buildReplacementFragment)(items, tr.doc.type.schema),
     fragment = _buildReplacementFrag.fragment,
     contentStartOffsets = _buildReplacementFrag.contentStartOffsets;
   if (fragment.size === 0) {
     return;
   }
   tr.replaceWith(rootListStart, rootListEnd, fragment);
-  var fromContentStart = elements[startIndex].pos + 1;
-  var toContentStart = elements[endIndex].pos + 1;
-  var fromOffset = originalSelection.from - fromContentStart;
-  var toOffset = originalSelection.to - toContentStart;
-  var clamp = function clamp(pos) {
-    return Math.min(Math.max(0, pos), tr.doc.content.size);
-  };
-  var from = clamp(rootListStart + contentStartOffsets[startIndex] + fromOffset);
-  var to = clamp(rootListStart + contentStartOffsets[endIndex] + toOffset);
+  var _computeSelectionOffs = (0, _lists.computeSelectionOffsets)({
+      items: items,
+      startIndex: startIndex,
+      endIndex: endIndex,
+      originalFrom: originalSelection.from,
+      originalTo: originalSelection.to,
+      contentStartOffsets: contentStartOffsets,
+      rootListStart: rootListStart,
+      docSize: tr.doc.content.size
+    }),
+    from = _computeSelectionOffs.from,
+    to = _computeSelectionOffs.to;
 
   // Restore selection using the positional offsets from the rebuild.
-  (0, _listIndentation.restoreSelection)({
+  (0, _lists.restoreSelection)({
     tr: tr,
     originalSelection: originalSelection,
     from: from,

package/dist/cjs/pm-plugins/utils/list-indentation.js

@@ -5,20 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.buildReplacementFragment = buildReplacementFragment;
 exports.flattenList = flattenList;
-exports.restoreSelection = restoreSelection;
-var _selection = require("@atlaskit/editor-common/selection");
+var _lists = require("@atlaskit/editor-common/lists");
 var _utils = require("@atlaskit/editor-common/utils");
-var _model = require("@atlaskit/editor-prosemirror/model");
-var _state = require("@atlaskit/editor-prosemirror/state");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-/**
- * A single content-bearing list element extracted from the PM tree.
- * Wrapper `listItem` nodes (those with no non-list children) are discarded;
- * only items the user can actually see and select are represented.
- */
-
 /**
  * Returns true if a listItem has at least one non-list child (paragraph, etc.).
  */
@@ -37,62 +28,31 @@ function contentSize(listItem) {
     return size + ((0, _utils.isListNode)(child) ? 0 : child.nodeSize);
   }, 0);
 }
+
 /**
- * Flatten a root list into a flat array of content-bearing `ListElement`
- * objects and simultaneously determine which elements intersect the user's
- * selection.
+ * Flatten a root list into a flat array of content-bearing items
+ * and simultaneously determine which elements intersect the user's selection.
+ *
+ * Delegates to the shared `flattenListLike` with list-specific callbacks.
  * Selection intersection is checked against each item's content-only
  * span (excluding nested lists).
  */
-function flattenList(_ref) {
-  var doc = _ref.doc,
-    rootListStart = _ref.rootListStart,
-    rootListEnd = _ref.rootListEnd,
-    selectionFrom = _ref.selectionFrom,
-    selectionTo = _ref.selectionTo,
-    delta = _ref.delta;
-  var elements = [];
-  var startIndex = -1;
-  var endIndex = -1;
-  var maxDepth = 0;
-  var rootDepth = doc.resolve(rootListStart).depth;
-  doc.nodesBetween(rootListStart, rootListEnd, function (node, pos, parent) {
-    if (!(0, _utils.isListItemNode)(node) || !hasContentChildren(node) || !(0, _utils.isListNode)(parent)) {
-      return true;
-    }
-
-    // Check selection intersection using content-only bounds
-    var cStart = pos + 1;
-    var cEnd = cStart + contentSize(node);
-    var isSelected = cStart < selectionTo && cEnd > selectionFrom;
-    var depth = (doc.resolve(pos).depth - rootDepth - 1) / 2 + (isSelected ? delta : 0);
-    elements.push({
-      node: node,
-      pos: pos,
-      depth: depth,
-      listType: parent.type.name,
-      parentListAttrs: parent.attrs,
-      isSelected: isSelected
-    });
-    if (isSelected) {
-      var index = elements.length - 1;
-      if (startIndex === -1) {
-        startIndex = index;
-      }
-      endIndex = index;
-      maxDepth = Math.max(maxDepth, depth);
+function flattenList(options) {
+  return (0, _lists.flattenList)(options, {
+    isContentNode: function isContentNode(node, parent) {
+      return (0, _utils.isListItemNode)(node) && hasContentChildren(node) && (0, _utils.isListNode)(parent);
+    },
+    // +1 shifts from the listItem node boundary to the start of its content children
+    getSelectionBounds: function getSelectionBounds(node, pos) {
+      return {
+        start: pos + 1,
+        end: pos + 1 + contentSize(node)
+      };
+    },
+    getDepth: function getDepth(resolvedDepth, rootDepth) {
+      return (resolvedDepth - rootDepth - 1) / 2;
     }
-    return true;
   });
-  if (elements.length === 0 || startIndex === -1) {
-    return null;
-  }
-  return {
-    elements: elements,
-    startIndex: startIndex,
-    endIndex: endIndex,
-    maxDepth: maxDepth
-  };
 }
 
 /**
@@ -110,7 +70,7 @@ function extractContentChildren(listItem) {
 }
 
 /**
- * Rebuild a ProseMirror list tree from a flat array of `ListElement` objects
+ * Rebuild a ProseMirror list tree from a flat array of `FlattenedItem` objects
  * using a bottom-up stack approach.
  *
  * The algorithm tracks open list/listItem wrappers on a stack. As depth
@@ -207,106 +167,43 @@ function rebuildPMList(elements, schema) {
   }
   closeToDepth(0);
   var root = stack[0];
-  return schema.nodes[root.listType].create(root.listAttrs, root.items);
-}
-/**
- * Build a replacement Fragment from a flat array of `ListElement` objects.
- *
- * Elements with depth >= 0 are grouped into consecutive list segments
- * and rebuilt via `rebuildPMList`. Elements with depth < 0 (extracted
- * past the root) are converted to their content children (paragraphs).
- * The result interleaves list nodes and extracted content in document order.
- */
-function buildReplacementFragment(elements, schema) {
-  var fragment = _model.Fragment.empty;
-  var pendingListSegment = [];
-  var pendingStartIdx = 0;
+  var rebuilt = schema.nodes[root.listType].create(root.listAttrs, root.items);
+
+  // Compute content start offsets by walking the rebuilt tree.
   var contentStartOffsets = new Array(elements.length);
-  var flushListSegment = function flushListSegment() {
-    if (pendingListSegment.length > 0) {
-      var fragmentOffset = fragment.size;
-      var rebuilt = rebuildPMList(pendingListSegment, schema);
-      if (rebuilt) {
-        // Walk the rebuilt tree to find content-bearing listItem positions.
-        // descendants() visits in document order matching the element order.
-        var segIdx = 0;
-        rebuilt.descendants(function (node, pos) {
-          if ((0, _utils.isListItemNode)(node) && hasContentChildren(node)) {
-            // pos is relative to rebuilt's content start;
-            // +1 for rebuilt's opening tag, +1 for listItem's opening tag
-            contentStartOffsets[pendingStartIdx + segIdx] = fragmentOffset + 1 + pos + 1;
-            segIdx++;
-          }
-          return true;
-        });
-        fragment = fragment.addToEnd(rebuilt);
-      }
-      pendingListSegment = [];
+  var segIdx = 0;
+  rebuilt.descendants(function (node, pos) {
+    if ((0, _utils.isListItemNode)(node) && hasContentChildren(node)) {
+      // +1 for rebuilt's opening tag, +1 for listItem's opening tag
+      contentStartOffsets[segIdx] = 1 + pos + 1;
+      segIdx++;
     }
-  };
-  var elIdx = 0;
-  var _iterator2 = _createForOfIteratorHelper(elements),
-    _step2;
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var el = _step2.value;
-      if (el.depth < 0) {
-        flushListSegment();
-        // Extracted element — content children become top-level nodes.
-        // Record offset of first content child.
-        contentStartOffsets[elIdx] = fragment.size;
-        var _iterator3 = _createForOfIteratorHelper(extractContentChildren(el.node)),
-          _step3;
-        try {
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            var node = _step3.value;
-            fragment = fragment.addToEnd(node);
-          }
-        } catch (err) {
-          _iterator3.e(err);
-        } finally {
-          _iterator3.f();
-        }
-      } else {
-        if (pendingListSegment.length === 0) {
-          pendingStartIdx = elIdx;
-        }
-        pendingListSegment.push(el);
-      }
-      elIdx++;
-    }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
-  }
-  flushListSegment();
+    return true;
+  });
   return {
-    fragment: fragment,
+    node: rebuilt,
     contentStartOffsets: contentStartOffsets
   };
 }
+
 /**
- * Restore the transaction's selection after a list structural change.
+ * Build a replacement Fragment from a flat array of `FlattenedItem` objects.
  *
- * Uses the content start offsets computed during fragment rebuild to
- * map each selection endpoint to its new absolute position.
+ * Elements with depth >= 0 are grouped into consecutive list segments
+ * and rebuilt via `rebuildPMList`. Elements with depth < 0 (extracted
+ * past the root) are converted to their content children (paragraphs).
+ * The result interleaves list nodes and extracted content in document order.
+ *
+ * Delegates to the shared `buildReplacementFragment` with list-specific
+ * rebuild and extraction functions.
  */
-function restoreSelection(_ref2) {
-  var tr = _ref2.tr,
-    originalSelection = _ref2.originalSelection,
-    from = _ref2.from,
-    to = _ref2.to;
-  var maxPos = tr.doc.content.size;
-  if (originalSelection instanceof _state.NodeSelection) {
-    try {
-      tr.setSelection(_state.NodeSelection.create(tr.doc, Math.min(from, maxPos - 1)));
-    } catch (_unused) {
-      tr.setSelection(_state.Selection.near(tr.doc.resolve(from)));
+function buildReplacementFragment(elements, schema) {
+  return (0, _lists.buildReplacementFragment)({
+    items: elements,
+    schema: schema,
+    rebuildFn: rebuildPMList,
+    extractContentFn: function extractContentFn(item) {
+      return extractContentChildren(item.node);
     }
-  } else if (originalSelection instanceof _selection.GapCursorSelection) {
-    tr.setSelection(new _selection.GapCursorSelection(tr.doc.resolve(from), originalSelection.side));
-  } else {
-    tr.setSelection(_state.TextSelection.create(tr.doc, from, to));
-  }
+  });
 }

package/dist/es2019/pm-plugins/actions/move-selected-list-items.js

@@ -1,11 +1,12 @@
+import { restoreSelection, computeSelectionOffsets } from '@atlaskit/editor-common/lists';
 import { MAX_NESTED_LIST_INDENTATION } from '../../types';
 import { findFirstParentListNode, findRootParentListNode } from '../utils/find';
-import { buildReplacementFragment, flattenList, restoreSelection } from '../utils/list-indentation';
+import { buildReplacementFragment, flattenList } from '../utils/list-indentation';
 
 /**
  * Moves the selected list items n levels up (negative delta) or down (positive delta).
  */
-export function moveSelectedListItems(tr, delta) {
+export function moveSelectedListItems(tr, indentDelta) {
   const originalSelection = tr.selection;
 
   // Find the root list so depth adjustments are absolute
@@ -25,13 +26,14 @@ export function moveSelectedListItems(tr, delta) {
     rootListEnd,
     selectionFrom: originalSelection.from,
     selectionTo: originalSelection.to,
-    delta
+    indentDelta,
+    maxDepth: MAX_NESTED_LIST_INDENTATION
   });
-  if (!result || result.maxDepth >= MAX_NESTED_LIST_INDENTATION) {
+  if (!result) {
     return;
   }
   const {
-    elements,
+    items,
     startIndex,
     endIndex
   } = result;
@@ -41,18 +43,24 @@ export function moveSelectedListItems(tr, delta) {
   const {
     fragment,
     contentStartOffsets
-  } = buildReplacementFragment(elements, tr.doc.type.schema);
+  } = buildReplacementFragment(items, tr.doc.type.schema);
   if (fragment.size === 0) {
     return;
   }
   tr.replaceWith(rootListStart, rootListEnd, fragment);
-  const fromContentStart = elements[startIndex].pos + 1;
-  const toContentStart = elements[endIndex].pos + 1;
-  const fromOffset = originalSelection.from - fromContentStart;
-  const toOffset = originalSelection.to - toContentStart;
-  const clamp = pos => Math.min(Math.max(0, pos), tr.doc.content.size);
-  const from = clamp(rootListStart + contentStartOffsets[startIndex] + fromOffset);
-  const to = clamp(rootListStart + contentStartOffsets[endIndex] + toOffset);
+  const {
+    from,
+    to
+  } = computeSelectionOffsets({
+    items,
+    startIndex,
+    endIndex,
+    originalFrom: originalSelection.from,
+    originalTo: originalSelection.to,
+    contentStartOffsets,
+    rootListStart,
+    docSize: tr.doc.content.size
+  });
 
   // Restore selection using the positional offsets from the rebuild.
   restoreSelection({

package/dist/es2019/pm-plugins/utils/list-indentation.js

@@ -1,14 +1,5 @@
-import { GapCursorSelection } from '@atlaskit/editor-common/selection';
+import { buildReplacementFragment as buildReplacementFragmentBase, flattenList as flattenListBase } from '@atlaskit/editor-common/lists';
 import { isListItemNode, isListNode } from '@atlaskit/editor-common/utils';
-import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-
-/**
- * A single content-bearing list element extracted from the PM tree.
- * Wrapper `listItem` nodes (those with no non-list children) are discarded;
- * only items the user can actually see and select are represented.
- */
-
 /**
  * Returns true if a listItem has at least one non-list child (paragraph, etc.).
  */
@@ -25,63 +16,25 @@ function contentSize(listItem) {
     return size + (isListNode(child) ? 0 : child.nodeSize);
   }, 0);
 }
+
 /**
- * Flatten a root list into a flat array of content-bearing `ListElement`
- * objects and simultaneously determine which elements intersect the user's
- * selection.
+ * Flatten a root list into a flat array of content-bearing items
+ * and simultaneously determine which elements intersect the user's selection.
+ *
+ * Delegates to the shared `flattenListLike` with list-specific callbacks.
  * Selection intersection is checked against each item's content-only
  * span (excluding nested lists).
  */
-export function flattenList({
-  doc,
-  rootListStart,
-  rootListEnd,
-  selectionFrom,
-  selectionTo,
-  delta
-}) {
-  const elements = [];
-  let startIndex = -1;
-  let endIndex = -1;
-  let maxDepth = 0;
-  const rootDepth = doc.resolve(rootListStart).depth;
-  doc.nodesBetween(rootListStart, rootListEnd, (node, pos, parent) => {
-    if (!isListItemNode(node) || !hasContentChildren(node) || !isListNode(parent)) {
-      return true;
-    }
-
-    // Check selection intersection using content-only bounds
-    const cStart = pos + 1;
-    const cEnd = cStart + contentSize(node);
-    const isSelected = cStart < selectionTo && cEnd > selectionFrom;
-    const depth = (doc.resolve(pos).depth - rootDepth - 1) / 2 + (isSelected ? delta : 0);
-    elements.push({
-      node,
-      pos,
-      depth,
-      listType: parent.type.name,
-      parentListAttrs: parent.attrs,
-      isSelected
-    });
-    if (isSelected) {
-      const index = elements.length - 1;
-      if (startIndex === -1) {
-        startIndex = index;
-      }
-      endIndex = index;
-      maxDepth = Math.max(maxDepth, depth);
-    }
-    return true;
+export function flattenList(options) {
+  return flattenListBase(options, {
+    isContentNode: (node, parent) => isListItemNode(node) && hasContentChildren(node) && isListNode(parent),
+    // +1 shifts from the listItem node boundary to the start of its content children
+    getSelectionBounds: (node, pos) => ({
+      start: pos + 1,
+      end: pos + 1 + contentSize(node)
+    }),
+    getDepth: (resolvedDepth, rootDepth) => (resolvedDepth - rootDepth - 1) / 2
   });
-  if (elements.length === 0 || startIndex === -1) {
-    return null;
-  }
-  return {
-    elements,
-    startIndex,
-    endIndex,
-    maxDepth
-  };
 }
 
 /**
@@ -99,7 +52,7 @@ function extractContentChildren(listItem) {
 }
 
 /**
- * Rebuild a ProseMirror list tree from a flat array of `ListElement` objects
+ * Rebuild a ProseMirror list tree from a flat array of `FlattenedItem` objects
  * using a bottom-up stack approach.
  *
  * The algorithm tracks open list/listItem wrappers on a stack. As depth
@@ -182,89 +135,41 @@ function rebuildPMList(elements, schema) {
   // Close all remaining open lists
   closeToDepth(0);
   const root = stack[0];
-  return schema.nodes[root.listType].create(root.listAttrs, root.items);
-}
-/**
- * Build a replacement Fragment from a flat array of `ListElement` objects.
- *
- * Elements with depth >= 0 are grouped into consecutive list segments
- * and rebuilt via `rebuildPMList`. Elements with depth < 0 (extracted
- * past the root) are converted to their content children (paragraphs).
- * The result interleaves list nodes and extracted content in document order.
- */
-export function buildReplacementFragment(elements, schema) {
-  let fragment = Fragment.empty;
-  let pendingListSegment = [];
-  let pendingStartIdx = 0;
+  const rebuilt = schema.nodes[root.listType].create(root.listAttrs, root.items);
+
+  // Compute content start offsets by walking the rebuilt tree.
   const contentStartOffsets = new Array(elements.length);
-  const flushListSegment = () => {
-    if (pendingListSegment.length > 0) {
-      const fragmentOffset = fragment.size;
-      const rebuilt = rebuildPMList(pendingListSegment, schema);
-      if (rebuilt) {
-        // Walk the rebuilt tree to find content-bearing listItem positions.
-        // descendants() visits in document order matching the element order.
-        let segIdx = 0;
-        rebuilt.descendants((node, pos) => {
-          if (isListItemNode(node) && hasContentChildren(node)) {
-            // pos is relative to rebuilt's content start;
-            // +1 for rebuilt's opening tag, +1 for listItem's opening tag
-            contentStartOffsets[pendingStartIdx + segIdx] = fragmentOffset + 1 + pos + 1;
-            segIdx++;
-          }
-          return true;
-        });
-        fragment = fragment.addToEnd(rebuilt);
-      }
-      pendingListSegment = [];
+  let segIdx = 0;
+  rebuilt.descendants((node, pos) => {
+    if (isListItemNode(node) && hasContentChildren(node)) {
+      // +1 for rebuilt's opening tag, +1 for listItem's opening tag
+      contentStartOffsets[segIdx] = 1 + pos + 1;
+      segIdx++;
     }
-  };
-  let elIdx = 0;
-  for (const el of elements) {
-    if (el.depth < 0) {
-      flushListSegment();
-      // Extracted element — content children become top-level nodes.
-      // Record offset of first content child.
-      contentStartOffsets[elIdx] = fragment.size;
-      for (const node of extractContentChildren(el.node)) {
-        fragment = fragment.addToEnd(node);
-      }
-    } else {
-      if (pendingListSegment.length === 0) {
-        pendingStartIdx = elIdx;
-      }
-      pendingListSegment.push(el);
-    }
-    elIdx++;
-  }
-  flushListSegment();
+    return true;
+  });
   return {
-    fragment,
+    node: rebuilt,
     contentStartOffsets
   };
 }
+
 /**
- * Restore the transaction's selection after a list structural change.
+ * Build a replacement Fragment from a flat array of `FlattenedItem` objects.
  *
- * Uses the content start offsets computed during fragment rebuild to
- * map each selection endpoint to its new absolute position.
+ * Elements with depth >= 0 are grouped into consecutive list segments
+ * and rebuilt via `rebuildPMList`. Elements with depth < 0 (extracted
+ * past the root) are converted to their content children (paragraphs).
+ * The result interleaves list nodes and extracted content in document order.
+ *
+ * Delegates to the shared `buildReplacementFragment` with list-specific
+ * rebuild and extraction functions.
  */
-export function restoreSelection({
-  tr,
-  originalSelection,
-  from,
-  to
-}) {
-  const maxPos = tr.doc.content.size;
-  if (originalSelection instanceof NodeSelection) {
-    try {
-      tr.setSelection(NodeSelection.create(tr.doc, Math.min(from, maxPos - 1)));
-    } catch {
-      tr.setSelection(Selection.near(tr.doc.resolve(from)));
-    }
-  } else if (originalSelection instanceof GapCursorSelection) {
-    tr.setSelection(new GapCursorSelection(tr.doc.resolve(from), originalSelection.side));
-  } else {
-    tr.setSelection(TextSelection.create(tr.doc, from, to));
-  }
+export function buildReplacementFragment(elements, schema) {
+  return buildReplacementFragmentBase({
+    items: elements,
+    schema,
+    rebuildFn: rebuildPMList,
+    extractContentFn: item => extractContentChildren(item.node)
+  });
 }

package/dist/esm/pm-plugins/actions/move-selected-list-items.js

@@ -1,11 +1,12 @@
+import { restoreSelection, computeSelectionOffsets } from '@atlaskit/editor-common/lists';
 import { MAX_NESTED_LIST_INDENTATION } from '../../types';
 import { findFirstParentListNode, findRootParentListNode } from '../utils/find';
-import { buildReplacementFragment, flattenList, restoreSelection } from '../utils/list-indentation';
+import { buildReplacementFragment, flattenList } from '../utils/list-indentation';
 
 /**
  * Moves the selected list items n levels up (negative delta) or down (positive delta).
  */
-export function moveSelectedListItems(tr, delta) {
+export function moveSelectedListItems(tr, indentDelta) {
   var originalSelection = tr.selection;
 
   // Find the root list so depth adjustments are absolute
@@ -25,33 +26,37 @@ export function moveSelectedListItems(tr, delta) {
     rootListEnd: rootListEnd,
     selectionFrom: originalSelection.from,
     selectionTo: originalSelection.to,
-    delta: delta
+    indentDelta: indentDelta,
+    maxDepth: MAX_NESTED_LIST_INDENTATION
   });
-  if (!result || result.maxDepth >= MAX_NESTED_LIST_INDENTATION) {
+  if (!result) {
     return;
   }
-  var elements = result.elements,
+  var items = result.items,
     startIndex = result.startIndex,
     endIndex = result.endIndex;
 
   // Build replacement — handles both indent (all depths >= 0)
   // and outdent (some depths may be < 0, producing extracted paragraphs).
-  var _buildReplacementFrag = buildReplacementFragment(elements, tr.doc.type.schema),
+  var _buildReplacementFrag = buildReplacementFragment(items, tr.doc.type.schema),
     fragment = _buildReplacementFrag.fragment,
     contentStartOffsets = _buildReplacementFrag.contentStartOffsets;
   if (fragment.size === 0) {
     return;
   }
   tr.replaceWith(rootListStart, rootListEnd, fragment);
-  var fromContentStart = elements[startIndex].pos + 1;
-  var toContentStart = elements[endIndex].pos + 1;
-  var fromOffset = originalSelection.from - fromContentStart;
-  var toOffset = originalSelection.to - toContentStart;
-  var clamp = function clamp(pos) {
-    return Math.min(Math.max(0, pos), tr.doc.content.size);
-  };
-  var from = clamp(rootListStart + contentStartOffsets[startIndex] + fromOffset);
-  var to = clamp(rootListStart + contentStartOffsets[endIndex] + toOffset);
+  var _computeSelectionOffs = computeSelectionOffsets({
+      items: items,
+      startIndex: startIndex,
+      endIndex: endIndex,
+      originalFrom: originalSelection.from,
+      originalTo: originalSelection.to,
+      contentStartOffsets: contentStartOffsets,
+      rootListStart: rootListStart,
+      docSize: tr.doc.content.size
+    }),
+    from = _computeSelectionOffs.from,
+    to = _computeSelectionOffs.to;
 
   // Restore selection using the positional offsets from the rebuild.
   restoreSelection({

package/dist/esm/pm-plugins/utils/list-indentation.js

@@ -1,17 +1,8 @@
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-import { GapCursorSelection } from '@atlaskit/editor-common/selection';
+import { buildReplacementFragment as buildReplacementFragmentBase, flattenList as flattenListBase } from '@atlaskit/editor-common/lists';
 import { isListItemNode, isListNode } from '@atlaskit/editor-common/utils';
-import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-
-/**
- * A single content-bearing list element extracted from the PM tree.
- * Wrapper `listItem` nodes (those with no non-list children) are discarded;
- * only items the user can actually see and select are represented.
- */
-
 /**
  * Returns true if a listItem has at least one non-list child (paragraph, etc.).
  */
@@ -30,62 +21,31 @@ function contentSize(listItem) {
     return size + (isListNode(child) ? 0 : child.nodeSize);
   }, 0);
 }
+
 /**
- * Flatten a root list into a flat array of content-bearing `ListElement`
- * objects and simultaneously determine which elements intersect the user's
- * selection.
+ * Flatten a root list into a flat array of content-bearing items
+ * and simultaneously determine which elements intersect the user's selection.
+ *
+ * Delegates to the shared `flattenListLike` with list-specific callbacks.
  * Selection intersection is checked against each item's content-only
  * span (excluding nested lists).
  */
-export function flattenList(_ref) {
-  var doc = _ref.doc,
-    rootListStart = _ref.rootListStart,
-    rootListEnd = _ref.rootListEnd,
-    selectionFrom = _ref.selectionFrom,
-    selectionTo = _ref.selectionTo,
-    delta = _ref.delta;
-  var elements = [];
-  var startIndex = -1;
-  var endIndex = -1;
-  var maxDepth = 0;
-  var rootDepth = doc.resolve(rootListStart).depth;
-  doc.nodesBetween(rootListStart, rootListEnd, function (node, pos, parent) {
-    if (!isListItemNode(node) || !hasContentChildren(node) || !isListNode(parent)) {
-      return true;
+export function flattenList(options) {
+  return flattenListBase(options, {
+    isContentNode: function isContentNode(node, parent) {
+      return isListItemNode(node) && hasContentChildren(node) && isListNode(parent);
+    },
+    // +1 shifts from the listItem node boundary to the start of its content children
+    getSelectionBounds: function getSelectionBounds(node, pos) {
+      return {
+        start: pos + 1,
+        end: pos + 1 + contentSize(node)
+      };
+    },
+    getDepth: function getDepth(resolvedDepth, rootDepth) {
+      return (resolvedDepth - rootDepth - 1) / 2;
     }
-
-    // Check selection intersection using content-only bounds
-    var cStart = pos + 1;
-    var cEnd = cStart + contentSize(node);
-    var isSelected = cStart < selectionTo && cEnd > selectionFrom;
-    var depth = (doc.resolve(pos).depth - rootDepth - 1) / 2 + (isSelected ? delta : 0);
-    elements.push({
-      node: node,
-      pos: pos,
-      depth: depth,
-      listType: parent.type.name,
-      parentListAttrs: parent.attrs,
-      isSelected: isSelected
-    });
-    if (isSelected) {
-      var index = elements.length - 1;
-      if (startIndex === -1) {
-        startIndex = index;
-      }
-      endIndex = index;
-      maxDepth = Math.max(maxDepth, depth);
-    }
-    return true;
   });
-  if (elements.length === 0 || startIndex === -1) {
-    return null;
-  }
-  return {
-    elements: elements,
-    startIndex: startIndex,
-    endIndex: endIndex,
-    maxDepth: maxDepth
-  };
 }
 
 /**
@@ -103,7 +63,7 @@ function extractContentChildren(listItem) {
 }
 
 /**
- * Rebuild a ProseMirror list tree from a flat array of `ListElement` objects
+ * Rebuild a ProseMirror list tree from a flat array of `FlattenedItem` objects
  * using a bottom-up stack approach.
  *
  * The algorithm tracks open list/listItem wrappers on a stack. As depth
@@ -200,106 +160,43 @@ function rebuildPMList(elements, schema) {
   }
   closeToDepth(0);
   var root = stack[0];
-  return schema.nodes[root.listType].create(root.listAttrs, root.items);
-}
-/**
- * Build a replacement Fragment from a flat array of `ListElement` objects.
- *
- * Elements with depth >= 0 are grouped into consecutive list segments
- * and rebuilt via `rebuildPMList`. Elements with depth < 0 (extracted
- * past the root) are converted to their content children (paragraphs).
- * The result interleaves list nodes and extracted content in document order.
- */
-export function buildReplacementFragment(elements, schema) {
-  var fragment = Fragment.empty;
-  var pendingListSegment = [];
-  var pendingStartIdx = 0;
+  var rebuilt = schema.nodes[root.listType].create(root.listAttrs, root.items);
+
+  // Compute content start offsets by walking the rebuilt tree.
   var contentStartOffsets = new Array(elements.length);
-  var flushListSegment = function flushListSegment() {
-    if (pendingListSegment.length > 0) {
-      var fragmentOffset = fragment.size;
-      var rebuilt = rebuildPMList(pendingListSegment, schema);
-      if (rebuilt) {
-        // Walk the rebuilt tree to find content-bearing listItem positions.
-        // descendants() visits in document order matching the element order.
-        var segIdx = 0;
-        rebuilt.descendants(function (node, pos) {
-          if (isListItemNode(node) && hasContentChildren(node)) {
-            // pos is relative to rebuilt's content start;
-            // +1 for rebuilt's opening tag, +1 for listItem's opening tag
-            contentStartOffsets[pendingStartIdx + segIdx] = fragmentOffset + 1 + pos + 1;
-            segIdx++;
-          }
-          return true;
-        });
-        fragment = fragment.addToEnd(rebuilt);
-      }
-      pendingListSegment = [];
-    }
-  };
-  var elIdx = 0;
-  var _iterator2 = _createForOfIteratorHelper(elements),
-    _step2;
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var el = _step2.value;
-      if (el.depth < 0) {
-        flushListSegment();
-        // Extracted element — content children become top-level nodes.
-        // Record offset of first content child.
-        contentStartOffsets[elIdx] = fragment.size;
-        var _iterator3 = _createForOfIteratorHelper(extractContentChildren(el.node)),
-          _step3;
-        try {
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            var node = _step3.value;
-            fragment = fragment.addToEnd(node);
-          }
-        } catch (err) {
-          _iterator3.e(err);
-        } finally {
-          _iterator3.f();
-        }
-      } else {
-        if (pendingListSegment.length === 0) {
-          pendingStartIdx = elIdx;
-        }
-        pendingListSegment.push(el);
-      }
-      elIdx++;
+  var segIdx = 0;
+  rebuilt.descendants(function (node, pos) {
+    if (isListItemNode(node) && hasContentChildren(node)) {
+      // +1 for rebuilt's opening tag, +1 for listItem's opening tag
+      contentStartOffsets[segIdx] = 1 + pos + 1;
+      segIdx++;
     }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
-  }
-  flushListSegment();
+    return true;
+  });
   return {
-    fragment: fragment,
+    node: rebuilt,
     contentStartOffsets: contentStartOffsets
   };
 }
+
 /**
- * Restore the transaction's selection after a list structural change.
+ * Build a replacement Fragment from a flat array of `FlattenedItem` objects.
  *
- * Uses the content start offsets computed during fragment rebuild to
- * map each selection endpoint to its new absolute position.
+ * Elements with depth >= 0 are grouped into consecutive list segments
+ * and rebuilt via `rebuildPMList`. Elements with depth < 0 (extracted
+ * past the root) are converted to their content children (paragraphs).
+ * The result interleaves list nodes and extracted content in document order.
+ *
+ * Delegates to the shared `buildReplacementFragment` with list-specific
+ * rebuild and extraction functions.
  */
-export function restoreSelection(_ref2) {
-  var tr = _ref2.tr,
-    originalSelection = _ref2.originalSelection,
-    from = _ref2.from,
-    to = _ref2.to;
-  var maxPos = tr.doc.content.size;
-  if (originalSelection instanceof NodeSelection) {
-    try {
-      tr.setSelection(NodeSelection.create(tr.doc, Math.min(from, maxPos - 1)));
-    } catch (_unused) {
-      tr.setSelection(Selection.near(tr.doc.resolve(from)));
+export function buildReplacementFragment(elements, schema) {
+  return buildReplacementFragmentBase({
+    items: elements,
+    schema: schema,
+    rebuildFn: rebuildPMList,
+    extractContentFn: function extractContentFn(item) {
+      return extractContentChildren(item.node);
     }
-  } else if (originalSelection instanceof GapCursorSelection) {
-    tr.setSelection(new GapCursorSelection(tr.doc.resolve(from), originalSelection.side));
-  } else {
-    tr.setSelection(TextSelection.create(tr.doc, from, to));
-  }
+  });
 }

package/dist/types/pm-plugins/actions/move-selected-list-items.d.ts

@@ -2,4 +2,4 @@ import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 /**
  * Moves the selected list items n levels up (negative delta) or down (positive delta).
  */
-export declare function moveSelectedListItems(tr: Transaction, delta: number): void;
+export declare function moveSelectedListItems(tr: Transaction, indentDelta: number): void;

package/dist/types/pm-plugins/utils/list-indentation.d.ts

@@ -1,76 +1,23 @@
-import type { Attrs, Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
-import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { type BuildResult, type FlattenedItem, type FlattenListOptions, type FlattenListResult } from '@atlaskit/editor-common/lists';
+import type { Schema } from '@atlaskit/editor-prosemirror/model';
 /**
- * A single content-bearing list element extracted from the PM tree.
- * Wrapper `listItem` nodes (those with no non-list children) are discarded;
- * only items the user can actually see and select are represented.
- */
-export interface ListElement {
-    depth: number;
-    /** Whether this element was within the user's selection (and had its depth adjusted). */
-    isSelected: boolean;
-    listType: 'bulletList' | 'orderedList';
-    node: PMNode;
-    /** Attributes of the immediate parent list node (bulletList/orderedList). */
-    parentListAttrs: Attrs | null;
-    pos: number;
-}
-export interface FlattenListResult {
-    elements: ListElement[];
-    endIndex: number;
-    maxDepth: number;
-    startIndex: number;
-}
-export interface FlattenListOptions {
-    delta: number;
-    doc: PMNode;
-    rootListEnd: number;
-    rootListStart: number;
-    selectionFrom: number;
-    selectionTo: number;
-}
-/**
- * Flatten a root list into a flat array of content-bearing `ListElement`
- * objects and simultaneously determine which elements intersect the user's
- * selection.
+ * Flatten a root list into a flat array of content-bearing items
+ * and simultaneously determine which elements intersect the user's selection.
+ *
+ * Delegates to the shared `flattenListLike` with list-specific callbacks.
  * Selection intersection is checked against each item's content-only
  * span (excluding nested lists).
  */
-export declare function flattenList({ doc, rootListStart, rootListEnd, selectionFrom, selectionTo, delta, }: FlattenListOptions): FlattenListResult | null;
-export interface BuildResult {
-    /**
-     * For each element (by index), the offset within the fragment where the
-     * element's content begins. For list elements this is the position just
-     * inside the listItem (pos + 1); for extracted elements it is the position
-     * of the first extracted content child.
-     *
-     * To get the absolute document position after `tr.replaceWith(rangeStart, …)`,
-     * add `rangeStart` to the offset.
-     */
-    contentStartOffsets: number[];
-    fragment: Fragment;
-}
+export declare function flattenList(options: FlattenListOptions): FlattenListResult | null;
 /**
- * Build a replacement Fragment from a flat array of `ListElement` objects.
+ * Build a replacement Fragment from a flat array of `FlattenedItem` objects.
  *
  * Elements with depth >= 0 are grouped into consecutive list segments
  * and rebuilt via `rebuildPMList`. Elements with depth < 0 (extracted
  * past the root) are converted to their content children (paragraphs).
  * The result interleaves list nodes and extracted content in document order.
- */
-export declare function buildReplacementFragment(elements: ListElement[], schema: Schema): BuildResult;
-export interface RestoreSelectionOptions {
-    from: number;
-    originalSelection: Selection;
-    to: number;
-    tr: Transaction;
-}
-/**
- * Restore the transaction's selection after a list structural change.
  *
- * Uses the content start offsets computed during fragment rebuild to
- * map each selection endpoint to its new absolute position.
+ * Delegates to the shared `buildReplacementFragment` with list-specific
+ * rebuild and extraction functions.
  */
-export declare function restoreSelection({ tr, originalSelection, from, to, }: RestoreSelectionOptions): void;
+export declare function buildReplacementFragment(elements: FlattenedItem[], schema: Schema): BuildResult;

package/dist/types-ts4.5/pm-plugins/actions/move-selected-list-items.d.ts

@@ -2,4 +2,4 @@ import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 /**
  * Moves the selected list items n levels up (negative delta) or down (positive delta).
  */
-export declare function moveSelectedListItems(tr: Transaction, delta: number): void;
+export declare function moveSelectedListItems(tr: Transaction, indentDelta: number): void;

package/dist/types-ts4.5/pm-plugins/utils/list-indentation.d.ts

@@ -1,76 +1,23 @@
-import type { Attrs, Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
-import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { type BuildResult, type FlattenedItem, type FlattenListOptions, type FlattenListResult } from '@atlaskit/editor-common/lists';
+import type { Schema } from '@atlaskit/editor-prosemirror/model';
 /**
- * A single content-bearing list element extracted from the PM tree.
- * Wrapper `listItem` nodes (those with no non-list children) are discarded;
- * only items the user can actually see and select are represented.
- */
-export interface ListElement {
-    depth: number;
-    /** Whether this element was within the user's selection (and had its depth adjusted). */
-    isSelected: boolean;
-    listType: 'bulletList' | 'orderedList';
-    node: PMNode;
-    /** Attributes of the immediate parent list node (bulletList/orderedList). */
-    parentListAttrs: Attrs | null;
-    pos: number;
-}
-export interface FlattenListResult {
-    elements: ListElement[];
-    endIndex: number;
-    maxDepth: number;
-    startIndex: number;
-}
-export interface FlattenListOptions {
-    delta: number;
-    doc: PMNode;
-    rootListEnd: number;
-    rootListStart: number;
-    selectionFrom: number;
-    selectionTo: number;
-}
-/**
- * Flatten a root list into a flat array of content-bearing `ListElement`
- * objects and simultaneously determine which elements intersect the user's
- * selection.
+ * Flatten a root list into a flat array of content-bearing items
+ * and simultaneously determine which elements intersect the user's selection.
+ *
+ * Delegates to the shared `flattenListLike` with list-specific callbacks.
  * Selection intersection is checked against each item's content-only
  * span (excluding nested lists).
  */
-export declare function flattenList({ doc, rootListStart, rootListEnd, selectionFrom, selectionTo, delta, }: FlattenListOptions): FlattenListResult | null;
-export interface BuildResult {
-    /**
-     * For each element (by index), the offset within the fragment where the
-     * element's content begins. For list elements this is the position just
-     * inside the listItem (pos + 1); for extracted elements it is the position
-     * of the first extracted content child.
-     *
-     * To get the absolute document position after `tr.replaceWith(rangeStart, …)`,
-     * add `rangeStart` to the offset.
-     */
-    contentStartOffsets: number[];
-    fragment: Fragment;
-}
+export declare function flattenList(options: FlattenListOptions): FlattenListResult | null;
 /**
- * Build a replacement Fragment from a flat array of `ListElement` objects.
+ * Build a replacement Fragment from a flat array of `FlattenedItem` objects.
  *
  * Elements with depth >= 0 are grouped into consecutive list segments
  * and rebuilt via `rebuildPMList`. Elements with depth < 0 (extracted
  * past the root) are converted to their content children (paragraphs).
  * The result interleaves list nodes and extracted content in document order.
- */
-export declare function buildReplacementFragment(elements: ListElement[], schema: Schema): BuildResult;
-export interface RestoreSelectionOptions {
-    from: number;
-    originalSelection: Selection;
-    to: number;
-    tr: Transaction;
-}
-/**
- * Restore the transaction's selection after a list structural change.
  *
- * Uses the content start offsets computed during fragment rebuild to
- * map each selection endpoint to its new absolute position.
+ * Delegates to the shared `buildReplacementFragment` with list-specific
+ * rebuild and extraction functions.
  */
-export declare function restoreSelection({ tr, originalSelection, from, to, }: RestoreSelectionOptions): void;
+export declare function buildReplacementFragment(elements: FlattenedItem[], schema: Schema): BuildResult;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-list",
-	"version": "10.0.12",
+	"version": "10.1.0",
 	"description": "List plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,11 +38,11 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
 		"@atlaskit/prosemirror-input-rules": "^3.6.0",
-		"@atlaskit/tmp-editor-statsig": "^44.0.0",
+		"@atlaskit/tmp-editor-statsig": "^44.1.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.7.0",
+		"@atlaskit/editor-common": "^112.8.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},