Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(AppHeader): elementAs, current, keyまわりのエラーを解消 #5355

Merged
merged 4 commits into from
Feb 18, 2025
Merged

fix(AppHeader): elementAs, current, keyまわりのエラーを解消 #5355

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
594d6b8
fix(AppHeader): elementAs, current, keyまわりのエラーを解消
Qs-F Jan 31, 2025
7906e0d
Update packages/smarthr-ui/src/components/AppHeader/components/deskto…
Qs-F Feb 18, 2025
d213a15
Merge remote-tracking branch 'origin' into fix/appheader/navigation-e…
Qs-F Feb 18, 2025
0a4f6f8
fix: destructure className
Qs-F Feb 18, 2025
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
43 changes: 25 additions & 18 deletions packages/smarthr-ui/src/components/AppHeader/components/desktop/Navigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,30 +64,31 @@ const buildNavigations = (
navigations: NavigationType[],
): ComponentProps<typeof AppNavi>['children'] => (
<>
{navigations.map((navigation) => {
{navigations.map((navigation, index) => {
if ('elementAs' in navigation) {
const { elementAs, ...rest } = navigation
return (
<AppNaviCustomTag
{...navigation}
key={navigation.children.toString()}
{...rest}
key={`${index}-${navigation.children.toString()}`}
tag={navigation.elementAs}
/>
)
}
if ('href' in navigation) {
return <AppNaviAnchor {...navigation} key={navigation.children.toString()} />
return <AppNaviAnchor {...navigation} key={`${index}-${navigation.children.toString()}`} />
}
if ('childNavigations' in navigation) {
return (
<AppNaviDropdownMenuButton
label={navigation.children}
key={navigation.children.toString()}
key={`${index}-${navigation.children.toString()}`}
>
{buildDropdownMenu(navigation.childNavigations)}
</AppNaviDropdownMenuButton>
)
}
return <AppNaviButton {...navigation} key={navigation.children.toString()} />
return <AppNaviButton {...navigation} key={`${index}-${navigation.children.toString()}`} />
})}
</>
)
Expand All @@ -96,15 +97,16 @@ const buildDropdownMenu = (
navigations: Array<ChildNavigation | ChildNavigationGroup>,
): ComponentProps<typeof AppNaviDropdownMenuButton>['children'] => (
<>
{navigations.map((navigation) => {
{navigations.map((navigation, index) => {
if ('elementAs' in navigation) {
const Component = navigation.elementAs
const { elementAs: Component, current, ...rest } = navigation
// TODO: DropdownMenuItemを作成し、elementAsを渡せるようにする
return (
<Component
{...navigation}
key={navigation.children}
aria-current={navigation.current}
{...rest}
// key={navigation.children}
key={`${index}-${navigation.children.toString()}`}
aria-current={current}
className={commonButton({
current: navigation.current,
className: navigation.className,
Expand All @@ -113,26 +115,31 @@ const buildDropdownMenu = (
)
}
if ('href' in navigation) {
const { current, ...rest } = navigation
return (
<AnchorButton
{...navigation}
aria-current={navigation.current && 'page'}
key={navigation.children.toString()}
{...rest}
aria-current={current && 'page'}
key={`${index}-${navigation.children.toString()}`}
/>
)
}
if ('title' in navigation) {
return (
<DropdownMenuGroup name={navigation.title} key={navigation.title.toString()}>
<DropdownMenuGroup
name={navigation.title}
key={`${index}-${navigation.title.toString()}`}
>
{buildDropdownMenu(navigation.childNavigations)}
</DropdownMenuGroup>
)
}
const { current, ...rest } = navigation
return (
<Button
{...navigation}
aria-current={navigation.current && 'page'}
key={navigation.children.toString()}
{...rest}
aria-current={current && 'page'}
key={`${index}-${navigation.children.toString()}`}
/>
)
})}
Expand Down