@fiduswriter/editor 0.1.20 → 0.1.21

package/src/menus/toolbar/{model.js → model.ts}

@@ -1,6 +1,8 @@
 import {toggleMark, wrapIn} from "prosemirror-commands"
 import {redo, redoDepth, undo, undoDepth} from "prosemirror-history"
 import {wrapInList} from "prosemirror-schema-list"
+import type {Mark, Node} from "prosemirror-model"
+import type {Selection, Transaction} from "prosemirror-state"
 
 import {COMMENT_ONLY_ROLES, READ_ONLY_ROLES} from "../../index.js"
 import {
@@ -11,13 +13,18 @@ import {
     TableDialog
 } from "../../dialogs/index.js"
 import {setBlockType} from "../../keymap.js"
+import {checkProtectedInSelection} from "../../state_plugins/document_template.js"
 import {
-    checkProtectedInSelection,
     getInlineReferenceState,
     setInlineReferenceState
-} from "../../state_plugins/index.js"
+} from "../../state_plugins/inline_reference/index.js"
+import type {Editor} from "../../types.js"
 
-const BLOCK_LABELS = {
+interface BlockLabels {
+    [key: string]: string
+}
+
+const BLOCK_LABELS: BlockLabels = {
     paragraph: gettext("Normal Text"),
     heading1: gettext("1st Heading"),
     heading2: gettext("2nd Heading"),
@@ -29,34 +36,61 @@ const BLOCK_LABELS = {
     figure: gettext("Figure")
 }
 
+/** Minimal shape of the headerbar model used by the toolbar toggle button. */
+interface HeaderbarModelLike {
+    open: boolean
+}
+
+/** Minimal shape of the headerbar view used to refresh the header menu. */
+interface HeaderbarViewLike {
+    update(): void
+}
+
+/**
+ * ProseMirror's base Selection type does not expose the instance `jsonID` and
+ * `node` properties that concrete subclasses such as NodeSelection provide.
+ * The toolbar model only reads these values, so we cast through this small
+ * local interface rather than using `any`.
+ */
+interface SelectionExtras {
+    jsonID: string
+    node?: Node
+}
+
+function currentSelection(editor: Editor): Selection & SelectionExtras {
+    return editor.currentView.state.selection as Selection & SelectionExtras
+}
+
 // from https://github.com/ProseMirror/prosemirror-tables/blob/master/src/util.js
-const findTable = state => {
+const findTable = (state: {selection: {$head: {depth: number; node(d: number): Node}}}) => {
     const $head = state.selection.$head
     for (let d = $head.depth; d > 0; d--) {
-        if ($head.node(d).type.spec.tableRole == "table") {
+        if (($head.node(d).type.spec as {tableRole?: string}).tableRole == "table") {
             return $head.node(d)
         }
     }
-    return false
+    return null
 }
 
-function elementAvailable(editor, elementName) {
+function elementAvailable(editor: Editor, elementName: string): boolean {
     let elementInDocParts = false
     editor.view.state.doc.forEach(docPart => {
         if (
-            docPart.attrs.elements &&
-            docPart.attrs.elements.includes(elementName)
+            (docPart.attrs.elements as string[] | undefined)?.includes(elementName)
         ) {
             elementInDocParts = true
         }
     })
     return (
-        editor.view.state.doc.attrs.footnote_elements.includes(elementName) ||
+        (editor.view.state.doc.attrs.footnote_elements as string[]).includes(elementName) ||
         elementInDocParts
     )
 }
 
-export function elementDisabled(editor, elementName) {
+export function elementDisabled(
+    editor: Editor,
+    elementName: string
+): boolean {
     if (editor.currentView === editor.view) {
         // main editor
         const anchorDocPart =
@@ -66,8 +100,7 @@ export function elementDisabled(editor, elementName) {
         return (
             !anchorDocPart ||
             headDocPart !== anchorDocPart ||
-            !anchorDocPart.attrs.elements ||
-            !anchorDocPart.attrs.elements.includes(elementName) ||
+            !(anchorDocPart.attrs.elements as string[] | undefined)?.includes(elementName) ||
             checkProtectedInSelection(editor.view.state)
         )
     } else {
@@ -79,25 +112,25 @@ export function elementDisabled(editor, elementName) {
         return (
             !anchorFootnote ||
             headFootnote !== anchorFootnote ||
-            !editor.view.state.doc.attrs.footnote_elements.includes(elementName)
+            !(editor.view.state.doc.attrs.footnote_elements as string[]).includes(elementName)
         )
     }
 }
 
-function markAvailable(editor, markName) {
+function markAvailable(editor: Editor, markName: string): boolean {
     let markInDocParts = false
     editor.view.state.doc.forEach(docPart => {
-        if (docPart.attrs.elements && docPart.attrs.marks.includes(markName)) {
+        if ((docPart.attrs.marks as string[] | undefined)?.includes(markName)) {
             markInDocParts = true
         }
     })
     return (
-        editor.view.state.doc.attrs.footnote_marks.includes(markName) ||
+        (editor.view.state.doc.attrs.footnote_marks as string[]).includes(markName) ||
         markInDocParts
     )
 }
 
-function markDisabled(editor, markName) {
+function markDisabled(editor: Editor, markName: string): boolean {
     if (editor.currentView === editor.view) {
         // main editor
         const anchorDocPart =
@@ -107,8 +140,7 @@ function markDisabled(editor, markName) {
         return (
             !anchorDocPart ||
             headDocPart !== anchorDocPart ||
-            !anchorDocPart.attrs.marks ||
-            !anchorDocPart.attrs.marks.includes(markName) ||
+            !(anchorDocPart.attrs.marks as string[] | undefined)?.includes(markName) ||
             checkProtectedInSelection(editor.view.state)
         )
     } else {
@@ -120,7 +152,7 @@ function markDisabled(editor, markName) {
         return (
             !anchorFootnote ||
             headFootnote !== anchorFootnote ||
-            !editor.view.state.doc.attrs.footnote_marks.includes(markName)
+            !(editor.view.state.doc.attrs.footnote_marks as string[]).includes(markName)
         )
     }
 }
@@ -131,22 +163,22 @@ export const toolbarModel = () => ({
         {
             type: "button",
             title: gettext("Open/close header menu"),
-            icon: editor => {
-                if (editor.menu.headerbarModel.open) {
+            icon: (editor: Editor) => {
+                if ((editor.menu.headerbarModel as HeaderbarModelLike).open) {
                     return "angle-double-up"
                 } else {
                     return "angle-double-down"
                 }
             },
-            action: editor => {
-                editor.menu.headerbarModel.open =
-                    !editor.menu.headerbarModel.open
+            action: (editor: Editor) => {
+                ;(editor.menu.headerbarModel as HeaderbarModelLike).open =
+                    !(editor.menu.headerbarModel as HeaderbarModelLike).open
                 if (editor.menu.headerView) {
-                    editor.menu.headerView.update()
+                    ;(editor.menu.headerView as HeaderbarViewLike).update()
                 }
             },
-            class: editor => {
-                if (editor.menu.headerbarModel.open) {
+            class: (editor: Editor) => {
+                if ((editor.menu.headerbarModel as HeaderbarModelLike).open) {
                     return "no-border"
                 } else {
                     return "no-border header-closed"
@@ -156,8 +188,9 @@ export const toolbarModel = () => ({
         },
         {
             type: "info",
-            show: editor => {
+            show: (editor: Editor) => {
                 let title = ""
+                const selection = currentSelection(editor)
                 if (editor.currentView !== editor.view) {
                     return gettext("Footnote")
                 } else if (
@@ -178,16 +211,16 @@ export const toolbarModel = () => ({
                 ) {
                     title =
                         editor.currentView.state.selection.$anchor.nodeAfter
-                            .attrs.title
+                            ?.attrs.title ?? ""
                     return title.length > 20
                         ? title.slice(0, 20) + "..."
                         : title
                 } else if (
-                    editor.currentView.state.selection.jsonID === "node" &&
-                    editor.currentView.state.selection.node.isBlock &&
-                    editor.currentView.state.selection.node.attrs.title
+                    selection.jsonID === "node" &&
+                    selection.node?.isBlock &&
+                    selection.node.attrs.title
                 ) {
-                    title = editor.currentView.state.selection.node.attrs.title
+                    title = selection.node.attrs.title
                     return title.length > 20
                         ? title.slice(0, 20) + "..."
                         : title
@@ -199,7 +232,8 @@ export const toolbarModel = () => ({
         },
         {
             type: "menu",
-            show: editor => {
+            show: (editor: Editor) => {
+                const selection = currentSelection(editor)
                 if (
                     editor.currentView.state.selection.$anchor.node(1) &&
                     !editor.view.state.selection.$anchor.node(1).attrs.elements
@@ -207,10 +241,10 @@ export const toolbarModel = () => ({
                     return ""
                 }
                 if (
-                    editor.currentView.state.selection.jsonID === "node" &&
-                    editor.currentView.state.selection.node.isBlock
+                    selection.jsonID === "node" &&
+                    selection.node?.isBlock
                 ) {
-                    const selectedNode = editor.currentView.state.selection.node
+                    const selectedNode = selection.node
                     return BLOCK_LABELS[selectedNode.type.name]
                         ? BLOCK_LABELS[selectedNode.type.name]
                         : ""
@@ -226,7 +260,7 @@ export const toolbarModel = () => ({
                         ? BLOCK_LABELS[blockNodeType]
                         : ""
                 } else {
-                    let blockNodeType = true
+                    let blockNodeType: string | boolean = true
                     editor.currentView.state.doc.nodesBetween(
                         editor.currentView.state.selection.from,
                         editor.currentView.state.selection.to,
@@ -243,7 +277,7 @@ export const toolbarModel = () => ({
                         }
                     )
 
-                    if (blockNodeType) {
+                    if (blockNodeType && typeof blockNodeType === "string") {
                         return BLOCK_LABELS[blockNodeType]
                             ? BLOCK_LABELS[blockNodeType]
                             : ""
@@ -252,119 +286,119 @@ export const toolbarModel = () => ({
                     }
                 }
             },
-            disabled: editor =>
-                READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
+            disabled: (editor: Editor) =>
+                READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
                 !editor.currentView.state.selection.$anchor.node(1) ||
                 !editor.currentView.state.selection.$anchor.node(1).attrs
                     .elements ||
-                (editor.currentView.state.selection.jsonID === "node" &&
-                    editor.currentView.state.selection.node.isBlock &&
-                    !editor.currentView.state.selection.node.isTextblock) ||
-                editor.currentView.state.selection.jsonID === "gapcursor",
+                (currentSelection(editor).jsonID === "node" &&
+                    currentSelection(editor).node?.isBlock &&
+                    !currentSelection(editor).node?.isTextblock) ||
+                currentSelection(editor).jsonID === "gapcursor",
             content: [
                 {
                     title: BLOCK_LABELS["paragraph"],
-                    action: editor => {
+                    action: (editor: Editor) => {
                         const view = editor.currentView
-                        setBlockType(view.state.schema.nodes.paragraph)(
+                        setBlockType(view.state.schema.nodes.paragraph!)(
                             view.state,
                             view.dispatch
                         )
                     },
-                    available: editor => elementAvailable(editor, "paragraph"),
-                    disabled: editor => elementDisabled(editor, "paragraph"),
+                    available: (editor: Editor) => elementAvailable(editor, "paragraph"),
+                    disabled: (editor: Editor) => elementDisabled(editor, "paragraph"),
                     order: 0
                 },
                 {
                     title: BLOCK_LABELS["heading1"],
-                    action: editor => {
+                    action: (editor: Editor) => {
                         const view = editor.currentView
-                        setBlockType(view.state.schema.nodes.heading1)(
+                        setBlockType(view.state.schema.nodes.heading1!)(
                             view.state,
                             view.dispatch
                         )
                     },
-                    available: editor => elementAvailable(editor, "heading1"),
-                    disabled: editor => elementDisabled(editor, "heading1"),
+                    available: (editor: Editor) => elementAvailable(editor, "heading1"),
+                    disabled: (editor: Editor) => elementDisabled(editor, "heading1"),
                     order: 1
                 },
                 {
                     title: BLOCK_LABELS["heading2"],
-                    action: editor => {
+                    action: (editor: Editor) => {
                         const view = editor.currentView
-                        setBlockType(view.state.schema.nodes.heading2)(
+                        setBlockType(view.state.schema.nodes.heading2!)(
                             view.state,
                             view.dispatch
                         )
                     },
-                    available: editor => elementAvailable(editor, "heading2"),
-                    disabled: editor => elementDisabled(editor, "heading2"),
+                    available: (editor: Editor) => elementAvailable(editor, "heading2"),
+                    disabled: (editor: Editor) => elementDisabled(editor, "heading2"),
                     order: 2
                 },
                 {
                     title: BLOCK_LABELS["heading3"],
-                    action: editor => {
+                    action: (editor: Editor) => {
                         const view = editor.currentView
-                        setBlockType(view.state.schema.nodes.heading3)(
+                        setBlockType(view.state.schema.nodes.heading3!)(
                             view.state,
                             view.dispatch
                         )
                     },
-                    available: editor => elementAvailable(editor, "heading3"),
-                    disabled: editor => elementDisabled(editor, "heading3"),
+                    available: (editor: Editor) => elementAvailable(editor, "heading3"),
+                    disabled: (editor: Editor) => elementDisabled(editor, "heading3"),
                     order: 3
                 },
                 {
                     title: BLOCK_LABELS["heading4"],
-                    action: editor => {
+                    action: (editor: Editor) => {
                         const view = editor.currentView
-                        setBlockType(view.state.schema.nodes.heading4)(
+                        setBlockType(view.state.schema.nodes.heading4!)(
                             view.state,
                             view.dispatch
                         )
                     },
-                    available: editor => elementAvailable(editor, "heading4"),
-                    disabled: editor => elementDisabled(editor, "heading4"),
+                    available: (editor: Editor) => elementAvailable(editor, "heading4"),
+                    disabled: (editor: Editor) => elementDisabled(editor, "heading4"),
                     order: 4
                 },
                 {
                     title: BLOCK_LABELS["heading5"],
-                    action: editor => {
+                    action: (editor: Editor) => {
                         const view = editor.currentView
-                        setBlockType(view.state.schema.nodes.heading5)(
+                        setBlockType(view.state.schema.nodes.heading5!)(
                             view.state,
                             view.dispatch
                         )
                     },
-                    available: editor => elementAvailable(editor, "heading5"),
-                    disabled: editor => elementDisabled(editor, "heading5"),
+                    available: (editor: Editor) => elementAvailable(editor, "heading5"),
+                    disabled: (editor: Editor) => elementDisabled(editor, "heading5"),
                     order: 5
                 },
                 {
                     title: BLOCK_LABELS["heading6"],
-                    action: editor => {
+                    action: (editor: Editor) => {
                         const view = editor.currentView
-                        setBlockType(view.state.schema.nodes.heading6)(
+                        setBlockType(view.state.schema.nodes.heading6!)(
                             view.state,
                             view.dispatch
                         )
                     },
-                    available: editor => elementAvailable(editor, "heading6"),
-                    disabled: editor => elementDisabled(editor, "heading6"),
+                    available: (editor: Editor) => elementAvailable(editor, "heading6"),
+                    disabled: (editor: Editor) => elementDisabled(editor, "heading6"),
                     order: 6
                 },
                 {
                     title: BLOCK_LABELS["code_block"],
-                    action: editor => {
+                    action: (editor: Editor) => {
                         const view = editor.currentView
-                        setBlockType(view.state.schema.nodes.code_block)(
+                        setBlockType(view.state.schema.nodes.code_block!)(
                             view.state,
                             view.dispatch
                         )
                     },
-                    available: editor => elementAvailable(editor, "code_block"),
-                    disabled: editor => elementDisabled(editor, "code_block"),
+                    available: (editor: Editor) => elementAvailable(editor, "code_block"),
+                    disabled: (editor: Editor) => elementDisabled(editor, "code_block"),
                     order: 7
                 }
             ],
@@ -374,31 +408,32 @@ export const toolbarModel = () => ({
             type: "button",
             title: gettext("Strong"),
             icon: "bold",
-            action: editor => {
-                const mark = editor.currentView.state.schema.marks["strong"]
+            action: (editor: Editor) => {
+                const mark = editor.currentView.state.schema.marks["strong"]!
                 const command = toggleMark(mark)
                 command(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr)
                 )
             },
-            available: editor => markAvailable(editor, "strong"),
-            disabled: editor => {
+            available: (editor: Editor) => markAvailable(editor, "strong"),
+            disabled: (editor: Editor) => {
                 if (
-                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    editor.currentView.state.selection.jsonID === "gapcursor" ||
+                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    currentSelection(editor).jsonID === "gapcursor" ||
                     markDisabled(editor, "strong")
                 ) {
                     return true
                 }
+                return false
             },
-            selected: editor => {
+            selected: (editor: Editor) => {
                 const storedMarks = editor.currentView.state.storedMarks
                 if (
-                    storedMarks?.some(mark => mark.type.name === "strong") ||
+                    storedMarks?.some((mark: Mark) => mark.type.name === "strong") ||
                     editor.currentView.state.selection.$head
                         .marks()
-                        .some(mark => mark.type.name === "strong")
+                        .some((mark: Mark) => mark.type.name === "strong")
                 ) {
                     return true
                 } else {
@@ -411,26 +446,26 @@ export const toolbarModel = () => ({
             type: "button",
             title: gettext("Emphasis"),
             icon: "italic",
-            action: editor => {
-                const mark = editor.currentView.state.schema.marks["em"]
+            action: (editor: Editor) => {
+                const mark = editor.currentView.state.schema.marks["em"]!
                 const command = toggleMark(mark)
                 command(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr)
                 )
             },
-            available: editor => markAvailable(editor, "em"),
-            disabled: editor =>
-                READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                editor.currentView.state.selection.jsonID === "gapcursor" ||
+            available: (editor: Editor) => markAvailable(editor, "em"),
+            disabled: (editor: Editor) =>
+                READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                currentSelection(editor).jsonID === "gapcursor" ||
                 markDisabled(editor, "em"),
-            selected: editor => {
+            selected: (editor: Editor) => {
                 const storedMarks = editor.currentView.state.storedMarks
                 if (
-                    storedMarks?.some(mark => mark.type.name === "em") ||
+                    storedMarks?.some((mark: Mark) => mark.type.name === "em") ||
                     editor.currentView.state.selection.$head
                         .marks()
-                        .some(mark => mark.type.name === "em")
+                        .some((mark: Mark) => mark.type.name === "em")
                 ) {
                     return true
                 } else {
@@ -443,31 +478,32 @@ export const toolbarModel = () => ({
             type: "button",
             title: gettext("Underline"),
             icon: "underline",
-            action: editor => {
-                const mark = editor.currentView.state.schema.marks["underline"]
+            action: (editor: Editor) => {
+                const mark = editor.currentView.state.schema.marks["underline"]!
                 const command = toggleMark(mark)
                 command(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr)
                 )
             },
-            available: editor => markAvailable(editor, "underline"),
-            disabled: editor => {
+            available: (editor: Editor) => markAvailable(editor, "underline"),
+            disabled: (editor: Editor) => {
                 if (
-                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    editor.currentView.state.selection.jsonID === "gapcursor" ||
+                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    currentSelection(editor).jsonID === "gapcursor" ||
                     markDisabled(editor, "underline")
                 ) {
                     return true
                 }
+                return false
             },
-            selected: editor => {
+            selected: (editor: Editor) => {
                 const storedMarks = editor.currentView.state.storedMarks
                 if (
-                    storedMarks?.some(mark => mark.type.name === "underline") ||
+                    storedMarks?.some((mark: Mark) => mark.type.name === "underline") ||
                     editor.currentView.state.selection.$head
                         .marks()
-                        .some(mark => mark.type.name === "underline")
+                        .some((mark: Mark) => mark.type.name === "underline")
                 ) {
                     return true
                 } else {
@@ -480,31 +516,32 @@ export const toolbarModel = () => ({
             type: "button",
             title: gettext("Superscript"),
             icon: "superscript",
-            action: editor => {
-                const mark = editor.currentView.state.schema.marks["sup"]
+            action: (editor: Editor) => {
+                const mark = editor.currentView.state.schema.marks["sup"]!
                 const command = toggleMark(mark)
                 command(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr)
                 )
             },
-            available: editor => markAvailable(editor, "sup"),
-            disabled: editor => {
+            available: (editor: Editor) => markAvailable(editor, "sup"),
+            disabled: (editor: Editor) => {
                 if (
-                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    editor.currentView.state.selection.jsonID === "gapcursor" ||
+                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    currentSelection(editor).jsonID === "gapcursor" ||
                     markDisabled(editor, "sup")
                 ) {
                     return true
                 }
+                return false
             },
-            selected: editor => {
+            selected: (editor: Editor) => {
                 const storedMarks = editor.currentView.state.storedMarks
                 if (
-                    storedMarks?.some(mark => mark.type.name === "sup") ||
+                    storedMarks?.some((mark: Mark) => mark.type.name === "sup") ||
                     editor.currentView.state.selection.$head
                         .marks()
-                        .some(mark => mark.type.name === "sup")
+                        .some((mark: Mark) => mark.type.name === "sup")
                 ) {
                     return true
                 } else {
@@ -517,31 +554,32 @@ export const toolbarModel = () => ({
             type: "button",
             title: gettext("Subscript"),
             icon: "subscript",
-            action: editor => {
-                const mark = editor.currentView.state.schema.marks["sub"]
+            action: (editor: Editor) => {
+                const mark = editor.currentView.state.schema.marks["sub"]!
                 const command = toggleMark(mark)
                 command(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr)
                 )
             },
-            available: editor => markAvailable(editor, "sub"),
-            disabled: editor => {
+            available: (editor: Editor) => markAvailable(editor, "sub"),
+            disabled: (editor: Editor) => {
                 if (
-                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    editor.currentView.state.selection.jsonID === "gapcursor" ||
+                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    currentSelection(editor).jsonID === "gapcursor" ||
                     markDisabled(editor, "sub")
                 ) {
                     return true
                 }
+                return false
             },
-            selected: editor => {
+            selected: (editor: Editor) => {
                 const storedMarks = editor.currentView.state.storedMarks
                 if (
-                    storedMarks?.some(mark => mark.type.name === "sub") ||
+                    storedMarks?.some((mark: Mark) => mark.type.name === "sub") ||
                     editor.currentView.state.selection.$head
                         .marks()
-                        .some(mark => mark.type.name === "sub")
+                        .some((mark: Mark) => mark.type.name === "sub")
                 ) {
                     return true
                 } else {
@@ -554,31 +592,32 @@ export const toolbarModel = () => ({
             type: "button",
             title: gettext("Code"),
             icon: "code",
-            action: editor => {
-                const mark = editor.currentView.state.schema.marks["code"]
+            action: (editor: Editor) => {
+                const mark = editor.currentView.state.schema.marks["code"]!
                 const command = toggleMark(mark)
                 command(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr)
                 )
             },
-            available: editor => markAvailable(editor, "code"),
-            disabled: editor => {
+            available: (editor: Editor) => markAvailable(editor, "code"),
+            disabled: (editor: Editor) => {
                 if (
-                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    editor.currentView.state.selection.jsonID === "gapcursor" ||
+                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    currentSelection(editor).jsonID === "gapcursor" ||
                     markDisabled(editor, "code")
                 ) {
                     return true
                 }
+                return false
             },
-            selected: editor => {
+            selected: (editor: Editor) => {
                 const storedMarks = editor.currentView.state.storedMarks
                 if (
-                    storedMarks?.some(mark => mark.type.name === "code") ||
+                    storedMarks?.some((mark: Mark) => mark.type.name === "code") ||
                     editor.currentView.state.selection.$head
                         .marks()
-                        .some(mark => mark.type.name === "code")
+                        .some((mark: Mark) => mark.type.name === "code")
                 ) {
                     return true
                 } else {
@@ -591,31 +630,32 @@ export const toolbarModel = () => ({
             type: "button",
             title: gettext("Numbered list"),
             icon: "list-ol",
-            action: editor => {
+            action: (editor: Editor) => {
                 const node =
-                    editor.currentView.state.schema.nodes["ordered_list"]
+                    editor.currentView.state.schema.nodes["ordered_list"]!
                 const command = wrapInList(node)
                 command(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr)
                 )
             },
-            available: editor => elementAvailable(editor, "ordered_list"),
-            disabled: editor => {
+            available: (editor: Editor) => elementAvailable(editor, "ordered_list"),
+            disabled: (editor: Editor) => {
                 if (
-                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
+                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
                     elementDisabled(editor, "ordered_list")
                 ) {
                     return true
                 }
+                return false
             },
-            selected: editor => {
+            selected: (editor: Editor) => {
                 const depth =
                     editor.currentView.state.selection.$head.sharedDepth(
                         editor.currentView.state.selection.anchor
                     )
                 const nodeType =
-                    editor.currentView.state.schema.nodes["ordered_list"]
+                    editor.currentView.state.schema.nodes["ordered_list"]!
                 for (let i = 0; i < depth; i++) {
                     const node =
                         editor.currentView.state.selection.$head.node(i)
@@ -631,31 +671,32 @@ export const toolbarModel = () => ({
             type: "button",
             title: gettext("Bullet list"),
             icon: "list-ul",
-            action: editor => {
+            action: (editor: Editor) => {
                 const node =
-                    editor.currentView.state.schema.nodes["bullet_list"]
+                    editor.currentView.state.schema.nodes["bullet_list"]!
                 const command = wrapInList(node)
                 command(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr)
                 )
             },
-            available: editor => elementAvailable(editor, "bullet_list"),
-            disabled: editor => {
+            available: (editor: Editor) => elementAvailable(editor, "bullet_list"),
+            disabled: (editor: Editor) => {
                 if (
-                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
+                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
                     elementDisabled(editor, "bullet_list")
                 ) {
                     return true
                 }
+                return false
             },
-            selected: editor => {
+            selected: (editor: Editor) => {
                 const depth =
                     editor.currentView.state.selection.$head.sharedDepth(
                         editor.currentView.state.selection.anchor
                     )
                 const nodeType =
-                    editor.currentView.state.schema.nodes["bullet_list"]
+                    editor.currentView.state.schema.nodes["bullet_list"]!
                 for (let i = 0; i < depth; i++) {
                     const node =
                         editor.currentView.state.selection.$head.node(i)
@@ -671,30 +712,31 @@ export const toolbarModel = () => ({
             type: "button",
             title: gettext("Blockquote"),
             icon: "quote-right",
-            action: editor => {
-                const node = editor.currentView.state.schema.nodes["blockquote"]
+            action: (editor: Editor) => {
+                const node = editor.currentView.state.schema.nodes["blockquote"]!
                 const command = wrapIn(node)
                 command(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr)
                 )
             },
-            available: editor => elementAvailable(editor, "blockquote"),
-            disabled: editor => {
+            available: (editor: Editor) => elementAvailable(editor, "blockquote"),
+            disabled: (editor: Editor) => {
                 if (
-                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
+                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
                     elementDisabled(editor, "blockquote")
                 ) {
                     return true
                 }
+                return false
             },
-            selected: editor => {
+            selected: (editor: Editor) => {
                 const depth =
                     editor.currentView.state.selection.$head.sharedDepth(
                         editor.currentView.state.selection.anchor
                     )
                 const nodeType =
-                    editor.currentView.state.schema.nodes["blockquote"]
+                    editor.currentView.state.schema.nodes["blockquote"]!
                 for (let i = 0; i < depth; i++) {
                     const node =
                         editor.currentView.state.selection.$head.node(i)
@@ -711,50 +753,52 @@ export const toolbarModel = () => ({
             type: "button",
             title: gettext("Link"),
             icon: "link",
-            action: editor => {
+            action: (editor: Editor) => {
                 const dialog = new LinkDialog(editor)
                 dialog.init()
             },
-            available: editor => markAvailable(editor, "link"),
-            disabled: editor => {
+            available: (editor: Editor) => markAvailable(editor, "link"),
+            disabled: (editor: Editor) => {
                 if (
-                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
+                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
                     (markDisabled(editor, "link") &&
                         elementDisabled(editor, "cross_reference"))
                 ) {
                     return true
                 }
+                return false
             },
-            selected: editor =>
+            selected: (editor: Editor) =>
                 editor.currentView.state.selection.$head
                     .marks()
-                    .some(mark => mark.type.name === "link"),
+                    .some((mark: Mark) => mark.type.name === "link"),
             order: 12
         },
         {
             type: "button",
             title: gettext("Footnote"),
             icon: "asterisk",
-            action: editor => {
-                const node = editor.view.state.schema.nodes["footnote"]
+            action: (editor: Editor) => {
+                const node = editor.view.state.schema.nodes["footnote"]!
                 const tr = editor.view.state.tr.replaceSelectionWith(
-                    node.createAndFill(),
+                    node.createAndFill()!,
                     false
                 )
                 editor.view.dispatch(tr)
                 return false
             },
-            available: editor => elementAvailable(editor, "footnote"),
-            disabled: editor => {
+            available: (editor: Editor) => elementAvailable(editor, "footnote"),
+            disabled: (editor: Editor) => {
                 if (
-                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
+                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
                     editor.view !== editor.currentView || // we don't allow footnotes in footnotes
                     elementDisabled(editor, "footnote")
                 ) {
                     return true
                 }
+                return false
             },
             order: 13
         },
@@ -762,36 +806,40 @@ export const toolbarModel = () => ({
             type: "button",
             title: gettext("Cite"),
             icon: "book",
-            action: editor => {
+            action: (editor: Editor) => {
                 const inlineState = getInlineReferenceState(
                     editor.currentView.state
-                )
+                ) as {active?: boolean; isEdit?: boolean} | undefined
                 if (inlineState?.active && inlineState.isEdit) {
                     editor.currentView.dispatch(
                         setInlineReferenceState(editor.currentView.state.tr, {
                             action: "openDialog"
-                        })
+                        } as Partial<{
+                            active?: boolean
+                            isEdit?: boolean
+                        }>) as Transaction
                     )
                 }
                 const dialog = new CitationDialog(editor)
                 dialog.init()
                 return false
             },
-            available: editor => elementAvailable(editor, "citation"),
-            disabled: editor => {
+            available: (editor: Editor) => elementAvailable(editor, "citation"),
+            disabled: (editor: Editor) => {
                 if (
-                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
+                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
                     elementDisabled(editor, "citation") ||
                     !["text", "node"].includes(
-                        editor.currentView.state.selection.jsonID
+                        currentSelection(editor).jsonID
                     ) ||
-                    (editor.currentView.state.selection.jsonID === "node" &&
-                        editor.currentView.state.selection.node.type.name !==
+                    (currentSelection(editor).jsonID === "node" &&
+                        currentSelection(editor).node?.type.name !==
                             "citation")
                 ) {
                     return true
                 }
+                return false
             },
             order: 14
         },
@@ -799,7 +847,7 @@ export const toolbarModel = () => ({
             type: "button",
             title: gettext("Horizontal line"),
             icon: "minus",
-            action: editor => {
+            action: (editor: Editor) => {
                 const view = editor.currentView,
                     state = view.state
                 view.dispatch(
@@ -808,15 +856,16 @@ export const toolbarModel = () => ({
                     )
                 )
             },
-            available: editor => elementAvailable(editor, "horizontal_rule"),
-            disabled: editor => {
+            available: (editor: Editor) => elementAvailable(editor, "horizontal_rule"),
+            disabled: (editor: Editor) => {
                 if (
-                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
+                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
                     elementDisabled(editor, "horizontal_rule")
                 ) {
                     return true
                 }
+                return false
             },
             order: 15
         },
@@ -824,25 +873,26 @@ export const toolbarModel = () => ({
             type: "button",
             title: gettext("Math"),
             icon: "percent",
-            action: editor => {
+            action: (editor: Editor) => {
                 const dialog = new MathDialog(editor)
                 dialog.init()
             },
-            available: editor => elementAvailable(editor, "equation"),
-            disabled: editor => {
+            available: (editor: Editor) => elementAvailable(editor, "equation"),
+            disabled: (editor: Editor) => {
                 if (
-                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
+                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
                     elementDisabled(editor, "equation") ||
                     !["text", "node"].includes(
-                        editor.currentView.state.selection.jsonID
+                        currentSelection(editor).jsonID
                     ) ||
-                    (editor.currentView.state.selection.jsonID === "node" &&
-                        editor.currentView.state.selection.node.type.name !==
+                    (currentSelection(editor).jsonID === "node" &&
+                        currentSelection(editor).node?.type.name !==
                             "equation")
                 ) {
                     return true
                 }
+                return false
             },
             order: 16
         },
@@ -850,20 +900,21 @@ export const toolbarModel = () => ({
             type: "button",
             title: gettext("Figure"),
             icon: "image",
-            action: editor => {
+            action: (editor: Editor) => {
                 const dialog = new FigureDialog(editor)
                 dialog.init()
                 return false
             },
-            available: editor => elementAvailable(editor, "figure"),
-            disabled: editor => {
+            available: (editor: Editor) => elementAvailable(editor, "figure"),
+            disabled: (editor: Editor) => {
                 if (
-                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
+                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
                     elementDisabled(editor, "figure")
                 ) {
                     return true
                 }
+                return false
             },
             order: 17
         },
@@ -872,21 +923,22 @@ export const toolbarModel = () => ({
             title: gettext("Table"),
             tooltip: gettext("Insert a table into the document."),
             icon: "table",
-            action: editor => {
+            action: (editor: Editor) => {
                 const dialog = new TableDialog(editor)
                 dialog.init()
                 return false
             },
-            available: editor => elementAvailable(editor, "table"),
-            disabled: editor => {
+            available: (editor: Editor) => elementAvailable(editor, "table"),
+            disabled: (editor: Editor) => {
                 if (
-                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
-                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights) ||
+                    READ_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
+                    COMMENT_ONLY_ROLES.includes(editor.docInfo.access_rights as string) ||
                     elementDisabled(editor, "table") ||
                     findTable(editor.currentView.state)
                 ) {
                     return true
                 }
+                return false
             },
             order: 15
         },
@@ -894,26 +946,26 @@ export const toolbarModel = () => ({
             type: "button",
             title: gettext("Undo"),
             icon: "undo",
-            action: editor =>
+            action: (editor: Editor) =>
                 undo(editor.currentView.state, tr =>
                     editor.currentView.dispatch(
                         tr.setMeta("inputType", "historyUndo")
                     )
                 ),
-            disabled: editor => undoDepth(editor.currentView.state) === 0,
+            disabled: (editor: Editor) => undoDepth(editor.currentView.state) === 0,
             order: 16
         },
         {
             type: "button",
             title: gettext("Redo"),
             icon: "redo",
-            action: editor =>
+            action: (editor: Editor) =>
                 redo(editor.currentView.state, tr =>
                     editor.currentView.dispatch(
                         tr.setMeta("inputType", "historyRedo")
                     )
                 ),
-            disabled: editor => redoDepth(editor.currentView.state) === 0,
+            disabled: (editor: Editor) => redoDepth(editor.currentView.state) === 0,
             order: 17
         }
     ]