X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/a482d45b5a46c897ff2da9808e01317831559a00..d5f11bb2fbb20c85e8ef857caedd58adf333e522:/src/components/multi-panel-view/multi-panel-view.tsx?ds=sidebyside diff --git a/src/components/multi-panel-view/multi-panel-view.tsx b/src/components/multi-panel-view/multi-panel-view.tsx index 5c16096b..185c3b90 100644 --- a/src/components/multi-panel-view/multi-panel-view.tsx +++ b/src/components/multi-panel-view/multi-panel-view.tsx @@ -2,8 +2,16 @@ // // SPDX-License-Identifier: AGPL-3.0 -import React, { ReactElement, ReactNode, useState } from 'react'; -import { Button, Grid, StyleRulesCallback, Tooltip, withStyles, WithStyles } from "@material-ui/core"; +import React, { MutableRefObject, ReactElement, ReactNode, useEffect, useRef, useState } from 'react'; +import { + Button, + Grid, + Paper, + StyleRulesCallback, + Tooltip, + withStyles, + WithStyles +} from "@material-ui/core"; import { GridProps } from '@material-ui/core/Grid'; import { isArray } from 'lodash'; import { DefaultView } from 'components/default-view/default-view'; @@ -11,7 +19,7 @@ import { InfoIcon, InvisibleIcon, VisibleIcon } from 'components/icon/icon'; import { ReactNodeArray } from 'prop-types'; import classNames from 'classnames'; -type CssRules = 'button' | 'buttonIcon'; +type CssRules = 'button' | 'buttonIcon' | 'content'; const styles: StyleRulesCallback = theme => ({ button: { @@ -23,33 +31,45 @@ const styles: StyleRulesCallback = theme => ({ padding: '2px 0px 2px 5px', fontSize: '1rem' }, + content: { + overflow: 'auto', + }, }); interface MPVHideablePanelDataProps { name: string; visible: boolean; + maximized: boolean; + illuminated: boolean; children: ReactNode; + panelRef?: MutableRefObject; } interface MPVHideablePanelActionProps { doHidePanel: () => void; + doMaximizePanel: () => void; } type MPVHideablePanelProps = MPVHideablePanelDataProps & MPVHideablePanelActionProps; -const MPVHideablePanel = ({doHidePanel, name, visible, ...props}: MPVHideablePanelProps) => +const MPVHideablePanel = ({doHidePanel, doMaximizePanel, name, visible, maximized, illuminated, ...props}: MPVHideablePanelProps) => visible ? <> - {React.cloneElement((props.children as ReactElement), { doHidePanel, panelName: name })} + {React.cloneElement((props.children as ReactElement), { doHidePanel, doMaximizePanel, panelName: name, panelMaximized: maximized, panelIlluminated: illuminated, panelRef: props.panelRef })} : null; interface MPVPanelDataProps { panelName?: string; + panelMaximized?: boolean; + panelIlluminated?: boolean; + panelRef?: MutableRefObject; + forwardProps?: boolean; } interface MPVPanelActionProps { doHidePanel?: () => void; + doMaximizePanel?: () => void; } // Props received by panel implementors @@ -58,58 +78,95 @@ export type MPVPanelProps = MPVPanelDataProps & MPVPanelActionProps; type MPVPanelContentProps = {children: ReactElement} & MPVPanelProps & GridProps; // Grid item compatible component for layout and MPV props passing -export const MPVPanelContent = ({doHidePanel, panelName, ...props}: MPVPanelContentProps) => - - {React.cloneElement(props.children, { doHidePanel, panelName })} +export const MPVPanelContent = ({doHidePanel, doMaximizePanel, panelName, panelMaximized, panelIlluminated, panelRef, forwardProps, ...props}: MPVPanelContentProps) => { + useEffect(() => { + if (panelRef && panelRef.current) { + panelRef.current.scrollIntoView({behavior: 'smooth'}); + } + }, [panelRef]); + + return + {/* Element to scroll to when the panel is selected */} + + { forwardProps + ? React.cloneElement(props.children, { doHidePanel, doMaximizePanel, panelName, panelMaximized }) + : props.children } + ; - -export interface MPVContainerDataProps { - panelNames?: string[]; } +export interface MPVPanelState { + name: string; + visible?: boolean; +} +interface MPVContainerDataProps { + panelStates?: MPVPanelState[]; +} type MPVContainerProps = MPVContainerDataProps & GridProps; // Grid container compatible component that also handles panel toggling. -const MPVContainerComponent = ({children, panelNames, classes, ...props}: MPVContainerProps & WithStyles) => { +const MPVContainerComponent = ({children, panelStates, classes, ...props}: MPVContainerProps & WithStyles) => { if (children === undefined || children === null || children === {}) { children = []; } else if (!isArray(children)) { children = [children]; } - const visibility = (children as ReactNodeArray).map(() => true); + const visibility = (children as ReactNodeArray).map((_, idx) => + !!!panelStates || // if panelStates wasn't passed, default to all visible panels + (panelStates[idx] && + (panelStates[idx].visible || panelStates[idx].visible === undefined))); const [panelVisibility, setPanelVisibility] = useState(visibility); + const [brightenedPanel, setBrightenedPanel] = useState(-1); + const panelRef = useRef(null); let panels: JSX.Element[] = []; let toggles: JSX.Element[] = []; if (isArray(children)) { for (let idx = 0; idx < children.length; idx++) { - const toggleFn = (idx: number) => () => { + const showFn = (idx: number) => () => { setPanelVisibility([ ...panelVisibility.slice(0, idx), - !panelVisibility[idx], + true, ...panelVisibility.slice(idx+1) + ]); + }; + const hideFn = (idx: number) => () => { + setPanelVisibility([ + ...panelVisibility.slice(0, idx), + false, + ...panelVisibility.slice(idx+1) + ]) + }; + const maximizeFn = (idx: number) => () => { + // Maximize X == hide all but X + setPanelVisibility([ + ...panelVisibility.slice(0, idx).map(() => false), + true, + ...panelVisibility.slice(idx+1).map(() => false), ]) }; const toggleIcon = panelVisibility[idx] ? : - const panelName = panelNames === undefined + const panelName = panelStates === undefined ? `Panel ${idx+1}` - : panelNames[idx] || `Panel ${idx+1}`; - const toggleVariant = panelVisibility[idx] - ? "raised" - : "flat"; + : (panelStates[idx] && panelStates[idx].name) || `Panel ${idx+1}`; + const toggleVariant = "outlined"; const toggleTooltip = panelVisibility[idx] - ? `Hide ${panelName} panel` - : `Show ${panelName} panel`; + ? '' + :`Show ${panelName} panel`; + const panelIsMaximized = panelVisibility[idx] && + panelVisibility.filter(e => e).length === 1; toggles = [ ...toggles, @@ -117,7 +174,10 @@ const MPVContainerComponent = ({children, panelNames, classes, ...props}: MPVCon ]; const aPanel = - + {children[idx]} ; panels = [...panels, aPanel]; @@ -125,14 +185,16 @@ const MPVContainerComponent = ({children, panelNames, classes, ...props}: MPVCon }; return - - { toggles } + + { toggles.map((tgl, idx) => {tgl}) } + + + { panelVisibility.includes(true) + ? panels + : + + } - { panelVisibility.includes(true) - ? panels - : - - } ; };