Merge branch 'fixes' into 'master'

Fixes

See merge request !419

wax-prosemirror-core/index.js

-/* Cotext & ComponentPlugin */
+/* Editor */
+export { default as Wax } from './src/Wax';
+
+/* Service Class */
+export { default as Service } from './src/Service';
+
+/* Context & ComponentPlugin */
 export { WaxContext, useInjection } from './src/WaxContext';
 export { PortalContext } from './src/PortalContext';
 export { default as ComponentPlugin } from './src/ComponentPlugin';
@@ -13,9 +19,6 @@ export { default as Middleware } from './src/utilities/lib/Middleware';
 export { default as ToolGroup } from './src/utilities/lib/ToolGroup';
 export { default as Tools } from './src/utilities/lib/Tools';
 
-/* Service Class */
-export { default as Service } from './src/Service';
-
 /* Base Services */
 export { default as LayoutService } from './src/config/defaultServices/LayoutService/LayoutService';
 export { default as PortalService } from './src/config/defaultServices/PortalService/PortalService';
@@ -24,7 +27,5 @@ export { default as OverlayService } from './src/config/defaultServices/OverlayS
 export { default as RulesService } from './src/config/defaultServices/RulesService/RulesService';
 export { default as SchemaService } from './src/config/defaultServices/SchemaService/SchemaService';
 export { default as ShortCutsService } from './src/config/defaultServices/ShortCutsService/ShortCutsService';
-export { default as QuestionsNodeView } from './src/utilities/lib/helpers/QuestionsNodeView';
 
-/* Editor */
-export { default as Wax } from './src/Wax';
+export { default as QuestionsNodeView } from './src/utilities/lib/helpers/QuestionsNodeView';

wax-prosemirror-core/src/Application.js

 import { Container } from 'inversify';
-// import 'reflect-metadata';
+import 'reflect-metadata';
 import deepmerge from 'deepmerge';
 import Config from './config/Config';
 import defaultConfig from './config/defaultConfig';

wax-prosemirror-core/src/WaxContext.js

@@ -65,21 +65,3 @@ export const useInjection = identifier => {
     ? { instance: container.get(identifier) }
     : null;
 };
-
-export class Service {
-  setApp(app) {
-    this.app = app;
-  }
-
-  get container() {
-    return this.app.container;
-  }
-
-  get config() {
-    return this.app.config.get(`config.${this.name}`) || this.app.config;
-  }
-
-  get schema() {
-    return this.app.getSchema();
-  }
-}

wax-prosemirror-core/src/WaxView.js

@@ -14,7 +14,7 @@ import styled from 'styled-components';
 import applyDevTools from 'prosemirror-dev-tools';
 import { EditorState } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
-import { trackedTransaction } from 'wax-prosemirror-services';
+// import { trackedTransaction } from 'wax-prosemirror-services';
 import { WaxContext } from './WaxContext';
 import { PortalContext } from './PortalContext';
 import ComponentPlugin from './ComponentPlugin';
@@ -130,10 +130,11 @@ const WaxView = forwardRef((props, ref) => {
 
   const dispatchTransaction = transaction => {
     const { TrackChange } = props;
-    const tr =
-      TrackChange && TrackChange.enabled
-        ? trackedTransaction(transaction, view.state, user)
-        : transaction;
+    const tr = transaction;
+    // const tr =
+    //   TrackChange && TrackChange.enabled
+    //     ? trackedTransaction(transaction, view.state, user)
+    //     : transaction;
 
     previousDoc = view.state.doc;
     const state = view.state.apply(tr);

wax-prosemirror-core/src/config/defaultServices/LayoutService/LayoutService.js

-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import Layout from './Layout';
 
 export default class LayoutService extends Service {

wax-prosemirror-core/src/config/defaultServices/MenuService/Menu.js

 import React, { useMemo, useContext } from 'react';
 import { injectable } from 'inversify';
-import { WaxContext, ToolGroup } from 'wax-prosemirror-core';
+import { WaxContext } from '../../../WaxContext';
+import ToolGroup from '../../../utilities/lib/ToolGroup';
 import MenuWrapper from './MenuWrapper';
 
 @injectable()

wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js

-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import { isPlainObject, isFunction } from 'lodash';
 import Menu from './Menu';
 import MenuCollection from './MenuCollection';

wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayService.js

-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import OverlayComponent from './OverlayComponent';
 
 export default class OverlayService extends Service {

wax-prosemirror-core/src/config/defaultServices/PortalService/PortalService.js

-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import PortalComponent from './components/PortalComponent';
 import PortalPlugin from './portalPlugin';
 import Portals from './Portals';

wax-prosemirror-core/src/config/defaultServices/RulesService/RulesService.js

-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import Rules from './Rules';
 
 export default class RulesService extends Service {

wax-prosemirror-core/src/config/defaultServices/SchemaService/SchemaService.js

-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import { each } from 'lodash';
 import Schema from './Schema';
 // import Node from './Node';

wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCutsService.js

-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import ShortCuts from './ShortCuts';
 
 export default class ShortCutsService extends Service {