diff --git a/src/components/dropdown-menu/dropdown-menu.tsx b/src/components/dropdown-menu/dropdown-menu.tsx index 821a3bbf7d..fc61a4e8ad 100644 --- a/src/components/dropdown-menu/dropdown-menu.tsx +++ b/src/components/dropdown-menu/dropdown-menu.tsx @@ -86,9 +86,6 @@ const DropdownMenu = (props: IDropdownMenu) => { } }; - /** - * On mobile screens, let's replace the Popper dropdown with a Modal. - */ const handleOpen = () => { dispatch(openDropdownMenu()); setIsOpen(true); diff --git a/src/features/event/components/event-header.tsx b/src/features/event/components/event-header.tsx index 6214fcdf20..1ce4028675 100644 --- a/src/features/event/components/event-header.tsx +++ b/src/features/event/components/event-header.tsx @@ -12,10 +12,10 @@ import { deleteStatusModal, toggleStatusSensitivityModal } from 'soapbox/actions import { initMuteModal } from 'soapbox/actions/mutes'; import { initReport, ReportableEntities } from 'soapbox/actions/reports'; import { deleteStatus } from 'soapbox/actions/statuses'; +import DropdownMenu, { type Menu as MenuType } from 'soapbox/components/dropdown-menu'; import Icon from 'soapbox/components/icon'; import StillImage from 'soapbox/components/still-image'; -import { Button, HStack, IconButton, Menu, MenuButton, MenuDivider, MenuItem, MenuLink, MenuList, Stack, Text } from 'soapbox/components/ui'; -import SvgIcon from 'soapbox/components/ui/icon/svg-icon'; +import { Button, HStack, IconButton, Stack, Text } from 'soapbox/components/ui'; import VerificationBadge from 'soapbox/components/verification-badge'; import { useAppDispatch, useFeatures, useOwnAccount, useSettings } from 'soapbox/hooks'; import { useChats } from 'soapbox/queries/chats'; @@ -27,7 +27,6 @@ import PlaceholderEventHeader from '../../placeholder/components/placeholder-eve import EventActionButton from '../components/event-action-button'; import EventDate from '../components/event-date'; -import type { Menu as MenuType } from 'soapbox/components/dropdown-menu'; import type { Status as StatusEntity } from 'soapbox/types/entities'; const messages = defineMessages({ @@ -379,39 +378,17 @@ const EventHeader: React.FC = ({ status }) => { {event.name} - - + + - - {makeMenu().map((menuItem, idx) => { - if (typeof menuItem?.text === 'undefined') { - return ; - } else { - const Comp = (menuItem.href ? MenuLink : MenuItem) as any; - const itemProps = menuItem.href ? { href: menuItem.href, target: menuItem.target || '_self' } : { onSelect: menuItem.action }; - - return ( - -
- {menuItem.icon && ( - - )} - -
{menuItem.text}
-
-
- ); - } - })} -
-
{account.id === ownAccount?.id ? (