Skip to content

Commit

Permalink
[Slot] Deduplicate merged className prop (#2336)
Browse files Browse the repository at this point in the history
Co-authored-by: Chance Strickland <hi@chance.dev>
  • Loading branch information
valentinpolitov and chaance authored Sep 26, 2024
1 parent 00ee464 commit 31b8033
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 2 deletions.
37 changes: 37 additions & 0 deletions packages/react/slot/src/Slot.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,43 @@ describe('given a slotted Trigger', () => {
expect(handleChildClick).toHaveBeenCalledTimes(1);
});
});

describe('with className on itself', () => {
beforeEach(() => {
render(
<Trigger as={Slot} className="btn">
<button type="button">Click me</button>
</Trigger>
);
});

it('should apply the className to the child', () => {
expect(screen.getByRole('button')).toHaveClass('btn');
});
});

describe('with className on itself AND the child', () => {
beforeEach(() => {
render(
<Trigger as={Slot} className="btn btn-sm">
<button type="button" className=" btn btn-primary ">
Click me
</button>
</Trigger>
);
});

it('should merge className and apply it to the child', () => {
expect(screen.getByRole('button')).toHaveClass('btn', 'btn-sm', 'btn-primary');
});

it('should deduplicate merged className', () => {
const classNames = screen.getByRole('button').className.split(' ');

expect(classNames).toHaveLength(3);
expect(classNames.filter((name) => name === 'btn')).toHaveLength(1);
});
});
});

describe('given a Button with Slottable', () => {
Expand Down
21 changes: 19 additions & 2 deletions packages/react/slot/src/Slot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,25 @@ function mergeProps(slotProps: AnyProps, childProps: AnyProps) {
// if it's `style`, we merge them
else if (propName === 'style') {
overrideProps[propName] = { ...slotPropValue, ...childPropValue };
} else if (propName === 'className') {
overrideProps[propName] = [slotPropValue, childPropValue].filter(Boolean).join(' ');
}
// if it's `className`, we deduplicate and merge them
else if (propName === 'className') {
const classNameSet = new Set<string>();

if (slotPropValue && typeof slotPropValue === 'string') {
slotPropValue
.split(' ')
.filter(Boolean)
.forEach((name) => classNameSet.add(name));
}
if (childPropValue && typeof childPropValue === 'string') {
childPropValue
.split(' ')
.filter(Boolean)
.forEach((name) => classNameSet.add(name));
}

overrideProps[propName] = [...classNameSet].join(' ');
}
}

Expand Down

0 comments on commit 31b8033

Please sign in to comment.