@portabletext/editor 1.49.5 → 1.49.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "1.49.5",
+  "version": "1.49.7",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",

package/src/editor/sync-machine.ts

@@ -383,6 +383,7 @@ async function updateValue({
   streamBlocks: boolean
   value: PortableTextBlock[] | undefined
 }) {
+  let doneSyncing = false
   let isChanged = false
   let isValid = true
 
@@ -394,6 +395,10 @@ async function updateValue({
     Editor.withoutNormalizing(slateEditor, () => {
       withoutSaving(slateEditor, () => {
         withoutPatching(slateEditor, () => {
+          if (doneSyncing) {
+            return
+          }
+
           if (hadSelection) {
             Transforms.deselect(slateEditor)
           }
@@ -427,32 +432,41 @@ async function updateValue({
       await new Promise<void>((resolve) => {
         Editor.withoutNormalizing(slateEditor, () => {
           withRemoteChanges(slateEditor, () => {
-            withoutPatching(slateEditor, async () => {
+            withoutPatching(slateEditor, () => {
+              if (doneSyncing) {
+                resolve()
+                return
+              }
+
               isChanged = removeExtraBlocks({
                 slateEditor,
                 slateValueFromProps,
               })
 
-              for await (const [
-                currentBlock,
-                currentBlockIndex,
-              ] of getStreamedBlocks({
-                slateValue: slateValueFromProps,
-              })) {
-                const {blockChanged, blockValid} = syncBlock({
-                  context,
-                  sendBack,
-                  block: currentBlock,
-                  index: currentBlockIndex,
-                  slateEditor,
-                  value,
-                })
+              const processBlocks = async () => {
+                for await (const [
+                  currentBlock,
+                  currentBlockIndex,
+                ] of getStreamedBlocks({
+                  slateValue: slateValueFromProps,
+                })) {
+                  const {blockChanged, blockValid} = syncBlock({
+                    context,
+                    sendBack,
+                    block: currentBlock,
+                    index: currentBlockIndex,
+                    slateEditor,
+                    value,
+                  })
+
+                  isChanged = blockChanged || isChanged
+                  isValid = isValid && blockValid
+                }
 
-                isChanged = blockChanged || isChanged
-                isValid = isValid && blockValid
+                resolve()
               }
 
-              resolve()
+              processBlocks()
             })
           })
         })
@@ -461,6 +475,10 @@ async function updateValue({
       Editor.withoutNormalizing(slateEditor, () => {
         withRemoteChanges(slateEditor, () => {
           withoutPatching(slateEditor, () => {
+            if (doneSyncing) {
+              return
+            }
+
             isChanged = removeExtraBlocks({
               slateEditor,
               slateValueFromProps,
@@ -490,6 +508,7 @@ async function updateValue({
 
   if (!isValid) {
     debug('Invalid value, returning')
+    doneSyncing = true
     sendBack({type: 'done syncing', value})
     return
   }
@@ -505,6 +524,7 @@ async function updateValue({
         resolution: null,
         value,
       })
+      doneSyncing = true
       sendBack({type: 'done syncing', value})
       return
     }
@@ -520,6 +540,7 @@ async function updateValue({
     debug('Server value and editor value is equal, no need to sync.')
   }
 
+  doneSyncing = true
   sendBack({type: 'done syncing', value})
 }