Skip to content

fix: DefinitionListでFragmentの子要素を適切に処理するよう修正 #5839

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: DefinitionListでFragmentの子要素を適切に処理するよう修正 #5839

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b9186e
fix: DefinitionListでFragmentの子要素を適切に処理するよう修正
matamatanot Sep 3, 2025
e1110ef
fix: DefinitionListの子要素処理ロジックを改善
matamatanot Sep 4, 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
25 changes: 16 additions & 9 deletions packages/smarthr-ui/src/components/DefinitionList/DefinitionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
Children,
type ComponentProps,
type FC,
Fragment,
type PropsWithChildren,
type ReactElement,
cloneElement,
Expand Down Expand Up @@ -55,15 +56,21 @@ export const DefinitionList: FC<Props & ElementProps> = ({
termStyleType={termStyleType}
/>
))}
{Children.map(
children,
(child) =>
isValidElement(child) &&
cloneElement(child as ReactElement, {
maxColumns,
termStyleType,
}),
)}
{Children.toArray(children)
.flatMap((child) => {
if (isValidElement(child) && child.type === Fragment) {
return Children.toArray(child.props.children)
}
return child
})
.map((child) =>
isValidElement(child)
? cloneElement(child as ReactElement, {
maxColumns,
termStyleType,
})
: child,
)}
Copy link
Member

@AtsushiM AtsushiM Sep 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

flatMap -> mapで配列を2回転している & 内容でisValidElementのチェックが2重でかかっている & Fragmentが複数ネストしている場合に対応できていないので以下の感じはどうっすかね？
(動作確認自体は未対応ですが...)

const childrenToItems = (children: ReactNode) => (
  Children.toArray(children)
    .reduce((prev, child) => {
      if (isValidElement(child)) {
        if (child.type === Fragment) {
          prev = prev.concat(childrenToItems(child.props.children))
        }

        prev.push(cloneElement(child as ReactElement, {
          maxColumns,
          termStyleType,
        }))
      } else {
        prev.push(child)
      }

      return prev
    }, [] as ReactElement)
)

...

{childrenToItems(children)}

Copy link
Contributor Author

@matamatanot matamatanot Sep 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AtsushiM
2回転とisValidElementの二重チェックを避けつつもう少し厳格にしました！
e1110ef

</Cluster>
)
}
Loading