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

editors/editoria/src/index.js

@@ -2,8 +2,6 @@ import React from "react";
 import ReactDOM from "react-dom";
 import Editoria from "./Editoria";
 import * as serviceWorker from "./serviceWorker";
-const { whyDidYouUpdate } = require("why-did-you-update");
-whyDidYouUpdate(React);
 ReactDOM.render(<Editoria />, document.getElementById("root"));
 
 // If you want your app to work offline and load faster, you can change

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

@@ -10,12 +10,14 @@ class CodeService extends Service {
   }
 
   register() {
-    this.container
-      .bind("schema")
-      .toConstantValue({ code: codeMark })
-      .whenTargetNamed("mark");
-
     this.container.bind("Code").to(Code);
+    const createMark = this.container.get("CreateMark");
+    createMark(
+      {
+        code: codeMark
+      },
+      { toWaxSchema: true }
+    );
   }
 }
 

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

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

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

@@ -5,13 +5,13 @@ import SmallCaps from "./SmallCaps";
 class SmallCapsService extends Service {
   register() {
     this.container.bind("SmallCaps").to(SmallCaps);
-
-    this.container
-      .bind("schema")
-      .toConstantValue({
+    const createMark = this.container.get("CreateMark");
+    createMark(
+      {
         smallcaps: smallcapsMark
-      })
-      .whenTargetNamed("mark");
+      },
+      { toWaxSchema: true }
+    );
   }
 }
 

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

@@ -4,13 +4,13 @@ import StrikeThrough from "./StrikeThrough";
 class StrikeThroughService extends Service {
   register() {
     this.container.bind("StrikeThrough").to(StrikeThrough);
-
-    this.container
-      .bind("schema")
-      .toConstantValue({
+    const createMark = this.container.get("CreateMark");
+    createMark(
+      {
         strikethrough: strikethroughMark
-      })
-      .whenTargetNamed("mark");
+      },
+      { toWaxSchema: true }
+    );
   }
 }
 

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

@@ -6,12 +6,14 @@ class SubscriptService extends Service {
   boot() {}
 
   register() {
-    this.container
-      .bind("schema")
-      .toConstantValue({ subscript: subscriptMark })
-      .whenTargetNamed("mark");
-
     this.container.bind("Subscript").to(Subscript);
+    const createMark = this.container.get("CreateMark");
+    createMark(
+      {
+        subscript: subscriptMark
+      },
+      { toWaxSchema: true }
+    );
   }
 }
 

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

@@ -6,12 +6,14 @@ class SuperscriptService extends Service {
   boot() {}
 
   register() {
-    this.container
-      .bind("schema")
-      .toConstantValue({ superscript: superscriptMark })
-      .whenTargetNamed("mark");
-
     this.container.bind("Superscript").to(Superscript);
+    const createMark = this.container.get("CreateMark");
+    createMark(
+      {
+        superscript: superscriptMark
+      },
+      { toWaxSchema: true }
+    );
   }
 }
 

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

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

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

@@ -7,11 +7,13 @@ class BulletListService extends Service {
 
   register() {
     this.container.bind("BulletList").to(BulletList);
-
-    this.container
-      .bind("schema")
-      .toConstantValue({ bulletlist: bulletListNode })
-      .whenTargetNamed("node");
+    const createNode = this.container.get("CreateNode");
+    createNode(
+      {
+        bulletlist: bulletListNode
+      },
+      { toWaxSchema: true }
+    );
   }
 }
 

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

@@ -5,10 +5,13 @@ class ListItemService extends Service {
   boot() {}
 
   register() {
-    this.container
-      .bind("schema")
-      .toConstantValue({ list_item: listItemNode })
-      .whenTargetNamed("node");
+    const createNode = this.container.get("CreateNode");
+    createNode(
+      {
+        list_item: listItemNode
+      },
+      { toWaxSchema: true }
+    );
   }
 }
 

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

@@ -7,10 +7,13 @@ class OrderedListService extends Service {
 
   register() {
     this.container.bind("OrderedList").to(OrderedList);
-    this.container
-      .bind("schema")
-      .toConstantValue({ orderedlist: orderedListNode })
-      .whenTargetNamed("node");
+    const createNode = this.container.get("CreateNode");
+    createNode(
+      {
+        orderedlist: orderedListNode
+      },
+      { toWaxSchema: true }
+    );
   }
 }
 

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

@@ -8,11 +8,11 @@ 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+"
     });
+    const createNode = this.container.get("CreateNode");
 
     createNode({
       table