failed tests resolved

mui · Jun 4, 2021 · 18cb6a6 · 18cb6a6
1 parent ea74456
commit 18cb6a6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/docs/pages/api-docs/grid.json b/docs/pages/api-docs/grid.json
@@ -7,8 +7,8 @@
     "container": { "type": { "name": "bool" } },
     "direction": {
       "type": {
-        "name": "enum",
-        "description": "'column-reverse'<br>&#124;&nbsp;'column'<br>&#124;&nbsp;'row-reverse'<br>&#124;&nbsp;'row'"
+        "name": "union",
+        "description": "'column-reverse'<br>&#124;&nbsp;'column'<br>&#124;&nbsp;'row-reverse'<br>&#124;&nbsp;'row'<br>&#124;&nbsp;Array&lt;'column-reverse'<br>&#124;&nbsp;'column'<br>&#124;&nbsp;'row-reverse'<br>&#124;&nbsp;'row'&gt;<br>&#124;&nbsp;object"
       },
       "default": "'row'"
     },
@@ -35,7 +35,10 @@
       "default": "false"
     },
     "spacing": {
-      "type": { "name": "union", "description": "number<br>&#124;&nbsp;string" },
+      "type": {
+        "name": "union",
+        "description": "Array&lt;number<br>&#124;&nbsp;string&gt;<br>&#124;&nbsp;number<br>&#124;&nbsp;object<br>&#124;&nbsp;string"
+      },
       "default": "0"
     },
     "sx": { "type": { "name": "object" } },

diff --git a/packages/material-ui/src/Grid/Grid.js b/packages/material-ui/src/Grid/Grid.js
@@ -299,7 +299,11 @@ Grid.propTypes /* remove-proptypes */ = {
    * It is applied for all screen sizes.
    * @default 'row'
    */
-  direction: PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row']),
+  direction: PropTypes.oneOfType([
+    PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row']),
+    PropTypes.arrayOf(PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row'])),
+    PropTypes.object,
+  ]),
   /**
    * If `true`, the component will have the flex *item* behavior.
    * You should be wrapping *items* with a *container*.
@@ -338,7 +342,12 @@ Grid.propTypes /* remove-proptypes */ = {
    * It can only be used on a type `container` component.
    * @default 0
    */
-  spacing: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+  spacing: PropTypes.oneOfType([
+    PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])),
+    PropTypes.number,
+    PropTypes.object,
+    PropTypes.string,
+  ]),
   /**
    * The system prop that allows defining system overrides as well as additional CSS styles.
    */