Merge pull request #149 from alanhamlett/main

Also pass shouldRender the match result

Author: inokawa

src/renderers/regex/index.tsx

@@ -22,16 +22,16 @@ export const createRegexRenderer = (
     | [
         regex: RegExp,
         style: StyleOrRender,
-        shouldRender?: (matchedText: string) => boolean,
+        shouldRender?: (matchedText: string, matchResult: RegExpExecArray) => boolean,
       ]
   )[]
 ): Renderer => {
   const allStyles = matchers.map(([, style]) => style);
 
   return (value) => {
     const [indexSet, startToStyleMap, endToStyleMap] = matchers.reduce(
-      (acc, [matcher, style, shouldRender]) => {
-        execReg(matcher, value, shouldRender).forEach((m) => {
+      (acc, [regex, style, shouldRender]) => {
+        execReg(regex, value, shouldRender).forEach((m) => {
           const start = m.index;
           const end = m.index + m[0]!.length;
 

src/renderers/regex/utils.ts

@@ -4,12 +4,12 @@
 export const execReg = (
   reg: RegExp,
   text: string,
-  shouldRender?: (matchedText: string) => boolean
+  shouldRender?: (matchedText: string, matchResult: RegExpExecArray) => boolean
 ): RegExpExecArray[] => {
   const results: RegExpExecArray[] = [];
   let match: RegExpExecArray | null = null;
   while ((match = reg.exec(text))) {
-    if (shouldRender && !shouldRender(text)) {
+    if (shouldRender && !shouldRender(text, match)) {
       continue;
     }
     results.push(match);