shoetcuts in progress

wax-prosemirror-core/src/Application.js

@@ -61,11 +61,18 @@ export default class Application {
     return this.schema.getSchema();
   }
 
+  getShortCuts() {
+    this.shortCuts = this.container.get('ShortCuts');
+    console.log(this.shortCuts);
+    this.PmPlugins.add('shortcuts', this.shortCuts.createShortCuts());
+  }
+
   resetApp() {
     this.container = {};
     this.config = {};
     this.PmPlugins = {};
     this.schema = {};
+    this.shortCuts = {};
   }
 
   static create(config) {

wax-prosemirror-core/src/WaxView.js

@@ -56,6 +56,7 @@ const WaxView = forwardRef((props, ref) => {
 
   if (!mounted) {
     context.app.bootServices();
+    context.app.getShortCuts();
   }
 
   const setEditorRef = useCallback(

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

-// import { wrapInList } from 'prosemirror-schema-list';
+import { wrapInList } from 'prosemirror-schema-list';
 import { bulletListNode } from 'wax-prosemirror-schema';
 import Service from '../../Service';
 import BulletList from './BulletList';
@@ -7,9 +7,9 @@ class BulletListService extends Service {
   name = 'BulletListService';
   boot() {
     const shortCuts = this.container.get('ShortCuts');
-    // shortCuts.addShortCut({
-    //   "Shift-Ctrl-8": wrapInList(this.schema.nodes.bulletlist)
-    // });
+    shortCuts.addShortCut({
+      'Shift-Ctrl-8': wrapInList(this.schema.nodes.bulletlist),
+    });
   }
 
   register() {

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

-import Service from "../../Service";
-import { liftListItem, sinkListItem } from "prosemirror-schema-list";
-import Lift from "./Lift";
+import { liftListItem, sinkListItem } from 'prosemirror-schema-list';
+import Service from '../../Service';
+import Lift from './Lift';
 
 class LiftService extends Service {
   boot() {
-    const shortCuts = this.container.get("ShortCuts");
-    // shortCuts.addShortCut({
-    //   "Mod-[": liftListItem(this.schema.nodes.list_item),
-    //   "Mod-]": sinkListItem(this.schema.nodes.list_item)
-    // });
+    const shortCuts = this.container.get('ShortCuts');
+    shortCuts.addShortCut({
+      'Mod-[': liftListItem(this.schema.nodes.list_item),
+      'Mod-]': sinkListItem(this.schema.nodes.list_item),
+    });
   }
 
   register() {
-    this.container.bind("Lift").to(Lift);
+    this.container.bind('Lift').to(Lift);
   }
 }
 

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

-import Service from '../../Service';
 import { wrapInList } from 'prosemirror-schema-list';
 import { orderedListNode } from 'wax-prosemirror-schema';
+import Service from '../../Service';
 import OrderedList from './OrderedList';
 
 class OrderedListService extends Service {
   name = 'OrderedListService';
   boot() {
     const shortCuts = this.container.get('ShortCuts');
-    // shortCuts.addShortCut({
-    //   "Shift-Ctrl-9": wrapInList(this.schema.nodes.orderedlist)
-    // });
+    shortCuts.addShortCut({
+      'Shift-Ctrl-9': wrapInList(this.schema.nodes.orderedlist),
+    });
   }
 
   register() {

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

+/* eslint-disable no-underscore-dangle */
 import { isPlainObject } from 'lodash';
 import ParseRule from './ParseRule';
 import Middleware from '../lib/Middleware';
@@ -55,7 +56,7 @@ export default class Node {
   }
 
   toJSON() {
-    const importer = this.importer;
+    const { importer } = this;
 
     return {
       atom: this.atom,

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

@@ -113,12 +113,12 @@ const redoShortCut = (state, dispatch, view) =>
   redo(state, tr => dispatch(tr.setMeta('inputType', 'Redo')), view);
 
 @injectable()
-class ShortCuts {
-  constructor(plugins, schema) {
+export default class ShortCuts {
+  constructor() {
     this.insertBreak = this.insertBreak.bind(this);
     this.insertRule = this.insertRule.bind(this);
-    this.PmPlugins = plugins;
-    this.schema = schema;
+    // this.PmPlugins = plugins;
+    // this.schema = schema;
     this.keys = this.getKeys();
   }
 
@@ -135,13 +135,12 @@ class ShortCuts {
   }
 
   createShortCuts() {
-    const shortCuts = keymap(this.createKeyBindings());
-    this.PmPlugins.add('shortcuts', shortCuts);
+    this.shortCuts = keymap(this.createKeyBindings());
+    return this.shortCuts;
   }
 
   addShortCut(shortcut) {
     Object.assign(this.keys, shortcut);
-    this.createShortCuts();
   }
 
   createKeyBindings() {
@@ -166,13 +165,11 @@ class ShortCuts {
       'Shift-Enter': chainCommands(exitCode, this.insertBreak),
       'Ctrl-Enter': chainCommands(exitCode, this.insertBreak),
       'Mod-_': this.insertRule,
-      'Mod-[': liftListItem(this.schema.nodes.list_item),
-      'Mod-]': sinkListItem(this.schema.nodes.list_item),
+      // 'Mod-[': liftListItem(this.schema.nodes.list_item),
+      // 'Mod-]': sinkListItem(this.schema.nodes.list_item),
       Enter: pressEnter,
-      'Shift-Ctrl-8': wrapInList(this.schema.nodes.bulletlist),
-      'Shift-Ctrl-9': wrapInList(this.schema.nodes.orderedlist),
+      // 'Shift-Ctrl-8': wrapInList(this.schema.nodes.bulletlist),
+      // 'Shift-Ctrl-9': wrapInList(this.schema.nodes.orderedlist),
     };
   }
 }
-
-export default ShortCuts;

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

@@ -4,30 +4,15 @@ import ShortCuts from './ShortCuts';
 export default class ShortCutsService extends Service {
   name = 'ShortCutsService';
 
-  boot() {
-    const shortCuts = this.container.get('ShortCuts');
-    shortCuts.createShortCuts();
-  }
-
   // TODO start ShortCuts as Schema is initiated
   register() {
-    const { PmPlugins } = this.app;
-    this.container
-      .bind('ShortCuts')
-      .toDynamicValue(() => {
-        if (this.app.schema) {
-          const {
-            schema: { schema },
-          } = this.app;
-
-          return new ShortCuts(PmPlugins, schema);
-        }
+    this.container.bind('ShortCuts').to(ShortCuts).inSingletonScope();
 
-        return new ShortCuts(
-          PmPlugins,
-          this.container.get('Schema').getSchema(),
-        );
-      })
-      .inSingletonScope();
+    this.container.bind('CreateShortCut').toFactory(context => {
+      return shortCut => {
+        const shortCutsInstance = context.container.get('ShortCuts');
+        shortCutsInstance.addShortCut(shortCut);
+      };
+    });
   }
 }