merged with master

1 files changed, 148 insertions, 69 deletions

diff --git a/src/client/util/ProsemirrorExampleTransfer.ts b/src/client/util/ProsemirrorExampleTransfer.ts
index c38f84551..419311df8 100644
--- a/src/client/util/ProsemirrorExampleTransfer.ts
+++ b/src/client/util/ProsemirrorExampleTransfer.ts
@@ -1,14 +1,11 @@
-import { Schema, NodeType } from "prosemirror-model";
-import {
-    wrapIn, setBlockType, chainCommands, toggleMark, exitCode,
-    joinUp, joinDown, lift, selectParentNode
-} from "prosemirror-commands";
-import { wrapInList, splitListItem, liftListItem, sinkListItem } from "prosemirror-schema-list";
-import { undo, redo } from "prosemirror-history";
+import { chainCommands, exitCode, joinDown, joinUp, lift, selectParentNode, setBlockType, splitBlockKeepMarks, toggleMark, wrapIn } from "prosemirror-commands";
+import { redo, undo } from "prosemirror-history";
 import { undoInputRule } from "prosemirror-inputrules";
-import { Transaction, EditorState } from "prosemirror-state";
+import { Schema } from "prosemirror-model";
+import { liftListItem, } from "./prosemirrorPatches.js";
+import { splitListItem, wrapInList, sinkListItem } from "prosemirror-schema-list";
+import { EditorState, Transaction, TextSelection, NodeSelection } from "prosemirror-state";
 import { TooltipTextMenu } from "./TooltipTextMenu";
-import { Statement } from "../northstar/model/idea/idea";
 
 const mac = typeof navigator !== "undefined" ? /Mac/.test(navigator.platform) : false;
 
