Merge branch 'fix-shortcuts' into 'master'

temp fix for injecting schema

See merge request !314

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

-import Service from "../../Service";
-import { toggleMark } from "prosemirror-commands";
-import { underlineMark } from "wax-prosemirror-schema";
-import Underline from "./Underline";
+import { toggleMark } from 'prosemirror-commands';
+import { underlineMark } from 'wax-prosemirror-schema';
+import Underline from './Underline';
+import Service from '../../Service';
 
 class UnderlineService extends Service {
   boot() {
-    const shortCuts = this.container.get("ShortCuts");
-    shortCuts.addShortCut({ "Mod-u": toggleMark(this.schema.marks.underline) });
+    const shortCuts = this.container.get('ShortCuts');
+    shortCuts.addShortCut({ 'Mod-u': toggleMark(this.schema.marks.underline) });
   }
 
   register() {
-    this.container.bind("Underline").to(Underline);
-    const createMark = this.container.get("CreateMark");
+    this.container.bind('Underline').to(Underline);
+    const createMark = this.container.get('CreateMark');
     createMark(
       {
-        underline: underlineMark
+        underline: underlineMark,
       },
-      { toWaxSchema: true }
+      { toWaxSchema: true },
     );
   }
 }

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

@@ -16,10 +16,11 @@ export default class ShortCutsService extends Service {
       .bind('ShortCuts')
       .toDynamicValue(() => {
         if (this.app.schema) {
-          return new ShortCuts(
-            PmPlugins,
-            this.container.get('Schema').getSchema(),
-          );
+          const {
+            schema: { schema },
+          } = this.app;
+
+          return new ShortCuts(PmPlugins, schema);
         }
 
         return new ShortCuts(