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

🎨 https://github.com/siyuan-note/siyuan/issues/15226

Browse source
This commit is contained in:
Vanessa 2025-09-03 20:49:12 +08:00
parent 78a7491173
commit 356356d888
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -855,15 +855,16 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
const cloneRange = range.cloneRange();
const nextElement = getNextBlock(getTopAloneElement(nodeElement));
if (nextElement) {
if (!nodeElement.classList.contains("code-block")) {
const nextRange = focusBlock(nextElement);
if (nextRange) {
const nextBlockElement = hasClosestBlock(nextRange.startContainer);
if (nextBlockElement) {
// 反向删除合并为一个块时，光标应保持在尾部 https://github.com/siyuan-note/siyuan/issues/14290#issuecomment-2849810529
cloneRange.insertNode(document.createElement("wbr"));
removeBlock(protyle, nextBlockElement, nextRange, "Delete");
}
const nextRange = focusBlock(nextElement);
if (nextRange) {
const nextBlockElement = hasClosestBlock(nextRange.startContainer);
if (nextBlockElement &&
(!nextBlockElement.classList.contains("code-block") ||
(nextBlockElement.classList.contains("code-block") && getContenteditableElement(nextBlockElement).textContent == "\n"))
) {
// 反向删除合并为一个块时，光标应保持在尾部 https://github.com/siyuan-note/siyuan/issues/14290#issuecomment-2849810529
cloneRange.insertNode(document.createElement("wbr"));
removeBlock(protyle, nextBlockElement, nextRange, "Delete");
}
}
event.stopPropagation();
@ -912,7 +913,9 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
// 需使用 textContent，文本元素没有 innerText
currentNode.textContent === "") // https://ld246.com/article/1649251218696
)) {
if (!nodeElement.classList.contains("code-block")) {
if (!nodeElement.classList.contains("code-block") ||
(nodeElement.classList.contains("code-block") && editElement.textContent == "\n")
) {
removeBlock(protyle, nodeElement, range, "Backspace");
}
event.stopPropagation();