mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-02-17 20:48:06 +01:00
🎨 Improve priority of folding processing when headings and super blocks are mixed https://github.com/siyuan-note/siyuan/issues/9488
This commit is contained in:
parent
256e64e8b5
commit
5e6d94783b
5 changed files with 19 additions and 112 deletions
|
|
@ -2,30 +2,14 @@ export const removeFoldHeading = (nodeElement: Element) => {
|
|||
const nodeH = parseInt(nodeElement.getAttribute("data-subtype").substr(1));
|
||||
let nextElement = nodeElement.nextElementSibling;
|
||||
while (nextElement) {
|
||||
if (nextElement.classList.contains("sb")) {
|
||||
let nextFirstElement = nextElement.firstElementChild;
|
||||
while (nextFirstElement && nextFirstElement.classList.contains("sb")) {
|
||||
nextFirstElement = nextFirstElement.firstElementChild;
|
||||
}
|
||||
if ((nextFirstElement.getAttribute("data-type") === "NodeHeading" &&
|
||||
parseInt(nextFirstElement.getAttribute("data-subtype").substr(1)) > nodeH) ||
|
||||
nextFirstElement.getAttribute("data-type") !== "NodeHeading") {
|
||||
const tempElement = nextElement;
|
||||
nextElement = nextElement.nextElementSibling;
|
||||
tempElement.remove();
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
const currentH = parseInt(nextElement.getAttribute("data-subtype")?.substr(1));
|
||||
if (!nextElement.classList.contains("protyle-attr") && // 超级块末尾为属性
|
||||
(isNaN(currentH) || currentH > nodeH)) {
|
||||
const tempElement = nextElement;
|
||||
nextElement = nextElement.nextElementSibling;
|
||||
tempElement.remove();
|
||||
} else {
|
||||
const currentH = parseInt(nextElement.getAttribute("data-subtype")?.substr(1));
|
||||
if (!nextElement.classList.contains("protyle-attr") && // 超级块末尾为属性
|
||||
(isNaN(currentH) || currentH > nodeH)) {
|
||||
const tempElement = nextElement;
|
||||
nextElement = nextElement.nextElementSibling;
|
||||
tempElement.remove();
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue