Commit 89d66619 authored by Michelle Nguyen's avatar Michelle Nguyen
Browse files

PC-701 Move tour overlay out of profile menu button

Summary:
currently whenever you click the tour overlay, it keeps opening the profile menu.
this is because the tour dialog is nested in the profile menu. it doesnt need to be, so this diff moves it out

Test Plan: ran yarn dev

Reviewers: zasgar, nserrino, vihang, philkuz, #engineering

Reviewed By: zasgar, #engineering

Differential Revision: https://phab.corp.pixielabs.ai/D6917

GitOrigin-RevId: 06a6079b5b5b38af663e5e20e9feef90a1be31ff
parent bbb2df09
Showing with 65 additions and 63 deletions
+65 -63
......@@ -265,72 +265,74 @@ const ProfileItem = ({
}, [id, email]);
return (
<ListItem button onClick={openMenu} key='Profile' className={classes.profileIcon}>
<>
<LiveTourDialog onClose={closeTour} />
<ListItemIcon>
<Avatar
<ListItem button onClick={openMenu} key='Profile' className={classes.profileIcon}>
<ListItemIcon>
<Avatar
name={name}
picture={picture}
className={classes.avatarSm}
/>
</ListItemIcon>
<ListItemText
primary={name}
secondary={email}
classes={{ primary: classes.profileText, secondary: classes.profileText }}
/>
<ProfileMenuWrapper
classes={classes}
open={open}
onCloseMenu={closeMenu}
anchorEl={anchorEl}
anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
name={name}
email={email}
picture={picture}
className={classes.avatarSm}
/>
</ListItemIcon>
<ListItemText
primary={name}
secondary={email}
classes={{ primary: classes.profileText, secondary: classes.profileText }}
/>
<ProfileMenuWrapper
classes={classes}
open={open}
onCloseMenu={closeMenu}
anchorEl={anchorEl}
anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
name={name}
email={email}
picture={picture}
>
<MenuItem key='admin' button component={Link} to='/admin'>
<StyledListItemIcon>
<SettingsIcon />
</StyledListItemIcon>
<StyledListItemText primary='Admin' />
</MenuItem>
{
inLiveView && (
[
(
<MenuItem key='tour' button component='button' onClick={openTour} className={classes.hideOnMobile}>
<StyledListItemIcon>
<ExploreIcon />
</StyledListItemIcon>
<StyledListItemText primary='Tour' />
</MenuItem>
),
(
<MenuItem key='shortcuts' button component='button' onClick={() => shortcuts['show-help'].handler()}>
<StyledListItemIcon>
<KeyboardIcon />
</StyledListItemIcon>
<StyledListItemText primary='Keyboard Shortcuts' />
</MenuItem>
),
]
)
}
<MenuItem key='credits' button component={Link} to='/credits'>
<StyledListItemIcon>
<CodeIcon />
</StyledListItemIcon>
<StyledListItemText primary='Credits' />
</MenuItem>
<MenuItem key='logout' button component={Link} to='/logout'>
<StyledListItemIcon>
<LogoutIcon />
</StyledListItemIcon>
<StyledListItemText primary='Logout' />
</MenuItem>
</ProfileMenuWrapper>
</ListItem>
>
<MenuItem key='admin' button component={Link} to='/admin'>
<StyledListItemIcon>
<SettingsIcon />
</StyledListItemIcon>
<StyledListItemText primary='Admin' />
</MenuItem>
{
inLiveView && (
[
(
<MenuItem key='tour' button component='button' onClick={openTour} className={classes.hideOnMobile}>
<StyledListItemIcon>
<ExploreIcon />
</StyledListItemIcon>
<StyledListItemText primary='Tour' />
</MenuItem>
),
(
<MenuItem key='shortcuts' button component='button' onClick={() => shortcuts['show-help'].handler()}>
<StyledListItemIcon>
<KeyboardIcon />
</StyledListItemIcon>
<StyledListItemText primary='Keyboard Shortcuts' />
</MenuItem>
),
]
)
}
<MenuItem key='credits' button component={Link} to='/credits'>
<StyledListItemIcon>
<CodeIcon />
</StyledListItemIcon>
<StyledListItemText primary='Credits' />
</MenuItem>
<MenuItem key='logout' button component={Link} to='/logout'>
<StyledListItemIcon>
<LogoutIcon />
</StyledListItemIcon>
<StyledListItemText primary='Logout' />
</MenuItem>
</ProfileMenuWrapper>
</ListItem>
</>
);
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment