X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/7ae86efd9905582df4191910528c3803a68ba81b..b14c0722a9327a762d9657ee0d5033843f997e49:/src/components/tree/tree.tsx diff --git a/src/components/tree/tree.tsx b/src/components/tree/tree.tsx index 20526005..bdc37421 100644 --- a/src/components/tree/tree.tsx +++ b/src/components/tree/tree.tsx @@ -3,21 +3,36 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { List, ListItem, ListItemIcon, Collapse } from "@material-ui/core"; +import { List, ListItem, ListItemIcon, Checkbox, Radio, Collapse } from "@material-ui/core"; import { StyleRulesCallback, withStyles, WithStyles } from '@material-ui/core/styles'; +import { ProjectIcon } from '~/components/icon/icon'; import { ReactElement } from "react"; import CircularProgress from '@material-ui/core/CircularProgress'; -import * as classnames from "classnames"; +import classnames from "classnames"; -import { ArvadosTheme } from '../../common/custom-theme'; +import { ArvadosTheme } from '~/common/custom-theme'; import { SidePanelRightArrowIcon } from '../icon/icon'; -type CssRules = 'list' | 'active' | 'loader' | 'toggableIconContainer' | 'iconClose' | 'iconOpen' | 'toggableIcon'; +type CssRules = 'list' + | 'listItem' + | 'active' + | 'loader' + | 'toggableIconContainer' + | 'iconClose' + | 'renderContainer' + | 'iconOpen' + | 'toggableIcon' + | 'checkbox' + | 'childItem' + | 'childItemIcon'; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ list: { padding: '3px 0px' }, + listItem: { + padding: '3px 0px', + }, loader: { position: 'absolute', transform: 'translate(0px)', @@ -26,13 +41,13 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ toggableIconContainer: { color: theme.palette.grey["700"], height: '14px', - position: 'absolute' + width: '14px', }, toggableIcon: { fontSize: '14px' }, - active: { - color: theme.palette.primary.main, + renderContainer: { + flex: 1 }, iconClose: { transition: 'all 0.1s ease', @@ -40,13 +55,38 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ 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"], + }, + childItem: { + cursor: 'pointer', + display: 'flex', + padding: '3px 20px', + fontSize: '0.875rem', + alignItems: 'center', + '&:hover': { + backgroundColor: 'rgba(0, 0, 0, 0.08)', + } + }, + childItemIcon: { + marginLeft: '8px', + marginRight: '16px', + color: 'rgba(0, 0, 0, 0.54)', + }, + active: { + color: theme.palette.primary.main, + }, }); export enum TreeItemStatus { - INITIAL, - PENDING, - LOADED + INITIAL = 'initial', + PENDING = 'pending', + LOADED = 'loaded' } export interface TreeItem { @@ -54,55 +94,197 @@ export interface TreeItem { id: string; open: boolean; active: boolean; + selected?: boolean; + flatTree?: boolean; status: TreeItemStatus; items?: Array>; } -interface TreeProps { +export interface TreeProps { + disableRipple?: boolean; + currentItemUuid?: string; 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; + itemRightPadding?: number; + toggleItemActive: (event: React.MouseEvent, item: TreeItem) => void; + toggleItemOpen: (event: React.MouseEvent, item: TreeItem) => void; + toggleItemSelection?: (event: React.MouseEvent, item: TreeItem) => void; + + /** + * When set to true use radio buttons instead of checkboxes for item selection. + * This does not guarantee radio group behavior (i.e item mutual exclusivity). + * Any item selection logic must be done in the toggleItemActive callback prop. + */ + useRadioButtons?: boolean; +} + +const getActionAndId = (event: any, initAction: string | undefined = undefined) => { + const { nativeEvent: { target } } = event; + let currentTarget: HTMLElement = target as HTMLElement; + let action: string | undefined = initAction || currentTarget.dataset.action; + let id: string | undefined = currentTarget.dataset.id; + + while (action === undefined || id === undefined) { + currentTarget = currentTarget.parentElement as HTMLElement; + + if (!currentTarget) { + break; + } + + action = action || currentTarget.dataset.action; + id = id || currentTarget.dataset.id; + } + + return [action, id]; +}; + +interface FlatTreeProps { + it: TreeItem; + levelIndentation: number; + onContextMenu: Function; + handleToggleItemOpen: Function; + toggleItemActive: Function; + getToggableIconClassNames: Function; + getProperArrowAnimation: Function; + classes: any; } +const FlatTree = (props: FlatTreeProps) => +
{ + const [action, id] = getActionAndId(event, 'CONTEXT_MENU'); + props.onContextMenu(event, { id } as any); + }} + onClick={(event) => { + const [action, id] = getActionAndId(event); + + if (action && id) { + switch (action) { + case 'TOGGLE_OPEN': + props.handleToggleItemOpen({ id } as any, event); + break; + case 'TOGGLE_ACTIVE': + props.toggleItemActive(event, { id } as any); + break; + default: + break; + } + } + }} + > + { + (props.it.items || []) + .map((item: any) =>
+ + + {props.getProperArrowAnimation(item.status, item.items!)} + + +
+ + + + {item.data.name} + + +
+
) + } +
; + 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 } = this.props; - const { list, loader, toggableIconContainer } = classes; - return + const { classes, render, items, toggleItemActive, toggleItemOpen, disableRipple, currentItemUuid, useRadioButtons } = this.props; + const { list, listItem, loader, toggableIconContainer, renderContainer } = classes; + const showSelection = typeof this.props.showSelection === 'function' + ? this.props.showSelection + : () => this.props.showSelection ? true : false; + + const { levelIndentation = 20, itemRightPadding = 20 } = this.props; + + return {items && items.map((it: TreeItem, idx: number) => -
- toggleItemActive(it.id, it.status)} - onContextMenu={this.handleRowContextMenu(it)}> +
+ toggleItemActive(event, it)} + selected={showSelection(it) && it.id === currentItemUuid} + onContextMenu={(event) => this.props.onContextMenu(event, it)}> {it.status === TreeItemStatus.PENDING ? : null} - this.props.toggleItemOpen(it.id, it.status)} + this.handleToggleItemOpen(it, e)} className={toggableIconContainer}> - {it.status !== TreeItemStatus.INITIAL && it.items && it.items.length === 0 ? : } + {this.getProperArrowAnimation(it.status, it.items!)} - {render(it, level)} + {showSelection(it) && !useRadioButtons && + } + {showSelection(it) && useRadioButtons && + } +
+ {render(it, level)} +
- {it.items && it.items.length > 0 && - - - } + { + it.open && it.items && it.items.length > 0 && + it.flatTree ? + : + + + + }
)} ; } + 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, { @@ -112,8 +294,19 @@ export const Tree = withStyles(styles)( }); } - 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); + } } );