Skip to content

Two easy optimizations #9

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

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

Two easy optimizations #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68e2639
Improve getPosFromRange2 performance by ~4x
egonelbre Feb 13, 2020
08e20a9
Avoid multiple scans over body in actionInput2
egonelbre Feb 13, 2020
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
28 changes: 22 additions & 6 deletions src/components/Editor/EditorReducer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,17 +132,33 @@ const reducer = state => ({
state.didSetPos = true
}
this.dropRedos()

// Update body:
const key1 = nodes[0].key
const index1 = state.body.findIndex(each => each.key === key1)
if (index1 === -1) {
throw new Error("FIXME")
}
const key2 = nodes[nodes.length - 1].key
const index2 = !atEnd ? state.body.findIndex(each => each.key === key2) : state.body.length - 1
if (index2 === -1) {

let index1 = -1;
let index2 = -1;
if(atEnd){
index2 = state.body.length - 1;
}
for(let i = 0; i < state.body.length; i++) {
let item = state.body[i];
if(index1 === -1 && item.key === key1){
index1 = i;
}
if(index2 === -1 && item.key === key2){
index2 = i;
}
if(index1 !== -1 && index2 !== -1){
break;
}
}

if (index1 === -1 || index2 === -1) {
throw new Error("FIXME")
}

state.body.splice(index1, (index2 + 1) - index1, ...nodes)
// Update data, pos1, and pos2:
const data = state.body.map(each => each.data).join("\n")
Expand Down
57 changes: 26 additions & 31 deletions src/components/Editor/helpers/getPosFromRange2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,41 @@ function getPosFromRange2(rootNode, node, offset) {
y: 0, // The paragraph index
pos: 0, // The cursor position
}

// NOTE: Gecko/Firefox can select the end element node
if (node.nodeType === Node.ELEMENT_NODE && offset && !(offset < node.childNodes.length)) {
// return getPosFromRange2(rootNode, null, 0)
node = null
offset = 0
}
const recurse = startNode => {
const { childNodes } = startNode
let index = 0
while (index < childNodes.length) {
if (childNodes[index] === node) {
Object.assign(pos, {
x: pos.x + offset,
pos: pos.pos + offset,
})
return true
}
const { length } = (childNodes[index].nodeValue || "")
Object.assign(pos, {
x: pos.x + length,
pos: pos.pos + length,
})
if (recurse(childNodes[index])) {
return true
}
const { nextSibling } = childNodes[index]
if (nextSibling && nextSibling.nodeType === Node.ELEMENT_NODE &&
// nextSibling.hasAttribute("data-node")) {
(nextSibling.hasAttribute("data-compound-node") || nextSibling.hasAttribute("data-node"))) {
Object.assign(pos, {
x: 0, // Reset
y: pos.y + 1,
pos: pos.pos + 1,
})

let walker = document.createTreeWalker(rootNode, NodeFilter.SHOW_ALL, null, false);

while(walker.nextNode()){
var cur = walker.currentNode;
if(cur.nodeType === Node.ELEMENT_NODE &&
(cur.hasAttribute("data-node") || cur.hasAttribute("data-compound-node"))
) {
pos.x = 0;
if(pos.pos !== 0){
pos.y += 1;
pos.pos += 1;
}
index++
}
return false

if(cur === node) {
pos.x += offset;
pos.pos += offset;
return pos;
}

if(cur.nodeValue){
const len = cur.nodeValue.length;
pos.x += len;
pos.pos += len;
}
}
recurse(rootNode)

return pos
}

Expand Down