fix: support named color in arbitrary value

tw-in-js · Mar 20, 2021 · 7f48c59 · 7f48c59
1 parent a979005
commit 7f48c59
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/__tests__/api.json b/src/__tests__/api.json
@@ -867,5 +867,6 @@
     ".rotate-\\[1\\.5turn\\]{--tw-rotate:1.5turn;transform:rotate(1.5turn);transform:translateX(var(--tw-translate-x,0)) translateY(var(--tw-translate-y,0)) rotate(var(--tw-rotate,0)) skewX(var(--tw-skew-x,0)) skewY(var(--tw-skew-y,0)) scaleX(var(--tw-scale-x,1)) scaleY(var(--tw-scale-y,1))}"
   ],
   "duration-[2s]": ".duration-\\[2s\\]{transition-duration:2s}",
-  "text-[2.23rem]": ".text-\\[2\\.23rem\\]{font-size:2.23rem}"
+  "text-[2.23rem]": ".text-\\[2\\.23rem\\]{font-size:2.23rem}",
+  "text-[tomato]": ".text-\\[tomato\\]{color:tomato}"
 }
diff --git a/src/twind/modes.ts b/src/twind/modes.ts
@@ -26,7 +26,7 @@ export const mode = (report: (message: string) => void): Mode => ({
     }
 
     // Put it back together
-    return report(stack.join('at '))
+    return report(join(stack, 'at '))
   },
 })
 

diff --git a/src/twind/theme.ts b/src/twind/theme.ts
@@ -834,7 +834,7 @@ const resolveContext: ThemeSectionResolverContext = {
 
 const handleArbitraryValues = (section: keyof Theme, key: string): string | false =>
   (key = (key[0] == '[' && key.slice(-1) == ']' && key.slice(1, -1)) as string) &&
-  includes(section, 'olor') == (key[0] == '#' || /^(?:#|(?:hsl|rgb)a?\()/.test(key)) &&
+  includes(section, 'olor') == /^(#|(hsl|rgb)a?\(|[a-z]+$)/.test(key) &&
   key
 
 export const makeThemeResolver = (config?: ThemeConfiguration): ThemeResolver => {