From: Pawel Kowalczyk Date: Tue, 18 Sep 2018 10:44:50 +0000 (+0200) Subject: 14219-missing-tooltip-for-filters-icon X-Git-Tag: 1.3.0~94^2~1 X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/8d16d4c8b7705e68e6dc9acb4210e9df53a3fa88?hp=-c 14219-missing-tooltip-for-filters-icon Feature #14219 Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk --- 8d16d4c8b7705e68e6dc9acb4210e9df53a3fa88 diff --git a/src/components/data-table-filters/data-table-filters.tsx b/src/components/data-table-filters/data-table-filters.tsx index d288a5a3..b8a6e834 100644 --- a/src/components/data-table-filters/data-table-filters.tsx +++ b/src/components/data-table-filters/data-table-filters.tsx @@ -18,7 +18,8 @@ import { Card, CardActions, Typography, - CardContent + CardContent, + Tooltip } from "@material-ui/core"; import * as classnames from "classnames"; import { DefaultTransformOrigin } from "../popover/helpers"; @@ -88,16 +89,18 @@ export const DataTableFilters = withStyles(styles)( const { name, classes, children } = this.props; const isActive = this.state.filters.some(f => f.selected); return <> - - {children} - - + + + {children} + + + ; export const DownloadIcon: IconType = (props) => ; export const FavoriteIcon: IconType = (props) => ; export const HelpIcon: IconType = (props) => ; +export const HelpOutlineIcon: IconType = (props) => ; +export const ImportContactsIcon: IconType = (props) => ; export const InputIcon: IconType = (props) => ; export const LogIcon: IconType = (props) => ; +export const MailIcon: IconType = (props) => ; export const MoreOptionsIcon: IconType = (props) => ; export const MoveToIcon: IconType = (props) => ; export const NewProjectIcon: IconType = (props) => ; @@ -92,6 +95,3 @@ export const TrashIcon: IconType = (props) => ; export const UserPanelIcon: IconType = (props) => ; export const UsedByIcon: IconType = (props) => ; export const WorkflowIcon: IconType = (props) => ; -export const ImportContactsIcon: IconType = (props) => ; -export const HelpOutlineIcon: IconType = (props) => ; -export const MailIcon: IconType = (props) => ; diff --git a/src/components/search-bar/search-bar.tsx b/src/components/search-bar/search-bar.tsx index de9e7de5..ab25e137 100644 --- a/src/components/search-bar/search-bar.tsx +++ b/src/components/search-bar/search-bar.tsx @@ -3,7 +3,7 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { IconButton, Paper, StyleRulesCallback, withStyles, WithStyles } from '@material-ui/core'; +import { IconButton, Paper, StyleRulesCallback, withStyles, WithStyles, Tooltip } from '@material-ui/core'; import SearchIcon from '@material-ui/icons/Search'; type CssRules = 'container' | 'input' | 'button'; @@ -58,7 +58,7 @@ export const SearchBar = withStyles(styles)( timeout: number; render() { - const {classes} = this.props; + const { classes } = this.props; return
- + + +
; } componentDidMount() { - this.setState({value: this.props.value}); + this.setState({ value: this.props.value }); } componentWillReceiveProps(nextProps: SearchBarProps) { if (nextProps.value !== this.props.value) { - this.setState({value: nextProps.value}); + this.setState({ value: nextProps.value }); } } @@ -96,7 +98,7 @@ export const SearchBar = withStyles(styles)( handleChange = (event: React.ChangeEvent) => { clearTimeout(this.timeout); - this.setState({value: event.target.value}); + this.setState({ value: event.target.value }); this.timeout = window.setTimeout( () => this.props.onSearch(this.state.value), this.props.debounce || DEFAULT_SEARCH_DEBOUNCE diff --git a/src/components/search-input/search-input.tsx b/src/components/search-input/search-input.tsx index dc02cd3d..da2f3a9b 100644 --- a/src/components/search-input/search-input.tsx +++ b/src/components/search-input/search-input.tsx @@ -3,7 +3,7 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { IconButton, StyleRulesCallback, withStyles, WithStyles, FormControl, InputLabel, Input, InputAdornment } from '@material-ui/core'; +import { IconButton, StyleRulesCallback, withStyles, WithStyles, FormControl, InputLabel, Input, InputAdornment, Tooltip } from '@material-ui/core'; import SearchIcon from '@material-ui/icons/Search'; type CssRules = 'container' | 'input' | 'button'; @@ -70,10 +70,12 @@ export const SearchInput = withStyles(styles)( - + + + - }/> + } /> ; }