diff --git a/packages/app/src/Components/Event/Note/Note.tsx b/packages/app/src/Components/Event/Note/Note.tsx index addcfc22..b30a33f8 100644 --- a/packages/app/src/Components/Event/Note/Note.tsx +++ b/packages/app/src/Components/Event/Note/Note.tsx @@ -11,6 +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 Username from "@/Components/User/Username"; import useModeration from "@/Hooks/useModeration"; import { findTag } from "@/Utils"; @@ -21,7 +22,6 @@ import Text from "../../Text/Text"; import { NoteProps } from "../EventComponent"; import HiddenNote from "../HiddenNote"; import Poll from "../Poll"; -import { NoteTranslation } from "./NoteContextMenu"; import NoteFooter from "./NoteFooter/NoteFooter"; const defaultOptions = { diff --git a/packages/app/src/Components/Event/Note/NoteContextMenu.tsx b/packages/app/src/Components/Event/Note/NoteContextMenu.tsx index de4c7a76..c672e9a2 100644 --- a/packages/app/src/Components/Event/Note/NoteContextMenu.tsx +++ b/packages/app/src/Components/Event/Note/NoteContextMenu.tsx @@ -1,34 +1,21 @@ -import { HexKey, NostrLink, NostrPrefix, TaggedNostrEvent } 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 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 interface NoteTranslation { - text: string; - fromLanguage: string; - confidence: number; - skipped?: boolean; -} - -interface NosteContextMenuProps { - ev: TaggedNostrEvent; - setShowReactions(b: boolean): void; - react(content: string): Promise; - onTranslated?: (t: NoteTranslation) => void; -} - -export function NoteContextMenu({ ev, ...props }: NosteContextMenuProps) { +export function NoteContextMenu({ ev, ...props }: NoteContextMenuProps) { const { formatMessage } = useIntl(); const login = useLogin(); const { mute, block } = useModeration(); diff --git a/packages/app/src/Components/Event/Note/NoteHeader.tsx b/packages/app/src/Components/Event/Note/NoteHeader.tsx index 789e805c..8383c183 100644 --- a/packages/app/src/Components/Event/Note/NoteHeader.tsx +++ b/packages/app/src/Components/Event/Note/NoteHeader.tsx @@ -3,10 +3,11 @@ import React, { useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; import { NotePropsOptions } from "@/Components/Event/EventComponent"; -import { NoteContextMenu, NoteTranslation } from "@/Components/Event/Note/NoteContextMenu"; +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 Icon from "@/Components/Icons/Icon"; import messages from "@/Components/messages"; import ProfileImage from "@/Components/User/ProfileImage"; diff --git a/packages/app/src/Components/Event/Note/NoteText.tsx b/packages/app/src/Components/Event/Note/NoteText.tsx index 6ac286ad..13fd1ac8 100644 --- a/packages/app/src/Components/Event/Note/NoteText.tsx +++ b/packages/app/src/Components/Event/Note/NoteText.tsx @@ -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/NoteContextMenu"; +import {NoteTranslation} from "@/Components/Event/Note/types"; import Reveal from "@/Components/Event/Reveal"; import Text from "@/Components/Text/Text"; import useLogin from "@/Hooks/useLogin"; diff --git a/packages/app/src/Components/Event/Note/TranslationInfo.tsx b/packages/app/src/Components/Event/Note/TranslationInfo.tsx index 62b034fe..a88165bc 100644 --- a/packages/app/src/Components/Event/Note/TranslationInfo.tsx +++ b/packages/app/src/Components/Event/Note/TranslationInfo.tsx @@ -1,7 +1,7 @@ import React from "react"; import { FormattedMessage } from "react-intl"; -import { NoteTranslation } from "@/Components/Event/Note/NoteContextMenu"; +import {NoteTranslation} from "@/Components/Event/Note/types"; import messages from "@/Components/messages"; interface TranslationInfoProps { diff --git a/packages/app/src/Components/Event/Note/types.tsx b/packages/app/src/Components/Event/Note/types.tsx new file mode 100644 index 00000000..7accb27d --- /dev/null +++ b/packages/app/src/Components/Event/Note/types.tsx @@ -0,0 +1,18 @@ +import {TaggedNostrEvent} from "@snort/system"; + +export interface NoteTranslation { + text: string; + fromLanguage: string; + confidence: number; + skipped?: boolean; +} + +export interface NoteContextMenuProps { + ev: TaggedNostrEvent; + + setShowReactions(b: boolean): void; + + react(content: string): Promise; + + onTranslated?: (t: NoteTranslation) => void; +} \ No newline at end of file