update,
This commit is contained in:
@@ -35,9 +35,7 @@ const flattenNavItems = (navItems: NavItem[], parentGroup?: string): OutputItem[
|
||||
};
|
||||
|
||||
export function flattenNavSections(navSections: NavSectionProps['data']): OutputItem[] {
|
||||
return navSections.flatMap((navSection) =>
|
||||
flattenNavItems(navSection.items, navSection.subheader)
|
||||
);
|
||||
return navSections.flatMap((navSection) => flattenNavItems(navSection.items, navSection.subheader));
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
@@ -50,7 +48,5 @@ type ApplyFilterProps = {
|
||||
export function applyFilter({ inputData, query }: ApplyFilterProps): OutputItem[] {
|
||||
if (!query) return inputData;
|
||||
|
||||
return inputData.filter(({ title, path, group }) =>
|
||||
[title, path, group].some((field) => field?.toLowerCase().includes(query.toLowerCase()))
|
||||
);
|
||||
return inputData.filter(({ title, path, group }) => [title, path, group].some((field) => field?.toLowerCase().includes(query.toLowerCase())));
|
||||
}
|
||||
|
@@ -50,13 +50,7 @@ export type DashboardLayoutProps = LayoutBaseProps & {
|
||||
};
|
||||
};
|
||||
|
||||
export function DashboardLayout({
|
||||
sx,
|
||||
cssVars,
|
||||
children,
|
||||
slotProps,
|
||||
layoutQuery = 'lg',
|
||||
}: DashboardLayoutProps) {
|
||||
export function DashboardLayout({ sx, cssVars, children, slotProps, layoutQuery = 'lg' }: DashboardLayoutProps) {
|
||||
const theme = useTheme();
|
||||
|
||||
const { user } = useMockedUser();
|
||||
@@ -73,8 +67,7 @@ export function DashboardLayout({
|
||||
const isNavHorizontal = settings.state.navLayout === 'horizontal';
|
||||
const isNavVertical = isNavMini || settings.state.navLayout === 'vertical';
|
||||
|
||||
const canDisplayItemByRole = (allowedRoles: NavItemProps['allowedRoles']): boolean =>
|
||||
!allowedRoles?.includes(user?.role);
|
||||
const canDisplayItemByRole = (allowedRoles: NavItemProps['allowedRoles']): boolean => !allowedRoles?.includes(user?.role);
|
||||
|
||||
const renderHeader = () => {
|
||||
const headerSlotProps: HeaderSectionProps['slotProps'] = {
|
||||
@@ -98,27 +91,13 @@ export function DashboardLayout({
|
||||
</Alert>
|
||||
),
|
||||
bottomArea: isNavHorizontal ? (
|
||||
<NavHorizontal
|
||||
data={navData}
|
||||
layoutQuery={layoutQuery}
|
||||
cssVars={navVars.section}
|
||||
checkPermissions={canDisplayItemByRole}
|
||||
/>
|
||||
<NavHorizontal data={navData} layoutQuery={layoutQuery} cssVars={navVars.section} checkPermissions={canDisplayItemByRole} />
|
||||
) : null,
|
||||
leftArea: (
|
||||
<>
|
||||
{/** @slot Nav mobile */}
|
||||
<MenuButton
|
||||
onClick={onOpen}
|
||||
sx={{ mr: 1, ml: -1, [theme.breakpoints.up(layoutQuery)]: { display: 'none' } }}
|
||||
/>
|
||||
<NavMobile
|
||||
data={navData}
|
||||
open={open}
|
||||
onClose={onClose}
|
||||
cssVars={navVars.section}
|
||||
checkPermissions={canDisplayItemByRole}
|
||||
/>
|
||||
<MenuButton onClick={onOpen} sx={{ mr: 1, ml: -1, [theme.breakpoints.up(layoutQuery)]: { display: 'none' } }} />
|
||||
<NavMobile data={navData} open={open} onClose={onClose} cssVars={navVars.section} checkPermissions={canDisplayItemByRole} />
|
||||
|
||||
{/** @slot Logo */}
|
||||
{isNavHorizontal && (
|
||||
@@ -131,15 +110,10 @@ export function DashboardLayout({
|
||||
)}
|
||||
|
||||
{/** @slot Divider */}
|
||||
{isNavHorizontal && (
|
||||
<VerticalDivider sx={{ [theme.breakpoints.up(layoutQuery)]: { display: 'flex' } }} />
|
||||
)}
|
||||
{isNavHorizontal && <VerticalDivider sx={{ [theme.breakpoints.up(layoutQuery)]: { display: 'flex' } }} />}
|
||||
|
||||
{/** @slot Workspace popover */}
|
||||
<WorkspacesPopover
|
||||
data={_workspaces}
|
||||
sx={{ ...(isNavHorizontal && { color: 'var(--layout-nav-text-primary-color)' }) }}
|
||||
/>
|
||||
<WorkspacesPopover data={_workspaces} sx={{ ...(isNavHorizontal && { color: 'var(--layout-nav-text-primary-color)' }) }} />
|
||||
</>
|
||||
),
|
||||
rightArea: (
|
||||
@@ -184,12 +158,7 @@ export function DashboardLayout({
|
||||
layoutQuery={layoutQuery}
|
||||
cssVars={navVars.section}
|
||||
checkPermissions={canDisplayItemByRole}
|
||||
onToggleNav={() =>
|
||||
settings.setField(
|
||||
'navLayout',
|
||||
settings.state.navLayout === 'vertical' ? 'mini' : 'vertical'
|
||||
)
|
||||
}
|
||||
onToggleNav={() => settings.setField('navLayout', settings.state.navLayout === 'vertical' ? 'mini' : 'vertical')}
|
||||
/>
|
||||
);
|
||||
|
||||
|
@@ -23,18 +23,7 @@ export type NavVerticalProps = React.ComponentProps<'div'> &
|
||||
};
|
||||
};
|
||||
|
||||
export function NavVertical({
|
||||
sx,
|
||||
data,
|
||||
slots,
|
||||
cssVars,
|
||||
className,
|
||||
isNavMini,
|
||||
onToggleNav,
|
||||
checkPermissions,
|
||||
layoutQuery = 'md',
|
||||
...other
|
||||
}: NavVerticalProps) {
|
||||
export function NavVertical({ sx, data, slots, cssVars, className, isNavMini, onToggleNav, checkPermissions, layoutQuery = 'md', ...other }: NavVerticalProps) {
|
||||
const renderNavVertical = () => (
|
||||
<>
|
||||
{slots?.topArea ?? (
|
||||
@@ -44,12 +33,7 @@ export function NavVertical({
|
||||
)}
|
||||
|
||||
<Scrollbar fillContent>
|
||||
<NavSectionVertical
|
||||
data={data}
|
||||
cssVars={cssVars}
|
||||
checkPermissions={checkPermissions}
|
||||
sx={{ px: 2, flex: '1 1 auto' }}
|
||||
/>
|
||||
<NavSectionVertical data={data} cssVars={cssVars} checkPermissions={checkPermissions} sx={{ px: 2, flex: '1 1 auto' }} />
|
||||
|
||||
{slots?.bottomArea ?? <NavUpgrade />}
|
||||
</Scrollbar>
|
||||
@@ -110,22 +94,20 @@ export function NavVertical({
|
||||
|
||||
const NavRoot = styled('div', {
|
||||
shouldForwardProp: (prop: string) => !['isNavMini', 'layoutQuery', 'sx'].includes(prop),
|
||||
})<Pick<NavVerticalProps, 'isNavMini' | 'layoutQuery'>>(
|
||||
({ isNavMini, layoutQuery = 'md', theme }) => ({
|
||||
top: 0,
|
||||
left: 0,
|
||||
height: '100%',
|
||||
display: 'none',
|
||||
position: 'fixed',
|
||||
flexDirection: 'column',
|
||||
zIndex: 'var(--layout-nav-zIndex)',
|
||||
backgroundColor: 'var(--layout-nav-bg)',
|
||||
width: isNavMini ? 'var(--layout-nav-mini-width)' : 'var(--layout-nav-vertical-width)',
|
||||
borderRight: `1px solid var(--layout-nav-border-color, ${varAlpha(theme.vars.palette.grey['500Channel'], 0.12)})`,
|
||||
transition: theme.transitions.create(['width'], {
|
||||
easing: 'var(--layout-transition-easing)',
|
||||
duration: 'var(--layout-transition-duration)',
|
||||
}),
|
||||
[theme.breakpoints.up(layoutQuery)]: { display: 'flex' },
|
||||
})
|
||||
);
|
||||
})<Pick<NavVerticalProps, 'isNavMini' | 'layoutQuery'>>(({ isNavMini, layoutQuery = 'md', theme }) => ({
|
||||
top: 0,
|
||||
left: 0,
|
||||
height: '100%',
|
||||
display: 'none',
|
||||
position: 'fixed',
|
||||
flexDirection: 'column',
|
||||
zIndex: 'var(--layout-nav-zIndex)',
|
||||
backgroundColor: 'var(--layout-nav-bg)',
|
||||
width: isNavMini ? 'var(--layout-nav-mini-width)' : 'var(--layout-nav-vertical-width)',
|
||||
borderRight: `1px solid var(--layout-nav-border-color, ${varAlpha(theme.vars.palette.grey['500Channel'], 0.12)})`,
|
||||
transition: theme.transitions.create(['width'], {
|
||||
easing: 'var(--layout-transition-easing)',
|
||||
duration: 'var(--layout-transition-duration)',
|
||||
}),
|
||||
[theme.breakpoints.up(layoutQuery)]: { display: 'flex' },
|
||||
}));
|
||||
|
@@ -55,11 +55,7 @@ const shouldForwardProp = (prop: string) => !['open', 'active', 'variant', 'sx']
|
||||
/**
|
||||
* @slot root
|
||||
*/
|
||||
const ItemRoot = styled(ButtonBase, { shouldForwardProp })<StyledState>(({
|
||||
active,
|
||||
open,
|
||||
theme,
|
||||
}) => {
|
||||
const ItemRoot = styled(ButtonBase, { shouldForwardProp })<StyledState>(({ active, open, theme }) => {
|
||||
const dotTransitions: Record<'in' | 'out', CSSObject> = {
|
||||
in: { opacity: 0, scale: 0 },
|
||||
out: { opacity: 1, scale: 1 },
|
||||
|
@@ -106,12 +106,7 @@ function NavSubList({ data, subheader, sx, ...other }: NavSubListProps) {
|
||||
</NavLi>
|
||||
) : (
|
||||
<NavLi key={item.title} sx={{ mt: 0.75 }}>
|
||||
<NavItem
|
||||
subItem
|
||||
title={item.title}
|
||||
path={item.path}
|
||||
active={isEqualPath(item.path, pathname)}
|
||||
/>
|
||||
<NavItem subItem title={item.title} path={item.path} active={isEqualPath(item.path, pathname)} />
|
||||
</NavLi>
|
||||
)
|
||||
)}
|
||||
|
Reference in New Issue
Block a user