Skip to content

Commit eb77c4a

Browse files
authored
Switch ExpansionPanel to Accordion in Material UI
With version 4 of Material UI the ExpansionPanel was renamed to Accordion. With version 5 it's now removed completely. We therefore also perform the switch.
1 parent cc2d578 commit eb77c4a

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

packages/material/src/layouts/ExpandPanelRenderer.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import {
2222
JsonFormsUISchemaRegistryEntry,
2323
getFirstPrimitiveProp
2424
} from '@jsonforms/core';
25-
import ExpansionPanelDetails from '@material-ui/core/ExpansionPanelDetails';
2625
import IconButton from '@material-ui/core/IconButton';
27-
import ExpansionPanel from '@material-ui/core/ExpansionPanel';
28-
import ExpansionPanelSummary from '@material-ui/core/ExpansionPanelSummary';
26+
import Accordion from '@material-ui/core/Accordion';
27+
import AccordionSummary from '@material-ui/core/AccordionSummary';
28+
import AccordionDetails from '@material-ui/core/AccordionDetails';
2929
import { Grid } from '@material-ui/core';
3030
import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
3131
import Avatar from '@material-ui/core/Avatar';
@@ -114,12 +114,12 @@ const ExpandPanelRenderer = (props: ExpandPanelProps) => {
114114
const appliedUiSchemaOptions = merge({}, config, uischema.options);
115115

116116
return (
117-
<ExpansionPanel
117+
<Accordion
118118
aria-labelledby={labelHtmlId}
119119
expanded={expanded}
120120
onChange={handleExpansion(childPath)}
121121
>
122-
<ExpansionPanelSummary expandIcon={<ExpandMoreIcon />}>
122+
<AccordionSummary expandIcon={<ExpandMoreIcon />}>
123123
<Grid container alignItems={'center'}>
124124
<Grid item xs={7} md={9}>
125125
<Grid container alignItems={'center'}>
@@ -180,8 +180,8 @@ const ExpandPanelRenderer = (props: ExpandPanelProps) => {
180180
</Grid>
181181
</Grid>
182182
</Grid>
183-
</ExpansionPanelSummary>
184-
<ExpansionPanelDetails>
183+
</AccordionSummary>
184+
<AccordionDetails>
185185
<JsonFormsDispatch
186186
schema={schema}
187187
uischema={foundUISchema}
@@ -190,8 +190,8 @@ const ExpandPanelRenderer = (props: ExpandPanelProps) => {
190190
renderers={renderers}
191191
cells={cells}
192192
/>
193-
</ExpansionPanelDetails>
194-
</ExpansionPanel>
193+
</AccordionDetails>
194+
</Accordion>
195195
);
196196
};
197197

packages/material/test/renderers/MaterialArrayLayout.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import {
3636
import Enzyme, { mount, ReactWrapper } from 'enzyme';
3737
import Adapter from 'enzyme-adapter-react-16';
3838
import { JsonForms, JsonFormsStateProvider } from '@jsonforms/react';
39-
import { ExpansionPanel } from '@material-ui/core';
39+
import { Accordion } from '@material-ui/core';
4040
import { initCore } from './util';
4141

4242
Enzyme.configure({ adapter: new Adapter() });
@@ -426,7 +426,7 @@ describe('Material array layout', () => {
426426
.find(
427427
`#${
428428
wrapper
429-
.find(ExpansionPanel)
429+
.find(Accordion)
430430
.at(index)
431431
.props()['aria-labelledby']
432432
}`

0 commit comments

Comments
 (0)