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: AppNaviDropdownMenuButton の current 装飾ロジックを見直し #4971

Merged
merged 1 commit into from
Oct 15, 2024
Merged

fix: AppNaviDropdownMenuButton の current 装飾ロジックを見直し #4971

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 12 additions & 13 deletions packages/smarthr-ui/src/components/AppNavi/AppNaviDropdownMenuButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import React, {
type ReactElement,
type ReactNode,
useMemo,
useState,
} from 'react'
import { tv } from 'tailwind-variants'

Expand Down Expand Up @@ -33,7 +32,12 @@ const {
const appNaviDropdownMenuButton = tv({
extend: appNaviItemStyle,
slots: {
wrapper: ['smarthr-ui-AppNavi-dropdownMenuButton', triggerButton],
wrapper: [
'smarthr-ui-AppNavi-dropdownMenuButton',
'has-[[aria-current="page"]]:shr-relative has-[[aria-current="page"]]:shr-text-black',
'has-[[aria-current="page"]]:after:shr-bottom-0 has-[[aria-current="page"]]:after:shr-inset-x-0 has-[[aria-current="page"]]:after:shr-block has-[[aria-current="page"]]:after:shr-h-0.25 has-[[aria-current="page"]]:after:shr-bg-main has-[[aria-current="page"]]:after:shr-content-[""] has-[[aria-current="page"]]:after:shr-absolute',
triggerButton,
],
actionList,
},
})
Expand All @@ -42,30 +46,25 @@ export const AppNaviDropdownMenuButton: FC<AppNaviDropdownMenuButtonProps> = ({
children,
label,
}) => {
const [hasCurrentPage, setHasCurrentPage] = useState(false)
const actualChildren = useMemo(
() =>
React.Children.map(children, (item, i) => {
if (React.isValidElement(item) && item.props['aria-current'] === 'page') {
setHasCurrentPage(true)
}

React.Children.map(children, (item, i) =>
// MEMO: {flag && <Button/>}のような書き方に対応させる為、型を変換する
// itemの存在チェックでfalsyな値は弾かれている想定
return item ? <li key={i}>{item as ActionItemTruthyType}</li> : null
}),
item ? <li key={i}>{item as ActionItemTruthyType}</li> : null,
),
[children],
)

const { wrapper: wrapperStyle, actionList: actionListStyle } = appNaviDropdownMenuButton({
active: hasCurrentPage,
})
const { wrapper: wrapperStyle, actionList: actionListStyle } = appNaviDropdownMenuButton()

return (
<Dropdown>
<DropdownTrigger>
<UnstyledButton className={wrapperStyle()}>
{label}
{/* has([aria-current="page"]) を書くために複製 */}
<span hidden>{actualChildren}</span>
<FaCaretDownIcon />
</UnstyledButton>
</DropdownTrigger>
Expand Down