Merge branch 'feature/auto-cols-rows' into release/1.11.0

Author: ben-rogerson

__fixtures__/grid.js

@@ -205,6 +205,18 @@ tw`grid-flow-col`
 tw`grid-flow-row-dense`
 tw`grid-flow-col-dense`
 
+// https://tailwindcss.com/docs/grid-auto-columns
+tw`auto-cols-auto`
+tw`auto-cols-min`
+tw`auto-cols-max`
+tw`auto-cols-fr`
+
+// https://tailwindcss.com/docs/grid-auto-rows
+tw`auto-rows-auto`
+tw`auto-rows-min`
+tw`auto-rows-max`
+tw`auto-rows-fr`
+
 // Grid alignment utilities
 // https://github.com/tailwindlabs/tailwindcss/pull/2306
 

__snapshots__/plugin.test.js.snap

@@ -6855,6 +6855,18 @@ tw\`grid-flow-col\`
 tw\`grid-flow-row-dense\`
 tw\`grid-flow-col-dense\`
 
+// https://tailwindcss.com/docs/grid-auto-columns
+tw\`auto-cols-auto\`
+tw\`auto-cols-min\`
+tw\`auto-cols-max\`
+tw\`auto-cols-fr\`
+
+// https://tailwindcss.com/docs/grid-auto-rows
+tw\`auto-rows-auto\`
+tw\`auto-rows-min\`
+tw\`auto-rows-max\`
+tw\`auto-rows-fr\`
+
 // Grid alignment utilities
 // https://github.com/tailwindlabs/tailwindcss/pull/2306
 
@@ -7456,6 +7468,32 @@ tw\`place-self-stretch\`
 })
 ;({
   gridAutoFlow: 'col dense',
+}) // https://tailwindcss.com/docs/grid-auto-columns
+
+;({
+  gridAutoColumns: 'auto',
+})
+;({
+  gridAutoColumns: 'min-content',
+})
+;({
+  gridAutoColumns: 'max-content',
+})
+;({
+  gridAutoColumns: 'minmax(0, 1fr)',
+}) // https://tailwindcss.com/docs/grid-auto-rows
+
+;({
+  gridAutoRows: 'auto',
+})
+;({
+  gridAutoRows: 'min-content',
+})
+;({
+  gridAutoRows: 'max-content',
+})
+;({
+  gridAutoRows: 'minmax(0, 1fr)',
 }) // Grid alignment utilities
 // https://github.com/tailwindlabs/tailwindcss/pull/2306
 

src/config/dynamicStyles.js

@@ -96,6 +96,12 @@ export default {
   'row-start': { prop: 'gridRowStart', config: 'gridRowStart' },
   'row-end': { prop: 'gridRowEnd', config: 'gridRowEnd' },
 
+  // https://tailwindcss.com/docs/grid-auto-columns
+  'auto-cols': { prop: 'gridAutoColumns', config: 'gridAutoColumns' },
+
+  // https://tailwindcss.com/docs/grid-auto-rows
+  'auto-rows': { prop: 'gridAutoRows', config: 'gridAutoRows' },
+
   // https://tailwindcss.com/docs/gap
   gap: { prop: 'gap', config: 'gap' },
   'gap-x': {

src/config/staticStyles.js

@@ -279,6 +279,10 @@ export default {
   'grid-flow-row-dense': { output: { gridAutoFlow: 'row dense' } },
   'grid-flow-col-dense': { output: { gridAutoFlow: 'col dense' } },
 
+  // https://tailwindcss.com/docs/grid-auto-columns
+  // https://tailwindcss.com/docs/grid-auto-rows#app
+  // See dynamicStyles.js
+
   /**
    * ===========================================
    * Spacing