fix(schema): add prosemirrorschema

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

@@ -11,7 +11,7 @@ import {
   TextStyleService,
   InlineAnnotationsService,
   LinkService,
-  OverlayService
+  OverlayService,
   ListsService,
   ListToolGroupService,
   TablesService,

wax-prosemirror-core/src/ioc-react.js

@@ -6,39 +6,6 @@ export const WaxContext = React.createContext({
   updateView: null
 });
 
-// export default class WaxContextComponent extends Component {
-//   constructor(props) {
-//     super(props);
-//     console.log("tesss");
-//     this.state = {
-//       app: props.app,
-//       view: props.view,
-//       updateView: view => {
-//         this.setState(view);
-//       }
-//     };
-//   }
-
-//   componentWillReceiveProps(next, prev) {
-//     console.log(next, prev);
-//   }
-
-//   render() {
-//     console.log("provider");
-//     return (
-//       <WaxContext.Provider
-//         value={{
-//           app: this.state.app,
-//           view: this.state.view,
-//           updateView: this.state.updateView
-//         }}
-//       >
-//         {this.props.children}
-//       </WaxContext.Provider>
-//     );
-//   }
-// }
-
 export default props => {
   const [context, setContext] = useState({
     app: props.app,

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

@@ -333,10 +333,6 @@ const nodes = {
     toDOM() {
       return blockquoteDOM;
     }
-  },
-  ...tableNodes({
-    tableGroup: "block",
-    cellContent: "block+"
-  })
+  }
 };
 export default nodes;

wax-prosemirror-services/index.js

 export { default as MenuService } from "./src/MenuService/MenuService";
-export { default as RedoUndoService } from "./src/RedoUndoService/RedoUndoService";
-export { default as AnnotationService } from "./src/AnnotationService/AnnotationService";
-export { default as PlaceholderService } from "./src/PlaceholderService/PlaceholderService";
 export { default as LinkService } from "./src/LinkService/LinkService";
 
 export { default as TextStyleService } from "./src/TextStyleService/TextStyleService";

wax-prosemirror-services/src/InlineAnnotations/StrongService/StrongService.js

@@ -11,13 +11,13 @@ class StrongService extends Service {
 
   register() {
     this.container.bind("Strong").to(Strong);
-
-    this.container
-      .bind("schema")
-      .toConstantValue({
+    const createMark = this.container.get("CreateMark");
+    createMark(
+      {
         strong: strongMark
-      })
-      .whenTargetNamed("mark");
+      },
+      { toWaxSchema: true }
+    );
   }
 }
 

wax-prosemirror-services/src/ListsService/ListsService.js

@@ -2,9 +2,7 @@ import ListsServices from "./index";
 import Service from "wax-prosemirror-core/src/services/Service";
 
 class ListsService extends Service {
-  register() {
-    this.config.pushToArray("services", ListsServices);
-  }
+  dependencies = ListsServices;
 }
 
 export default ListsService;

wax-prosemirror-services/src/SchemaService/Node.js

@@ -6,6 +6,7 @@ export default class Node {
   name = "";
   importer = {};
 
+  isolating = false;
   inline = false;
   group = "";
   content = "";
@@ -59,6 +60,7 @@ export default class Node {
       inline: this.inline,
       group: this.group,
       content: this.content,
+      isolating: this.isolating,
       draggable: this.draggable,
       attrs: this._attrs,
       parseDOM: this._parseRules.map(rule => rule.combineRules()),

wax-prosemirror-services/src/SchemaService/SchemaService.js

@@ -13,29 +13,30 @@ export default class SchemaService extends Service {
       .inSingletonScope();
 
     this.container.bind("CreateNode").toFactory(context => {
-      return (schema, options) => {
+      return (schema, options = { toWaxSchema: false }) => {
         if (options.toWaxSchema) {
-          context
+          context.container
             .bind("schema")
             .toConstantValue(schema)
             .whenTargetNamed("node");
         } else {
-          const schema = context.get("Schema");
-          schema.addProsemirrorSchema(schema, "nodes");
+          const schemaInstance = context.container.get("Schema");
+
+          schemaInstance.addProsemirrorSchema(schema, "nodes");
         }
       };
     });
 
     this.container.bind("CreateMark").toFactory(context => {
-      return (schema, options) => {
+      return (schema, options = { toWaxSchema: false }) => {
         if (options.toWaxSchema) {
-          context
+          context.container
             .bind("schema")
             .toConstantValue(schema)
             .whenTargetNamed("mark");
         } else {
-          const schema = context.get("Schema");
-          schema.addProsemirrorSchema(schema, "marks");
+          const schemaInstance = context.container.get("Schema");
+          schemaInstance.addProsemirrorSchema(schema, "marks");
         }
       };
     });

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

@@ -7,6 +7,25 @@ class InsertTableService extends Service {
 
   register() {
     this.container.bind("Table").to(Table);
+
+    const createNode = this.container.get("CreateNode");
+    const { table, table_row, table_cell, table_header } = tableNodes({
+      tableGroup: "block",
+      cellContent: "block+"
+    });
+
+    createNode({
+      table
+    });
+    createNode({
+      table_row
+    });
+    createNode({
+      table_cell
+    });
+    createNode({
+      table_header
+    });
   }
 }