Skip to content

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

chore: ui improvements

Ilian Sapundshievbc27222fbfda
diff --git a/app/components/EntryProperties.tsx b/app/components/EntryProperties.tsx
index 1470fc575..170e61fe4 100644
--- a/app/components/EntryProperties.tsx
+++ b/app/components/EntryProperties.tsx
@@ -974,13 +974,13 @@ function EntryProperties(props: Props) {
!PlatformIO.haveObjectStoreSupport() &&
dirProps.current &&
!currentEntry.current.isFile &&
- i18n.t('core:directories') +
- ': ' +
- dirProps.current.dirsCount +
+ dirProps.current.dirsCount +
' ' +
- i18n.t('core:files') +
- ': ' +
- dirProps.current.filesCount
+ i18n.t('core:directories') +
+ ', ' +
+ dirProps.current.filesCount +
+ ' ' +
+ i18n.t('core:files')
}
>
<TextField
diff --git a/app/components/FolderContainer.tsx b/app/components/FolderContainer.tsx
index 4ea834e1c..cfae69d82 100644
--- a/app/components/FolderContainer.tsx
+++ b/app/components/FolderContainer.tsx
@@ -527,6 +527,9 @@ function FolderContainer(props: Props) {
}
};
+ const openSearchKeyBinding =
+ ' (' + (AppConfig.isMaclike ? '⌘' : 'Ctrl') + '+Shift+F)';
+ // keyBindings['openSearch'].toUpperCase()
return (
<div data-tid="folderContainerTID" style={{ position: 'relative' }}>
<div
@@ -594,50 +597,39 @@ function FolderContainer(props: Props) {
<>
<div
style={{
- flex: '1 1 10%',
+ flex: '1 1 1%',
display: 'flex',
flexDirection: 'column'
}}
/>
- <Tooltip
- title={
- i18n.t('showSearch') +
- ' (' +
- (AppConfig.isMaclike ? '⌘' : 'CTRL') +
- ' + SHIFT + F)'
- // +
- // ' - ' +
- // keyBindings['openSearch'].toUpperCase()
+ <MainSearchField
+ fullWidth
+ data-tid="toggleSearch"
+ defaultValue=""
+ variant="outlined"
+ size="small"
+ style={{
+ minWidth: 40,
+ width: 220,
+ marginRight: 10
+ }}
+ onKeyDown={toggleSearchMode}
+ onClick={toggleSearchMode}
+ margin="dense"
+ placeholder={
+ i18n.t('core:searchTitle') +
+ (isDesktopMode ? openSearchKeyBinding : '')
}
- >
- <MainSearchField
- fullWidth
- data-tid="toggleSearch"
- defaultValue=""
- variant="outlined"
- size="small"
- style={{
- minWidth: 40,
- width: 200
- }}
- onKeyDown={toggleSearchMode}
- onClick={toggleSearchMode}
- margin="dense"
- placeholder={i18n.t('core:searchTitle')}
- InputProps={{
- startAdornment: (
- <InputAdornment
- position="start"
- style={{ marginRight: 0 }}
- >
- <IconButton size="small" edge="end">
- <SearchIcon />
- </IconButton>
- </InputAdornment>
- )
- }}
- />
- </Tooltip>
+ InputProps={{
+ startAdornment: (
+ <InputAdornment position="start" style={{ marginRight: 0 }}>
+ <IconButton size="small" edge="end">
+ <SearchIcon />
+ </IconButton>
+ </InputAdornment>
+ )
+ }}
+ />
{props.progress && props.progress.length > 0 && (
<IconButton
id="progressButton"
diff --git a/app/components/dialogs/AddRemoveTagsDialog.tsx b/app/components/dialogs/AddRemoveTagsDialog.tsx
index c8187fa71..04c24ce5e 100644
--- a/app/components/dialogs/AddRemoveTagsDialog.tsx
+++ b/app/components/dialogs/AddRemoveTagsDialog.tsx
@@ -17,7 +17,6 @@
*/
import React, { useState } from 'react';
-import Draggable from 'react-draggable';
import Button from '@mui/material/Button';
import Paper, { PaperProps } from '@mui/material/Paper';
import DialogActions from '@mui/material/DialogActions';
@@ -31,6 +30,7 @@ import FolderIcon from '@mui/icons-material/FolderOpen';
import FileIcon from '@mui/icons-material/InsertDriveFileOutlined';
import Typography from '@mui/material/Typography';
import Dialog from '@mui/material/Dialog';
+import DraggablePaper from '-/components/DraggablePaper';
import AppConfig from '-/AppConfig';
import TagsSelect from '../TagsSelect';
import i18n from '-/services/i18n';
@@ -53,17 +53,6 @@ interface Props {
removeAllTags: (paths: Array<string>) => void;
}
-function PaperComponent(props: PaperProps) {
- return (
- <Draggable
- handle="#draggable-dialog-title"
- cancel={'[class*="MuiDialogContent-root"]'}
- >
- <Paper {...props} />
- </Draggable>
- );
-}
-
function AddRemoveTagsDialog(props: Props) {
const [newlyAddedTags, setNewlyAddedTags] = useState<Array<TS.Tag>>([]);
@@ -129,7 +118,7 @@ function AddRemoveTagsDialog(props: Props) {
onClose={onClose}
keepMounted
scroll="paper"
- PaperComponent={fullScreen ? Paper : PaperComponent}
+ PaperComponent={fullScreen ? Paper : DraggablePaper}
aria-labelledby="draggable-dialog-title"
>
<DialogTitle style={{ cursor: 'move' }} id="draggable-dialog-title">
@@ -154,19 +143,10 @@ function AddRemoveTagsDialog(props: Props) {
tagMode="remove"
autoFocus={true}
/>
-
- <List
- dense
- style={{ width: 550, marginLeft: -15 }}
- subheader={
- <ListSubheader
- style={{ backgroundColor: 'transparent' }}
- component="div"
- >
- {i18n.t('selectedFilesAndFolders')}
- </ListSubheader>
- }
- >
+ <Typography style={{ marginTop: 10 }} variant="subtitle2">
+ {i18n.t('selectedFilesAndFolders')}
+ </Typography>
+ <List dense style={{ width: 550, marginLeft: -15 }}>
{selectedEntries.length > 0 &&
selectedEntries.map(entry => (
<ListItem key={entry.path} title={entry.path}>
diff --git a/app/components/dialogs/MoveCopyFilesDialog.tsx b/app/components/dialogs/MoveCopyFilesDialog.tsx
index ef05ec72e..7e676e04a 100644
--- a/app/components/dialogs/MoveCopyFilesDialog.tsx
+++ b/app/components/dialogs/MoveCopyFilesDialog.tsx
@@ -198,6 +198,9 @@ function MoveCopyFilesDialog(props: Props) {
<DialogCloseButton onClose={onCloseDialog} />
</DialogTitle>
<DialogContent style={{ overflow: 'hidden' }}>
+ <Typography variant="subtitle2">
+ {i18n.t('selectedFilesAndFolders')}
+ </Typography>
<List
dense
style={{
@@ -207,13 +210,6 @@ function MoveCopyFilesDialog(props: Props) {
marginLeft: -15,
marginBottom: 20
}}
- subheader={
- <ListSubheader>
- <Typography variant="subtitle2">
- {i18n.t('selectedFilesAndFolders')}
- </Typography>
- </ListSubheader>
- }
>
{props.selectedEntries &&
props.selectedEntries.length > 0 &&
diff --git a/app/components/dialogs/MoveOrCopyFilesDialog.tsx b/app/components/dialogs/MoveOrCopyFilesDialog.tsx
index 3ea93c382..8305f6ed3 100644
--- a/app/components/dialogs/MoveOrCopyFilesDialog.tsx
+++ b/app/components/dialogs/MoveOrCopyFilesDialog.tsx
@@ -75,15 +75,8 @@ function MoveOrCopyFilesDialog(props: Props) {
overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'
}}
>
- <List
- dense
- style={{ width: 550, marginLeft: -15 }}
- subheader={
- <ListSubheader component="div">
- {i18n.t('selectedFiles')}
- </ListSubheader>
- }
- >
+ <Typography variant="subtitle2">{i18n.t('selectedFiles')}</Typography>
+ <List dense style={{ width: 550, marginLeft: -15 }}>
{props.selectedFiles &&
props.selectedFiles.length > 0 &&
props.selectedFiles.map((file: File) => (
diff --git a/app/package.json b/app/package.json
index 3cd04eade..468bf5cca 100644
--- a/app/package.json
+++ b/app/package.json
@@ -13,11 +13,11 @@
"license": "AGPL-3.0",
"scripts": {},
"webDependencies": {
- "@tagspaces/extensions": "1.0.79"
+ "@tagspaces/extensions": "1.0.80"
},
"nodeDependencies": {
"@tagspaces/tagspaces-ws": "2.1.28",
- "@tagspaces/extensions": "1.0.79",
+ "@tagspaces/extensions": "1.0.80",
"sharp": "0.31.3"
}
}