0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 fix https://github.com/siyuan-note/siyuan/issues/5591

Browse source
This commit is contained in:
Vanessa 2022-08-06 17:46:20 +08:00
parent 3f676903e7
commit f7e34c0e71
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -141,7 +141,8 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false) =>
tempElement.innerHTML = `<div${subType === "o" ? " data-marker=\"1.\"" : ""} data-subtype="${subType}" data-node-id="${Lute.NewNodeID()}" data-type="NodeList" class="list">${html}<div class="protyle-attr" contenteditable="false">${Constants.ZWSP}</div></div>`;
}
}
Array.from(tempElement.content.children).reverse().forEach(item => {
let lastElement: Element
Array.from(tempElement.content.children).reverse().forEach((item) => {
const addId = item.getAttribute("data-node-id");
if (addId === id) {
doOperation.push({
@ -169,6 +170,9 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false) =>
if (!render) {
blockElement.after(item);
}
if (!lastElement) {
lastElement = item;
}
});
if (editableElement && editableElement.textContent === "") {
doOperation.push({
@ -182,11 +186,15 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false) =>
previousID: blockElement.previousElementSibling ? blockElement.previousElementSibling.getAttribute("data-node-id") : "",
parentID: blockElement.parentElement.getAttribute("data-node-id") || protyle.block.parentID
});
const nextElement = blockElement.nextElementSibling;
blockElement.remove();
focusBlock(nextElement, undefined, false);
} else {
focusByWbr(protyle.wysiwyg.element, range);
}
if (lastElement) {
// https://github.com/siyuan-note/siyuan/issues/5591
focusBlock(lastElement, undefined, false);
}
const wbrElement = protyle.wysiwyg.element.querySelector("wbr")
if (wbrElement) {
wbrElement.remove();
}
transaction(protyle, doOperation, undoOperation);
};