check for class without potential modifier first

Necessary becayse the isAny validator matches classes with validators too eagerly
dcastil · Apr 1, 2023 · 9b35ce5 · 9b35ce5
1 parent 573754b
commit 9b35ce5
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/lib/merge-classlist.ts b/src/lib/merge-classlist.ts
@@ -27,8 +27,13 @@ export function mergeClassList(classList: string, configUtils: ConfigUtils) {
                     maybePostfixModifierPosition,
                 } = splitModifiers(originalClassName)
 
-                let classGroupId = getClassGroupId(baseClassName)
-                let hasPostfixModifier = false
+                let classGroupId = getClassGroupId(
+                    maybePostfixModifierPosition
+                        ? baseClassName.substring(0, maybePostfixModifierPosition)
+                        : baseClassName,
+                )
+
+                let hasPostfixModifier = Boolean(maybePostfixModifierPosition)
 
                 if (!classGroupId) {
                     if (!maybePostfixModifierPosition) {
@@ -38,9 +43,7 @@ export function mergeClassList(classList: string, configUtils: ConfigUtils) {
                         }
                     }
 
-                    classGroupId = getClassGroupId(
-                        baseClassName.substring(0, maybePostfixModifierPosition),
-                    )
+                    classGroupId = getClassGroupId(baseClassName)
 
                     if (!classGroupId) {
                         return {
@@ -49,7 +52,7 @@ export function mergeClassList(classList: string, configUtils: ConfigUtils) {
                         }
                     }
 
-                    hasPostfixModifier = true
+                    hasPostfixModifier = false
                 }
 
                 const variantModifier = sortModifiers(modifiers).join(':')