Skip to content

Commit

Permalink
refactor(design-system): overrode className in grid layout component (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
gwansikk committed Mar 26, 2024
1 parent 3a9e744 commit c3c1104
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions packages/design-system/src/Grid/Grid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,17 @@ interface GridProps extends ComponentPropsWithRef<'div'> {
}

const Grid = forwardRef<HTMLDivElement, GridProps>(
({ col = 1, gap = 'none', children }, ref) => {
({ col = 1, gap = 'none', children, className, ...rest }, ref) => {
return (
<div
ref={ref}
className={twMerge('grid', gridStyleCols[col], gridStyleGaps[gap])}
className={twMerge(
'grid',
gridStyleCols[col],
gridStyleGaps[gap],
className,
)}
{...rest}
>
{children}
</div>
Expand Down

0 comments on commit c3c1104

Please sign in to comment.