From 78a6653e701b8835ae9b4c674100ec12f6082167 Mon Sep 17 00:00:00 2001 From: Lisa Knox Date: Mon, 8 May 2023 12:55:03 -0400 Subject: [PATCH] 15768: created multiselect toolbar Arvados-DCO-1.1-Signed-off-by: Lisa Knox --- .../data-explorer/data-explorer.tsx | 6 +++- .../multiselectToolbar/MultiselectToolbar.tsx | 36 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 src/components/multiselectToolbar/MultiselectToolbar.tsx diff --git a/src/components/data-explorer/data-explorer.tsx b/src/components/data-explorer/data-explorer.tsx index ea95648e7b..16a014bceb 100644 --- a/src/components/data-explorer/data-explorer.tsx +++ b/src/components/data-explorer/data-explorer.tsx @@ -14,6 +14,7 @@ import { DataTableFilters } from 'components/data-table-filters/data-table-filte import { CloseIcon, IconType, MaximizeIcon, UnMaximizeIcon, MoreOptionsIcon } from 'components/icon/icon'; import { PaperProps } from '@material-ui/core/Paper'; import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view'; +import MultiselectToolbar from 'components/multiselectToolbar/MultiselectToolbar'; type CssRules = 'searchBox' | 'headerMenu' | 'toolbar' | 'footer' | 'root' | 'moreOptionsButton' | 'title' | 'dataTable' | 'container'; @@ -48,8 +49,10 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ height: '100%', }, headerMenu: { + width: '100%', float: 'right', - display: 'inline-block', + display: 'flex', + justifyContent: 'space-between', }, }); @@ -190,6 +193,7 @@ export const DataExplorer = withStyles(styles)( )} {(!hideColumnSelector || !hideSearchInput || !!actions) && ( + {!hideSearchInput && (
diff --git a/src/components/multiselectToolbar/MultiselectToolbar.tsx b/src/components/multiselectToolbar/MultiselectToolbar.tsx new file mode 100644 index 0000000000..c71994afcf --- /dev/null +++ b/src/components/multiselectToolbar/MultiselectToolbar.tsx @@ -0,0 +1,36 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + +import React from 'react'; +import { StyleRulesCallback, withStyles, WithStyles, Toolbar } from '@material-ui/core'; +import { ArvadosTheme } from 'common/custom-theme'; + +type CssRules = 'root' | 'item'; + +const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ + root: { + // border: '2px dotted green', + display: 'flex', + flexDirection: 'row', + }, + item: { + // border: '2px dotted blue', + color: theme.palette.text.primary, + margin: '0.5rem', + }, +}); + +type MultiselectToolbarProps = WithStyles; + +export default withStyles(styles)((props: MultiselectToolbarProps) => { + console.log(props); + const { classes } = props; + return ( + +
test1
+
test2
+
test3
+
+ ); +}); -- 2.39.5