@fiduswriter/editor 0.1.20 → 0.1.21

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

@@ -1,3 +1,5 @@
+import type {Node} from "prosemirror-model"
+import type {EditorState, Transaction} from "prosemirror-state"
 import {
     addColumnAfter,
     addColumnBefore,
@@ -12,9 +14,10 @@ import {
     toggleHeaderRow
 } from "prosemirror-tables"
 import {TableConfigurationDialog} from "../../dialogs/index.js"
+import type {Editor} from "../../types.js"
 
 // from https://github.com/ProseMirror/prosemirror-tables/blob/master/src/util.js
-const findTable = state => {
+const findTable = (state: EditorState) => {
     const $head = state.selection.$head
     for (let d = $head.depth; d > 0; d--) {
         if ($head.node(d).type.name == "table") {
@@ -25,7 +28,10 @@ const findTable = state => {
 }
 
 // Adjusted from https://github.com/ProseMirror/prosemirror-tables/blob/master/src/commands.js
-export function deleteTable(state, dispatch) {
+export function deleteTable(
+    state: EditorState,
+    dispatch?: (tr: Transaction) => void
+): boolean {
     const $pos = state.selection.$anchor
     for (let d = $pos.depth; d > 0; d--) {
         const node = $pos.node(d)
@@ -43,7 +49,7 @@ export function deleteTable(state, dispatch) {
     return false
 }
 
-const tableAddedFromTemplate = state => {
+const tableAddedFromTemplate = (state: EditorState) => {
     const $head = state.selection.$head
     for (let d = $head.depth; d > 0; d--) {
         if ($head.node(d).type.name == "table") {
@@ -57,31 +63,32 @@ const tableAddedFromTemplate = state => {
     return true
 }
 
-const tableAddedByUser = (table, userId) =>
+const tableAddedByUser = (table: Node, userId: number) =>
     table.attrs.track.find(
-        track => track.type === "insertion" && track.user === userId
+        (track: {type: string; user: number}) =>
+            track.type === "insertion" && track.user === userId
     )
         ? true
         : false
 export const tableMenuModel = () => ({
     content: [
         {
-            title: editor =>
+            title: (editor: Editor) =>
                 `${gettext("Add row above")}${editor.view.state.doc.attrs.tracked ? ` (${gettext("Not tracked")})` : ""}`,
             type: "action",
             tooltip: gettext("Add a row above the current row"),
             order: 0,
-            action: editor => {
+            action: (editor: Editor) => {
                 addRowBefore(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr.setMeta("untracked", true))
                 )
             },
-            disabled: editor => {
+            disabled: (editor: Editor) => {
                 const table = findTable(editor.currentView.state)
                 if (
                     !table ||
                     (["write-tracked", "review-tracked"].includes(
-                        editor.docInfo.access_rights
+                        (editor.docInfo.access_rights as string)
                     ) &&
                         !tableAddedByUser(table, editor.user.id))
                 ) {
@@ -92,22 +99,22 @@ export const tableMenuModel = () => ({
             }
         },
         {
-            title: editor =>
+            title: (editor: Editor) =>
                 `${gettext("Add row below")}${editor.view.state.doc.attrs.tracked ? ` (${gettext("Not tracked")})` : ""}`,
             type: "action",
             tooltip: gettext("Add a row below the current row"),
             order: 1,
-            action: editor => {
+            action: (editor: Editor) => {
                 addRowAfter(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr.setMeta("untracked", true))
                 )
             },
-            disabled: editor => {
+            disabled: (editor: Editor) => {
                 const table = findTable(editor.currentView.state)
                 if (
                     !table ||
                     (["write-tracked", "review-tracked"].includes(
-                        editor.docInfo.access_rights
+                        (editor.docInfo.access_rights as string)
                     ) &&
                         !tableAddedByUser(table, editor.user.id))
                 ) {
@@ -118,22 +125,22 @@ export const tableMenuModel = () => ({
             }
         },
         {
-            title: editor =>
+            title: (editor: Editor) =>
                 `${gettext("Add column left")}${editor.view.state.doc.attrs.tracked ? ` (${gettext("Not tracked")})` : ""}`,
             type: "action",
             tooltip: gettext("Add a column to the left of the current column"),
             order: 2,
-            action: editor => {
+            action: (editor: Editor) => {
                 addColumnBefore(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr.setMeta("untracked", true))
                 )
             },
-            disabled: editor => {
+            disabled: (editor: Editor) => {
                 const table = findTable(editor.currentView.state)
                 if (
                     !table ||
                     (["write-tracked", "review-tracked"].includes(
-                        editor.docInfo.access_rights
+                        (editor.docInfo.access_rights as string)
                     ) &&
                         !tableAddedByUser(table, editor.user.id))
                 ) {
@@ -144,22 +151,22 @@ export const tableMenuModel = () => ({
             }
         },
         {
-            title: editor =>
+            title: (editor: Editor) =>
                 `${gettext("Add column right")}${editor.view.state.doc.attrs.tracked ? ` (${gettext("Not tracked")})` : ""}`,
             type: "action",
             tooltip: gettext("Add a column to the right of the current column"),
             order: 3,
-            action: editor => {
+            action: (editor: Editor) => {
                 addColumnAfter(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr.setMeta("untracked", true))
                 )
             },
-            disabled: editor => {
+            disabled: (editor: Editor) => {
                 const table = findTable(editor.currentView.state)
                 if (
                     !table ||
                     (["write-tracked", "review-tracked"].includes(
-                        editor.docInfo.access_rights
+                        (editor.docInfo.access_rights as string)
                     ) &&
                         !tableAddedByUser(table, editor.user.id))
                 ) {
@@ -174,22 +181,22 @@ export const tableMenuModel = () => ({
             order: 4
         },
         {
-            title: editor =>
+            title: (editor: Editor) =>
                 `${gettext("Delete row")}${editor.view.state.doc.attrs.tracked ? ` (${gettext("Not tracked")})` : ""}`,
             type: "action",
             tooltip: gettext("Delete current row"),
             order: 5,
-            action: editor => {
+            action: (editor: Editor) => {
                 deleteRow(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr.setMeta("untracked", true))
                 )
             },
-            disabled: editor => {
+            disabled: (editor: Editor) => {
                 const table = findTable(editor.currentView.state)
                 if (
                     !table ||
                     (["write-tracked", "review-tracked"].includes(
-                        editor.docInfo.access_rights
+                        (editor.docInfo.access_rights as string)
                     ) &&
                         !tableAddedByUser(table, editor.user.id))
                 ) {
@@ -200,22 +207,22 @@ export const tableMenuModel = () => ({
             }
         },
         {
-            title: editor =>
+            title: (editor: Editor) =>
                 `${gettext("Delete column")}${editor.view.state.doc.attrs.tracked ? ` (${gettext("Not tracked")})` : ""}`,
             type: "action",
             tooltip: gettext("Delete current column"),
             order: 6,
-            action: editor => {
+            action: (editor: Editor) => {
                 deleteColumn(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr.setMeta("untracked", true))
                 )
             },
-            disabled: editor => {
+            disabled: (editor: Editor) => {
                 const table = findTable(editor.currentView.state)
                 if (
                     !table ||
                     (["write-tracked", "review-tracked"].includes(
-                        editor.docInfo.access_rights
+                        (editor.docInfo.access_rights as string)
                     ) &&
                         !tableAddedByUser(table, editor.user.id))
                 ) {
@@ -230,25 +237,31 @@ export const tableMenuModel = () => ({
             order: 7
         },
         {
-            title: editor =>
+            title: (editor: Editor) =>
                 `${gettext("Merge cells")}${editor.view.state.doc.attrs.tracked ? ` (${gettext("Not tracked")})` : ""}`,
             type: "action",
             tooltip: gettext("Merge selected cells"),
             order: 8,
-            action: editor => {
+            action: (editor: Editor) => {
                 mergeCells(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr.setMeta("untracked", true))
                 )
             },
-            disabled: editor => {
+            disabled: (editor: Editor) => {
                 const table = findTable(editor.currentView.state)
+                const selection = editor.currentView.state
+                    .selection as unknown as {
+                    jsonID: string
+                    $headCell: {pos: number}
+                    $anchorCell: {pos: number}
+                }
                 if (
                     !table ||
-                    editor.currentView.state.selection.jsonID !== "cell" ||
-                    editor.currentView.state.selection.$headCell.pos ===
-                        editor.currentView.state.selection.$anchorCell.pos ||
+                    selection.jsonID !== "cell" ||
+                    selection.$headCell.pos ===
+                        selection.$anchorCell.pos ||
                     (["write-tracked", "review-tracked"].includes(
-                        editor.docInfo.access_rights
+                        (editor.docInfo.access_rights as string)
                     ) &&
                         !tableAddedByUser(table, editor.user.id))
                 ) {
@@ -259,29 +272,37 @@ export const tableMenuModel = () => ({
             }
         },
         {
-            title: editor =>
+            title: (editor: Editor) =>
                 `${gettext("Split cells")}${editor.view.state.doc.attrs.tracked ? ` (${gettext("Not tracked")})` : ""}`,
             type: "action",
             tooltip: gettext("Split selected cell"),
             order: 9,
-            action: editor => {
+            action: (editor: Editor) => {
                 splitCell(editor.currentView.state, tr =>
                     editor.currentView.dispatch(tr.setMeta("untracked", true))
                 )
             },
-            disabled: editor => {
+            disabled: (editor: Editor) => {
                 const table = findTable(editor.currentView.state)
+                const selection = editor.currentView.state
+                    .selection as unknown as {
+                    jsonID: string
+                    $headCell: {pos: number}
+                    $anchorCell: {
+                        pos: number
+                        nodeAfter: {attrs: {rowspan: number; colspan: number}}
+                    }
+                }
                 if (
                     !table ||
-                    editor.currentView.state.selection.jsonID !== "cell" ||
-                    editor.currentView.state.selection.$headCell.pos !==
-                        editor.currentView.state.selection.$anchorCell.pos ||
-                    (editor.currentView.state.selection.$anchorCell.nodeAfter
-                        .attrs.rowspan === 1 &&
-                        editor.currentView.state.selection.$anchorCell.nodeAfter
-                            .attrs.colspan === 1) ||
+                    selection.jsonID !== "cell" ||
+                    selection.$headCell.pos !==
+                        selection.$anchorCell.pos ||
+                    (selection.$anchorCell.nodeAfter.attrs.rowspan === 1 &&
+                        selection.$anchorCell.nodeAfter.attrs.colspan ===
+                            1) ||
                     (["write-tracked", "review-tracked"].includes(
-                        editor.docInfo.access_rights
+                        (editor.docInfo.access_rights as string)
                     ) &&
                         !tableAddedByUser(table, editor.user.id))
                 ) {
@@ -296,23 +317,23 @@ export const tableMenuModel = () => ({
             order: 10
         },
         {
-            title: editor =>
+            title: (editor: Editor) =>
                 `${gettext("Toggle header row")}${editor.view.state.doc.attrs.tracked ? ` (${gettext("Not tracked")})` : ""}`,
             type: "action",
             tooltip: gettext("Toggle header-status of currently selected row"),
             order: 11,
-            action: editor => {
+            action: (editor: Editor) => {
                 toggleHeaderRow(
                     editor.currentView.state,
                     editor.currentView.dispatch
                 )
             },
-            disabled: editor => {
+            disabled: (editor: Editor) => {
                 const table = findTable(editor.currentView.state)
                 if (
                     !table ||
                     (["write-tracked", "review-tracked"].includes(
-                        editor.docInfo.access_rights
+                        (editor.docInfo.access_rights as string)
                     ) &&
                         !tableAddedByUser(table, editor.user.id))
                 ) {
@@ -323,25 +344,25 @@ export const tableMenuModel = () => ({
             }
         },
         {
-            title: editor =>
+            title: (editor: Editor) =>
                 `${gettext("Toggle header column")}${editor.view.state.doc.attrs.tracked ? ` (${gettext("Not tracked")})` : ""}`,
             type: "action",
             tooltip: gettext(
                 "Toggle header-status of currently selected column"
             ),
             order: 12,
-            action: editor => {
+            action: (editor: Editor) => {
                 toggleHeaderColumn(
                     editor.currentView.state,
                     editor.currentView.dispatch
                 )
             },
-            disabled: editor => {
+            disabled: (editor: Editor) => {
                 const table = findTable(editor.currentView.state)
                 if (
                     !table ||
                     (["write-tracked", "review-tracked"].includes(
-                        editor.docInfo.access_rights
+                        (editor.docInfo.access_rights as string)
                     ) &&
                         !tableAddedByUser(table, editor.user.id))
                 ) {
@@ -352,25 +373,25 @@ export const tableMenuModel = () => ({
             }
         },
         {
-            title: editor =>
+            title: (editor: Editor) =>
                 `${gettext("Toggle header cell")}${editor.view.state.doc.attrs.tracked ? ` (${gettext("Not tracked")})` : ""}`,
             type: "action",
             tooltip: gettext(
                 "Toggle header-status of currently selected cells"
             ),
             order: 13,
-            action: editor => {
+            action: (editor: Editor) => {
                 toggleHeaderCell(
                     editor.currentView.state,
                     editor.currentView.dispatch
                 )
             },
-            disabled: editor => {
+            disabled: (editor: Editor) => {
                 const table = findTable(editor.currentView.state)
                 if (
                     !table ||
                     (["write-tracked", "review-tracked"].includes(
-                        editor.docInfo.access_rights
+                        (editor.docInfo.access_rights as string)
                     ) &&
                         !tableAddedByUser(table, editor.user.id))
                 ) {
@@ -389,12 +410,12 @@ export const tableMenuModel = () => ({
             type: "action",
             tooltip: gettext("Configure the table."),
             order: 15,
-            action: editor => {
+            action: (editor: Editor) => {
                 const dialog = new TableConfigurationDialog(editor)
                 dialog.init()
                 return false
             },
-            disabled: editor => !findTable(editor.currentView.state)
+            disabled: (editor: Editor) => !findTable(editor.currentView.state)
         },
         {
             title: gettext("Delete table"),
@@ -402,13 +423,13 @@ export const tableMenuModel = () => ({
             icon: "trash-alt",
             tooltip: gettext("Delete currently selected table"),
             order: 16,
-            action: editor => {
+            action: (editor: Editor) => {
                 deleteTable(
                     editor.currentView.state,
                     editor.currentView.dispatch
                 )
             },
-            disabled: editor => tableAddedFromTemplate(editor.currentView.state)
+            disabled: (editor: Editor) => tableAddedFromTemplate(editor.currentView.state)
         }
     ]
 })