2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-23 17:37:38 +00:00

[UI] Tweak NavigationDrawer (#10623)

- Remove double scrollbar
This commit is contained in:
Oliver
2025-10-19 15:39:17 +11:00
committed by GitHub
parent bddcef9c34
commit 3b27d56682

View File

@@ -1,12 +1,5 @@
import { t } from '@lingui/core/macro'; import { t } from '@lingui/core/macro';
import { import { Container, Drawer, Flex, Group, Space } from '@mantine/core';
Container,
Drawer,
Flex,
Group,
ScrollArea,
Space
} from '@mantine/core';
import { useViewportSize } from '@mantine/hooks'; import { useViewportSize } from '@mantine/hooks';
import { useEffect, useMemo, useRef, useState } from 'react'; import { useEffect, useMemo, useRef, useState } from 'react';
@@ -183,33 +176,31 @@ function DrawerContent({ closeFunc }: Readonly<{ closeFunc?: () => void }>) {
</Group> </Group>
<Space h='xs' /> <Space h='xs' />
<Container className={classes.layoutContent} p={0}> <Container className={classes.layoutContent} p={0}>
<ScrollArea h={scrollHeight} type='always' offsetScrollbars> <MenuLinks
title={t`Navigation`}
links={menuItemsNavigate}
beforeClick={closeFunc}
/>
<MenuLinks
title={t`Settings`}
links={menuItemsSettings}
beforeClick={closeFunc}
/>
<MenuLinks
title={t`Actions`}
links={menuItemsAction}
beforeClick={closeFunc}
/>
<Space h='md' />
{plugins.length > 0 ? (
<MenuLinks <MenuLinks
title={t`Navigation`} title={t`Plugins`}
links={menuItemsNavigate} links={plugins}
beforeClick={closeFunc} beforeClick={closeFunc}
/> />
<MenuLinks ) : (
title={t`Settings`} <></>
links={menuItemsSettings} )}
beforeClick={closeFunc}
/>
<MenuLinks
title={t`Actions`}
links={menuItemsAction}
beforeClick={closeFunc}
/>
<Space h='md' />
{plugins.length > 0 ? (
<MenuLinks
title={t`Plugins`}
links={plugins}
beforeClick={closeFunc}
/>
) : (
<></>
)}
</ScrollArea>
</Container> </Container>
<div ref={ref}> <div ref={ref}>
<Space h='md' /> <Space h='md' />