@jant/core 0.6.13 → 0.6.15

package/src/client/tiptap/extensions.ts

@@ -13,9 +13,10 @@ import type { PasteMediaOptions } from "./paste-media.js";
 import { BubbleMenu } from "./bubble-menu.js";
 import { LinkToolbar } from "./link-toolbar.js";
 import { ExitableMarks } from "./exitable-marks.js";
-import { TabIndent } from "./tab-indent.js";
+import { CodeBlockIndent } from "./tab-indent.js";
+import { StructuralKeymap } from "./structural-keymap.js";
+import { ContinuousLists } from "./continuous-lists.js";
 import { LinkInputRules } from "./link-input-rules.js";
-import { WrappingInputRules } from "./wrapping-input-rules.js";
 import { InsertParagraphAround } from "./insert-paragraph-around.js";
 import { Footnotes } from "./footnotes.js";
 import type { FormattingToolbarMode } from "./toolbar-mode.js";
@@ -28,6 +29,8 @@ import { RehostImages } from "./rehost-images.js";
 import type { RehostImagesOptions } from "./rehost-images.js";
 import { MarkdownClipboard } from "./markdown-clipboard.js";
 import { ImageInputRules } from "./image-input-rules.js";
+import { TableControls } from "./table-controls.js";
+import type { TableControlLabels } from "./table-control-labels.js";
 import {
   MARKDOWN_MARKED_OPTIONS,
   createMarkdownContentExtensions,
@@ -39,6 +42,7 @@ export interface EditorExtensionOptions {
   pasteMedia?: PasteMediaOptions;
   rehostImages?: RehostImagesOptions;
   imageNodeLabels?: Partial<ImageNodeLabels>;
+  tableControlLabels?: TableControlLabels;
 }
 
 /**
@@ -83,10 +87,11 @@ export function createSettingsEditorExtensions(
     }),
     ReclaimModEnter,
     LinkInputRules,
-    WrappingInputRules,
     MarkdownClipboard,
     ExitableMarks,
     InsertParagraphAround,
+    StructuralKeymap,
+    ContinuousLists,
     BubbleMenu.configure({
       toolbarMode: "compose",
     }),
@@ -116,9 +121,11 @@ export function createEditorExtensions(
     Footnotes,
     ImageInputRules,
     LinkInputRules,
-    WrappingInputRules,
     MarkdownClipboard,
     SlashCommands,
+    ...(options.tableControlLabels
+      ? [TableControls.configure({ labels: options.tableControlLabels })]
+      : []),
     EmbedPaste,
     PasteMedia.configure(options.pasteMedia ?? {}),
     RehostImages.configure(options.rehostImages ?? {}),
@@ -128,6 +135,8 @@ export function createEditorExtensions(
     LinkToolbar,
     ExitableMarks,
     InsertParagraphAround,
-    TabIndent,
+    StructuralKeymap,
+    ContinuousLists,
+    CodeBlockIndent,
   ];
 }

package/src/client/tiptap/footnotes.ts

@@ -2,6 +2,7 @@ import { Extension, InputRule } from "@tiptap/core";
 import { Fragment, type Node as ProseMirrorNode } from "@tiptap/pm/model";
 import {
   NodeSelection,
+  Plugin,
   TextSelection,
   type EditorState,
   type Transaction,
@@ -195,6 +196,85 @@ function ensureFootnoteDefinition(
   return insertPos;
 }
 
+function collectMissingFootnoteDefinitionLabels(
+  doc: ProseMirrorNode,
+): string[] {
+  const definedLabels = new Set<string>();
+  const queuedLabels = new Set<string>();
+  const missingLabels: string[] = [];
+
+  doc.forEach((node) => {
+    if (node.type.name !== "footnoteDefinition") {
+      return;
+    }
+
+    const label = normalizeFootnoteLabel(node.attrs.label);
+    if (label) {
+      definedLabels.add(getFootnoteLabelKey(label));
+    }
+  });
+
+  doc.descendants((node) => {
+    if (node.type.name !== "footnoteReference") {
+      return true;
+    }
+
+    const label = normalizeFootnoteLabel(node.attrs.label);
+    const labelKey = getFootnoteLabelKey(label);
+    if (label && !definedLabels.has(labelKey) && !queuedLabels.has(labelKey)) {
+      queuedLabels.add(labelKey);
+      missingLabels.push(label);
+    }
+
+    return true;
+  });
+
+  return missingLabels;
+}
+
+function buildEnsureFootnoteDefinitionsTransaction(
+  state: EditorState,
+): Transaction | null {
+  const missingLabels = collectMissingFootnoteDefinitionLabels(state.doc);
+  if (missingLabels.length === 0) {
+    return null;
+  }
+
+  const tr = state.tr;
+  for (const label of missingLabels) {
+    ensureFootnoteDefinition(state, tr, label);
+  }
+
+  return tr.docChanged ? tr : null;
+}
+
+function getSelectedFootnoteReferenceLabel(state: EditorState): string | null {
+  const { selection } = state;
+  if (
+    !(selection instanceof NodeSelection) ||
+    selection.node.type.name !== "footnoteReference"
+  ) {
+    return null;
+  }
+
+  return normalizeFootnoteLabel(selection.node.attrs.label) || null;
+}
+
+function buildNavigateToFootnoteDefinitionTransaction(
+  state: EditorState,
+  label: string,
+): Transaction | null {
+  const tr = state.tr;
+  const definitionPos = ensureFootnoteDefinition(state, tr, label);
+  if (definitionPos === null) {
+    return null;
+  }
+
+  setSelectionInsideInsertedFootnote(tr, definitionPos);
+  tr.scrollIntoView();
+  return tr;
+}
+
 function ensureNonEmptyDoc(state: EditorState, tr: Transaction) {
   if (tr.doc.childCount > 0) {
     return;
@@ -603,6 +683,66 @@ declare module "@tiptap/core" {
 export const Footnotes = Extension.create({
   name: "footnotes",
 
+  onCreate() {
+    const tr = buildEnsureFootnoteDefinitionsTransaction(this.editor.state);
+    if (tr) {
+      this.editor.view.dispatch(tr);
+    }
+  },
+
+  addProseMirrorPlugins() {
+    return [
+      new Plugin({
+        appendTransaction: (transactions, _oldState, newState) => {
+          if (!transactions.some((transaction) => transaction.docChanged)) {
+            return null;
+          }
+
+          return buildEnsureFootnoteDefinitionsTransaction(newState);
+        },
+        props: {
+          handleClickOn: (view, _pos, node, _nodePos, _event, direct) => {
+            if (!direct || node.type.name !== "footnoteReference") {
+              return false;
+            }
+
+            const label = normalizeFootnoteLabel(node.attrs.label);
+            if (!label) {
+              return false;
+            }
+
+            const tr = buildNavigateToFootnoteDefinitionTransaction(
+              view.state,
+              label,
+            );
+            if (!tr) {
+              return false;
+            }
+
+            view.dispatch(tr);
+            view.focus();
+            return true;
+          },
+          handleClick: (view, pos) => {
+            const $pos = view.state.doc.resolve(pos);
+            if (
+              $pos.nodeBefore?.type.name !== "footnoteDefinition" ||
+              $pos.nodeAfter?.type.name !== "footnoteDefinition"
+            ) {
+              return false;
+            }
+
+            const tr = view.state.tr;
+            setSelectionInsideInsertedFootnote(tr, pos);
+            view.dispatch(tr.scrollIntoView());
+            view.focus();
+            return true;
+          },
+        },
+      }),
+    ];
+  },
+
   addCommands() {
     return {
       insertFootnote:
@@ -649,6 +789,22 @@ export const Footnotes = Extension.create({
   addKeyboardShortcuts() {
     return {
       Enter: ({ editor }) => {
+        const selectedReferenceLabel = getSelectedFootnoteReferenceLabel(
+          editor.state,
+        );
+        if (selectedReferenceLabel) {
+          const navigateTr = buildNavigateToFootnoteDefinitionTransaction(
+            editor.state,
+            selectedReferenceLabel,
+          );
+          if (!navigateTr) {
+            return false;
+          }
+
+          editor.view.dispatch(navigateTr);
+          return true;
+        }
+
         const tr = activateTrailingFootnoteAtParagraphEnd(editor.state);
         if (!tr) {
           return false;