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

Jump to bottom

[RFR] Change to useStyles for Tree component #3569

Merged
merged 1 commit into from
Aug 22, 2019
Merged

[RFR] Change to useStyles for Tree component #3569

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
166 changes: 82 additions & 84 deletions packages/ra-tree-ui-materialui/src/Tree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Children, Component, Fragment } from 'react';
import React, { Children, useEffect, Fragment } from 'react';
import PropTypes from 'prop-types';
import { withStyles } from '@material-ui/core/styles';
import { makeStyles } from '@material-ui/core/styles';
import List from '@material-ui/core/List';
import { TreeController } from 'ra-tree-core';
import { DragDropContext } from 'react-dnd';
Expand All @@ -15,12 +15,12 @@ import DefaultTreeNodeContent from './TreeNodeContent';
import DefaultTreeNodeWithChildren from './TreeNodeWithChildren';
import RootDropTarget from './RootDropTarget';

export const styles = {
const useStyles = makeStyles({
root: {
display: 'flex',
flexDirection: 'column',
},
};
});

const sanitizeRestProps = ({
currentSort,
Expand Down Expand Up @@ -101,90 +101,88 @@ If you need actions on each node, use the actions prop on either the NodeView or
`
);

export class Tree extends Component {
componentDidMount() {
const childrenCount = Children.count(this.props.children);
function Tree({
allowDropOnRoot,
children,
classes: classesOverride,
dragPreviewComponent,
enableDragAndDrop,
parentSource,
treeNodeComponent,
treeNodeWithChildrenComponent,
treeNodeContentComponent,
...props
}) {
const classes = useStyles({ classes: classesOverride });
useEffect(() => {
const childrenCount = Children.count(children);

if (childrenCount > 1 && process.env.NODE_ENV !== 'production') {
warnAboutChildren();
}
}

render() {
const {
allowDropOnRoot,
children,
classes,
dragPreviewComponent,
enableDragAndDrop,
parentSource,
treeNodeComponent,
treeNodeWithChildrenComponent,
treeNodeContentComponent,
...props
} = this.props;
const Container = enableDragAndDrop
? DragDropContext(
TouchBackend({
enableKeyboardEvents: true,
enableMouseEvents: true,
enableTouchEvents: true,
})
)('div')
: Fragment;

const TreeNode = enableDragAndDrop
? droppable(treeNodeComponent)
: treeNodeComponent;

const TreeNodeContent = enableDragAndDrop
? draggable(treeNodeContentComponent)
: treeNodeContentComponent;

return (
<TreeController parentSource={parentSource} {...props}>
{({ getTreeState, tree, ...controllerProps }) => (
<Container>
{enableDragAndDrop ? (
<DragLayer
dragPreviewComponent={dragPreviewComponent}
/>
}, [children]);

const Container = enableDragAndDrop
? DragDropContext(
TouchBackend({
enableKeyboardEvents: true,
enableMouseEvents: true,
enableTouchEvents: true,
})
)('div')
: Fragment;

const TreeNode = enableDragAndDrop
? droppable(treeNodeComponent)
: treeNodeComponent;

const TreeNodeContent = enableDragAndDrop
? draggable(treeNodeContentComponent)
: treeNodeContentComponent;

return (
<TreeController parentSource={parentSource} {...props}>
{({ getTreeState, tree, ...controllerProps }) => (
<Container>
{enableDragAndDrop ? (
<DragLayer
dragPreviewComponent={dragPreviewComponent}
/>
) : null}
<List
classes={{
root: classes.root,
}}
dense
disablePadding
>
{enableDragAndDrop && allowDropOnRoot ? (
<RootDropTarget parentSource={parentSource} />
) : null}
<List
classes={{
root: classes.root,
}}
dense
disablePadding
>
{enableDragAndDrop && allowDropOnRoot ? (
<RootDropTarget parentSource={parentSource} />
) : null}
{tree.map(node => (
<TreeNode
key={`TreeNode_${node.id}`}
classes={{
...classes,
root: classes.node || undefined,
}}
getTreeState={getTreeState}
node={node}
treeNodeComponent={TreeNode}
treeNodeWithChildrenComponent={
treeNodeWithChildrenComponent
}
treeNodeContentComponent={TreeNodeContent}
{...sanitizeRestProps(controllerProps)}
>
{children}
</TreeNode>
))}
</List>
</Container>
)}
</TreeController>
);
}
{tree.map(node => (
<TreeNode
key={`TreeNode_${node.id}`}
classes={{
...classes,
root: classes.node || undefined,
}}
getTreeState={getTreeState}
node={node}
treeNodeComponent={TreeNode}
treeNodeWithChildrenComponent={
treeNodeWithChildrenComponent
}
treeNodeContentComponent={TreeNodeContent}
{...sanitizeRestProps(controllerProps)}
>
{children}
</TreeNode>
))}
</List>
</Container>
)}
</TreeController>
);
}

Tree.propTypes = {
Expand Down Expand Up @@ -220,4 +218,4 @@ Tree.defaultProps = {
treeNodeWithChildrenComponent: DefaultTreeNodeWithChildren,
};

export default withStyles(styles)(Tree);
export default Tree;