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

🚨

Browse source
This commit is contained in:
Vanessa 2024-11-29 07:45:56 +08:00
parent c315fce720
commit 476547cfcd
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/protyle/util/reload.ts
View file

@ -61,7 +61,7 @@ export const reloadProtyle = (protyle: IProtyle, focus: boolean, updateReadonly?
updateReadonly,
cb () {
if (protyle.query?.key) {
highlightMark(protyle, protyle.wysiwyg.element.querySelectorAll(`span[data-type~="search-mark"]`));
highlightMark(protyle, protyle.wysiwyg.element.querySelectorAll('span[data-type~="search-mark"]'));
}
}
});

16
app/src/search/util.ts
View file

@ -1167,11 +1167,11 @@ const renderNextSearchMark = (options: {
if (options.edit.protyle.highlight.rangeIndex >= options.edit.protyle.highlight.ranges.length) {
options.edit.protyle.highlight.rangeIndex = 0;
}
let rangeTop
let rangeTop;
options.edit.protyle.highlight.ranges.forEach((item, index) => {
if (options.edit.protyle.highlight.rangeIndex === index) {
options.edit.protyle.highlight.markHL.add(item);
rangeTop = item.getBoundingClientRect().top
rangeTop = item.getBoundingClientRect().top;
} else {
options.edit.protyle.highlight.mark.add(item);
}
@ -1237,7 +1237,7 @@ export const getArticle = (options: {
return;
}
const contentRect = options.edit.protyle.contentElement.getBoundingClientRect();
let matchRectTop: number
let matchRectTop: number;
if (CSS.highlights) {
options.edit.protyle.highlight.rangeIndex = 0;
highlightMark(options.edit.protyle, matchElements);
@ -1513,8 +1513,8 @@ export const highlightMark = (protyle: IProtyle, matchElements: NodeListOf<Eleme
matchElements.forEach((item, index) => {
const range = new Range();
if (item.getAttribute("data-type") === "search-mark") {
const contentElement = item.firstChild
item.replaceWith(contentElement)
const contentElement = item.firstChild;
item.replaceWith(contentElement);
range.selectNodeContents(contentElement);
} else {
item.setAttribute("data-type", item.getAttribute("data-type").replace(" search-mark", "").replace("search-mark ", ""));
@ -1525,8 +1525,8 @@ export const highlightMark = (protyle: IProtyle, matchElements: NodeListOf<Eleme
} else {
protyle.highlight.mark.add(range);
}
protyle.highlight.ranges.push(range)
})
protyle.highlight.ranges.push(range);
});
CSS.highlights.set("search-mark", protyle.highlight.mark);
CSS.highlights.set("search-mark-hl", protyle.highlight.markHL);
}
};