Archives/cudr_slate-collaborative
1
0
Fork 0
mirror of https://github.com/cudr/slate-collaborative.git synced 2024-10-27 20:34:06 +00:00
Code Issues Projects Releases Wiki Activity

fix: add error handling for applyOperation

Browse Source
This commit is contained in:
Eric Maciel 2020-10-30 15:27:26 -04:00
parent baeab8a74c
commit 025943de4e
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/client/src/automerge-editor.ts
View File

@ -138,7 +138,12 @@ export const AutomergeEditor = {
Promise.resolve().then(_ => (e.isRemote = false)) Promise.resolve().then(_ => (e.isRemote = false))
} }
} catch (e) { } catch (e) {
console.error(e) // unset remove flag
if (e.isRemote) {
e.isRemote = false
}
throw e
} }
}, },

5
packages/client/src/withAutomerge.ts
View File

@ -108,7 +108,12 @@ const withAutomerge = <T extends Editor>(
e.receiveOperation = data => { e.receiveOperation = data => {
if (docId !== data.docId) return if (docId !== data.docId) return
try {
AutomergeEditor.applyOperation(e, docId, data, preserveExternalHistory) AutomergeEditor.applyOperation(e, docId, data, preserveExternalHistory)
} catch (err) {
// report any errors during apply operation
onError(err)
}
} }
return e return e