Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fix: improving search ux

Ilian Sapundshiev60366eaa9f92
diff --git a/src/renderer/components/FolderContainer.tsx b/src/renderer/components/FolderContainer.tsx
index 781ef37a3..fac9cb6cb 100644
--- a/src/renderer/components/FolderContainer.tsx
+++ b/src/renderer/components/FolderContainer.tsx
@@ -19,7 +19,9 @@
import React, { useCallback, useState } from 'react';
import { useTheme } from '@mui/material/styles';
import { useDispatch, useSelector } from 'react-redux';
+import useMediaQuery from '@mui/material/useMediaQuery';
import IconButton from '@mui/material/IconButton';
+import Button from '@mui/material/Button';
import Box from '@mui/material/Box';
import CircularProgress from '@mui/material/CircularProgress';
import Tooltip from '-/components/Tooltip';
@@ -176,7 +178,8 @@ function FolderContainer(props: Props) {
enterSearchMode();
};
- const openSearchKeyBinding = ` (${adjustKeyBinding(keyBindings.openSearch)})`;
+ const openSearchKeyBinding = `${adjustKeyBinding(keyBindings.openSearch)}`;
+ const isTinyMode = useMediaQuery(theme.breakpoints.down('md'));
return (
<div
@@ -236,7 +239,7 @@ function FolderContainer(props: Props) {
<GoBackIcon />
</IconButton>
</Tooltip>
- {isDesktopMode && (
+ {isTinyMode && (
<Tooltip title={t('core:goforward') + ' - BETA'}>
<IconButton
id="goForwardButton"
@@ -263,18 +266,41 @@ function FolderContainer(props: Props) {
flexDirection: 'column',
}}
/>
- <Tooltip title={t('core:openSearch') + openSearchKeyBinding}>
- <IconButton
+ {isTinyMode ? (
+ <Tooltip
+ title={t('core:openSearch') + ' (' + openSearchKeyBinding + ')'}
+ >
+ <IconButton
+ data-tid="toggleSearch"
+ onClick={openSearchMode}
+ style={{
+ // @ts-ignore
+ WebkitAppRegion: 'no-drag',
+ }}
+ >
+ <SearchIcon />
+ </IconButton>
+ </Tooltip>
+ ) : (
+ <Button
+ variant="outlined"
+ size="small"
data-tid="toggleSearch"
onClick={openSearchMode}
+ startIcon={<SearchIcon />}
style={{
// @ts-ignore
WebkitAppRegion: 'no-drag',
+ marginRight: 5,
+ whiteSpace: 'nowrap',
}}
>
- <SearchIcon />
- </IconButton>
- </Tooltip>
+ {t('core:searchTitle')}
+ <span style={{ width: 10 }} />
+ {openSearchKeyBinding}
+ </Button>
+ )}
+
{progress?.length > 0 && (
<IconButton
id="progressButton"
diff --git a/src/renderer/components/SearchAutocomplete.tsx b/src/renderer/components/SearchAutocomplete.tsx
index 012dd0ada..00f7e11da 100644
--- a/src/renderer/components/SearchAutocomplete.tsx
+++ b/src/renderer/components/SearchAutocomplete.tsx
@@ -1238,7 +1238,7 @@ function SearchAutocomplete(props: Props) {
<style>
{`
#searchAutocompleteComp .MuiAutocomplete-root .MuiInputBase-root {
- padding: 0 5px 0 5px !important;
+ padding: 1px 5px 0 5px !important;
}
.MuiAutocomplete-popper {
min-width: 350px;