Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[docs] Improve Tree View demos #10268

Merged
merged 2 commits into from
Sep 8, 2023
Merged

[docs] Improve Tree View demos #10268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
783e5ad
[docs] Improve Tree View demos
oliviertassinari Sep 7, 2023
471553c
fix ci
oliviertassinari Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 50 additions & 52 deletions docs/data/tree-view/overview/BarTreeView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,57 +6,58 @@ import ChevronRightIcon from '@mui/icons-material/ChevronRight';
import { TreeItem, useTreeItem } from '@mui/x-tree-view/TreeItem';
import clsx from 'clsx';
import Typography from '@mui/material/Typography';
import Box from '@mui/material/Box';

const CustomContentRoot = styled('div')(({ theme }) => ({
WebkitTapHighlightColor: 'transparent',
'&:hover, &.Mui-disabled, &.Mui-focused, &.Mui-selected, &.Mui-selected.Mui-focused, &.Mui-selected:hover':
'&&:hover, &&.Mui-disabled, &&.Mui-focused, &&.Mui-selected, &&.Mui-selected.Mui-focused, &&.Mui-selected:hover':
{
backgroundColor: 'transparent',
},
[`& .MuiTreeItem-contentBar`]: {
'.MuiTreeItem-contentBar': {
position: 'absolute',
width: '100%',
height: 24,
left: 0,
'&:hover &': {
backgroundColor: theme.palette.action.hover,
// Reset on touch devices, it doesn't add specificity
'@media (hover: none)': {
backgroundColor: 'transparent',
},
},
'&.Mui-disabled &': {
opacity: theme.palette.action.disabledOpacity,
},
'&:hover .MuiTreeItem-contentBar': {
backgroundColor: theme.palette.action.hover,
// Reset on touch devices, it doesn't add specificity
'@media (hover: none)': {
backgroundColor: 'transparent',
},
'&.Mui-focused &': {
backgroundColor: theme.palette.action.focus,
},
'&.Mui-selected &': {
},
'&.Mui-disabled .MuiTreeItem-contentBar': {
opacity: theme.palette.action.disabledOpacity,
backgroundColor: 'transparent',
},
'&.Mui-focused .MuiTreeItem-contentBar': {
backgroundColor: theme.palette.action.focus,
},
'&.Mui-selected .MuiTreeItem-contentBar': {
backgroundColor: alpha(
theme.palette.primary.main,
theme.palette.action.selectedOpacity,
),
},
'&.Mui-selected:hover .MuiTreeItem-contentBar': {
backgroundColor: alpha(
theme.palette.primary.main,
theme.palette.action.selectedOpacity + theme.palette.action.hoverOpacity,
),
// Reset on touch devices, it doesn't add specificity
'@media (hover: none)': {
backgroundColor: alpha(
theme.palette.primary.main,
theme.palette.action.selectedOpacity,
),
},
'&.Mui-selected:hover &': {
backgroundColor: alpha(
theme.palette.primary.main,
theme.palette.action.selectedOpacity + theme.palette.action.hoverOpacity,
),
// Reset on touch devices, it doesn't add specificity
'@media (hover: none)': {
backgroundColor: alpha(
theme.palette.primary.main,
theme.palette.action.selectedOpacity,
),
},
},
'&.Mui-selected.Mui-focused &': {
backgroundColor: alpha(
theme.palette.primary.main,
theme.palette.action.selectedOpacity + theme.palette.action.focusOpacity,
),
},
},
'&.Mui-selected.Mui-focused .MuiTreeItem-contentBar': {
backgroundColor: alpha(
theme.palette.primary.main,
theme.palette.action.selectedOpacity + theme.palette.action.focusOpacity,
),
},
}));

Expand Down Expand Up @@ -119,26 +120,23 @@ const CustomTreeItem = React.forwardRef(function CustomTreeItem(props, ref) {

export default function BarTreeView() {
return (
<TreeView
aria-label="icon expansion"
defaultCollapseIcon={<ExpandMoreIcon />}
defaultExpandIcon={<ChevronRightIcon />}
sx={{ height: 240, flexGrow: 1, maxWidth: 400, position: 'relative' }}
>
<CustomTreeItem nodeId="1" label="Applications">
<CustomTreeItem nodeId="2" label="Calendar" />
<CustomTreeItem nodeId="3" label="Chrome" />
<CustomTreeItem nodeId="4" label="Webstorm" />
</CustomTreeItem>
<CustomTreeItem nodeId="5" label="Documents">
<CustomTreeItem nodeId="10" label="OSS" />
<CustomTreeItem nodeId="6" label="MUI">
<CustomTreeItem nodeId="7" label="src">
<Box sx={{ minHeight: 180, flexGrow: 1, maxWidth: 300 }}>
<TreeView
aria-label="icon expansion"
defaultCollapseIcon={<ExpandMoreIcon />}
defaultExpandIcon={<ChevronRightIcon />}
sx={{ position: 'relative' }}
>
<CustomTreeItem nodeId="1" label="Applications">
<CustomTreeItem nodeId="2" label="Calendar" />
</CustomTreeItem>
<CustomTreeItem nodeId="5" label="Documents">
<CustomTreeItem nodeId="10" label="OSS" />
<CustomTreeItem nodeId="6" label="MUI">
<CustomTreeItem nodeId="8" label="index.js" />
<CustomTreeItem nodeId="9" label="tree-view.js" />
</CustomTreeItem>
</CustomTreeItem>
</CustomTreeItem>
</TreeView>
</TreeView>
</Box>
);
}
102 changes: 50 additions & 52 deletions docs/data/tree-view/overview/BarTreeView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,57 +11,58 @@ import {
} from '@mui/x-tree-view/TreeItem';
import clsx from 'clsx';
import Typography from '@mui/material/Typography';
import Box from '@mui/material/Box';

const CustomContentRoot = styled('div')(({ theme }) => ({
WebkitTapHighlightColor: 'transparent',
'&:hover, &.Mui-disabled, &.Mui-focused, &.Mui-selected, &.Mui-selected.Mui-focused, &.Mui-selected:hover':
'&&:hover, &&.Mui-disabled, &&.Mui-focused, &&.Mui-selected, &&.Mui-selected.Mui-focused, &&.Mui-selected:hover':
{
backgroundColor: 'transparent',
},
[`& .MuiTreeItem-contentBar`]: {
'.MuiTreeItem-contentBar': {
position: 'absolute',
width: '100%',
height: 24,
left: 0,
'&:hover &': {
backgroundColor: theme.palette.action.hover,
// Reset on touch devices, it doesn't add specificity
'@media (hover: none)': {
backgroundColor: 'transparent',
},
},
'&.Mui-disabled &': {
opacity: theme.palette.action.disabledOpacity,
},
'&:hover .MuiTreeItem-contentBar': {
backgroundColor: theme.palette.action.hover,
// Reset on touch devices, it doesn't add specificity
'@media (hover: none)': {
backgroundColor: 'transparent',
},
'&.Mui-focused &': {
backgroundColor: theme.palette.action.focus,
},
'&.Mui-selected &': {
},
'&.Mui-disabled .MuiTreeItem-contentBar': {
opacity: theme.palette.action.disabledOpacity,
backgroundColor: 'transparent',
},
'&.Mui-focused .MuiTreeItem-contentBar': {
backgroundColor: theme.palette.action.focus,
},
'&.Mui-selected .MuiTreeItem-contentBar': {
backgroundColor: alpha(
theme.palette.primary.main,
theme.palette.action.selectedOpacity,
),
},
'&.Mui-selected:hover .MuiTreeItem-contentBar': {
backgroundColor: alpha(
theme.palette.primary.main,
theme.palette.action.selectedOpacity + theme.palette.action.hoverOpacity,
),
// Reset on touch devices, it doesn't add specificity
'@media (hover: none)': {
backgroundColor: alpha(
theme.palette.primary.main,
theme.palette.action.selectedOpacity,
),
},
'&.Mui-selected:hover &': {
backgroundColor: alpha(
theme.palette.primary.main,
theme.palette.action.selectedOpacity + theme.palette.action.hoverOpacity,
),
// Reset on touch devices, it doesn't add specificity
'@media (hover: none)': {
backgroundColor: alpha(
theme.palette.primary.main,
theme.palette.action.selectedOpacity,
),
},
},
'&.Mui-selected.Mui-focused &': {
backgroundColor: alpha(
theme.palette.primary.main,
theme.palette.action.selectedOpacity + theme.palette.action.focusOpacity,
),
},
},
'&.Mui-selected.Mui-focused .MuiTreeItem-contentBar': {
backgroundColor: alpha(
theme.palette.primary.main,
theme.palette.action.selectedOpacity + theme.palette.action.focusOpacity,
),
},
}));

Expand Down Expand Up @@ -130,26 +131,23 @@ const CustomTreeItem = React.forwardRef(function CustomTreeItem(

export default function BarTreeView() {
return (
<TreeView
aria-label="icon expansion"
defaultCollapseIcon={<ExpandMoreIcon />}
defaultExpandIcon={<ChevronRightIcon />}
sx={{ height: 240, flexGrow: 1, maxWidth: 400, position: 'relative' }}
>
<CustomTreeItem nodeId="1" label="Applications">
<CustomTreeItem nodeId="2" label="Calendar" />
<CustomTreeItem nodeId="3" label="Chrome" />
<CustomTreeItem nodeId="4" label="Webstorm" />
</CustomTreeItem>
<CustomTreeItem nodeId="5" label="Documents">
<CustomTreeItem nodeId="10" label="OSS" />
<CustomTreeItem nodeId="6" label="MUI">
<CustomTreeItem nodeId="7" label="src">
<Box sx={{ minHeight: 180, flexGrow: 1, maxWidth: 300 }}>
<TreeView
aria-label="icon expansion"
defaultCollapseIcon={<ExpandMoreIcon />}
defaultExpandIcon={<ChevronRightIcon />}
sx={{ position: 'relative' }}
>
<CustomTreeItem nodeId="1" label="Applications">
<CustomTreeItem nodeId="2" label="Calendar" />
</CustomTreeItem>
<CustomTreeItem nodeId="5" label="Documents">
<CustomTreeItem nodeId="10" label="OSS" />
<CustomTreeItem nodeId="6" label="MUI">
<CustomTreeItem nodeId="8" label="index.js" />
<CustomTreeItem nodeId="9" label="tree-view.js" />
</CustomTreeItem>
</CustomTreeItem>
</CustomTreeItem>
</TreeView>
</TreeView>
</Box>
);
}
16 changes: 16 additions & 0 deletions docs/data/tree-view/overview/BarTreeView.tsx.preview
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<TreeView
aria-label="icon expansion"
defaultCollapseIcon={<ExpandMoreIcon />}
defaultExpandIcon={<ChevronRightIcon />}
sx={{ position: 'relative' }}
>
<CustomTreeItem nodeId="1" label="Applications">
<CustomTreeItem nodeId="2" label="Calendar" />
</CustomTreeItem>
<CustomTreeItem nodeId="5" label="Documents">
<CustomTreeItem nodeId="10" label="OSS" />
<CustomTreeItem nodeId="6" label="MUI">
<CustomTreeItem nodeId="8" label="index.js" />
</CustomTreeItem>
</CustomTreeItem>
</TreeView>
2 changes: 1 addition & 1 deletion docs/data/tree-view/overview/ControlledTreeView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default function ControlledTreeView() {
};

return (
<Box sx={{ height: 270, flexGrow: 1, maxWidth: 400, overflowY: 'auto' }}>
<Box sx={{ minHeight: 270, flexGrow: 1, maxWidth: 300 }}>
<Box sx={{ mb: 1 }}>
<Button onClick={handleExpandClick}>
{expanded.length === 0 ? 'Expand all' : 'Collapse all'}
Expand Down
2 changes: 1 addition & 1 deletion docs/data/tree-view/overview/ControlledTreeView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default function ControlledTreeView() {
};

return (
<Box sx={{ height: 270, flexGrow: 1, maxWidth: 400, overflowY: 'auto' }}>
<Box sx={{ minHeight: 270, flexGrow: 1, maxWidth: 300 }}>
<Box sx={{ mb: 1 }}>
<Button onClick={handleExpandClick}>
{expanded.length === 0 ? 'Expand all' : 'Collapse all'}
Expand Down
49 changes: 24 additions & 25 deletions docs/data/tree-view/overview/CustomizedTreeView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';
import Box from '@mui/material/Box';
import { useSpring, animated } from '@react-spring/web';
import SvgIcon from '@mui/material/SvgIcon';

Expand Down Expand Up @@ -41,10 +42,6 @@ function CloseSquare(props) {

function TransitionComponent(props) {
const style = useSpring({
from: {
opacity: 0,
transform: 'translate3d(20px,0,0)',
},
to: {
opacity: props.in ? 1 : 0,
transform: `translate3d(${props.in ? 0 : 20}px,0,0)`,
Expand Down Expand Up @@ -77,28 +74,30 @@ const StyledTreeItem = styled(CustomTreeItem)(({ theme }) => ({

export default function CustomizedTreeView() {
return (
<TreeView
aria-label="customized"
defaultExpanded={['1']}
defaultCollapseIcon={<MinusSquare />}
defaultExpandIcon={<PlusSquare />}
defaultEndIcon={<CloseSquare />}
sx={{ height: 264, flexGrow: 1, maxWidth: 400, overflowY: 'auto' }}
>
<StyledTreeItem nodeId="1" label="Main">
<StyledTreeItem nodeId="2" label="Hello" />
<StyledTreeItem nodeId="3" label="Subtree with children">
<StyledTreeItem nodeId="6" label="Hello" />
<StyledTreeItem nodeId="7" label="Sub-subtree with children">
<StyledTreeItem nodeId="9" label="Child 1" />
<StyledTreeItem nodeId="10" label="Child 2" />
<StyledTreeItem nodeId="11" label="Child 3" />
<Box sx={{ minHeight: 270, flexGrow: 1, maxWidth: 300 }}>
<TreeView
aria-label="customized"
defaultExpanded={['1']}
defaultCollapseIcon={<MinusSquare />}
defaultExpandIcon={<PlusSquare />}
defaultEndIcon={<CloseSquare />}
sx={{ overflowX: 'hidden' }}
>
<StyledTreeItem nodeId="1" label="Main">
<StyledTreeItem nodeId="2" label="Hello" />
<StyledTreeItem nodeId="3" label="Subtree with children">
<StyledTreeItem nodeId="6" label="Hello" />
<StyledTreeItem nodeId="7" label="Sub-subtree with children">
<StyledTreeItem nodeId="9" label="Child 1" />
<StyledTreeItem nodeId="10" label="Child 2" />
<StyledTreeItem nodeId="11" label="Child 3" />
</StyledTreeItem>
<StyledTreeItem nodeId="8" label="Hello" />
</StyledTreeItem>
<StyledTreeItem nodeId="8" label="Hello" />
<StyledTreeItem nodeId="4" label="World" />
<StyledTreeItem nodeId="5" label="Something something" />
</StyledTreeItem>
<StyledTreeItem nodeId="4" label="World" />
<StyledTreeItem nodeId="5" label="Something something" />
</StyledTreeItem>
</TreeView>
</TreeView>
</Box>
);
}
Loading