github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-19 02:21:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa 2025-03-14 13:02:14 +08:00
parent 3b04d3199c
commit b5894597a7
3 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/protyle/util/selection.ts
View File

@ -135,7 +135,7 @@ export const getRangeByPoint = (x: number, y: number) => {
return range; return range;
}; };
export const getEditorRange = (element: Element) => { export const getEditorRange = (element: Element): Range => {
let range: Range; let range: Range;
if (getSelection().rangeCount > 0) { if (getSelection().rangeCount > 0) {
range = getSelection().getRangeAt(0); range = getSelection().getRangeAt(0);
@ -153,7 +153,10 @@ export const getEditorRange = (element: Element) => {
} }
if (element.classList.contains("li") || element.classList.contains("list")) { if (element.classList.contains("li") || element.classList.contains("list")) {
return getEditorRange(element.querySelector("[data-node-id]")); const childElement = element.querySelector("[data-node-id]")
if (childElement) {
return getEditorRange(childElement);
}
} }
// 代码块过长，在代码块的下一个块前删除，代码块会滚动到顶部，因粗需要 preventScroll // 代码块过长，在代码块的下一个块前删除，代码块会滚动到顶部，因粗需要 preventScroll
@ -171,9 +174,9 @@ export const getEditorRange = (element: Element) => {
if (!targetElement) { if (!targetElement) {
const type = element.getAttribute("data-type"); const type = element.getAttribute("data-type");
if (type === "NodeThematicBreak") { if (type === "NodeThematicBreak") {
targetElement= element.firstElementChild; targetElement = element.firstElementChild;
} else if (type === "NodeBlockQueryEmbed") { } else if (type === "NodeBlockQueryEmbed") {
targetElement = element.lastElementChild.previousElementSibling?.firstChild; targetElement = element.lastElementChild.previousElementSibling?.firstChild;
} else if (["NodeMathBlock", "NodeHTMLBlock"].includes(type)) { } else if (["NodeMathBlock", "NodeHTMLBlock"].includes(type)) {
targetElement = element.lastElementChild.previousElementSibling?.lastElementChild?.firstChild; targetElement = element.lastElementChild.previousElementSibling?.lastElementChild?.firstChild;
} else if (type === "NodeVideo") { } else if (type === "NodeVideo") {
@ -575,8 +578,8 @@ export const focusBlock = (element: Element, parentElement?: HTMLElement, toStar
genRenderFrame(element); genRenderFrame(element);
range.setStart(element.firstElementChild.lastElementChild.firstChild, 0); range.setStart(element.firstElementChild.lastElementChild.firstChild, 0);
setRange = true; setRange = true;
} else if (type === "NodeHTMLBlock") { } else if (type === "NodeHTMLBlock") {
range.selectNodeContents(element.lastElementChild.previousElementSibling.lastElementChild.firstChild, 0); range.setStart(element.lastElementChild.previousElementSibling.lastElementChild.firstChild, 0);
range.collapse(true); range.collapse(true);
setRange = true; setRange = true;
} else if (type === "NodeIFrame" || type === "NodeWidget") { } else if (type === "NodeIFrame" || type === "NodeWidget") {

11
app/src/protyle/wysiwyg/getBlock.ts
View File

@ -164,11 +164,18 @@ export const hasNextSibling = (element: Node) => {
}; };
export const isEndOfBlock = (range: Range) => { export const isEndOfBlock = (range: Range) => {
if (range.endContainer.textContent.length !== range.endOffset) { if (range.endContainer.nodeType === 3 &&
return false; range.endContainer.textContent.length !== range.endOffset &&
range.endContainer.textContent !== Constants.ZWSP &&
range.endContainer.textContent !== "\n") {
return false;
} }
let nextSibling = range.endContainer; let nextSibling = range.endContainer;
if (range.endContainer.nodeType !== 3 && range.endContainer.childNodes[range.endOffset]) {
nextSibling = range.endContainer.childNodes[range.endOffset];
}
while (nextSibling) { while (nextSibling) {
if (hasNextSibling(nextSibling)) { if (hasNextSibling(nextSibling)) {
return false; return false;

19
app/src/protyle/wysiwyg/keydown.ts
View File

@ -853,11 +853,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
} }
// 需使用 innerText，否则 br 无法传唤为 /n https://github.com/siyuan-note/siyuan/issues/12066 // 需使用 innerText，否则 br 无法传唤为 /n https://github.com/siyuan-note/siyuan/issues/12066
// 段末反向删除 https://github.com/siyuan-note/insider/issues/274 // 段末反向删除 https://github.com/siyuan-note/insider/issues/274
if (position.end === editElement.innerText.length || if (isEndOfBlock(range)) {
// 软换行后删除 https://github.com/siyuan-note/siyuan/issues/11118
(position.end === editElement.innerText.length - 1 && editElement.innerText.endsWith("\n")) ||
// 图片后无内容删除 https://github.com/siyuan-note/siyuan/issues/11868
(position.end === editElement.innerText.length - 1 && editElement.innerText.endsWith(Constants.ZWSP))) {
const nextElement = getNextBlock(getTopAloneElement(nodeElement)); const nextElement = getNextBlock(getTopAloneElement(nodeElement));
if (nextElement) { if (nextElement) {
const nextRange = focusBlock(nextElement); const nextRange = focusBlock(nextElement);
@ -934,8 +930,8 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
event.preventDefault(); event.preventDefault();
return; return;
} }
// 图片后为空格，在空格后删除 https://github.com/siyuan-note/siyuan/issues/13949
if (range.startOffset === 1 && range.startContainer.textContent.length === 1) { if (range.startOffset === 1 && range.startContainer.textContent.length === 1) {
// 图片后为空格，在空格后删除 https://github.com/siyuan-note/siyuan/issues/13949
const rangePreviousElement = hasPreviousSibling(range.startContainer) as HTMLElement; const rangePreviousElement = hasPreviousSibling(range.startContainer) as HTMLElement;
const rangeNextElement = hasNextSibling(range.startContainer) as HTMLElement; const rangeNextElement = hasNextSibling(range.startContainer) as HTMLElement;
if (rangePreviousElement && rangePreviousElement.nodeType === 1 && rangePreviousElement.classList.contains("img") && if (rangePreviousElement && rangePreviousElement.nodeType === 1 && rangePreviousElement.classList.contains("img") &&
@ -949,6 +945,17 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
event.preventDefault(); event.preventDefault();
return; return;
} }
// 图片前有一个字符，在字符后删除
if (position.start === 1 && !rangePreviousElement && rangeNextElement && rangeNextElement.nodeType === 1 && rangeNextElement.classList.contains("img")) {
const wbrElement = document.createElement("wbr");
range.insertNode(wbrElement);
const oldHTML = nodeElement.outerHTML;
wbrElement.previousSibling.textContent = Constants.ZWSP;
updateTransaction(protyle, nodeElement.getAttribute("data-node-id"), nodeElement.outerHTML, oldHTML);
focusByWbr(nodeElement, range);
event.preventDefault();
return;
}
} }
// 代码块中空行 ⌘+Del 异常 https://ld246.com/article/1663166544901 // 代码块中空行 ⌘+Del 异常 https://ld246.com/article/1663166544901
if (nodeElement.classList.contains("code-block") && isOnlyMeta(event) && if (nodeElement.classList.contains("code-block") && isOnlyMeta(event) &&