Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 16:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 fix https://github.com/siyuan-note/siyuan/issues/3913 光标处理

Browse source
This commit is contained in:
Vanessa 2022-06-16 18:43:21 +08:00
parent 7a212b93c1
commit b3d453b27e
2 changed files with 66 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/protyle/util/hasClosest.ts
View file

@ -47,6 +47,21 @@ export const hasTopClosestByTag = (element: Node, nodeName: string) => {
return closest || false;
};
export const hasTopClosestByAttribute = (element: Node, attr: string, value: string | null, top = false) => {
let closest = hasClosestByAttribute(element, attr, value, top);
let parentClosest: boolean | HTMLElement = false;
let findTop = false;
while (closest && !closest.classList.contains("protyle-wysiwyg") && !findTop) {
parentClosest = hasClosestByAttribute(closest.parentElement, attr, value, top);
if (parentClosest) {
closest = parentClosest;
} else {
findTop = true;
}
}
return closest || false;
};
export const hasClosestByAttribute = (element: Node, attr: string, value: string | null, top = false) => {
if (!element) {
return false;

65
app/src/protyle/wysiwyg/keydown.ts
View file

@ -9,7 +9,12 @@ import {
setFirstNodeRange,
setLastNodeRange
} from "../util/selection";
import {hasClosestBlock, hasClosestByAttribute, hasClosestByMatchTag} from "../util/hasClosest";
import {
hasClosestBlock,
hasClosestByAttribute,
hasClosestByMatchTag,
hasTopClosestByAttribute
} from "../util/hasClosest";
import {removeBlock} from "./remove";
import {
getContenteditableElement,
@ -125,7 +130,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
if (nextElement) {
if (nextElement.getBoundingClientRect().width === 0) {
// https://github.com/siyuan-note/siyuan/issues/4294
const foldElement = hasClosestByAttribute(nextElement, "fold", "1");
const foldElement = hasTopClosestByAttribute(nextElement, "fold", "1");
if (foldElement) {
nextElement = getNextBlock(foldElement) as HTMLElement;
if (nextElement) {
@ -156,19 +161,20 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
} else if (event.key === "ArrowUp") {
let previousElement: HTMLElement = getPreviousBlock(selectElements[0]) as HTMLElement;
if (previousElement) {
if (previousElement.getAttribute("fold") === "1"
&& (previousElement.classList.contains("sb") || previousElement.classList.contains("bq"))) {
previousElement = getLastBlock(previousElement) as HTMLElement;
if (previousElement.getBoundingClientRect().width === 0) {
// https://github.com/siyuan-note/siyuan/issues/4294
const foldElement = hasTopClosestByAttribute(previousElement, "fold", "1");
if (foldElement) {
previousElement = getFirstBlock(foldElement) as HTMLElement;
} else {
previousElement = selectElements[0] as HTMLElement;
}
} else if (previousElement) {
// https://github.com/siyuan-note/siyuan/issues/3913
} else {
previousElement = getLastBlock(previousElement) as HTMLElement;
if (previousElement.getBoundingClientRect().width === 0) {
// https://github.com/siyuan-note/siyuan/issues/4294
const foldElement = hasClosestByAttribute(previousElement, "fold", "1");
if (foldElement) {
previousElement = getFirstBlock(foldElement) as HTMLElement;
} else {
previousElement = selectElements[0] as HTMLElement;
}
const foldElement = hasTopClosestByAttribute(previousElement, "fold", "1")
if (foldElement && (foldElement.classList.contains("sb") || foldElement.classList.contains("bq"))) {
previousElement = foldElement
}
}
} else if (protyle.title && (protyle.wysiwyg.element.firstElementChild.getAttribute("data-eof") === "true" ||
@ -539,6 +545,20 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
protyle.scroll.lastScrollTop = 8;
}
}
} else {
let previousElement: HTMLElement = getPreviousBlock(nodeElement) as HTMLElement;
if (previousElement) {
previousElement = getLastBlock(previousElement) as HTMLElement;
if (previousElement) {
previousElement = hasClosestByAttribute(previousElement, "fold", "1") as HTMLElement
if (previousElement && previousElement.getAttribute("data-type") !== "NodeListItem") {
// 遇到折叠块
focusBlock(previousElement, undefined, true);
event.stopPropagation();
event.preventDefault();
}
}
}
}
} else if (range.toString() === "" && (event.key === "ArrowDown" || event.key === "ArrowRight") && nodeElement.isSameNode(getLastBlock(protyle.wysiwyg.element.lastElementChild)) &&
// 表格无法右移动 https://ld246.com/article/1631434502215
@ -560,6 +580,23 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
focusByRange(range);
}
}
if (event.key === "ArrowDown") {
const foldElement = hasClosestByAttribute(range.startContainer, "fold", "1")
if (foldElement) {
let nextElement = getNextBlock(foldElement) as HTMLElement;
if (nextElement) {
if (nextElement.getAttribute("fold") === "1"
&& (nextElement.classList.contains("sb") || nextElement.classList.contains("bq"))) {
// https://github.com/siyuan-note/siyuan/issues/3913
} else {
nextElement = getFirstBlock(nextElement) as HTMLElement;
}
focusBlock(nextElement);
event.stopPropagation();
event.preventDefault();
}
}
}
return;
}