Skip to content

Commit

Permalink
Merge branch 'next' into feat/typography-system-props
Browse files Browse the repository at this point in the history
  • Loading branch information
mnajdova authored Jan 22, 2021
2 parents 3a49aec + 9aa6e97 commit 50a84c3
Show file tree
Hide file tree
Showing 75 changed files with 1,057 additions and 685 deletions.
5 changes: 3 additions & 2 deletions docs/pages/api-docs/accordion-actions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"props": {
"children": { "type": { "name": "node" } },
"classes": { "type": { "name": "object" } },
"disableSpacing": { "type": { "name": "bool" } }
"disableSpacing": { "type": { "name": "bool" } },
"sx": { "type": { "name": "object" } }
},
"name": "AccordionActions",
"styles": { "classes": ["root", "spacing"], "globalClasses": {}, "name": "MuiAccordionActions" },
Expand All @@ -11,6 +12,6 @@
"filename": "/packages/material-ui/src/AccordionActions/AccordionActions.js",
"inheritance": null,
"demos": "<ul><li><a href=\"/components/accordion/\">Accordion</a></li></ul>",
"styledComponent": false,
"styledComponent": true,
"cssComponent": false
}
5 changes: 3 additions & 2 deletions docs/pages/api-docs/accordion-details.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"props": {
"children": { "type": { "name": "node" } },
"classes": { "type": { "name": "object" } }
"classes": { "type": { "name": "object" } },
"sx": { "type": { "name": "object" } }
},
"name": "AccordionDetails",
"styles": { "classes": ["root"], "globalClasses": {}, "name": "MuiAccordionDetails" },
Expand All @@ -10,6 +11,6 @@
"filename": "/packages/material-ui/src/AccordionDetails/AccordionDetails.js",
"inheritance": null,
"demos": "<ul><li><a href=\"/components/accordion/\">Accordion</a></li></ul>",
"styledComponent": false,
"styledComponent": true,
"cssComponent": false
}
3 changes: 2 additions & 1 deletion docs/pages/api-docs/accordion.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"expanded": { "type": { "name": "bool" } },
"onChange": { "type": { "name": "func" } },
"square": { "type": { "name": "bool" } },
"sx": { "type": { "name": "object" } },
"TransitionComponent": { "type": { "name": "elementType" }, "default": "Collapse" },
"TransitionProps": { "type": { "name": "object" } }
},
Expand All @@ -21,6 +22,6 @@
"filename": "/packages/material-ui/src/Accordion/Accordion.js",
"inheritance": { "component": "Paper", "pathname": "/api/paper/" },
"demos": "<ul><li><a href=\"/components/accordion/\">Accordion</a></li></ul>",
"styledComponent": false,
"styledComponent": true,
"cssComponent": false
}
4 changes: 2 additions & 2 deletions docs/pages/api-docs/autocomplete.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"props": {
"options": { "type": { "name": "array" }, "required": true },
"renderInput": { "type": { "name": "func" }, "required": true },
"autoComplete": { "type": { "name": "bool" } },
"autoHighlight": { "type": { "name": "bool" } },
"autoSelect": { "type": { "name": "bool" } },
Expand Down Expand Up @@ -59,12 +61,10 @@
"open": { "type": { "name": "bool" } },
"openOnFocus": { "type": { "name": "bool" } },
"openText": { "type": { "name": "string" }, "default": "'Open'" },
"options": { "type": { "name": "array" }, "required": true },
"PaperComponent": { "type": { "name": "elementType" }, "default": "Paper" },
"PopperComponent": { "type": { "name": "elementType" }, "default": "Popper" },
"popupIcon": { "type": { "name": "node" }, "default": "<ArrowDropDownIcon />" },
"renderGroup": { "type": { "name": "func" } },
"renderInput": { "type": { "name": "func" }, "required": true },
"renderOption": { "type": { "name": "func" } },
"renderTags": { "type": { "name": "func" } },
"selectOnFocus": { "type": { "name": "bool" }, "default": "!props.freeSolo" },
Expand Down
5 changes: 3 additions & 2 deletions docs/pages/api-docs/backdrop.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"props": {
"open": { "type": { "name": "bool" }, "required": true },
"children": { "type": { "name": "node" } },
"classes": { "type": { "name": "object" } },
"invisible": { "type": { "name": "bool" } },
"open": { "type": { "name": "bool" }, "required": true },
"sx": { "type": { "name": "object" } },
"transitionDuration": {
"type": {
"name": "union",
Expand All @@ -18,6 +19,6 @@
"filename": "/packages/material-ui/src/Backdrop/Backdrop.js",
"inheritance": { "component": "Fade", "pathname": "/api/fade/" },
"demos": "<ul><li><a href=\"/components/backdrop/\">Backdrop</a></li></ul>",
"styledComponent": false,
"styledComponent": true,
"cssComponent": false
}
4 changes: 2 additions & 2 deletions docs/pages/api-docs/badge.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
},
"default": "'default'"
},
"component": { "type": { "name": "elementType" } },
"components": {
"type": { "name": "shape", "description": "{ Badge?: elementType, Root?: elementType }" },
"default": "{}"
Expand All @@ -36,8 +37,7 @@
"description": "'dot'<br>&#124;&nbsp;'standard'<br>&#124;&nbsp;string"
},
"default": "'standard'"
},
"component": { "type": { "name": "elementType" } }
}
},
"name": "Badge",
"styles": {
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/api-docs/click-away-listener.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"props": {
"children": { "type": { "name": "custom", "description": "element" }, "required": true },
"onClickAway": { "type": { "name": "func" }, "required": true },
"disableReactTree": { "type": { "name": "bool" } },
"mouseEvent": {
"type": {
Expand All @@ -9,7 +10,6 @@
},
"default": "'onClick'"
},
"onClickAway": { "type": { "name": "func" }, "required": true },
"touchEvent": {
"type": {
"name": "enum",
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/api-docs/dialog.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"props": {
"open": { "type": { "name": "bool" }, "required": true },
"aria-describedby": { "type": { "name": "string" } },
"aria-labelledby": { "type": { "name": "string" } },
"children": { "type": { "name": "node" } },
Expand All @@ -16,7 +17,6 @@
},
"onBackdropClick": { "type": { "name": "func" } },
"onClose": { "type": { "name": "func" } },
"open": { "type": { "name": "bool" }, "required": true },
"PaperComponent": { "type": { "name": "elementType" }, "default": "Paper" },
"PaperProps": { "type": { "name": "object" }, "default": "{}" },
"scroll": {
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/api-docs/form-control-label.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"props": {
"control": { "type": { "name": "element" }, "required": true },
"checked": { "type": { "name": "bool" } },
"classes": { "type": { "name": "object" } },
"control": { "type": { "name": "element" }, "required": true },
"disabled": { "type": { "name": "bool" } },
"inputRef": { "type": { "name": "custom", "description": "ref" } },
"label": { "type": { "name": "node" } },
Expand Down
3 changes: 2 additions & 1 deletion docs/pages/api-docs/link.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"classes": { "type": { "name": "object" } },
"color": { "type": { "name": "any" }, "default": "'primary'" },
"component": { "type": { "name": "custom", "description": "element type" } },
"sx": { "type": { "name": "object" } },
"TypographyClasses": { "type": { "name": "object" } },
"underline": {
"type": {
Expand Down Expand Up @@ -38,6 +39,6 @@
"filename": "/packages/material-ui/src/Link/Link.js",
"inheritance": { "component": "Typography", "pathname": "/api/typography/" },
"demos": "<ul><li><a href=\"/components/breadcrumbs/\">Breadcrumbs</a></li>\n<li><a href=\"/components/links/\">Links</a></li></ul>",
"styledComponent": false,
"styledComponent": true,
"cssComponent": false
}
2 changes: 1 addition & 1 deletion docs/pages/api-docs/menu.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"props": {
"open": { "type": { "name": "bool" }, "required": true },
"anchorEl": { "type": { "name": "union", "description": "HTML element<br>&#124;&nbsp;func" } },
"autoFocus": { "type": { "name": "bool" }, "default": "true" },
"children": { "type": { "name": "node" } },
"classes": { "type": { "name": "object" } },
"disableAutoFocusItem": { "type": { "name": "bool" } },
"MenuListProps": { "type": { "name": "object" }, "default": "{}" },
"onClose": { "type": { "name": "func" } },
"open": { "type": { "name": "bool" }, "required": true },
"PopoverClasses": { "type": { "name": "object" } },
"transitionDuration": {
"type": {
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/api-docs/mobile-stepper.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"props": {
"steps": { "type": { "name": "number" }, "required": true },
"activeStep": { "type": { "name": "number" }, "default": "0" },
"backButton": { "type": { "name": "node" } },
"classes": { "type": { "name": "object" } },
Expand All @@ -12,7 +13,6 @@
},
"default": "'bottom'"
},
"steps": { "type": { "name": "number" }, "required": true },
"variant": {
"type": {
"name": "enum",
Expand Down
6 changes: 3 additions & 3 deletions docs/pages/api-docs/modal.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"props": {
"children": { "type": { "name": "custom", "description": "element" }, "required": true },
"open": { "type": { "name": "bool" }, "required": true },
"BackdropComponent": { "type": { "name": "elementType" }, "default": "SimpleBackdrop" },
"BackdropProps": { "type": { "name": "object" } },
"children": { "type": { "name": "custom", "description": "element" }, "required": true },
"closeAfterTransition": { "type": { "name": "bool" } },
"container": { "type": { "name": "union", "description": "HTML element<br>&#124;&nbsp;func" } },
"disableAutoFocus": { "type": { "name": "bool" } },
Expand All @@ -14,8 +15,7 @@
"hideBackdrop": { "type": { "name": "bool" } },
"keepMounted": { "type": { "name": "bool" } },
"onBackdropClick": { "type": { "name": "func" } },
"onClose": { "type": { "name": "func" } },
"open": { "type": { "name": "bool" }, "required": true }
"onClose": { "type": { "name": "func" } }
},
"name": "Modal",
"styles": { "classes": [], "globalClasses": {}, "name": null },
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/api-docs/popover.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"props": {
"open": { "type": { "name": "bool" }, "required": true },
"action": { "type": { "name": "custom", "description": "ref" } },
"anchorEl": { "type": { "name": "custom", "description": "HTML element<br>&#124;&nbsp;func" } },
"anchorOrigin": {
Expand All @@ -26,7 +27,6 @@
"getContentAnchorEl": { "type": { "name": "func" } },
"marginThreshold": { "type": { "name": "number" }, "default": "16" },
"onClose": { "type": { "name": "func" } },
"open": { "type": { "name": "bool" }, "required": true },
"PaperProps": {
"type": { "name": "shape", "description": "{ component?: element type }" },
"default": "{}"
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/api-docs/popper.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"props": {
"open": { "type": { "name": "bool" }, "required": true },
"anchorEl": {
"type": {
"name": "custom",
Expand All @@ -16,7 +17,6 @@
"description": "Array&lt;{ data?: object, effect?: func, enabled?: bool, fn?: func, name: any, options?: object, phase?: 'afterMain'<br>&#124;&nbsp;'afterRead'<br>&#124;&nbsp;'afterWrite'<br>&#124;&nbsp;'beforeMain'<br>&#124;&nbsp;'beforeRead'<br>&#124;&nbsp;'beforeWrite'<br>&#124;&nbsp;'main'<br>&#124;&nbsp;'read'<br>&#124;&nbsp;'write', requires?: Array&lt;string&gt;, requiresIfExists?: Array&lt;string&gt; }&gt;"
}
},
"open": { "type": { "name": "bool" }, "required": true },
"placement": {
"type": {
"name": "enum",
Expand Down
4 changes: 2 additions & 2 deletions docs/pages/api-docs/slider.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"type": { "name": "enum", "description": "'primary'<br>&#124;&nbsp;'secondary'" },
"default": "'primary'"
},
"component": { "type": { "name": "elementType" } },
"components": {
"type": {
"name": "shape",
Expand Down Expand Up @@ -59,8 +60,7 @@
"valueLabelFormat": {
"type": { "name": "union", "description": "func<br>&#124;&nbsp;string" },
"default": "(x) => x"
},
"component": { "type": { "name": "elementType" } }
}
},
"name": "Slider",
"styles": {
Expand Down
6 changes: 3 additions & 3 deletions docs/pages/api-docs/swipeable-drawer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"props": {
"onClose": { "type": { "name": "func" }, "required": true },
"onOpen": { "type": { "name": "func" }, "required": true },
"open": { "type": { "name": "bool" }, "required": true },
"children": { "type": { "name": "node" } },
"disableBackdropTransition": { "type": { "name": "bool" } },
"disableDiscovery": { "type": { "name": "bool" } },
Expand All @@ -9,9 +12,6 @@
},
"hysteresis": { "type": { "name": "number" }, "default": "0.52" },
"minFlingVelocity": { "type": { "name": "number" }, "default": "450" },
"onClose": { "type": { "name": "func" }, "required": true },
"onOpen": { "type": { "name": "func" }, "required": true },
"open": { "type": { "name": "bool" }, "required": true },
"SwipeAreaProps": { "type": { "name": "object" } },
"swipeAreaWidth": { "type": { "name": "number" }, "default": "20" },
"transitionDuration": {
Expand Down
4 changes: 2 additions & 2 deletions docs/pages/api-docs/tab-context.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"props": {
"children": { "type": { "name": "node" } },
"value": { "type": { "name": "string" }, "required": true }
"value": { "type": { "name": "string" }, "required": true },
"children": { "type": { "name": "node" } }
},
"name": "TabContext",
"styles": { "classes": [], "globalClasses": {}, "name": null },
Expand Down
4 changes: 2 additions & 2 deletions docs/pages/api-docs/tab-panel.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"props": {
"value": { "type": { "name": "string" }, "required": true },
"children": { "type": { "name": "node" } },
"classes": { "type": { "name": "object" } },
"value": { "type": { "name": "string" }, "required": true }
"classes": { "type": { "name": "object" } }
},
"name": "TabPanel",
"styles": { "classes": ["root"], "globalClasses": {}, "name": "MuiTabPanel" },
Expand Down
8 changes: 4 additions & 4 deletions docs/pages/api-docs/tab-scroll-button.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"props": {
"children": { "type": { "name": "node" } },
"classes": { "type": { "name": "object" } },
"direction": {
"type": { "name": "enum", "description": "'left'<br>&#124;&nbsp;'right'" },
"required": true
},
"disabled": { "type": { "name": "bool" } },
"orientation": {
"type": { "name": "enum", "description": "'horizontal'<br>&#124;&nbsp;'vertical'" },
"required": true
}
},
"children": { "type": { "name": "node" } },
"classes": { "type": { "name": "object" } },
"disabled": { "type": { "name": "bool" } }
},
"name": "TabScrollButton",
"styles": {
Expand Down
8 changes: 4 additions & 4 deletions docs/pages/api-docs/table-pagination.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
"props": {
"count": { "type": { "name": "number" }, "required": true },
"onPageChange": { "type": { "name": "func" }, "required": true },
"page": { "type": { "name": "custom", "description": "number" }, "required": true },
"rowsPerPage": { "type": { "name": "number" }, "required": true },
"ActionsComponent": { "type": { "name": "elementType" }, "default": "TablePaginationActions" },
"backIconButtonProps": { "type": { "name": "object" } },
"classes": { "type": { "name": "object" } },
"component": { "type": { "name": "elementType" } },
"count": { "type": { "name": "number" }, "required": true },
"getItemAriaLabel": {
"type": { "name": "func" },
"default": "function defaultGetAriaLabel(type) {\n return `Go to ${type} page`;\n}"
Expand All @@ -15,10 +18,7 @@
},
"labelRowsPerPage": { "type": { "name": "node" }, "default": "'Rows per page:'" },
"nextIconButtonProps": { "type": { "name": "object" } },
"onPageChange": { "type": { "name": "func" }, "required": true },
"onRowsPerPageChange": { "type": { "name": "func" } },
"page": { "type": { "name": "custom", "description": "number" }, "required": true },
"rowsPerPage": { "type": { "name": "number" }, "required": true },
"rowsPerPageOptions": {
"type": {
"name": "arrayOf",
Expand Down
4 changes: 2 additions & 2 deletions docs/pages/api-docs/toggle-button.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"props": {
"value": { "type": { "name": "any" }, "required": true },
"children": { "type": { "name": "node" } },
"classes": { "type": { "name": "object" } },
"disabled": { "type": { "name": "bool" } },
Expand All @@ -12,8 +13,7 @@
"description": "'large'<br>&#124;&nbsp;'medium'<br>&#124;&nbsp;'small'"
},
"default": "'medium'"
},
"value": { "type": { "name": "any" }, "required": true }
}
},
"name": "ToggleButton",
"styles": {
Expand Down
4 changes: 2 additions & 2 deletions docs/pages/api-docs/tooltip.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"props": {
"arrow": { "type": { "name": "bool" } },
"children": { "type": { "name": "custom", "description": "element" }, "required": true },
"title": { "type": { "name": "node" }, "required": true },
"arrow": { "type": { "name": "bool" } },
"classes": { "type": { "name": "object" } },
"describeChild": { "type": { "name": "bool" } },
"disableFocusListener": { "type": { "name": "bool" } },
Expand All @@ -27,7 +28,6 @@
},
"PopperComponent": { "type": { "name": "elementType" }, "default": "Popper" },
"PopperProps": { "type": { "name": "object" }, "default": "{}" },
"title": { "type": { "name": "node" }, "required": true },
"TransitionComponent": { "type": { "name": "elementType" }, "default": "Grow" },
"TransitionProps": { "type": { "name": "object" } }
},
Expand Down
Loading

0 comments on commit 50a84c3

Please sign in to comment.