Parse transitions

Author: devongovett

src/lib.rs

@@ -1314,5 +1314,10 @@ mod tests {
     minify_test(".foo { transition-timing-function: ease-in-out, cubic-bezier(0.42, 0, 1, 1) }", ".foo{transition-timing-function:ease-in-out,ease-in}");
     minify_test(".foo { transition-timing-function: cubic-bezier(0.42, 0, 1, 1), cubic-bezier(0.58, 0.2, 0.11, 1.2) }", ".foo{transition-timing-function:ease-in,cubic-bezier(.58,.2,.11,1.2)}");
     minify_test(".foo { transition-timing-function: step-start, steps(5, jump-start) }", ".foo{transition-timing-function:step-start,steps(5,start)}");
+    minify_test(".foo { transition: width 2s ease }", ".foo{transition:width 2s}");
+    minify_test(".foo { transition: width 2s ease, height 1000ms cubic-bezier(0.25, 0.1, 0.25, 1) }", ".foo{transition:width 2s,height 1s}");
+    minify_test(".foo { transition: width 2s 1s }", ".foo{transition:width 2s 1s}");
+    minify_test(".foo { transition: width 2s ease 1s }", ".foo{transition:width 2s 1s}");
+    minify_test(".foo { transition: ease-in 1s width 4s }", ".foo{transition:width 1s ease-in 4s}");
   }
 }

src/properties/mod.rs

@@ -9,6 +9,7 @@ pub mod box_shadow;
 pub mod border;
 pub mod border_image;
 pub mod border_radius;
+pub mod transition;
 
 use cssparser::*;
 use custom::*;
@@ -21,6 +22,7 @@ use box_shadow::*;
 use border::*;
 use border_image::*;
 use border_radius::*;
+use transition::*;
 use crate::values::{image::*, length::*, rect::*, color::*, time::Time, ident::CustomIdent, easing::EasingFunction};
 use crate::traits::{Parse, ToCss};
 use crate::printer::Printer;
@@ -234,7 +236,8 @@ pub enum Property {
   TransitionProperty(Vec<CustomIdent>),
   TransitionDuration(Vec<Time>),
   TransitionDelay(Vec<Time>),
-  TransitionTimingFunction(Vec<EasingFunction>)
+  TransitionTimingFunction(Vec<EasingFunction>),
+  Transition(Vec<Transition>)
 }
 
 impl Property {
@@ -430,6 +433,7 @@ impl Property {
       "transition-duration" => property!(TransitionDuration, Time, true),
       "transition-delay" => property!(TransitionDelay, Time, true),
       "transition-timing-function" => property!(TransitionTimingFunction, EasingFunction, true),
+      "transition" => property!(Transition, Transition, true),
       _ => {}
     }
 
@@ -633,6 +637,7 @@ impl Property {
       TransitionDuration(val) => property!("transition-duration", val, true),
       TransitionDelay(val) => property!("transition-delay", val, true),
       TransitionTimingFunction(val) => property!("transition-timing-function", val, true),
+      Transition(val) => property!("transition", val, true),
       Custom(custom) => {
         dest.write_str(custom.name.as_ref())?;
         dest.delim(':', false)?;

src/properties/transition.rs

@@ -0,0 +1,85 @@
+use cssparser::*;
+use crate::traits::{Parse, ToCss, PropertyHandler};
+use crate::values::{ident::CustomIdent, time::Time, easing::EasingFunction};
+use super::Property;
+use crate::printer::Printer;
+use std::fmt::Write;
+
+/// https://www.w3.org/TR/2018/WD-css-transitions-1-20181011/#transition-shorthand-property
+#[derive(Debug, Clone, PartialEq)]
+pub struct Transition {
+  property: CustomIdent,
+  duration: Time,
+  delay: Time,
+  timing_function: EasingFunction 
+}
+
+impl Parse for Transition {
+  fn parse<'i, 't>(input: &mut Parser<'i, 't>) -> Result<Self, ParseError<'i, ()>> {
+    let mut property = None;
+    let mut duration = None;
+    let mut delay = None;
+    let mut timing_function = None;
+
+    loop {
+      if duration.is_none() {
+        if let Ok(value) = input.try_parse(Time::parse) {
+          duration = Some(value);
+          continue
+        }
+      }
+
+      if timing_function.is_none() {
+        if let Ok(value) = input.try_parse(EasingFunction::parse) {
+          timing_function = Some(value);
+          continue
+        }
+      }
+
+      if delay.is_none() {
+        if let Ok(value) = input.try_parse(Time::parse) {
+          delay = Some(value);
+          continue
+        }
+      }
+
+      if property.is_none() {
+        if let Ok(value) = input.try_parse(CustomIdent::parse) {
+          property = Some(value);
+          continue
+        }
+      }
+
+      break
+    }
+
+    Ok(Transition {
+      property: property.unwrap_or(CustomIdent("all".into())),
+      duration: duration.unwrap_or(Time::Seconds(0.0)),
+      delay: delay.unwrap_or(Time::Seconds(0.0)),
+      timing_function: timing_function.unwrap_or(EasingFunction::Ease)
+    })
+  }
+}
+
+impl ToCss for Transition {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
+    self.property.to_css(dest)?;
+    if self.duration != 0.0 {
+      dest.write_char(' ')?;
+      self.duration.to_css(dest)?;
+    }
+
+    if self.timing_function != EasingFunction::Ease && self.timing_function != EasingFunction::CubicBezier(0.25, 0.1, 0.25, 1.0) {
+      dest.write_char(' ')?;
+      self.timing_function.to_css(dest)?;
+    }
+
+    if self.delay != 0.0 {
+      dest.write_char(' ')?;
+      self.delay.to_css(dest)?;
+    }
+
+    Ok(())
+  }
+}

src/values/ident.rs

@@ -5,7 +5,7 @@ use std::fmt::Write;
 
 /// https://www.w3.org/TR/css-values-4/#custom-idents
 #[derive(Debug, Clone, PartialEq)]
-pub struct CustomIdent(String);
+pub struct CustomIdent(pub String);
 
 impl Parse for CustomIdent {
   fn parse<'i, 't>(input: &mut Parser<'i, 't>) -> Result<Self, ParseError<'i, ()>> {