Refactor experimental layout user menu

This commit is contained in:
Bill Thornton 2022-11-28 16:39:13 -05:00
parent a2b111f8e2
commit 7a154fddcd
4 changed files with 70 additions and 54 deletions

View file

@ -10,7 +10,6 @@ import { useApi } from 'hooks/useApi';
import { useLocalStorage } from 'hooks/useLocalStorage';
import AppToolbar from './components/AppToolbar';
import AppUserMenu from './components/AppUserMenu';
import AppDrawer, { DRAWER_WIDTH, isDrawerPath } from './components/drawers/AppDrawer';
import ElevationScroll from './components/ElevationScroll';
import { ExperimentalAppRoutes } from './routes/AppRoutes';
@ -35,9 +34,6 @@ const ExperimentalApp = () => {
const isDrawerAvailable = isDrawerPath(location.pathname);
const isDrawerOpen = isDrawerActive && isDrawerAvailable && Boolean(user);
const [ userMenuAnchorEl, setUserMenuAnchorEl ] = useState<null | HTMLElement>(null);
const isUserMenuOpen = Boolean(userMenuAnchorEl);
useEffect(() => {
if (isDrawerActive !== appSettings.isDrawerPinned) {
setAppSettings({
@ -51,14 +47,6 @@ const ExperimentalApp = () => {
setIsDrawerActive(!isDrawerActive);
}, [ isDrawerActive, setIsDrawerActive ]);
const onUserButtonClick = useCallback((event) => {
setUserMenuAnchorEl(event.currentTarget);
}, [ setUserMenuAnchorEl ]);
const onUserMenuClose = useCallback(() => {
setUserMenuAnchorEl(null);
}, [ setUserMenuAnchorEl ]);
return (
<ThemeProvider theme={theme}>
<Backdrop />
@ -80,7 +68,6 @@ const ExperimentalApp = () => {
<AppToolbar
isDrawerOpen={isDrawerOpen}
onDrawerButtonClick={onToggleDrawer}
onUserButtonClick={onUserButtonClick}
/>
</AppBar>
</ElevationScroll>
@ -120,12 +107,6 @@ const ExperimentalApp = () => {
<ExperimentalAppRoutes />
</div>
</Box>
<AppUserMenu
open={isUserMenuOpen}
anchorEl={userMenuAnchorEl}
onMenuClose={onUserMenuClose}
/>
</Box>
</ThemeProvider>
);