Merge branch 'fix-trackChanges' into 'master'

Fix track changes

See merge request !424

.nvmrc

-12.13.0
+14.15.5

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 './utilities/track-changes/trackedTransaction';
 import { WaxContext } from './WaxContext';
 import { PortalContext } from './PortalContext';
 import ComponentPlugin from './ComponentPlugin';
@@ -130,11 +130,10 @@ const WaxView = forwardRef((props, ref) => {
 
   const dispatchTransaction = transaction => {
     const { TrackChange } = props;
-    const tr = transaction;
-    // const tr =
-    //   TrackChange && TrackChange.enabled
-    //     ? trackedTransaction(transaction, view.state, user)
-    //     : 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/utilities/track-changes/helpers/removeNode.js

+import { replaceStep } from 'prosemirror-transform';
+import { Selection } from 'prosemirror-state';
+
+const removeNode = (tr, node, nodePos, map) => {
+  const newNodePos = map.map(nodePos);
+  const selectionBefore = Selection.findFrom(tr.doc.resolve(newNodePos), -1);
+  const start = selectionBefore.$anchor.pos;
+  const end = newNodePos + 1;
+
+  const delStep = replaceStep(tr.doc, start, end);
+
+  tr.step(delStep);
+  const stepMap = delStep.getMap();
+  map.appendMap(stepMap);
+};
+
+export default removeNode;

wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/replaceAroundStep.js → wax-prosemirror-core/src/utilities/track-changes/helpers/replaceAroundStep.js

-import { liftListItem } from 'prosemirror-schema-list';
 import markDeletion from './markDeletion';
 import markInsertion from './markInsertion';
 import markWrapping from './markWrapping';

wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/replaceStep.js → wax-prosemirror-core/src/utilities/track-changes/helpers/replaceStep.js

 import { ReplaceStep } from 'prosemirror-transform';
-import { DocumentHelpers } from 'wax-prosemirror-core';
+import DocumentHelpers from '../../document/DocumentHelpers';
 
 import markDeletion from './markDeletion';
 import markInsertion from './markInsertion';

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

@@ -7,7 +7,7 @@ import {
   Mapping,
 } from 'prosemirror-transform';
 
-import { DocumentHelpers } from 'wax-prosemirror-core';
+import DocumentHelpers from '../document/DocumentHelpers';
 import replaceStep from './helpers/replaceStep';
 import replaceAroundStep from './helpers/replaceAroundStep';
 import addMarkStep from './helpers/addMarkStep';

wax-prosemirror-services/index.js

@@ -13,7 +13,6 @@ export { default as CommentsService } from './src/CommentsService/CommentsServic
 export { default as CodeBlockService } from './src/CodeBlockService/CodeBlockService';
 export { default as LinkService } from './src/LinkService/LinkService';
 export { default as TrackChangeService } from './src/TrackChangeService/TrackChangeService';
-export { default as trackedTransaction } from './src/TrackChangeService/track-changes/trackedTransaction';
 export { default as MathService } from './src/MathService/MathService';
 export { default as FindAndReplaceService } from './src/FindAndReplaceService/FindAndReplaceService';
 export { default as FullScreenService } from './src/FullScreenService/FullScreenService';

wax-prosemirror-services/src/FillTheGapQuestionService/components/FeedbackComponent.js

@@ -46,7 +46,7 @@ export default ({ node, view, getPos, readOnly }) => {
         main.dispatch(
           main.state.tr.setNodeMarkup(getPos(), undefined, {
             ...singleNode.node.attrs,
-            feedback: feedBack,
+            feedback: feedBackRef.current.value,
           }),
         );
       }

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

@@ -41,6 +41,14 @@ export default class BulletList extends Tools {
     const { disallowedTools } = activeView.props;
     if (disallowedTools.includes('Lists')) status = false;
 
+    // Disable lists first in questions
+    if (
+      activeViewId !== 'main' &&
+      activeView.state.selection.$from.start(1) === 1
+    ) {
+      status = false;
+    }
+
     return status;
   };
 

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

@@ -38,6 +38,15 @@ export default class OrderedList extends Tools {
     if (from === null) return false;
     const { disallowedTools } = activeView.props;
     if (disallowedTools.includes('Lists')) status = false;
+
+    // Disable lists first in questions
+    if (
+      activeViewId !== 'main' &&
+      activeView.state.selection.$from.start(1) === 1
+    ) {
+      status = false;
+    }
+
     return status;
   };
 

wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js

@@ -45,7 +45,7 @@ export default ({ node, view, getPos, readOnly }) => {
         main.dispatch(
           main.state.tr.setNodeMarkup(getPos(), undefined, {
             ...singleNode.node.attrs,
-            feedback: feedBack,
+            feedback: feedBackRef.current.value,
           }),
         );
       }

wax-prosemirror-services/src/MultipleDropDownService/components/FeedbackComponent.js

@@ -46,7 +46,7 @@ export default ({ node, view, getPos, readOnly }) => {
         main.dispatch(
           main.state.tr.setNodeMarkup(getPos(), undefined, {
             ...singleNode.node.attrs,
-            feedback: feedBack,
+            feedback: feedBackRef.current.value,
           }),
         );
       }

wax-prosemirror-services/src/TrackChangeService/track-changes/README.md

-This belongs to https://github.com/fiduswriter/fiduswriter
-This is a modified version of: https://github.com/fiduswriter/fiduswriter/blob/develop/fiduswriter/document/static/js/modules/editor/track/amend_transaction.js
-License included.