yonote/yjs
14
0
Fork 0
Code Pull Requests 1 Releases Activity

basic merge works. fixes first test #263

Browse Source
This commit is contained in:
Kevin Jahns
2020-12-13 16:24:43 +01:00
parent c8534ea6bc
commit 004a781a56
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/structs/Item.js
View File

@@ -639,16 +639,21 @@ export class Item extends AbstractStruct {
}
if (origin === null && rightOrigin === null) {
const parent = /** @type {AbstractType<any>} */ (this.parent)
const parentItem = parent._item
if (parentItem === null) {
// parent type on y._map
// find the correct key
const ykey = findRootTypeKey(parent)
if (parent.constructor === String) { // this edge case was added by differential updates
encoder.writeParentInfo(true) // write parentYKey
encoder.writeString(ykey)
encoder.writeString(parent)
} else {
encoder.writeParentInfo(false) // write parent id
encoder.writeLeftID(parentItem.id)
const parentItem = parent._item
if (parentItem === null) {
// parent type on y._map
// find the correct key
const ykey = findRootTypeKey(parent)
encoder.writeParentInfo(true) // write parentYKey
encoder.writeString(ykey)
} else {
encoder.writeParentInfo(false) // write parent id
encoder.writeLeftID(parentItem.id)
}
}
if (parentSub !== null) {
encoder.writeString(parentSub)