all repos — caroster @ 2d7b6d7c0ba20bc08a603a1c18f604608f552eaf

[Octree] Group carpool to your event https://caroster.io

fixup! :lipstick: add a divider in menus to isolate about menu item
Hadrien Froger hadrien@octree.ch
Tue, 08 Sep 2020 07:23:44 +0100
commit

2d7b6d7c0ba20bc08a603a1c18f604608f552eaf

parent

d13e528834a43efd386673182cc0647513e3b821

1 files changed, 24 insertions(+), 13 deletions(-)

jump to
M app/src/containers/EventMenu/index.jsapp/src/containers/EventMenu/index.js

@@ -1,18 +1,20 @@

import React from 'react'; import Menu from '@material-ui/core/Menu'; import MenuItem from '@material-ui/core/MenuItem'; +import {makeStyles} from '@material-ui/core/styles'; import {useTranslation} from 'react-i18next'; import {useStrapi} from 'strapi-react-context'; const EventMenu = ({anchorEl, setAnchorEl, actions = []}) => { const {t} = useTranslation(); const strapi = useStrapi(); + const classes = useStyles(); const [settings] = strapi.stores?.settings || [{}]; - const aboutMenuItem = { label: t('menu.about'), onClick: () => (window.location.href = settings['about_link']), id: 'AboutTabs', + className: classes.withDivider, }; return (

@@ -31,19 +33,28 @@ open={!!anchorEl}

onClose={() => setAnchorEl(null)} > {actions && - [...actions, aboutMenuItem].filter(Boolean).map((action, idx) => ( - <MenuItem - onClick={() => { - action.onClick(); - setAnchorEl(null); - }} - key={idx} - id={action.id || `MenuItem${idx}`} - > - {action.label} - </MenuItem> - ))} + [...actions, aboutMenuItem] + .filter(Boolean) + .map(({label, id, onClick, ...attributes}, idx) => ( + <MenuItem + onClick={() => { + onClick(); + setAnchorEl(null); + }} + key={idx} + id={id || `MenuItem${idx}`} + {...attributes} + > + {label} + </MenuItem> + ))} </Menu> ); }; + +const useStyles = makeStyles(theme => ({ + withDivider: { + borderTop: `1px solid ${theme.palette.divider}`, + }, +})); export default EventMenu;