X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/63210cc7d29062bcffa7af461e27f56d3b8bac7c..acbcc3e7ea8c92dc96f0b481c8b54ff7c294d273:/src/components/tree/tree.tsx diff --git a/src/components/tree/tree.tsx b/src/components/tree/tree.tsx index 8de9bda5..cccb0a98 100644 --- a/src/components/tree/tree.tsx +++ b/src/components/tree/tree.tsx @@ -3,17 +3,72 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import List from "@material-ui/core/List/List"; -import ListItem from "@material-ui/core/ListItem/ListItem"; -import { StyleRulesCallback, Theme, withStyles, WithStyles } from '@material-ui/core/styles'; +import { List, ListItem, ListItemIcon, Collapse, Checkbox } from "@material-ui/core"; +import { StyleRulesCallback, withStyles, WithStyles } from '@material-ui/core/styles'; import { ReactElement } from "react"; -import Collapse from "@material-ui/core/Collapse/Collapse"; import CircularProgress from '@material-ui/core/CircularProgress'; +import * as classnames from "classnames"; + +import { ArvadosTheme } from '~/common/custom-theme'; +import { SidePanelRightArrowIcon } from '../icon/icon'; + +type CssRules = 'list' + | 'listItem' + | 'active' + | 'loader' + | 'toggableIconContainer' + | 'iconClose' + | 'renderContainer' + | 'iconOpen' + | 'toggableIcon' + | 'checkbox'; + +const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ + list: { + padding: '3px 0px' + }, + listItem: { + padding: '3px 0px', + }, + loader: { + position: 'absolute', + transform: 'translate(0px)', + top: '3px' + }, + toggableIconContainer: { + color: theme.palette.grey["700"], + height: '14px', + width: '14px', + }, + toggableIcon: { + fontSize: '14px' + }, + renderContainer: { + flex: 1 + }, + active: { + color: theme.palette.primary.main, + }, + iconClose: { + transition: 'all 0.1s ease', + }, + iconOpen: { + transition: 'all 0.1s ease', + transform: 'rotate(90deg)', + }, + checkbox: { + width: theme.spacing.unit * 3, + height: theme.spacing.unit * 3, + margin: `0 ${theme.spacing.unit}px`, + padding: 0, + color: theme.palette.grey["500"], + } +}); export enum TreeItemStatus { - Initial, - Pending, - Loaded + INITIAL = 'initial', + PENDING = 'pending', + LOADED = 'loaded' } export interface TreeItem { @@ -21,90 +76,114 @@ export interface TreeItem { id: string; open: boolean; active: boolean; + selected?: boolean; status: TreeItemStatus; - toggled?: boolean; items?: Array>; } -interface TreeProps { +export interface TreeProps { + disableRipple?: boolean; items?: Array>; - render: (item: TreeItem, level?: number) => ReactElement<{}>; - toggleItemOpen: (id: string, status: TreeItemStatus) => void; - toggleItemActive: (id: string, status: TreeItemStatus) => void; level?: number; onContextMenu: (event: React.MouseEvent, item: TreeItem) => void; + render: (item: TreeItem, level?: number) => ReactElement<{}>; + showSelection?: boolean | ((item: TreeItem) => boolean); + levelIndentation?: number; + toggleItemActive: (event: React.MouseEvent, item: TreeItem) => void; + toggleItemOpen: (event: React.MouseEvent, item: TreeItem) => void; + toggleItemSelection?: (event: React.MouseEvent, item: TreeItem) => void; } -class Tree extends React.Component & WithStyles, {}> { - render(): ReactElement { - const level = this.props.level ? this.props.level : 0; - const { classes, render, toggleItemOpen, items, toggleItemActive, onContextMenu } = this.props; - const { list, inactiveArrow, activeArrow, loader } = classes; - return - {items && items.map((it: TreeItem, idx: number) => -
- toggleItemActive(it.id, it.status)} onContextMenu={this.handleRowContextMenu(it)}> - {it.status === TreeItemStatus.Pending ? : null} - {it.toggled && it.items && it.items.length === 0 ? null : this.renderArrow(it.status, it.active ? activeArrow : inactiveArrow, it.open, it.id)} - {render(it, level)} - - {it.items && it.items.length > 0 && - - - } -
)} -
; - } - renderArrow(status: TreeItemStatus, arrowClass: string, open: boolean, id: string) { - const { arrowTransition, arrowVisibility, arrowRotate } = this.props.classes; - return this.props.toggleItemOpen(id, status)} - className={` - ${arrowClass} - ${status === TreeItemStatus.Pending ? arrowVisibility : ''} - ${open ? `fas fa-caret-down ${arrowTransition}` : `fas fa-caret-down ${arrowRotate}`}`} />; - } +export const Tree = withStyles(styles)( + class Component extends React.Component & WithStyles, {}> { + render(): ReactElement { + const level = this.props.level ? this.props.level : 0; + const { classes, render, toggleItemOpen, items, toggleItemActive, onContextMenu, disableRipple } = this.props; + const { list, listItem, loader, toggableIconContainer, renderContainer } = classes; + const isCheckboxVisible = typeof this.props.showSelection === 'function' + ? this.props.showSelection + : () => this.props.showSelection ? true : false; - handleRowContextMenu = (item: TreeItem) => - (event: React.MouseEvent) => - this.props.onContextMenu(event, item) -} + const { levelIndentation = 20 } = this.props; -type CssRules = 'list' | 'activeArrow' | 'inactiveArrow' | 'arrowRotate' | 'arrowTransition' | 'loader' | 'arrowVisibility'; + return + {items && items.map((it: TreeItem, idx: number) => +
+ toggleItemActive(event, it)} + onContextMenu={this.handleRowContextMenu(it)}> + {it.status === TreeItemStatus.PENDING ? + : null} + + + {this.getProperArrowAnimation(it.status, it.items!)} + + + { isCheckboxVisible(it) && + } +
+ {render(it, level)} +
+
+ {it.items && it.items.length > 0 && + + + } +
)} +
; + } -const styles: StyleRulesCallback = (theme: Theme) => ({ - list: { - paddingBottom: '3px', - paddingTop: '3px', - }, - activeArrow: { - color: '#4285F6', - position: 'absolute', - }, - inactiveArrow: { - position: 'absolute', - }, - arrowTransition: { - transition: 'all 0.1s ease', - }, - arrowRotate: { - transition: 'all 0.1s ease', - transform: 'rotate(-90deg)', - }, - arrowVisibility: { - opacity: 0, - }, - loader: { - position: 'absolute', - transform: 'translate(0px)', - top: '3px' - } -}); + getProperArrowAnimation = (status: string, items: Array>) => { + return this.isSidePanelIconNotNeeded(status, items) ? : ; + } + + isSidePanelIconNotNeeded = (status: string, items: Array>) => { + return status === TreeItemStatus.PENDING || + (status === TreeItemStatus.LOADED && !items) || + (status === TreeItemStatus.LOADED && items && items.length === 0); + } + + getToggableIconClassNames = (isOpen?: boolean, isActive?: boolean) => { + const { iconOpen, iconClose, active, toggableIcon } = this.props.classes; + return classnames(toggableIcon, { + [iconOpen]: isOpen, + [iconClose]: !isOpen, + [active]: isActive + }); + } -const StyledTree = withStyles(styles)(Tree); -export default StyledTree; + handleRowContextMenu = (item: TreeItem) => + (event: React.MouseEvent) => + this.props.onContextMenu(event, item) + + handleCheckboxChange = (item: TreeItem) => { + const { toggleItemSelection } = this.props; + return toggleItemSelection + ? (event: React.MouseEvent) => { + event.stopPropagation(); + toggleItemSelection(event, item); + } + : undefined; + } + + handleToggleItemOpen = (item: TreeItem) => (event: React.MouseEvent) => { + event.stopPropagation(); + this.props.toggleItemOpen(event, item); + } + } +);