Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix wrong isRemote false caused by the incorrect promise schedule case. #61

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix wrong isRemote false caused by the incorrect promise schedule case. #61

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ebad49
Fix wrong isRemote false caused by the incorrect promise schedule case.
ulion Feb 7, 2021
8b0bd1d
Continue fix for mixed apply remote operations ops and non-ops.
ulion Feb 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/client/src/automerge-editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, () => {
Expand All @@ -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)
Expand Down