working better

2 files changed, 13 insertions, 19 deletions

diff --git a/src/client/util/ProsemirrorExampleTransfer.ts b/src/client/util/ProsemirrorExampleTransfer.ts
index 78b992ac8..8bec2015e 100644
--- a/src/client/util/ProsemirrorExampleTransfer.ts
+++ b/src/client/util/ProsemirrorExampleTransfer.ts
@@ -99,10 +99,9 @@ export default function buildKeymap<S extends Schema<any>>(schema: S, mapKeys?:
             const resolvedPos = tx2.doc.resolve(range!.start);
 
             let ns = new NodeSelection(resolvedPos);
-            let tx3 = tx2.removeMark(ns.from - 1, ns.to, created).removeMark(ns.from - 1, ns.to, nodeTypeMark as any).addMark(ns.from - 1, ns.to, created).addMark(ns.from - 1, ns.to, nodeTypeMark as any).setSelection(TextSelection.create(tx2.doc, ns.to - (depth == 0 ? 3 : 1)));
-            marks && tx3.ensureMarks([...marks, created]);
-            marks && tx3.setStoredMarks([...marks, created]);
-
+            let tx3 = tx2.removeMark(ns.from - 1, ns.to, created).removeMark(ns.from - 1, ns.to, nodeTypeMark as any).addMark(ns.from - 1, ns.to, created).addMark(ns.from - 1, ns.to, nodeTypeMark).setSelection(TextSelection.create(tx2.doc, ns.to - (depth == 0 ? 3 : 1)));
+            marks && tx3.ensureMarks([...marks.filter(m => m.type !== schema.marks.mbulletType && m.type !== schema.marks.pFontSize), created, nodeTypeMark]);
+            marks && tx3.setStoredMarks([...marks.filter(m => m.type !== schema.marks.mbulletType && m.type !== schema.marks.pFontSize), created, nodeTypeMark]);
             dispatch(tx3);
         })) {
             let sxf = state.tr.setSelection(TextSelection.create(state.doc, range!.start, range!.end));
@@ -110,10 +109,10 @@ export default function buildKeymap<S extends Schema<any>>(schema: S, mapKeys?:
             if (!wrapInList(nodeType)(newstate.state, (tx2: Transaction) => {
                 const resolvedPos = tx2.doc.resolve(range!.start);
                 let ns = new TextSelection(resolvedPos, tx2.doc.resolve(range!.end + 1)); // new NodeSelection(resolvedPos);
-                let tx3 = tx2.setSelection(ns).removeMark(ns.from, ns.to, created).removeMark(ns.from, ns.to, nodeTypeMark as any).addMark(ns.from - 1, ns.to, nodeTypeMark as any).addMark(ns.from, ns.to, created).setSelection(TextSelection.create(tx2.doc, ns.to));
+                let tx3 = tx2.setSelection(ns).removeMark(ns.from, ns.to, created).removeMark(ns.from, ns.to, nodeTypeMark as any).addMark(ns.from, ns.to, nodeTypeMark as any).addMark(ns.from, ns.to, created).setSelection(TextSelection.create(tx2.doc, ns.to));
                 let tx4 = depth > 0 ? tx3.insertText(" ").setSelection(TextSelection.create(tx2.doc, ns.to - 2, ns.to + 2)).deleteSelection() : tx3;
-                marks && tx4.ensureMarks([...marks, created]);
-                marks && tx4.setStoredMarks([...marks, created]);
+                marks && tx4.ensureMarks([...marks.filter(m => m.type !== schema.marks.mbulletType && m.type !== schema.marks.pFontSize), created, nodeTypeMark]);
+                marks && tx4.setStoredMarks([...marks.filter(m => m.type !== schema.marks.mbulletType && m.type !== schema.marks.pFontSize), created, nodeTypeMark]);
 
                 dispatch(tx4);
             })) {
@@ -127,6 +126,8 @@ export default function buildKeymap<S extends Schema<any>>(schema: S, mapKeys?:
         var ref = state.selection;
         var range = ref.$from.blockRange(ref.$to);
         var marks = state.storedMarks || (state.selection.$to.parentOffset && state.selection.$from.marks());
+        let depth = range && range.depth > 3 ? range.depth - 4 : 0;
+        let nodeTypeMark = schema.marks.mbulletType.create({ bulletType: depth == 2 ? "upper-alpha" : depth == 4 ? "lower-roman" : depth == 6 ? "lower-alpha" : "decimal" });
         let created = levelMark(range && range.depth ? range.depth - 4 : 0);
         liftListItem(schema.nodes.list_item)(state, (tx2: Transaction) => {
             try {
@@ -135,9 +136,11 @@ export default function buildKeymap<S extends Schema<any>>(schema: S, mapKeys?:
                 let ns = new NodeSelection(tx2.doc.resolve(nodeIndex));
                 if (resolvedPos.nodeAfter && resolvedPos.nodeAfter.type.name === "list_item")
                     ns = new NodeSelection(tx2.doc.resolve(nodeIndex + 1));
-                let tx3 = tx2.setSelection(ns).removeMark(ns.from, ns.to, created).addMark(ns.from, ns.to, created).setSelection(TextSelection.create(tx2.doc, ns.to));
-                marks && tx3.ensureMarks([...marks, created]);
-                marks && tx3.setStoredMarks([...marks, created]);
+                let tx3 = tx2.setSelection(ns).removeMark(ns.from - 1, ns.to, created).addMark(ns.from - 1, ns.to, created)
+                    .removeMark(ns.from - 1, ns.to, nodeTypeMark).addMark(ns.from - 1, ns.to, nodeTypeMark).setSelection(TextSelection.create(tx2.doc, ns.to));
+
+                marks && tx3.ensureMarks([...marks.filter(m => m.type !== schema.marks.mbulletType && m.type !== schema.marks.pFontSize), created, nodeTypeMark]);
+                marks && tx3.setStoredMarks([...marks.filter(m => m.type !== schema.marks.mbulletType && m.type !== schema.marks.pFontSize), created, nodeTypeMark]);
                 dispatch(tx3);
             } catch (e) {
                 dispatch(tx2);
diff --git a/src/client/views/nodes/FormattedTextBox.scss b/src/client/views/nodes/FormattedTextBox.scss
index 9d5dc76d3..1b537cc52 100644
--- a/src/client/views/nodes/FormattedTextBox.scss
+++ b/src/client/views/nodes/FormattedTextBox.scss
@@ -65,13 +65,4 @@
 
 .em {
     font-style: italic;
-}
-
-ol { counter-reset: item }
-.XXX:before {
-     content: counters(item, ".") " ";
-     counter-increment: item ;
-}
-p {
-    display:inline;
 }
\ No newline at end of file