grid-auto-rows/columns

Author: devongovett

src/lib.rs

@@ -5627,5 +5627,15 @@ mod tests {
     minify_test(".foo { grid-template-columns: 200px repeat(auto-fill, 100px) 300px; }", ".foo{grid-template-columns:200px repeat(auto-fill,100px) 300px}");
     minify_test(".foo { grid-template-columns: [linename1 linename2] 100px repeat(auto-fit, [linename1] 300px) [linename3]; }", ".foo{grid-template-columns:[linename1 linename2]100px repeat(auto-fit,[linename1]300px)[linename3]}");
     minify_test(".foo { grid-template-rows: [linename1 linename2] 100px repeat(auto-fit, [linename1] 300px) [linename3]; }", ".foo{grid-template-rows:[linename1 linename2]100px repeat(auto-fit,[linename1]300px)[linename3]}");
+
+    minify_test(".foo { grid-auto-rows: auto; }", ".foo{grid-auto-rows:auto}");
+    minify_test(".foo { grid-auto-rows: 1fr; }", ".foo{grid-auto-rows:1fr}");
+    minify_test(".foo { grid-auto-rows: 100px; }", ".foo{grid-auto-rows:100px}");
+    minify_test(".foo { grid-auto-rows: min-content; }", ".foo{grid-auto-rows:min-content}");
+    minify_test(".foo { grid-auto-rows: max-content; }", ".foo{grid-auto-rows:max-content}");
+    minify_test(".foo { grid-auto-rows: minmax(100px,auto); }", ".foo{grid-auto-rows:minmax(100px,auto)}");
+    minify_test(".foo { grid-auto-rows: fit-content(20%); }", ".foo{grid-auto-rows:fit-content(20%)}");
+    minify_test(".foo { grid-auto-rows: 100px minmax(100px, auto) 10% 0.5fr fit-content(400px); }", ".foo{grid-auto-rows:100px minmax(100px,auto) 10% .5fr fit-content(400px)}");
+    minify_test(".foo { grid-auto-columns: 100px minmax(100px, auto) 10% 0.5fr fit-content(400px); }", ".foo{grid-auto-columns:100px minmax(100px,auto) 10% .5fr fit-content(400px)}");
   }
 }

src/properties/grid.rs

@@ -36,6 +36,10 @@ pub enum TrackSize {
   FitContent(LengthPercentage)
 }
 
+/// https://drafts.csswg.org/css-grid-2/#auto-tracks
+#[derive(Debug, Clone, PartialEq)]
+pub struct TrackSizeList(pub SmallVec<[TrackSize; 1]>);
+
 /// https://drafts.csswg.org/css-grid-2/#typedef-track-breadth
 #[derive(Debug, Clone, PartialEq)]
 pub enum TrackBreadth {
@@ -347,3 +351,28 @@ impl ToCss for TrackSizing {
     }
   }
 }
+
+impl Parse for TrackSizeList {
+  fn parse<'i, 't>(input: &mut Parser<'i, 't>) -> Result<Self, ParseError<'i, ()>> {
+    let mut res = SmallVec::new();
+    while let Ok(size) = input.try_parse(TrackSize::parse) {
+      res.push(size)
+    }
+    Ok(TrackSizeList(res))
+  }
+}
+
+impl ToCss for TrackSizeList {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
+    let mut first = true;
+    for item in &self.0 {
+      if first {
+        first = false;
+      } else {
+        dest.write_char(' ')?;
+      }
+      item.to_css(dest)?;
+    }
+    Ok(())
+  }
+}

src/properties/mod.rs

@@ -334,6 +334,8 @@ define_properties! {
 
   "grid-template-columns": GridTemplateColumns(TrackSizing),
   "grid-template-rows": GridTemplateRows(TrackSizing),
+  "grid-auto-columns": GridAutoColumns(TrackSizeList),
+  "grid-auto-rows": GridAutoRows(TrackSizeList),
 
   "margin-top": MarginTop(LengthPercentageOrAuto),
   "margin-bottom": MarginBottom(LengthPercentageOrAuto),