feat: use modern tables for pre-packaged editors (remirror#1191)

sandzone · Sep 1, 2021 · 9b8f766 · 9b8f766
1 parent 6c0b960
commit 9b8f766
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 2 deletions.
diff --git a/packages/remirror__preset-wysiwyg/__tests__/tsconfig.json b/packages/remirror__preset-wysiwyg/__tests__/tsconfig.json
@@ -79,6 +79,9 @@
     {
       "path": "../../remirror__extension-list/src"
     },
+    {
+      "path": "../../remirror__extension-react-tables/src"
+    },
     {
       "path": "../../remirror__extension-search/src"
     },

diff --git a/packages/remirror__preset-wysiwyg/package.json b/packages/remirror__preset-wysiwyg/package.json
@@ -57,6 +57,7 @@
     "@remirror/extension-italic": "^1.0.3",
     "@remirror/extension-link": "^1.0.3",
     "@remirror/extension-list": "^1.0.8",
+    "@remirror/extension-react-tables": "^1.0.7",
     "@remirror/extension-search": "^1.0.3",
     "@remirror/extension-strike": "^1.0.3",
     "@remirror/extension-tables": "^1.0.4",

diff --git a/packages/remirror__preset-wysiwyg/src/tsconfig.json b/packages/remirror__preset-wysiwyg/src/tsconfig.json
@@ -64,6 +64,9 @@
     {
       "path": "../../remirror__extension-list/src"
     },
+    {
+      "path": "../../remirror__extension-react-tables/src"
+    },
     {
       "path": "../../remirror__extension-search/src"
     },

diff --git a/packages/remirror__preset-wysiwyg/src/wysiwyg-preset.ts b/packages/remirror__preset-wysiwyg/src/wysiwyg-preset.ts
@@ -18,9 +18,10 @@ import {
   OrderedListExtension,
   TaskListItemExtension,
 } from '@remirror/extension-list';
+import { TableExtension } from '@remirror/extension-react-tables';
 import { SearchExtension, SearchOptions } from '@remirror/extension-search';
 import { StrikeExtension } from '@remirror/extension-strike';
-import { TableExtension, TableOptions } from '@remirror/extension-tables';
+import { TableOptions } from '@remirror/extension-tables';
 import { TrailingNodeExtension, TrailingNodeOptions } from '@remirror/extension-trailing-node';
 import { UnderlineExtension } from '@remirror/extension-underline';
 

diff --git a/packages/remirror__react-editors/src/components/top-toolbar.tsx b/packages/remirror__react-editors/src/components/top-toolbar.tsx
@@ -77,6 +77,7 @@ const toolbarItems: ToolbarItemUnion[] = [
         display: 'icon',
       },
       { type: ComponentItem.ToolbarCommandButton, commandName: 'toggleTaskList', display: 'icon' },
+      { type: ComponentItem.ToolbarCommandButton, commandName: 'createTable', display: 'icon' },
     ],
     separator: 'none',
   },

diff --git a/packages/remirror__react-editors/src/social/social-editor.tsx b/packages/remirror__react-editors/src/social/social-editor.tsx
@@ -14,6 +14,7 @@ import {
   MentionAtomPopupComponent,
   MentionAtomState,
   Remirror,
+  TableComponents,
   ThemeProvider,
   useRemirror,
 } from '@remirror/react';
@@ -89,6 +90,7 @@ export const SocialEditor: FC<SocialEditorProps> = ({ placeholder, ...props }) =
           <EditorComponent />
           <EmojiPopupComponent />
           <MentionComponent {...props} />
+          <TableComponents />
           <BubbleMenu />
           {children}
         </Remirror>

diff --git a/packages/remirror__react-editors/src/wysiwyg/wysiwyg-editor.tsx b/packages/remirror__react-editors/src/wysiwyg/wysiwyg-editor.tsx
@@ -1,6 +1,12 @@
 import { FC, useCallback } from 'react';
 import { PlaceholderExtension, wysiwygPreset } from 'remirror/extensions';
-import { EditorComponent, Remirror, ThemeProvider, useRemirror } from '@remirror/react';
+import {
+  EditorComponent,
+  Remirror,
+  TableComponents,
+  ThemeProvider,
+  useRemirror,
+} from '@remirror/react';
 import { AllStyledComponent } from '@remirror/styles/emotion';
 
 import { BubbleMenu } from '../components/bubble-menu';
@@ -26,6 +32,7 @@ export const WysiwygEditor: FC<WysiwygEditorProps> = ({ placeholder, ...props })
           <TopToolbar />
           <EditorComponent />
           <BubbleMenu />
+          <TableComponents />
           {children}
         </Remirror>
       </ThemeProvider>

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/support/root/.size-limit.json b/support/root/.size-limit.json
@@ -753,6 +753,7 @@
       "@remirror/extension-italic",
       "@remirror/extension-link",
       "@remirror/extension-list",
+      "@remirror/extension-react-tables",
       "@remirror/extension-search",
       "@remirror/extension-strike",
       "@remirror/extension-tables",
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,6 +79,9 @@ @@
         {
           "path": "../../remirror__extension-list/src"
         },
+        {
+          "path": "../../remirror__extension-react-tables/src"
+        },
         {
           "path": "../../remirror__extension-search/src"
         },
@@ Expand Down @@