Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-04-01 01:18:10 +02:00
Code Issues Projects Releases Wiki Activity

refactor: Composable new in unleash (#8505)

Browse Source
This commit is contained in:
Mateusz Kwasniewski 2024-10-22 10:52:08 +02:00 committed by GitHub
parent d3294d58c2
commit cbfdb8ca6e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/component/layout/MainLayout/MainLayout.tsx
View File

@ -18,6 +18,7 @@ import { NavigationSidebar } from './NavigationSidebar/NavigationSidebar';
import { MainLayoutEventTimeline } from './MainLayoutEventTimeline'; import { MainLayoutEventTimeline } from './MainLayoutEventTimeline';
import { EventTimelineProvider } from 'component/events/EventTimeline/EventTimelineProvider'; import { EventTimelineProvider } from 'component/events/EventTimeline/EventTimelineProvider';
import { AIChat } from 'component/ai/AIChat'; import { AIChat } from 'component/ai/AIChat';
import { NewInUnleash } from './NavigationSidebar/NewInUnleash/NewInUnleash';
interface IMainLayoutProps { interface IMainLayoutProps {
children: ReactNode; children: ReactNode;
@ -124,7 +125,11 @@ export const MainLayout = forwardRef<HTMLDivElement, IMainLayoutProps>(
> >
<ConditionallyRender <ConditionallyRender
condition={!isSmallScreen} condition={!isSmallScreen}
show={<NavigationSidebar />} show={
<NavigationSidebar
NewInUnleash={NewInUnleash}
/>
}
/> />
<Box <Box

25
frontend/src/component/layout/MainLayout/NavigationSidebar/NavigationSidebar.tsx
View File

@ -15,16 +15,17 @@ import {
import { useInitialPathname } from './useInitialPathname'; import { useInitialPathname } from './useInitialPathname';
import { useLastViewedProject } from 'hooks/useLastViewedProject'; import { useLastViewedProject } from 'hooks/useLastViewedProject';
import { useLastViewedFlags } from 'hooks/useLastViewedFlags'; import { useLastViewedFlags } from 'hooks/useLastViewedFlags';
import { NewInUnleash } from './NewInUnleash/NewInUnleash'; import type { NewInUnleash } from './NewInUnleash/NewInUnleash';
export const MobileNavigationSidebar: FC<{ onClick: () => void }> = ({ export const MobileNavigationSidebar: FC<{
onClick, onClick: () => void;
}) => { NewInUnleash?: typeof NewInUnleash;
}> = ({ onClick, NewInUnleash }) => {
const { routes } = useRoutes(); const { routes } = useRoutes();
return ( return (
<> <>
<NewInUnleash onItemClick={onClick} /> {NewInUnleash ? <NewInUnleash /> : null}
<PrimaryNavigationList mode='full' onClick={onClick} /> <PrimaryNavigationList mode='full' onClick={onClick} />
<SecondaryNavigationList <SecondaryNavigationList
routes={routes.mainNavRoutes} routes={routes.mainNavRoutes}
@ -66,7 +67,9 @@ const StickyContainer = styled(Box)(({ theme }) => ({
borderTop: `1px solid ${theme.palette.divider}`, borderTop: `1px solid ${theme.palette.divider}`,
})); }));
export const NavigationSidebar = () => { export const NavigationSidebar: FC<{ NewInUnleash?: typeof NewInUnleash }> = ({
NewInUnleash,
}) => {
const { routes } = useRoutes(); const { routes } = useRoutes();
const [mode, setMode] = useNavigationMode(); const [mode, setMode] = useNavigationMode();
@ -154,10 +157,12 @@ export const NavigationSidebar = () => {
<Box sx={{ flex: 1 }} /> <Box sx={{ flex: 1 }} />
<StickyContainer> <StickyContainer>
<NewInUnleash {NewInUnleash ? (
mode={mode} <NewInUnleash
onMiniModeClick={() => setMode('full')} mode={mode}
/> onMiniModeClick={() => setMode('full')}
/>
) : null}
<ShowHide <ShowHide
mode={mode} mode={mode}
onChange={() => { onChange={() => {

2
frontend/src/component/layout/MainLayout/NavigationSidebar/NewInUnleash/NewInUnleash.tsx
View File

@ -89,13 +89,11 @@ type NewItem = {
interface INewInUnleashProps { interface INewInUnleashProps {
mode?: NavigationMode; mode?: NavigationMode;
onItemClick?: () => void;
onMiniModeClick?: () => void; onMiniModeClick?: () => void;
} }
export const NewInUnleash = ({ export const NewInUnleash = ({
mode = 'full', mode = 'full',
onItemClick,
onMiniModeClick, onMiniModeClick,
}: INewInUnleashProps) => { }: INewInUnleashProps) => {
const navigate = useNavigate(); const navigate = useNavigate();

6
frontend/src/component/menu/Header/DrawerMenu/DrawerMenu.tsx
View File

@ -8,6 +8,7 @@ import styles from './DrawerMenu.module.scss'; // FIXME: useStyle - theme
import theme from 'themes/theme'; import theme from 'themes/theme';
import { ThemeMode } from 'component/common/ThemeMode/ThemeMode'; import { ThemeMode } from 'component/common/ThemeMode/ThemeMode';
import { MobileNavigationSidebar } from 'component/layout/MainLayout/NavigationSidebar/NavigationSidebar'; import { MobileNavigationSidebar } from 'component/layout/MainLayout/NavigationSidebar/NavigationSidebar';
import { NewInUnleash } from 'component/layout/MainLayout/NavigationSidebar/NewInUnleash/NewInUnleash';
const StyledDrawerHeader = styled('div')(({ theme }) => ({ const StyledDrawerHeader = styled('div')(({ theme }) => ({
display: 'flex', display: 'flex',
@ -71,7 +72,10 @@ export const DrawerMenu: VFC<IDrawerMenuProps> = ({
</Link> </Link>
</StyledDrawerHeader> </StyledDrawerHeader>
<Divider /> <Divider />
<MobileNavigationSidebar onClick={toggleDrawer} /> <MobileNavigationSidebar
onClick={toggleDrawer}
NewInUnleash={NewInUnleash}
/>
</nav> </nav>
</Drawer> </Drawer>
); );