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

Merge 8b0bd1d04d into f65ab040ee

Browse Source
This commit is contained in:
Ulion 2021-02-08 03:54:40 +00:00 committed by GitHub
commit b3f1c7c499
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,6 +125,8 @@ export const AutomergeEditor = {
if (operations.length) {
const slateOps = toSlateOp(operations, current)
// do not change isRemote flag for no-op case.
const wasRemote = e.isRemote
e.isRemote = true
Editor.withoutNormalizing(e, () => {
@ -141,7 +143,12 @@ export const AutomergeEditor = {
e.onCursor && e.onCursor(updated.cursors)
})
Promise.resolve().then(_ => (e.isRemote = false))
if (slateOps.length > 0) {
// XXX: only schedule set isRemote false when we did scheduled onChange by apply.
Promise.resolve().then(_ => (e.isRemote = false))
} else {
e.isRemote = wasRemote
}
}
} catch (e) {
console.error(e)