deblan-mirror/editor.js
deblan-mirror/editor.js
1
0
Fork 0
mirror of https://github.com/codex-team/editor.js synced 2026-03-18 08:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Fix vertical skip

Browse source
This commit is contained in:
Tomoyuki Hata 2021-02-02 01:24:38 +09:00
commit 7a8d397bf9
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/components/modules/caret.ts
View file

@ -579,7 +579,7 @@ export default class Caret extends Module {
let node = treeWalker.firstChild();
let offset = 0;
let prevX: number | undefined;
let prevBoundingClientRect: DOMRect | undefined;
while (node) {
if (!(node instanceof Text)) {
@ -588,10 +588,14 @@ export default class Caret extends Module {
for (let index = 0; index < node.length; index++) {
range.setStart(node, index);
range.setEnd(node, index + 1);
const boundingClientRect = range.getBoundingClientRect();
if (prevX !== undefined && Math.abs(currentBoundingClientRect.x - prevX) < Math.abs(currentBoundingClientRect.x - boundingClientRect.x)) {
if (
prevBoundingClientRect &&
Math.abs(currentBoundingClientRect.x - prevBoundingClientRect.x) < Math.abs(currentBoundingClientRect.x - boundingClientRect.x)
) {
return {
nextBlock,
nextInput,
@ -600,7 +604,7 @@ export default class Caret extends Module {
}
offset++;
prevX = boundingClientRect.x;
prevBoundingClientRect = boundingClientRect;
}
node = treeWalker.nextNode();
@ -639,7 +643,7 @@ export default class Caret extends Module {
let node = treeWalker.lastChild();
let offset = root.textContent.length - 1;
let prevX: number | undefined;
let prevBoundingClientRect: DOMRect | undefined;
while (node) {
if (!(node instanceof Text)) {
@ -648,10 +652,14 @@ export default class Caret extends Module {
for (let index = node.length - 1; index >= 0; index--) {
range.setStart(node, index);
range.setEnd(node, index + 1);
const boundingClientRect = range.getBoundingClientRect();
if (prevX !== undefined && Math.abs(currentBoundingClientRect.x - prevX) < Math.abs(currentBoundingClientRect.x - boundingClientRect.x)) {
if (
prevBoundingClientRect &&
Math.abs(currentBoundingClientRect.x - prevBoundingClientRect.x) < Math.abs(currentBoundingClientRect.x - boundingClientRect.x)
) {
return {
previousBlock,
previousInput,
@ -660,7 +668,7 @@ export default class Caret extends Module {
}
offset--;
prevX = boundingClientRect.x;
prevBoundingClientRect = boundingClientRect;
}
node = treeWalker.previousNode();
@ -738,6 +746,7 @@ export default class Caret extends Module {
for (let index = 0; index < node.length; index++) {
range.setStart(node, index);
range.setEnd(node, index + 1);
const boundingClientRect = range.getBoundingClientRect();
@ -773,6 +782,7 @@ export default class Caret extends Module {
for (let index = node.length - 1; index >= 0; index--) {
range.setStart(node, index);
range.setEnd(node, index + 1);
const boundingClientRect = range.getBoundingClientRect();