feat(tables): finsish tables toolgroup

editors/editoria/src/config/config.js

@@ -13,6 +13,7 @@ export default {
       toolGroups: [
         "Annotations",
         "Lists",
+        "Tables",
         { name: "RedoUndo", exclude: ["Redo"] }
       ]
     },

wax-prosemirror-core/src/config/defaultConfig.js

@@ -12,7 +12,9 @@ import {
   InlineAnnotationsService,
   LinkService,
   ListsService,
-  ListToolGroupService
+  ListToolGroupService,
+  TablesService,
+  TableToolGroupService
 } from "wax-prosemirror-services";
 
 export default {
@@ -30,6 +32,8 @@ export default {
     new ImageService(),
     new InlineAnnotationsService(),
     new LinkService(),
-    new ListsService()
+    new ListsService(),
+    new TableToolGroupService(),
+    new TablesService()
   ]
 };

wax-prosemirror-schema/src/editoria/nodes.js

-import { tableNodes, columnResizing, tableEditing } from "prosemirror-tables";
+import { tableNodes } from "prosemirror-tables";
 import { parseFormatList, parseTracks, blockLevelToDOM } from "./helpers";
 const pDOM = ["p", 0],
   brDOM = ["br"],

wax-prosemirror-services/index.js

-export { default as LinkService } from "./src/LinkService/LinkService";
 export { default as MenuService } from "./src/MenuService/MenuService";
+export { default as LinkService } from "./src/LinkService/LinkService";
+
 export {
   default as RedoUndoService
 } from "./src/RedoUndoService/RedoUndoService";
@@ -16,12 +17,17 @@ export { default as SchemaService } from "./src/SchemaService/SchemaService";
 export {
   default as ShortCutsService
 } from "./src/ShortCutsService/ShortCutsService";
+
+export { default as Tool } from "./src/lib/Tools";
+
+/*
+All Elements services
+*/
 export {
   default as InlineAnnotationsService
 } from "./src/InlineAnnotations/InlineAnnotationsService";
 export { default as ListsService } from "./src/ListsService/ListsService";
-
-export { default as Tool } from "./src/lib/Tools";
+export { default as TablesService } from "./src/TablesService/TablesService";
 
 /*
 ToolGroups
@@ -32,3 +38,6 @@ export {
 export {
   default as ListToolGroupService
 } from "./src/WaxToolGroups/ListToolGroupService/ListToolGroupService";
+export {
+  default as TableToolGroupService
+} from "./src/WaxToolGroups/TableToolGroupService/TableToolGroupService";

wax-prosemirror-services/src/TablesService/EditTableService/EditTableService.js

 import Service from "wax-prosemirror-core/src/services/Service";
-import Table from "./Table";
+import TableDropDownOptions from "./TableDropDownOptions";
 
 class EditTableService extends Service {
   boot() {}

wax-prosemirror-services/src/TablesService/EditTableService/TableDropDownOptions.js

 import React from "react";
 import { v4 as uuid } from "uuid";
-import { canInsert } from "../../../lib/Utils";
-import Tools from "../../../lib/Tools";
+import { canInsert } from "../../lib/Utils";
+import Tools from "../../lib/Tools";
 import { injectable } from "inversify";
 import { TableDropDown } from "wax-prosemirror-components";
 import { addColumnBefore } from "prosemirror-tables";

wax-prosemirror-services/src/TablesService/InsertTableService/InsertTableService.js

+import { tableNodes } from "prosemirror-tables";
 import Service from "wax-prosemirror-core/src/services/Service";
 import Table from "./Table";
 

wax-prosemirror-services/src/TablesService/index.js

+import InsertTableService from "./InsertTableService/InsertTableService";
+import EditTableService from "./EditTableService/EditTableService";
+
+export default [new InsertTableService(), new EditTableService()];

wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableGroupService.js

-import Table from "./Table";
-import Service from "wax-prosemirror-core/src/services/Service";
-
-class TableToolGroupService extends Service {
-  name = "TableToolGroupService";
-
-  register() {
-    this.container.bind("Table").to(Table);
-  }
-}
-
-export default TableToolGroupService;

wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableToolGroupService.js

-import Table from "./Table";
+import Tables from "./Tables";
 import Service from "wax-prosemirror-core/src/services/Service";
 
 class TableToolGroupService extends Service {
   name = "TableToolGroupService";
 
   register() {
-    this.container.bind("Table").to(Table);
+    this.container.bind("Tables").to(Tables);
   }
 }
 

wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/Table.js → wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/Tables.js

@@ -2,16 +2,14 @@ import { injectable, inject } from "inversify";
 import ToolGroup from "../../lib/ToolGroup";
 
 @injectable()
-class Table extends ToolGroup {
+class Tables extends ToolGroup {
   tools = [];
   constructor(
-    @inject("OrderedList") orderedlist,
-    @inject("BulletList") bulletlist,
-    @inject("JoinUp") joinup,
-    @inject("Lift") lift
+    @inject("Table") table,
+    @inject("TableDropDownOptions") tableDropDownOptions
   ) {
     super();
-    this.tools = [orderedlist, bulletlist, joinup, lift];
+    this.tools = [table, tableDropDownOptions];
   }
 
   renderTools(view) {
@@ -23,4 +21,4 @@ class Table extends ToolGroup {
   }
 }
 
-export default Table;
+export default Tables;