@manuscripts/track-changes-plugin 0.0.3 → 0.2.0

package/dist/index.es.js

@@ -327,8 +327,9 @@ function deleteNode(node, pos, tr) {
     var _a;
     const startPos = tr.doc.resolve(pos + 1);
     const range = startPos.blockRange(tr.doc.resolve(startPos.pos - 2 + node.nodeSize));
-    const targetDepth = range ? Number(liftTarget(range)) : NaN;
-    if (range && !Number.isNaN(targetDepth)) {
+    const targetDepth = range && liftTarget(range);
+    // Check with typeof since with old prosemirror-transform targetDepth is undefined
+    if (range && typeof targetDepth === 'number') {
         return tr.lift(range, targetDepth);
     }
     const resPos = tr.doc.resolve(pos);
@@ -505,7 +506,7 @@ function applyAcceptedRejectedChanges(tr, schema, changes, deleteMap = new Mappi
         // or were already deleted by an applied block delete
         const { pos: from, deleted } = deleteMap.mapResult(change.from), node = tr.doc.nodeAt(from), noChangeNeeded = deleted || ChangeSet.shouldNotDelete(change);
         if (!node) {
-            log.warn('no node found to update for change', change);
+            !deleted && log.warn('no node found to update for change', change);
             return;
         }
         if (ChangeSet.isTextChange(change) && noChangeNeeded) {
@@ -929,6 +930,7 @@ function deleteAndMergeSplitNodes(from, to, gap, startDoc, newTr, schema, trackA
         // But from what I remember what it safeguards against is, when you've already deleted a node
         // say an inserted blockquote that had all its children deleted, nodesBetween still iterates over those
         // nodes and therefore we have to make this check to ensure they still exist in the doc.
+        //
         if (nodeEnd > offsetFrom && !nodeWasDeleted && !wasWithinGap) {
             // |<p>asdf</p>| -> node deleted completely
             const nodeCompletelyDeleted = offsetPos >= offsetFrom && nodeEnd <= offsetTo;
@@ -1209,11 +1211,9 @@ function trackReplaceStep(step, oldState, newTr, attrs) {
  * This skips the direct dependency to prosemirror-state where multiple versions might cause conflicts
  * as the created instances might belong to different prosemirror-state import than one used in the editor.
  * @param sel
- * @param doc
- * @param from
  * @returns
  */
-const getSelectionStaticCreate = (sel, doc, from) => Object.getPrototypeOf(sel).constructor.create(doc, from);
+const getSelectionStaticConstructor = (sel) => Object.getPrototypeOf(sel).constructor;
 /**
  * Inverts transactions to wrap their contents/operations with track data instead
  *
@@ -1257,7 +1257,12 @@ function trackTransaction(tr, oldState, newTr, userID) {
         else if (step instanceof ReplaceStep) {
             const selectionPos = trackReplaceStep(step, oldState, newTr, emptyAttrs);
             if (!wasNodeSelection) {
-                newTr.setSelection(getSelectionStaticCreate(tr.selection, newTr.doc, selectionPos));
+                const sel = getSelectionStaticConstructor(tr.selection);
+                // Use Selection.near to fix selections that point to a block node instead of inline content
+                // eg when inserting a complete new paragraph. -1 finds the first valid position moving backwards
+                // inside the content
+                const near = sel.near(newTr.doc.resolve(selectionPos), -1);
+                newTr.setSelection(near);
             }
         }
         else if (step instanceof ReplaceAroundStep) {
@@ -1268,13 +1273,12 @@ function trackTransaction(tr, oldState, newTr, userID) {
         // TODO: here we could check whether adjacent inserts & deletes cancel each other out.
         // However, this should not be done by diffing and only matching node or char by char instead since
         // it's A easier and B more intuitive to user.
-        const { meta } = tr;
-        // This is quite non-optimal in some sense but to ensure no information is lost
-        // we have to re-add all the old meta keys, such as inputType or uiEvent.
-        // This should prevent bugs incase other plugins/widgets rely upon them existing (and they
-        // are not able to process the transactions before track-changes).
-        // TODO: will this cause race-condition if a meta causes another appendTransaction to fire
-        Object.keys(meta).forEach((key) => newTr.setMeta(key, tr.getMeta(key)));
+        // The old meta keys are not copied to the new transaction since this will cause race-conditions
+        // when a single meta-field is expected to having been processed / removed. Generic input meta keys,
+        // inputType and uiEvent, are re-added since some plugins might depend on them and process the transaction
+        // after track-changes plugin.
+        tr.getMeta('inputType') && newTr.setMeta('inputType', tr.getMeta('inputType'));
+        tr.getMeta('uiEvent') && newTr.setMeta('uiEvent', tr.getMeta('uiEvent'));
     });
     // This is kinda hacky solution at the moment to maintain NodeSelections over transactions
     // These are required by at least cross-references that need it to activate the selector pop-up
@@ -1282,7 +1286,8 @@ function trackTransaction(tr, oldState, newTr, userID) {
         const mappedPos = newTr.mapping.map(tr.selection.from);
         const resPos = newTr.doc.resolve(mappedPos);
         const nodePos = mappedPos - (((_a = resPos.nodeBefore) === null || _a === void 0 ? void 0 : _a.nodeSize) || 0);
-        newTr.setSelection(getSelectionStaticCreate(tr.selection, newTr.doc, nodePos));
+        const sel = getSelectionStaticConstructor(tr.selection);
+        newTr.setSelection(sel.create(newTr.doc, nodePos));
     }
     log.info('NEW transaction', newTr);
     return newTr;
@@ -1332,7 +1337,8 @@ const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous' }) => {
         key: trackChangesPluginKey,
         props: {
             editable(state) {
-                return this.getState(state).status !== TrackChangesStatus.viewSnapshots;
+                var _a;
+                return ((_a = trackChangesPluginKey.getState(state)) === null || _a === void 0 ? void 0 : _a.status) !== TrackChangesStatus.viewSnapshots;
             },
         },
         state: {
@@ -1402,7 +1408,6 @@ const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous' }) => {
                     (wasAppended && getAction(wasAppended, TrackChangesAction.skipTrack));
                 if (tr.docChanged && !skipMetaUsed && !skipTrackUsed && !tr.getMeta('history$')) {
                     createdTr = trackTransaction(tr, oldState, createdTr, userID);
-                    createdTr.setMeta('origin', trackChangesPluginKey);
                     infiniteLoopCounter.iters += 1;
                 }
                 docChanged = docChanged || tr.docChanged;
@@ -1429,6 +1434,7 @@ const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous' }) => {
                 log.warn('had to fix inconsistent changes in', createdTr);
             }
             if (docChanged || createdTr.docChanged || changed) {
+                createdTr.setMeta('origin', trackChangesPluginKey);
                 return setAction(createdTr, TrackChangesAction.refreshChanges, true);
             }
             return null;