Skip to content

Commit d385ea8

Browse files
LukaFilipovic99jtomic-croz
authored andcommitted
#241 Fix bug when Breadcrumbs icon is rendered between non-rendered elements
1 parent ceedd72 commit d385ea8

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

libs/core/src/Breadcrumbs.tsx

+15-11
Original file line numberDiff line numberDiff line change
@@ -54,28 +54,32 @@ function Breadcrumbs({ children, icon, className, ...props }: BreadcrumbsProps)
5454
tokens.container.borderRadius,
5555
tokens.container.padding,
5656
tokens.container.display,
57-
tokens.container.spaceBetween
57+
tokens.container.spaceBetween,
5858
);
5959

6060
const childContainerClassName = cx(
6161
tokens.childContainer.display,
6262
tokens.childContainer.alignItems,
63-
tokens.childContainer.spaceBetween
63+
tokens.childContainer.spaceBetween,
6464
);
6565

6666
const breadcrumbIcon = useIcon("breadcrumbs", icon, { className: tokens.iconColor });
6767

6868
return (
6969
<nav className="flex">
7070
<ol className={containerClassName}>
71-
{React.Children.map(children, (child, index) => (
72-
<li key={index} className="flex">
73-
<div className={childContainerClassName}>
74-
{index > 0 && React.cloneElement(breadcrumbIcon)}
75-
{child}
76-
</div>
77-
</li>
78-
))}
71+
{React.Children.map(
72+
children,
73+
(child, index) =>
74+
child && (
75+
<li key={index} className="flex">
76+
<div className={childContainerClassName}>
77+
{index > 0 && React.cloneElement(breadcrumbIcon)}
78+
{child}
79+
</div>
80+
</li>
81+
),
82+
)}
7983
</ol>
8084
</nav>
8185
);
@@ -91,7 +95,7 @@ function Breadcrumb({ children, ...props }: BreadcrumbProps) {
9195
tokens.breadcrumb.color,
9296
tokens.breadcrumb.hover,
9397
tokens.breadcrumb.transitionDuration,
94-
tokens.breadcrumb.transitionTimingFunction
98+
tokens.breadcrumb.transitionTimingFunction,
9599
);
96100

97101
return <span className={breadcrumbClassname}>{children}</span>;

0 commit comments

Comments
 (0)