Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 26 additions & 15 deletions apps/landing/src/components/Header/HeaderWrap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import { Box, Flex } from '@devup-ui/react'
import { usePathname, useSearchParams } from 'next/navigation'
import { Suspense } from 'react'

export function HeaderWrap({ children }: { children: React.ReactNode }) {
const path = usePathname()
const isRoot = path === '/'
const menu = useSearchParams().get('menu') === '1'
return (
<Box
pos={isRoot ? 'fixed' : 'sticky'}
Expand All @@ -17,20 +17,31 @@ export function HeaderWrap({ children }: { children: React.ReactNode }) {
w="100%"
zIndex={1}
>
<Flex
alignItems="center"
bg="$containerBackground"
borderRadius={isRoot ? [null, null, '16px'] : undefined}
boxShadow="0px 2px 8px 0px var(--shadow, rgba(135, 135, 135, 0.25))"
h={['50px', null, '70px']}
justifyContent="space-between"
maxW={isRoot ? '1440px' : '100%'}
mx="auto"
pl={[menu ? null : 4, 5, '40px']}
pr={[null, 5, '40px']}
>
{children}
</Flex>
<Suspense>
<HeaderWrapInner>{children}</HeaderWrapInner>
</Suspense>
</Box>
)
}

function HeaderWrapInner({ children }: { children: React.ReactNode }) {
const path = usePathname()
const isRoot = path === '/'
const menu = useSearchParams().get('menu') === '1'
return (
<Flex
alignItems="center"
bg="$containerBackground"
borderRadius={isRoot ? [null, null, '16px'] : undefined}
boxShadow="0px 2px 8px 0px var(--shadow, rgba(135, 135, 135, 0.25))"
h={['50px', null, '70px']}
justifyContent="space-between"
maxW={isRoot ? '1440px' : '100%'}
mx="auto"
pl={[menu ? null : 4, 5, '40px']}
pr={[null, 5, '40px']}
>
{children}
</Flex>
)
}
31 changes: 18 additions & 13 deletions apps/landing/src/components/Header/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { css, Flex } from '@devup-ui/react'
import Link from 'next/link'
import { Suspense } from 'react'

import { URL_PREFIX } from '../../constants'
import { Logo } from '../Logo'
Expand Down Expand Up @@ -31,16 +32,18 @@ export function Header() {
return (
<HeaderWrap>
<Flex alignItems="center" gap="16px">
<MobMenuWrapper openChildren={top}>
<Link
className={css({
textDecoration: 'none',
})}
href={URL_PREFIX + '/'}
>
<Logo />
</Link>
</MobMenuWrapper>
<Suspense>
<MobMenuWrapper openChildren={top}>
<Link
className={css({
textDecoration: 'none',
})}
href={URL_PREFIX + '/'}
>
<Logo />
</Link>
</MobMenuWrapper>
</Suspense>
</Flex>
<Flex alignItems="center" display={['none', null, 'flex']} gap="10px">
<Flex alignItems="center" px="24px">
Expand Down Expand Up @@ -75,9 +78,11 @@ export function Header() {
gap="10px"
p="10px"
>
<MobMenuButton>
<MobMenu />
</MobMenuButton>
<Suspense fallback={<MobMenu />}>
<MobMenuButton>
<MobMenu />
</MobMenuButton>
</Suspense>
</Flex>
</HeaderWrap>
)
Expand Down
5 changes: 3 additions & 2 deletions packages/react/src/types/props/svg.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import type { Property } from 'csstype'

import type { ResponsiveValue } from '../responsive-value'
import type { DevupThemeColors } from '../theme'

export interface DevupUiSvgProps {
fill?: ResponsiveValue<Property.Fill>
stroke?: ResponsiveValue<Property.Stroke>
fill?: ResponsiveValue<Property.Fill | keyof DevupThemeColors>
stroke?: ResponsiveValue<Property.Stroke | keyof DevupThemeColors>
strokeWidth?: ResponsiveValue<Property.StrokeWidth>
strokeOpacity?: ResponsiveValue<Property.StrokeOpacity>
}
Loading