@fiduswriter/editor 0.1.20 → 0.1.21

package/src/{keymap.js → keymap.ts}

@@ -7,6 +7,10 @@ import {
 } from "prosemirror-commands"
 import {redo, undo} from "prosemirror-history"
 import {liftListItem} from "prosemirror-schema-list"
+import type {Node, NodeType, Schema} from "prosemirror-model"
+import type {Command, EditorState, Transaction} from "prosemirror-state"
+import type {EditorView} from "prosemirror-view"
+
 const mac =
     typeof navigator != "undefined" ? /Mac/.test(navigator.platform) : false
 
@@ -15,15 +19,19 @@ const backspace = chainCommands(
     joinBackward,
     selectNodeBackward
 )
-const addInputType = (tr, inputType) => tr.setMeta("inputType", inputType)
+const addInputType = (tr: Transaction, inputType: string) =>
+    tr.setMeta("inputType", inputType)
 
 /* Adjusted version of setBlockType that preserves attributes */
 /* source https://github.com/ProseMirror/prosemirror-commands/blob/b9ceb06e340ffcb3e12cd214f58939e81c0b61af/src/commands.js#L414-L432 */
-export function setBlockType(nodeType, attrs = {}) {
+export function setBlockType(
+    nodeType: NodeType,
+    attrs: Record<string, unknown> = {}
+): Command {
     return (state, dispatch) => {
         const {from, to} = state.selection
         const tr = state.tr
-        state.doc.nodesBetween(from, to, (node, pos) => {
+        state.doc.nodesBetween(from, to, (node: Node, pos: number) => {
             if (!node.isTextblock || node.hasMarkup(nodeType, attrs)) {
                 return
             }
@@ -58,32 +66,40 @@ export function setBlockType(nodeType, attrs = {}) {
     }
 }
 
-export const buildEditorKeymap = schema => {
-    const editorKeymap = {
-        Backspace: (state, dispatch, view) =>
+export const buildEditorKeymap = (schema: Schema) => {
+    const editorKeymap: Record<string, Command> = {
+        Backspace: (state: EditorState, dispatch, view?: EditorView) =>
             backspace(
                 state,
-                tr => dispatch(addInputType(tr, "deleteContentBackward")),
+                tr => dispatch!(addInputType(tr, "deleteContentBackward")),
+                view
+            ),
+        "Mod-z": (state: EditorState, dispatch, view?: EditorView) =>
+            undo(
+                state,
+                tr => dispatch!(addInputType(tr, "historyUndo")),
+                view
+            ),
+        "Shift-Mod-z": (state: EditorState, dispatch, view?: EditorView) =>
+            redo(
+                state,
+                tr => dispatch!(addInputType(tr, "historyRedo")),
                 view
             ),
-        "Mod-z": (state, dispatch, view) =>
-            undo(state, tr => dispatch(addInputType(tr, "historyUndo")), view),
-        "Shift-Mod-z": (state, dispatch, view) =>
-            redo(state, tr => dispatch(addInputType(tr, "historyRedo")), view),
         "Shift-Ctrl-0": setBlockType(schema.nodes.paragraph),
         "Shift-Ctrl-\\": setBlockType(schema.nodes.code_block),
         "Ctrl-<": liftListItem(schema.nodes.list_item),
-        "Mod-.": (state, dispatch) => {
+        "Mod-.": (state: EditorState, dispatch) => {
             const mark = schema.marks.sup
             const command = toggleMark(mark)
             return command(state, dispatch)
         },
-        "Mod-,": (state, dispatch) => {
+        "Mod-,": (state: EditorState, dispatch) => {
             const mark = schema.marks.sub
             const command = toggleMark(mark)
             return command(state, dispatch)
         },
-        "Mod-'": (state, dispatch) => {
+        "Mod-'": (state: EditorState, dispatch) => {
             const mark = schema.marks.code
             const command = toggleMark(mark)
             return command(state, dispatch)
@@ -95,8 +111,12 @@ export const buildEditorKeymap = schema => {
         })
     }
     if (!mac) {
-        editorKeymap["Mod-y"] = (state, dispatch, view) =>
-            redo(state, tr => dispatch(addInputType(tr, "historyRedo")), view)
+        editorKeymap["Mod-y"] = (state: EditorState, dispatch, view?: EditorView) =>
+            redo(
+                state,
+                tr => dispatch!(addInputType(tr, "historyRedo")),
+                view
+            )
     }
     return editorKeymap
 }