Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-21 17:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2025-12-11 17:19:47 +08:00
parent 1413457ab6
commit 218503ddee
5 changed files with 28 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/protyle/util/editorCommonEvent.ts
View file

@ -11,7 +11,7 @@ import {Constants} from "../../constants";
import {paste} from "./paste"; import {paste} from "./paste";
import {cancelSB, genEmptyElement, genSBElement, insertEmptyBlock} from "../../block/util"; import {cancelSB, genEmptyElement, genSBElement, insertEmptyBlock} from "../../block/util";
import {transaction, turnsIntoOneTransaction} from "../wysiwyg/transaction"; import {transaction, turnsIntoOneTransaction} from "../wysiwyg/transaction";
import {getTopAloneElement} from "../wysiwyg/getBlock"; import {getParentBlock, getTopAloneElement} from "../wysiwyg/getBlock";
import {updateListOrder} from "../wysiwyg/list"; import {updateListOrder} from "../wysiwyg/list";
import {fetchPost, fetchSyncPost} from "../../util/fetch"; import {fetchPost, fetchSyncPost} from "../../util/fetch";
import {onGet} from "./onGet"; import {onGet} from "./onGet";
@ -71,7 +71,7 @@ const moveTo = async (protyle: IProtyle, sourceElements: Element[], targetElemen
data: newListElement.outerHTML, data: newListElement.outerHTML,
id: newListId, id: newListId,
previousID: position === "afterbegin" ? null : (position === "afterend" ? targetId : tempTargetElement.previousElementSibling?.getAttribute("data-node-id")), previousID: position === "afterbegin" ? null : (position === "afterend" ? targetId : tempTargetElement.previousElementSibling?.getAttribute("data-node-id")),
parentID: position === "afterbegin" ? targetId : (tempTargetElement.parentElement?.getAttribute("data-node-id") || protyle.block.parentID || protyle.block.rootID), parentID: position === "afterbegin" ? targetId : (getParentBlock(tempTargetElement)?.getAttribute("data-node-id") || protyle.block.parentID || protyle.block.rootID),
}); });
undoOperations.push({ undoOperations.push({
action: "delete", action: "delete",
@ -132,7 +132,7 @@ const moveTo = async (protyle: IProtyle, sourceElements: Element[], targetElemen
id: copyNewId, id: copyNewId,
data: copyElement.outerHTML, data: copyElement.outerHTML,
previousID: position === "afterbegin" ? null : (position === "afterend" ? targetId : copyElement.previousElementSibling?.getAttribute("data-node-id")), // 不能使用常量，移动后会被修改 previousID: position === "afterbegin" ? null : (position === "afterend" ? targetId : copyElement.previousElementSibling?.getAttribute("data-node-id")), // 不能使用常量，移动后会被修改
parentID: position === "afterbegin" ? targetId : (copyElement.parentElement?.getAttribute("data-node-id") || protyle.block.parentID || protyle.block.rootID), parentID: position === "afterbegin" ? targetId : (getParentBlock(copyElement)?.getAttribute("data-node-id") || protyle.block.parentID || protyle.block.rootID),
}); });
newSourceElements.push(copyElement); newSourceElements.push(copyElement);
} }
@ -155,7 +155,7 @@ const moveTo = async (protyle: IProtyle, sourceElements: Element[], targetElemen
action: "move", action: "move",
id, id,
previousID: position === "afterbegin" ? null : (position === "afterend" ? targetId : item.previousElementSibling?.getAttribute("data-node-id")), // 不能使用常量，移动后会被修改 previousID: position === "afterbegin" ? null : (position === "afterend" ? targetId : item.previousElementSibling?.getAttribute("data-node-id")), // 不能使用常量，移动后会被修改
parentID: position === "afterbegin" ? targetId : (item.parentElement?.getAttribute("data-node-id") || protyle.block.parentID || protyle.block.rootID), parentID: position === "afterbegin" ? targetId : (getParentBlock(item)?.getAttribute("data-node-id") || protyle.block.parentID || protyle.block.rootID),
}); });
newSourceElements.push(item); newSourceElements.push(item);
} }
@ -171,7 +171,7 @@ const moveTo = async (protyle: IProtyle, sourceElements: Element[], targetElemen
data: topSourceElement.outerHTML, data: topSourceElement.outerHTML,
id: topSourceElement.getAttribute("data-node-id"), id: topSourceElement.getAttribute("data-node-id"),
previousID: topSourceElement.previousElementSibling?.getAttribute("data-node-id"), previousID: topSourceElement.previousElementSibling?.getAttribute("data-node-id"),
parentID: topSourceElement.parentElement?.getAttribute("data-node-id") || protyle.block.parentID || protyle.block.rootID parentID: getParentBlock(topSourceElement)?.getAttribute("data-node-id") || protyle.block.parentID || protyle.block.rootID
}); });
const topSourceParentElement = topSourceElement.parentElement; const topSourceParentElement = topSourceElement.parentElement;
topSourceElement.remove(); topSourceElement.remove();
@ -348,7 +348,7 @@ const dragSb = async (protyle: IProtyle, sourceElements: Element[], targetElemen
action: "move", action: "move",
id: targetElement.getAttribute("data-node-id"), id: targetElement.getAttribute("data-node-id"),
previousID: targetElement.previousElementSibling?.getAttribute("data-node-id"), previousID: targetElement.previousElementSibling?.getAttribute("data-node-id"),
parentID: targetElement.parentElement?.getAttribute("data-node-id") || protyle.block.parentID || protyle.block.rootID parentID: getParentBlock(targetElement)?.getAttribute("data-node-id") || protyle.block.parentID || protyle.block.rootID
}; };
const sbElement = genSBElement(direct); const sbElement = genSBElement(direct);
targetElement.parentElement.replaceChild(sbElement, targetElement); targetElement.parentElement.replaceChild(sbElement, targetElement);
@ -358,7 +358,7 @@ const dragSb = async (protyle: IProtyle, sourceElements: Element[], targetElemen
id: sbElement.getAttribute("data-node-id"), id: sbElement.getAttribute("data-node-id"),
nextID: sbElement.nextElementSibling?.getAttribute("data-node-id"), nextID: sbElement.nextElementSibling?.getAttribute("data-node-id"),
previousID: sbElement.previousElementSibling?.getAttribute("data-node-id"), previousID: sbElement.previousElementSibling?.getAttribute("data-node-id"),
parentID: sbElement.parentElement.getAttribute("data-node-id") || protyle.block.parentID || protyle.block.rootID parentID: getParentBlock(sbElement)?.getAttribute("data-node-id") || protyle.block.parentID || protyle.block.rootID
}]; }];
// 临时插入，防止后面计算错误，最终再移动矫正 // 临时插入，防止后面计算错误，最终再移动矫正
sbElement.lastElementChild.before(targetElement); sbElement.lastElementChild.before(targetElement);

