move table into module

temuera · Apr 24, 2018 · 5fab7f0 · 5fab7f0
1 parent 6451f1d
commit 5fab7f0
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 44 deletions.
diff --git a/formats/table.js b/formats/table.js
@@ -1,20 +1,38 @@
+import Parchment from 'parchment';
 import Block from '../blots/block';
 import Container from '../blots/container';
-import Quill from '../core/quill';
 
-class TableContainer extends Container {
+class TableCell extends Block {
   static create(value) {
-    const node = super.create(value);
-    node.setAttribute('contenteditable', false);
+    const node = super.create();
+    if (value && value.row) {
+      node.setAttribute('data-row', value.row);
+    } else {
+      node.setAttribute('data-row', tableId());
+    }
+    node.setAttribute('contenteditable', true);
     return node;
   }
-}
-TableContainer.blotName = 'table-container';
-TableContainer.tagName = 'TABLE';
 
-class TableBody extends Container {}
-TableBody.blotName = 'table-body';
-TableBody.tagName = 'TBODY';
+  static formats(domNode) {
+    if (domNode.hasAttribute('data-row')) {
+      return {
+        row: domNode.getAttribute('data-row'),
+      };
+    }
+    return undefined;
+  }
+
+  table() {
+    let cur = this.parent;
+    while (cur != null && cur.statics.blotName !== 'table-container') {
+      cur = cur.parent;
+    }
+    return cur;
+  }
+}
+TableCell.blotName = 'table';
+TableCell.tagName = 'TD';
 
 class TableRow extends Container {
   checkMerge() {
@@ -29,15 +47,14 @@ class TableRow extends Container {
 TableRow.blotName = 'table-row';
 TableRow.tagName = 'TR';
 
-class TableCell extends Block {
+class TableBody extends Container {}
+TableBody.blotName = 'table-body';
+TableBody.tagName = 'TBODY';
+
+class TableContainer extends Container {
   static create(value) {
-    const node = super.create();
-    if (value && value.row) {
-      node.setAttribute('data-row', value.row);
-    } else {
-      node.setAttribute('data-row', tableId());
-    }
-    node.setAttribute('contenteditable', true);
+    const node = super.create(value);
+    node.setAttribute('contenteditable', false);
     return node;
   }
 
@@ -57,31 +74,10 @@ class TableCell extends Block {
         blot.optimize(); // Add break blot
       });
     });
-  static formats(domNode) {
-    if (domNode.hasAttribute('data-row')) {
-      return {
-        row: domNode.getAttribute('data-row'),
-      };
-    }
-    return undefined;
-  }
-
-  static register() {
-    Quill.register(TableRow);
-    Quill.register(TableBody);
-    Quill.register(TableContainer);
-  }
-
-  table() {
-    let cur = this.parent;
-    while (cur != null && cur.statics.blotName !== 'table-container') {
-      cur = cur.parent;
-    }
-    return cur;
   }
 }
-TableCell.blotName = 'table';
-TableCell.tagName = 'TD';
+TableContainer.blotName = 'table-container';
+TableContainer.tagName = 'TABLE';
 
 TableContainer.allowedChildren = [TableBody];
 TableBody.requiredContainer = TableContainer;
@@ -98,4 +94,4 @@ function tableId() {
     .slice(4);
 }
 
-export { TableCell as default, tableId };
+export { TableCell, TableRow, TableBody, TableContainer, tableId };
diff --git a/modules/table.js b/modules/table.js
@@ -0,0 +1,22 @@
+import Parchment from 'parchment';
+import Block from '../blots/block';
+import Container from '../blots/container';
+import Quill from '../core/quill';
+import Module from '../core/module';
+import {
+  TableCell,
+  TableRow,
+  TableBody,
+  TableContainer,
+} from '../formats/table';
+
+class Table extends Module {
+  static register() {
+    Quill.register(TableCell);
+    Quill.register(TableRow);
+    Quill.register(TableBody);
+    Quill.register(TableContainer);
+  }
+}
+
+export default Table;
diff --git a/quill.js b/quill.js
@@ -11,7 +11,6 @@ import Indent from './formats/indent';
 import Blockquote from './formats/blockquote';
 import Header from './formats/header';
 import List from './formats/list';
-import Table from './formats/table';
 
 import { BackgroundClass, BackgroundStyle } from './formats/background';
 import { ColorClass, ColorStyle } from './formats/color';
@@ -32,6 +31,7 @@ import Video from './formats/video';
 import CodeBlock, { Code as InlineCode } from './formats/code';
 
 import Syntax from './modules/syntax';
+import Table from './modules/table';
 import Toolbar from './modules/toolbar';
 
 import Icons from './ui/icons';
@@ -79,7 +79,6 @@ Quill.register(
     'formats/code-block': CodeBlock,
     'formats/header': Header,
     'formats/list': List,
-    'formats/table': Table,
 
     'formats/bold': Bold,
     'formats/code': InlineCode,
@@ -94,6 +93,7 @@ Quill.register(
     'formats/video': Video,
 
     'modules/syntax': Syntax,
+    'modules/table': Table,
     'modules/toolbar': Toolbar,
 
     'themes/bubble': BubbleTheme,