Skip to content

fix: handle empty strings in mergeClasses() #248

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

Merged
layershifter merged 1 commit into from
Oct 5, 2022
Merged

fix: handle empty strings in mergeClasses() #248

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions change/@griffel-core-69be5d24-4050-4443-a10d-75722b29e744.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: handle empty strings in mergeClasses()",
"packageName": "@griffel/core",
"email": "[email protected]",
"dependentChangeType": "patch"
}
5 changes: 5 additions & 0 deletions packages/core/src/mergeClasses.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ describe('mergeClasses', () => {
expect(mergeClasses(undefined, false)).toBe('');
});

it('handles empty classes', () => {
expect(mergeClasses('ui-button', '', 'ui-toogle-button')).toBe('ui-button ui-toogle-button');
expect(mergeClasses('', '')).toBe('');
});

it('performs deduplication for multiple arguments', () => {
const classes = makeStyles({
block: { display: 'block' },
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/mergeClasses.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export function mergeClasses(): string {
for (let i = 0; i < arguments.length; i++) {
const className = arguments[i];

if (typeof className === 'string') {
if (typeof className === 'string' && className !== '') {
// All classes generated by `makeStyles()` are prefixed by a sequence hash, this allows to identify class sets
// without parsing each className in a string
const sequenceIndex = className.indexOf(SEQUENCE_PREFIX);
Expand Down