X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/71b9264c1720e619f8cfcb297a7848ece420c61c..cfe5ff035578ede95613b0c545708466da78cbea:/src/components/data-table-filters/data-table-filters-popover.tsx diff --git a/src/components/data-table-filters/data-table-filters-popover.tsx b/src/components/data-table-filters/data-table-filters-popover.tsx index 4015126a..3183157b 100644 --- a/src/components/data-table-filters/data-table-filters-popover.tsx +++ b/src/components/data-table-filters/data-table-filters-popover.tsx @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from "react"; +import React from "react"; import { WithStyles, withStyles, @@ -15,15 +15,16 @@ import { CardActions, Typography, CardContent, - Tooltip + Tooltip, + IconButton } from "@material-ui/core"; -import * as classnames from "classnames"; -import { DefaultTransformOrigin } from "~/components/popover/helpers"; -import { createTree } from '~/models/tree'; +import classnames from "classnames"; +import { DefaultTransformOrigin } from "components/popover/helpers"; +import { createTree } from 'models/tree'; import { DataTableFilters, DataTableFiltersTree } from "./data-table-filters-tree"; -import { getNodeDescendants } from '~/models/tree'; +import { getNodeDescendants } from 'models/tree'; -export type CssRules = "root" | "icon" | "active" | "checkbox"; +export type CssRules = "root" | "icon" | "iconButton" | "active" | "checkbox"; const styles: StyleRulesCallback = (theme: Theme) => ({ root: { @@ -41,16 +42,20 @@ const styles: StyleRulesCallback = (theme: Theme) => ({ }, active: { color: theme.palette.text.primary, - '& $icon': { + '& $iconButton': { opacity: 1, }, }, icon: { - marginRight: 4, - marginLeft: 4, + fontSize: 12, + userSelect: 'none', + width: 16, + height: 15, + marginTop: 1 + }, + iconButton: { + color: theme.palette.text.primary, opacity: 0.7, - userSelect: "none", - width: 16 }, checkbox: { width: 24, @@ -58,10 +63,26 @@ const styles: StyleRulesCallback = (theme: Theme) => ({ } }); +enum SelectionMode { + ALL = 'all', + NONE = 'none' +} + export interface DataTableFilterProps { name: string; filters: DataTableFilters; onChange?: (filters: DataTableFilters) => void; + + /** + * When set to true, only one filter can be selected at a time. + */ + mutuallyExclusive?: boolean; + + /** + * By default `all` filters selection means that label should be grayed out. + * Use `none` when label is supposed to be grayed out when no filter is selected. + */ + defaultSelection?: SelectionMode; } interface DataTableFilterState { @@ -80,19 +101,25 @@ export const DataTableFiltersPopover = withStyles(styles)( icon = React.createRef(); render() { - const { name, classes, children } = this.props; - const isActive = getNodeDescendants('')(this.state.filters).some(f => f.selected); + const { name, classes, defaultSelection = SelectionMode.ALL, children } = this.props; + const isActive = getNodeDescendants('')(this.state.filters) + .some(f => defaultSelection === SelectionMode.ALL + ? !f.selected + : f.selected + ); return <> - + {children} - + + + this.setState({ filters })} /> + mutuallyExclusive={this.props.mutuallyExclusive} + onChange={filters => { + this.setState({ filters }); + if (this.props.mutuallyExclusive) { + const { onChange } = this.props; + if (onChange) { + onChange(filters); + } + this.setState({ anchorEl: undefined }); + } + }} /> + {this.props.mutuallyExclusive ||