0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2024-10-21 23:18:45 +08:00
parent 78ebd3119e
commit 22e954c4e7
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -696,7 +696,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
// 页面按向下/右箭头丢失焦点 https://ld246.com/article/1629954026096
const lastEditElement = getContenteditableElement(nodeElement);
// 代码块需替换最后一个 /n https://github.com/siyuan-note/siyuan/issues/3221
if (lastEditElement && lastEditElement.textContent.replace(/\n$/, "").length <= getSelectionOffset(lastEditElement, undefined, range).end) {
if (lastEditElement && !lastEditElement.querySelector(".emoji") && lastEditElement.textContent.replace(/\n$/, "").length <= getSelectionOffset(lastEditElement, undefined, range).end) {
event.stopPropagation();
event.preventDefault();
focusByRange(range);
@ -860,7 +860,9 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
const currentNode = range.startContainer.childNodes[range.startOffset - 1] as HTMLElement;
if (position.start === 0 && (
range.startOffset === 0 ||
(currentNode && currentNode.nodeType === 3 && !hasPreviousSibling(currentNode) && currentNode.innerText === "") // https://ld246.com/article/1649251218696
(currentNode && currentNode.nodeType === 3 && !hasPreviousSibling(currentNode) &&
// 需使用 textContent，文本元素没有 innerText
currentNode.textContent === "") // https://ld246.com/article/1649251218696
)) {
removeBlock(protyle, nodeElement, range, "Backspace");
event.stopPropagation();

2
app/src/protyle/wysiwyg/remove.ts
View file

@ -389,7 +389,7 @@ export const removeBlock = (protyle: IProtyle, blockElement: Element, range: Ran
focusBlock(previousLastElement, undefined, false);
} else {
const previousLastEditElement = getContenteditableElement(previousLastElement);
if (editableElement && editableElement.textContent !== "") {
if (editableElement && (editableElement.textContent !== "" || editableElement.querySelector(".emoji"))) {
// 非空块
range.setEndAfter(editableElement.lastChild);
// 数学公式回车后再删除 https://github.com/siyuan-note/siyuan/issues/3850