Merge pull request #112 from dcastil/bugfix/111/fix-w-fit

Fix overriding w-full with w-fit not working

Author: dcastil

src/lib/default-config.ts

@@ -531,7 +531,7 @@ export function getDefaultConfig() {
              * Width
              * @see https://tailwindcss.com/docs/width
              */
-            w: [{ w: ['auto', 'min', 'max', spacing] }],
+            w: [{ w: ['auto', 'min', 'max', 'fit', spacing] }],
             /**
              * Min-Width
              * @see https://tailwindcss.com/docs/min-width

tests/class-group-conflicts.test.ts

@@ -2,6 +2,7 @@ import { twMerge } from '../src'
 
 test('merges classes from same group correctly', () => {
     expect(twMerge('overflow-x-auto overflow-x-hidden')).toBe('overflow-x-hidden')
+    expect(twMerge('w-full w-fit')).toBe('w-fit')
     expect(twMerge('overflow-x-auto overflow-x-hidden overflow-x-scroll')).toBe('overflow-x-scroll')
     expect(twMerge('overflow-x-auto hover:overflow-x-hidden overflow-x-scroll')).toBe(
         'hover:overflow-x-hidden overflow-x-scroll'