react-highlight-me 2.2.3 → 2.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -0
- package/dist/cjs/index.d.ts +1 -1
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +25 -15
- package/dist/cjs/index.js.map +1 -1
- package/dist/esm/index.d.ts +1 -1
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +26 -16
- package/dist/esm/index.js.map +1 -1
- package/package.json +15 -13
- package/src/index.tsx +25 -15
package/README.md
CHANGED
|
@@ -20,6 +20,9 @@ A flexible React component for highlighting specific words or phrases within tex
|
|
|
20
20
|
|
|
21
21
|
*) pnpm is a preferable package manager for me at the moment.
|
|
22
22
|
|
|
23
|
+
## [Demo](https://ahgpuk.github.io/react-highlight-me/)
|
|
24
|
+
|
|
25
|
+
|
|
23
26
|
## Usage
|
|
24
27
|
|
|
25
28
|
### Basic Text Highlighting
|
package/dist/cjs/index.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ type Props = {
|
|
|
3
3
|
children?: React.ReactNode;
|
|
4
4
|
words?: string[] | string | RegExp | RegExp[];
|
|
5
5
|
highlightStyle?: React.CSSProperties;
|
|
6
|
-
caseSensitive?: boolean;
|
|
6
|
+
caseSensitive?: boolean | undefined;
|
|
7
7
|
isWordBoundary?: boolean;
|
|
8
8
|
isDebug?: boolean;
|
|
9
9
|
escapeRegex?: RegExp;
|
package/dist/cjs/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8E,MAAM,OAAO,CAAC;AAEnG,KAAK,KAAK,GAAG;IACX,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;IAC9C,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAA;AAMD,eAAO,MAAM,aAAa,oCAAmC,CAAC;AAC9D,eAAO,MAAM,uBAAuB,wHAAkF,CAAC;AAEvH,UAAU,wBAAyB,SAAQ,KAAK,CAAC,yBAAyB,CAAC,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IACrH,uBAAuB,EAAE,MAAM,CAAC;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,QAAA,MAAM,eAAe,EAkOf,wBAAwB,CAAC;AAM/B,eAAe,eAAe,CAAC"}
|
package/dist/cjs/index.js
CHANGED
|
@@ -41,7 +41,7 @@ const ROOT_ELEMENT_SELECTOR = `[${ROOT_ELEMENT_ATTR}="${ROOT_ELEMENT_ID}"]`;
|
|
|
41
41
|
const MARK_ATTRIBUTE = 'data-highlighter';
|
|
42
42
|
exports.MARK_SELECTOR = `mark[${MARK_ATTRIBUTE}="true"]`;
|
|
43
43
|
exports.MARKS_IN_SCOPE_SELECTOR = `:scope ${exports.MARK_SELECTOR}:not(:scope ${ROOT_ELEMENT_SELECTOR} ${exports.MARK_SELECTOR})`;
|
|
44
|
-
const TextHighlighter = (0, react_1.forwardRef)(({ children, words = [], highlightStyle = { backgroundColor: 'yellow', fontWeight: 'bold' }, caseSensitive =
|
|
44
|
+
const TextHighlighter = (0, react_1.forwardRef)(({ children, words = [], highlightStyle = { backgroundColor: 'yellow', fontWeight: 'bold' }, caseSensitive = undefined, isWordBoundary = false, isDebug = false, escapeRegex = /[.*+?^${}()|[\]\\]/g, }, ref) => {
|
|
45
45
|
const containerRef = (0, react_1.useRef)(null);
|
|
46
46
|
const observerRef = (0, react_1.useRef)(null);
|
|
47
47
|
const lastHighlightSignature = (0, react_1.useRef)('');
|
|
@@ -49,15 +49,17 @@ const TextHighlighter = (0, react_1.forwardRef)(({ children, words = [], highlig
|
|
|
49
49
|
const currentProps = { words, highlightStyle, caseSensitive, isWordBoundary, escapeRegex };
|
|
50
50
|
const propsRef = (0, react_1.useRef)(currentProps);
|
|
51
51
|
propsRef.current = currentProps;
|
|
52
|
-
const nodeFilter = {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
52
|
+
const nodeFilter = (0, react_1.useMemo)(() => {
|
|
53
|
+
return {
|
|
54
|
+
acceptNode: (node) => {
|
|
55
|
+
if (!containerRef.current)
|
|
56
|
+
return NodeFilter.FILTER_SKIP;
|
|
57
|
+
return isInMyScope(containerRef.current, node, ROOT_ELEMENT_SELECTOR)
|
|
58
|
+
? NodeFilter.FILTER_ACCEPT
|
|
59
|
+
: NodeFilter.FILTER_SKIP;
|
|
60
|
+
}
|
|
61
|
+
};
|
|
62
|
+
}, [containerRef === null || containerRef === void 0 ? void 0 : containerRef.current]);
|
|
61
63
|
const getTextSignature = (0, react_1.useCallback)((element) => {
|
|
62
64
|
var _a;
|
|
63
65
|
// Create a signature of all text content to detect real changes
|
|
@@ -70,20 +72,24 @@ const TextHighlighter = (0, react_1.forwardRef)(({ children, words = [], highlig
|
|
|
70
72
|
}
|
|
71
73
|
}
|
|
72
74
|
return textParts.join('|');
|
|
73
|
-
}, []);
|
|
75
|
+
}, [nodeFilter]);
|
|
74
76
|
const highlightTextInElement = (0, react_1.useCallback)((element) => {
|
|
75
77
|
const { words, highlightStyle, caseSensitive, isWordBoundary, escapeRegex } = propsRef.current;
|
|
76
78
|
const wordsArray = Array.isArray(words) ? words : [words];
|
|
77
79
|
isDebug && console.log('Highlighting with words:', wordsArray);
|
|
78
80
|
// Remove existing highlights
|
|
79
81
|
const existingMarks = element.querySelectorAll(TextHighlighter.MARKS_IN_SCOPE_SELECTOR);
|
|
82
|
+
const elementsToNormalize = new Set();
|
|
80
83
|
existingMarks.forEach(mark => {
|
|
81
84
|
var _a;
|
|
82
85
|
const textContent = mark.textContent || '';
|
|
83
86
|
const textNode = document.createTextNode(textContent);
|
|
84
|
-
(
|
|
87
|
+
if (mark.parentNode) {
|
|
88
|
+
elementsToNormalize.add(mark.parentNode);
|
|
89
|
+
(_a = mark.parentNode) === null || _a === void 0 ? void 0 : _a.replaceChild(textNode, mark);
|
|
90
|
+
}
|
|
85
91
|
});
|
|
86
|
-
|
|
92
|
+
elementsToNormalize.forEach(node => node.normalize());
|
|
87
93
|
if (!wordsArray.length || wordsArray.every(word => !word)) {
|
|
88
94
|
lastHighlightSignature.current = getTextSignature(element);
|
|
89
95
|
return;
|
|
@@ -116,7 +122,7 @@ const TextHighlighter = (0, react_1.forwardRef)(({ children, words = [], highlig
|
|
|
116
122
|
.join('|');
|
|
117
123
|
if (!pattern)
|
|
118
124
|
return;
|
|
119
|
-
const regex = new RegExp(`(${pattern})`, caseSensitive ? 'g' : 'gi');
|
|
125
|
+
const regex = new RegExp(`(${pattern})`, !!caseSensitive ? 'g' : 'gi');
|
|
120
126
|
const parts = text.split(regex);
|
|
121
127
|
if (parts.length > 1) {
|
|
122
128
|
const fragment = document.createDocumentFragment();
|
|
@@ -125,6 +131,9 @@ const TextHighlighter = (0, react_1.forwardRef)(({ children, words = [], highlig
|
|
|
125
131
|
return;
|
|
126
132
|
const shouldHighlight = wordsArray.some(word => {
|
|
127
133
|
if (word instanceof RegExp) {
|
|
134
|
+
if (caseSensitive === undefined) {
|
|
135
|
+
return word.test(part);
|
|
136
|
+
}
|
|
128
137
|
const flags = caseSensitive ? word.flags : [...new Set([...word.flags.split(''), 'i'])].join('');
|
|
129
138
|
const testRegex = new RegExp(word.source, flags);
|
|
130
139
|
return testRegex.test(part);
|
|
@@ -188,7 +197,8 @@ const TextHighlighter = (0, react_1.forwardRef)(({ children, words = [], highlig
|
|
|
188
197
|
observerRef.current.observe(currentRef, {
|
|
189
198
|
childList: true,
|
|
190
199
|
subtree: true,
|
|
191
|
-
characterData: true
|
|
200
|
+
characterData: true,
|
|
201
|
+
attributes: true,
|
|
192
202
|
});
|
|
193
203
|
return () => {
|
|
194
204
|
if (observerRef.current) {
|
package/dist/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"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"}
|
package/dist/esm/index.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ type Props = {
|
|
|
3
3
|
children?: React.ReactNode;
|
|
4
4
|
words?: string[] | string | RegExp | RegExp[];
|
|
5
5
|
highlightStyle?: React.CSSProperties;
|
|
6
|
-
caseSensitive?: boolean;
|
|
6
|
+
caseSensitive?: boolean | undefined;
|
|
7
7
|
isWordBoundary?: boolean;
|
|
8
8
|
isDebug?: boolean;
|
|
9
9
|
escapeRegex?: RegExp;
|
package/dist/esm/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8E,MAAM,OAAO,CAAC;AAEnG,KAAK,KAAK,GAAG;IACX,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;IAC9C,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAA;AAMD,eAAO,MAAM,aAAa,oCAAmC,CAAC;AAC9D,eAAO,MAAM,uBAAuB,wHAAkF,CAAC;AAEvH,UAAU,wBAAyB,SAAQ,KAAK,CAAC,yBAAyB,CAAC,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IACrH,uBAAuB,EAAE,MAAM,CAAC;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,QAAA,MAAM,eAAe,EAkOf,wBAAwB,CAAC;AAM/B,eAAe,eAAe,CAAC"}
|
package/dist/esm/index.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import React, { useLayoutEffect, useRef, useCallback, useState, forwardRef } from 'react';
|
|
1
|
+
import React, { useLayoutEffect, useRef, useCallback, useState, forwardRef, useMemo } from 'react';
|
|
2
2
|
const ROOT_ELEMENT_ID = 'react-highlight-me';
|
|
3
3
|
const ROOT_ELEMENT_ATTR = 'data-id';
|
|
4
4
|
const ROOT_ELEMENT_SELECTOR = `[${ROOT_ELEMENT_ATTR}="${ROOT_ELEMENT_ID}"]`;
|
|
5
5
|
const MARK_ATTRIBUTE = 'data-highlighter';
|
|
6
6
|
export const MARK_SELECTOR = `mark[${MARK_ATTRIBUTE}="true"]`;
|
|
7
7
|
export const MARKS_IN_SCOPE_SELECTOR = `:scope ${MARK_SELECTOR}:not(:scope ${ROOT_ELEMENT_SELECTOR} ${MARK_SELECTOR})`;
|
|
8
|
-
const TextHighlighter = forwardRef(({ children, words = [], highlightStyle = { backgroundColor: 'yellow', fontWeight: 'bold' }, caseSensitive =
|
|
8
|
+
const TextHighlighter = forwardRef(({ children, words = [], highlightStyle = { backgroundColor: 'yellow', fontWeight: 'bold' }, caseSensitive = undefined, isWordBoundary = false, isDebug = false, escapeRegex = /[.*+?^${}()|[\]\\]/g, }, ref) => {
|
|
9
9
|
const containerRef = useRef(null);
|
|
10
10
|
const observerRef = useRef(null);
|
|
11
11
|
const lastHighlightSignature = useRef('');
|
|
@@ -13,15 +13,17 @@ const TextHighlighter = forwardRef(({ children, words = [], highlightStyle = { b
|
|
|
13
13
|
const currentProps = { words, highlightStyle, caseSensitive, isWordBoundary, escapeRegex };
|
|
14
14
|
const propsRef = useRef(currentProps);
|
|
15
15
|
propsRef.current = currentProps;
|
|
16
|
-
const nodeFilter = {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
16
|
+
const nodeFilter = useMemo(() => {
|
|
17
|
+
return {
|
|
18
|
+
acceptNode: (node) => {
|
|
19
|
+
if (!containerRef.current)
|
|
20
|
+
return NodeFilter.FILTER_SKIP;
|
|
21
|
+
return isInMyScope(containerRef.current, node, ROOT_ELEMENT_SELECTOR)
|
|
22
|
+
? NodeFilter.FILTER_ACCEPT
|
|
23
|
+
: NodeFilter.FILTER_SKIP;
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
}, [containerRef === null || containerRef === void 0 ? void 0 : containerRef.current]);
|
|
25
27
|
const getTextSignature = useCallback((element) => {
|
|
26
28
|
var _a;
|
|
27
29
|
// Create a signature of all text content to detect real changes
|
|
@@ -34,20 +36,24 @@ const TextHighlighter = forwardRef(({ children, words = [], highlightStyle = { b
|
|
|
34
36
|
}
|
|
35
37
|
}
|
|
36
38
|
return textParts.join('|');
|
|
37
|
-
}, []);
|
|
39
|
+
}, [nodeFilter]);
|
|
38
40
|
const highlightTextInElement = useCallback((element) => {
|
|
39
41
|
const { words, highlightStyle, caseSensitive, isWordBoundary, escapeRegex } = propsRef.current;
|
|
40
42
|
const wordsArray = Array.isArray(words) ? words : [words];
|
|
41
43
|
isDebug && console.log('Highlighting with words:', wordsArray);
|
|
42
44
|
// Remove existing highlights
|
|
43
45
|
const existingMarks = element.querySelectorAll(TextHighlighter.MARKS_IN_SCOPE_SELECTOR);
|
|
46
|
+
const elementsToNormalize = new Set();
|
|
44
47
|
existingMarks.forEach(mark => {
|
|
45
48
|
var _a;
|
|
46
49
|
const textContent = mark.textContent || '';
|
|
47
50
|
const textNode = document.createTextNode(textContent);
|
|
48
|
-
(
|
|
51
|
+
if (mark.parentNode) {
|
|
52
|
+
elementsToNormalize.add(mark.parentNode);
|
|
53
|
+
(_a = mark.parentNode) === null || _a === void 0 ? void 0 : _a.replaceChild(textNode, mark);
|
|
54
|
+
}
|
|
49
55
|
});
|
|
50
|
-
|
|
56
|
+
elementsToNormalize.forEach(node => node.normalize());
|
|
51
57
|
if (!wordsArray.length || wordsArray.every(word => !word)) {
|
|
52
58
|
lastHighlightSignature.current = getTextSignature(element);
|
|
53
59
|
return;
|
|
@@ -80,7 +86,7 @@ const TextHighlighter = forwardRef(({ children, words = [], highlightStyle = { b
|
|
|
80
86
|
.join('|');
|
|
81
87
|
if (!pattern)
|
|
82
88
|
return;
|
|
83
|
-
const regex = new RegExp(`(${pattern})`, caseSensitive ? 'g' : 'gi');
|
|
89
|
+
const regex = new RegExp(`(${pattern})`, !!caseSensitive ? 'g' : 'gi');
|
|
84
90
|
const parts = text.split(regex);
|
|
85
91
|
if (parts.length > 1) {
|
|
86
92
|
const fragment = document.createDocumentFragment();
|
|
@@ -89,6 +95,9 @@ const TextHighlighter = forwardRef(({ children, words = [], highlightStyle = { b
|
|
|
89
95
|
return;
|
|
90
96
|
const shouldHighlight = wordsArray.some(word => {
|
|
91
97
|
if (word instanceof RegExp) {
|
|
98
|
+
if (caseSensitive === undefined) {
|
|
99
|
+
return word.test(part);
|
|
100
|
+
}
|
|
92
101
|
const flags = caseSensitive ? word.flags : [...new Set([...word.flags.split(''), 'i'])].join('');
|
|
93
102
|
const testRegex = new RegExp(word.source, flags);
|
|
94
103
|
return testRegex.test(part);
|
|
@@ -152,7 +161,8 @@ const TextHighlighter = forwardRef(({ children, words = [], highlightStyle = { b
|
|
|
152
161
|
observerRef.current.observe(currentRef, {
|
|
153
162
|
childList: true,
|
|
154
163
|
subtree: true,
|
|
155
|
-
characterData: true
|
|
164
|
+
characterData: true,
|
|
165
|
+
attributes: true,
|
|
156
166
|
});
|
|
157
167
|
return () => {
|
|
158
168
|
if (observerRef.current) {
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-highlight-me",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.3.0",
|
|
4
4
|
"description": "Highlight words in React components or text",
|
|
5
5
|
"main": "dist/cjs/index.js",
|
|
6
6
|
"module": "dist/esm/index.js",
|
|
@@ -22,26 +22,28 @@
|
|
|
22
22
|
"src",
|
|
23
23
|
"README.md"
|
|
24
24
|
],
|
|
25
|
-
"keywords": [],
|
|
26
|
-
"author": "Andrey Hohutkin <Andrey.Hohutkin@gmail.com",
|
|
27
|
-
"repository": {
|
|
28
|
-
"type": "git",
|
|
29
|
-
"url": "git+https://github.com/AHgPuK/react-highlight-me.git"
|
|
30
|
-
},
|
|
31
|
-
"license": "ISC",
|
|
32
|
-
"devDependencies": {
|
|
33
|
-
"@types/react": "^19.1.8",
|
|
34
|
-
"typescript": "^5.3.3"
|
|
35
|
-
},
|
|
36
25
|
"scripts": {
|
|
37
26
|
"test": "echo \"Error: no test specified\" && exit 1",
|
|
38
27
|
"build": "npm run build:cjs && npm run build:esm",
|
|
39
28
|
"build:cjs": "tsc -p tsconfig.cjs.json",
|
|
40
29
|
"build:esm": "tsc -p tsconfig.esm.json",
|
|
41
30
|
"clean": "rm -rf dist",
|
|
31
|
+
"prepublishOnly": "npm run build",
|
|
42
32
|
"pack:check": "npm pack && tar -tzf *.tgz && rm *.tgz",
|
|
43
33
|
"demo:dev": "cd demo && pnpm run dev",
|
|
44
34
|
"demo:build": "pnpm run build && cd demo && pnpm run build",
|
|
45
35
|
"demo:preview": "cd demo && pnpm run preview"
|
|
36
|
+
},
|
|
37
|
+
"keywords": [],
|
|
38
|
+
"author": "Andrey Hohutkin <Andrey.Hohutkin@gmail.com>",
|
|
39
|
+
"repository": {
|
|
40
|
+
"type": "git",
|
|
41
|
+
"url": "git+https://github.com/AHgPuK/react-highlight-me.git"
|
|
42
|
+
},
|
|
43
|
+
"license": "ISC",
|
|
44
|
+
"packageManager": "pnpm@10.9.0",
|
|
45
|
+
"devDependencies": {
|
|
46
|
+
"@types/react": "^19.1.8",
|
|
47
|
+
"typescript": "^5.3.3"
|
|
46
48
|
}
|
|
47
|
-
}
|
|
49
|
+
}
|
package/src/index.tsx
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import React, { useLayoutEffect, useRef, useCallback, useState, forwardRef } from 'react';
|
|
1
|
+
import React, { useLayoutEffect, useRef, useCallback, useState, forwardRef, useMemo } from 'react';
|
|
2
2
|
|
|
3
3
|
type Props = {
|
|
4
4
|
children?: React.ReactNode;
|
|
5
5
|
words?: string[] | string | RegExp | RegExp[];
|
|
6
6
|
highlightStyle?: React.CSSProperties;
|
|
7
|
-
caseSensitive?: boolean;
|
|
7
|
+
caseSensitive?: boolean | undefined;
|
|
8
8
|
isWordBoundary?: boolean;
|
|
9
9
|
isDebug?: boolean;
|
|
10
10
|
escapeRegex?: RegExp;
|
|
@@ -27,7 +27,7 @@ const TextHighlighter = forwardRef<HTMLDivElement, Props>(({
|
|
|
27
27
|
children,
|
|
28
28
|
words = [],
|
|
29
29
|
highlightStyle = { backgroundColor: 'yellow', fontWeight: 'bold' },
|
|
30
|
-
caseSensitive =
|
|
30
|
+
caseSensitive = undefined,
|
|
31
31
|
isWordBoundary = false,
|
|
32
32
|
isDebug = false,
|
|
33
33
|
escapeRegex = /[.*+?^${}()|[\]\\]/g,
|
|
@@ -41,15 +41,17 @@ const TextHighlighter = forwardRef<HTMLDivElement, Props>(({
|
|
|
41
41
|
const propsRef = useRef(currentProps);
|
|
42
42
|
propsRef.current = currentProps;
|
|
43
43
|
|
|
44
|
-
const nodeFilter = {
|
|
45
|
-
|
|
46
|
-
|
|
44
|
+
const nodeFilter = useMemo(() => {
|
|
45
|
+
return {
|
|
46
|
+
acceptNode: (node: Node) => {
|
|
47
|
+
if (!containerRef.current) return NodeFilter.FILTER_SKIP;
|
|
47
48
|
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
49
|
+
return isInMyScope(containerRef.current, node, ROOT_ELEMENT_SELECTOR)
|
|
50
|
+
? NodeFilter.FILTER_ACCEPT
|
|
51
|
+
: NodeFilter.FILTER_SKIP;
|
|
52
|
+
}
|
|
51
53
|
}
|
|
52
|
-
}
|
|
54
|
+
}, [containerRef?.current]);
|
|
53
55
|
|
|
54
56
|
const getTextSignature = useCallback((element: HTMLElement): string => {
|
|
55
57
|
// Create a signature of all text content to detect real changes
|
|
@@ -68,7 +70,7 @@ const TextHighlighter = forwardRef<HTMLDivElement, Props>(({
|
|
|
68
70
|
}
|
|
69
71
|
|
|
70
72
|
return textParts.join('|');
|
|
71
|
-
}, []);
|
|
73
|
+
}, [nodeFilter]);
|
|
72
74
|
|
|
73
75
|
const highlightTextInElement = useCallback((element: HTMLElement) => {
|
|
74
76
|
const { words, highlightStyle, caseSensitive, isWordBoundary, escapeRegex } = propsRef.current;
|
|
@@ -78,13 +80,17 @@ const TextHighlighter = forwardRef<HTMLDivElement, Props>(({
|
|
|
78
80
|
|
|
79
81
|
// Remove existing highlights
|
|
80
82
|
const existingMarks = element.querySelectorAll(TextHighlighter.MARKS_IN_SCOPE_SELECTOR);
|
|
83
|
+
const elementsToNormalize = new Set<Node>();
|
|
81
84
|
existingMarks.forEach(mark => {
|
|
82
85
|
const textContent = mark.textContent || '';
|
|
83
86
|
const textNode = document.createTextNode(textContent);
|
|
84
|
-
mark.parentNode
|
|
87
|
+
if (mark.parentNode) {
|
|
88
|
+
elementsToNormalize.add(mark.parentNode);
|
|
89
|
+
mark.parentNode?.replaceChild(textNode, mark);
|
|
90
|
+
}
|
|
85
91
|
});
|
|
86
92
|
|
|
87
|
-
|
|
93
|
+
elementsToNormalize.forEach(node => node.normalize());
|
|
88
94
|
|
|
89
95
|
if (!wordsArray.length || wordsArray.every(word => !word)) {
|
|
90
96
|
lastHighlightSignature.current = getTextSignature(element);
|
|
@@ -126,7 +132,7 @@ const TextHighlighter = forwardRef<HTMLDivElement, Props>(({
|
|
|
126
132
|
|
|
127
133
|
if (!pattern) return;
|
|
128
134
|
|
|
129
|
-
const regex = new RegExp(`(${pattern})`, caseSensitive ? 'g' : 'gi');
|
|
135
|
+
const regex = new RegExp(`(${pattern})`, !!caseSensitive ? 'g' : 'gi');
|
|
130
136
|
const parts = text.split(regex);
|
|
131
137
|
|
|
132
138
|
if (parts.length > 1) {
|
|
@@ -137,6 +143,9 @@ const TextHighlighter = forwardRef<HTMLDivElement, Props>(({
|
|
|
137
143
|
|
|
138
144
|
const shouldHighlight = wordsArray.some(word => {
|
|
139
145
|
if (word instanceof RegExp) {
|
|
146
|
+
if (caseSensitive === undefined) {
|
|
147
|
+
return word.test(part);
|
|
148
|
+
}
|
|
140
149
|
const flags = caseSensitive ? word.flags : [...new Set([...word.flags.split(''), 'i'])].join('');
|
|
141
150
|
const testRegex = new RegExp(word.source, flags);
|
|
142
151
|
return testRegex.test(part);
|
|
@@ -209,7 +218,8 @@ const TextHighlighter = forwardRef<HTMLDivElement, Props>(({
|
|
|
209
218
|
observerRef.current.observe(currentRef, {
|
|
210
219
|
childList: true,
|
|
211
220
|
subtree: true,
|
|
212
|
-
characterData: true
|
|
221
|
+
characterData: true,
|
|
222
|
+
attributes: true,
|
|
213
223
|
});
|
|
214
224
|
|
|
215
225
|
return () => {
|