@magic-marker/prosemirror-suggest-changes 0.2.1-block-join.4 → 0.2.1-block-join.5

package/dist/ensureSelectionPlugin.js

@@ -2,7 +2,7 @@ import { Plugin, PluginKey, TextSelection } from "prosemirror-state";
 import { getSuggestionMarks } from "./utils.js";
 import { ZWSP } from "./constants.js";
 // import { ZWSP } from "./constants.js";
-const TRACE_ENABLED = false;
+const TRACE_ENABLED = true;
 function trace(...args) {
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     if (!TRACE_ENABLED) return;
@@ -43,15 +43,18 @@ export function ensureSelection() {
                 newState.handleKeyDown.arrowLeft = event.key === "ArrowLeft";
                 newState.handleKeyDown.arrowRight = event.key === "ArrowRight";
                 if (newState.handleKeyDown.backspace !== state.handleKeyDown.backspace || newState.handleKeyDown.delete !== state.handleKeyDown.delete || newState.handleKeyDown.arrowLeft !== state.handleKeyDown.arrowLeft || newState.handleKeyDown.arrowRight !== state.handleKeyDown.arrowRight) {
-                    console.log("handleKeyDown newState =", newState);
+                    trace("handleKeyDown newState =", newState);
                     view.dispatch(view.state.tr.setMeta(ensureSelectionKey, newState));
                 }
             }
         },
         appendTransaction (_transactions, oldState, newState) {
+            const pluginState = ensureSelectionKey.getState(newState);
+            if (isPosValid(newState.selection.$anchor) && isPosValid(newState.selection.$head)) {
+                return null;
+            }
             // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
             if (TRACE_ENABLED) console.groupCollapsed("[ensureSelectionPlugin]", "appendTransaction");
-            const pluginState = ensureSelectionKey.getState(newState);
             trace("appendTransaction", "search for new valid $anchor...");
             let $newAnchor = getNewValidPos(newState.selection.$anchor, getDirection(oldState.selection.$anchor, newState.selection.$anchor, pluginState));
             trace("appendTransaction", "new valid $anchor", $newAnchor?.pos, {
@@ -145,27 +148,22 @@ function isPosValid($pos) {
     const isZWSPBefore = $pos.nodeBefore && $pos.nodeBefore.textContent.replace(ZWSP_REGEXP, "") === "";
     const isZWSPAfter = $pos.nodeAfter && $pos.nodeAfter.textContent.replace(ZWSP_REGEXP, "") === "";
     if (insertionBefore && insertionAfter && isZWSPBefore && isZWSPAfter) {
-        console.log("isPosValid", $pos.pos, "pos invalid", "reason: between two ZWSP insertions", {
+        trace("isPosValid", $pos.pos, "pos invalid", "reason: between two ZWSP insertions", {
             $pos
         });
         return false;
     }
-    console.log("ZWSP checks", {
-        nodeAfterCheck: $pos.nodeAfter?.textContent.replace(ZWSP_REGEXP, ""),
-        nodeBeforeCheck: $pos.nodeBefore?.textContent.replace(ZWSP_REGEXP, ""),
-        parentCheck: $pos.parent.textContent.replace(ZWSP_REGEXP, "")
-    });
     if (insertionBefore && isZWSPBefore && $pos.nodeAfter == null && // a position like this:
     // <p><insertion>ZWSP</insertion>|</p>
     // because it means this paragraph was just created and it's empty
     $pos.parent.textContent.replace(ZWSP_REGEXP, "") !== "") {
-        console.log("isPosValid", $pos.pos, "pos invalid", "reason: between ZWSP insertion and right node boundary", {
+        trace("isPosValid", $pos.pos, "pos invalid", "reason: between ZWSP insertion and right node boundary", {
             $pos
         });
         return false;
     }
     if (insertionAfter && isZWSPAfter && $pos.nodeBefore == null) {
-        console.log("isPosValid", $pos.pos, "pos invalid", "reason: between ZWSP insertion and left node boundary", {
+        trace("isPosValid", $pos.pos, "pos invalid", "reason: between ZWSP insertion and left node boundary", {
             $pos
         });
         return false;

package/dist/prependDeletionsWithZWSP.js

@@ -1,8 +1,15 @@
 import { getSuggestionMarks } from "./utils.js";
 import { Transform } from "prosemirror-transform";
 import { ZWSP } from "./constants.js";
+const TRACE_ENABLED = true;
+function trace(...args) {
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (!TRACE_ENABLED) return;
+    console.log("[prependDeletionsWithZWSP]", ...args);
+}
 export function prependDeletionsWithZWSP(transaction, opts) {
-    console.groupCollapsed("prepend deletions with zwsp");
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (TRACE_ENABLED) console.groupCollapsed("prepend deletions with zwsp");
     const { deletion } = getSuggestionMarks(transaction.doc.type.schema);
     let transform = new Transform(transaction.doc);
     transform.doc.descendants((node, pos)=>{
@@ -10,7 +17,7 @@ export function prependDeletionsWithZWSP(transaction, opts) {
         if (!node.isText || mark == null) return true;
         const mappedPos = transform.mapping.map(pos);
         transform.delete(mappedPos, mappedPos + node.nodeSize);
-        console.log("found zwsp, deleted", {
+        trace("found zwsp, deleted", {
             from: mappedPos,
             to: mappedPos + node.nodeSize
         });
@@ -19,10 +26,11 @@ export function prependDeletionsWithZWSP(transaction, opts) {
     transform.steps.forEach((step)=>{
         transaction.step(step);
     });
-    console.log(`added ${String(transform.steps.length)} remove zwsp steps to tr`);
+    trace(`added ${String(transform.steps.length)} remove zwsp steps to tr`);
     if (opts?.experimental_deletions !== "hidden") {
-        console.log("deletions are visible, skipping prepend zwsp");
-        console.groupEnd();
+        trace("deletions are visible, skipping prepend zwsp");
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        if (TRACE_ENABLED) console.groupEnd();
         return transaction;
     }
     transform = new Transform(transaction.doc);
@@ -39,7 +47,7 @@ export function prependDeletionsWithZWSP(transaction, opts) {
         ]);
         const mappedPos = transform.mapping.map(pos);
         transform.insert(mappedPos + 1, zwspNode);
-        console.log("found first-child-deletion inline content node, inserted zwsp at", {
+        trace("found first-child-deletion inline content node, inserted zwsp at", {
             pos,
             mappedPos
         });
@@ -48,7 +56,8 @@ export function prependDeletionsWithZWSP(transaction, opts) {
     transform.steps.forEach((step)=>{
         transaction.step(step);
     });
-    console.log(`added ${String(transform.steps.length)} add zwsp steps to tr`);
-    console.groupEnd();
+    trace(`added ${String(transform.steps.length)} add zwsp steps to tr`);
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (TRACE_ENABLED) console.groupEnd();
     return transaction;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magic-marker/prosemirror-suggest-changes",
-  "version": "0.2.1-block-join.4",
+  "version": "0.2.1-block-join.5",
   "license": "MIT",
   "type": "module",
   "module": "dist/index.js",