Merge pull request #457 from dcastil/bugfix/456/fix-space-at-beginnin…

…g-causing-infinite-loop

Fx space at beginning of input causing infinite loop

src/lib/merge-classlist.ts

@@ -14,14 +14,21 @@ export const mergeClassList = (classList: string, configUtils: ConfigUtils) => {
     const classGroupsInConflict: string[] = []
 
     let result = ''
+    let index = classList.length - 1
 
-    for (let i = classList.length - 1; i >= 0; ) {
-        while (classList[i] === ' ') {
-            --i
+    while (index >= 0) {
+        while (classList[index] === ' ') {
+            index -= 1
         }
-        const nextI = classList.lastIndexOf(' ', i)
-        const originalClassName = classList.slice(nextI === -1 ? 0 : nextI + 1, i + 1)
-        i = nextI
+
+        if (index < 0) {
+            break
+        }
+
+        const nextIndex = classList.lastIndexOf(' ', index)
+        const originalClassName = classList.slice(nextIndex + 1, index + 1)
+
+        index = nextIndex
 
         const { modifiers, hasImportantModifier, baseClassName, maybePostfixModifierPosition } =
             parseClassName(originalClassName)

tests/wonky-inputs.test.ts

@@ -0,0 +1,9 @@
+import { twMerge } from '../src'
+
+test('handles wonky inputs', () => {
+    expect(twMerge(' block')).toBe('block')
+    expect(twMerge('block ')).toBe('block')
+    expect(twMerge(' block ')).toBe('block')
+    expect(twMerge('  block  px-2     py-4  ')).toBe('block px-2 py-4')
+    expect(twMerge('  block  px-2', ' ', '     py-4  ')).toBe('block px-2 py-4')
+})