[core] Add grid support for Box

Resolves #15878
mui · Sep 5, 2019 · 121e9e9 · 121e9e9
1 parent d50e500
commit 121e9e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -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,