fix(shared): token-based deduplication in mergeClasses (#5240)

* fix(shared): token-based deduplication in mergeClasses

* feat(packages): fix merge class throw errors in `lucide-preact` & update mergeClasses to a simpler implementation

---------

Co-authored-by: Karsa <contact@karsa.org>
This commit is contained in:
k l n murthi
2026-11-17 13:46:12 +01:00
committed by GitHub
co-authored by Karsa
parent daec1ba981
commit af08783503
4 changed files with 37 additions and 16 deletions
+5 -1
View File
@@ -15,6 +15,9 @@ type IconComponentProps = LucideProps &
}
);
const resolveClassName = (value: LucideProps['class']) =>
typeof value === 'object' ? value?.value : value;
/**
* Lucide icon component
*
@@ -47,6 +50,7 @@ const Icon = ({
size: 24,
},
class: classes = '',
className = '',
...rest
}: IconComponentProps) => {
const {
@@ -65,7 +69,7 @@ const Icon = ({
strokeWidth: strokeWidth ?? contextStrokeWidth,
absoluteStrokeWidth: absoluteStrokeWidth ?? contextAbsoluteStrokeWidth,
nonScalingStroke: nonScalingStroke ?? contextNonScalingStroke,
className: mergeClasses(contextClass, classes as string),
className: mergeClasses(contextClass, resolveClassName(classes), resolveClassName(className)),
hasA11yProp: Boolean(children) || hasA11yProp(rest),
attributes: rest,
});
@@ -1,5 +1,5 @@
import { h, type SignalLike } from 'preact';
import { mergeClasses, toLucideIconData, toPascalCase } from '@lucide/shared';
import { h } from 'preact';
import { toLucideIconData, toPascalCase } from '@lucide/shared';
import Icon from './Icon';
import type { LucideIcon, LucideIconData, LucideIconNode, LucideProps } from './types';
@@ -35,13 +35,12 @@ function createLucideIcon(
? toLucideIconData(iconDataOrName, iconNode as LucideIconNode[], aliases)
: iconDataOrName;
const Component = ({ class: classes = '', className = '', children, ...props }: LucideProps) =>
const Component = ({ children, ...props }: LucideProps) =>
h(
Icon,
{
...props,
icon: iconData,
class: mergeClasses<string | SignalLike<string | undefined>>(classes, className),
},
children,
);
+12 -11
View File
@@ -4,14 +4,15 @@
* @param {array} classes
* @returns {string} A string of classes
*/
export const mergeClasses = <ClassType = string | undefined | null>(...classes: ClassType[]) =>
classes
.filter((className, index, array) => {
return (
Boolean(className) &&
(className as string).trim() !== '' &&
array.indexOf(className) === index
);
})
.join(' ')
.trim();
export const mergeClasses = (...classes: (string | undefined | null)[]) => {
const tokens = new Set<string>();
for (const cls of classes) {
if (typeof cls !== 'string') continue;
for (const token of cls.split(/\s+/)) {
if (token) tokens.add(token);
}
}
return [...tokens].join(' ');
};
@@ -26,4 +26,21 @@ describe('mergeClasses', () => {
const classes = mergeClasses('lucide', ' ', 'lucide-circle');
expect(classes).toBe('lucide lucide-circle');
});
it('deduplicates across multi-class and whitespace-padded strings', async () => {
const classes = mergeClasses('lucide lucide-circle', 'lucide', 'lucide-circle custom-class');
expect(classes).toBe('lucide lucide-circle custom-class');
});
it('handles strings with surrounding whitespace and trailing duplicate', async () => {
const classes = mergeClasses('lucide ', 'lucide');
expect(classes).toBe('lucide');
});
it('deduplicates tokens within a single string in first-seen order', () => {
expect(mergeClasses('custom lucide custom', 'lucide other custom')).toBe('custom lucide other');
});
it('splits tabs and newlines into class tokens', () => {
expect(mergeClasses('lucide\tcustom\nlucide', '\r\nother\tcustom')).toBe('lucide custom other');
});
it('ignores null and whitespace-only values', () => {
expect(mergeClasses(null, undefined, '', ' \t\n ')).toBe('');
});
});