fix: Add ability to convert between checklist and other types of list

shared/editor/nodes/Blockquote.ts

@@ -1,9 +1,10 @@
 import { wrappingInputRule } from "prosemirror-inputrules";
 import { NodeSpec, Node as ProsemirrorNode, NodeType } from "prosemirror-model";
-import { EditorState, Transaction } from "prosemirror-state";
+import { EditorState } from "prosemirror-state";
 import toggleWrap from "../commands/toggleWrap";
 import { MarkdownSerializerState } from "../lib/markdown/serializer";
 import isNodeActive from "../queries/isNodeActive";
+import { Dispatch } from "../types";
 import Node from "./Node";
 
 export default class Blockquote extends Node {
@@ -37,10 +38,7 @@ export default class Blockquote extends Node {
     return {
       "Ctrl->": toggleWrap(type),
       "Mod-]": toggleWrap(type),
-      "Shift-Enter": (
-        state: EditorState,
-        dispatch: (tr: Transaction) => void
-      ) => {
+      "Shift-Enter": (state: EditorState, dispatch: Dispatch) => {
         if (!isNodeActive(type)(state)) {
           return false;
         }

shared/editor/nodes/CodeFence.ts

@@ -38,7 +38,7 @@ import toggleBlockType from "../commands/toggleBlockType";
 import { MarkdownSerializerState } from "../lib/markdown/serializer";
 import Prism, { LANGUAGES } from "../plugins/Prism";
 import isInCode from "../queries/isInCode";
-import { ToastType } from "../types";
+import { Dispatch, ToastType } from "../types";
 import Node from "./Node";
 
 const PERSISTENCE_KEY = "rme-code-language";
@@ -146,10 +146,7 @@ export default class CodeFence extends Node {
   keys({ type, schema }: { type: NodeType; schema: Schema }) {
     return {
       "Shift-Ctrl-\\": toggleBlockType(type, schema.nodes.paragraph),
-      "Shift-Enter": (
-        state: EditorState,
-        dispatch: (tr: Transaction) => void
-      ) => {
+      "Shift-Enter": (state: EditorState, dispatch: Dispatch) => {
         if (!isInCode(state)) {
           return false;
         }
@@ -172,7 +169,7 @@ export default class CodeFence extends Node {
         dispatch(tr.insertText(newText, selection.from, selection.to));
         return true;
       },
-      Tab: (state: EditorState, dispatch: (tr: Transaction) => void) => {
+      Tab: (state: EditorState, dispatch: Dispatch) => {
         if (!isInCode(state)) {
           return false;
         }

shared/editor/nodes/Embed.tsx

@@ -1,11 +1,11 @@
 import Token from "markdown-it/lib/token";
 import { NodeSpec, NodeType, Node as ProsemirrorNode } from "prosemirror-model";
-import { EditorState, Transaction } from "prosemirror-state";
+import { EditorState } from "prosemirror-state";
 import * as React from "react";
 import DisabledEmbed from "../components/DisabledEmbed";
 import { MarkdownSerializerState } from "../lib/markdown/serializer";
 import embedsRule from "../rules/embeds";
-import { ComponentProps } from "../types";
+import { ComponentProps, Dispatch } from "../types";
 import Node from "./Node";
 
 const cache = {};
@@ -117,7 +117,7 @@ export default class Embed extends Node {
   commands({ type }: { type: NodeType }) {
     return (attrs: Record<string, any>) => (
       state: EditorState,
-      dispatch: (tr: Transaction) => void
+      dispatch: Dispatch
     ) => {
       dispatch(
         state.tr.replaceSelectionWith(type.create(attrs)).scrollIntoView()

shared/editor/nodes/Emoji.tsx

@@ -2,9 +2,10 @@ import nameToEmoji from "gemoji/name-to-emoji.json";
 import Token from "markdown-it/lib/token";
 import { InputRule } from "prosemirror-inputrules";
 import { NodeSpec, Node as ProsemirrorNode, NodeType } from "prosemirror-model";
-import { EditorState, TextSelection, Transaction } from "prosemirror-state";
+import { EditorState, TextSelection } from "prosemirror-state";
 import { MarkdownSerializerState } from "../lib/markdown/serializer";
 import emojiRule from "../rules/emoji";
+import { Dispatch } from "../types";
 import Node from "./Node";
 
 export default class Emoji extends Node {
@@ -63,7 +64,7 @@ export default class Emoji extends Node {
   commands({ type }: { type: NodeType }) {
     return (attrs: Record<string, string>) => (
       state: EditorState,
-      dispatch: (tr: Transaction) => void
+      dispatch: Dispatch
     ) => {
       const { selection } = state;
       const position =

shared/editor/nodes/HardBreak.ts

@@ -1,8 +1,9 @@
 import { NodeSpec, NodeType } from "prosemirror-model";
-import { EditorState, Transaction } from "prosemirror-state";
+import { EditorState } from "prosemirror-state";
 import { isInTable } from "prosemirror-tables";
 import { MarkdownSerializerState } from "../lib/markdown/serializer";
 import breakRule from "../rules/breaks";
+import { Dispatch } from "../types";
 import Node from "./Node";
 
 export default class HardBreak extends Node {
@@ -27,7 +28,7 @@ export default class HardBreak extends Node {
   }
 
   commands({ type }: { type: NodeType }) {
-    return () => (state: EditorState, dispatch: (tr: Transaction) => void) => {
+    return () => (state: EditorState, dispatch: Dispatch) => {
       dispatch(state.tr.replaceSelectionWith(type.create()).scrollIntoView());
       return true;
     };
@@ -35,10 +36,7 @@ export default class HardBreak extends Node {
 
   keys({ type }: { type: NodeType }) {
     return {
-      "Shift-Enter": (
-        state: EditorState,
-        dispatch: (tr: Transaction) => void
-      ) => {
+      "Shift-Enter": (state: EditorState, dispatch: Dispatch) => {
         if (!isInTable(state)) {
           return false;
         }

shared/editor/nodes/HorizontalRule.ts

@@ -1,8 +1,9 @@
 import Token from "markdown-it/lib/token";
 import { InputRule } from "prosemirror-inputrules";
 import { NodeSpec, NodeType, Node as ProsemirrorNode } from "prosemirror-model";
-import { EditorState, Transaction } from "prosemirror-state";
+import { EditorState } from "prosemirror-state";
 import { MarkdownSerializerState } from "../lib/markdown/serializer";
+import { Dispatch } from "../types";
 import Node from "./Node";
 
 export default class HorizontalRule extends Node {
@@ -31,7 +32,7 @@ export default class HorizontalRule extends Node {
   commands({ type }: { type: NodeType }) {
     return (attrs: Record<string, any>) => (
       state: EditorState,
-      dispatch: (tr: Transaction) => void
+      dispatch: Dispatch
     ) => {
       dispatch(
         state.tr.replaceSelectionWith(type.create(attrs)).scrollIntoView()
@@ -42,7 +43,7 @@ export default class HorizontalRule extends Node {
 
   keys({ type }: { type: NodeType }) {
     return {
-      "Mod-_": (state: EditorState, dispatch: (tr: Transaction) => void) => {
+      "Mod-_": (state: EditorState, dispatch: Dispatch) => {
         dispatch(state.tr.replaceSelectionWith(type.create()).scrollIntoView());
         return true;
       },

shared/editor/nodes/Image.tsx

@@ -7,7 +7,6 @@ import {
   TextSelection,
   NodeSelection,
   EditorState,
-  Transaction,
 } from "prosemirror-state";
 import * as React from "react";
 import ImageZoom from "react-medium-image-zoom";
@@ -16,7 +15,7 @@ import getDataTransferFiles from "../../utils/getDataTransferFiles";
 import insertFiles, { Options } from "../commands/insertFiles";
 import { MarkdownSerializerState } from "../lib/markdown/serializer";
 import uploadPlaceholderPlugin from "../lib/uploadPlaceholder";
-import { ComponentProps } from "../types";
+import { ComponentProps, Dispatch } from "../types";
 import Node from "./Node";
 
 /**
@@ -366,17 +365,11 @@ export default class Image extends Node {
 
         return true;
       },
-      deleteImage: () => (
-        state: EditorState,
-        dispatch: (tr: Transaction) => void
-      ) => {
+      deleteImage: () => (state: EditorState, dispatch: Dispatch) => {
         dispatch(state.tr.deleteSelection());
         return true;
       },
-      alignRight: () => (
-        state: EditorState,
-        dispatch: (tr: Transaction) => void
-      ) => {
+      alignRight: () => (state: EditorState, dispatch: Dispatch) => {
         if (!(state.selection instanceof NodeSelection)) {
           return false;
         }
@@ -389,10 +382,7 @@ export default class Image extends Node {
         dispatch(state.tr.setNodeMarkup(selection.from, undefined, attrs));
         return true;
       },
-      alignLeft: () => (
-        state: EditorState,
-        dispatch: (tr: Transaction) => void
-      ) => {
+      alignLeft: () => (state: EditorState, dispatch: Dispatch) => {
         if (!(state.selection instanceof NodeSelection)) {
           return false;
         }
@@ -436,10 +426,7 @@ export default class Image extends Node {
         inputElement.click();
         return true;
       },
-      alignCenter: () => (
-        state: EditorState,
-        dispatch: (tr: Transaction) => void
-      ) => {
+      alignCenter: () => (state: EditorState, dispatch: Dispatch) => {
         if (!(state.selection instanceof NodeSelection)) {
           return false;
         }
@@ -450,7 +437,7 @@ export default class Image extends Node {
       },
       createImage: (attrs: Record<string, any>) => (
         state: EditorState,
-        dispatch: (tr: Transaction) => void
+        dispatch: Dispatch
       ) => {
         const { selection } = state;
         const position =

shared/editor/nodes/ListItem.ts

@@ -16,6 +16,7 @@ import { MarkdownSerializerState } from "../lib/markdown/serializer";
 import getParentListItem from "../queries/getParentListItem";
 import isInList from "../queries/isInList";
 import isList from "../queries/isList";
+import { Dispatch } from "../types";
 import Node from "./Node";
 
 export default class ListItem extends Node {
@@ -199,10 +200,7 @@ export default class ListItem extends Node {
       "Shift-Tab": liftListItem(type),
       "Mod-]": sinkListItem(type),
       "Mod-[": liftListItem(type),
-      "Shift-Enter": (
-        state: EditorState,
-        dispatch: (tr: Transaction) => void
-      ) => {
+      "Shift-Enter": (state: EditorState, dispatch: Dispatch) => {
         if (!isInList(state)) {
           return false;
         }
@@ -214,10 +212,7 @@ export default class ListItem extends Node {
         dispatch(tr.split(selection.to));
         return true;
       },
-      "Alt-ArrowUp": (
-        state: EditorState,
-        dispatch: (tr: Transaction) => void
-      ) => {
+      "Alt-ArrowUp": (state: EditorState, dispatch: Dispatch) => {
         if (!state.selection.empty) {
           return false;
         }
@@ -248,10 +243,7 @@ export default class ListItem extends Node {
         );
         return true;
       },
-      "Alt-ArrowDown": (
-        state: EditorState,
-        dispatch: (tr: Transaction) => void
-      ) => {
+      "Alt-ArrowDown": (state: EditorState, dispatch: Dispatch) => {
         if (!state.selection.empty) {
           return false;
         }

shared/editor/nodes/Table.ts

@@ -1,10 +1,5 @@
 import { NodeSpec, Node as ProsemirrorNode, Schema } from "prosemirror-model";
-import {
-  EditorState,
-  Plugin,
-  TextSelection,
-  Transaction,
-} from "prosemirror-state";
+import { EditorState, Plugin, TextSelection } from "prosemirror-state";
 import {
   addColumnAfter,
   addColumnBefore,
@@ -27,6 +22,7 @@ import {
 import { Decoration, DecorationSet } from "prosemirror-view";
 import { MarkdownSerializerState } from "../lib/markdown/serializer";
 import tablesRule from "../rules/tables";
+import { Dispatch } from "../types";
 import Node from "./Node";
 
 export default class Table extends Node {
@@ -67,7 +63,7 @@ export default class Table extends Node {
       }: {
         rowsCount: number;
         colsCount: number;
-      }) => (state: EditorState, dispatch: (tr: Transaction) => void) => {
+      }) => (state: EditorState, dispatch: Dispatch) => {
         const offset = state.tr.selection.anchor + 1;
         const nodes = createTable(schema, rowsCount, colsCount);
         const tr = state.tr.replaceSelectionWith(nodes).scrollIntoView();
@@ -83,7 +79,7 @@ export default class Table extends Node {
       }: {
         index: number;
         alignment: string;
-      }) => (state: EditorState, dispatch: (tr: Transaction) => void) => {
+      }) => (state: EditorState, dispatch: Dispatch) => {
         const cells = getCellsInColumn(index)(state.selection) || [];
         let transaction = state.tr;
         cells.forEach(({ pos }) => {
@@ -99,7 +95,7 @@ export default class Table extends Node {
       deleteColumn: () => deleteColumn,
       addRowAfter: ({ index }: { index: number }) => (
         state: EditorState,
-        dispatch: (tr: Transaction) => void
+        dispatch: Dispatch
       ) => {
         if (index === 0) {
           // A little hack to avoid cloning the heading row by cloning the row
@@ -123,7 +119,7 @@ export default class Table extends Node {
     return {
       Tab: goToNextCell(1),
       "Shift-Tab": goToNextCell(-1),
-      Enter: (state: EditorState, dispatch: (tr: Transaction) => void) => {
+      Enter: (state: EditorState, dispatch: Dispatch) => {
         if (!isInTable(state)) {
           return false;
         }