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

correctly handle gc with UndoManager and un-merge when syncing

Browse Source
This commit is contained in:
Kevin Jahns
2018-04-23 13:25:30 +02:00
parent ef6eb08335
commit 94933a704d
10 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Struct/Delete.js
View File

@@ -7,7 +7,7 @@ import { logID } from '../MessageHandler/messageToString.js'
* Delete all items in an ID-range
* TODO: implement getItemCleanStartNode for better performance (only one lookup)
*/
export function deleteItemRange (y, user, clock, range) {
export function deleteItemRange (y, user, clock, range, gcChildren) {
const createDelete = y.connector !== null && y.connector._forwardAppliedStructs
let item = y.os.getItemCleanStart(new ID(user, clock))
if (item !== null) {
@@ -24,7 +24,7 @@ export function deleteItemRange (y, user, clock, range) {
const nodeVal = node.val
if (!nodeVal._deleted) {
nodeVal._splitAt(y, range)
nodeVal._delete(y, createDelete, true)
nodeVal._delete(y, createDelete, gcChildren)
}
const nodeLen = nodeVal._length
range -= nodeLen
@@ -100,7 +100,7 @@ export default class Delete {
if (!locallyCreated) {
// from remote
const id = this._targetID
deleteItemRange(y, id.user, id.clock, this._length)
deleteItemRange(y, id.user, id.clock, this._length, false)
} else if (y.connector !== null) {
// from local
y.connector.broadcastStruct(this)