Skip to content

Commit 56e0e27

Browse files
committed
Use TreeView v7 from mui (#2778)
Signed-off-by: David BRAQUART <[email protected]>
1 parent 6b946e8 commit 56e0e27

File tree

3 files changed

+53
-31
lines changed

3 files changed

+53
-31
lines changed

package-lock.json

Lines changed: 47 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
"dependencies": {
1212
"@emotion/react": "^11.14.0",
1313
"@emotion/styled": "^11.14.0",
14-
"@gridsuite/commons-ui": "0.93.0",
14+
"@gridsuite/commons-ui": "0.94.0",
1515
"@hello-pangea/dnd": "^18.0.1",
1616
"@hookform/resolvers": "^4.0.0",
1717
"@mui/icons-material": "^5.16.14",
1818
"@mui/lab": "5.0.0-alpha.175",
1919
"@mui/material": "^5.16.14",
2020
"@mui/x-charts": "^7.25.0",
21-
"@mui/x-tree-view": "^6.17.0",
21+
"@mui/x-tree-view": "^7.28.1",
2222
"@powsybl/network-viewer": "1.8.0",
2323
"@reduxjs/toolkit": "^2.5.1",
2424
"@svgdotjs/svg.js": "^3.2.4",

src/components/dialogs/parameters/dynamicsimulation/curve/common/checkbox-treeview.tsx

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77

88
import * as React from 'react';
99
import { forwardRef, useCallback, useImperativeHandle, useMemo, useState } from 'react';
10-
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
11-
import ChevronRightIcon from '@mui/icons-material/ChevronRight';
1210
import { alpha, Checkbox, SxProps, Theme, useTheme } from '@mui/material';
1311
import { styled } from '@mui/material/styles';
14-
import { treeItemClasses, TreeView, TreeItem } from '@mui/x-tree-view';
12+
import { treeItemClasses, SimpleTreeView, TreeItem } from '@mui/x-tree-view';
1513

1614
import { ModelVariable } from '../../dynamic-simulation.type';
1715

@@ -35,7 +33,7 @@ const BorderedTreeItem = styled(TreeItem)(({ root }: { root: boolean }) => {
3533
top: 20,
3634
borderBottom: root ? 'none' : border,
3735
},
38-
[`& .${treeItemClasses.group}`]: {
36+
[`& .${treeItemClasses.groupTransition}`]: {
3937
marginLeft: 15,
4038
paddingLeft: 18,
4139
borderLeft: border,
@@ -209,7 +207,7 @@ const CheckboxTreeview = forwardRef<GetSelectedItemsHandle, CheckBoxTreeViewProp
209207
return itemsToRender.map((elem) => (
210208
<BorderedTreeItem
211209
key={elem.id}
212-
nodeId={elem.id}
210+
itemId={elem.id}
213211
onClick={handleExpand}
214212
root={!elem.parentId}
215213
label={
@@ -228,11 +226,7 @@ const CheckboxTreeview = forwardRef<GetSelectedItemsHandle, CheckBoxTreeViewProp
228226
));
229227
};
230228

231-
return (
232-
<TreeView defaultCollapseIcon={<ExpandMoreIcon />} defaultExpandIcon={<ChevronRightIcon />} {...rest}>
233-
{renderItems(items)}
234-
</TreeView>
235-
);
229+
return <SimpleTreeView {...rest}>{renderItems(items)}</SimpleTreeView>;
236230
}
237231
);
238232

0 commit comments

Comments
 (0)