Merge pull request 'feat: highlight search results' (#625) from ferna…

…ndoporazzi/snort:highlight-searched-word into main Reviewed-on: https://git.v0l.io/Kieran/snort/pulls/625
v0l · Sep 29, 2023 · 1d1e888 · 1d1e888
2 parents 60326ea + a082464
commit 1d1e888
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 3 deletions.
diff --git a/packages/app/src/Element/Event/Note.tsx b/packages/app/src/Element/Event/Note.tsx
@@ -49,6 +49,7 @@ export interface NoteProps {
   ignoreModeration?: boolean;
   onClick?: (e: TaggedNostrEvent) => void;
   depth?: number;
+  searchedValue?: string;
   options?: {
     showHeader?: boolean;
     showContextMenu?: boolean;
@@ -206,6 +207,7 @@ export function NoteInner(props: NoteProps) {
             <Text
               id={ev.id}
               content={ev.content}
+              highlighText={props.searchedValue}
               tags={ev.tags}
               creator={ev.pubkey}
               depth={props.depth}
@@ -222,6 +224,7 @@ export function NoteInner(props: NoteProps) {
       return (
         <Text
           id={ev.id}
+          highlighText={props.searchedValue}
           content={body}
           tags={ev.tags}
           creator={ev.pubkey}

diff --git a/packages/app/src/Element/Feed/Timeline.tsx b/packages/app/src/Element/Feed/Timeline.tsx
@@ -107,7 +107,7 @@ const Timeline = (props: TimelineProps) => {
         </>
       )}
       {mainFeed.map(e => (
-        <Note key={e.id} data={e} related={relatedFeed(e.id)} ignoreModeration={props.ignoreModeration} depth={0} />
+        <Note key={e.id} searchedValue={props.subject.discriminator} data={e} related={relatedFeed(e.id)} ignoreModeration={props.ignoreModeration} depth={0} />
       ))}
       {(props.loadMore === undefined || props.loadMore === true) && (
         <div className="flex f-center">

diff --git a/packages/app/src/Element/HighlightedText.tsx b/packages/app/src/Element/HighlightedText.tsx
@@ -0,0 +1,9 @@
+const HighlightedText = ({ content }: { content: string }) => {
+  return (
+    <strong className="highlighted-text">
+      {content}
+    </strong>
+  );
+};
+
+export default HighlightedText;
diff --git a/packages/app/src/Element/Text.tsx b/packages/app/src/Element/Text.tsx
@@ -9,6 +9,7 @@ import CashuNuts from "Element/Embed/CashuNuts";
 import RevealMedia from "./Event/RevealMedia";
 import { ProxyImg } from "./ProxyImg";
 import { SpotlightMediaModal } from "./Deck/SpotlightMedia";
+import HighlightedText from "./HighlightedText";
 import { useTextTransformer } from "Hooks/useTextTransformCache";
 
 export interface TextProps {
@@ -22,6 +23,7 @@ export interface TextProps {
   depth?: number;
   truncate?: number;
   className?: string;
+  highlighText?: string;
   onClick?: (e: React.MouseEvent) => void;
 }
 
@@ -36,6 +38,7 @@ export default function Text({
   disableLinkPreview,
   truncate,
   className,
+  highlighText,
   onClick,
 }: TextProps) {
   const [showSpotlight, setShowSpotlight] = useState(false);
@@ -45,6 +48,35 @@ export default function Text({
 
   const images = elements.filter(a => a.type === "media" && a.mimeType?.startsWith("image")).map(a => a.content);
 
+  function renderContentWithHighlightedText(content: string, textToHighlight: string) {
+    const textToHighlightArray = textToHighlight.trim().toLowerCase().split(' ');
+    const re = new RegExp(`(${textToHighlightArray.join('|')})`, 'gi');
+    const splittedContent = content.split(re);
+
+    const fragments = splittedContent.map(c => {
+      if (textToHighlightArray.includes(c.toLowerCase())) {
+        return {
+          type: 'highlighted_text',
+          content: c,
+        } as ParsedFragment;
+      }
+
+      return c;
+    })
+
+    return (
+      <>
+        {fragments.map(f => {
+          if (typeof f === "string") {
+            return f;
+          }
+
+          return <HighlightedText content={f.content} />;
+        })}
+      </>
+    );
+  }
+
   const renderContent = () => {
     let lenCtr = 0;
     function renderChunk(a: ParsedFragment) {
@@ -96,7 +128,9 @@ export default function Text({
           case "custom_emoji":
             return <ProxyImg src={a.content} size={15} className="custom-emoji" />;
           default:
-            return <div className="text-frag">{a.content}</div>;
+            return <div className="text-frag">
+              {highlighText ? renderContentWithHighlightedText(a.content, highlighText) : a.content}
+            </div>;
         }
       }
     }

diff --git a/packages/app/src/Pages/DonatePage.tsx b/packages/app/src/Pages/DonatePage.tsx
@@ -27,6 +27,7 @@ const Contributors = [
   bech32ToHex("npub179rec9sw2a5ngkr2wsjpjhwp2ksygjxn6uw5py9daj2ezhw3aw5swv3s6q"), // h3y6e - JA + other stuff
   bech32ToHex("npub17q5n2z8naw0xl6vu9lvt560lg33pdpe29k0k09umlfxm3vc4tqrq466f2y"), // w3irdrobot
   bech32ToHex("npub1ltx67888tz7lqnxlrg06x234vjnq349tcfyp52r0lstclp548mcqnuz40t"), // Vivek
+  bech32ToHex("npub1wh30wunfpkezx5s7edqu9g0s0raeetf5dgthzm0zw7sk8wqygmjqqfljgh"), // Fernando Porazzi
 ];
 
 const Translators = [

diff --git a/packages/system/src/text.ts b/packages/system/src/text.ts
@@ -5,7 +5,7 @@ import { validateNostrLink } from "./nostr-link";
 import { splitByUrl } from "./utils";
 
 export interface ParsedFragment {
-  type: "text" | "link" | "mention" | "invoice" | "media" | "cashu" | "hashtag" | "custom_emoji";
+  type: "text" | "link" | "mention" | "invoice" | "media" | "cashu" | "hashtag" | "custom_emoji" | "highlighted_text";
   content: string;
   mimeType?: string;
 }