@atlaskit/editor-plugin-list 10.1.2 → 10.1.3

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-list
 
+## 10.1.3
+
+### Patch Changes
+
+- [`9b33b26d69865`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9b33b26d69865) -
+  Narrow list replacement range during indent/outdent for collab-friendly cursor preservation
+- [`3f6f3c13a6033`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3f6f3c13a6033) -
+  Fix fontSize mark not being stripped during paragraph to list conversion by checking listItem mark
+  compatibility instead of list container
+- Updated dependencies
+
 ## 10.1.2
 
 ### Patch Changes

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

@@ -13,8 +13,6 @@ var _listIndentation = require("../utils/list-indentation");
  */
 function moveSelectedListItems(tr, indentDelta) {
   var originalSelection = tr.selection;
-
-  // Find the root list so depth adjustments are absolute
   var rootListResolved = (0, _find.findRootParentListNode)(originalSelection.$from);
   if (!rootListResolved) {
     return;
@@ -40,30 +38,29 @@ function moveSelectedListItems(tr, indentDelta) {
   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)(items, tr.doc.type.schema),
     fragment = _buildReplacementFrag.fragment,
     contentStartOffsets = _buildReplacementFrag.contentStartOffsets;
   if (fragment.size === 0) {
     return;
   }
-  tr.replaceWith(rootListStart, rootListEnd, fragment);
+
+  // Narrow the replacement to the minimal changed range for collab-friendly
+  // cursor preservation on unaffected list items.
+  var narrowed = (0, _lists.narrowReplacementRange)(tr.doc, rootListStart, rootListEnd, fragment, contentStartOffsets);
+  tr.replaceWith(narrowed.start, narrowed.end, narrowed.fragment);
   var _computeSelectionOffs = (0, _lists.computeSelectionOffsets)({
       items: items,
       startIndex: startIndex,
       endIndex: endIndex,
       originalFrom: originalSelection.from,
       originalTo: originalSelection.to,
-      contentStartOffsets: contentStartOffsets,
-      rootListStart: rootListStart,
+      contentStartOffsets: narrowed.adjustedContentStartOffsets,
+      rootListStart: narrowed.start,
       docSize: tr.doc.content.size
     }),
     from = _computeSelectionOffs.from,
     to = _computeSelectionOffs.to;
-
-  // Restore selection using the positional offsets from the rebuild.
   (0, _lists.restoreSelection)({
     tr: tr,
     originalSelection: originalSelection,

package/dist/cjs/pm-plugins/utils/mark.js

@@ -4,6 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.sanitiseMarksInSelection = void 0;
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var listContainerTypes = new Set(['bulletList', 'orderedList']);
+
+/**
+ * When wrapping in a list, the paragraph's direct parent will be listItem,
+ * not the list container itself. For fontSize marks, resolve to listItem
+ * so mark compatibility is checked against the actual parent.
+ */
+var resolveEffectiveParentType = function resolveEffectiveParentType(newParentType) {
+  if (newParentType && listContainerTypes.has(newParentType.name) && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
+    return newParentType.schema.nodes.listItem;
+  }
+  return newParentType;
+};
+var isMarkDisallowed = function isMarkDisallowed(mark, parent, effectiveParentType) {
+  return !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(mark.type)) || effectiveParentType && !effectiveParentType.allowsMarkType(mark.type);
+};
 var sanitiseMarksInSelection = exports.sanitiseMarksInSelection = function sanitiseMarksInSelection(tr, newParentType) {
   var _tr$selection = tr.selection,
     from = _tr$selection.from,
@@ -19,7 +36,8 @@ var sanitiseMarksInSelection = exports.sanitiseMarksInSelection = function sanit
       return true;
     }
     node.marks.forEach(function (mark) {
-      if (!(parent !== null && parent !== void 0 && parent.type.allowsMarkType(mark.type)) || newParentType && !newParentType.allowsMarkType(mark.type)) {
+      var effectiveParentType = resolveEffectiveParentType(newParentType);
+      if (isMarkDisallowed(mark, parent, effectiveParentType)) {
         var filteredMarks = node.marks.filter(function (m) {
           return m.type !== mark.type;
         });

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

@@ -1,4 +1,4 @@
-import { restoreSelection, computeSelectionOffsets } from '@atlaskit/editor-common/lists';
+import { computeSelectionOffsets, narrowReplacementRange, restoreSelection } from '@atlaskit/editor-common/lists';
 import { MAX_NESTED_LIST_INDENTATION } from '../../types';
 import { findFirstParentListNode, findRootParentListNode } from '../utils/find';
 import { buildReplacementFragment, flattenList } from '../utils/list-indentation';
@@ -8,8 +8,6 @@ import { buildReplacementFragment, flattenList } from '../utils/list-indentation
  */
 export function moveSelectedListItems(tr, indentDelta) {
   const originalSelection = tr.selection;
-
-  // Find the root list so depth adjustments are absolute
   const rootListResolved = findRootParentListNode(originalSelection.$from);
   if (!rootListResolved) {
     return;
@@ -37,9 +35,6 @@ export function moveSelectedListItems(tr, indentDelta) {
     startIndex,
     endIndex
   } = result;
-
-  // Build replacement — handles both indent (all depths >= 0)
-  // and outdent (some depths may be < 0, producing extracted paragraphs).
   const {
     fragment,
     contentStartOffsets
@@ -47,7 +42,11 @@ export function moveSelectedListItems(tr, indentDelta) {
   if (fragment.size === 0) {
     return;
   }
-  tr.replaceWith(rootListStart, rootListEnd, fragment);
+
+  // Narrow the replacement to the minimal changed range for collab-friendly
+  // cursor preservation on unaffected list items.
+  const narrowed = narrowReplacementRange(tr.doc, rootListStart, rootListEnd, fragment, contentStartOffsets);
+  tr.replaceWith(narrowed.start, narrowed.end, narrowed.fragment);
   const {
     from,
     to
@@ -57,12 +56,10 @@ export function moveSelectedListItems(tr, indentDelta) {
     endIndex,
     originalFrom: originalSelection.from,
     originalTo: originalSelection.to,
-    contentStartOffsets,
-    rootListStart,
+    contentStartOffsets: narrowed.adjustedContentStartOffsets,
+    rootListStart: narrowed.start,
     docSize: tr.doc.content.size
   });
-
-  // Restore selection using the positional offsets from the rebuild.
   restoreSelection({
     tr,
     originalSelection,

package/dist/es2019/pm-plugins/utils/mark.js

@@ -1,3 +1,18 @@
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+const listContainerTypes = new Set(['bulletList', 'orderedList']);
+
+/**
+ * When wrapping in a list, the paragraph's direct parent will be listItem,
+ * not the list container itself. For fontSize marks, resolve to listItem
+ * so mark compatibility is checked against the actual parent.
+ */
+const resolveEffectiveParentType = newParentType => {
+  if (newParentType && listContainerTypes.has(newParentType.name) && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+    return newParentType.schema.nodes.listItem;
+  }
+  return newParentType;
+};
+const isMarkDisallowed = (mark, parent, effectiveParentType) => !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(mark.type)) || effectiveParentType && !effectiveParentType.allowsMarkType(mark.type);
 export const sanitiseMarksInSelection = (tr, newParentType) => {
   const {
     from,
@@ -14,7 +29,8 @@ export const sanitiseMarksInSelection = (tr, newParentType) => {
       return true;
     }
     node.marks.forEach(mark => {
-      if (!(parent !== null && parent !== void 0 && parent.type.allowsMarkType(mark.type)) || newParentType && !newParentType.allowsMarkType(mark.type)) {
+      const effectiveParentType = resolveEffectiveParentType(newParentType);
+      if (isMarkDisallowed(mark, parent, effectiveParentType)) {
         const filteredMarks = node.marks.filter(m => m.type !== mark.type);
         const position = pos > 0 ? pos : 0;
         const marksRemoved = node.marks.filter(m => m.type === mark.type);

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

@@ -1,4 +1,4 @@
-import { restoreSelection, computeSelectionOffsets } from '@atlaskit/editor-common/lists';
+import { computeSelectionOffsets, narrowReplacementRange, restoreSelection } from '@atlaskit/editor-common/lists';
 import { MAX_NESTED_LIST_INDENTATION } from '../../types';
 import { findFirstParentListNode, findRootParentListNode } from '../utils/find';
 import { buildReplacementFragment, flattenList } from '../utils/list-indentation';
@@ -8,8 +8,6 @@ import { buildReplacementFragment, flattenList } from '../utils/list-indentation
  */
 export function moveSelectedListItems(tr, indentDelta) {
   var originalSelection = tr.selection;
-
-  // Find the root list so depth adjustments are absolute
   var rootListResolved = findRootParentListNode(originalSelection.$from);
   if (!rootListResolved) {
     return;
@@ -35,30 +33,29 @@ export function moveSelectedListItems(tr, indentDelta) {
   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(items, tr.doc.type.schema),
     fragment = _buildReplacementFrag.fragment,
     contentStartOffsets = _buildReplacementFrag.contentStartOffsets;
   if (fragment.size === 0) {
     return;
   }
-  tr.replaceWith(rootListStart, rootListEnd, fragment);
+
+  // Narrow the replacement to the minimal changed range for collab-friendly
+  // cursor preservation on unaffected list items.
+  var narrowed = narrowReplacementRange(tr.doc, rootListStart, rootListEnd, fragment, contentStartOffsets);
+  tr.replaceWith(narrowed.start, narrowed.end, narrowed.fragment);
   var _computeSelectionOffs = computeSelectionOffsets({
       items: items,
       startIndex: startIndex,
       endIndex: endIndex,
       originalFrom: originalSelection.from,
       originalTo: originalSelection.to,
-      contentStartOffsets: contentStartOffsets,
-      rootListStart: rootListStart,
+      contentStartOffsets: narrowed.adjustedContentStartOffsets,
+      rootListStart: narrowed.start,
       docSize: tr.doc.content.size
     }),
     from = _computeSelectionOffs.from,
     to = _computeSelectionOffs.to;
-
-  // Restore selection using the positional offsets from the rebuild.
   restoreSelection({
     tr: tr,
     originalSelection: originalSelection,

package/dist/esm/pm-plugins/utils/mark.js

@@ -1,3 +1,20 @@
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+var listContainerTypes = new Set(['bulletList', 'orderedList']);
+
+/**
+ * When wrapping in a list, the paragraph's direct parent will be listItem,
+ * not the list container itself. For fontSize marks, resolve to listItem
+ * so mark compatibility is checked against the actual parent.
+ */
+var resolveEffectiveParentType = function resolveEffectiveParentType(newParentType) {
+  if (newParentType && listContainerTypes.has(newParentType.name) && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+    return newParentType.schema.nodes.listItem;
+  }
+  return newParentType;
+};
+var isMarkDisallowed = function isMarkDisallowed(mark, parent, effectiveParentType) {
+  return !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(mark.type)) || effectiveParentType && !effectiveParentType.allowsMarkType(mark.type);
+};
 export var sanitiseMarksInSelection = function sanitiseMarksInSelection(tr, newParentType) {
   var _tr$selection = tr.selection,
     from = _tr$selection.from,
@@ -13,7 +30,8 @@ export var sanitiseMarksInSelection = function sanitiseMarksInSelection(tr, newP
       return true;
     }
     node.marks.forEach(function (mark) {
-      if (!(parent !== null && parent !== void 0 && parent.type.allowsMarkType(mark.type)) || newParentType && !newParentType.allowsMarkType(mark.type)) {
+      var effectiveParentType = resolveEffectiveParentType(newParentType);
+      if (isMarkDisallowed(mark, parent, effectiveParentType)) {
         var filteredMarks = node.marks.filter(function (m) {
           return m.type !== mark.type;
         });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-list",
-	"version": "10.1.2",
+	"version": "10.1.3",
 	"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": "^45.0.0",
+		"@atlaskit/tmp-editor-statsig": "^46.0.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.8.0",
+		"@atlaskit/editor-common": "^112.9.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},