chore: updated table extensions

makeplane · Oct 18, 2024 · 47b7853 · 47b7853
1 parent 6ff940a
commit 47b7853
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 22 deletions.
diff --git a/packages/editor/src/core/extensions/core-without-props.ts b/packages/editor/src/core/extensions/core-without-props.ts
@@ -13,7 +13,7 @@ import { IssueWidgetWithoutProps } from "./issue-embed/issue-embed-without-props
 import { CustomMentionWithoutProps } from "./mentions/mentions-without-props";
 import { CustomQuoteExtension } from "./quote";
 import { CustomStarterKit } from "./starter-kit";
-import { TableHeader, TableCell, TableRow, Table } from "./table";
+import { CustomTableExtension } from "./table";
 import { CustomTodoListExtension } from "./todo-list";
 
 export const CoreEditorExtensionsWithoutProps: (Extension<any, any> | Node<any, any> | Mark<any, any>)[] = [
@@ -32,10 +32,7 @@ export const CoreEditorExtensionsWithoutProps: (Extension<any, any> | Node<any,
   ...CustomTodoListExtension(),
   CustomCodeInlineExtension,
   CustomCodeBlockExtensionWithoutProps,
-  Table,
-  TableHeader,
-  TableCell,
-  TableRow,
+  ...CustomTableExtension,
   CustomMentionWithoutProps(),
   CustomColorExtension,
 ];

diff --git a/packages/editor/src/core/extensions/extensions.tsx b/packages/editor/src/core/extensions/extensions.tsx
@@ -17,15 +17,12 @@ import {
   CustomPlaceholderExtension,
   CustomQuoteExtension,
   CustomStarterKit,
+  CustomTableExtension,
   CustomTodoListExtension,
   CustomTypographyExtension,
   DropHandlerExtension,
   ImageExtension,
   ListKeymap,
-  Table,
-  TableCell,
-  TableHeader,
-  TableRow,
 } from "@/extensions";
 // types
 import { IMentionHighlight, IMentionSuggestion, TFileHandler } from "@/types";
@@ -72,10 +69,7 @@ export const CoreEditorExtensions = (args: TArguments): (Extension<any, any> | N
       transformPastedText: true,
       breaks: true,
     }),
-    Table,
-    TableHeader,
-    TableCell,
-    TableRow,
+    ...CustomTableExtension,
     CustomMention({
       mentionSuggestions: mentionConfig.mentionSuggestions,
       mentionHighlights: mentionConfig.mentionHighlights,

diff --git a/packages/editor/src/core/extensions/read-only-extensions.tsx b/packages/editor/src/core/extensions/read-only-extensions.tsx
@@ -12,16 +12,13 @@ import {
   ReadOnlyImageExtension,
   CustomCodeBlockExtension,
   CustomCodeInlineExtension,
-  TableHeader,
-  TableCell,
-  TableRow,
-  Table,
   CustomMention,
   HeadingListExtension,
   CustomReadOnlyImageExtension,
   CustomColorExtension,
   CustomStarterKit,
   CustomTodoListExtension,
+  CustomTableExtension,
 } from "@/extensions";
 // types
 import { IMentionHighlight, TFileHandler } from "@/types";
@@ -67,10 +64,7 @@ export const CoreReadOnlyEditorExtensions = (
       html: true,
       transformCopiedText: true,
     }),
-    Table,
-    TableHeader,
-    TableCell,
-    TableRow,
+    ...CustomTableExtension,
     CustomMention({
       mentionHighlights: mentionConfig.mentionHighlights,
       readOnly: true,

diff --git a/packages/editor/src/core/extensions/table/extension.tsx b/packages/editor/src/core/extensions/table/extension.tsx
@@ -0,0 +1,12 @@
+import { Extension, Mark, Node } from "@tiptap/core";
+import { Table } from "./table";
+import { TableCell } from "./table-cell";
+import { TableHeader } from "./table-header";
+import { TableRow } from "./table-row";
+
+export const CustomTableExtension: (Extension<any, any> | Node<any, any> | Mark<any, any>)[] = [
+  Table,
+  TableHeader,
+  TableCell,
+  TableRow,
+];
diff --git a/packages/editor/src/core/extensions/table/index.ts b/packages/editor/src/core/extensions/table/index.ts
@@ -2,3 +2,4 @@ export * from "./table";
 export * from "./table-cell";
 export * from "./table-header";
 export * from "./table-row";
+export * from "./extension";
diff --git a/packages/editor/src/core/extensions/todo-list.ts b/packages/editor/src/core/extensions/todo-list.ts
@@ -1,3 +1,4 @@
+import { Extension, Mark, Node } from "@tiptap/core";
 import TaskItem from "@tiptap/extension-task-item";
 import TaskList from "@tiptap/extension-task-list";
 // helpers
@@ -7,7 +8,7 @@ type Props = {
   readOnly?: boolean;
 };
 
-export const CustomTodoListExtension = (props?: Props) => {
+export const CustomTodoListExtension = (props?: Props): (Extension<any, any> | Node<any, any> | Mark<any, any>)[] => {
   const { readOnly } = props;
 
   return [