From 96347030c1873408d32adf9a8c80cfb53681a026 Mon Sep 17 00:00:00 2001
From: David Edmondson <threehams@gmail.com>
Date: Thu, 7 Feb 2019 21:34:26 -0800
Subject: [PATCH 1/4] Add missing justifyItems definition.

---
 types/styled-system/index.d.ts              |  4 +++-
 types/styled-system/styled-system-tests.tsx | 10 +++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/types/styled-system/index.d.ts b/types/styled-system/index.d.ts
index 19b9afcd5f..028ced7314 100644
--- a/types/styled-system/index.d.ts
+++ b/types/styled-system/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for styled-system 3.2
+// Type definitions for styled-system 3.2.1
 // Project: https://github.com/jxnblk/styled-system#readme
 // Definitions by: Marshall Bowers <https://github.com/maxdeviant>
 //                 Ben McCormick <https://github.com/phobon>
@@ -421,6 +421,8 @@ export interface JustifyItemsProps {
     justifyItems?: ResponsiveValue<CSS.JustifyItemsProperty>;
 }
 
+export function justifyItems(...args: any[]): any;
+
 export interface JustifyContentProps {
     /**
      * The CSS justify-content property defines how the browser distributes space between and around content items
diff --git a/types/styled-system/styled-system-tests.tsx b/types/styled-system/styled-system-tests.tsx
index 397e1b0402..bfedc38182 100644
--- a/types/styled-system/styled-system-tests.tsx
+++ b/types/styled-system/styled-system-tests.tsx
@@ -43,6 +43,8 @@ import {
     alignContent,
     justifyContent,
     JustifyContentProps,
+    justifyItems,
+    JustifyItemsProps,
     FlexWrapProps,
     flexWrap,
     flexBasis,
@@ -273,7 +275,8 @@ interface GridComponentProps
         GridAutoColumnsProps,
         GridAutoRowsProps,
         GridTemplatesRowsProps,
-        GridTemplatesColumnsProps {}
+        GridTemplatesColumnsProps,
+        JustifyItemsProps {}
 const Grid: React.ComponentType<GridComponentProps> = styled`
     ${gridGap};
     ${gridRowGap};
@@ -285,6 +288,7 @@ const Grid: React.ComponentType<GridComponentProps> = styled`
     ${gridAutoColumns};
     ${gridTemplateRows};
     ${gridTemplateColumns};
+    ${justifyItems};
 `;
 
 interface ButtonProps
@@ -467,6 +471,10 @@ const test = () => (
         <Grid gridTemplateColumns="auto" />
         <Grid gridTemplateColumns={["auto", "1fr"]} />
         <Grid gridTemplateColumns={{ sm: "auto", md: "1fr" }} />
+        // justifyItems
+        <Grid justifyItems="baseline" />
+        <Grid justifyItems={["baseline", "center"]} />
+        <Grid justifyItems={{ sm: "baseline", md: "center" }} />
         // flex (responsive)
         <Box flex="1 1 auto" />
         <Box flex={["1 1 auto"]} />

From 247a03b2198d698e7283095f951aebf549705668 Mon Sep 17 00:00:00 2001
From: David Edmondson <threehams@gmail.com>
Date: Thu, 7 Feb 2019 22:32:38 -0800
Subject: [PATCH 2/4] Remove patch version

---
 types/styled-system/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/styled-system/index.d.ts b/types/styled-system/index.d.ts
index 028ced7314..788e8c305f 100644
--- a/types/styled-system/index.d.ts
+++ b/types/styled-system/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for styled-system 3.2.1
+// Type definitions for styled-system 3.2
 // Project: https://github.com/jxnblk/styled-system#readme
 // Definitions by: Marshall Bowers <https://github.com/maxdeviant>
 //                 Ben McCormick <https://github.com/phobon>

From f6036e83cf9b93ae5e7c890440a2021b1f80ffe9 Mon Sep 17 00:00:00 2001
From: David Edmondson <threehams@gmail.com>
Date: Thu, 7 Feb 2019 23:10:35 -0800
Subject: [PATCH 3/4] Organize justifyItems with Flex

---
 types/styled-system/styled-system-tests.tsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/types/styled-system/styled-system-tests.tsx b/types/styled-system/styled-system-tests.tsx
index bfedc38182..ce7b8d24ff 100644
--- a/types/styled-system/styled-system-tests.tsx
+++ b/types/styled-system/styled-system-tests.tsx
@@ -255,7 +255,8 @@ interface FlexComponentProps
         JustifyContentProps,
         FlexWrapProps,
         FlexBasisProps,
-        FlexDirectionProps {}
+        FlexDirectionProps,
+        JustifyItemsProps {}
 const Flex: React.ComponentType<FlexComponentProps> = styled`
     ${alignItems};
     ${alignContent};
@@ -263,6 +264,7 @@ const Flex: React.ComponentType<FlexComponentProps> = styled`
     ${flexWrap};
     ${flexBasis};
     ${flexDirection};
+    ${justifyItems};
 `;
 
 interface GridComponentProps
@@ -275,8 +277,7 @@ interface GridComponentProps
         GridAutoColumnsProps,
         GridAutoRowsProps,
         GridTemplatesRowsProps,
-        GridTemplatesColumnsProps,
-        JustifyItemsProps {}
+        GridTemplatesColumnsProps{}
 const Grid: React.ComponentType<GridComponentProps> = styled`
     ${gridGap};
     ${gridRowGap};
@@ -288,7 +289,6 @@ const Grid: React.ComponentType<GridComponentProps> = styled`
     ${gridAutoColumns};
     ${gridTemplateRows};
     ${gridTemplateColumns};
-    ${justifyItems};
 `;
 
 interface ButtonProps
@@ -431,6 +431,10 @@ const test = () => (
         <Flex flexDirection="column" />
         <Flex flexDirection={["column"]} />
         <Flex flexDirection={{ sm: "column" }} />
+        // justifyItems
+        <Flex justifyItems="baseline" />
+        <Flex justifyItems={["baseline", "center"]} />
+        <Flex justifyItems={{ sm: "baseline", md: "center" }} />
         // gridGap
         <Grid gridGap="1px" />
         <Grid gridGap={["1", "2"]} />
@@ -471,10 +475,6 @@ const test = () => (
         <Grid gridTemplateColumns="auto" />
         <Grid gridTemplateColumns={["auto", "1fr"]} />
         <Grid gridTemplateColumns={{ sm: "auto", md: "1fr" }} />
-        // justifyItems
-        <Grid justifyItems="baseline" />
-        <Grid justifyItems={["baseline", "center"]} />
-        <Grid justifyItems={{ sm: "baseline", md: "center" }} />
         // flex (responsive)
         <Box flex="1 1 auto" />
         <Box flex={["1 1 auto"]} />

From 66469de2630f121c4cba2de554deea2265f39836 Mon Sep 17 00:00:00 2001
From: David Edmondson <threehams@gmail.com>
Date: Fri, 8 Feb 2019 19:25:08 -0800
Subject: [PATCH 4/4] Revert whitespace change

---
 types/styled-system/styled-system-tests.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/styled-system/styled-system-tests.tsx b/types/styled-system/styled-system-tests.tsx
index ce7b8d24ff..1a008fa045 100644
--- a/types/styled-system/styled-system-tests.tsx
+++ b/types/styled-system/styled-system-tests.tsx
@@ -277,7 +277,7 @@ interface GridComponentProps
         GridAutoColumnsProps,
         GridAutoRowsProps,
         GridTemplatesRowsProps,
-        GridTemplatesColumnsProps{}
+        GridTemplatesColumnsProps {}
 const Grid: React.ComponentType<GridComponentProps> = styled`
     ${gridGap};
     ${gridRowGap};