Merge pull request #347 from dcastil/bugfix/345/fix-display-not-remov…

…ed-when-it-precedes-line-clamp Fix display class not removed when it precedes line-clamp class
dcastil · Nov 18, 2023 · 552d019 · 552d019
2 parents 730b1c2 + c11411b
commit 552d019
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -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')
+})