Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修复了一些关于脚注的问题 #1525

Merged
merged 6 commits into from
Dec 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
61 changes: 25 additions & 36 deletions src/ts/sv/inputEvent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {scrollCenter} from "../util/editorCommonEvent";
import {hasClosestByAttribute} from "../util/hasClosest";
import {getSelectPosition, setRangeByWbr} from "../util/selection";
import {getSideByType, processAfterRender, processSpinVditorSVDOM} from "./process";
import { combineFootnote } from "../util/combineFootnote"

export const inputEvent = (vditor: IVditor, event?: InputEvent) => {
const range = getSelection().getRangeAt(0).cloneRange();
Expand Down Expand Up @@ -140,24 +141,24 @@ export const inputEvent = (vditor: IVditor, event?: InputEvent) => {
html = blockElement.previousElementSibling.textContent + html;
blockElement.previousElementSibling.remove();
}
if (!blockElement.innerText.startsWith("```")) {
// 添加链接引用
vditor.sv.element.querySelectorAll("[data-type='link-ref-defs-block']").forEach((item, index) => {
if (index === 0 && item && !(blockElement as HTMLElement).isEqualNode(item.parentElement)) {
html += "\n" + item.parentElement.textContent;
item.parentElement.remove();
}
});
// 添加链接引用
let footnotes = ""

// 添加脚注
vditor.sv.element.querySelectorAll("[data-type='footnotes-link']").forEach((item, index) => {
// 加入所有脚注便于渲染引用
if (item && !(blockElement as HTMLElement).isEqualNode(item.parentElement)) {
html += "\n" + item.parentElement.textContent;
item.parentElement.remove();
}
});
}
vditor.sv.element.querySelectorAll("[data-type='link-ref-defs-block']").forEach((item, index) => {
if (item && !(blockElement as HTMLElement).isEqualNode(item.parentElement)) {
footnotes += item.parentElement.textContent + "\n";
item.parentElement.remove();
}
});

// 添加脚注到文章头,便于lute处理
vditor.sv.element.querySelectorAll("[data-type='footnotes-link']").forEach((item, index) => {
if (item && !(blockElement as HTMLElement).isEqualNode(item.parentElement)) {
footnotes += item.parentElement.textContent + "\n";
item.parentElement.remove();
}
});
html = footnotes + html;
}
html = processSpinVditorSVDOM(html, vditor);
if (isSVElement) {
Expand All @@ -166,26 +167,14 @@ export const inputEvent = (vditor: IVditor, event?: InputEvent) => {
blockElement.outerHTML = html;
}

let firstLinkRefDefElement: Element;
const allLinkRefDefsElement = vditor.sv.element.querySelectorAll("[data-type='link-ref-defs-block']");
allLinkRefDefsElement.forEach((item, index) => {
if (index === 0) {
firstLinkRefDefElement = item.parentElement;
} else {
firstLinkRefDefElement.lastElementChild.remove();
firstLinkRefDefElement.insertAdjacentHTML("beforeend", `${item.parentElement.innerHTML}`);
item.parentElement.remove();
}
});
if (allLinkRefDefsElement.length > 0) {
vditor.sv.element.insertAdjacentElement("beforeend", firstLinkRefDefElement);
}
vditor.sv.element.querySelectorAll("[data-type='link-ref-defs-block']").forEach((item) => {
vditor.sv.element.insertAdjacentElement("beforeend", item.parentElement)
})

// 脚注合并后添加的末尾
vditor.sv.element.querySelectorAll("[data-type='footnotes-link']")
.forEach((item, index) => {
vditor.sv.element.insertAdjacentElement("beforeend", item.parentElement)
});
// 合并脚注
combineFootnote(vditor.sv.element, (root: HTMLElement) => {
vditor.sv.element.insertAdjacentElement("beforeend", root)
})

setRangeByWbr(vditor.sv.element, range);

Expand Down
3 changes: 3 additions & 0 deletions src/ts/sv/process.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import {hasClosestByTag} from "../util/hasClosestByHeadings";
import {log} from "../util/log";
import {getEditorRange, setRangeByWbr} from "../util/selection";
import {inputEvent} from "./inputEvent";
import { combineFootnote } from "../util/combineFootnote"


export const processPaste = (vditor: IVditor, text: string) => {
const range = getEditorRange(vditor);
Expand All @@ -25,6 +27,7 @@ export const processPaste = (vditor: IVditor, text: string) => {
} else {
blockElement.outerHTML = spinHTML;
}
combineFootnote(vditor.sv.element)
setRangeByWbr(vditor.sv.element, range);

scrollCenter(vditor);
Expand Down
2 changes: 2 additions & 0 deletions src/ts/toolbar/EditMode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
removeCurrentToolbar,
showToolbar, toggleSubMenu,
} from "./setToolbar";
import { combineFootnote } from "../util/combineFootnote"

export const setEditMode = (vditor: IVditor, type: string, event: Event | string) => {
let markdownText;
Expand Down Expand Up @@ -122,6 +123,7 @@ export const setEditMode = (vditor: IVditor, type: string, event: Event | string
svHTML = "";
}
vditor.sv.element.innerHTML = svHTML;
combineFootnote(vditor.sv.element)
processSVAfterRender(vditor, {
enableAddUndoStack: true,
enableHint: false,
Expand Down
27 changes: 27 additions & 0 deletions src/ts/util/combineFootnote.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/**
* 合并脚注
* @param elements vditor.sv.element
* @param afterCombine 每个脚注块合并完成后的回调, param: root为合并后的脚注块
*/
export const combineFootnote = (elements: HTMLElement, afterCombine?: (root: HTMLElement) => void ) => {
elements.querySelectorAll("[data-type=footnotes-link]").forEach((el: Element) => {
const root = el.parentElement
let footnote = root.nextSibling
// 寻找所有该脚注的块
while (footnote) {
if (footnote.textContent.startsWith(" ")) {
// 解析到四个空格,加入到root并继续解析
const thisNode = footnote
thisNode.childNodes.forEach(node => {
root.append(node.cloneNode(true))
})
footnote = footnote.nextSibling
thisNode.remove()
} else {
// 非空格停止解析
break
}
}
afterCombine && afterCombine(root)
})
}