Merge branch 'master' into heartbeat

1 files changed, 82 insertions, 2 deletions

diff --git a/src/client/views/nodes/formattedText/ProsemirrorExampleTransfer.ts b/src/client/views/nodes/formattedText/ProsemirrorExampleTransfer.ts
index 3d9bd6add..8d57cc081 100644
--- a/src/client/views/nodes/formattedText/ProsemirrorExampleTransfer.ts
+++ b/src/client/views/nodes/formattedText/ProsemirrorExampleTransfer.ts
@@ -4,11 +4,14 @@ import { Schema } from 'prosemirror-model';
 import { splitListItem, wrapInList } from 'prosemirror-schema-list';
 import { EditorState, NodeSelection, TextSelection, Transaction } from 'prosemirror-state';
 import { liftTarget } from 'prosemirror-transform';
-import { AclAugment, AclSelfEdit, Doc } from '../../../../fields/Doc';
+import { Doc } from '../../../../fields/Doc';
+import { AclAugment, AclSelfEdit } from '../../../../fields/DocSymbols';
 import { GetEffectiveAcl } from '../../../../fields/util';
 import { Utils } from '../../../../Utils';
 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';
 
 const mac = typeof navigator !== 'undefined' ? /Mac/.test(navigator.platform) : false;
@@ -135,7 +138,7 @@ export function buildKeymap<S extends Schema<any>>(schema: S, props: any, mapKey
     //Command to create a new Tab with a PDF of all the command shortcuts
     bind('Mod-/', (state: EditorState, dispatch: (tx: Transaction) => void) => {
         const newDoc = Docs.Create.PdfDocument(Utils.prepend('/assets/cheat-sheet.pdf'), { _width: 300, _height: 300 });
-        props.addDocTab(newDoc, 'add:right');
+        props.addDocTab(newDoc, OpenWhere.addRight);
     });
 
     //Commands to modify BlockType
@@ -177,6 +180,83 @@ export function buildKeymap<S extends Schema<any>>(schema: S, props: any, mapKey
         dispatch(state.tr.setSelection(new TextSelection(state.doc.resolve(1), state.doc.resolve(state.doc.content.size - 1))));
         return true;
     });
+    bind('Cmd-?', (state: EditorState, dispatch: (tx: Transaction) => void) => {
+        RTFMarkup.Instance.open();
+        return true;
+    });
+    bind('Cmd-e', (state: EditorState, dispatch: (tx: Transaction) => void) => {
+        if (!state.selection.empty) {
+            const mark = state.schema.marks.summarizeInclusive.create();
+            const tr = state.tr.addMark(state.selection.$from.pos, state.selection.$to.pos, mark);
+            const content = tr.selection.content();
+            tr.selection.replaceWith(tr, schema.nodes.summary.create({ visibility: false, text: content, textslice: content.toJSON() }));
+            dispatch(tr);
+        }
+        return true;
+    });
+    bind('Cmd-]', (state: EditorState, dispatch: (tx: Transaction) => void) => {
+        const resolved = state.doc.resolve(state.selection.from) as any;
+        const tr = state.tr;
+        if (resolved?.parent.type.name === 'paragraph') {
+            tr.setNodeMarkup(resolved.path[resolved.path.length - 4], schema.nodes.paragraph, { ...resolved.parent.attrs, align: 'right' }, resolved.parent.marks);
+        } else {
+            const node = resolved.nodeAfter;
+            const sm = state.storedMarks || undefined;
+            if (node) {
+                tr.replaceRangeWith(state.selection.from, state.selection.from, schema.nodes.paragraph.create({ align: 'right' })).setStoredMarks([...node.marks, ...(sm ? sm : [])]);
+            }
+        }
+        dispatch(tr);
+        return true;
+    });
+    bind('Cmd-\\', (state: EditorState, dispatch: (tx: Transaction) => void) => {
+        const resolved = state.doc.resolve(state.selection.from) as any;
+        const tr = state.tr;
+        if (resolved?.parent.type.name === 'paragraph') {
+            tr.setNodeMarkup(resolved.path[resolved.path.length - 4], schema.nodes.paragraph, { ...resolved.parent.attrs, align: 'center' }, resolved.parent.marks);
+        } else {
+            const node = resolved.nodeAfter;
+            const sm = state.storedMarks || undefined;
+            if (node) {
+                tr.replaceRangeWith(state.selection.from, state.selection.from, schema.nodes.paragraph.create({ align: 'center' })).setStoredMarks([...node.marks, ...(sm ? sm : [])]);
+            }
+        }
+        dispatch(tr);
+        return true;
+    });
+    bind('Cmd-[', (state: EditorState, dispatch: (tx: Transaction) => void) => {
+        const resolved = state.doc.resolve(state.selection.from) as any;
+        const tr = state.tr;
+        if (resolved?.parent.type.name === 'paragraph') {
+            tr.setNodeMarkup(resolved.path[resolved.path.length - 4], schema.nodes.paragraph, { ...resolved.parent.attrs, align: 'left' }, resolved.parent.marks);
+        } else {
+            const node = resolved.nodeAfter;
+            const sm = state.storedMarks || undefined;
+            if (node) {
+                tr.replaceRangeWith(state.selection.from, state.selection.from, schema.nodes.paragraph.create({ align: 'left' })).setStoredMarks([...node.marks, ...(sm ? sm : [])]);
+            }
+        }
+        dispatch(tr);
+        return true;
+    });
+
+    bind('Cmd-f', (state: EditorState, dispatch: (tx: Transaction) => void) => {
+        const content = state.tr.selection.empty ? undefined : state.tr.selection.content().content.textBetween(0, state.tr.selection.content().size + 1);
+        const newNode = schema.nodes.footnote.create({}, content ? state.schema.text(content) : undefined);
+        const 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 || 0)
+                    )
+                )
+            )
+        );
+        return true;
+    });
 
     bind('Ctrl-a', (state: EditorState, dispatch: (tx: Transaction) => void) => {
         dispatch(state.tr.setSelection(new TextSelection(state.doc.resolve(1), state.doc.resolve(state.doc.content.size - 1))));