Merge branch 'various-improvments' into 'master'

Various improvments

See merge request !151

package.json

@@ -48,7 +48,7 @@
   },
   "resolutions": {
     "styled-components": "4.2.0",
-    "prosemirror-model": "1.9.1"
+    "prosemirror-model": "1.11.0"
   },
   "workspaces": [
     "wax-prosemirror-core",

wax-prosemirror-components/package.json

@@ -15,8 +15,8 @@
     "@fortawesome/react-fontawesome": "^0.0.17",
     "lodash": "^4.17.4",
     "prop-types": "^15.7.2",
-    "prosemirror-model": "^1.9.1",
-    "prosemirror-state": "^1.3.2",
+    "prosemirror-model": "^1.11.0",
+    "prosemirror-state": "^1.3.3",
     "react-dropdown": "^1.6.2",
     "react-transition-group": "^4.3.0",
     "styled-components": "^4.2.0",

wax-prosemirror-core/package.json

@@ -14,17 +14,17 @@
     "inversify": "^5.0.1",
     "inversify-inject-decorators": "^3.1.0",
     "lodash": "^4.17.4",
-    "prosemirror-commands": "^1.1.3",
+    "prosemirror-commands": "^1.1.4",
     "prosemirror-dev-tools": "^2.1.1",
     "prosemirror-dropcursor": "^1.3.2",
-    "prosemirror-gapcursor": "^1.1.3",
+    "prosemirror-gapcursor": "^1.1.5",
     "prosemirror-history": "^1.1.3",
     "prosemirror-inputrules": "^1.1.2",
-    "prosemirror-keymap": "^1.1.3",
-    "prosemirror-model": "^1.9.1",
-    "prosemirror-state": "^1.3.2",
-    "prosemirror-transform": "^1.2.3",
-    "prosemirror-view": "^1.13.11",
+    "prosemirror-keymap": "^1.1.4",
+    "prosemirror-model": "^1.11.0",
+    "prosemirror-state": "^1.3.3",
+    "prosemirror-transform": "^1.2.8",
+    "prosemirror-view": "^1.15.6",
     "reflect-metadata": "^0.1.13",
     "styled-components": "^4.2.0",
     "uuid": "^7.0.3",

wax-prosemirror-plugins/package.json

@@ -13,8 +13,8 @@
     "highlight.js": "^10.1.1",
     "lodash": "^4.17.4",
     "prosemirror-highlightjs": "^0.2.0",
-    "prosemirror-state": "^1.3.2",
-    "prosemirror-view": "^1.13.11",
+    "prosemirror-state": "^1.3.3",
+    "prosemirror-view": "^1.15.6",
     "wax-prosemirror-components": "^0.0.14",
     "wax-prosemirror-core": "^0.0.14",
     "wax-prosemirror-layouts": "^0.0.14",

wax-prosemirror-schema/src/nodes/footNoteNode.js

 // TODO Write the node in WaxSchema
 const footnote = {
   group: 'inline',
-  content: 'block',
+  content: 'block*',
   inline: true,
   atom: true,
   attrs: {

wax-prosemirror-services/package.json

@@ -13,14 +13,14 @@
     "inversify": "^5.0.1",
     "inversify-inject-decorators": "^3.1.0",
     "lodash": "^4.17.4",
-    "prosemirror-commands": "^1.1.3",
+    "prosemirror-commands": "^1.1.4",
     "prosemirror-history": "^1.1.3",
-    "prosemirror-keymap": "^1.1.3",
-    "prosemirror-model": "^1.9.1",
-    "prosemirror-schema-list": "^1.1.2",
-    "prosemirror-state": "^1.3.2",
-    "prosemirror-transform": "^1.2.3",
-    "prosemirror-view": "^1.13.11",
+    "prosemirror-keymap": "^1.1.4",
+    "prosemirror-model": "^1.11.0",
+    "prosemirror-schema-list": "^1.1.4",
+    "prosemirror-state": "^1.3.3",
+    "prosemirror-transform": "^1.2.8",
+    "prosemirror-view": "^1.15.6",
     "styled-components": "^4.2.0",
     "uuid": "^7.0.3",
     "wax-prosemirror-components": "^0.0.14",

wax-prosemirror-services/src/NoteService/Editor.js

@@ -63,7 +63,7 @@ export default ({ node, view }) => {
     );
 
     const tr = TrackChange.enabled
-      ? trackedTransaction(transaction, noteView.state, user)
+      ? trackedTransaction(transaction, noteView.state, user, 'notes')
       : transaction;
 
     const { state, transactions } = noteView.state.applyTransaction(tr);

wax-prosemirror-services/src/TrackChangeService/track-changes/trackedTransaction.js

@@ -13,7 +13,7 @@ import replaceAroundStep from './helpers/replaceAroundStep';
 import addMarkStep from './helpers/addMarkStep';
 import removeMarkStep from './helpers/removeMarkStep';
 
-const trackedTransaction = (tr, state, user) => {
+const trackedTransaction = (tr, state, user, group = 'main') => {
   // Don't track table operations
   if (!tr.selectionSet) {
     const $pos = state.selection.$anchor;
@@ -45,7 +45,7 @@ const trackedTransaction = (tr, state, user) => {
     return tr;
   }
 
-  const group = tr.getMeta('outsideView') ? tr.getMeta('outsideView') : 'main';
+  // const group = tr.getMeta('outsideView') ? tr.getMeta('outsideView') : 'main';
   const newTr = state.tr;
   const map = new Mapping();
   const date = Math.floor(Date.now() / 300000);

wax-prosemirror-utilities/package.json

@@ -10,7 +10,7 @@
     "build": "BABEL_ENV=production rollup -c"
   },
   "dependencies": {
-    "prosemirror-commands": "^1.1.3",
+    "prosemirror-commands": "^1.1.4",
     "prosemirror-utils": "^0.9.6",
     "uuid": "^7.0.3"
   }