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

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

Browse Source
This commit is contained in:
Vanessa 2025-04-02 23:11:56 +08:00
parent e1e57161a8
commit f57ad14ac2
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/protyle/toolbar/index.ts
View File

@ -616,6 +616,7 @@ export class Toolbar {
}); });
} }
} }
if (this.range.startContainer.nodeType !== 3 && (this.range.startContainer as HTMLElement).tagName === "SPAN" && if (this.range.startContainer.nodeType !== 3 && (this.range.startContainer as HTMLElement).tagName === "SPAN" &&
this.range.startContainer.isSameNode(this.range.endContainer) && !isEndSpan) { this.range.startContainer.isSameNode(this.range.endContainer) && !isEndSpan) {
// 切割元素 // 切割元素
@ -693,7 +694,7 @@ export class Toolbar {
currentNewNode.after(document.createTextNode(Constants.ZWSP)); currentNewNode.after(document.createTextNode(Constants.ZWSP));
} }
} else if (currentNewNode.nodeType === 3 && ["code", "tag", "kbd", "clear"].includes(type)) { } else if (currentNewNode.nodeType === 3 && ["code", "tag", "kbd", "clear"].includes(type)) {
const currentPreviousSibling = hasPreviousSibling(currentNewNode) as HTMLElement; let currentPreviousSibling = hasPreviousSibling(currentNewNode) as HTMLElement;
let previousIsCTK = false; let previousIsCTK = false;
if (currentPreviousSibling) { if (currentPreviousSibling) {
if (currentPreviousSibling.nodeType === 1) { if (currentPreviousSibling.nodeType === 1) {
@ -705,7 +706,7 @@ export class Toolbar {
currentPreviousSibling.textContent = currentPreviousSibling.textContent.substring(0, currentPreviousSibling.textContent.length - 1); currentPreviousSibling.textContent = currentPreviousSibling.textContent.substring(0, currentPreviousSibling.textContent.length - 1);
} }
} }
const currentNextSibling = hasNextSibling(currentNewNode) as HTMLElement; let currentNextSibling = hasNextSibling(currentNewNode) as HTMLElement;
let nextIsCTK = false; let nextIsCTK = false;
if (currentNextSibling) { if (currentNextSibling) {
if (currentNextSibling.nodeType === 1) { if (currentNextSibling.nodeType === 1) {
@ -723,14 +724,30 @@ export class Toolbar {
currentNewNode.textContent = Constants.ZWSP + currentNewNode.textContent; currentNewNode.textContent = Constants.ZWSP + currentNewNode.textContent;
} }
} else if (currentNewNode.textContent.startsWith(Constants.ZWSP)) { } else if (currentNewNode.textContent.startsWith(Constants.ZWSP)) {
currentNewNode.textContent = currentNewNode.textContent.substring(1); currentPreviousSibling = hasPreviousSibling(currentNewNode) as HTMLElement;
if (currentPreviousSibling.nodeType === 1) {
const currentPreviousSiblingTypes = currentPreviousSibling.dataset.type.split(" ");
if (!currentPreviousSiblingTypes.includes("code") && !currentPreviousSiblingTypes.includes("tag") && !currentPreviousSiblingTypes.includes("kbd")) {
currentNewNode.textContent = currentNewNode.textContent.substring(1);
}
} else {
currentNewNode.textContent = currentNewNode.textContent.substring(1);
}
} }
if (nextIsCTK) { if (nextIsCTK) {
if (!currentNextSibling.textContent.startsWith(Constants.ZWSP)) { if (!currentNextSibling.textContent.startsWith(Constants.ZWSP)) {
currentNextSibling.textContent = Constants.ZWSP + currentNextSibling.textContent; currentNextSibling.textContent = Constants.ZWSP + currentNextSibling.textContent;
} }
} else if (currentNewNode.textContent.endsWith(Constants.ZWSP)) { } else if (currentNewNode.textContent.endsWith(Constants.ZWSP)) {
currentNewNode.textContent = currentNewNode.textContent.substring(0, currentNewNode.textContent.length - 1); currentNextSibling = hasNextSibling(currentNewNode) as HTMLElement;
if (currentNextSibling.nodeType === 1) {
const currentNextSiblingTypes = currentNextSibling.dataset.type.split(" ");
if (!currentNextSiblingTypes.includes("code") && !currentNextSiblingTypes.includes("tag") && !currentNextSiblingTypes.includes("kbd")) {
currentNewNode.textContent = currentNewNode.textContent.substring(0, currentNewNode.textContent.length - 1);
}
} else {
currentNewNode.textContent = currentNewNode.textContent.substring(0, currentNewNode.textContent.length - 1);
}
} }
} }
} }