fix space at beginning of input causing infinite loop

dcastil · Aug 12, 2024 · 400b90d · 400b90d
1 parent 14166d3
commit 400b90d
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/lib/merge-classlist.ts b/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)