From 121e9e9c5c9ab1c89a31d349d473be1b8470eb59 Mon Sep 17 00:00:00 2001
From: Adam Lavin <adam.lavin@volo.ai>
Date: Thu, 5 Sep 2019 14:58:40 +0100
Subject: [PATCH] [core] Add grid support for Box

Resolves #15878
---
 packages/material-ui/src/Box/Box.d.ts | 3 +++
 packages/material-ui/src/Box/Box.js   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/packages/material-ui/src/Box/Box.d.ts b/packages/material-ui/src/Box/Box.d.ts
index 6cf8aa7dca27a0..14f1b6197f83f2 100644
--- a/packages/material-ui/src/Box/Box.d.ts
+++ b/packages/material-ui/src/Box/Box.d.ts
@@ -4,6 +4,7 @@ import {
   ComposedStyleFunction,
   display,
   flexbox,
+  grid,
   palette,
   positions,
   shadows,
@@ -19,6 +20,7 @@ type BoxStyleFunction = ComposedStyleFunction<
     typeof borders,
     typeof display,
     typeof flexbox,
+    typeof grid,
     typeof palette,
     typeof positions,
     typeof shadows,
@@ -42,3 +44,4 @@ export interface BoxProps extends ElementProps, SystemProps {
 declare const Box: React.ComponentType<BoxProps>;
 
 export default Box;
+
diff --git a/packages/material-ui/src/Box/Box.js b/packages/material-ui/src/Box/Box.js
index 4af695551db5a3..10b85801656fa9 100644
--- a/packages/material-ui/src/Box/Box.js
+++ b/packages/material-ui/src/Box/Box.js
@@ -3,6 +3,7 @@ import {
   compose,
   display,
   flexbox,
+  grid,
   palette,
   positions,
   shadows,
@@ -18,6 +19,7 @@ export const styleFunction = css(
     borders,
     display,
     flexbox,
+    grid,
     positions,
     palette,
     shadows,