add support for svh, lvh and dvh` scale values

dcastil · Dec 21, 2023 · 6047d53 · 6047d53
1 parent 381f117
commit 6047d53
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 4 deletions.
diff --git a/src/lib/default-config.ts b/src/lib/default-config.ts
@@ -581,7 +581,21 @@ export function getDefaultConfig() {
              * Width
              * @see https://tailwindcss.com/docs/width
              */
-            w: [{ w: ['auto', 'min', 'max', 'fit', isArbitraryValue, spacing] }],
+            w: [
+                {
+                    w: [
+                        'auto',
+                        'min',
+                        'max',
+                        'fit',
+                        'svw',
+                        'lvw',
+                        'dvw',
+                        isArbitraryValue,
+                        spacing,
+                    ],
+                },
+            ],
             /**
              * Min-Width
              * @see https://tailwindcss.com/docs/min-width
@@ -611,17 +625,35 @@ export function getDefaultConfig() {
              * Height
              * @see https://tailwindcss.com/docs/height
              */
-            h: [{ h: [isArbitraryValue, spacing, 'auto', 'min', 'max', 'fit'] }],
+            h: [
+                {
+                    h: [
+                        isArbitraryValue,
+                        spacing,
+                        'auto',
+                        'min',
+                        'max',
+                        'fit',
+                        'svh',
+                        'lvh',
+                        'dvh',
+                    ],
+                },
+            ],
             /**
              * Min-Height
              * @see https://tailwindcss.com/docs/min-height
              */
-            'min-h': [{ 'min-h': ['min', 'max', 'fit', isLength, isArbitraryValue] }],
+            'min-h': [
+                { 'min-h': ['min', 'max', 'fit', 'svh', 'lvh', 'dvh', isLength, isArbitraryValue] },
+            ],
             /**
              * Max-Height
              * @see https://tailwindcss.com/docs/max-height
              */
-            'max-h': [{ 'max-h': [isArbitraryValue, spacing, 'min', 'max', 'fit'] }],
+            'max-h': [
+                { 'max-h': [isArbitraryValue, spacing, 'min', 'max', 'fit', 'svh', 'lvh', 'dvh'] },
+            ],
             // Typography
             /**
              * Font Size

diff --git a/tests/tailwind-css-versions.test.ts b/tests/tailwind-css-versions.test.ts
@@ -34,3 +34,7 @@ test('supports Tailwind CSS v3.3 features', () => {
     expect(twMerge('content-normal content-center content-stretch')).toBe('content-stretch')
     expect(twMerge('whitespace-nowrap whitespace-break-spaces')).toBe('whitespace-break-spaces')
 })
+
+test('supports Tailwind CSS v3.4 features', () => {
+    expect(twMerge('h-svh h-dvh w-svw w-dvw')).toBe('h-dvh w-dvw')
+})