@@ -30,79 +27,161 @@ export default function buildKeymap<S extends Schema<any>>(schema: S, mapKeys?:
     bind("Shift-Mod-z", redo);
     bind("Backspace", undoInputRule);
 
-    if (!mac) {
-        bind("Mod-y", redo);
-    }
+    !mac && bind("Mod-y", redo);
 
     bind("Alt-ArrowUp", joinUp);
     bind("Alt-ArrowDown", joinDown);
     bind("Mod-BracketLeft", lift);
     bind("Escape", selectParentNode);
 
-    if (type = schema.marks.strong) {
-        bind("Mod-b", toggleMark(type));
-        bind("Mod-B", toggleMark(type));
-    }
-    if (type = schema.marks.em) {
-        bind("Mod-i", toggleMark(type));
-        bind("Mod-I", toggleMark(type));
-    }
-    if (type = schema.marks.underline) {
-        bind("Mod-u", toggleMark(type));
-        bind("Mod-U", toggleMark(type));
-    }
-    if (type = schema.marks.code) {
-        bind("Mod-`", toggleMark(type));
-    }
+    bind("Mod-b", toggleMark(schema.marks.strong));
+    bind("Mod-B", toggleMark(schema.marks.strong));
 
-    if (type = schema.nodes.bullet_list) {
-        bind("Ctrl-.", wrapInList(type));
-    }
-    if (type = schema.nodes.ordered_list) {
-        bind("Ctrl-n", wrapInList(type));
-    }
-    if (type = schema.nodes.blockquote) {
-        bind("Ctrl->", wrapIn(type));
+    bind("Mod-e", toggleMark(schema.marks.em));
+    bind("Mod-E", toggleMark(schema.marks.em));
+
+    bind("Mod-u", toggleMark(schema.marks.underline));
+    bind("Mod-U", toggleMark(schema.marks.underline));
+
+    bind("Mod-`", toggleMark(schema.marks.code));
+
+    bind("Ctrl-.", wrapInList(schema.nodes.bullet_list));
+
+    bind("Ctrl-n", wrapInList(schema.nodes.ordered_list));
+
+    bind("Ctrl->", wrapIn(schema.nodes.blockquote));
+
+    bind("^", (state: EditorState<S>, dispatch: (tx: Transaction<S>) => void) => {
+        let newNode = schema.nodes.footnote.create({});
+        if (dispatch && state.selection.from === state.selection.to) {
+            let tr = state.tr;
+            tr.replaceSelectionWith(newNode); // replace insertion with a footnote.
+            dispatch(tr.setSelection(new NodeSelection( // select the footnote node to open its display
+                tr.doc.resolve(  // get the location of the footnote node by subtracting the nodesize of the footnote from the current insertion point anchor (which will be immediately after the footnote node)
+                    tr.selection.anchor - tr.selection.$anchor.nodeBefore!.nodeSize))));
+            return true;
+        }
+        return false;
+    })
+
+
+    let cmd = chainCommands(exitCode, (state, dispatch) => {
+        if (dispatch) {
+            dispatch(state.tr.replaceSelectionWith(schema.nodes.hard_break.create()).scrollIntoView());
+            return true;
+        }
+        return false;
+    });
+    bind("Mod-Enter", cmd);
+    bind("Shift-Enter", cmd);
+    mac && bind("Ctrl-Enter", cmd);
+
+
+    bind("Shift-Ctrl-0", setBlockType(schema.nodes.paragraph));
+
+    bind("Shift-Ctrl-\\", setBlockType(schema.nodes.code_block));
+
+    for (let i = 1; i <= 6; i++) {
+        bind("Shift-Ctrl-" + i, setBlockType(schema.nodes.heading, { level: i }));
     }
-    if (type = schema.nodes.hard_break) {
-        let br = type, cmd = chainCommands(exitCode, (state, dispatch) => {
-            if (dispatch) {
-                dispatch(state.tr.replaceSelectionWith(br.create()).scrollIntoView());
-                return true;
+
+    let hr = schema.nodes.horizontal_rule;
+    bind("Mod-_", (state: EditorState<S>, dispatch: (tx: Transaction<S>) => void) => {
+        dispatch(state.tr.replaceSelectionWith(hr.create()).scrollIntoView());
+        return true;
+    });
+
+    bind("Mod-s", TooltipTextMenu.insertStar);
+
+    let updateBullets = (tx2: Transaction, refStart: number, delta: number) => {
+        for (let i = refStart; i > 0; i--) {
+            let testPos = tx2.doc.nodeAt(i);
+            if (testPos && testPos.type === schema.nodes.list_item) {
+                let start = i;
+                let preve = i > 0 && tx2.doc.nodeAt(start - 1);
+                if (preve && preve.type === schema.nodes.ordered_list) {
+                    start = start - 1;
+                }
+                let rangeStart = tx2.doc.nodeAt(start);
+                if (rangeStart && rangeStart.type === schema.nodes.ordered_list) {
+                    tx2.setNodeMarkup(start, rangeStart.type, { ...rangeStart.attrs, bulletStyle: rangeStart.attrs.bulletStyle + delta }, rangeStart.marks);
+                }
+                rangeStart && rangeStart.descendants((node: any, offset: any, index: any) => {
+                    if (node.type === schema.nodes.ordered_list) {
+                        tx2.setNodeMarkup(start + offset + 1, node.type, { ...node.attrs, bulletStyle: node.attrs.bulletStyle + delta }, node.marks);
+                    }
+                });
+                break;
             }
-            return false;
-        });
-        bind("Mod-Enter", cmd);
-        bind("Shift-Enter", cmd);
-        if (mac) {
-            bind("Ctrl-Enter", cmd);
         }
     }
-    if (type = schema.nodes.list_item) {
-        bind("Enter", splitListItem(type));
-        bind("Shift-Tab", liftListItem(type));
-        bind("Tab", sinkListItem(type));
-    }
-    if (type = schema.nodes.paragraph) {
-        bind("Shift-Ctrl-0", setBlockType(type));
-    }
-    if (type = schema.nodes.code_block) {
-        bind("Shift-Ctrl-\\", setBlockType(type));
-    }
-    if (type = schema.nodes.heading) {
-        for (let i = 1; i <= 6; i++) {
-            bind("Shift-Ctrl-" + i, setBlockType(type, { level: i }));
+
+    bind("Tab", (state: EditorState<S>, dispatch: (tx: Transaction<S>) => void) => {
+        var ref = state.selection;
+        var range = ref.$from.blockRange(ref.$to);
+        var marks = state.storedMarks || (state.selection.$to.parentOffset && state.selection.$from.marks());
+        if (!sinkListItem(schema.nodes.list_item)(state, (tx2: Transaction) => {
+            updateBullets(tx2, range!.start, 1);
+            marks && tx2.ensureMarks([...marks]);
+            marks && tx2.setStoredMarks([...marks]);
+            dispatch(tx2);
+        })) { // couldn't sink into an existing list, so wrap in a new one
+            let sxf = state.tr.setSelection(TextSelection.create(state.doc, range!.start, range!.end));
+            let newstate = state.applyTransaction(sxf);
+            if (!wrapInList(schema.nodes.ordered_list)(newstate.state, (tx2: Transaction) => {
+                for (let i = range!.start; i >= 0; i--) {
+                    let rangeStart = tx2.doc.nodeAt(i);
+                    if (rangeStart && rangeStart.type === schema.nodes.ordered_list) {
+                        tx2.setNodeMarkup(i, rangeStart.type, { ...rangeStart.attrs, bulletStyle: 1 }, rangeStart.marks);
+                        break;
+                    }
+                }
+                // when promoting to a list, assume list will format things so don't copy the stored marks.
+                marks && tx2.ensureMarks([...marks]);
+                marks && tx2.setStoredMarks([...marks]);
+                dispatch(tx2);
+            })) {
+                console.log("bullet promote fail");
+            }
         }
-    }
-    if (type = schema.nodes.horizontal_rule) {
-        let hr = type;
-        bind("Mod-_", (state: EditorState<S>, dispatch: (tx: Transaction<S>) => void) => {
-            dispatch(state.tr.replaceSelectionWith(hr.create()).scrollIntoView());
-            return true;
-        });
-    }
+    });
+
+    bind("Shift-Tab", (state: EditorState<S>, dispatch: (tx: Transaction<S>) => void) => {
+        var range = state.selection.$from.blockRange(state.selection.$to);
+        var marks = state.storedMarks || (state.selection.$to.parentOffset && state.selection.$from.marks());
+
+        let tr = state.tr;
+        updateBullets(tr, range!.start, -1);
+
+        if (!liftListItem(schema.nodes.list_item)(tr, (tx2: Transaction) => {
+            marks && tx2.ensureMarks([...marks]);
+            marks && tx2.setStoredMarks([...marks]);
+            dispatch(tx2);
+        })) {
+            console.log("bullet demote fail");
+        }
+    });
+
+    bind("Enter", (state: EditorState<S>, dispatch: (tx: Transaction<S>) => void) => {
+        var marks = state.storedMarks || (state.selection.$to.parentOffset && state.selection.$from.marks());
+        if (!splitListItem(schema.nodes.list_item)(state, (tx3: Transaction) => {
+            // marks && tx3.ensureMarks(marks);
+            // marks && tx3.setStoredMarks(marks);
+            dispatch(tx3);
+        })) {
+            if (!splitBlockKeepMarks(state, (tx3: Transaction) => {
+                marks && tx3.ensureMarks(marks);
+                marks && tx3.setStoredMarks(marks);
+                if (!liftListItem(schema.nodes.list_item)(tx3, dispatch as ((tx: Transaction<Schema<any, any>>) => void))) {
+                    dispatch(tx3);
+                }
+            })) {
+                return false;
+            }
+        }
+        return true;
+    });
 
-    bind("Mod-s", TooltipTextMenu.insertStar);
 
     return keys;
 }