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

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

Browse source
This commit is contained in:
Vanessa 2024-06-10 17:14:22 +08:00
parent f1993e13e3
commit d4357b6883
2 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,13 @@ import {hasClosestBlock, hasClosestByAttribute, hasClosestByClassName, hasCloses
import * as dayjs from "dayjs";
import {transaction, updateTransaction} from "../wysiwyg/transaction";
import {getContenteditableElement} from "../wysiwyg/getBlock";
import {fixTableRange, focusBlock, focusByWbr, getEditorRange} from "./selection";
import {
fixTableRange,
focusBlock,
focusByWbr,
getEditorRange,
getSelectionOffset,
} from "./selection";
import {Constants} from "../../constants";
import {highlightRender} from "../render/highlightRender";
import {scrollCenter} from "../../util/highlightById";
@ -189,7 +195,8 @@ const processAV = (range: Range, html: string, protyle: IProtyle, blockElement:
export const insertHTML = (html: string, protyle: IProtyle, isBlock = false,
// 移动端插入嵌入块时，获取到的 range 为旧值
useProtyleRange = false) => {
useProtyleRange = false,
insertByCursor = false) => {
if (html === "") {
return;
}
@ -331,7 +338,14 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false,
}
}
let lastElement: Element;
Array.from(tempElement.content.children).reverse().forEach((item) => {
let insertBefore = false
if (!range.toString() && insertByCursor) {
const positon = getSelectionOffset(blockElement, protyle.wysiwyg.element, range)
if (positon.start === 0 && editableElement.textContent !== "") {
insertBefore = true;
}
}
(insertBefore ? Array.from(tempElement.content.children) : Array.from(tempElement.content.children).reverse()).forEach((item) => {
let addId = item.getAttribute("data-node-id");
if (addId === id) {
doOperation.push({
@ -361,14 +375,19 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false,
action: "insert",
data: item.outerHTML,
id: addId,
previousID: id
nextID: insertBefore ? id : undefined,
previousID: insertBefore ? undefined : id
});
undoOperation.push({
action: "delete",
id: addId,
});
}
blockElement.after(item);
if (insertBefore) {
blockElement.before(item);
} else {
blockElement.after(item);
}
if (!lastElement) {
lastElement = item;
}