Skip to content

Commit

Permalink
Merge pull request #74 from Apollo-Spreadsheet/feat/mui-fix
Browse files Browse the repository at this point in the history
Fixes
  • Loading branch information
VeraRibeiro authored May 25, 2022
2 parents 9c3b74e + 3d9ff83 commit 36b5450
Show file tree
Hide file tree
Showing 47 changed files with 18,982 additions and 26,475 deletions.
2 changes: 1 addition & 1 deletion docs/docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ yarn add apollo-spreadsheet
Example

```typescript
import { Box } from '@material-ui/core'
import { Box } from '@mui/material'
import React, { useMemo } from 'react'
import { Column, ColumnCellType } from 'columnGrid'
import ApolloSpreadSheet from 'ApolloSpreadsheet'
Expand Down
19 changes: 9 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,15 @@
"@emotion/react": ">= 11.1.5",
"@emotion/styled": ">= 11.3.0",
"dayjs": ">= 1.10.4",
"react": "^16.0.0",
"react-dom": "^16.0.0"
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
"dependencies": {
"@babel/core": ">=7.11.5 <8.0.0",
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "4.11.3",
"@material-ui/lab": "4.0.0-alpha.61",
"@material-ui/pickers": "^3.3.10",
"@material-ui/styles": "^4.11.5",
"@mui/icons-material": "^5.6.1",
"@mui/lab": "^5.0.0-alpha.77",
"@mui/material": "^5.6.1",
"@mui/styles": "^5.6.1",
"@storybook/addon-controls": "^6.5.2",
"@storybook/addon-viewport": "6.5.3",
"@storybook/react": "6.4.0-alpha.30",
Expand Down Expand Up @@ -89,7 +88,7 @@
"@types/json2csv": "^5.0.1",
"@types/lodash": "^4.14.162",
"@types/node": "^14.14.37",
"@types/react": "^17.0.0",
"@types/react": "^18.0.0",
"@types/react-beautiful-dnd": "^13.0.0",
"@types/react-datepicker": "^3.1.8",
"@types/react-dom": "17.0.0",
Expand Down Expand Up @@ -124,8 +123,8 @@
"pre-commit": "^1.2.2",
"prettier": "^2.2.1",
"pretty-quick": "^3.1.0",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react": "^17.0.0",
"react-dom": "^17.0.0",
"react-test-renderer": "^16.0.0",
"regenerator-runtime": "^0.13.1",
"require-reload": "^0.2.2",
Expand Down
Loading

0 comments on commit 36b5450

Please sign in to comment.