Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[docs] Remove react@15 message #11399

Merged
merged 2 commits into from
May 15, 2018
Merged

[docs] Remove react@15 message #11399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bdf075
Changed MuiThemeProvider to have one child
jeffwillette May 15, 2018
96d5da1
[docs] Remove react@15 message
oliviertassinari May 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/material-ui/src/CssBaseline/CssBaseline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class CssBaseline extends React.Component {

CssBaseline.propTypes = {
/**
* You can only provide a single element with react@15, a node with react@16.
* You can wrap a node.
*/
children: PropTypes.node,
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/material-ui/src/styles/MuiThemeProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class MuiThemeProvider extends React.Component {

MuiThemeProvider.propTypes = {
/**
* You can only provide a single element with react@15, a node with react@16.
* You can wrap a node.
*/
children: PropTypes.node.isRequired,
/**
Expand Down
2 changes: 1 addition & 1 deletion pages/api/css-baseline.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Kickstart an elegant, consistent, and simple baseline to build upon.

| Name | Type | Default | Description |
|:-----|:-----|:--------|:------------|
| <span class="prop-name">children</span> | <span class="prop-type">node | <span class="prop-default">null</span> | You can only provide a single element with react@15, a node with react@16. |
| <span class="prop-name">children</span> | <span class="prop-type">node | <span class="prop-default">null</span> | You can wrap a node. |

Any other properties supplied will be [spread to the root element](/guides/api#spread).

Expand Down
2 changes: 1 addition & 1 deletion pages/api/mui-theme-provider.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This component should preferably be used at **the root of your component tree**.

| Name | Type | Default | Description |
|:-----|:-----|:--------|:------------|
| <span class="prop-name required">children *</span> | <span class="prop-type">node | | You can only provide a single element with react@15, a node with react@16. |
| <span class="prop-name required">children *</span> | <span class="prop-type">node | | You can wrap a node. |
| <span class="prop-name">disableStylesGeneration</span> | <span class="prop-type">bool | | You can disable the generation of the styles with this option. It can be useful when traversing the React tree outside of the HTML rendering step on the server. Let's say you are using react-apollo to extract all the queries made by the interface server side. You can significantly speed up the traversal with this property. |
| <span class="prop-name">sheetsManager</span> | <span class="prop-type">object | | The sheetsManager is used to deduplicate style sheet injection in the page. It's deduplicating using the (theme, styles) couple. On the server, you should provide a new instance for each request. |
| <span class="prop-name required">theme *</span> | <span class="prop-type">union:&nbsp;object&nbsp;&#124;<br>&nbsp;func<br> | | A theme object. |
Expand Down