From 20cd5cbf600bf973c8481c57f7cdca446fa0a892 Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Sun, 26 Jan 2020 21:39:49 +0100 Subject: [PATCH 01/19] [docs] Use style root convention --- docs/src/pages/components/cards/ImgMediaCard.js | 4 ++-- docs/src/pages/components/cards/ImgMediaCard.tsx | 4 ++-- docs/src/pages/components/cards/MediaCard.js | 4 ++-- docs/src/pages/components/cards/MediaCard.tsx | 4 ++-- docs/src/pages/components/cards/MediaControlCard.js | 4 ++-- docs/src/pages/components/cards/MediaControlCard.tsx | 4 ++-- docs/src/pages/components/cards/OutlinedCard.js | 4 ++-- docs/src/pages/components/cards/OutlinedCard.tsx | 4 ++-- docs/src/pages/components/cards/RecipeReviewCard.js | 4 ++-- docs/src/pages/components/cards/RecipeReviewCard.tsx | 4 ++-- docs/src/pages/components/cards/SimpleCard.js | 4 ++-- docs/src/pages/components/cards/SimpleCard.tsx | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/src/pages/components/cards/ImgMediaCard.js b/docs/src/pages/components/cards/ImgMediaCard.js index 8b900f47bf99e2..1a967b8cc74217 100644 --- a/docs/src/pages/components/cards/ImgMediaCard.js +++ b/docs/src/pages/components/cards/ImgMediaCard.js @@ -9,7 +9,7 @@ import Button from '@material-ui/core/Button'; import Typography from '@material-ui/core/Typography'; const useStyles = makeStyles({ - card: { + root: { maxWidth: 345, }, }); @@ -18,7 +18,7 @@ export default function ImgMediaCard() { const classes = useStyles(); return ( - + + + + ({ - card: { + root: { display: 'flex', }, details: { @@ -40,7 +40,7 @@ export default function MediaControlCard() { const theme = useTheme(); return ( - +
diff --git a/docs/src/pages/components/cards/MediaControlCard.tsx b/docs/src/pages/components/cards/MediaControlCard.tsx index f3adffd758655f..a5d9281ec7c739 100644 --- a/docs/src/pages/components/cards/MediaControlCard.tsx +++ b/docs/src/pages/components/cards/MediaControlCard.tsx @@ -11,7 +11,7 @@ import SkipNextIcon from '@material-ui/icons/SkipNext'; const useStyles = makeStyles((theme: Theme) => createStyles({ - card: { + root: { display: 'flex', }, details: { @@ -42,7 +42,7 @@ export default function MediaControlCard() { const theme = useTheme(); return ( - +
diff --git a/docs/src/pages/components/cards/OutlinedCard.js b/docs/src/pages/components/cards/OutlinedCard.js index 77855224dcaaf2..1f143544b2b6a4 100644 --- a/docs/src/pages/components/cards/OutlinedCard.js +++ b/docs/src/pages/components/cards/OutlinedCard.js @@ -7,7 +7,7 @@ import Button from '@material-ui/core/Button'; import Typography from '@material-ui/core/Typography'; const useStyles = makeStyles({ - card: { + root: { minWidth: 275, }, bullet: { @@ -28,7 +28,7 @@ export default function OutlinedCard() { const bull = ; return ( - + Word of the Day diff --git a/docs/src/pages/components/cards/OutlinedCard.tsx b/docs/src/pages/components/cards/OutlinedCard.tsx index 77855224dcaaf2..1f143544b2b6a4 100644 --- a/docs/src/pages/components/cards/OutlinedCard.tsx +++ b/docs/src/pages/components/cards/OutlinedCard.tsx @@ -7,7 +7,7 @@ import Button from '@material-ui/core/Button'; import Typography from '@material-ui/core/Typography'; const useStyles = makeStyles({ - card: { + root: { minWidth: 275, }, bullet: { @@ -28,7 +28,7 @@ export default function OutlinedCard() { const bull = ; return ( - + Word of the Day diff --git a/docs/src/pages/components/cards/RecipeReviewCard.js b/docs/src/pages/components/cards/RecipeReviewCard.js index 31498e60154214..04a18b6a912f10 100644 --- a/docs/src/pages/components/cards/RecipeReviewCard.js +++ b/docs/src/pages/components/cards/RecipeReviewCard.js @@ -17,7 +17,7 @@ import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; import MoreVertIcon from '@material-ui/icons/MoreVert'; const useStyles = makeStyles(theme => ({ - card: { + root: { maxWidth: 345, }, media: { @@ -48,7 +48,7 @@ export default function RecipeReviewCard() { }; return ( - + diff --git a/docs/src/pages/components/cards/RecipeReviewCard.tsx b/docs/src/pages/components/cards/RecipeReviewCard.tsx index 928edc041be879..e6697cd9f2cda6 100644 --- a/docs/src/pages/components/cards/RecipeReviewCard.tsx +++ b/docs/src/pages/components/cards/RecipeReviewCard.tsx @@ -18,7 +18,7 @@ import MoreVertIcon from '@material-ui/icons/MoreVert'; const useStyles = makeStyles((theme: Theme) => createStyles({ - card: { + root: { maxWidth: 345, }, media: { @@ -50,7 +50,7 @@ export default function RecipeReviewCard() { }; return ( - + diff --git a/docs/src/pages/components/cards/SimpleCard.js b/docs/src/pages/components/cards/SimpleCard.js index 20bedec76119e9..79be00bd552a90 100644 --- a/docs/src/pages/components/cards/SimpleCard.js +++ b/docs/src/pages/components/cards/SimpleCard.js @@ -7,7 +7,7 @@ import Button from '@material-ui/core/Button'; import Typography from '@material-ui/core/Typography'; const useStyles = makeStyles({ - card: { + root: { minWidth: 275, }, bullet: { @@ -28,7 +28,7 @@ export default function SimpleCard() { const bull = ; return ( - + Word of the Day diff --git a/docs/src/pages/components/cards/SimpleCard.tsx b/docs/src/pages/components/cards/SimpleCard.tsx index 20bedec76119e9..79be00bd552a90 100644 --- a/docs/src/pages/components/cards/SimpleCard.tsx +++ b/docs/src/pages/components/cards/SimpleCard.tsx @@ -7,7 +7,7 @@ import Button from '@material-ui/core/Button'; import Typography from '@material-ui/core/Typography'; const useStyles = makeStyles({ - card: { + root: { minWidth: 275, }, bullet: { @@ -28,7 +28,7 @@ export default function SimpleCard() { const bull = ; return ( - + Word of the Day From da8c3d51cbd445349a6a946dd4006e55bf19b14e Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Sun, 26 Jan 2020 21:41:06 +0100 Subject: [PATCH 02/19] [docs] Fix wrong social share logo URL --- docs/pages/index.js | 2 +- docs/src/modules/components/Head.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/pages/index.js b/docs/pages/index.js index 759f527912a7d4..59fd3b7c86dc21 100644 --- a/docs/pages/index.js +++ b/docs/pages/index.js @@ -174,7 +174,7 @@ export default function HomePage() { "@type": "Organization", "name": "Material-UI", "url": "https://material-ui.com/", - "logo": "https://material-ui.com/static/brand.png", + "logo": "https://material-ui.com/static/logo.png", "sameAs": [ "https://twitter.com/materialUI", "https://github.com/mui-org/material-ui", diff --git a/docs/src/modules/components/Head.js b/docs/src/modules/components/Head.js index b8f45007d28807..c14d27fdd246cc 100644 --- a/docs/src/modules/components/Head.js +++ b/docs/src/modules/components/Head.js @@ -21,7 +21,7 @@ export default function Head(props) { - + {/* Facebook */} @@ -30,7 +30,7 @@ export default function Head(props) { content={`https://material-ui.com${Router._rewriteUrlForNextExport(router.asPath)}`} /> - + {/* Algolia */} From 8fd78f3c8563e2831cb70537ea5bf3ba49d14a1f Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Sun, 26 Jan 2020 21:42:55 +0100 Subject: [PATCH 03/19] [docs] Fix Autocomplete reason description --- docs/pages/api/autocomplete.md | 2 +- packages/material-ui-lab/src/Autocomplete/Autocomplete.js | 2 +- .../material-ui-lab/src/useAutocomplete/useAutocomplete.d.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/pages/api/autocomplete.md b/docs/pages/api/autocomplete.md index e12242b9bd08b3..f6531069f6411b 100644 --- a/docs/pages/api/autocomplete.md +++ b/docs/pages/api/autocomplete.md @@ -61,7 +61,7 @@ You can learn more about the difference by [reading this guide](/guides/minimizi | noOptionsText | node | 'No options' | Text to display when there are no options.
For localization purposes, you can use the provided [translations](/guides/localization/). | | onChange | func | | Callback fired when the value changes.

**Signature:**
`function(event: object, value: T) => void`
*event:* The event source of the callback.
*value:* null | | onClose | func | | Callback fired when the popup requests to be closed. Use in controlled mode (see open).

**Signature:**
`function(event: object) => void`
*event:* The event source of the callback. | -| onInputChange | func | | Callback fired when the input value changes.

**Signature:**
`function(event: object, value: string, reason: string) => void`
*event:* The event source of the callback.
*value:* The new value of the text input.
*reason:* Can be: "input" (user input), "reset" (programmatic change), `"clear"`. | +| onInputChange | func | | Callback fired when the input value changes.

**Signature:**
`function(event: object, value: string, reason: string) => void`
*event:* The event source of the callback.
*value:* The new value of the text input.
*reason:* Can be: `"input"` (user input), `"reset"` (programmatic change), `"clear"`. | | onOpen | func | | Callback fired when the popup requests to be opened. Use in controlled mode (see open).

**Signature:**
`function(event: object) => void`
*event:* The event source of the callback. | | open | bool | | Control the popup` open state. | | openText | string | 'Open' | Override the default text for the *open popup* icon button.
For localization purposes, you can use the provided [translations](/guides/localization/). | diff --git a/packages/material-ui-lab/src/Autocomplete/Autocomplete.js b/packages/material-ui-lab/src/Autocomplete/Autocomplete.js index 25c676bdb14c34..5c0ebf1ba21e66 100644 --- a/packages/material-ui-lab/src/Autocomplete/Autocomplete.js +++ b/packages/material-ui-lab/src/Autocomplete/Autocomplete.js @@ -677,7 +677,7 @@ Autocomplete.propTypes = { * * @param {object} event The event source of the callback. * @param {string} value The new value of the text input. - * @param {string} reason Can be: "input" (user input), "reset" (programmatic change), `"clear"`. + * @param {string} reason Can be: `"input"` (user input), `"reset"` (programmatic change), `"clear"`. */ onInputChange: PropTypes.func, /** diff --git a/packages/material-ui-lab/src/useAutocomplete/useAutocomplete.d.ts b/packages/material-ui-lab/src/useAutocomplete/useAutocomplete.d.ts index fc2ff41adb1529..6eb2df4f872f9c 100644 --- a/packages/material-ui-lab/src/useAutocomplete/useAutocomplete.d.ts +++ b/packages/material-ui-lab/src/useAutocomplete/useAutocomplete.d.ts @@ -135,7 +135,7 @@ export interface UseAutocompleteCommonProps { * * @param {object} event The event source of the callback. * @param {string} value The new value of the text input. - * @param {string} reason Can be: "input" (user input), "reset" (programmatic change), `"clear"`. + * @param {string} reason Can be: `"input"` (user input), `"reset"` (programmatic change), `"clear"`. */ onInputChange?: ( event: React.ChangeEvent<{}>, From 143e908fd747c9c1ffe6f1f63d62bc37c24db396 Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Sun, 26 Jan 2020 21:53:30 +0100 Subject: [PATCH 04/19] [core] Prefer early export default for consistency --- docs/src/pages/discover-more/languages/Languages.js | 4 +--- docs/src/pages/getting-started/usage/Usage.js | 4 +--- docs/src/pages/premium-themes/onepirate/modules/withRoot.js | 4 +--- .../src/ServerStyleSheets/ServerStyleSheets.js | 4 +--- .../material-ui-styles/src/StylesProvider/StylesProvider.js | 4 +--- .../src/getStylesCreator/getStylesCreator.js | 4 +--- .../material-ui-styles/src/getThemeProps/getThemeProps.js | 4 +--- packages/material-ui-styles/src/jssPreset/jssPreset.js | 4 +--- packages/material-ui-styles/src/makeStyles/makeStyles.js | 4 +--- packages/material-ui-styles/src/mergeClasses/mergeClasses.js | 4 +--- packages/material-ui-styles/src/styled/styled.js | 4 +--- packages/material-ui/src/useMediaQuery/useMediaQuery.js | 4 +--- packages/material-ui/src/useMediaQuery/useMediaQueryTheme.js | 4 +--- 13 files changed, 13 insertions(+), 39 deletions(-) diff --git a/docs/src/pages/discover-more/languages/Languages.js b/docs/src/pages/discover-more/languages/Languages.js index b88571dd77ac00..6d1db81b8416e0 100644 --- a/docs/src/pages/discover-more/languages/Languages.js +++ b/docs/src/pages/discover-more/languages/Languages.js @@ -15,7 +15,7 @@ const useStyles = makeStyles({ }, }); -function Languages() { +export default function Languages() { const classes = useStyles(); return ( @@ -44,5 +44,3 @@ function Languages() { ); } - -export default Languages; diff --git a/docs/src/pages/getting-started/usage/Usage.js b/docs/src/pages/getting-started/usage/Usage.js index 5e7168a85dcec7..d8458e680d58cb 100644 --- a/docs/src/pages/getting-started/usage/Usage.js +++ b/docs/src/pages/getting-started/usage/Usage.js @@ -1,6 +1,6 @@ import React from 'react'; -function Usage() { +export default function Usage() { return (