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

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

Browse source
This commit is contained in:
Vanessa 2025-02-24 12:38:45 +08:00
parent f77ce65bb4
commit cce1f03476
1 changed files with 38 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

75
app/src/protyle/render/searchMarkRender.ts
View file

@ -2,7 +2,7 @@ import {Constants} from "../../constants";
import {isInEmbedBlock} from "../util/hasClosest";
export const searchMarkRender = (protyle: IProtyle, keys: string[], hlId?: string | number, cb?: () => void) => {
if (!isSupportCSSHL() || !keys || keys.length === 0) {
if (!isSupportCSSHL() || ((!keys || keys.length === 0) && !hlId)) {
return;
}
setTimeout(() => {
@ -36,43 +36,44 @@ export const searchMarkRender = (protyle: IProtyle, keys: string[], hlId?: strin
const text = protyle.wysiwyg.element.textContent;
const rangeIndexes: { range: Range, startIndex: number, isCurrent: boolean }[] = [];
keys.forEach(key => {
if (!key) {
return;
}
let startIndex = 0;
let endIndex = 0;
let currentNodeIndex = 0;
while ((startIndex = text.indexOf(key, startIndex)) !== -1) {
const range = new Range();
endIndex = startIndex + key.length;
try {
while (currentNodeIndex < textNodes.length && textNodesSize[currentNodeIndex] <= startIndex) {
currentNodeIndex++;
}
let currentTextNode = textNodes[currentNodeIndex];
range.setStart(currentTextNode, startIndex - (currentNodeIndex ? textNodesSize[currentNodeIndex - 1] : 0));
while (currentNodeIndex < textNodes.length && textNodesSize[currentNodeIndex] < endIndex) {
currentNodeIndex++;
}
currentTextNode = textNodes[currentNodeIndex];
range.setEnd(currentTextNode, endIndex - (currentNodeIndex ? textNodesSize[currentNodeIndex - 1] : 0));
let isCurrent = false;
if (!isSetHL && hlBlockElement && hlBlockElement.contains(currentTextNode)) {
isSetHL = true;
isCurrent = true;
}
rangeIndexes.push({range, startIndex, isCurrent});
} catch (e) {
console.error("searchMarkRender error:", e);
if (keys && keys.length > 0) {
keys.forEach(key => {
if (!key) {
return;
}
startIndex = endIndex;
}
});
let startIndex = 0;
let endIndex = 0;
let currentNodeIndex = 0;
while ((startIndex = text.indexOf(key, startIndex)) !== -1) {
const range = new Range();
endIndex = startIndex + key.length;
try {
while (currentNodeIndex < textNodes.length && textNodesSize[currentNodeIndex] <= startIndex) {
currentNodeIndex++;
}
let currentTextNode = textNodes[currentNodeIndex];
range.setStart(currentTextNode, startIndex - (currentNodeIndex ? textNodesSize[currentNodeIndex - 1] : 0));
while (currentNodeIndex < textNodes.length && textNodesSize[currentNodeIndex] < endIndex) {
currentNodeIndex++;
}
currentTextNode = textNodes[currentNodeIndex];
range.setEnd(currentTextNode, endIndex - (currentNodeIndex ? textNodesSize[currentNodeIndex - 1] : 0));
let isCurrent = false;
if (!isSetHL && hlBlockElement && hlBlockElement.contains(currentTextNode)) {
isSetHL = true;
isCurrent = true;
}
rangeIndexes.push({range, startIndex, isCurrent});
} catch (e) {
console.error("searchMarkRender error:", e);
}
startIndex = endIndex;
}
});
}
// 没有匹配到关键字，但是有高亮块时，需将其添加进去
if (!isSetHL && hlBlockElement) {