jazz-tools 0.17.7 → 0.17.8

package/dist/index.js

@@ -37,7 +37,7 @@ import {
   randomSessionProvider,
   subscribeToCoValue,
   zodReExport_exports
-} from "./chunk-SJHXI5AB.js";
+} from "./chunk-L3GGWY3X.js";
 
 // src/tools/auth/clerk/index.ts
 import {

package/dist/prosemirror/index.js

@@ -2086,28 +2086,52 @@ function proseMirrorToHtml(doc2) {
 
 // src/prosemirror/lib/sync.ts
 import { recreateTransform } from "@manuscripts/prosemirror-recreate-steps";
+import { EditorState } from "prosemirror-state";
 var META_KEY = "fromJazz";
 function createSyncHandlers(coRichText) {
   let view;
+  let localChange = false;
+  let remoteChange = false;
   function handleCoRichTextChange(newText) {
-    if (!view || !newText) return;
-    const pmDoc = htmlToProseMirror(
-      newText.toString(),
-      view.state.doc.type.schema
-    );
-    const transform = recreateTransform(view.state.doc, pmDoc);
-    const tr = view.state.tr;
-    transform.steps.forEach((step) => {
-      tr.step(step);
+    if (!view || !newText || localChange || remoteChange) return;
+    const currentView = view;
+    remoteChange = true;
+    queueMicrotask(() => {
+      const pmDoc = htmlToProseMirror(
+        newText.toString(),
+        currentView.state.doc.type.schema
+      );
+      try {
+        const transform = recreateTransform(currentView.state.doc, pmDoc);
+        const tr = currentView.state.tr;
+        transform.steps.forEach((step) => {
+          tr.step(step);
+        });
+        tr.setMeta(META_KEY, true);
+        currentView.dispatch(tr);
+      } catch (err) {
+        const newState = EditorState.create({
+          schema: currentView.state.schema,
+          doc: pmDoc,
+          plugins: currentView.state.plugins,
+          selection: currentView.state.selection
+        });
+        currentView.updateState(newState);
+      } finally {
+        remoteChange = false;
+      }
     });
-    tr.setMeta(META_KEY, true);
-    view.dispatch(tr);
   }
   function handleProseMirrorChange(tr) {
     if (!coRichText || tr.getMeta(META_KEY)) return;
     if (tr.docChanged) {
       const str = proseMirrorToHtml(tr.doc);
-      coRichText.applyDiff(str);
+      localChange = true;
+      try {
+        coRichText.applyDiff(str);
+      } finally {
+        localChange = false;
+      }
     }
   }
   return {