X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/f0ac109691369516a5adf9370838cb4eacf16a45..b14c0722a9327a762d9657ee0d5033843f997e49:/src/components/tree/tree.tsx diff --git a/src/components/tree/tree.tsx b/src/components/tree/tree.tsx index 06d7cbbf..bdc37421 100644 --- a/src/components/tree/tree.tsx +++ b/src/components/tree/tree.tsx @@ -3,11 +3,12 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { List, ListItem, ListItemIcon, Collapse, Checkbox } 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 { SidePanelRightArrowIcon } from '../icon/icon'; @@ -21,7 +22,9 @@ type CssRules = 'list' | 'renderContainer' | 'iconOpen' | 'toggableIcon' - | 'checkbox'; + | 'checkbox' + | 'childItem' + | 'childItemIcon'; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ list: { @@ -46,9 +49,6 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ renderContainer: { flex: 1 }, - active: { - color: theme.palette.primary.main, - }, iconClose: { transition: 'all 0.1s ease', }, @@ -60,8 +60,27 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ width: theme.spacing.unit * 3, height: theme.spacing.unit * 3, margin: `0 ${theme.spacing.unit}px`, - color: theme.palette.grey["500"] - } + 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 { @@ -76,72 +95,196 @@ export interface TreeItem { open: boolean; active: boolean; selected?: boolean; + flatTree?: boolean; status: TreeItemStatus; items?: Array>; } 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; - showSelection?: boolean; - onSelectionChange?: (event: React.MouseEvent, item: TreeItem) => void; - disableRipple?: boolean; + 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, disableRipple } = this.props; + const { classes, render, items, toggleItemActive, toggleItemOpen, disableRipple, currentItemUuid, useRadioButtons } = this.props; const { list, listItem, loader, toggableIconContainer, renderContainer } = classes; - return + 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)}> + onClick={event => 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.PENDING - || (it.status === TreeItemStatus.LOADED && !it.items) - || (it.status === TreeItemStatus.LOADED && it.items && it.items.length === 0) ? : } + {this.getProperArrowAnimation(it.status, it.items!)} - {this.props.showSelection && + {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, { @@ -151,17 +294,19 @@ export const Tree = withStyles(styles)( }); } - handleRowContextMenu = (item: TreeItem) => - (event: React.MouseEvent) => - this.props.onContextMenu(event, item) - handleCheckboxChange = (item: TreeItem) => { - const { onSelectionChange } = this.props; - return onSelectionChange + const { toggleItemSelection } = this.props; + return toggleItemSelection ? (event: React.MouseEvent) => { - onSelectionChange(event, item); + event.stopPropagation(); + toggleItemSelection(event, item); } : undefined; } + + handleToggleItemOpen = (item: TreeItem, event: React.MouseEvent) => { + event.stopPropagation(); + this.props.toggleItemOpen(event, item); + } } );