diff --git a/apps/desktop2/src/components/note/buttons/repost.tsx b/apps/desktop2/src/components/note/buttons/repost.tsx
index 66730cce..b8e840bf 100644
--- a/apps/desktop2/src/components/note/buttons/repost.tsx
+++ b/apps/desktop2/src/components/note/buttons/repost.tsx
@@ -1,24 +1,23 @@
-import { QuoteIcon, RepostIcon } from "@lume/icons";
+import { RepostIcon } from "@lume/icons";
import { cn } from "@lume/utils";
-import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
-import * as Tooltip from "@radix-ui/react-tooltip";
-import { useState } from "react";
+import { useCallback, useState } from "react";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
import { Spinner } from "@lume/ui";
import { useNoteContext } from "../provider";
import { LumeWindow } from "@lume/system";
+import { Menu, MenuItem } from "@tauri-apps/api/menu";
export function NoteRepost({ large = false }: { large?: boolean }) {
const event = useNoteContext();
- const [t] = useTranslation();
const [loading, setLoading] = useState(false);
const [isRepost, setIsRepost] = useState(false);
const repost = async () => {
+ if (isRepost) return;
+
try {
- if (isRepost) return;
setLoading(true);
// repost
@@ -30,71 +29,50 @@ export function NoteRepost({ large = false }: { large?: boolean }) {
// notify
toast.success("You've reposted this post successfully");
- } catch (e) {
+ } catch {
setLoading(false);
toast.error("Repost failed, try again later");
}
};
+ const showContextMenu = useCallback(async (e: React.MouseEvent) => {
+ e.preventDefault();
+
+ const menuItems = await Promise.all([
+ MenuItem.new({
+ text: "Quote",
+ action: async () => repost(),
+ }),
+ MenuItem.new({
+ text: "Repost",
+ action: () => LumeWindow.openEditor(null, event.id),
+ }),
+ ]);
+
+ const menu = await Menu.new({
+ items: menuItems,
+ });
+
+ await menu.popup().catch((e) => console.error(e));
+ }, []);
+
return (
-
-
-
-
-
-
-
-
-
-
- {t("note.buttons.repost")}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
);
}
diff --git a/apps/desktop2/src/components/note/menu.tsx b/apps/desktop2/src/components/note/menu.tsx
index a0728a41..4ab542cd 100644
--- a/apps/desktop2/src/components/note/menu.tsx
+++ b/apps/desktop2/src/components/note/menu.tsx
@@ -1,100 +1,62 @@
import { HorizontalDotsIcon } from "@lume/icons";
-import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
import { writeText } from "@tauri-apps/plugin-clipboard-manager";
-import { useTranslation } from "react-i18next";
import { useNoteContext } from "./provider";
-import { LumeWindow } from "@lume/system";
+import { useCallback } from "react";
+import { Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/api/menu";
export function NoteMenu() {
- const { t } = useTranslation();
const event = useNoteContext();
- const copyID = async () => {
- await writeText(await event.idAsBech32());
- };
+ const showContextMenu = useCallback(async (e: React.MouseEvent) => {
+ e.preventDefault();
- const copyRaw = async () => {
- await writeText(JSON.stringify(event));
- };
+ const menuItems = await Promise.all([
+ MenuItem.new({
+ text: "Copy Sharable Link",
+ action: async () => {
+ const eventId = await event.idAsBech32();
+ await writeText(`https://njump.me/${eventId}`);
+ },
+ }),
+ MenuItem.new({
+ text: "Copy Event ID",
+ action: async () => {
+ const eventId = await event.idAsBech32();
+ await writeText(eventId);
+ },
+ }),
+ MenuItem.new({
+ text: "Copy Public Key",
+ action: async () => {
+ const pubkey = await event.pubkeyAsBech32();
+ await writeText(pubkey);
+ },
+ }),
+ PredefinedMenuItem.new({ item: "Separator" }),
+ MenuItem.new({
+ text: "Copy Raw Event",
+ action: async () => {
+ event.meta = undefined;
+ const raw = JSON.stringify(event);
+ await writeText(raw);
+ },
+ }),
+ ]);
- const copyNpub = async () => {
- await writeText(await event.pubkeyAsBech32());
- };
+ const menu = await Menu.new({
+ items: menuItems,
+ });
- const copyLink = async () => {
- await writeText(`https://njump.me/${await event.idAsBech32()}`);
- };
+ await menu.popup().catch((e) => console.error(e));
+ }, []);
return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
);
}
diff --git a/apps/desktop2/src/routes/editor/-components/mention.tsx b/apps/desktop2/src/routes/editor/-components/mention.tsx
deleted file mode 100644
index 09c8b7b4..00000000
--- a/apps/desktop2/src/routes/editor/-components/mention.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import { MentionIcon } from "@lume/icons";
-import { cn, insertMention } from "@lume/utils";
-import * as Tooltip from "@radix-ui/react-tooltip";
-import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
-import { useEffect, useState } from "react";
-import { useSlateStatic } from "slate-react";
-import type { Contact } from "@lume/types";
-import { toast } from "sonner";
-import { User } from "@/components/user";
-import { NostrAccount, NostrQuery } from "@lume/system";
-
-export function MentionButton({ className }: { className?: string }) {
- const editor = useSlateStatic();
- const [contacts, setContacts] = useState([]);
-
- const select = async (user: string) => {
- try {
- const metadata = await NostrQuery.getProfile(user);
- const contact: Contact = { pubkey: user, profile: metadata };
-
- insertMention(editor, contact);
- } catch (e) {
- toast.error(String(e));
- }
- };
-
- useEffect(() => {
- async function getContacts() {
- const data = await NostrAccount.getContactList();
- setContacts(data);
- }
-
- getContacts();
- }, []);
-
- return (
-
-
-
-
-
-
-
-
-
-
- Mention
-
-
-
-
-
-
-
- {contacts.length < 1 ? (
-
-
Contact List is empty.
-