Skip to content

Commit a2d13a5

Browse files
committed
feat: support MUI v5
fix #76 fix #77 BREAKING CHANGE: MUI v4 is no longer supported
1 parent bbf59a0 commit a2d13a5

12 files changed

+86
-112
lines changed

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ Also provides a [Render Props Component](https://reactjs.org/docs/render-props.h
1515
keeps track of the local state for a single popup, and passes the state and
1616
mutation functions to a child render function.
1717

18+
# Beta version
19+
20+
These are the docs for the beta version that supports the MUI v5 release candidate.
21+
For v4, see https://github.com/jcoreio/material-ui-popup-state.
22+
1823
# Table of Contents
1924

2025
<!-- toc -->
@@ -53,7 +58,7 @@ mutation functions to a child render function.
5358
# Installation
5459

5560
```sh
56-
npm install --save material-ui-popup-state
61+
npm install --save material-ui-popup-state@beta
5762
```
5863

5964
# Examples with React Hooks

demo/Demo.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react'
2-
import { withStyles } from '@material-ui/styles'
3-
import Code from '@material-ui/icons/Code'
2+
import { withStyles } from '@mui/styles'
3+
import Code from '@mui/icons-material/Code'
44
import Collapse from '@mui/material/Collapse'
55
import Button from '@mui/material/Button'
66
import IconButton from '@mui/material/IconButton'
@@ -92,7 +92,7 @@ const Demo = ({
9292
)}
9393
<div className={classes.toolbarSpacer} />
9494
<Tooltip title="Show Source" placement="top">
95-
<IconButton onClick={() => setShowSource(!showSource)}>
95+
<IconButton onClick={() => setShowSource(!showSource)} size="large">
9696
<Code />
9797
</IconButton>
9898
</Tooltip>

demo/Root.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import CascadingHoverMenusHooks from './examples/CascadingHoverMenus.hooks'
3434
import CascadingHoverMenusHooksCode from '!!raw-loader!./examples/CascadingHoverMenus.hooks'
3535
import Demo from './Demo'
3636
import Typography from '@mui/material/Typography'
37-
import { withStyles } from '@material-ui/styles'
37+
import { withStyles } from '@mui/styles'
3838
import { StyledEngineProvider } from '@mui/material/styles'
3939
import { createTheme, ThemeProvider } from '@mui/material/styles'
4040

demo/examples/CascadingHoverMenus.hooks.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import * as React from 'react'
2-
import { makeStyles } from '@material-ui/styles'
2+
import { makeStyles } from '@mui/styles'
33
import HoverMenu from 'material-ui-popup-state/HoverMenu'
44
import MenuItem from '@mui/material/MenuItem'
5-
import ChevronRight from '@material-ui/icons/ChevronRight'
5+
import ChevronRight from '@mui/icons-material/ChevronRight'
66
import Button from '@mui/material/Button'
77
import {
88
usePopupState,

demo/examples/CascadingHoverMenus.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react'
2-
import { makeStyles } from '@material-ui/styles'
2+
import { makeStyles } from '@mui/styles'
33
import MenuItem from '@mui/material/MenuItem'
4-
import ChevronRight from '@material-ui/icons/ChevronRight'
4+
import ChevronRight from '@mui/icons-material/ChevronRight'
55
import Button from '@mui/material/Button'
66
import PopupState, { bindHover, bindMenu } from 'material-ui-popup-state'
77
import HoverMenu from 'material-ui-popup-state/HoverMenu'

demo/examples/CustomAnchor.hooks.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import List from '@mui/material/List'
88
import ListItem from '@mui/material/ListItem'
99
import ListItemText from '@mui/material/ListItemText'
1010
import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction'
11-
import MoreVertIcon from '@material-ui/icons/MoreVert'
11+
import MoreVertIcon from '@mui/icons-material/MoreVert'
1212
import PopupState, {
1313
anchorRef,
1414
bindTrigger,
@@ -34,7 +34,7 @@ const CustomAnchor = () => (
3434
secondary="Last Modified Apr 9, 2019"
3535
/>
3636
<ListItemSecondaryAction>
37-
<IconButton {...bindTrigger(popupState)}>
37+
<IconButton {...bindTrigger(popupState)} size="large">
3838
<MoreVertIcon />
3939
</IconButton>
4040
</ListItemSecondaryAction>

demo/examples/HoverPopper.hooks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const HoverPopperPopupState = ({ classes }) => {
1919
<Button variant="contained" {...bindHover(popupState)}>
2020
Hover to open Popper
2121
</Button>
22-
<Popper {...bindPopper(popupState)} transition>
22+
<Popper {...bindPopper(popupState)} placement="bottom">
2323
<Paper>
2424
<Typography style={{ margin: 10 }}>
2525
The content of the Popper.

demo/examples/TriggerPopover.hooks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import PropTypes from 'prop-types'
3-
import { withStyles } from '@material-ui/styles'
3+
import { withStyles } from '@mui/styles'
44
import Typography from '@mui/material/Typography'
55
import Button from '@mui/material/Button'
66
import Popover from '@mui/material/Popover'

demo/examples/TriggerPopover.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import PropTypes from 'prop-types'
3-
import { withStyles } from '@material-ui/styles'
3+
import { withStyles } from '@mui/styles'
44
import Typography from '@mui/material/Typography'
55
import Button from '@mui/material/Button'
66
import Popover from '@mui/material/Popover'

package.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
"@mui/material": "^5.0.0-rc.0",
112112
"@types/classnames": "^2.2.9",
113113
"@types/prop-types": "^15.7.3",
114+
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
114115
"babel-eslint": "^10.1.0",
115116
"babel-loader": "^8.0.5",
116117
"babel-plugin-istanbul": "^6.0.0",
@@ -119,7 +120,6 @@
119120
"copy": "^0.3.2",
120121
"cross-env": "^7.0.3",
121122
"enzyme": "^3.11.0",
122-
"enzyme-adapter-react-16": "^1.15.6",
123123
"eslint": "^7.18.0",
124124
"eslint-config-prettier": "^7.2.0",
125125
"eslint-plugin-flowtype": "^5.2.0",
@@ -157,7 +157,16 @@
157157
"prop-types": "^15.7.2"
158158
},
159159
"peerDependencies": {
160-
"@mui/material": "^4.0.0 || ^5.0.0-rc.0",
160+
"@mui/material": "^5.0.0-rc.0",
161161
"react": "^15.0.0 || ^16.0.0 || ^17.0.0"
162+
},
163+
"release": {
164+
"branches": [
165+
"master",
166+
{
167+
"name": "beta",
168+
"prerelease": true
169+
}
170+
]
162171
}
163172
}

0 commit comments

Comments
 (0)