From 2f3dda35aa72dff52bd9fb4f1041003630ba5abe Mon Sep 17 00:00:00 2001 From: Soreine Date: Fri, 28 Oct 2016 11:45:14 +0200 Subject: [PATCH] Adapt benchmarks --- perf/benchmarks/delete-backward-deep/index.js | 8 ++++++-- perf/benchmarks/delete-backward-deep/input.yaml | 2 +- perf/benchmarks/delete-backward-normal/index.js | 8 ++++++-- perf/benchmarks/delete-backward-normal/input.yaml | 2 +- perf/benchmarks/delete-backward-wide/index.js | 8 ++++++-- perf/benchmarks/delete-backward-wide/input.yaml | 2 +- perf/benchmarks/normalize-document-deep/index.js | 2 +- perf/benchmarks/normalize-document-normal/index.js | 2 +- perf/benchmarks/normalize-document-wide/index.js | 2 +- perf/benchmarks/render-split-block/index.js | 8 ++++++-- perf/benchmarks/render-split-block/input.yaml | 2 +- perf/benchmarks/split-block-deep/index.js | 8 ++++++-- perf/benchmarks/split-block-deep/input.yaml | 2 +- perf/benchmarks/split-block-normal/index.js | 8 ++++++-- perf/benchmarks/split-block-normal/input.yaml | 2 +- perf/benchmarks/split-block-wide/index.js | 8 ++++++-- perf/benchmarks/split-block-wide/input.yaml | 2 +- 17 files changed, 52 insertions(+), 24 deletions(-) diff --git a/perf/benchmarks/delete-backward-deep/index.js b/perf/benchmarks/delete-backward-deep/index.js index 7dfab6fc7..fa26f4166 100644 --- a/perf/benchmarks/delete-backward-deep/index.js +++ b/perf/benchmarks/delete-backward-deep/index.js @@ -3,8 +3,12 @@ module.exports = { setup(state) { // Move cursor return state.transform() - .collapseToStartOf({ key: '_cursor_' }) - .moveForward(10) // Move inside the text + .moveTo({ + anchorKey: '_cursor_', + anchorOffset: 10, + focusKey: '_cursor_', + focusOffset: 10 + }) .apply() }, diff --git a/perf/benchmarks/delete-backward-deep/input.yaml b/perf/benchmarks/delete-backward-deep/input.yaml index 663398117..a4225da69 100644 --- a/perf/benchmarks/delete-backward-deep/input.yaml +++ b/perf/benchmarks/delete-backward-deep/input.yaml @@ -36,10 +36,10 @@ nodes: type: paragraph nodes: - kind: block - key: _cursor_ type: paragraph nodes: - kind: text + key: _cursor_ ranges: - text: 'Since it''s rich text, you can do things like turn a selection of text ' - text: 'bold' diff --git a/perf/benchmarks/delete-backward-normal/index.js b/perf/benchmarks/delete-backward-normal/index.js index 7dfab6fc7..fa26f4166 100644 --- a/perf/benchmarks/delete-backward-normal/index.js +++ b/perf/benchmarks/delete-backward-normal/index.js @@ -3,8 +3,12 @@ module.exports = { setup(state) { // Move cursor return state.transform() - .collapseToStartOf({ key: '_cursor_' }) - .moveForward(10) // Move inside the text + .moveTo({ + anchorKey: '_cursor_', + anchorOffset: 10, + focusKey: '_cursor_', + focusOffset: 10 + }) .apply() }, diff --git a/perf/benchmarks/delete-backward-normal/input.yaml b/perf/benchmarks/delete-backward-normal/input.yaml index 48cd3e381..0c91e89d2 100644 --- a/perf/benchmarks/delete-backward-normal/input.yaml +++ b/perf/benchmarks/delete-backward-normal/input.yaml @@ -19,9 +19,9 @@ nodes: - text: '!' - kind: block type: paragraph - key: _cursor_ nodes: - kind: text + key: _cursor_ ranges: - text: 'Since it''s rich text, you can do things like turn a selection of text ' - text: 'bold' diff --git a/perf/benchmarks/delete-backward-wide/index.js b/perf/benchmarks/delete-backward-wide/index.js index 7dfab6fc7..fa26f4166 100644 --- a/perf/benchmarks/delete-backward-wide/index.js +++ b/perf/benchmarks/delete-backward-wide/index.js @@ -3,8 +3,12 @@ module.exports = { setup(state) { // Move cursor return state.transform() - .collapseToStartOf({ key: '_cursor_' }) - .moveForward(10) // Move inside the text + .moveTo({ + anchorKey: '_cursor_', + anchorOffset: 10, + focusKey: '_cursor_', + focusOffset: 10 + }) .apply() }, diff --git a/perf/benchmarks/delete-backward-wide/input.yaml b/perf/benchmarks/delete-backward-wide/input.yaml index 891bd1ebb..3663bebe3 100644 --- a/perf/benchmarks/delete-backward-wide/input.yaml +++ b/perf/benchmarks/delete-backward-wide/input.yaml @@ -20,9 +20,9 @@ nodes: - text: '!' - kind: block type: paragraph - key: _cursor_ nodes: - kind: text + key: _cursor_ ranges: - text: 'Since it''s rich text, you can do things like turn a selection of text ' - text: 'bold' diff --git a/perf/benchmarks/normalize-document-deep/index.js b/perf/benchmarks/normalize-document-deep/index.js index 4c807efeb..95826d717 100644 --- a/perf/benchmarks/normalize-document-deep/index.js +++ b/perf/benchmarks/normalize-document-deep/index.js @@ -1,6 +1,6 @@ module.exports = { run(state) { - return state.document.normalize() + return state.transform().normalize().apply() } } diff --git a/perf/benchmarks/normalize-document-normal/index.js b/perf/benchmarks/normalize-document-normal/index.js index 4c807efeb..95826d717 100644 --- a/perf/benchmarks/normalize-document-normal/index.js +++ b/perf/benchmarks/normalize-document-normal/index.js @@ -1,6 +1,6 @@ module.exports = { run(state) { - return state.document.normalize() + return state.transform().normalize().apply() } } diff --git a/perf/benchmarks/normalize-document-wide/index.js b/perf/benchmarks/normalize-document-wide/index.js index 4c807efeb..95826d717 100644 --- a/perf/benchmarks/normalize-document-wide/index.js +++ b/perf/benchmarks/normalize-document-wide/index.js @@ -1,6 +1,6 @@ module.exports = { run(state) { - return state.document.normalize() + return state.transform().normalize().apply() } } diff --git a/perf/benchmarks/render-split-block/index.js b/perf/benchmarks/render-split-block/index.js index f7db23ec2..512af8d9f 100644 --- a/perf/benchmarks/render-split-block/index.js +++ b/perf/benchmarks/render-split-block/index.js @@ -7,8 +7,12 @@ module.exports = { setup(state) { // Move cursor return state.transform() - .collapseToStartOf({ key: '_cursor_' }) - .moveForward(10) // Move inside the text + .moveTo({ + anchorKey: '_cursor_', + anchorOffset: 10, + focusKey: '_cursor_', + focusOffset: 10 + }) .apply() }, diff --git a/perf/benchmarks/render-split-block/input.yaml b/perf/benchmarks/render-split-block/input.yaml index 48cd3e381..0c91e89d2 100644 --- a/perf/benchmarks/render-split-block/input.yaml +++ b/perf/benchmarks/render-split-block/input.yaml @@ -19,9 +19,9 @@ nodes: - text: '!' - kind: block type: paragraph - key: _cursor_ nodes: - kind: text + key: _cursor_ ranges: - text: 'Since it''s rich text, you can do things like turn a selection of text ' - text: 'bold' diff --git a/perf/benchmarks/split-block-deep/index.js b/perf/benchmarks/split-block-deep/index.js index 48c7d85e5..f3bf7ed54 100644 --- a/perf/benchmarks/split-block-deep/index.js +++ b/perf/benchmarks/split-block-deep/index.js @@ -3,8 +3,12 @@ module.exports = { setup(state) { // Move cursor return state.transform() - .collapseToStartOf({ key: '_cursor_' }) - .moveForward(10) // Move inside the text + .moveTo({ + anchorKey: '_cursor_', + anchorOffset: 10, + focusKey: '_cursor_', + focusOffset: 10 + }) .apply() }, diff --git a/perf/benchmarks/split-block-deep/input.yaml b/perf/benchmarks/split-block-deep/input.yaml index 663398117..a4225da69 100644 --- a/perf/benchmarks/split-block-deep/input.yaml +++ b/perf/benchmarks/split-block-deep/input.yaml @@ -36,10 +36,10 @@ nodes: type: paragraph nodes: - kind: block - key: _cursor_ type: paragraph nodes: - kind: text + key: _cursor_ ranges: - text: 'Since it''s rich text, you can do things like turn a selection of text ' - text: 'bold' diff --git a/perf/benchmarks/split-block-normal/index.js b/perf/benchmarks/split-block-normal/index.js index 48c7d85e5..f3bf7ed54 100644 --- a/perf/benchmarks/split-block-normal/index.js +++ b/perf/benchmarks/split-block-normal/index.js @@ -3,8 +3,12 @@ module.exports = { setup(state) { // Move cursor return state.transform() - .collapseToStartOf({ key: '_cursor_' }) - .moveForward(10) // Move inside the text + .moveTo({ + anchorKey: '_cursor_', + anchorOffset: 10, + focusKey: '_cursor_', + focusOffset: 10 + }) .apply() }, diff --git a/perf/benchmarks/split-block-normal/input.yaml b/perf/benchmarks/split-block-normal/input.yaml index 48cd3e381..0c91e89d2 100644 --- a/perf/benchmarks/split-block-normal/input.yaml +++ b/perf/benchmarks/split-block-normal/input.yaml @@ -19,9 +19,9 @@ nodes: - text: '!' - kind: block type: paragraph - key: _cursor_ nodes: - kind: text + key: _cursor_ ranges: - text: 'Since it''s rich text, you can do things like turn a selection of text ' - text: 'bold' diff --git a/perf/benchmarks/split-block-wide/index.js b/perf/benchmarks/split-block-wide/index.js index 48c7d85e5..f3bf7ed54 100644 --- a/perf/benchmarks/split-block-wide/index.js +++ b/perf/benchmarks/split-block-wide/index.js @@ -3,8 +3,12 @@ module.exports = { setup(state) { // Move cursor return state.transform() - .collapseToStartOf({ key: '_cursor_' }) - .moveForward(10) // Move inside the text + .moveTo({ + anchorKey: '_cursor_', + anchorOffset: 10, + focusKey: '_cursor_', + focusOffset: 10 + }) .apply() }, diff --git a/perf/benchmarks/split-block-wide/input.yaml b/perf/benchmarks/split-block-wide/input.yaml index 891bd1ebb..3663bebe3 100644 --- a/perf/benchmarks/split-block-wide/input.yaml +++ b/perf/benchmarks/split-block-wide/input.yaml @@ -20,9 +20,9 @@ nodes: - text: '!' - kind: block type: paragraph - key: _cursor_ nodes: - kind: text + key: _cursor_ ranges: - text: 'Since it''s rich text, you can do things like turn a selection of text ' - text: 'bold'