Merge branch 'wax-plugins' of gitlab.coko.foundation:wax/wax-prosemirror into wax-plugins

editors/editoria/src/config/config.js

 import { emDash, ellipsis } from "prosemirror-inputrules";
 import { columnResizing, tableEditing } from "prosemirror-tables";
+import {
+  ImageService,
+  PlaceholderService,
+  TextStyleService,
+  InlineAnnotationsService,
+  LinkService,
+  ListsService,
+  ListToolGroupService,
+  TablesService,
+  TableToolGroupService,
+  BaseService,
+  BaseToolGroupService,
+  DisplayBlockLevelService,
+  DisplayToolGroupService,
+  ImageToolGroupService
+} from "wax-prosemirror-services";
+
 import invisibles, {
   space,
   hardBreak,
@@ -27,5 +44,25 @@ export default {
     tableEditing(),
     // TrackChangePlugin({ options: {} }),
     invisibles([hardBreak()])
+  ],
+  services: [
+    new ListToolGroupService(),
+    new TextStyleService(),
+    new PlaceholderService(),
+    new ImageService(),
+    new InlineAnnotationsService(),
+    // new OverlayService()
+    new LinkService(),
+    new ListsService(),
+    new TableToolGroupService(),
+    new TablesService(),
+    new BaseService(),
+    new BaseToolGroupService(),
+    //new ImageToolGroupService(),
+    new DisplayBlockLevelService(),
+    new DisplayToolGroupService(),
+    // new TextBlockLevelService(),
+    // new TextToolGroupService()
+    new ImageToolGroupService()
   ]
 };

wax-prosemirror-core/package.json

@@ -27,7 +27,8 @@
     "inversify": "^5.0.1",
     "inversify-inject-decorators": "^3.1.0",
     "reflect-metadata": "^0.1.13",
-    "wax-prosemirror-services": "^0.0.3"
+    "wax-prosemirror-services": "^0.0.3",
+    "deepmerge": "^4.2.2"
   },
   "devDependencies": {
     "mocha": "^3.4.2",

wax-prosemirror-core/src/Application.js

 import { Container } from "inversify";
 import "reflect-metadata";
+import deepmerge from "deepmerge";
 import Config from "./config/Config";
 import defaultConfig from "./config/defaultConfig";
 import PmPlugins from "./PmPlugins";
@@ -77,6 +78,11 @@ export default class Application {
       .inSingletonScope();
 
     container.bind("Wax").toFactory(() => new Application(container));
+
+    defaultConfig.services = defaultConfig.services.concat(
+      config.config.services
+    );
+
     container.bind("config").toConstantValue(defaultConfig);
     container
       .bind("Config")

wax-prosemirror-core/src/Wax.js

@@ -44,7 +44,6 @@ class Wax extends Component {
     this.application = Application.create(props);
     const schema = this.application.getSchema();
     this.application.bootServices();
-
     const { value, onChange } = this.props;
 
     const WaxOnchange = onChange ? onChange : value => true;

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

@@ -4,25 +4,7 @@ import {
   MenuService,
   RulesService,
   ShortCutsService,
-  AnnotationToolGroupService,
-  /*TODO MOVE FROM DEFAULT CONFIG*/
-  ImageService,
-  PlaceholderService,
-  TextStyleService,
-  InlineAnnotationsService,
-  LinkService,
-  OverlayService,
-  ListsService,
-  ListToolGroupService,
-  TablesService,
-  TableToolGroupService,
-  BaseService,
-  BaseToolGroupService,
-  ImageToolGroupService,
-  TextBlockLevelService,
-  TextToolGroupService,
-  DisplayBlockLevelService,
-  DisplayToolGroupService
+  AnnotationToolGroupService
 } from "wax-prosemirror-services";
 
 export default {
@@ -32,23 +14,6 @@ export default {
     new ShortCutsService(),
     new LayoutService(),
     new MenuService(),
-    new AnnotationToolGroupService(),
-    new ListToolGroupService(),
-    new DisplayBlockLevelService(),
-    new DisplayToolGroupService(),
-    // new TextStyleService(),
-    new PlaceholderService(),
-    new ImageService(),
-    new InlineAnnotationsService(),
-    // new OverlayService()
-    new LinkService(),
-    new ListsService(),
-    new TableToolGroupService(),
-    new TablesService(),
-    new BaseService(),
-    new BaseToolGroupService(),
-    new ImageToolGroupService()
-    // new TextBlockLevelService(),
-    // new TextToolGroupService()
+    new AnnotationToolGroupService()
   ]
 };

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

@@ -17,13 +17,13 @@ export default class LinkService extends Service {
 
   register() {
     this.container.bind("Link").to(LinkTool);
-
-    this.container
-      .bind("schema")
-      .toConstantValue({
+    const createMark = this.container.get("CreateMark");
+    createMark(
+      {
         link: linkMark
-      })
-      .whenTargetNamed("mark");
+      },
+      { toWaxSchema: true }
+    );
   }
 
   dependencies = [new OverlayService()];

wax-prosemirror-services/src/LinkService/LinkTool.js

@@ -16,7 +16,7 @@ export default class LinkTool extends Tools {
         return true;
       }
 
-      toggleMark(state.config.schema.marks.link, { href: "#" })(
+      toggleMark(state.config.schema.marks.link, { href: "ld#" })(
         state,
         dispatch
       );

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

@@ -12,54 +12,38 @@ export default class Schema {
   prosemirrorSchema = { nodes: {}, marks: {} };
   schema = null;
 
-  constructor(
-    @multiInject("schema")
-    @named("mark")
-    marks,
-    @multiInject("schema")
-    @named("node")
-    nodes
-  ) {
-    this.setNodes(nodes);
-    this.setMarks(marks);
-  }
-
-  setNodes(nodes) {
-    return nodes.map(schemaConfig => {
-      const name = Object.keys(schemaConfig)[0];
-      const config = schemaConfig[name];
+  addNode(schemaConfig) {
+    const name = Object.keys(schemaConfig)[0];
+    const config = schemaConfig[name];
 
-      const node = new Node(name);
-      let nd = {};
+    const node = new Node(name);
+    let nd = {};
 
-      if ((nd = this.has(node))) {
-        nd.fromJSON(config);
-        return nd;
-      } else {
-        node.fromJSON(config);
-        this.addSchema(node);
+    if ((nd = this.has(node))) {
+      nd.fromJSON(config);
+      return nd;
+    } else {
+      node.fromJSON(config);
+      this.addSchema(node);
 
-        return { [name]: node };
-      }
-    });
+      return { [name]: node };
+    }
   }
 
-  setMarks(marks) {
-    return marks.map(schemaConfig => {
-      const name = Object.keys(schemaConfig)[0];
-      const config = schemaConfig[name];
-
-      const mark = new Mark(name);
-      let mr = {};
-      if ((mr = this.has(mark))) {
-        mr.fromJSON(config);
-        return mr;
-      } else {
-        mark.fromJSON(config);
-        this.addSchema(mark);
-        return { [name]: mark };
-      }
-    });
+  addMark(schemaConfig) {
+    const name = Object.keys(schemaConfig)[0];
+    const config = schemaConfig[name];
+
+    const mark = new Mark(name);
+    let mr = {};
+    if ((mr = this.has(mark))) {
+      mr.fromJSON(config);
+      return mr;
+    } else {
+      mark.fromJSON(config);
+      this.addSchema(mark);
+      return { [name]: mark };
+    }
   }
 
   has(instance) {

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

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