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

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

Browse source
This commit is contained in:
Vanessa 2026-01-09 19:43:46 +08:00
parent ca24bea936
commit 8a1c0deb21
1 changed files with 41 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -931,6 +931,9 @@ export const openSearchEditor = (options: {
}) => {
let currentRange = (options.rootId === options.protyle.block.rootID && options.id === options.protyle.block.id) ?
options.protyle.highlight.ranges[options.protyle.highlight.rangeIndex] : null;
if (options.protyle.block.scroll) {
currentRange = null;
}
if (currentRange) {
const rangeBlockElement = hasClosestBlock(currentRange.startContainer);
if (rangeBlockElement) {
@ -1166,46 +1169,48 @@ export const getArticle = (options: {
data: getResponse,
protyle: options.edit.protyle,
action: zoomIn ? [Constants.CB_GET_ALL, Constants.CB_GET_HTML] : [Constants.CB_GET_HTML],
afterCB() {
const contentRect = options.edit.protyle.contentElement.getBoundingClientRect();
if (isSupportCSSHL()) {
let observer: ResizeObserver;
searchMarkRender(options.edit.protyle, getResponse.data.keywords, options.id, () => {
const highlightKeys = () => {
const currentRange = options.edit.protyle.highlight.ranges[options.edit.protyle.highlight.rangeIndex];
if (options.edit.protyle.highlight.ranges.length > 0 && currentRange) {
if (!currentRange.toString()) {
highlightById(options.edit.protyle, options.id, "center");
} else {
scrollToCurrent(options.edit.protyle.contentElement, currentRange, contentRect);
}
} else {
highlightById(options.edit.protyle, options.id, "center");
}
};
if (observer) {
observer.disconnect();
}
highlightKeys();
observer = new ResizeObserver(() => {
highlightKeys();
});
observer.observe(options.edit.protyle.wysiwyg.element);
setTimeout(() => {
observer.disconnect();
}, Constants.TIMEOUT_COUNT);
});
} else {
const matchElements = options.edit.protyle.wysiwyg.element.querySelectorAll('span[data-type~="search-mark"]');
if (matchElements.length === 0) {
return;
}
matchElements[0].classList.add("search-mark--hl");
options.edit.protyle.contentElement.scrollTop = options.edit.protyle.contentElement.scrollTop + matchElements[0].getBoundingClientRect().top - contentRect.top - contentRect.height / 2;
}
}
});
if (options.edit.protyle.options.render.title) {
options.edit.protyle.title.render(options.edit.protyle, response);
}
const contentRect = options.edit.protyle.contentElement.getBoundingClientRect();
if (isSupportCSSHL()) {
let observer: ResizeObserver;
searchMarkRender(options.edit.protyle, getResponse.data.keywords, options.id, () => {
const highlightKeys = () => {
const currentRange = options.edit.protyle.highlight.ranges[options.edit.protyle.highlight.rangeIndex];
if (options.edit.protyle.highlight.ranges.length > 0 && currentRange) {
if (!currentRange.toString()) {
highlightById(options.edit.protyle, options.id, "center");
} else {
scrollToCurrent(options.edit.protyle.contentElement, currentRange, contentRect);
}
} else {
highlightById(options.edit.protyle, options.id, "center");
}
};
if (observer) {
observer.disconnect();
}
highlightKeys();
observer = new ResizeObserver(() => {
highlightKeys();
});
observer.observe(options.edit.protyle.wysiwyg.element);
setTimeout(() => {
observer.disconnect();
}, Constants.TIMEOUT_COUNT);
});
} else {
const matchElements = options.edit.protyle.wysiwyg.element.querySelectorAll('span[data-type~="search-mark"]');
if (matchElements.length === 0) {
return;
}
matchElements[0].classList.add("search-mark--hl");
options.edit.protyle.contentElement.scrollTop = options.edit.protyle.contentElement.scrollTop + matchElements[0].getBoundingClientRect().top - contentRect.top - contentRect.height / 2;
}
});
});
});