4
app/src/protyle/util/insertHTML.ts
View file

@ -1,7 +1,7 @@
import {hasClosestBlock, hasClosestByAttribute, hasClosestByClassName, hasClosestByTag} from "./hasClosest"; import {hasClosestBlock, hasClosestByAttribute, hasClosestByClassName, hasClosestByTag} from "./hasClosest";
import * as dayjs from "dayjs"; import * as dayjs from "dayjs";
import {transaction, updateTransaction} from "../wysiwyg/transaction"; import {transaction, updateTransaction} from "../wysiwyg/transaction";
import {getContenteditableElement} from "../wysiwyg/getBlock"; import {getContenteditableElement, getParentBlock} from "../wysiwyg/getBlock";
import { import {
fixTableRange, fixTableRange,
focusBlock, focusBlock,
@ -545,7 +545,7 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false,
data: oldHTML, data: oldHTML,
id, id,
previousID: blockElement.previousElementSibling ? blockElement.previousElementSibling.getAttribute("data-node-id") : "", previousID: blockElement.previousElementSibling ? blockElement.previousElementSibling.getAttribute("data-node-id") : "",
parentID: blockElement.parentElement.getAttribute("data-node-id") || protyle.block.parentID parentID: getParentBlock(blockElement).getAttribute("data-node-id") || protyle.block.parentID
}); });
blockElement.remove(); blockElement.remove();
} }

