feat: upgrade material-ui to 4.9.2

toptal · Feb 10, 2020 · 2ddc5b2 · 2ddc5b2
1 parent 8f43895
commit 2ddc5b2
Show file tree

Hide file tree

Showing 13 changed files with 137 additions and 61 deletions.
diff --git a/docs/contribution/css-naming.md b/docs/contribution/css-naming.md
@@ -14,7 +14,7 @@ To maintain consistency within `Picasso` repository we try to follow some conven
 ```jsx
 import React from 'react'
 import cx from 'classnames'
-import { capitalize } from '@material-ui/core/utils/helpers'
+import capitalize from '@material-ui/core/utils/capitalize'
 
 import styles from './styles'
 

diff --git a/packages/picasso-lab/package.json b/packages/picasso-lab/package.json
@@ -28,8 +28,8 @@
     "react-dom": "^16.12.0"
   },
   "dependencies": {
-    "@material-ui/core": "4.5.0",
-    "@material-ui/icons": "4.5.1",
+    "@material-ui/core": "4.9.2",
+    "@material-ui/icons": "4.9.1",
     "classnames": "^2.2.6",
     "date-fns": "^2.3.0",
     "simple-react-calendar": "^1.9.2"

diff --git a/packages/picasso/package.json b/packages/picasso/package.json
@@ -26,8 +26,8 @@
     "react-dom": "^16.12.0"
   },
   "dependencies": {
-    "@material-ui/core": "4.5.0",
-    "@material-ui/icons": "4.5.1",
+    "@material-ui/core": "4.9.2",
+    "@material-ui/icons": "4.9.1",
     "@toptal/picasso-shared": "^1.3.0",
     "classnames": "^2.2.6",
     "notistack": "^0.9.7",

diff --git a/packages/picasso/src/Autocomplete/Autocomplete.tsx b/packages/picasso/src/Autocomplete/Autocomplete.tsx
@@ -7,7 +7,7 @@ import React, {
   useRef
 } from 'react'
 import { withStyles } from '@material-ui/core/styles'
-import { capitalize } from '@material-ui/core/utils/helpers'
+import capitalize from '@material-ui/core/utils/capitalize'
 import cx from 'classnames'
 import { StandardProps } from '@toptal/picasso-shared'
 

diff --git a/packages/picasso/src/Container/styles.ts b/packages/picasso/src/Container/styles.ts
@@ -1,4 +1,4 @@
-import { capitalize } from '@material-ui/core/utils/helpers'
+import capitalize from '@material-ui/core/utils/capitalize'
 import { Theme, createStyles } from '@material-ui/core/styles'
 import { Color } from '@material-ui/core'
 import { SimplePaletteColorOptions } from '@material-ui/core/styles/createPalette'

diff --git a/packages/picasso/src/InputLabel/InputLabel.tsx b/packages/picasso/src/InputLabel/InputLabel.tsx
@@ -9,7 +9,7 @@ type VariantType = 'standard' | 'outlined' | 'filled'
 
 export interface Props
   extends StandardProps,
-    LabelHTMLAttributes<HTMLLabelElement> {
+    Omit<LabelHTMLAttributes<HTMLLabelElement>, 'color'> {
   variant?: VariantType
   htmlFor?: string
   /** Label content */

diff --git a/packages/picasso/src/Loader/Loader.tsx b/packages/picasso/src/Loader/Loader.tsx
@@ -1,6 +1,6 @@
 import React, { ReactNode, forwardRef, HTMLAttributes } from 'react'
 import { withStyles } from '@material-ui/core/styles'
-import { capitalize } from '@material-ui/core/utils/helpers'
+import capitalize from '@material-ui/core/utils/capitalize'
 import cx from 'classnames'
 import { StandardProps, SizeType } from '@toptal/picasso-shared'
 

diff --git a/packages/picasso/src/MenuItem/MenuItem.tsx b/packages/picasso/src/MenuItem/MenuItem.tsx
@@ -11,7 +11,7 @@ import React, {
 } from 'react'
 import cx from 'classnames'
 import { withStyles } from '@material-ui/core/styles'
-import { capitalize } from '@material-ui/core/utils/helpers'
+import capitalize from '@material-ui/core/utils/capitalize'
 import MUIMenuItem from '@material-ui/core/MenuItem'
 import {
   StandardProps,

diff --git a/packages/picasso/src/Notification/Notification.tsx b/packages/picasso/src/Notification/Notification.tsx
@@ -10,7 +10,7 @@ import React, {
 import { withStyles } from '@material-ui/core/styles'
 import SnackbarContent from '@material-ui/core/SnackbarContent'
 import cx from 'classnames'
-import { capitalize } from '@material-ui/core/utils/helpers'
+import capitalize from '@material-ui/core/utils/capitalize'
 import {
   StandardProps,
   PicassoComponentWithRef,

diff --git a/packages/picasso/src/OutlinedInput/OutlinedInput.tsx b/packages/picasso/src/OutlinedInput/OutlinedInput.tsx
@@ -10,7 +10,7 @@ import cx from 'classnames'
 import { withStyles } from '@material-ui/core/styles'
 import MUIOutlinedInput from '@material-ui/core/OutlinedInput'
 import { InputBaseComponentProps } from '@material-ui/core/InputBase'
-import { capitalize } from '@material-ui/core/utils/helpers'
+import capitalize from '@material-ui/core/utils/capitalize'
 import { StandardProps, SizeType, Classes } from '@toptal/picasso-shared'
 
 import InputAdornment from '../InputAdornment'
@@ -29,7 +29,7 @@ export interface Props
   extends StandardProps,
     Omit<
       InputHTMLAttributes<HTMLInputElement>,
-      'value' | 'defaultValue' | 'size'
+      'value' | 'defaultValue' | 'size' | 'color'
     > {
   /** Width of the component */
   width?: 'full' | 'shrink' | 'auto'

diff --git a/packages/picasso/src/Select/Select.tsx b/packages/picasso/src/Select/Select.tsx
@@ -13,7 +13,7 @@ import React, {
 import cx from 'classnames'
 import NativeSelect from '@material-ui/core/NativeSelect'
 import { withStyles } from '@material-ui/core/styles'
-import { capitalize } from '@material-ui/core/utils/helpers'
+import capitalize from '@material-ui/core/utils/capitalize'
 import { StandardProps, SizeType } from '@toptal/picasso-shared'
 
 import OutlinedInput from '../OutlinedInput'
@@ -37,7 +37,7 @@ const getOptionText = (option: Option | null) =>
 
 export interface Props
   extends StandardProps,
-    Omit<InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'size'> {
+    Omit<InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'size' | 'color'> {
   /** If true, the 'Select' will be disabled */
   disabled?: boolean
   /** Indicate whether `Select` is in error state */

diff --git a/packages/picasso/src/Typography/Typography.tsx b/packages/picasso/src/Typography/Typography.tsx
@@ -1,6 +1,6 @@
 import React, { forwardRef, ReactNode, HTMLAttributes } from 'react'
 import { withStyles } from '@material-ui/core/styles'
-import { ThemeStyle as MUIVariant } from '@material-ui/core/styles/createTypography'
+import { Variant as MUIVariant } from '@material-ui/core/styles/createTypography'
 import { PropTypes } from '@material-ui/core'
 import MUITypography from '@material-ui/core/Typography'
 import cx from 'classnames'