bookish-press 0.4.0 → 0.4.16

package/components/editor/Commands.js

@@ -1,37 +1,89 @@
-import CalloutNode from "../../models/chapter/CalloutNode";
-import CitationsNode from "../../models/chapter/CitationsNode";
-import CodeNode from "../../models/chapter/CodeNode";
-import CommentNode from "../../models/chapter/CommentNode";
-import DefinitionNode from "../../models/chapter/DefinitionNode";
-import EmbedNode from "../../models/chapter/EmbedNode";
-import FootnoteNode from "../../models/chapter/FootnoteNode";
-import FormatNode from "../../models/chapter/FormatNode";
-import InlineCodeNode from "../../models/chapter/InlineCodeNode";
-import LabelNode from "../../models/chapter/LabelNode";
-import LinkNode from "../../models/chapter/LinkNode";
-import ListNode from "../../models/chapter/ListNode";
-import ParagraphNode from "../../models/chapter/ParagraphNode";
-import QuoteNode from "../../models/chapter/QuoteNode";
-import RuleNode from "../../models/chapter/RuleNode";
-import TableNode from "../../models/chapter/TableNode";
-import TextNode from "../../models/chapter/TextNode";
-import AtomNode from "../../models/chapter/AtomNode";
-import BlocksNode from "../../models/chapter/BlocksNode";
-// SVG Icons from: https://thenounproject.com/browse/collection-icon/minio-text-editor-bold-13520/?p=1
+import CalloutNode from '../../models/chapter/CalloutNode';
+import CitationsNode from '../../models/chapter/CitationsNode';
+import CodeNode from '../../models/chapter/CodeNode';
+import CommentNode from '../../models/chapter/CommentNode';
+import DefinitionNode from '../../models/chapter/DefinitionNode';
+import EmbedNode from '../../models/chapter/EmbedNode';
+import FootnoteNode from '../../models/chapter/FootnoteNode';
+import FormatNode from '../../models/chapter/FormatNode';
+import InlineCodeNode from '../../models/chapter/InlineCodeNode';
+import LabelNode from '../../models/chapter/LabelNode';
+import LinkNode from '../../models/chapter/LinkNode';
+import ListNode from '../../models/chapter/ListNode';
+import ParagraphNode from '../../models/chapter/ParagraphNode';
+import QuoteNode from '../../models/chapter/QuoteNode';
+import RuleNode from '../../models/chapter/RuleNode';
+import TableNode from '../../models/chapter/TableNode';
+import TextNode from '../../models/chapter/TextNode';
+import AtomNode from '../../models/chapter/AtomNode';
+import BlocksNode from '../../models/chapter/BlocksNode';
+import BoldIcon from './icons/bold.svg?raw';
+import BulletsIcon from './icons/bullets.svg?raw';
+import CalloutIcon from './icons/callout.svg?raw';
+import CitationIcon from './icons/citation.svg?raw';
+import ClearIcon from './icons/clear.svg?raw';
+import CodeIcon from './icons/code.svg?raw';
+import ColumnAfterIcon from './icons/columnafter.svg?raw';
+import ColumnBeforeIcon from './icons/columnbefore.svg?raw';
+import CommentIcon from './icons/comment.svg?raw';
+import CopyIcon from './icons/copy.svg?raw';
+import CutIcon from './icons/cut.svg?raw';
+import DefineIcon from './icons/define.svg?raw';
+import DeleteColumnIcon from './icons/deletecolumn.svg?raw';
+import DeleteRowIcon from './icons/deleterow.svg?raw';
+import FootnoteIcon from './icons/footnote.svg?raw';
+import Header1Icon from './icons/header1.svg?raw';
+import Header2Icon from './icons/header2.svg?raw';
+import Header3Icon from './icons/header3.svg?raw';
+import IndentIcon from './icons/indent.svg?raw';
+import ItalicIcon from './icons/italic.svg?raw';
+import LabelIcon from './icons/label.svg?raw';
+import LinkIcon from './icons/link.svg?raw';
+import MediaIcon from './icons/media.svg?raw';
+import NumbersIcon from './icons/numbers.svg?raw';
+import ParagraphIcon from './icons/paragraph.svg?raw';
+import PasteIcon from './icons/paste.svg?raw';
+import QuoteIcon from './icons/quote.svg?raw';
+import RedoIcon from './icons/redo.svg?raw';
+import RowAboveIcon from './icons/rowabove.svg?raw';
+import RowBelowIcon from './icons/rowbelow.svg?raw';
+import RuleIcon from './icons/rule.svg?raw';
+import SubscriptIcon from './icons/sub.svg?raw';
+import SuperscriptIcon from './icons/super.svg?raw';
+import TableIcon from './icons/table.svg?raw';
+import UndoIcon from './icons/undo.svg?raw';
+import UnindentIcon from './icons/unindent.svg?raw';
+/**
+ * Icons:
+ *      From: https://www.streamlinehq.com/icons/streamline-mini-line
+ *      All use CSS currentColor
+ *      No background
+ *      SVG
+ *      48 px
+ *      stroke width 1
+ *  */
 function insertTableRowColumn(context, table, format, row, before) {
     const location = table.locate(format);
     if (location === undefined)
         return;
-    return rootWithNode(context, table, row ? table.withNewRow(location.row + (before ? 0 : 1)) : table.withNewColumn(location.column + (before ? 0 : 1)), t => t.getCell(location.row + (row && !before ? 1 : 0), location.column + (!row && !before ? 1 : 0)).getFirstCaret());
+    return rootWithNode(context, table, row
+        ? table.withNewRow(location.row + (before ? 0 : 1))
+        : table.withNewColumn(location.column + (before ? 0 : 1)), (t) => t.getCell(location.row + (row && !before ? 1 : 0), location.column + (!row && !before ? 1 : 0)).getFirstCaret());
 }
 function deleteTableRowColumn(context, table, format, row) {
     const location = table.locate(format);
     if (location === undefined)
         return;
-    return rootWithNode(context, table, row ? table.withoutRow(location.row) : table.withoutColumn(location.column), t => {
-        return (row ?
-            t.getCell(location.row === table.getRowCount() ? location.row - 1 : location.row, location.column) :
-            t.getCell(location.row, location.column === table.getColumnCount() ? location.column - 1 : location.column))?.getFirstCaret();
+    return rootWithNode(context, table, row
+        ? table.withoutRow(location.row)
+        : table.withoutColumn(location.column), (t) => {
+        return (row
+            ? t.getCell(location.row === table.getRowCount()
+                ? location.row - 1
+                : location.row, location.column)
+            : t.getCell(location.row, location.column === table.getColumnCount()
+                ? location.column - 1
+                : location.column))?.getFirstCaret();
     });
 }
 // A helper function that encapsulates boilerplate for replacing a node in a root and updating a caret.
@@ -48,245 +100,496 @@ function rootWithNode(context, original, replacement, caret) {
     if (caret !== undefined && newCaret === undefined)
         return;
     // Return the edit
-    return { root: newRoot, range: newCaret !== undefined ? { start: newCaret, end: newCaret } : context.range };
+    return {
+        root: newRoot,
+        range: newCaret !== undefined
+            ? { start: newCaret, end: newCaret }
+            : context.range,
+    };
 }
 // An ordered list of command specifications for keyboard and mouse input.
 const commands = [
     {
-        label: "—↑",
-        description: "insert row above",
-        category: "table",
-        control: false, alt: true, shift: false, key: "ArrowUp",
-        visible: context => context.table !== undefined,
-        active: context => context.table !== undefined && context.format !== undefined,
-        handler: context => context.table !== undefined && context.format !== undefined ? insertTableRowColumn(context, context.table, context.format, true, true) : undefined
-    },
-    {
-        label: "—↓",
-        description: "insert row below",
-        category: "table",
-        control: false, alt: true, shift: false, key: "ArrowDown",
-        visible: context => context.table !== undefined,
-        active: context => context.table !== undefined && context.format !== undefined,
-        handler: context => context.table !== undefined && context.format !== undefined ? insertTableRowColumn(context, context.table, context.format, true, false) : undefined
-    },
-    {
-        label: "→|",
-        description: "insert column after",
-        category: "table",
-        control: false, alt: true, shift: false, key: "ArrowRight",
-        visible: context => context.table !== undefined,
-        active: context => context.table !== undefined && context.format !== undefined,
-        handler: context => context.table !== undefined && context.format !== undefined ? insertTableRowColumn(context, context.table, context.format, false, false) : undefined
-    },
-    {
-        label: "|←",
-        description: "insert column before",
-        category: "table",
-        control: false, alt: true, shift: false, key: "ArrowLeft",
-        visible: context => context.table !== undefined,
-        active: context => context.table !== undefined && context.format !== undefined,
-        handler: context => context.table !== undefined && context.format !== undefined ? insertTableRowColumn(context, context.table, context.format, false, true) : undefined
-    },
-    {
-        label: "\u232B—",
-        description: "delete row",
-        category: "table",
-        control: false, alt: true, shift: false, key: "Backspace",
-        visible: context => context.table !== undefined,
-        active: context => context.format !== undefined && context.table !== undefined && context.table.getRowCount() > 1,
-        handler: context => context.format !== undefined && context.table !== undefined ? deleteTableRowColumn(context, context.table, context.format, true) : undefined
-    },
-    {
-        label: "\u232B|",
-        description: "delete column",
-        category: "table",
-        control: false, alt: true, shift: true, key: "Backspace",
-        visible: context => context.table !== undefined,
-        active: context => context.format !== undefined && context.table !== undefined && context.table.getColumnCount() > 1,
-        handler: context => context.format !== undefined && context.table !== undefined ? deleteTableRowColumn(context, context.table, context.format, false) : undefined
-    },
-    {
-        description: "move to previous character",
-        category: "navigation",
-        control: false, alt: false, shift: false, key: "ArrowLeft",
+        icon: RowAboveIcon,
+        description: 'insert row above',
+        category: 'table',
+        mutates: true,
+        control: false,
+        alt: true,
+        shift: false,
+        key: 'ArrowUp',
+        visible: (context) => context.table !== undefined,
+        active: (context) => context.table !== undefined && context.format !== undefined,
+        handler: (context) => context.table !== undefined && context.format !== undefined
+            ? insertTableRowColumn(context, context.table, context.format, true, true)
+            : undefined,
+    },
+    {
+        icon: RowBelowIcon,
+        description: 'insert row below',
+        category: 'table',
+        mutates: true,
+        control: false,
+        alt: true,
+        shift: false,
+        key: 'ArrowDown',
+        visible: (context) => context.table !== undefined,
+        active: (context) => context.table !== undefined && context.format !== undefined,
+        handler: (context) => context.table !== undefined && context.format !== undefined
+            ? insertTableRowColumn(context, context.table, context.format, true, false)
+            : undefined,
+    },
+    {
+        icon: ColumnAfterIcon,
+        description: 'insert column after',
+        category: 'table',
+        mutates: true,
+        control: false,
+        alt: true,
+        shift: false,
+        key: 'ArrowRight',
+        visible: (context) => context.table !== undefined,
+        active: (context) => context.table !== undefined && context.format !== undefined,
+        handler: (context) => context.table !== undefined && context.format !== undefined
+            ? insertTableRowColumn(context, context.table, context.format, false, false)
+            : undefined,
+    },
+    {
+        icon: ColumnBeforeIcon,
+        description: 'insert column before',
+        category: 'table',
+        mutates: true,
+        control: false,
+        alt: true,
+        shift: false,
+        key: 'ArrowLeft',
+        visible: (context) => context.table !== undefined,
+        active: (context) => context.table !== undefined && context.format !== undefined,
+        handler: (context) => context.table !== undefined && context.format !== undefined
+            ? insertTableRowColumn(context, context.table, context.format, false, true)
+            : undefined,
+    },
+    {
+        icon: DeleteRowIcon,
+        description: 'delete row',
+        category: 'table',
+        mutates: true,
+        control: false,
+        alt: true,
+        shift: false,
+        key: 'Backspace',
+        visible: (context) => context.table !== undefined,
+        active: (context) => context.format !== undefined &&
+            context.table !== undefined &&
+            context.table.getRowCount() > 1,
+        handler: (context) => context.format !== undefined && context.table !== undefined
+            ? deleteTableRowColumn(context, context.table, context.format, true)
+            : undefined,
+    },
+    {
+        icon: DeleteColumnIcon,
+        description: 'delete column',
+        category: 'table',
+        mutates: true,
+        control: false,
+        alt: true,
+        shift: true,
+        key: 'Backspace',
+        visible: (context) => context.table !== undefined,
+        active: (context) => context.format !== undefined &&
+            context.table !== undefined &&
+            context.table.getColumnCount() > 1,
+        handler: (context) => context.format !== undefined && context.table !== undefined
+            ? deleteTableRowColumn(context, context.table, context.format, false)
+            : undefined,
+    },
+    {
+        icon: '➡️',
+        description: 'next paragraph',
+        category: 'navigation',
+        mutates: false,
+        control: false,
+        alt: false,
+        shift: false,
+        key: 'Tab',
+        visible: () => false,
+        active: (context) => context.format !== undefined,
+        handler: (context) => {
+            if (context.format) {
+                let caret = context.root
+                    .getNodeAfter(context.format, (node) => node instanceof FormatNode)
+                    ?.getFirstCaret();
+                if (caret)
+                    return {
+                        root: context.root,
+                        range: { start: caret, end: caret },
+                    };
+            }
+        },
+    },
+    {
+        icon: '←',
+        description: 'previous paragraph',
+        category: 'navigation',
+        mutates: false,
+        control: false,
+        alt: false,
+        shift: true,
+        key: 'Tab',
         visible: () => false,
-        active: context => context.endIsTextOrAtom,
-        handler: context => {
-            if (context.end.node instanceof TextNode || context.end.node instanceof AtomNode) {
+        active: (context) => context.format !== undefined,
+        // If we're in a table, find the previous cell.
+        handler: (context) => {
+            if (context.format) {
+                let caret = context.root
+                    .getNodeBefore(context.format, (node) => node instanceof FormatNode)
+                    ?.getFirstCaret();
+                if (caret)
+                    return {
+                        root: context.root,
+                        range: { start: caret, end: caret },
+                    };
+            }
+        },
+    },
+    {
+        icon: '←',
+        description: 'move to previous character',
+        category: 'navigation',
+        mutates: false,
+        control: false,
+        alt: false,
+        shift: false,
+        key: 'ArrowLeft',
+        visible: () => false,
+        active: (context) => context.endIsTextOrAtom,
+        handler: (context) => {
+            if (context.end.node instanceof TextNode ||
+                context.end.node instanceof AtomNode ||
+                context.end.node instanceof EmbedNode) {
                 const nextCaret = context.root.getAdjacentCaret(context.end, false);
                 const sortedRange = context.root.sortRange(context.range);
-                return { root: context.root, range: nextCaret === undefined ? { start: sortedRange.start, end: sortedRange.start } : { start: nextCaret, end: nextCaret } };
+                return {
+                    root: context.root,
+                    range: nextCaret === undefined
+                        ? {
+                            start: sortedRange.start,
+                            end: sortedRange.start,
+                        }
+                        : { start: nextCaret, end: nextCaret },
+                };
             }
-        }
+        },
     },
     {
-        description: "move to previous word",
-        category: "navigation",
-        control: false, alt: true, shift: false, key: "ArrowLeft",
+        icon: '← word',
+        description: 'move to previous word',
+        category: 'navigation',
+        mutates: false,
+        control: false,
+        alt: true,
+        shift: false,
+        key: 'ArrowLeft',
         visible: false,
-        active: context => context.endIsTextOrAtom,
-        handler: context => {
-            if (context.end.node instanceof TextNode || context.end.node instanceof AtomNode) {
+        active: (context) => context.endIsTextOrAtom,
+        handler: (context) => {
+            if (context.end.node instanceof TextNode ||
+                context.end.node instanceof AtomNode ||
+                context.end.node instanceof EmbedNode) {
                 const previous = context.end.node.previousWord(context.root, context.end.index);
-                return { root: context.root, range: { start: previous, end: previous } };
+                return {
+                    root: context.root,
+                    range: { start: previous, end: previous },
+                };
             }
-        }
+        },
     },
     {
-        description: "move to paragraph start",
-        category: "navigation",
-        control: true, alt: false, shift: false, key: "ArrowLeft",
+        icon: '← paragraph',
+        description: 'move to paragraph start',
+        category: 'navigation',
+        mutates: false,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'ArrowLeft',
         visible: false,
-        active: context => context.format !== undefined,
-        handler: context => {
+        active: (context) => context.format !== undefined,
+        handler: (context) => {
             if (context.format !== undefined) {
                 const first = context.format.getFirstTextNode();
-                return { root: context.root, range: { start: { node: first, index: 0 }, end: { node: first, index: 0 } } };
+                return {
+                    root: context.root,
+                    range: {
+                        start: { node: first, index: 0 },
+                        end: { node: first, index: 0 },
+                    },
+                };
             }
-        }
+        },
     },
     {
-        description: "expand selection to previous character",
-        category: "selection",
-        control: false, alt: false, shift: true, key: "ArrowLeft",
+        icon: '← select',
+        description: 'expand selection to previous character',
+        category: 'selection',
+        mutates: false,
+        control: false,
+        alt: false,
+        shift: true,
+        key: 'ArrowLeft',
         visible: false,
-        active: context => context.endIsTextOrAtom,
-        handler: context => {
-            if (context.end.node instanceof TextNode || context.end.node instanceof AtomNode) {
+        active: (context) => context.endIsTextOrAtom,
+        handler: (context) => {
+            if (context.end.node instanceof TextNode ||
+                context.end.node instanceof AtomNode ||
+                context.end.node instanceof EmbedNode) {
                 const previous = context.root.getAdjacentCaret(context.end, false);
                 if (previous === undefined)
                     return;
-                return { root: context.root, range: { start: context.start, end: previous } };
+                return {
+                    root: context.root,
+                    range: { start: context.start, end: previous },
+                };
             }
-        }
+        },
     },
     {
-        description: "expand selection to previous word",
-        category: "selection",
-        control: false, alt: true, shift: true, key: "ArrowLeft",
+        icon: 'select ← word',
+        description: 'expand selection to previous word',
+        category: 'selection',
+        mutates: false,
+        control: false,
+        alt: true,
+        shift: true,
+        key: 'ArrowLeft',
         visible: false,
-        active: context => context.endIsTextOrAtom,
-        handler: context => {
-            if (context.end.node instanceof TextNode || context.end.node instanceof AtomNode) {
+        active: (context) => context.endIsTextOrAtom,
+        handler: (context) => {
+            if (context.end.node instanceof TextNode ||
+                context.end.node instanceof AtomNode ||
+                context.end.node instanceof EmbedNode) {
                 const previous = context.end.node.previousWord(context.root, context.end.index);
-                return { root: context.root, range: { start: context.start, end: previous } };
+                return {
+                    root: context.root,
+                    range: { start: context.start, end: previous },
+                };
             }
-        }
+        },
     },
     {
-        description: "expand selection to start",
-        category: "selection",
-        control: true, alt: false, shift: true, key: "ArrowLeft",
+        icon: 'select start',
+        description: 'expand selection to start',
+        category: 'selection',
+        mutates: false,
+        control: true,
+        alt: false,
+        shift: true,
+        key: 'ArrowLeft',
         visible: false,
-        active: context => context.format !== undefined,
-        handler: context => {
+        active: (context) => context.format !== undefined,
+        handler: (context) => {
             if (context.format !== undefined) {
                 const first = context.format.getFirstTextNode();
-                return { root: context.root, range: { start: context.start, end: { node: first, index: 0 } } };
+                return {
+                    root: context.root,
+                    range: {
+                        start: context.start,
+                        end: { node: first, index: 0 },
+                    },
+                };
             }
-        }
+        },
     },
     {
-        description: "move to next character",
-        category: "navigation",
-        control: false, alt: false, shift: false, key: "ArrowRight",
+        icon: '→',
+        description: 'move to next character',
+        category: 'navigation',
+        mutates: false,
+        control: false,
+        alt: false,
+        shift: false,
+        key: 'ArrowRight',
         visible: false,
-        active: context => context.endIsTextOrAtom,
-        handler: context => {
-            if (context.end.node instanceof TextNode || context.end.node instanceof AtomNode) {
+        active: (context) => context.endIsTextOrAtom,
+        handler: (context) => {
+            if (context.end.node instanceof TextNode ||
+                context.end.node instanceof AtomNode ||
+                context.end.node instanceof EmbedNode) {
                 const nextCaret = context.root.getAdjacentCaret(context.end, true);
                 const sortedRange = context.root.sortRange(context.range);
                 // If there is no next caret, move the caret to the largest of the current start and end.
-                return { root: context.root, range: nextCaret === undefined ? { start: sortedRange.end, end: sortedRange.end } : { start: nextCaret, end: nextCaret } };
+                return {
+                    root: context.root,
+                    range: nextCaret === undefined
+                        ? { start: sortedRange.end, end: sortedRange.end }
+                        : { start: nextCaret, end: nextCaret },
+                };
             }
-        }
+        },
     },
     {
-        description: "move to next word",
-        category: "navigation",
-        control: false, alt: true, shift: false, key: "ArrowRight",
+        icon: '→ word',
+        description: 'move to next word',
+        category: 'navigation',
+        mutates: false,
+        control: false,
+        alt: true,
+        shift: false,
+        key: 'ArrowRight',
         visible: false,
-        active: context => context.endIsTextOrAtom,
-        handler: context => {
-            if (context.end.node instanceof TextNode || context.end.node instanceof AtomNode) {
+        active: (context) => context.endIsTextOrAtom,
+        handler: (context) => {
+            if (context.end.node instanceof TextNode ||
+                context.end.node instanceof AtomNode ||
+                context.end.node instanceof EmbedNode) {
                 const next = context.end.node.nextWord(context.root, context.end.index);
-                return { root: context.root, range: { start: next, end: next } };
+                return {
+                    root: context.root,
+                    range: { start: next, end: next },
+                };
             }
-        }
+        },
     },
     {
-        description: "move to paragraph end",
-        category: "navigation",
-        control: true, alt: false, shift: false, key: "ArrowRight",
+        icon: '→ end',
+        description: 'move to paragraph end',
+        category: 'navigation',
+        mutates: false,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'ArrowRight',
         visible: false,
-        active: context => context.format !== undefined,
-        handler: context => {
+        active: (context) => context.format !== undefined,
+        handler: (context) => {
             if (context.format !== undefined) {
                 const last = context.format.getLastTextNode();
                 const caret = { node: last, index: last.getLength() };
-                return { root: context.root, range: { start: caret, end: caret } };
+                return {
+                    root: context.root,
+                    range: { start: caret, end: caret },
+                };
             }
-        }
+        },
     },
     {
-        description: "expand selection to next character",
-        category: "selection",
-        control: false, alt: false, shift: true, key: "ArrowRight",
+        icon: 'select →',
+        description: 'expand selection to next character',
+        category: 'selection',
+        mutates: false,
+        control: false,
+        alt: false,
+        shift: true,
+        key: 'ArrowRight',
         visible: false,
-        active: context => context.endIsTextOrAtom,
-        handler: context => {
-            if (context.end.node instanceof TextNode || context.end.node instanceof AtomNode) {
+        active: (context) => context.endIsTextOrAtom,
+        handler: (context) => {
+            if (context.end.node instanceof TextNode ||
+                context.end.node instanceof AtomNode ||
+                context.end.node instanceof EmbedNode) {
                 const next = context.root.getAdjacentCaret(context.end, true);
                 if (next === undefined)
                     return;
-                return { root: context.root, range: { start: context.start, end: next } };
+                return {
+                    root: context.root,
+                    range: { start: context.start, end: next },
+                };
             }
-        }
+        },
     },
     {
-        description: "expand selection to next word",
-        category: "selection",
-        control: false, alt: true, shift: true, key: "ArrowRight",
+        icon: 'select → word',
+        description: 'expand selection to next word',
+        category: 'selection',
+        mutates: false,
+        control: false,
+        alt: true,
+        shift: true,
+        key: 'ArrowRight',
         visible: false,
-        active: context => context.endIsTextOrAtom,
-        handler: context => {
-            if (context.end.node instanceof TextNode || context.end.node instanceof AtomNode) {
+        active: (context) => context.endIsTextOrAtom,
+        handler: (context) => {
+            if (context.end.node instanceof TextNode ||
+                context.end.node instanceof AtomNode ||
+                context.end.node instanceof EmbedNode) {
                 const previous = context.end.node.nextWord(context.root, context.end.index);
-                return { root: context.root, range: { start: context.start, end: previous } };
+                return {
+                    root: context.root,
+                    range: { start: context.start, end: previous },
+                };
             }
-        }
+        },
     },
     {
-        description: "expand selection to end",
-        category: "selection",
-        control: true, alt: false, shift: true, key: "ArrowRight",
+        icon: 'select → end',
+        description: 'expand selection to end',
+        category: 'selection',
+        mutates: false,
+        control: true,
+        alt: false,
+        shift: true,
+        key: 'ArrowRight',
         visible: false,
-        active: context => context.format !== undefined,
-        handler: context => {
+        active: (context) => context.format !== undefined,
+        handler: (context) => {
             if (context.format !== undefined) {
                 const last = context.format.getLastTextNode();
-                return { root: context.root, range: { start: context.start, end: { node: last, index: last.getLength() } } };
+                return {
+                    root: context.root,
+                    range: {
+                        start: context.start,
+                        end: { node: last, index: last.getLength() },
+                    },
+                };
             }
-        }
+        },
     },
     {
-        description: "expand selection to all",
-        category: "selection",
-        control: true, alt: false, shift: false, key: "a",
+        icon: 'select all',
+        description: 'expand selection to all',
+        category: 'selection',
+        mutates: false,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'a',
         visible: false,
         active: () => true,
-        handler: context => {
+        handler: (context) => {
             // If in a footnote, expand to the footnote.
             if (context.atom) {
                 const format = context.atom.getMeta();
-                return { root: context.root, range: { start: format.getFirstCaret(), end: format.getLastCaret() } };
+                return {
+                    root: context.root,
+                    range: {
+                        start: format.getFirstCaret(),
+                        end: format.getLastCaret(),
+                    },
+                };
+            }
+            // If in a code node, expand to the code.
+            else if (context.block instanceof CodeNode &&
+                context.range.start.node === context.block.getCodeNode()) {
+                const code = context.block.getCodeNode();
+                return {
+                    root: context.root,
+                    range: {
+                        start: { node: code, index: 0 },
+                        end: { node: code, index: code.getLength() },
+                    },
+                };
             }
-            // If not in a paragraph, expand to all of the formats of the block.
-            else if (context.paragraph === undefined && context.block) {
-                const formats = context.block.getFormats();
-                if (formats.length > 0)
-                    return { root: context.root, range: { start: formats[0].getFirstCaret(), end: formats[formats.length - 1].getLastCaret() } };
+            // If in a non paragraph block, expand to the format of whatever format we're in.
+            else if (context.paragraph === undefined &&
+                context.block &&
+                context.format) {
+                return {
+                    root: context.root,
+                    range: {
+                        start: context.format.getFirstCaret(),
+                        end: context.format.getLastCaret(),
+                    },
+                };
             }
             else {
                 // Find the first and last caret of the entire chapter.
@@ -296,64 +599,98 @@ const commands = [
                         root: context.root,
                         range: {
                             start: { node: text[0], index: 0 },
-                            end: { node: text[text.length - 1], index: text[text.length - 1].getLength() }
-                        }
+                            end: {
+                                node: text[text.length - 1],
+                                index: text[text.length - 1].getLength(),
+                            },
+                        },
                     };
                 }
             }
-        }
+        },
     },
     {
-        description: "move up one line",
-        category: "navigation",
-        control: false, alt: false, shift: false, key: "ArrowUp",
+        icon: '↑ line',
+        description: 'move up one line',
+        category: 'navigation',
+        mutates: false,
+        control: false,
+        alt: false,
+        shift: false,
+        key: 'ArrowUp',
         visible: false,
-        active: context => context.startIsTextOrAtom,
+        active: (context) => context.startIsTextOrAtom,
         handler: (context, utilities) => {
             const above = utilities.getCaretOnLine(context.start, false);
             return { root: context.root, range: { start: above, end: above } };
-        }
+        },
     },
     {
-        description: "move selection up one line",
-        category: "selection",
-        control: false, alt: false, shift: true, key: "ArrowUp",
+        icon: 'select ↑ line',
+        description: 'move selection up one line',
+        category: 'selection',
+        mutates: false,
+        control: false,
+        alt: false,
+        shift: true,
+        key: 'ArrowUp',
         visible: false,
-        active: context => context.startIsTextOrAtom,
+        active: (context) => context.startIsTextOrAtom,
         handler: (context, utilities) => {
             const above = utilities.getCaretOnLine(context.end, false);
-            return { root: context.root, range: { start: context.start, end: above } };
-        }
+            return {
+                root: context.root,
+                range: { start: context.start, end: above },
+            };
+        },
     },
     {
-        description: "move up down line",
-        category: "navigation",
-        control: false, alt: false, shift: false, key: "ArrowDown",
+        icon: 'select ↓ line',
+        description: 'move up down line',
+        category: 'navigation',
+        mutates: false,
+        control: false,
+        alt: false,
+        shift: false,
+        key: 'ArrowDown',
         visible: false,
-        active: context => context.startIsTextOrAtom,
+        active: (context) => context.startIsTextOrAtom,
         handler: (context, utilities) => {
             const below = utilities.getCaretOnLine(context.start, true);
             return { root: context.root, range: { start: below, end: below } };
-        }
+        },
     },
     {
-        description: "move selection down one line",
-        category: "selection",
-        control: false, alt: false, shift: true, key: "ArrowDown",
+        icon: 'select ↓ line',
+        description: 'move selection down one line',
+        category: 'selection',
+        mutates: false,
+        control: false,
+        alt: false,
+        shift: true,
+        key: 'ArrowDown',
         visible: false,
-        active: context => context.startIsTextOrAtom,
+        active: (context) => context.startIsTextOrAtom,
         handler: (context, utilities) => {
             const below = utilities.getCaretOnLine(context.end, true);
-            return { root: context.root, range: { start: context.start, end: below } };
-        }
+            return {
+                root: context.root,
+                range: { start: context.start, end: below },
+            };
+        },
     },
     {
-        description: "delete previous character",
-        category: "text",
-        control: false, alt: false, shift: false, key: "Backspace",
+        icon: 'delete ←',
+        description: 'delete previous character',
+        category: 'text',
+        mutates: false,
+        control: false,
+        alt: false,
+        shift: false,
+        key: 'Backspace',
         visible: false,
         active: true,
-        handler: context => {
+        handler: (context) => {
             if (context.root === undefined)
                 return;
             if (context.isSelection) {
@@ -368,15 +705,20 @@ const commands = [
                     return;
                 return rootWithNode(context, context.root, edit.root, () => edit.range.start);
             }
-        }
+        },
     },
     {
-        description: "delete next character",
-        category: "text",
-        control: false, alt: false, shift: false, key: "Delete",
+        icon: 'delete →',
+        description: 'delete next character',
+        category: 'text',
+        mutates: true,
+        control: false,
+        alt: false,
+        shift: false,
+        key: 'Delete',
         visible: false,
         active: true,
-        handler: context => {
+        handler: (context) => {
             if (context.root === undefined)
                 return;
             if (context.isSelection) {
@@ -391,36 +733,53 @@ const commands = [
                     return;
                 return rootWithNode(context, context.root, edit.root, () => edit.range.start);
             }
-        }
+        },
     },
     {
-        description: "insert code newline",
-        category: "text",
-        control: false, alt: false, shift: false, key: "Enter",
+        icon: 'new line',
+        description: 'insert code newline',
+        category: 'text',
+        mutates: true,
+        control: false,
+        alt: false,
+        shift: false,
+        key: 'Enter',
         visible: false,
-        active: context => context.code !== undefined,
-        handler: context => {
+        active: (context) => context.code !== undefined,
+        handler: (context) => {
             if (context.code?.getCodeNode() !== context.start.node)
                 return;
-            const newText = context.start.node.withCharacterAt("\n", context.start.index);
+            const newText = context.start.node.withCharacterAt('\n', context.start.index);
             if (newText === undefined)
                 return;
-            return rootWithNode(context, context.start.node, newText, text => { return { node: text, index: context.start.index + 1 }; });
-        }
+            return rootWithNode(context, context.start.node, newText, (text) => {
+                return { node: text, index: context.start.index + 1 };
+            });
+        },
     },
     {
-        description: "split list item",
-        category: "list",
-        control: false, alt: false, shift: false, key: "Enter",
+        icon: 'split list',
+        description: 'split list item',
+        category: 'list',
+        mutates: true,
+        control: false,
+        alt: false,
+        shift: false,
+        key: 'Enter',
         visible: false,
-        active: context => context.list !== undefined,
-        handler: context => {
+        active: (context) => context.list !== undefined,
+        handler: (context) => {
             if (context.list === undefined)
                 return;
             const lastItem = context.list.getLastItem();
             const lastCaret = lastItem?.getLastCaret();
             // If we're at the last item in the list and it's empty, then add a
-            if (lastItem !== undefined && lastCaret !== undefined && lastCaret.node instanceof TextNode && lastCaret.node.getLength() === 0 && lastCaret.node === context.end.node && lastCaret.index === context.end.index) {
+            if (lastItem !== undefined &&
+                lastCaret !== undefined &&
+                lastCaret.node instanceof TextNode &&
+                lastCaret.node.getLength() === 0 &&
+                lastCaret.node === context.end.node &&
+                lastCaret.index === context.end.index) {
                 const listParent = context.list.getParent(context.root);
                 if (listParent instanceof ListNode) {
                     const newSublist = context.list.withoutItem(lastItem);
@@ -438,14 +797,16 @@ const commands = [
                     const listWithoutItem = context.list.withoutItem(lastItem);
                     if (listWithoutItem === undefined)
                         return;
-                    const newBlocks = listParent.withChildReplaced(context.list, listWithoutItem)?.withBlockInsertedAfter(listWithoutItem, new ParagraphNode(0, lastItem));
+                    const newBlocks = listParent
+                        .withChildReplaced(context.list, listWithoutItem)
+                        ?.withBlockInsertedAfter(listWithoutItem, new ParagraphNode(0, lastItem));
                     if (newBlocks === undefined)
                         return;
                     return rootWithNode(context, listParent, newBlocks, () => lastCaret);
                 }
             }
             else
-                return rootWithNode(context, context.list, context.list?.withItemSplit(context.range.start), newList => {
+                return rootWithNode(context, context.list, context.list?.withItemSplit(context.range.start), (newList) => {
                     const index = context.list?.getItemContaining(context.range.start);
                     if (index === undefined)
                         return;
@@ -454,374 +815,528 @@ const commands = [
                         return;
                     return item.getFirstCaret();
                 });
-        }
+        },
     },
     {
-        description: "split paragraph",
-        category: "paragraph",
-        control: false, alt: false, shift: false, key: "Enter",
+        icon: 'split paragraph',
+        description: 'split paragraph',
+        category: 'text',
+        mutates: true,
+        control: false,
+        alt: false,
+        shift: false,
+        key: 'Enter',
         visible: false,
-        active: context => context.atom === undefined && context.blocks !== undefined,
-        handler: context => {
+        active: (context) => context.atom === undefined && context.blocks !== undefined,
+        handler: (context) => {
             const edit = context.blocks?.withSelectionSplit(context.range);
             if (edit === undefined)
                 return;
             return rootWithNode(context, context.blocks, edit.root, () => edit.range.start);
-        }
-    },
-    {
-        label: "indent",
-        icon: "indent.svg",
-        description: "indent list item",
-        category: "list",
-        control: false, alt: false, shift: false, key: "Tab",
-        visible: context => context.list !== undefined,
-        active: context => context.list !== undefined,
-        handler: context => rootWithNode(context, context.blocks, context.blocks?.withListsIndented(context.range, true))
-    },
-    {
-        label: "unindent",
-        icon: 'svg/unindent.svg',
-        description: "unindent list item",
-        category: "list",
-        control: false, alt: false, shift: true, key: "Tab",
-        visible: context => context.list !== undefined,
-        active: context => context.list !== undefined && context.list.isInside(context.root, ListNode),
-        handler: context => rootWithNode(context, context.blocks, context.blocks?.withListsIndented(context.range, false))
-    },
-    {
-        label: "plain",
-        icon: "clear.svg",
-        description: "clear formatting",
-        category: "text",
-        control: true, alt: false, shift: false, key: "0",
+        },
+    },
+    {
+        icon: IndentIcon,
+        description: 'indent list item',
+        category: 'list',
+        mutates: true,
+        control: false,
+        alt: false,
+        shift: false,
+        key: 'Tab',
+        visible: (context) => context.list !== undefined,
+        active: (context) => context.list !== undefined,
+        handler: (context) => rootWithNode(context, context.blocks, context.blocks?.withListsIndented(context.range, true)),
+    },
+    {
+        icon: UnindentIcon,
+        description: 'unindent list item',
+        mutates: true,
+        category: 'list',
+        control: false,
+        alt: false,
+        shift: true,
+        key: 'Tab',
+        visible: (context) => context.list !== undefined,
+        active: (context) => context.list !== undefined &&
+            context.list.isInside(context.root, ListNode),
+        handler: (context) => rootWithNode(context, context.blocks, context.blocks?.withListsIndented(context.range, false)),
+    },
+    {
+        icon: ClearIcon,
+        description: 'clear formatting',
+        mutates: true,
+        category: 'text',
+        control: true,
+        alt: false,
+        shift: false,
+        key: '0',
         visible: true,
-        active: context => context.startIsText || context.endIsText,
-        handler: context => context.root.withRangeFormatted(context.range, "")
+        active: (context) => context.startIsText || context.endIsText,
+        handler: (context) => context.root.withRangeFormatted(context.range, ''),
     },
     {
-        label: "bold",
-        icon: "bold.svg",
-        description: "bold",
-        category: "text",
-        control: true, alt: false, shift: false, key: "b",
+        icon: BoldIcon,
+        description: 'bold',
+        category: 'text',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'b',
         visible: true,
-        active: context => context.startIsText || context.endIsText,
-        handler: context => context.root.withRangeFormatted(context.range, "*")
+        active: (context) => context.startIsText || context.endIsText,
+        handler: (context) => context.root.withRangeFormatted(context.range, '*'),
     },
     {
-        description: "italic",
-        icon: "italic.svg",
-        category: "text",
-        control: true, alt: false, shift: false, key: "i",
+        description: 'italic',
+        icon: ItalicIcon,
+        category: 'text',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'i',
         visible: true,
-        active: context => context.startIsText || context.endIsText,
-        handler: context => context.root.withRangeFormatted(context.range, "_")
+        active: (context) => context.startIsText || context.endIsText,
+        handler: (context) => context.root.withRangeFormatted(context.range, '_'),
     },
     {
-        label: "sub\u2099",
-        icon: "sub.svg",
-        description: "subscript",
-        category: "text",
-        control: true, alt: false, shift: false, key: ",",
+        icon: SubscriptIcon,
+        description: 'subscript',
+        category: 'text',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: false,
+        key: ',',
         visible: true,
-        active: context => context.startIsText || context.endIsText,
-        handler: context => context.root.withRangeFormatted(context.range, "v")
+        active: (context) => context.startIsText || context.endIsText,
+        handler: (context) => context.root.withRangeFormatted(context.range, 'v'),
     },
     {
-        label: "super\u207F",
-        icon: "super.svg",
-        description: "superscript",
-        category: "text",
-        control: true, alt: false, shift: false, key: ".",
+        icon: SuperscriptIcon,
+        description: 'superscript',
+        category: 'text',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: false,
+        key: '.',
         visible: true,
-        active: context => context.startIsText || context.endIsText,
-        handler: context => context.root.withRangeFormatted(context.range, "^")
+        active: (context) => context.startIsText || context.endIsText,
+        handler: (context) => context.root.withRangeFormatted(context.range, '^'),
     },
     {
-        label: "<code>",
-        icon: "code.svg",
-        description: "toggle code",
-        category: "annotation",
-        control: true, alt: false, shift: false, key: "j",
+        icon: CodeIcon,
+        description: 'toggle code',
+        category: 'annotation',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'e',
         visible: true,
-        active: context => context.startIsText || context.endIsText,
-        handler: context => context.meta instanceof InlineCodeNode ?
-            rootWithNode(context, context.format, context.format?.withSegmentReplaced(context.meta, context.meta.getText())) :
-            context.root.withSegmentAtSelection(context.range, text => new InlineCodeNode(new TextNode(text)))
+        active: (context) => context.startIsText || context.endIsText,
+        handler: (context) => context.meta instanceof InlineCodeNode
+            ? rootWithNode(context, context.format, context.format?.withSegmentReplaced(context.meta, context.meta.getText()))
+            : context.root.withSegmentAtSelection(context.range, (text) => new InlineCodeNode(new TextNode(text))),
     },
     {
-        label: "link ⚭",
-        icon: "link.svg",
-        description: "toggle link",
-        category: "annotation",
-        control: true, alt: false, shift: false, key: "k",
+        icon: LinkIcon,
+        description: 'toggle link',
+        category: 'annotation',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'k',
         visible: true,
-        active: context => (context.atom === undefined && context.meta === undefined) || context.meta instanceof LinkNode,
-        handler: context => context.meta instanceof LinkNode ?
-            rootWithNode(context, context.format, context.format?.withSegmentReplaced(context.meta, context.meta.getText())) :
-            context.root.withSegmentAtSelection(context.range, text => new LinkNode(new TextNode(text)))
-    },
-    {
-        label: "Aa",
-        description: "toggle definition",
-        category: "annotation",
-        control: true, alt: false, shift: false, key: "d",
-        visible: context => context.chapter && context.atom === undefined && context.meta === undefined,
-        active: context => context.chapter && context.atom === undefined && context.meta === undefined,
-        handler: context => context.meta instanceof DefinitionNode ?
-            rootWithNode(context, context.format, context.format?.withSegmentReplaced(context.meta, context.meta.getText())) :
-            context.root.withSegmentAtSelection(context.range, text => new DefinitionNode(new TextNode(text)))
-    },
-    {
-        label: "a\u1D43",
-        description: "insert footnote",
-        category: "annotation",
-        control: true, alt: false, shift: false, key: "f",
-        visible: context => context.chapter && context.atom === undefined && context.meta === undefined,
-        active: context => context.chapter && context.atom === undefined && context.meta === undefined,
-        handler: context => context.root.withSegmentAtSelection(context.range, text => new FootnoteNode(new FormatNode("", [new TextNode(text)])))
-    },
-    {
-        label: "a\u00b9",
-        description: "insert citations",
-        category: "annotation",
-        control: true, alt: false, shift: false, key: "t",
-        visible: context => context.chapter && context.atom === undefined && context.meta === undefined,
-        active: context => context.chapter && context.atom === undefined && context.meta === undefined,
-        handler: context => context.root.withSegmentAtSelection(context.range, () => new CitationsNode([]))
-    },
-    {
-        label: "•",
-        description: "insert label",
-        category: "annotation",
-        control: true, alt: false, shift: false, key: "l",
-        visible: context => context.chapter && context.atom === undefined && context.meta === undefined,
-        active: context => context.chapter && context.atom === undefined && context.meta === undefined,
-        handler: context => context.root.withSegmentAtSelection(context.range, () => new LabelNode(""))
-    },
-    {
-        label: "comment",
-        icon: "comment.svg",
-        description: "insert comment",
-        category: "annotation",
-        control: true, alt: false, shift: false, key: "'",
-        visible: context => context.chapter && context.atom === undefined && context.meta === undefined,
-        active: context => context.chapter && context.atom === undefined && context.meta === undefined,
-        handler: context => context.root.withSegmentAtSelection(context.range, text => new CommentNode(new FormatNode("", [new TextNode(text)])))
-    },
-    {
-        label: "paragraph",
-        icon: "paragraph.svg",
-        description: "format as paragraph",
-        category: "level",
-        control: true, alt: true, shift: false, code: "Digit0",
-        visible: context => context.paragraph !== undefined && context.paragraph.getLevel() !== 0,
-        active: context => context.paragraph !== undefined && context.paragraph.getLevel() !== 0,
-        handler: context => {
+        active: (context) => (context.atom === undefined && context.meta === undefined) ||
+            context.meta instanceof LinkNode,
+        handler: (context) => context.meta instanceof LinkNode
+            ? rootWithNode(context, context.format, context.format?.withSegmentReplaced(context.meta, context.meta.getText()))
+            : context.root.withSegmentAtSelection(context.range, (text) => new LinkNode(new TextNode(text))),
+    },
+    {
+        icon: DefineIcon,
+        description: 'toggle definition',
+        category: 'annotation',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'd',
+        visible: (context) => context.chapter &&
+            context.atom === undefined &&
+            context.meta === undefined,
+        active: (context) => context.chapter &&
+            context.atom === undefined &&
+            context.meta === undefined,
+        handler: (context) => context.meta instanceof DefinitionNode
+            ? rootWithNode(context, context.format, context.format?.withSegmentReplaced(context.meta, context.meta.getText()))
+            : context.root.withSegmentAtSelection(context.range, (text) => new DefinitionNode(new TextNode(text))),
+    },
+    {
+        icon: FootnoteIcon,
+        description: 'insert footnote',
+        category: 'annotation',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'f',
+        visible: (context) => context.chapter &&
+            context.atom === undefined &&
+            context.meta === undefined,
+        active: (context) => context.chapter &&
+            context.atom === undefined &&
+            context.meta === undefined,
+        handler: (context) => context.root.withSegmentAtSelection(context.range, (text) => new FootnoteNode(new FormatNode('', [new TextNode(text)]))),
+    },
+    {
+        icon: CitationIcon,
+        description: 'insert citations',
+        category: 'annotation',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'o',
+        visible: (context) => context.chapter &&
+            context.atom === undefined &&
+            context.meta === undefined,
+        active: (context) => context.chapter &&
+            context.atom === undefined &&
+            context.meta === undefined,
+        handler: (context) => context.root.withSegmentAtSelection(context.range, () => new CitationsNode([])),
+    },
+    {
+        icon: LabelIcon,
+        description: 'insert label',
+        category: 'annotation',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'l',
+        visible: (context) => context.chapter &&
+            context.atom === undefined &&
+            context.meta === undefined,
+        active: (context) => context.chapter &&
+            context.atom === undefined &&
+            context.meta === undefined,
+        handler: (context) => context.root.withSegmentAtSelection(context.range, () => new LabelNode('')),
+    },
+    {
+        icon: CommentIcon,
+        description: 'insert comment',
+        category: 'annotation',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: false,
+        key: "'",
+        visible: (context) => context.chapter &&
+            context.atom === undefined &&
+            context.meta === undefined,
+        active: (context) => context.chapter &&
+            context.atom === undefined &&
+            context.meta === undefined,
+        handler: (context) => context.root.withSegmentAtSelection(context.range, (text) => new CommentNode(new FormatNode('', [new TextNode(text)]))),
+    },
+    {
+        icon: ParagraphIcon,
+        description: 'format as paragraph',
+        category: 'level',
+        mutates: true,
+        control: true,
+        alt: true,
+        shift: false,
+        code: 'Digit0',
+        visible: (context) => context.paragraph !== undefined &&
+            context.paragraph.getLevel() !== 0,
+        active: (context) => context.paragraph !== undefined &&
+            context.paragraph.getLevel() !== 0,
+        handler: (context) => {
             if (context.paragraph === undefined)
                 return;
             return rootWithNode(context, context.paragraph, context.paragraph.withLevel(0));
-        }
-    },
-    {
-        label: "h1",
-        description: "format as 1st level header",
-        category: "level",
-        control: true, alt: true, shift: false, code: "Digit1",
-        visible: context => context.paragraph !== undefined,
-        active: context => context.paragraph !== undefined && context.paragraph.getLevel() !== 1,
-        handler: context => rootWithNode(context, context.paragraph, context.paragraph?.withLevel(1))
-    },
-    {
-        label: "h2",
-        description: "format as 2nd level header",
-        category: "level",
-        control: true, alt: true, shift: false, code: "Digit2",
-        visible: context => context.paragraph !== undefined,
-        active: context => context.paragraph !== undefined && context.paragraph.getLevel() !== 2,
-        handler: context => rootWithNode(context, context.paragraph, context.paragraph?.withLevel(2))
-    },
-    {
-        label: "h3",
-        description: "format as 3rd level header",
-        category: "level",
-        control: true, alt: true, shift: false, code: "Digit3",
-        visible: context => context.paragraph !== undefined,
-        active: context => context.paragraph !== undefined && context.paragraph.getLevel() !== 3,
-        handler: context => rootWithNode(context, context.paragraph, context.paragraph?.withLevel(3))
-    },
-    {
-        label: "\u2014",
-        description: "insert horizontal rule",
-        category: "block",
-        control: true, alt: false, shift: true, key: "h",
-        visible: context => context.paragraph !== undefined,
-        active: context => context.paragraph !== undefined && context.atParagraphStart,
-        handler: context => context.paragraph ? rootWithNode(context, context.blocks, context.blocks?.withBlockInsertedBefore(context.paragraph, new RuleNode())) : undefined
-    },
-    {
-        label: "🄰",
-        description: "insert callout",
-        category: "block",
-        control: true, alt: false, shift: true, key: "e",
-        visible: context => context.paragraph !== undefined,
-        active: context => context.paragraph !== undefined && context.atParagraphStart,
-        handler: context => {
+        },
+    },
+    {
+        icon: Header1Icon,
+        description: 'format as 1st level header',
+        category: 'level',
+        mutates: true,
+        control: true,
+        alt: true,
+        shift: false,
+        code: 'Digit1',
+        visible: (context) => context.paragraph !== undefined,
+        active: (context) => context.paragraph !== undefined &&
+            context.paragraph.getLevel() !== 1,
+        handler: (context) => rootWithNode(context, context.paragraph, context.paragraph?.withLevel(1)),
+    },
+    {
+        icon: Header2Icon,
+        description: 'format as 2nd level header',
+        category: 'level',
+        mutates: true,
+        control: true,
+        alt: true,
+        shift: false,
+        code: 'Digit2',
+        visible: (context) => context.paragraph !== undefined,
+        active: (context) => context.paragraph !== undefined &&
+            context.paragraph.getLevel() !== 2,
+        handler: (context) => rootWithNode(context, context.paragraph, context.paragraph?.withLevel(2)),
+    },
+    {
+        icon: Header3Icon,
+        description: 'format as 3rd level header',
+        category: 'level',
+        mutates: true,
+        control: true,
+        alt: true,
+        shift: false,
+        code: 'Digit3',
+        visible: (context) => context.paragraph !== undefined,
+        active: (context) => context.paragraph !== undefined &&
+            context.paragraph.getLevel() !== 3,
+        handler: (context) => rootWithNode(context, context.paragraph, context.paragraph?.withLevel(3)),
+    },
+    {
+        icon: RuleIcon,
+        description: 'insert horizontal rule',
+        category: 'block',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'u',
+        visible: (context) => context.paragraph !== undefined,
+        active: (context) => context.paragraph !== undefined && context.atParagraphStart,
+        handler: (context) => context.paragraph
+            ? rootWithNode(context, context.blocks, context.blocks?.withBlockInsertedBefore(context.paragraph, new RuleNode()))
+            : undefined,
+    },
+    {
+        icon: CalloutIcon,
+        description: 'insert callout',
+        category: 'block',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: true,
+        key: '-',
+        visible: (context) => context.paragraph !== undefined,
+        active: (context) => context.paragraph !== undefined && context.atParagraphStart,
+        handler: (context) => {
             // If the caret is in a paragraph in a blocks node, insert a callout before the current paragraph.
             if (context.blocks && context.paragraph) {
                 // Make a new callout node with an empty paragraph, insert it before the paragraph the caret is in, and place the caret inside the empty paragraph.
                 const newParagraph = new ParagraphNode();
                 return rootWithNode(context, context.blocks, context.blocks.withBlockInsertedBefore(context.paragraph, new CalloutNode([newParagraph])), () => newParagraph.getFirstCaret());
             }
-        }
+        },
     },
     {
-        label: "‟",
-        icon: "quote.svg",
-        description: "insert quote",
-        category: "block",
-        control: true, alt: false, shift: true, key: "u",
-        visible: context => context.paragraph !== undefined,
-        active: context => context.paragraph !== undefined && context.atParagraphStart,
-        handler: context => {
+        icon: QuoteIcon,
+        description: 'insert quote',
+        category: 'block',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: true,
+        key: "'",
+        visible: (context) => context.paragraph !== undefined,
+        active: (context) => context.paragraph !== undefined && context.atParagraphStart,
+        handler: (context) => {
             if (context.blocks && context.paragraph) {
                 // Make a new quote and place the caret inside the quote's first empty paragraph.
                 const newParagraph = new ParagraphNode();
                 return rootWithNode(context, context.blocks, context.blocks.withBlockInsertedBefore(context.paragraph, new QuoteNode([newParagraph])), () => newParagraph.getFirstCaret());
             }
-        }
+        },
     },
     {
-        label: "<code>",
-        icon: "code.svg",
-        description: "insert code",
-        category: "block",
-        control: true, alt: false, shift: true, key: "s",
-        visible: context => context.paragraph !== undefined,
-        active: context => context.paragraph !== undefined && context.atParagraphStart,
-        handler: context => {
+        icon: CodeIcon,
+        description: 'insert code',
+        category: 'block',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: true,
+        key: 's',
+        visible: (context) => context.paragraph !== undefined,
+        active: (context) => context.paragraph !== undefined && context.atParagraphStart,
+        handler: (context) => {
             if (context.blocks && context.paragraph) {
-                const newCode = new CodeNode(new TextNode(), "plaintext", "|");
-                return rootWithNode(context, context.blocks, context.blocks.withBlockInsertedBefore(context.paragraph, newCode), () => { return { node: newCode.getCodeNode(), index: 0 }; });
+                const newCode = new CodeNode(new TextNode(), 'plaintext', '|');
+                return rootWithNode(context, context.blocks, context.blocks.withBlockInsertedBefore(context.paragraph, newCode), () => {
+                    return { node: newCode.getCodeNode(), index: 0 };
+                });
             }
-        }
+        },
     },
     {
-        label: "image/video",
-        icon: "media.svg",
-        description: "insert image or video",
-        category: "block",
-        control: true, alt: false, shift: true, key: "p",
-        visible: context => context.paragraph !== undefined,
-        active: context => context.paragraph !== undefined && context.atParagraphStart,
-        handler: context => {
+        icon: MediaIcon,
+        description: 'insert image or video',
+        category: 'block',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: true,
+        key: 'i',
+        visible: (context) => context.paragraph !== undefined,
+        active: (context) => context.paragraph !== undefined && context.atParagraphStart,
+        handler: (context) => {
             if (context.blocks && context.paragraph) {
                 // Place the caret inside the code's code node.
-                const newEmbed = new EmbedNode("", "");
+                const newEmbed = new EmbedNode('', '');
                 return rootWithNode(context, context.blocks, context.blocks.withBlockInsertedBefore(context.paragraph, newEmbed), () => newEmbed.getCaption().getFirstCaret());
             }
-        }
+        },
     },
     {
-        label: "▦",
-        description: "insert table",
-        category: "block",
-        control: true, alt: false, shift: true, key: "\\",
-        visible: context => context.paragraph !== undefined,
-        active: context => context.paragraph !== undefined && context.atParagraphStart,
-        handler: context => {
+        icon: TableIcon,
+        description: 'insert table',
+        category: 'block',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: false,
+        key: '[',
+        visible: (context) => context.paragraph !== undefined,
+        active: (context) => context.paragraph !== undefined && context.atParagraphStart,
+        handler: (context) => {
             if (context.blocks && context.paragraph) {
                 // Create a 3x3 of table rows and columns
                 // Return a caret corresponding to the first cell.
                 const newRows = [[], [], []];
                 for (let r = 0; r < Math.max(1, 3); r++) {
                     for (let c = 0; c < Math.max(1, 3); c++)
-                        newRows[r].push(new FormatNode("", [new TextNode()]));
+                        newRows[r].push(new FormatNode('', [new TextNode()]));
                 }
-                const newTable = new TableNode(newRows, "|", new FormatNode("", [new TextNode()]));
-                return rootWithNode(context, context.blocks, context.blocks.withBlockInsertedBefore(context.paragraph, newTable), () => { return { node: newTable.getRows()[0][0].getTextNodes()[0], index: 0 }; });
+                const newTable = new TableNode(newRows, '|', new FormatNode('', [new TextNode()]));
+                return rootWithNode(context, context.blocks, context.blocks.withBlockInsertedBefore(context.paragraph, newTable), () => {
+                    return {
+                        node: newTable.getRows()[0][0].getTextNodes()[0],
+                        index: 0,
+                    };
+                });
             }
-        }
-    },
-    {
-        label: "bulleted",
-        icon: "bullets.svg",
-        description: "convert paragraph to bulleted list item",
-        category: "list",
-        control: true, alt: false, shift: true, key: "7",
-        visible: context => context.paragraph !== undefined && context.list === undefined,
-        active: context => context.paragraph !== undefined && context.list === undefined,
-        handler: context => rootWithNode(context, context.blocks, context.blocks?.withParagraphsAsLists(context.range, false))
-    },
-    {
-        label: "numbered",
-        icon: "numbers.svg",
-        description: "convert paragraph to numbered list item",
-        category: "list",
-        control: true, alt: false, shift: true, key: "8",
-        visible: context => context.paragraph !== undefined && context.list === undefined,
-        active: context => context.paragraph !== undefined && context.list === undefined,
-        handler: context => rootWithNode(context, context.blocks, context.blocks?.withParagraphsAsLists(context.range, true))
-    },
-    {
-        label: "bulleted",
-        icon: "bullets.svg",
-        description: "convert numbered list item to bulleted",
-        category: "list",
-        control: true, alt: false, shift: true, key: "7",
-        visible: context => context.list !== undefined && context.list.isNumbered(),
-        active: context => context.list !== undefined && context.list.isNumbered(),
-        handler: context => context.list ? rootWithNode(context, context.blocks, context.blocks?.withListAsStyle(context.list, false)) : undefined
-    },
-    {
-        label: "numbered",
-        icon: "numbers.svg",
-        description: "convert bulleted list item to numbered",
-        category: "list",
-        control: true, alt: false, shift: true, key: "8",
-        visible: context => context.list !== undefined && !context.list.isNumbered(),
-        active: context => context.list !== undefined && !context.list.isNumbered(),
-        handler: context => context.list ? rootWithNode(context, context.blocks, context.blocks?.withListAsStyle(context.list, true)) : undefined
-    },
-    {
-        label: "paragraph",
-        icon: "paragraph.svg",
-        description: "convert bulleted list item to paragraph",
-        category: "list",
-        control: true, alt: false, shift: true, key: ["7", "8"],
-        visible: context => context.list !== undefined,
-        active: context => context.list !== undefined,
-        handler: context => rootWithNode(context, context.blocks, context.blocks?.withListsAsParagraphs(context.range))
-    },
-    {
-        label: "undo",
-        icon: "undo.svg",
-        description: "undo the last command",
-        category: "history",
-        control: true, alt: false, shift: false, key: ["z"],
+        },
+    },
+    {
+        icon: BulletsIcon,
+        description: 'convert paragraph to bulleted list item',
+        category: 'list',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: true,
+        key: '7',
+        visible: (context) => context.paragraph !== undefined && context.list === undefined,
+        active: (context) => context.paragraph !== undefined && context.list === undefined,
+        handler: (context) => rootWithNode(context, context.blocks, context.blocks?.withParagraphsAsLists(context.range, false)),
+    },
+    {
+        icon: NumbersIcon,
+        description: 'convert paragraph to numbered list item',
+        category: 'list',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: true,
+        key: '8',
+        visible: (context) => context.paragraph !== undefined && context.list === undefined,
+        active: (context) => context.paragraph !== undefined && context.list === undefined,
+        handler: (context) => rootWithNode(context, context.blocks, context.blocks?.withParagraphsAsLists(context.range, true)),
+    },
+    {
+        icon: BulletsIcon,
+        description: 'convert numbered list item to bulleted',
+        category: 'list',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: true,
+        key: '7',
+        visible: (context) => context.list !== undefined && context.list.isNumbered(),
+        active: (context) => context.list !== undefined && context.list.isNumbered(),
+        handler: (context) => context.list
+            ? rootWithNode(context, context.blocks, context.blocks?.withListAsStyle(context.list, false))
+            : undefined,
+    },
+    {
+        icon: NumbersIcon,
+        description: 'convert bulleted list item to numbered',
+        category: 'list',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: true,
+        key: '8',
+        visible: (context) => context.list !== undefined && !context.list.isNumbered(),
+        active: (context) => context.list !== undefined && !context.list.isNumbered(),
+        handler: (context) => context.list
+            ? rootWithNode(context, context.blocks, context.blocks?.withListAsStyle(context.list, true))
+            : undefined,
+    },
+    {
+        icon: ParagraphIcon,
+        description: 'convert bulleted list item to paragraph',
+        category: 'list',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: true,
+        key: ['7', '8'],
+        visible: (context) => context.list !== undefined,
+        active: (context) => context.list !== undefined,
+        handler: (context) => rootWithNode(context, context.blocks, context.blocks?.withListsAsParagraphs(context.range)),
+    },
+    {
+        icon: UndoIcon,
+        description: 'undo the last command',
+        category: 'history',
+        mutates: false,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'z',
         visible: true,
-        active: context => context.undoStack.length > 0 && context.undoPosition < context.undoStack.length - 1,
-        handler: context => context.undo()
+        active: (context) => context.undoStack.length > 0 &&
+            context.undoPosition < context.undoStack.length - 1,
+        handler: (context) => context.undo(),
     },
     {
-        label: "redo",
-        icon: "redo.svg",
-        description: "redo the most recently undone command",
-        category: "history",
-        control: true, alt: false, shift: true, key: ["z"],
+        icon: RedoIcon,
+        description: 'redo the most recently undone command',
+        category: 'history',
+        mutates: false,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'y',
         visible: true,
-        active: context => context.undoPosition > 0,
-        handler: context => context.redo()
+        active: (context) => context.undoPosition > 0,
+        handler: (context) => context.redo(),
     },
     {
-        label: "✂",
-        description: "delete the selected content and copy it to the clipboard",
-        category: "clipboard",
-        control: true, alt: false, shift: false, key: ["x"],
+        icon: CutIcon,
+        description: 'delete the selected content and copy it to the clipboard',
+        category: 'clipboard',
+        mutates: true,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'x',
         visible: true,
-        active: context => context.root !== undefined && context.isSelection,
-        handler: context => {
+        active: (context) => context.root !== undefined && context.isSelection,
+        handler: (context) => {
             if (context.root === undefined)
                 return;
             // Save the copied content to the clipboard
@@ -831,16 +1346,20 @@ const commands = [
                 return;
             context.handleCopy(copy);
             return rootWithNode(context, context.root, edit.root, () => edit.range.start);
-        }
+        },
     },
     {
-        label: "🗎",
-        description: "copy the selected content to the clipboard",
-        category: "clipboard",
-        control: true, alt: false, shift: false, key: ["c"],
+        icon: CopyIcon,
+        description: 'copy the selected content to the clipboard',
+        category: 'clipboard',
+        mutates: false,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'c',
         visible: true,
-        active: context => context.isSelection,
-        handler: context => {
+        active: (context) => context.isSelection,
+        handler: (context) => {
             if (context.root === undefined)
                 return;
             // Save the copied content to the clipboard
@@ -848,52 +1367,70 @@ const commands = [
             if (copy !== undefined)
                 context.handleCopy(copy);
             return undefined;
-        }
+        },
     },
     {
-        label: "⎘",
-        description: "paste the content from the clipboard",
-        category: "clipboard",
-        control: true, alt: false, shift: false, key: ["v"],
+        icon: PasteIcon,
+        description: 'paste the content from the clipboard',
+        category: 'clipboard',
+        mutates: false,
+        control: true,
+        alt: false,
+        shift: false,
+        key: 'v',
         visible: true,
         active: () => true,
-        handler: context => {
+        handler: (context) => {
             if (context.root === undefined)
                 return undefined;
             // See if there's something on the clipboard.
             if (navigator.clipboard) {
-                navigator.clipboard.read()
-                    .then((items) => {
+                navigator.clipboard.read().then((items) => {
                     // If there's nothing, paste whatever is on the editor clipboard, if there is something.
                     if (items.length === 0 && context.clipboard !== undefined)
                         context.handlePaste(context, context.clipboard, true);
                     else {
-                        for (const item of items) {
-                            for (const type of item.types) {
-                                if (type === "text/plain")
-                                    item.getType(type)
-                                        .then((blob) => {
-                                        blob.text().then(text => {
-                                            context.handlePaste(context, new TextNode(text), true);
-                                        });
-                                    });
+                        // See if there's data we can handle. Just look at the first.
+                        const item = items[0];
+                        // If there's something, try pasting that.
+                        if (item) {
+                            async function gatherClipboard() {
+                                // Eventually we should add HTML support.
+                                const contents = {
+                                    plain: undefined,
+                                };
+                                try {
+                                    {
+                                        const blob = await item.getType('text/plain');
+                                        const text = await blob.text();
+                                        contents.plain = text;
+                                    }
+                                    context.handlePaste(context, contents, true);
+                                }
+                                catch (err) { }
                             }
+                            gatherClipboard();
                         }
+                        // Otherwise, try pasting what's on the app clipboard.
+                        else if (context.clipboard !== undefined)
+                            return context.handlePaste(context, context.clipboard, false);
                     }
                 });
             }
-            // If there is no OS clipboard access, but there is something in the editor clipboard, copy it.
-            else if (context.clipboard !== undefined) {
-                return context.handlePaste(context, context.clipboard, false);
-            }
-            return undefined;
-        }
+            // Return the current caret to avoid unhandled command feedback.
+            return { root: context.root, range: context.range };
+        },
     },
     {
-        label: "insert",
-        description: "insert character",
-        category: "text",
-        control: false, alt: false, shift: undefined, key: undefined,
+        icon: 'insert symbol',
+        description: 'insert character',
+        category: 'text',
+        press: true,
+        mutates: true,
+        control: undefined,
+        alt: undefined,
+        shift: undefined,
+        key: (key) => key.length === 1,
         visible: false,
         active: (context, key) => context && key !== undefined && key.length === 1,
         handler: (context, utilities, key) => {
@@ -910,7 +1447,8 @@ const commands = [
                 // If there's a selection, remove it before inserting, and insert at the caret returned.
                 if (context.isSelection) {
                     if (context.code) {
-                        if (context.code.getCodeNode() === sortedRange.start.node) {
+                        if (context.code.getCodeNode() ===
+                            sortedRange.start.node) {
                             const newText = insertionPoint.node.withoutRange(sortedRange);
                             if (newText === undefined)
                                 return;
@@ -918,7 +1456,10 @@ const commands = [
                             if (edit === undefined)
                                 return;
                             newRoot = edit;
-                            insertionPoint = { node: newText, index: sortedRange.start.index };
+                            insertionPoint = {
+                                node: newText,
+                                index: sortedRange.start.index,
+                            };
                         }
                     }
                     else {
@@ -943,9 +1484,11 @@ const commands = [
                 if (newRoot === undefined)
                     return;
                 // Update the chapter
-                return rootWithNode(context, context.root, newRoot, () => { return { node: newText, index: insertionPoint.index + 1 }; });
+                return rootWithNode(context, context.root, newRoot, () => {
+                    return { node: newText, index: insertionPoint.index + 1 };
+                });
             }
-        }
-    }
+        },
+    },
 ];
 export default commands;