refs #13610 Merge branch '13610-projects-hierarchy'

[arvados-workbench2.git] / src / components / tree / tree.tsx

diff --git a/src/components/tree/tree.tsx b/src/components/tree/tree.tsx
index fdde3c16a6c08023a127d98f4f166ac40e63b025..d8397d6673a7a9f2c30a95ee7e7f1c090f1a24d1 100644 (file)
--- a/src/components/tree/tree.tsx
+++ b/src/components/tree/tree.tsx
@@ -13,11 +13,11 @@ type CssRules = 'list' | 'activeArrow' | 'arrow' | 'arrowRotate';
 
 const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
     list: {
-        paddingBottom: '3px', 
+        paddingBottom: '3px',
         paddingTop: '3px',
     },
     activeArrow: {
-        color: '#4285F6', 
+        color: '#4285F6',
         position: 'absolute',
     },
     arrow: {
@@ -38,29 +38,29 @@ export interface TreeItem<T> {
 
 interface TreeProps<T> {
     items?: Array<TreeItem<T>>;
-    render: (item: TreeItem<T>) => ReactElement<{}>;
+    render: (item: TreeItem<T>, level?: number) => ReactElement<{}>;
     toggleItem: (id: string) => any;
     level?: number;
 }
 
 class Tree<T> extends React.Component<TreeProps<T> & WithStyles<CssRules>, {}> {
-    renderArrow (items: Array<TreeItem<T>> | undefined, arrowClass: string, isOpen: boolean){
-        return items && items.length > 0 ? <i className={`${arrowClass} ${isOpen ? "fas fa-caret-down" : `fas fa-caret-down ${this.props.classes.arrowRotate}`}`} /> : ''
+    renderArrow (items: boolean, arrowClass: string, open: boolean){
+        return <i className={`${arrowClass} ${open ? "fas fa-caret-down" : `fas fa-caret-down ${this.props.classes.arrowRotate}`}`} />
     }
     render(): ReactElement<any> {
         const level = this.props.level ? this.props.level : 0;
         const {classes, render, toggleItem, items} = this.props;
-        const {list, arrow, activeArrow, arrowRotate} = classes;
+        const {list, arrow, activeArrow} = classes;
         return <List component="div" className={list}>
             {items && items.map((it: TreeItem<T>, idx: number) =>
-             <div key={`item/${level}/${idx}`}>      
-                <ListItem button onClick={() => toggleItem(it.id)} className={list} style={{paddingLeft: (level + 1) * 20}}>  
-                    {it.active ? this.renderArrow(it.items, activeArrow, it.open) : this.renderArrow(it.items, arrow, it.open)}
-                    {render(it)}
+             <div key={`item/${level}/${idx}`}>
+                <ListItem button onClick={() => toggleItem(it.id)} className={list} style={{paddingLeft: (level + 1) * 20}}>
+                    {this.renderArrow(true, it.active ? activeArrow : arrow, it.open)}
+                    {render(it, level)}
                 </ListItem>
                 {it.items && it.items.length > 0 &&
                 <Collapse in={it.open} timeout="auto" unmountOnExit>
-                    <StyledTree 
+                    <StyledTree
                         items={it.items}
                         render={render}
                         toggleItem={toggleItem}