feat: make col plugin support arbitrary CSS

arlyon · Feb 20, 2023 · c3d7b19 · c3d7b19
1 parent dd7656b
commit c3d7b19
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/crates/tailwind-parse/src/eval/plugin.rs b/crates/tailwind-parse/src/eval/plugin.rs
@@ -808,7 +808,11 @@ pub fn white_space(
     Ok(to_lit(&rule))
 }
 
-pub fn col<'a>(col: Option<Col>, value: &Value, theme: &'a TailwindTheme) -> PluginResult<'a> {
+pub fn col<'a>(
+    col: Option<Col>,
+    value: &SubjectValue,
+    theme: &'a TailwindTheme,
+) -> PluginResult<'a> {
     match col {
         None => grid_col(value, theme),
         Some(Col::Start) => grid_col_start(value, theme),

diff --git a/crates/tailwind-parse/src/literal.rs b/crates/tailwind-parse/src/literal.rs
@@ -57,8 +57,9 @@ enum PluginType<'a> {
     Optional(fn(Option<&Value>, &'a TailwindTheme) -> PluginResult<'a>),
     /// This plugin requires a value, or arbitrary css.
     RequiredArbitrary(fn(&SubjectValue, &'a TailwindTheme) -> PluginResult<'a>),
+    RequiredArbitraryBox(Box<dyn Fn(&SubjectValue, &'a TailwindTheme) -> PluginResult<'a>>),
     /// This plugin takes an optional value, or arbitrary css.
-    OptionalArbitrary(fn(&Option<SubjectValue>, &'a TailwindTheme) -> PluginResult<'a>),
+    OptionalArbitrary(fn(Option<&SubjectValue>, &'a TailwindTheme) -> PluginResult<'a>),
 }
 
 impl<'a> Literal<'a> {
@@ -107,7 +108,7 @@ impl<'a> Literal<'a> {
             Translate(tr) => {
                 OptionalAbitraryBox(StdBox::new(move |v, t| plugin::translate(tr, v, t)))
             }
-            Col(c) => RequiredBox(StdBox::new(move |v, t| plugin::col(c, v, t))),
+            Col(c) => RequiredArbitraryBox(StdBox::new(move |v, t| plugin::col(c, v, t))),
             Row(r) => RequiredBox(StdBox::new(move |v, t| plugin::row(r, v, t))),
             Overflow(o) => RequiredBox(StdBox::new(move |v, t| plugin::overflow(o, v, t))),
             Not(_) => todo!(),
@@ -213,6 +214,7 @@ impl<'a> Literal<'a> {
             (Optional(p), Some(SubjectValue::Value(s))) => p(Some(s), theme),
             (Optional(p), None) => p(None, theme),
             (RequiredArbitrary(p), Some(value)) => p(value, theme),
+            (RequiredArbitraryBox(p), Some(value)) => p(value, theme),
             (Singular(p), None) => Ok(p()),
             (RequiredBox(p), Some(SubjectValue::Value(value))) => p(value, theme),
             (OptionalAbitraryBox(p), value) => p(value, theme),