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

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

Browse source
This commit is contained in:
Vanessa 2023-02-10 11:18:48 +08:00
parent fe2eaa9ec2
commit 35469884d4
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import {focusBlock, focusByWbr} from "../util/selection";
import {focusBlock, focusByRange, focusByWbr, setLastNodeRange} from "../util/selection";
import {
getContenteditableElement,
getLastBlock,
@ -119,18 +119,21 @@ const removeLi = (protyle: IProtyle, blockElement: Element, range: Range) => {
}];
const previousLastElement = listItemElement.previousElementSibling.lastElementChild;
if (listItemElement.previousElementSibling.getAttribute("fold") === "1") {
if (getContenteditableElement(blockElement).textContent.trim() === "") {
if (getContenteditableElement(blockElement).textContent.trim() === "" &&
blockElement.nextElementSibling.classList.contains("protyle-attr")) {
doOperations.push({
action: "delete",
id: listItemId
});
undoOperations[0].data = listItemElement.outerHTML;
range.selectNodeContents(getContenteditableElement(listItemElement.previousElementSibling));
range.collapse(false);
setLastNodeRange(getContenteditableElement(listItemElement.previousElementSibling), range);
range.collapse(true);
listItemElement.remove();
} else {
range.selectNodeContents(getContenteditableElement(listItemElement.previousElementSibling));
range.collapse(false);
setLastNodeRange(getContenteditableElement(listItemElement.previousElementSibling), range);
range.collapse(true);
focusByRange(range);
blockElement.querySelector("wbr")?.remove();
return;
}
} else {