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

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

Browse source
This commit is contained in:
Vanessa 2025-05-11 23:34:37 +08:00
parent b75b4f19d9
commit 655967d237
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/protyle/wysiwyg/getBlock.ts
View file

@ -177,14 +177,8 @@ export const isEndOfBlock = (range: Range) => {
}
while (nextSibling) {
const nextNextSibling = hasNextSibling(nextSibling);
if (nextNextSibling) {
// 行内元素后为 \n https://github.com/siyuan-note/siyuan/issues/14290#issuecomment-2833372579
if (nextNextSibling.nodeType === 3 && (nextNextSibling as Text).wholeText === "\n") {
nextSibling = nextNextSibling;
} else {
return false;
}
if (hasNextSibling(nextSibling)) {
return false;
} else {
if (nextSibling.parentElement.getAttribute("spellcheck")) {
return true;

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

@ -838,7 +838,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
}
// 需使用 innerText，否则 br 无法传唤为 /n https://github.com/siyuan-note/siyuan/issues/12066
// 段末反向删除 https://github.com/siyuan-note/insider/issues/274
if (isEndOfBlock(range)) {
if (isEndOfBlock(range) || editElement.textContent.substring(position.start) === "\n") {
const cloneRange = range.cloneRange();
const nextElement = getNextBlock(getTopAloneElement(nodeElement));
if (nextElement) {
@ -860,6 +860,18 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
event.preventDefault();
return;
} else {
// TODO 软换行前 Delete https://github.com/siyuan-note/siyuan/issues/14807
// if (/\n+$/.test(editElement.textContent.substring(position.start))) {
// const wbrElement = document.createElement("wbr");
// range.insertNode(wbrElement);
// const oldHTML = nodeElement.outerHTML;
// wbrElement.nextSibling.textContent = wbrElement.nextSibling.textContent.substring(1);
// updateTransaction(protyle, nodeElement.getAttribute("data-node-id"), nodeElement.outerHTML, oldHTML);
// focusByWbr(nodeElement, range);
// event.stopPropagation();
// event.preventDefault();
// return;
// }
// 图片前 Delete 无效 https://github.com/siyuan-note/siyuan/issues/11209
let nextSibling = hasNextSibling(range.startContainer) as Element;
if (nextSibling) {