Merge branch 'master' into zach-starter

1 files changed, 37 insertions, 28 deletions

diff --git a/src/client/views/nodes/formattedText/ProsemirrorExampleTransfer.ts b/src/client/views/nodes/formattedText/ProsemirrorExampleTransfer.ts
index ec8879487..03c902580 100644
--- a/src/client/views/nodes/formattedText/ProsemirrorExampleTransfer.ts
+++ b/src/client/views/nodes/formattedText/ProsemirrorExampleTransfer.ts
@@ -257,7 +257,7 @@ export function buildKeymap<S extends Schema<any>>(schema: S, props: any, mapKey
     });
 
     // backspace = chainCommands(deleteSelection, joinBackward, selectNodeBackward);
-    const backspace = (state: EditorState, dispatch: (tx: Transaction) => void, view: EditorView, once = true) => {
+    const backspace = (state: EditorState, dispatch: (tx: Transaction) => void, view: EditorView) => {
         if (props.onKey?.(event, props)) return true;
         if (!canEdit(state)) return true;
 
@@ -269,7 +269,10 @@ export function buildKeymap<S extends Schema<any>>(schema: S, props: any, mapKey
             if (
                 !joinBackward(state, (tx: Transaction) => {
                     dispatch(updateBullets(tx, schema));
-                    if (once && view.state.selection.$from.depth > 1 && view.state.selection.$from.node(view.state.selection.$from.depth - 1).type === view.state.schema.nodes.list_item) backspace(view.state, view.dispatch, view, false);
+                    if (view.state.selection.$anchor.node(-1)?.type === schema.nodes.list_item) {
+                        // gets rid of an extra paragraph when joining two list items together.
+                        joinBackward(view.state, (tx: Transaction) => view.dispatch(tx));
+                    }
                 })
             ) {
                 if (
@@ -296,7 +299,7 @@ export function buildKeymap<S extends Schema<any>>(schema: S, props: any, mapKey
         const depth = trange ? liftTarget(trange) : null;
         if (
             depth !== null &&
-            state.selection.$from.node(state.selection.$from.depth - 1)?.type === state.schema.nodes.blockquote && //
+            state.selection.$from.node(-1)?.type === state.schema.nodes.blockquote && //
             !state.selection.$from.node().content.size &&
             trange
         ) {
@@ -306,7 +309,13 @@ export function buildKeymap<S extends Schema<any>>(schema: S, props: any, mapKey
 
         const marks = state.storedMarks || (state.selection.$to.parentOffset && state.selection.$from.marks());
         if (!newlineInCode(state, dispatch as any)) {
-            if (once && view.state.selection.$from.depth > 1 && !view.state.selection.$from.nodeBefore && !view.state.selection.$from.nodeBefore) {
+            const olNode = view.state.selection.$anchor.node(-2);
+            const liNode = view.state.selection.$anchor.node(-1);
+            // prettier-ignore
+            if (liNode?.type === schema.nodes.list_item && !liNode.textContent && 
+                olNode?.type === schema.nodes.ordered_list && once && view.state.selection.$from.depth === 3) 
+            {
+                // handles case of hitting enter at then end of a top-level empty list item - the result is to create a paragraph
                 for (let i = 0; i < 10 && view.state.selection.$from.depth > 1 && liftListItem(schema.nodes.list_item)(view.state, view.dispatch); i++);
             } else if (
                 !splitListItem(schema.nodes.list_item)(state as any, (tx2: Transaction) => {
@@ -314,32 +323,32 @@ export function buildKeymap<S extends Schema<any>>(schema: S, props: any, mapKey
                     marks && tx3.ensureMarks([...marks]);
                     marks && tx3.setStoredMarks([...marks]);
                     dispatch(tx3);
+                    // removes an extra paragraph created when selecting text across two list items or splitting an empty list item
+                    !once && view.dispatch(view.state.tr.deleteRange(view.state.selection.from - 5, view.state.selection.from - 2));
                 })
             ) {
-                const fromattrs = state.selection.$from.node().attrs;
-                if (
-                    !splitBlockKeepMarks(state, (tx3: Transaction) => {
-                        const tonode = tx3.selection.$to.node();
-                        if (tx3.selection.to && tx3.doc.nodeAt(tx3.selection.to - 1)) {
-                            const tx4 = tx3.setNodeMarkup(tx3.selection.to - 1, tonode.type, fromattrs, tonode.marks);
-                            dispatch(tx4);
-                            if (
-                                view.state.selection.$from.parentOffset && //
-                                !view.state.selection.$from.node().content.size
-                            )
-                                liftListItem(schema.nodes.list_item)(view.state, view.dispatch);
-                            else if (
-                                once &&
-                                view.state.selection.$from.parentOffset &&
-                                view.state.selection.$from.depth > 1 && //
-                                view.state.selection.$from.node(view.state.selection.$from.depth - 1).type === schema.nodes.list_item
-                            )
-                                enter(view.state, view.dispatch, view, false);
-                            else if (once && depth && !view.state.selection.$from.parentOffset) backspace(view.state, view.dispatch, view, false);
-                        } else dispatch(tx3.insertText('\r\n'));
-                    })
-                ) {
-                    return false;
+                if (once && view.state.selection.$from.node(-2)?.type === schema.nodes.ordered_list && view.state.selection.$from.node(-1)?.type === schema.nodes.list_item && view.state.selection.$from.node(-1)?.textContent === '') {
+                    // handles case of hitting enter on an empty list item which needs to create a second empty paragraph, then split it by calling enter() again
+                    view.dispatch(view.state.tr.insert(view.state.selection.from, schema.nodes.paragraph.create({})));
+                    enter(view.state, view.dispatch, view, false);
+                } else {
+                    const fromattrs = state.selection.$from.node().attrs;
+                    if (
+                        !splitBlockKeepMarks(state, (tx3: Transaction) => {
+                            const tonode = tx3.selection.$to.node();
+                            if (tx3.selection.to && tx3.doc.nodeAt(tx3.selection.to - 1)) {
+                                const tx4 = tx3.setNodeMarkup(tx3.selection.to - 1, tonode.type, fromattrs, tonode.marks);
+                                dispatch(tx4);
+                            }
+
+                            if (view.state.selection.$anchor.nodeAfter?.type === schema.nodes.text && once) {
+                                // if text is selected across list items, then we need to forcibly insert a new line since the splitBlock code joins the two list items.
+                                enter(view.state, dispatch, view, false);
+                            }
+                        })
+                    ) {
+                        return false;
+                    }
                 }
             }
         }