From e2a317a769b455dec165373d1e7d3cf9643d5966 Mon Sep 17 00:00:00 2001 From: southclaws Date: Tue, 26 Dec 2023 22:19:59 +0000 Subject: [PATCH] remove chakra menu --- .../components/thread/PostMenu/PostMenu.tsx | 98 ++++++++++++------- web/src/theme/components/index.ts | 10 -- 2 files changed, 63 insertions(+), 45 deletions(-) diff --git a/web/src/components/thread/PostMenu/PostMenu.tsx b/web/src/components/thread/PostMenu/PostMenu.tsx index 994cd1ca1..ee6f4db70 100644 --- a/web/src/components/thread/PostMenu/PostMenu.tsx +++ b/web/src/components/thread/PostMenu/PostMenu.tsx @@ -1,5 +1,6 @@ "use client"; +import { Portal } from "@ark-ui/react"; import { LinkIcon, PencilIcon, TrashIcon } from "@heroicons/react/24/outline"; import { ShareIcon } from "@heroicons/react/24/solid"; import format from "date-fns/format"; @@ -8,12 +9,16 @@ import { PostProps } from "src/api/openapi/schemas"; import { MoreAction } from "src/components/site/Action/More"; import { Menu, - MenuButton, - MenuDivider, - MenuGroup, + MenuContent, MenuItem, - MenuList, -} from "src/theme/components"; + MenuItemGroup, + MenuItemGroupLabel, + MenuPositioner, + MenuSeparator, + MenuTrigger, +} from "src/theme/components/Menu"; + +import { HStack, styled } from "@/styled-system/jsx"; import { usePostMenu } from "./usePostMenu"; @@ -29,42 +34,65 @@ export function PostMenu(props: PostProps) { } = usePostMenu(props); return ( - - + + - - - - - {format(new Date(props.createdAt), "yyyy-mm-dd")} - - - + + + + + + + + {`Post by ${props.author.name}`} + + + {format(new Date(props.createdAt), "yyyy-mm-dd")} + + + + - } onClick={onCopyLink}> - Copy link - + + + Copy link + + - {shareEnabled && ( - } onClick={onShare}> - Share - - )} + {shareEnabled && ( + + + Share + + + )} - {/* Reply */} + {/* Reply */} - {editEnabled && ( - } onClick={onEdit}> - Edit - - )} + {editEnabled && ( + + + Edit + + + )} - {deleteEnabled && ( - } onClick={onDelete}> - Delete - - )} - + {deleteEnabled && ( + + + Delete + + + )} + + + + ); } diff --git a/web/src/theme/components/index.ts b/web/src/theme/components/index.ts index 38be6428b..7563e68ba 100644 --- a/web/src/theme/components/index.ts +++ b/web/src/theme/components/index.ts @@ -1,10 +1,4 @@ import { - Menu, - MenuButton, - MenuDivider, - MenuGroup, - MenuItem, - MenuList, Popover, PopoverArrow, PopoverBody, @@ -14,10 +8,6 @@ import { // NOTE: These are being replaced gradually, so these are being re-exported. -// Menu - -export { Menu, MenuButton, MenuDivider, MenuGroup, MenuItem, MenuList }; - // Popover export { Popover, PopoverArrow, PopoverBody, PopoverContent, PopoverTrigger };