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.

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

TECH.compact code of VNode #1783

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
77 changes: 36 additions & 41 deletions src/List.js
Expand Up @@ -271,67 +271,62 @@ class VNode {
this.ownerID = ownerID;
}

// TODO: seems like these methods are very similar

removeBefore(ownerID, level, index) {
if (index === level ? 1 << level : 0 || this.array.length === 0) {
removeNodes(ownerID, level, index, isRemoveBefore = true) {
if (index === (level ? 1 << level : 0) || this.array.length === 0) {
return this;
}
const originIndex = (index >>> level) & MASK;
if (originIndex >= this.array.length) {
return new VNode([], ownerID);
const levelIndex = (index >>> level) & MASK,
removeFirst = levelIndex === 0,
removeLast = levelIndex === this.array.length - 1;

if (levelIndex >= this.array.length) {
return isRemoveBefore ? new VNode([], ownerID) : this;
}
const removingFirst = originIndex === 0;

let newChild;
if (level > 0) {
const oldChild = this.array[originIndex];
const oldChild = this.array[levelIndex];
newChild =
oldChild && oldChild.removeBefore(ownerID, level - SHIFT, index);
if (newChild === oldChild && removingFirst) {
oldChild &&
oldChild.removeNodes(ownerID, level - SHIFT, index, isRemoveBefore);
if (
newChild === oldChild &&
((isRemoveBefore && removeFirst) || (!isRemoveBefore && removeLast))
) {
return this;
}
}
if (removingFirst && !newChild) {
return this;
}
const editable = editableVNode(this, ownerID);
if (!removingFirst) {
for (let ii = 0; ii < originIndex; ii++) {
editable.array[ii] = undefined;
}
}
if (newChild) {
editable.array[originIndex] = newChild;
}
return editable;
}

removeAfter(ownerID, level, index) {
if (index === (level ? 1 << level : 0) || this.array.length === 0) {
return this;
}
const sizeIndex = ((index - 1) >>> level) & MASK;
if (sizeIndex >= this.array.length) {
if (
((isRemoveBefore && removeFirst) || (!isRemoveBefore && removeLast)) &&
!newChild
) {
return this;
}

let newChild;
if (level > 0) {
const oldChild = this.array[sizeIndex];
newChild =
oldChild && oldChild.removeAfter(ownerID, level - SHIFT, index);
if (newChild === oldChild && sizeIndex === this.array.length - 1) {
return this;
const editable = editableNode(this, ownerID);
if (isRemoveBefore) {
for (let ii = 0; ii < levelIndex; ii++) {
editable.array[ii] = void 0;
}
} else {
editable.array.splice(levelIndex + 1);
}

const editable = editableVNode(this, ownerID);
editable.array.splice(sizeIndex + 1);
if (newChild) {
editable.array[sizeIndex] = newChild;
editable.array[levelIndex] = newChild;
}

return editable;
}

removeBefore(ownerID, level, index) {
return this.removeNodes(ownerID, level, index);
}

removeAfter(ownerID, level, index) {
return this.removeNodes(ownerID, level, index, false);
}
}

const DONE = {};
Expand Down