Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 00:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2025-05-23 23:14:38 +08:00
parent d031a8fdab
commit 890da1d822
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/protyle/toolbar/index.ts
View file

@ -250,9 +250,13 @@ export class Toolbar {
rangeTypes = rangeTypes.concat((item.getAttribute("data-type") || "").split(" "));
}
});
const rangeStartNextSibling = hasNextSibling(this.range.startContainer);
const isSameNode = this.range.startContainer.isSameNode(this.range.endContainer) ||
(rangeStartNextSibling && rangeStartNextSibling.isSameNode(this.range.endContainer) &&
this.range.startContainer.parentElement.isSameNode(this.range.endContainer.parentElement));
if (this.range.startContainer.nodeType === 3 && this.range.startContainer.parentElement.tagName === "SPAN" &&
this.range.startContainer.isSameNode(this.range.endContainer) &&
this.range.startOffset > -1 && this.range.endOffset <= this.range.startContainer.textContent.length) {
isSameNode &&
this.range.startOffset > -1 && this.range.endOffset <= this.range.endContainer.textContent.length) {
rangeTypes = rangeTypes.concat((this.range.startContainer.parentElement.getAttribute("data-type") || "").split(" "));
}
const selectText = this.range.toString();
@ -292,16 +296,16 @@ export class Toolbar {
let html;
let needWrapTarget;
if (this.range.startContainer.nodeType === 3 && this.range.startContainer.parentElement.tagName === "SPAN" &&
this.range.startContainer.isSameNode(this.range.endContainer)) {
if (this.range.startOffset > -1 && this.range.endOffset <= this.range.startContainer.textContent.length) {
isSameNode) {
if (this.range.startOffset > -1 && this.range.endOffset <= this.range.endContainer.textContent.length) {
needWrapTarget = this.range.startContainer.parentElement;
}
if ((
this.range.startOffset !== 0 ||
// https://github.com/siyuan-note/siyuan/issues/14869
(this.range.startOffset === 0 && this.range.startContainer.previousSibling.nodeType === 3 &&
(this.range.startOffset === 0 && this.range.startContainer.previousSibling?.nodeType === 3 &&
this.range.startContainer.previousSibling.parentElement.isSameNode(this.range.startContainer.parentElement))
) && this.range.endOffset !== this.range.startContainer.textContent.length &&
) && this.range.endOffset !== this.range.endContainer.textContent.length &&
!(this.range.startOffset === 1 && this.range.startContainer.textContent.startsWith(Constants.ZWSP))) {
// 切割元素
const parentElement = this.range.startContainer.parentElement;