bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use MenuItem if action

Browse source
This commit is contained in:
Justin 2022-03-21 16:29:33 -04:00
parent e02d5142e5
commit b6985f836a
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/soapbox/features/account/components/header.js
View file

@ -14,7 +14,7 @@ import { openModal } from 'soapbox/actions/modals';
import Avatar from 'soapbox/components/avatar'; import Avatar from 'soapbox/components/avatar';
import Badge from 'soapbox/components/badge'; import Badge from 'soapbox/components/badge';
import StillImage from 'soapbox/components/still_image'; import StillImage from 'soapbox/components/still_image';
import { HStack, IconButton, Menu, MenuButton, MenuList, MenuLink, MenuDivider } from 'soapbox/components/ui'; import { HStack, IconButton, Menu, MenuButton, MenuItem, MenuList, MenuLink, MenuDivider } from 'soapbox/components/ui';
import ActionButton from 'soapbox/features/ui/components/action_button'; import ActionButton from 'soapbox/features/ui/components/action_button';
import { import {
isStaff, isStaff,
@ -346,7 +346,8 @@ class Header extends ImmutablePureComponent {
if (isAdmin(meAccount)) { if (isAdmin(meAccount)) {
menu.push({ menu.push({
text: intl.formatMessage(messages.admin_account, { name: account.get('username') }), text: intl.formatMessage(messages.admin_account, { name: account.get('username') }),
href: `/pleroma/admin/#/users/${account.get('id')}/`, newTab: true, to: `/pleroma/admin/#/users/${account.id}/`,
newTab: true,
icon: require('@tabler/icons/icons/gavel.svg'), icon: require('@tabler/icons/icons/gavel.svg'),
}); });
} }
@ -610,20 +611,23 @@ class Header extends ImmutablePureComponent {
if (typeof menuItem?.text === 'undefined') { if (typeof menuItem?.text === 'undefined') {
return <MenuDivider key={idx} />; return <MenuDivider key={idx} />;
} else { } else {
const Comp = menuItem.action ? MenuItem : MenuLink;
// TODO: Add `as: Link` once React Router is upgraded.
const itemProps = menuItem.action ? { onSelect: menuItem.action } : { to: menuItem.to, target: menuItem.newTab ? '_blank' : '_self' };
return ( return (
<MenuLink key={idx} href={menuItem.to} onClick={menuItem.action} className='group'> <Comp key={idx} {...itemProps} className='group'>
<div className='flex items-center'> <div className='flex items-center'>
<InlineSVG src={menuItem.icon} className='mr-3 h-5 w-5 text-gray-400 group-hover:text-gray-500' /> <InlineSVG src={menuItem.icon} className='mr-3 h-5 w-5 text-gray-400 group-hover:text-gray-500' />
<div className='truncate'>{menuItem.text}</div> <div className='truncate'>{menuItem.text}</div>
</div> </div>
</MenuLink> </Comp>
); );
} }
})} })}
</MenuList> </MenuList>
</Menu> </Menu>
)} )}
{this.renderShareButton()} {this.renderShareButton()}