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

♻️ https://github.com/siyuan-note/siyuan/pull/15347

Browse source
This commit is contained in:
Vanessa 2025-07-23 13:08:38 +08:00
parent c88f99646c
commit 508eb93183
33 changed files with 111 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -134,7 +134,7 @@ export class Toolbar {
// shift+方向键或三击选中，不同的块 https://github.com/siyuan-note/siyuan/issues/3891
const startElement = hasClosestBlock(range.startContainer);
const endElement = hasClosestBlock(range.endContainer);
if (startElement && endElement && (startElement !== endElement)) {
if (startElement && endElement && startElement !== endElement) {
if (event) { // 在 keyup 中使用 shift+方向键选中
if (event.key === "ArrowLeft") {
this.range = setLastNodeRange(getContenteditableElement(startElement), range, false);
@ -212,7 +212,7 @@ export class Toolbar {
if (types.length === 0 && (!endElement || endElement.nodeType === 3)) {
return [];
}
if (endElement && !["DIV", "TD", "TH", "TR"].includes(endElement.tagName) && (startElement !== endElement)) {
if (endElement && !["DIV", "TD", "TH", "TR"].includes(endElement.tagName) && startElement !== endElement) {
types = types.concat((endElement.getAttribute("data-type") || "").split(" "));
}
range.cloneContents().childNodes.forEach((item: HTMLElement) => {
@ -251,9 +251,9 @@ export class Toolbar {
}
});
const rangeStartNextSibling = hasNextSibling(this.range.startContainer);
const isSameNode = (this.range.startContainer === this.range.endContainer) ||
(rangeStartNextSibling && (rangeStartNextSibling === this.range.endContainer) &&
(this.range.startContainer.parentElement === this.range.endContainer.parentElement));
const isSameNode = this.range.startContainer === this.range.endContainer ||
(rangeStartNextSibling && rangeStartNextSibling === this.range.endContainer &&
this.range.startContainer.parentElement === this.range.endContainer.parentElement);
if (this.range.startContainer.nodeType === 3 && this.range.startContainer.parentElement.tagName === "SPAN" &&
isSameNode &&
this.range.startOffset > -1 && this.range.endOffset <= this.range.endContainer.textContent.length) {
@ -284,7 +284,7 @@ export class Toolbar {
}
}
// https://github.com/siyuan-note/siyuan/issues/14534
if (rangeTypes.includes("text") && type === "text" && textObj && this.range.startContainer.nodeType === 3 && (this.range.startContainer === this.range.endContainer)) {
if (rangeTypes.includes("text") && type === "text" && textObj && this.range.startContainer.nodeType === 3 && this.range.startContainer === this.range.endContainer) {
const selectParentElement = this.range.startContainer.parentElement;
if (selectParentElement && hasSameTextStyle(null, selectParentElement, textObj)) {
return;
@ -304,14 +304,14 @@ export class Toolbar {
this.range.startOffset !== 0 ||
// https://github.com/siyuan-note/siyuan/issues/14869
(this.range.startOffset === 0 && this.range.startContainer.previousSibling?.nodeType === 3 &&
(this.range.startContainer.previousSibling.parentElement === this.range.startContainer.parentElement))
this.range.startContainer.previousSibling.parentElement === this.range.startContainer.parentElement)
) && (
this.range.endOffset !== this.range.endContainer.textContent.length ||
// https://github.com/siyuan-note/siyuan/issues/14869#issuecomment-2911553387
(
this.range.endOffset === this.range.endContainer.textContent.length &&
this.range.endContainer.nextSibling?.nodeType === 3 &&
(this.range.endContainer.nextSibling.parentElement === this.range.endContainer.parentElement)
this.range.endContainer.nextSibling.parentElement === this.range.endContainer.parentElement
)
) &&
!(this.range.startOffset === 1 && this.range.startContainer.textContent.startsWith(Constants.ZWSP))) {