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 3d0cf7597a into f65ab040ee

Browse Source
This commit is contained in:
Ulion 2021-01-29 00:09:12 +00:00 committed by GitHub
commit c16f4f38da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,10 +99,14 @@ export const AutomergeEditor = {
e.docSet.setDoc(docId, mergedDoc)
Editor.withoutNormalizing(e, () => {
e.children = toJS(mergedDoc).children
e.onChange()
const doc = toJS(mergedDoc)
e.children = doc.children
e.onCursor && e.onCursor(doc.cursors)
})
// onChange expect valid doc, we make sure do normalization before that.
Editor.normalize(e, { force: true })
e.onChange()
},
/**