1 files changed, 16 insertions, 18 deletions

diff --git a/src/client/views/nodes/formattedText/ProsemirrorExampleTransfer.ts b/src/client/views/nodes/formattedText/ProsemirrorExampleTransfer.ts
index 47527847b..1058c51da 100644
--- a/src/client/views/nodes/formattedText/ProsemirrorExampleTransfer.ts
+++ b/src/client/views/nodes/formattedText/ProsemirrorExampleTransfer.ts
@@ -1,7 +1,7 @@
 import { chainCommands, deleteSelection, exitCode, joinBackward, joinDown, joinUp, lift, newlineInCode, selectNodeBackward, setBlockType, splitBlockKeepMarks, toggleMark, wrapIn } from 'prosemirror-commands';
 import { redo, undo } from 'prosemirror-history';
 import { Schema } from 'prosemirror-model';
-import { splitListItem, wrapInList } from 'prosemirror-schema-list';
+import { splitListItem, wrapInList, sinkListItem, liftListItem } from 'prosemirror-schema-list';
 import { EditorState, NodeSelection, TextSelection, Transaction } from 'prosemirror-state';
 import { liftTarget } from 'prosemirror-transform';
 import { AclAdmin, AclAugment, AclEdit } from '../../../../fields/DocSymbols';
@@ -11,8 +11,9 @@ import { Docs } from '../../../documents/Documents';
 import { RTFMarkup } from '../../../util/RTFMarkup';
 import { SelectionManager } from '../../../util/SelectionManager';
 import { OpenWhere } from '../DocumentView';
-import { liftListItem, sinkListItem } from './prosemirrorPatches.js';
+//import { liftListItem, sinkListItem } from './prosemirrorPatches.js';
 import { Doc } from '../../../../fields/Doc';
+import { EditorView } from 'prosemirror-view';
 
 const mac = typeof navigator !== 'undefined' ? /Mac/.test(navigator.platform) : false;
 
@@ -120,7 +121,7 @@ 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 (
-            !liftListItem(schema.nodes.list_item)(state.tr, (tx2: Transaction) => {
+            !liftListItem(schema.nodes.list_item)(state, (tx2: Transaction) => {
                 const tx3 = updateBullets(tx2, schema);
                 marks && tx3.ensureMarks([...marks]);
                 marks && tx3.setStoredMarks([...marks]);
@@ -164,12 +165,6 @@ export function buildKeymap<S extends Schema<any>>(schema: S, props: any, mapKey
         SelectionManager.DeselectAll();
     });
 
-    const splitMetadata = (marks: any, tx: Transaction) => {
-        marks && tx.ensureMarks(marks.filter((val: any) => val.type !== schema.marks.metadata && val.type !== schema.marks.metadataKey && val.type !== schema.marks.metadataVal));
-        marks && tx.setStoredMarks(marks.filter((val: any) => val.type !== schema.marks.metadata && val.type !== schema.marks.metadataKey && val.type !== schema.marks.metadataVal));
-        return tx;
-    };
-
     bind('Alt-Enter', () => (props.onKey?.(event, props) ? true : true));
     bind('Ctrl-Enter', () => (props.onKey?.(event, props) ? true : true));
     bind('Cmd-a', (state: EditorState, dispatch: (tx: Transaction) => void) => {
@@ -288,7 +283,8 @@ export function buildKeymap<S extends Schema<any>>(schema: S, props: any, mapKey
 
     //newlineInCode, createParagraphNear, liftEmptyBlock, splitBlock
     //command to break line
-    bind('Enter', (state: EditorState, dispatch: (tx: Transaction) => void) => {
+
+    const enter = (state: EditorState, dispatch: (tx: Transaction) => void, view: EditorView) => {
         if (props.onKey?.(event, props)) return true;
         if (!canEdit(state)) return true;
 
@@ -304,7 +300,11 @@ export function buildKeymap<S extends Schema<any>>(schema: S, props: any, mapKey
         const marks = state.storedMarks || (state.selection.$to.parentOffset && state.selection.$from.marks());
         const cr = state.selection.$from.node().textContent.endsWith('\n');
         if (/*cr ||*/ !newlineInCode(state, dispatch as any)) {
-            if (
+            if (!view.state.selection.$from.nodeBefore && !view.state.selection.$from.nodeBefore) {
+                do {
+                    liftListItem(schema.nodes.list_item)(view.state, view.dispatch);
+                } while (view.state.selection.$from.depth > 1);
+            } else if (
                 !splitListItem(schema.nodes.list_item)(state as any, (tx2: Transaction) => {
                     const tx3 = updateBullets(tx2, schema);
                     marks && tx3.ensureMarks([...marks]);
@@ -318,10 +318,9 @@ export function buildKeymap<S extends Schema<any>>(schema: S, props: any, mapKey
                         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);
-                            splitMetadata(marks, tx4);
-                            if (!liftListItem(schema.nodes.list_item)(tx4, dispatch as (tx: Transaction) => void)) {
-                                dispatch(tx4);
-                            }
+                            dispatch(tx4);
+                            if (!view.state.selection.$from.node().content.size) liftListItem(schema.nodes.list_item)(view.state, view.dispatch);
+                            else enter(view.state, view.dispatch, view); // view.dispatch(view.state.tr.insertText('\r\n'));
                         } else dispatch(tx3.insertText('\r\n'));
                     })
                 ) {
@@ -330,13 +329,12 @@ export function buildKeymap<S extends Schema<any>>(schema: S, props: any, mapKey
             }
         }
         return true;
-    });
+    };
+    bind('Enter', enter);
 
     //Command to create a blank space
     bind('Space', (state: EditorState, dispatch: (tx: Transaction) => void) => {
         if (props.TemplateDataDocument && GetEffectiveAcl(props.TemplateDataDocument) != AclEdit && GetEffectiveAcl(props.TemplateDataDocument) != AclAugment && GetEffectiveAcl(props.TemplateDataDocument) != AclAdmin) return true;
-        const marks = state.storedMarks || (state.selection.$to.parentOffset && state.selection.$from.marks());
-        dispatch(splitMetadata(marks, state.tr));
         return false;
     });