[core] Fix some DashboardLayout bugs and make some docs examples more consis… #3905
Next
Next commit
Fix some DashboardLayout bugs and make some docs examples more consis…
…tent
- Loading branch information
commit cd5ce4bee001f0851ff6356ddcc195a5cde549f0
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,63 @@ | ||
| import * as React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import Box from '@mui/material/Box'; | ||
| import Typography from '@mui/material/Typography'; | ||
| import { extendTheme } from '@mui/material/styles'; | ||
| import DashboardIcon from '@mui/icons-material/Dashboard'; | ||
| import { AppProvider } from '@toolpad/core/AppProvider'; | ||
| import { DashboardLayout } from '@toolpad/core/DashboardLayout'; | ||
|
|
||
| const NAVIGATION = [ | ||
| { | ||
| segment: 'dashboard', | ||
| title: 'Dashboard', | ||
| icon: <DashboardIcon />, | ||
| }, | ||
| ]; | ||
|
|
||
| const demoTheme = extendTheme({ | ||
| breakpoints: { | ||
| values: { | ||
| xs: 0, | ||
| sm: 600, | ||
| md: 600, | ||
| lg: 1200, | ||
| xl: 1536, | ||
| }, | ||
| }, | ||
| }); | ||
|
|
||
| function DemoPageContent({ pathname }) { | ||
| return ( | ||
| <Box | ||
| sx={{ | ||
| py: 4, | ||
| display: 'flex', | ||
| flexDirection: 'column', | ||
| alignItems: 'center', | ||
| textAlign: 'center', | ||
| }} | ||
| > | ||
| <Typography>Dashboard content for {pathname}</Typography> | ||
| </Box> | ||
| ); | ||
| } | ||
|
|
||
| DemoPageContent.propTypes = { | ||
| pathname: PropTypes.string.isRequired, | ||
| }; | ||
|
|
||
| function AccountWithDashboard(props) { | ||
| const { window } = props; | ||
|
|
||
| const [session, setSession] = React.useState({ | ||
| user: { | ||
| name: 'Bharat Kashyap', | ||
| email: '[email protected]', | ||
| image: 'https://avatars.githubusercontent.com/u/19550456', | ||
| }, | ||
| }); | ||
|
|
||
| const authentication = React.useMemo(() => { | ||
| return { | ||
| signIn: () => { | ||
|
|
@@ -27,11 +75,43 @@ export default function AccountWithDashboard() { | |
| }; | ||
| }, []); | ||
|
|
||
| const [pathname, setPathname] = React.useState('/dashboard'); | ||
|
|
||
| const router = React.useMemo(() => { | ||
| return { | ||
| pathname, | ||
| searchParams: new URLSearchParams(), | ||
| navigate: (path) => setPathname(String(path)), | ||
| }; | ||
| }, [pathname]); | ||
|
|
||
| // Remove this const when copying and pasting into your project. | ||
| const demoWindow = window !== undefined ? window() : undefined; | ||
|
|
||
| return ( | ||
| // preview-start | ||
| <AppProvider | ||
| session={session} | ||
| authentication={authentication} | ||
| navigation={NAVIGATION} | ||
| router={router} | ||
| theme={demoTheme} | ||
| window={demoWindow} | ||
| > | ||
| <DashboardLayout> | ||
| <DemoPageContent pathname={pathname} /> | ||
| </DashboardLayout> | ||
| </AppProvider> | ||
| // preview-end | ||
| ); | ||
| } | ||
|
|
||
| AccountWithDashboard.propTypes = { | ||
| /** | ||
| * Injected by the documentation to work in an iframe. | ||
| * Remove this when copying and pasting into your project. | ||
| */ | ||
| window: PropTypes.func, | ||
| }; | ||
|
|
||
| export default AccountWithDashboard; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,67 @@ | ||
| import * as React from 'react'; | ||
| import Box from '@mui/material/Box'; | ||
| import Typography from '@mui/material/Typography'; | ||
| import { extendTheme } from '@mui/material/styles'; | ||
| import DashboardIcon from '@mui/icons-material/Dashboard'; | ||
| import { AppProvider } from '@toolpad/core/AppProvider'; | ||
| import { DashboardLayout } from '@toolpad/core/DashboardLayout'; | ||
| import type { Session, Router, Navigation } from '@toolpad/core'; | ||
|
|
||
| const NAVIGATION: Navigation = [ | ||
| { | ||
| segment: 'dashboard', | ||
| title: 'Dashboard', | ||
| icon: <DashboardIcon />, | ||
| }, | ||
| ]; | ||
|
|
||
| const demoTheme = extendTheme({ | ||
| breakpoints: { | ||
| values: { | ||
| xs: 0, | ||
| sm: 600, | ||
| md: 600, | ||
| lg: 1200, | ||
| xl: 1536, | ||
| }, | ||
| }, | ||
| }); | ||
|
|
||
| function DemoPageContent({ pathname }: { pathname: string }) { | ||
| return ( | ||
| <Box | ||
| sx={{ | ||
| py: 4, | ||
| display: 'flex', | ||
| flexDirection: 'column', | ||
| alignItems: 'center', | ||
| textAlign: 'center', | ||
| }} | ||
| > | ||
| <Typography>Dashboard content for {pathname}</Typography> | ||
| </Box> | ||
| ); | ||
| } | ||
|
|
||
| interface DemoProps { | ||
| /** | ||
| * Injected by the documentation to work in an iframe. | ||
| * Remove this when copying and pasting into your project. | ||
| */ | ||
| window?: () => Window; | ||
| } | ||
|
|
||
| export default function AccountWithDashboard(props: DemoProps) { | ||
| const { window } = props; | ||
|
|
||
| const [session, setSession] = React.useState<Session | null>({ | ||
| user: { | ||
| name: 'Bharat Kashyap', | ||
| email: '[email protected]', | ||
| image: 'https://avatars.githubusercontent.com/u/19550456', | ||
| }, | ||
| }); | ||
|
|
||
| const authentication = React.useMemo(() => { | ||
| return { | ||
| signIn: () => { | ||
|
|
@@ -27,11 +79,33 @@ export default function AccountWithDashboard() { | |
| }; | ||
| }, []); | ||
|
|
||
| const [pathname, setPathname] = React.useState('/dashboard'); | ||
|
|
||
| const router = React.useMemo<Router>(() => { | ||
| return { | ||
| pathname, | ||
| searchParams: new URLSearchParams(), | ||
| navigate: (path) => setPathname(String(path)), | ||
| }; | ||
| }, [pathname]); | ||
|
|
||
| // Remove this const when copying and pasting into your project. | ||
| const demoWindow = window !== undefined ? window() : undefined; | ||
|
|
||
| return ( | ||
| // preview-start | ||
| <AppProvider | ||
| session={session} | ||
| authentication={authentication} | ||
| navigation={NAVIGATION} | ||
| router={router} | ||
| theme={demoTheme} | ||
| window={demoWindow} | ||
| > | ||
| <DashboardLayout> | ||
| <DemoPageContent pathname={pathname} /> | ||
| </DashboardLayout> | ||
| </AppProvider> | ||
| // preview-end | ||
| ); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,12 @@ | ||
| <AppProvider | ||
| session={session} | ||
| authentication={authentication} | ||
| navigation={NAVIGATION} | ||
| router={router} | ||
| theme={demoTheme} | ||
| window={demoWindow} | ||
| > | ||
| <DashboardLayout> | ||
| <DemoPageContent pathname={pathname} /> | ||
| </DashboardLayout> | ||
| </AppProvider> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah it's adding all this boilerplate here too but this way it matches the other examples...