TagSpaces is an offline, open source, document manager with tagging support
chore: improving showing of tooltips by introducing a custom component
Ilian Sapundshievf676bbee7e22
diff --git a/app/components/CustomLogo.tsx b/app/components/CustomLogo.tsxindex 4605370ae..e8c281264 100644--- a/app/components/CustomLogo.tsx+++ b/app/components/CustomLogo.tsx@@ -22,7 +22,7 @@ import { bindActionCreators } from 'redux';import IconButton from '@mui/material/IconButton';import withStyles from '@mui/styles/withStyles';import Badge from '@mui/material/Badge';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';import PlatformIO from '-/services/platform-facade';import { Pro } from '../pro';diff --git a/app/components/FolderContainer.tsx b/app/components/FolderContainer.tsxindex a7242f144..698643371 100644--- a/app/components/FolderContainer.tsx+++ b/app/components/FolderContainer.tsx@@ -23,7 +23,7 @@ import IconButton from '@mui/material/IconButton';import Box from '@mui/material/Box';import CircularProgress from '@mui/material/CircularProgress';import Popover from '@mui/material/Popover';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import Typography from '@mui/material/Typography';import InputAdornment from '@mui/material/InputAdornment';import SearchIcon from '@mui/icons-material/Search';@@ -521,7 +521,7 @@ function FolderContainer(props: Props) {data-tid={perspective.key}onClick={() => switchPerspective(perspective.id)}>- <Tooltip arrow title={perspective.title}>+ <Tooltip title={perspective.title}><div style={{ display: 'flex' }}>{perspective.icon}</div></Tooltip></ToggleButton>diff --git a/app/components/HelperComponents.tsx b/app/components/HelperComponents.tsxindex 768c8c1f9..809183de6 100644--- a/app/components/HelperComponents.tsx+++ b/app/components/HelperComponents.tsx@@ -24,7 +24,7 @@ import { Pro } from '-/pro';export function BetaLabel() {return (- <Tooltip arrow placement="top" title={i18n.t('featureInBetaStatus')}>+ <Tooltip title={i18n.t('featureInBetaStatus')}><Typography style={{ display: 'initial' }}><sup style={{ marginLeft: 5, textTransform: 'uppercase' }}>{i18n.t('betaStatus')}@@ -38,7 +38,6 @@ export function ProLabel() {return (!Pro && (<Tooltip- arrowplacement="top"title={i18n.t('thisFunctionalityIsAvailableInPro')}>diff --git a/app/components/LocationView.tsx b/app/components/LocationView.tsxindex 0065fb674..6d9f8d700 100644--- a/app/components/LocationView.tsx+++ b/app/components/LocationView.tsx@@ -20,7 +20,7 @@ import React, { useRef, useState } from 'react';import { bindActionCreators } from 'redux';import { connect } from 'react-redux';import withStyles from '@mui/styles/withStyles';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import ListItem from '@mui/material/ListItem';import ListItemIcon from '@mui/material/ListItemIcon';import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction';@@ -294,7 +294,7 @@ function LocationView(props: Props) {}}onClick={handleLocationIconClick}>- <Tooltip title={i18n.t('clickToExpand')} arrow placement="top">+ <Tooltip title={i18n.t('clickToExpand')}>{isCloudLocation ? (<CloudLocationIconstyle={{diff --git a/app/components/MobileNavigation.tsx b/app/components/MobileNavigation.tsxindex 6252a5f1d..fb0b12d22 100644--- a/app/components/MobileNavigation.tsx+++ b/app/components/MobileNavigation.tsx@@ -21,7 +21,7 @@ import { v1 as uuidv1 } from 'uuid';import { connect } from 'react-redux';import { bindActionCreators } from 'redux';import classNames from 'classnames';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import ToggleButton from '@mui/material/ToggleButton';import Button from '@mui/material/Button';import ButtonGroup from '@mui/material/ButtonGroup';@@ -42,15 +42,14 @@ import CardContent from '@mui/material/CardContent';import { CognitoUserInterface } from '@aws-amplify/ui-components';import CloseIcon from '@mui/icons-material/Close';import Popover from '@mui/material/Popover';-import ProTeaser from '../assets/images/spacerocket_undraw.svg';import ProTeaserImage from '-/assets/images/pro-teaser.svg';-import ProTextLogo from '../assets/images/text-logo-pro.svg';+import ProTextLogo from '-/assets/images/text-logo-pro.svg';import { Pro } from '-/pro';-import CustomLogo from './CustomLogo';-import TagLibrary from '../components/TagLibrary';-import LocationManager from '../components/LocationManager';-import HelpFeedbackPanel from '../components/HelpFeedbackPanel';-import i18n from '../services/i18n';+import CustomLogo from '-/components/CustomLogo';+import TagLibrary from '-/components/TagLibrary';+import LocationManager from '-/components/LocationManager';+import HelpFeedbackPanel from '-/components/HelpFeedbackPanel';+import i18n from '-/services/i18n';import {actions as AppActions,isSettingsDialogOpened,@@ -61,12 +60,12 @@ import {isReadOnlyMode,getDirectoryPath} from '../reducers/app';-import LoadingLazy from './LoadingLazy';+import LoadingLazy from '-/components/LoadingLazy';import {actions as SettingsActions,getCurrentLanguage,isFirstRun-} from '../reducers/settings';+} from '-/reducers/settings';import Links from '-/links';import StoredSearches from '-/components/StoredSearches';import UserDetailsPopover from '-/components/UserDetailsPopover';@@ -303,7 +302,7 @@ function MobileNavigation(props: Props) {</CardActions></>)}- <Tooltip title={i18n.t('core:settings')} arrow>+ <Tooltip title={i18n.t('core:settings')}><IconButtonid="verticalNavButton"data-tid="settings"@@ -317,7 +316,7 @@ function MobileNavigation(props: Props) {</IconButton></Tooltip><ToggleButtonGroup exclusive>- <Tooltip title={i18n.t('core:locationManager')} arrow>+ <Tooltip title={i18n.t('core:locationManager')}><ToggleButtononClick={openLocationManagerPanel}className={@@ -331,7 +330,7 @@ function MobileNavigation(props: Props) {<LocationsIcon /></ToggleButton></Tooltip>- <Tooltip title={i18n.t('core:tagLibrary')} arrow>+ <Tooltip title={i18n.t('core:tagLibrary')}><ToggleButtondata-tid="tagLibrary"onClick={openTagLibraryPanel}@@ -345,7 +344,7 @@ function MobileNavigation(props: Props) {<TagLibraryIcon /></ToggleButton></Tooltip>- <Tooltip title={i18n.t('core:quickAccess')} arrow>+ <Tooltip title={i18n.t('core:quickAccess')}><ToggleButtondata-tid="search"onClick={openSearchPanel}@@ -359,7 +358,7 @@ function MobileNavigation(props: Props) {<RecentThingsIcon /></ToggleButton></Tooltip>- <Tooltip title={i18n.t('core:helpFeedback')} arrow>+ <Tooltip title={i18n.t('core:helpFeedback')}><ToggleButtondata-tid="helpFeedback"onClick={openHelpFeedbackPanel}@@ -376,7 +375,7 @@ function MobileNavigation(props: Props) {</ToggleButtonGroup>{user ? (<>- <Tooltip title={i18n.t('core:userAccount')} arrow>+ <Tooltip title={i18n.t('core:userAccount')}><IconButtondata-tid="accountCircleIconTID"onClick={(event: React.MouseEvent<HTMLButtonElement>) =>@@ -405,7 +404,7 @@ function MobileNavigation(props: Props) {</Popover></>) : (- <Tooltip title={i18n.t('core:switchTheme')} arrow>+ <Tooltip title={i18n.t('core:switchTheme')}><IconButtondata-tid="switchTheme"onClick={switchTheme}diff --git a/app/components/PathBreadcrumbs.tsx b/app/components/PathBreadcrumbs.tsxindex 93962a6c8..7cd6de659 100644--- a/app/components/PathBreadcrumbs.tsx+++ b/app/components/PathBreadcrumbs.tsx@@ -20,7 +20,7 @@ import React, { useState } from 'react';import { emphasize, Theme } from '@mui/material/styles';import withStyles from '@mui/styles/withStyles';import Breadcrumbs from '@mui/material/Breadcrumbs';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import Chip from '@mui/material/Chip';import ExpandMoreIcon from '@mui/icons-material/MoreVert';import PlatformIO from '../services/platform-facade';diff --git a/app/components/SearchBox.tsx b/app/components/SearchBox.tsxindex 65494372a..bccb3ddde 100644--- a/app/components/SearchBox.tsx+++ b/app/components/SearchBox.tsx@@ -24,7 +24,7 @@ import ClearSearchIcon from '@mui/icons-material/Close';import HelpOutlineIcon from '@mui/icons-material/HelpOutline';import ExpandMoreIcon from '@mui/icons-material/ExpandMore';import Button from '@mui/material/Button';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import IconButton from '@mui/material/IconButton';import InputAdornment from '@mui/material/InputAdornment';import Typography from '@mui/material/Typography';diff --git a/app/components/SearchInline.tsx b/app/components/SearchInline.tsxindex 6c7a80580..5f53ea58f 100644--- a/app/components/SearchInline.tsx+++ b/app/components/SearchInline.tsx@@ -24,7 +24,7 @@ import ClearSearchIcon from '@mui/icons-material/Close';import HelpOutlineIcon from '@mui/icons-material/HelpOutline';import ExpandMoreIcon from '@mui/icons-material/ExpandMore';import Button from '@mui/material/Button';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import IconButton from '@mui/material/IconButton';import InputAdornment from '@mui/material/InputAdornment';import Typography from '@mui/material/Typography';@@ -322,7 +322,6 @@ function SearchInline(props: Props) {function HelpTooltip(hClasses) {return (<Tooltip- arrowclasses={{ tooltip: hClasses.customWidth }}title={<span style={{ fontSize: 14 }}>@@ -432,7 +431,6 @@ function SearchInline(props: Props) {<InputAdornment position="start" style={{ marginRight: 0 }}>{isDesktop ? (<Tooltip- arrowclasses={{ tooltip: classes.customWidth }}title={<span style={{ fontSize: 14 }}>diff --git a/app/components/SearchPopover.tsx b/app/components/SearchPopover.tsxindex 092aef5e5..5fde607a0 100644--- a/app/components/SearchPopover.tsx+++ b/app/components/SearchPopover.tsx@@ -24,7 +24,7 @@ import makeStyles from '@mui/styles/makeStyles';import format from 'date-fns/format';import Typography from '@mui/material/Typography';import MenuItem from '@mui/material/MenuItem';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import PictureIcon from '@mui/icons-material/Panorama';import DocumentIcon from '@mui/icons-material/PictureAsPdf';import NoteIcon from '@mui/icons-material/Note';@@ -579,20 +579,17 @@ function SearchPopover(props: Props) {value={searchBoxing.current}><ToggleButton value="location">- <Tooltip arrow title={i18n.t('searchPlaceholder')}>+ <Tooltip title={i18n.t('searchPlaceholder')}><div>{i18n.t('location')}</div></Tooltip></ToggleButton><ToggleButton value="folder">- <Tooltip- arrow- title={i18n.t('searchCurrentFolderWithSubFolders')}- >+ <Tooltip title={i18n.t('searchCurrentFolderWithSubFolders')}><div>{i18n.t('folder')}</div></Tooltip></ToggleButton><ToggleButton disabled={!Pro} value="global">- <Tooltip arrow title={i18n.t('searchInAllLocationTooltip')}>+ <Tooltip title={i18n.t('searchInAllLocationTooltip')}><div>{i18n.t('globalSearch')}</div></Tooltip>{Pro ? <BetaLabel /> : <ProLabel />}@@ -608,17 +605,17 @@ function SearchPopover(props: Props) {value={searchType.current}><ToggleButton value="fuzzy" data-tid="fuzzySearchTID">- <Tooltip arrow title={i18n.t('searchTypeFuzzyTooltip')}>+ <Tooltip title={i18n.t('searchTypeFuzzyTooltip')}><div>{i18n.t('searchTypeFuzzy')}</div></Tooltip></ToggleButton><ToggleButton value="semistrict" data-tid="semiStrictSearchTID">- <Tooltip arrow title={i18n.t('searchTypeSemiStrictTooltip')}>+ <Tooltip title={i18n.t('searchTypeSemiStrictTooltip')}><div>{i18n.t('searchTypeSemiStrict')}</div></Tooltip></ToggleButton><ToggleButton value="strict" data-tid="strictSearchTID">- <Tooltip arrow title={i18n.t('searchTypeStrictTooltip')}>+ <Tooltip title={i18n.t('searchTypeStrictTooltip')}><div>{i18n.t('searchTypeStrict')}</div></Tooltip></ToggleButton>@@ -636,12 +633,12 @@ function SearchPopover(props: Props) {value={forceIndexing.current}><ToggleButton value={false}>- <Tooltip arrow title={i18n.t('useCurrentIndexTooltip')}>+ <Tooltip title={i18n.t('useCurrentIndexTooltip')}><div>{i18n.t('useCurrentIndex')}</div></Tooltip></ToggleButton><ToggleButton value={true} data-tid="forceIndexingTID">- <Tooltip arrow title={i18n.t('forceReindexTooltip')}>+ <Tooltip title={i18n.t('forceReindexTooltip')}><div>{i18n.t('forceReindex')}</div></Tooltip></ToggleButton>diff --git a/app/components/StoredSearches.tsx b/app/components/StoredSearches.tsxindex 890da9a5e..fc9532284 100644--- a/app/components/StoredSearches.tsx+++ b/app/components/StoredSearches.tsx@@ -236,7 +236,6 @@ function StoredSearches(props: Props) {}}><Tooltip- arrowtitle={<span style={{ fontSize: 14 }}><b>Path:</b> {item.path}diff --git a/app/components/TagsPreview.tsx b/app/components/TagsPreview.tsxindex f7821046f..23bd74862 100644--- a/app/components/TagsPreview.tsx+++ b/app/components/TagsPreview.tsx@@ -18,7 +18,7 @@import React from 'react';import { connect } from 'react-redux';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import { TS } from '-/tagspaces.namespace';import { getAllTags, getTagColors } from '-/reducers/taglibrary';import {diff --git a/app/components/Tooltip.tsx b/app/components/Tooltip.tsxnew file mode 100644index 000000000..3c9b16fcb--- /dev/null+++ b/app/components/Tooltip.tsx@@ -0,0 +1,50 @@+/**+ * TagSpaces - universal file and folder organizer+ * Copyright (C) 2017-present TagSpaces UG (haftungsbeschraenkt)+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License (version 3) as+ * published by the Free Software Foundation.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <https://www.gnu.org/licenses/>.+ *+ */++import React from 'react';+import Tooltip from '@mui/material/Tooltip';++interface Props {+ title: any;+ children: any;+ classes?: any;+ placement?:+ | 'bottom-end'+ | 'bottom-start'+ | 'bottom'+ | 'left-end'+ | 'left-start'+ | 'left'+ | 'right-end'+ | 'right-start'+ | 'right'+ | 'top-end'+ | 'top-start'+ | 'top';+}++function TooltipTS(props: Props) {+ const { title, placement } = props;+ return (+ <Tooltip arrow title={title} placement="top" {...props}>+ {props.children}+ </Tooltip>+ );+}++export default TooltipTS;diff --git a/app/components/UserDetailsPopover.tsx b/app/components/UserDetailsPopover.tsxindex c8ee047a5..bf0ca03fc 100644--- a/app/components/UserDetailsPopover.tsx+++ b/app/components/UserDetailsPopover.tsx@@ -24,7 +24,7 @@ import Box from '@mui/material/Box';import ListItem from '@mui/material/ListItem';import ListItemIcon from '@mui/material/ListItemIcon';import Avatar from '@mui/material/Avatar';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import Button from '@mui/material/Button';import Auth from '@aws-amplify/auth';import ExitToAppIcon from '@mui/icons-material/ExitToApp';diff --git a/app/components/dialogs/AboutDialog.tsx b/app/components/dialogs/AboutDialog.tsxindex da9fa00fa..2cd0afb2b 100644--- a/app/components/dialogs/AboutDialog.tsx+++ b/app/components/dialogs/AboutDialog.tsx@@ -22,7 +22,7 @@ import Typography from '@mui/material/Typography';import DialogActions from '@mui/material/DialogActions';import DialogContent from '@mui/material/DialogContent';import DialogTitle from '@mui/material/DialogTitle';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import Dialog from '@mui/material/Dialog';import semver from 'semver';import LogoIcon from '-/assets/images/icon100x100.svg';@@ -113,7 +113,6 @@ function AboutDialog(props: Props) {style={{ float: 'left', marginRight: 10, width: 120, height: 120 }}/><Tooltip- arrowplacement="top"title={'Build on: ' +diff --git a/app/components/dialogs/CreateEditLocationDialog.tsx b/app/components/dialogs/CreateEditLocationDialog.tsxindex 1e980b0d1..cbe24db19 100644--- a/app/components/dialogs/CreateEditLocationDialog.tsx+++ b/app/components/dialogs/CreateEditLocationDialog.tsx@@ -28,7 +28,7 @@ import FormControl from '@mui/material/FormControl';import FormControlLabel from '@mui/material/FormControlLabel';import FormGroup from '@mui/material/FormGroup';import Typography from '@mui/material/Typography';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import Dialog from '@mui/material/Dialog';import List from '@mui/material/List';import ListItem from '@mui/material/ListItem';@@ -734,7 +734,6 @@ function CreateEditLocationDialog(props: Props) {onClick={() => setPersistTagsInSidecarFile(null)}><Tooltip- arrowtitle={<Typography color="inherit">{i18n.t('core:useDefaultTaggingType')}:{' '}@@ -758,7 +757,6 @@ function CreateEditLocationDialog(props: Props) {onClick={() => setPersistTagsInSidecarFile(false)}><Tooltip- arrowtitle={<Typography color="inherit">{i18n.t('core:tagsInFilenameExplanation')}@@ -778,7 +776,6 @@ function CreateEditLocationDialog(props: Props) {onClick={() => setPersistTagsInSidecarFile(true)}><Tooltip- arrowtitle={<Typography color="inherit">{i18n.t('core:tagsInSidecarFileExplanation')}diff --git a/app/components/dialogs/settings/SettingsAdvanced.tsx b/app/components/dialogs/settings/SettingsAdvanced.tsxindex 0e438e179..be6f53469 100644--- a/app/components/dialogs/settings/SettingsAdvanced.tsx+++ b/app/components/dialogs/settings/SettingsAdvanced.tsx@@ -23,7 +23,7 @@ import withStyles from '@mui/styles/withStyles';import List from '@mui/material/List';import ListItem from '@mui/material/ListItem';import ListItemText from '@mui/material/ListItemText';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import Button from '@mui/material/Button';import CheckIcon from '@mui/icons-material/Check';import EditIcon from '@mui/icons-material/Edit';diff --git a/app/components/dialogs/settings/SettingsGeneral.tsx b/app/components/dialogs/settings/SettingsGeneral.tsxindex 1d5177b9b..bd021ec27 100644--- a/app/components/dialogs/settings/SettingsGeneral.tsx+++ b/app/components/dialogs/settings/SettingsGeneral.tsx@@ -26,7 +26,7 @@ import ListItemText from '@mui/material/ListItemText';import Typography from '@mui/material/Typography';import MenuItem from '@mui/material/MenuItem';import Switch from '@mui/material/Switch';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import Input from '@mui/material/Input';import Select from '@mui/material/Select';import Button from '@mui/material/Button';@@ -200,7 +200,6 @@ function SettingsGeneral(props: Props) {onClick={() => props.setPersistTagsInSidecarFile(false)}><Tooltip- arrowtitle={<Typography color="inherit">{i18n.t('core:tagsInFilenameExplanation')}@@ -220,7 +219,6 @@ function SettingsGeneral(props: Props) {onClick={() => props.setPersistTagsInSidecarFile(true)}><Tooltip- arrowtitle={<Typography color="inherit">{i18n.t('core:tagsInSidecarFileExplanation')}diff --git a/app/components/menus/DirectoryMenu.tsx b/app/components/menus/DirectoryMenu.tsxindex 34bf4b8bf..94f9607b7 100644--- a/app/components/menus/DirectoryMenu.tsx+++ b/app/components/menus/DirectoryMenu.tsx@@ -21,7 +21,7 @@ import { bindActionCreators } from 'redux';import { connect } from 'react-redux';import ListItemIcon from '@mui/material/ListItemIcon';import ListItemText from '@mui/material/ListItemText';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import Menu from '@mui/material/Menu';import MenuItem from '@mui/material/MenuItem';import Divider from '@mui/material/Divider';diff --git a/app/components/menus/LocationMenu.tsx b/app/components/menus/LocationMenu.tsxindex 010ac5b78..9c643767d 100644--- a/app/components/menus/LocationMenu.tsx+++ b/app/components/menus/LocationMenu.tsx@@ -26,7 +26,7 @@ import CloudLocationIcon from '@mui/icons-material/CloudQueue';import ListItemIcon from '@mui/material/ListItemIcon';import ListItemText from '@mui/material/ListItemText';import ListSubHeader from '@mui/material/ListSubheader';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import withTheme from '@mui/styles/withTheme';import IconButton from '@mui/material/IconButton';import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';diff --git a/app/perspectives/grid-perspective/components/MainToolbar.tsx b/app/perspectives/grid-perspective/components/MainToolbar.tsxindex f4bae43b2..465644e50 100644--- a/app/perspectives/grid-perspective/components/MainToolbar.tsx+++ b/app/perspectives/grid-perspective/components/MainToolbar.tsx@@ -18,7 +18,7 @@import React from 'react';import Toolbar from '@mui/material/Toolbar';-import Tooltip from '@mui/material/Tooltip';+import Tooltip from '-/components/Tooltip';import SettingsIcon from '@mui/icons-material/Settings';import IconButton from '@mui/material/IconButton';import ParentDirIcon from '@mui/icons-material/SubdirectoryArrowLeft';