fix table commands type error

This commit is contained in:
Philipinho
2024-07-22 15:43:43 +01:00
parent 373fc86e47
commit 2df7de5828
6 changed files with 12 additions and 19 deletions

View File

@ -4,13 +4,14 @@ import { TextAlign } from "@tiptap/extension-text-align";
import { TaskList } from "@tiptap/extension-task-list"; import { TaskList } from "@tiptap/extension-task-list";
import { TaskItem } from "@tiptap/extension-task-item"; import { TaskItem } from "@tiptap/extension-task-item";
import { Underline } from "@tiptap/extension-underline"; import { Underline } from "@tiptap/extension-underline";
import { Link } from "@tiptap/extension-link";
import { Superscript } from "@tiptap/extension-superscript"; import { Superscript } from "@tiptap/extension-superscript";
import SubScript from "@tiptap/extension-subscript"; import SubScript from "@tiptap/extension-subscript";
import { Highlight } from "@tiptap/extension-highlight"; import { Highlight } from "@tiptap/extension-highlight";
import { Typography } from "@tiptap/extension-typography"; import { Typography } from "@tiptap/extension-typography";
import { TextStyle } from "@tiptap/extension-text-style"; import { TextStyle } from "@tiptap/extension-text-style";
import { Color } from "@tiptap/extension-color"; import { Color } from "@tiptap/extension-color";
import Table from "@tiptap/extension-table";
import TableHeader from "@tiptap/extension-table-header";
import CodeBlockLowlight from "@tiptap/extension-code-block-lowlight"; import CodeBlockLowlight from "@tiptap/extension-code-block-lowlight";
import SlashCommand from "@/features/editor/extensions/slash-command"; import SlashCommand from "@/features/editor/extensions/slash-command";
import { Collaboration } from "@tiptap/extension-collaboration"; import { Collaboration } from "@tiptap/extension-collaboration";
@ -23,8 +24,6 @@ import {
DetailsSummary, DetailsSummary,
MathBlock, MathBlock,
MathInline, MathInline,
Table,
TableHeader,
TableCell, TableCell,
TableRow, TableRow,
TrailingNode, TrailingNode,
@ -97,10 +96,16 @@ export const mainExtensions = [
class: "comment-mark", class: "comment-mark",
}, },
}), }),
Table,
Table.configure({
resizable: true,
lastColumnResizable: false,
allowTableNodeSelection: true,
}),
TableRow, TableRow,
TableCell, TableCell,
TableHeader, TableHeader,
MathInline.configure({ MathInline.configure({
view: MathInlineView, view: MathInlineView,
}), }),

View File

@ -10,6 +10,8 @@ import { Typography } from '@tiptap/extension-typography';
import { TextStyle } from '@tiptap/extension-text-style'; import { TextStyle } from '@tiptap/extension-text-style';
import { Color } from '@tiptap/extension-color'; import { Color } from '@tiptap/extension-color';
import { Youtube } from '@tiptap/extension-youtube'; import { Youtube } from '@tiptap/extension-youtube';
import Table from '@tiptap/extension-table';
import TableHeader from '@tiptap/extension-table-header';
import { import {
Callout, Callout,
Comment, Comment,
@ -19,9 +21,7 @@ import {
LinkExtension, LinkExtension,
MathBlock, MathBlock,
MathInline, MathInline,
Table,
TableCell, TableCell,
TableHeader,
TableRow, TableRow,
TiptapImage, TiptapImage,
TiptapVideo, TiptapVideo,

View File

@ -1,3 +0,0 @@
import TiptapTableHeader from "@tiptap/extension-table-header";
export const TableHeader = TiptapTableHeader.configure();

View File

@ -1,4 +1,2 @@
export * from "./table-extension";
export * from "./header";
export * from "./row"; export * from "./row";
export * from "./cell"; export * from "./cell";

View File

@ -1,7 +0,0 @@
import TiptapTable from "@tiptap/extension-table";
export const Table = TiptapTable.configure({
resizable: true,
lastColumnResizable: false,
allowTableNodeSelection: true,
});

View File

@ -3,7 +3,7 @@ import { Editor, findParentNode, isTextSelection } from "@tiptap/core";
import { Selection, Transaction } from "@tiptap/pm/state"; import { Selection, Transaction } from "@tiptap/pm/state";
import { CellSelection, TableMap } from "@tiptap/pm/tables"; import { CellSelection, TableMap } from "@tiptap/pm/tables";
import { Node, ResolvedPos } from "@tiptap/pm/model"; import { Node, ResolvedPos } from "@tiptap/pm/model";
import { Table } from "./table/table-extension"; import Table from "@tiptap/extension-table";
export const isRectSelected = (rect: any) => (selection: CellSelection) => { export const isRectSelected = (rect: any) => (selection: CellSelection) => {
const map = TableMap.get(selection.$anchorCell.node(-1)); const map = TableMap.get(selection.$anchorCell.node(-1));