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

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

Browse source
This commit is contained in:
Vanessa 2023-03-07 10:42:20 +08:00
parent 9916fe7f65
commit 8f530a9b0a
4 changed files with 58 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

45
app/src/protyle/toolbar/util.ts
View file

@ -12,3 +12,48 @@ export const previewTemplate = (pathString: string, element: Element, parentId:
element.innerHTML = `<div class="protyle-wysiwyg" style="padding: 8px">${response.data.content.replace(/contenteditable="true"/g, "")}</div>`;
});
};
const mergeElement = (a: Element, b: Element, after = true) => {
a.setAttribute("data-type", a.getAttribute("data-type").replace("search-mark", "").trim());
b.setAttribute("data-type", b.getAttribute("data-type").replace("search-mark", "").trim());
const attributes = a.attributes
let isMatch = true
for (let i = 0; i < attributes.length; i++) {
if (b.getAttribute(attributes[i].name) !== attributes[i].value) {
isMatch = false
}
}
if (isMatch) {
if (after) {
a.innerHTML = a.innerHTML + b.innerHTML
} else {
a.innerHTML = b.innerHTML + a.innerHTML
}
b.remove();
}
return isMatch;
}
export const removeSearchMark = (element: HTMLElement) => {
let previousElement = element.previousSibling as HTMLElement;
while (previousElement && previousElement.nodeType !== 3) {
if (!mergeElement(element, previousElement, false)) {
break;
} else {
previousElement = element.previousSibling as HTMLElement;
}
}
let nextElement = element.nextSibling as HTMLElement;
while (nextElement && nextElement.nodeType !== 3) {
if (!mergeElement(element, nextElement)) {
break;
} else {
nextElement = element.nextSibling as HTMLElement;
}
}
if (element.getAttribute("data-type").includes("search-mark")) {
element.setAttribute("data-type", element.getAttribute("data-type").replace("search-mark", "").trim());
}
}