diff --git a/src/lib/default-config.ts b/src/lib/default-config.ts index 451242c8..a29892df 100644 --- a/src/lib/default-config.ts +++ b/src/lib/default-config.ts @@ -1740,6 +1740,7 @@ export function getDefaultConfig() { 'fvn-figure': ['fvn-normal'], 'fvn-spacing': ['fvn-normal'], 'fvn-fraction': ['fvn-normal'], + 'line-clamp': ['display', 'overflow'], rounded: [ 'rounded-s', 'rounded-e', diff --git a/tests/conflicts-across-class-groups.test.ts b/tests/conflicts-across-class-groups.test.ts index 5f1c2ef9..af91a7a6 100644 --- a/tests/conflicts-across-class-groups.test.ts +++ b/tests/conflicts-across-class-groups.test.ts @@ -31,3 +31,8 @@ test('touch classes do create conflicts correctly', () => { ) expect(twMerge('touch-pan-x touch-pan-y touch-pinch-zoom touch-auto')).toBe('touch-auto') }) + +test('line-clamp classes do create conflicts correctly', () => { + expect(twMerge('overflow-auto inline line-clamp-1')).toBe('line-clamp-1') + expect(twMerge('line-clamp-1 overflow-auto inline')).toBe('line-clamp-1 overflow-auto inline') +})