feat(text editor): handle list changes with no selection

- instead of trying to convert nested list nodes and creating extra transactions we limit functionality

Author: john-traas

src/components/text-editor/prosemirror-adapter/menu/menu-commands.ts

@@ -18,7 +18,6 @@ import {
     toggleList,
     Dispatch,
 } from './utils/list-utils';
-import { adjustSelectionToFullBlocks } from './utils/selection-utils';
 import { copyPasteLinkCommand } from './utils/link-utils';
 import { findAncestorDepthOfType } from './utils/node-utils';
 
@@ -217,42 +216,42 @@ const createWrapInCommand = (
 };
 
 /**
- * Handles list operations when there is no selection.
+ * Handles list operations when there is no selection (cursor only).
+ * If the cursor is within a list item, only that list item is affected.
  *
- * @param state - The current editor state.
- * @param type - The type of list to toggle.
- * @param schema - The ProseMirror schema.
- * @param otherType - The other type of list to convert to.
- * @param dispatch - The dispatch function.
- * @returns A command for handling list operations when there is no selection.
+ * @param EditorState - state - The current editor state.
+ * @param NodeType - type - The type of list to toggle.
+ * @param Schema - schema - The ProseMirror schema.
+ * @param Function - dispatch - The dispatch function.
+ * @returns boolean - True if the command was executed.
  */
-const handleListNoSelection = (
-    state: EditorState,
-    type: NodeType,
-    schema: Schema,
-    otherType: NodeType,
-    dispatch: Dispatch,
-) => {
+const handleListNoSelection = (state, type, schema, dispatch) => {
     const { $from } = state.selection;
-    const blockFrom = $from.start();
-    const blockTo = $from.end();
-    const adjustedTr = state.tr.setSelection(
-        new TextSelection(
-            state.doc.resolve(blockFrom),
-            state.doc.resolve(blockTo),
-        ),
+    // Find the nearest list_item ancestor.
+    const listItemDepth = findAncestorDepthOfType(
+        $from,
+        schema.nodes.list_item,
     );
-    const newState = state.apply(adjustedTr);
 
-    if (isInListOfType(newState, type)) {
-        return removeListNodes(newState, type, schema, dispatch);
+    if (listItemDepth === null) {
+        // Not inside a list item; fallback to toggling list on the current block.
+        return toggleList(type)(state, dispatch);
     }
 
-    if (isInListOfType(newState, otherType)) {
-        return convertAllListNodes(newState, otherType, type, dispatch);
-    }
+    // Get the content positions within the list item
+    const listItemStart = $from.start(listItemDepth);
+    const listItemEnd = $from.end(listItemDepth);
+
+    // Set selection to the current list item.
+    const tr = state.tr.setSelection(
+        new TextSelection(
+            state.doc.resolve(listItemStart),
+            state.doc.resolve(listItemEnd),
+        ),
+    );
+    const newState = state.apply(tr);
 
-    return toggleList(type)(newState, dispatch);
+    return sinkListItem(schema.nodes.list_item)(newState, dispatch);
 };
 
 /**
@@ -272,7 +271,7 @@ const handleListWithSelection = (
     otherType: NodeType,
     dispatch: Dispatch,
 ) => {
-    const { $from } = state.selection;
+    const { $from, $to } = state.selection;
     const listItemType = schema.nodes.list_item;
     const ancestorDepth = findAncestorDepthOfType($from, listItemType);
 
@@ -291,14 +290,7 @@ const handleListWithSelection = (
         return convertAllListNodes(state, otherType, type, dispatch);
     }
 
-    const { from, to } = adjustSelectionToFullBlocks(state);
-    if (from >= to) {
-        return false;
-    }
-
-    const modifiedTr = state.tr.setSelection(
-        new TextSelection(state.doc.resolve(from), state.doc.resolve(to)),
-    );
+    const modifiedTr = state.tr.setSelection(new TextSelection($from, $to));
     const updatedState = state.apply(modifiedTr);
 
     return wrapInList(type)(updatedState, dispatch);
@@ -329,7 +321,7 @@ export const createListCommand = (
         const otherType = getOtherListType(schema, listTypeName);
 
         return noSelection
-            ? handleListNoSelection(state, type, schema, otherType, dispatch)
+            ? handleListNoSelection(state, type, schema, dispatch)
             : handleListWithSelection(state, type, schema, otherType, dispatch);
     };
 

src/components/text-editor/prosemirror-adapter/menu/utils/list-utils.ts

@@ -24,6 +24,12 @@ export const isInListOfType = (
     return false;
 };
 
+/**
+ * Get the other list type from the current list type.
+ * @param schema - The schema to use.
+ * @param currentType - The current list type.
+ * @returns The other list type.
+ */
 export const getOtherListType = (
     schema: Schema,
     currentType: string,
@@ -198,3 +204,40 @@ export const toggleList = (listType: NodeType) => {
         }
     };
 };
+
+/**
+ * Converts a single list node from one type to another.
+ */
+export const convertSingleListNode = (
+    state: EditorState,
+    fromType: NodeType,
+    toType: NodeType,
+    dispatch: Dispatch,
+): boolean => {
+    const { $from } = state.selection;
+    const tr = state.tr;
+
+    // Find the nearest parent list of fromType
+    for (let depth = $from.depth; depth > 0; depth--) {
+        const node = $from.node(depth);
+        if (node.type === fromType) {
+            const pos = $from.before(depth);
+            const newNode = toType.create(
+                convertListAttributes(fromType, toType, node.attrs),
+                node.content,
+                node.marks,
+            );
+            if (dispatch) {
+                dispatch(
+                    tr
+                        .replaceWith(pos, pos + node.nodeSize, newNode)
+                        .scrollIntoView(),
+                );
+            }
+
+            return true;
+        }
+    }
+
+    return false;
+};