7
app/src/protyle/wysiwyg/getBlock.ts
View file

@ -1,6 +1,13 @@
import {hasClosestBlock, hasClosestByAttribute, isInEmbedBlock} from "../util/hasClosest"; import {hasClosestBlock, hasClosestByAttribute, isInEmbedBlock} from "../util/hasClosest";
import {Constants} from "../../constants"; import {Constants} from "../../constants";
export const getParentBlock = (element: Element) => {
if (element.parentElement.classList.contains("callout-content")) {
return element.parentElement.parentElement;
}
return element.parentElement;
};
export const getCalloutInfo = (element: Element) => { export const getCalloutInfo = (element: Element) => {
const icon = element.querySelector(".callout-icon").textContent; const icon = element.querySelector(".callout-icon").textContent;
return (icon ? icon + " " : "") + element.querySelector(".callout-title").textContent; return (icon ? icon + " " : "") + element.querySelector(".callout-title").textContent;

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

@ -25,7 +25,7 @@ import {
getContenteditableElement, getContenteditableElement,
getFirstBlock, getFirstBlock,
getLastBlock, getLastBlock,
getNextBlock, getNextBlock, getParentBlock,
getPreviousBlock, getPreviousBlock,
getTopAloneElement, getTopAloneElement,
hasNextSibling, hasNextSibling,
@ -356,12 +356,9 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
protyle.contentElement.scrollTop = protyle.contentElement.scrollTop + top; protyle.contentElement.scrollTop = protyle.contentElement.scrollTop + top;
protyle.scroll.lastScrollTop = protyle.contentElement.scrollTop + 1; protyle.scroll.lastScrollTop = protyle.contentElement.scrollTop + 1;
} }
} else if (!selectElements[0].parentElement.classList.contains("protyle-wysiwyg")) { } else if (!getParentBlock(selectElements[0]).classList.contains("protyle-wysiwyg")) {
hideElements(["select"], protyle); hideElements(["select"], protyle);
const parentBlockElement = hasClosestBlock(selectElements[0].parentElement); getParentBlock(selectElements[0]).classList.add("protyle-wysiwyg--select");
if (parentBlockElement) {
parentBlockElement.classList.add("protyle-wysiwyg--select");
}
} }
} }
}); });
@ -385,12 +382,9 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
protyle.contentElement.scrollTop = protyle.contentElement.scrollTop + bottom; protyle.contentElement.scrollTop = protyle.contentElement.scrollTop + bottom;
protyle.scroll.lastScrollTop = protyle.contentElement.scrollTop - 1; protyle.scroll.lastScrollTop = protyle.contentElement.scrollTop - 1;
} }
} else if (!selectLastElement.parentElement.classList.contains("protyle-wysiwyg")) { } else if (!getParentBlock(selectLastElement).classList.contains("protyle-wysiwyg")) {
hideElements(["select"], protyle); hideElements(["select"], protyle);
const parentBlockElement = hasClosestBlock(selectLastElement.parentElement); getParentBlock(selectLastElement).classList.add("protyle-wysiwyg--select");
if (parentBlockElement) {
parentBlockElement.classList.add("protyle-wysiwyg--select");
}
} }
} }
}); });
@ -413,12 +407,9 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
protyle.contentElement.scrollTop = protyle.contentElement.scrollTop + top; protyle.contentElement.scrollTop = protyle.contentElement.scrollTop + top;
protyle.scroll.lastScrollTop = protyle.contentElement.scrollTop + 1; protyle.scroll.lastScrollTop = protyle.contentElement.scrollTop + 1;
} }
} else if (!startEndElement.endElement.parentElement.classList.contains("protyle-wysiwyg")) { } else if (!getParentBlock(startEndElement.endElement).classList.contains("protyle-wysiwyg")) {
hideElements(["select"], protyle); hideElements(["select"], protyle);
const parentBlockElement = hasClosestBlock(startEndElement.endElement.parentElement); getParentBlock(startEndElement.endElement).classList.add("protyle-wysiwyg--select");
if (parentBlockElement) {
parentBlockElement.classList.add("protyle-wysiwyg--select");
}
} }
} else { } else {
startEndElement.endElement.classList.remove("protyle-wysiwyg--select"); startEndElement.endElement.classList.remove("protyle-wysiwyg--select");
@ -452,10 +443,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
if (nextElement.getBoundingClientRect().width === 0) { if (nextElement.getBoundingClientRect().width === 0) {
// https://github.com/siyuan-note/siyuan/issues/11194 // https://github.com/siyuan-note/siyuan/issues/11194
hideElements(["select"], protyle); hideElements(["select"], protyle);
const parentBlockElement = hasClosestBlock(startEndElement.endElement.parentElement); getParentBlock(startEndElement.endElement).classList.add("protyle-wysiwyg--select");
if (parentBlockElement) {
parentBlockElement.classList.add("protyle-wysiwyg--select");
}
} else { } else {
nextElement.classList.add("protyle-wysiwyg--select"); nextElement.classList.add("protyle-wysiwyg--select");
nextElement.setAttribute("select-end", "true"); nextElement.setAttribute("select-end", "true");
@ -466,12 +454,9 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
protyle.scroll.lastScrollTop = protyle.contentElement.scrollTop - 1; protyle.scroll.lastScrollTop = protyle.contentElement.scrollTop - 1;
} }
} }
} else if (!startEndElement.endElement.parentElement.classList.contains("protyle-wysiwyg")) { } else if (!getParentBlock(startEndElement.endElement).classList.contains("protyle-wysiwyg")) {
hideElements(["select"], protyle); hideElements(["select"], protyle);
const parentBlockElement = hasClosestBlock(startEndElement.endElement.parentElement); getParentBlock(startEndElement.endElement).classList.add("protyle-wysiwyg--select");
if (parentBlockElement) {
parentBlockElement.classList.add("protyle-wysiwyg--select");
}
} }
} else { } else {
startEndElement.endElement.classList.remove("protyle-wysiwyg--select"); startEndElement.endElement.classList.remove("protyle-wysiwyg--select");

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

@ -2,7 +2,7 @@ import {focusBlock, focusByRange, focusByWbr, getSelectionOffset, setLastNodeRan
import { import {
getContenteditableElement, getContenteditableElement,
getLastBlock, getLastBlock,
getNextBlock, getNextBlock, getParentBlock,
getPreviousBlock, getPreviousBlock,
getTopAloneElement, getTopAloneElement,
getTopEmptyElement, getTopEmptyElement,
@ -126,13 +126,12 @@ export const removeBlock = async (protyle: IProtyle, blockElement: Element, rang
} }
previousID = unfoldData[foldId].previousID; previousID = unfoldData[foldId].previousID;
} }
const parentElement = hasClosestBlock(topElement.parentElement);
inserts.push({ inserts.push({
action: "insert", action: "insert",
data, data,
id, id,
previousID, previousID,
parentID: (parentElement ? parentElement.getAttribute("data-node-id") : null) || protyle.block.parentID parentID: getParentBlock(topElement)?.getAttribute("data-node-id") || protyle.block.parentID
}); });
if (topElement.getAttribute("data-subtype") === "o" && topElement.classList.contains("li")) { if (topElement.getAttribute("data-subtype") === "o" && topElement.classList.contains("li")) {
listElement = topElement.parentElement; listElement = topElement.parentElement;