fix highlighted text in searched notes

This commit is contained in:
Martti Malmi
2024-02-29 11:14:17 +02:00
parent 04e7d0b54f
commit 95dc979b8d
14 changed files with 104 additions and 108 deletions

View File

@ -41,7 +41,7 @@ export interface NoteProps {
ignoreModeration?: boolean;
onClick?: (e: TaggedNostrEvent) => void;
depth?: number;
searchedValue?: string;
highlightText?: string;
threadChains?: Map<string, Array<NostrEvent>>;
context?: ReactNode;
options?: NotePropsOptions;

View File

@ -11,7 +11,7 @@ import NoteHeader from "@/Components/Event/Note/NoteHeader";
import NoteQuote from "@/Components/Event/Note/NoteQuote";
import { NoteText } from "@/Components/Event/Note/NoteText";
import { TranslationInfo } from "@/Components/Event/Note/TranslationInfo";
import {NoteTranslation} from "@/Components/Event/Note/types";
import { NoteTranslation } from "@/Components/Event/Note/types";
import Username from "@/Components/User/Username";
import useModeration from "@/Hooks/useModeration";
import { findTag } from "@/Utils";

View File

@ -1,19 +1,19 @@
import {HexKey, NostrLink, NostrPrefix} from "@snort/system";
import {Menu, MenuItem} from "@szhsin/react-menu";
import {useEffect, useState} from "react";
import {FormattedMessage, useIntl} from "react-intl";
import { HexKey, NostrLink, NostrPrefix } from "@snort/system";
import { Menu, MenuItem } from "@szhsin/react-menu";
import { useEffect, useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
import {NoteContextMenuProps, NoteTranslation} from "@/Components/Event/Note/types";
import { NoteContextMenuProps, NoteTranslation } from "@/Components/Event/Note/types";
import Icon from "@/Components/Icons/Icon";
import messages from "@/Components/messages";
import SnortApi from "@/External/SnortApi";
import useEventPublisher from "@/Hooks/useEventPublisher";
import useLogin from "@/Hooks/useLogin";
import useModeration from "@/Hooks/useModeration";
import {setBookmarked, setPinned} from "@/Utils/Login";
import {getCurrentSubscription, SubscriptionType} from "@/Utils/Subscription";
import { setBookmarked, setPinned } from "@/Utils/Login";
import { getCurrentSubscription, SubscriptionType } from "@/Utils/Subscription";
import {ReBroadcaster} from "../../ReBroadcaster";
import { ReBroadcaster } from "../../ReBroadcaster";
export function NoteContextMenu({ ev, ...props }: NoteContextMenuProps) {
const { formatMessage } = useIntl();

View File

@ -7,7 +7,7 @@ import { NoteContextMenu } from "@/Components/Event/Note/NoteContextMenu";
import NoteTime from "@/Components/Event/Note/NoteTime";
import ReactionsModal from "@/Components/Event/Note/ReactionsModal";
import ReplyTag from "@/Components/Event/Note/ReplyTag";
import {NoteTranslation} from "@/Components/Event/Note/types";
import { NoteTranslation } from "@/Components/Event/Note/types";
import Icon from "@/Components/Icons/Icon";
import messages from "@/Components/messages";
import ProfileImage from "@/Components/User/ProfileImage";

View File

@ -3,7 +3,7 @@ import { FormattedMessage } from "react-intl";
import { Link } from "react-router-dom";
import { NoteProps } from "@/Components/Event/EventComponent";
import {NoteTranslation} from "@/Components/Event/Note/types";
import { NoteTranslation } from "@/Components/Event/Note/types";
import Reveal from "@/Components/Event/Reveal";
import Text from "@/Components/Text/Text";
import useLogin from "@/Hooks/useLogin";
@ -40,7 +40,7 @@ export const NoteText = memo(function InnerContent(
{shouldTruncate && showMore && <ToggleShowMore />}
<Text
id={id}
highlighText={props.searchedValue}
highlightText={props.highlightText}
content={body}
tags={ev.tags}
creator={ev.pubkey}

View File

@ -1,7 +1,7 @@
import React from "react";
import { FormattedMessage } from "react-intl";
import {NoteTranslation} from "@/Components/Event/Note/types";
import { NoteTranslation } from "@/Components/Event/Note/types";
import messages from "@/Components/messages";
interface TranslationInfoProps {

View File

@ -1,4 +1,4 @@
import {TaggedNostrEvent} from "@snort/system";
import { TaggedNostrEvent } from "@snort/system";
export interface NoteTranslation {
text: string;
@ -15,4 +15,4 @@ export interface NoteContextMenuProps {
react(content: string): Promise<void>;
onTranslated?: (t: NoteTranslation) => void;
}
}