Skip to content

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

chore: changing files on small screen

Ilian Sapundshiev9efd32b1bc8b
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index b8a158c03..8f1174115 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "tagspaces",
- "version": "6.0.3",
+ "version": "6.0.5",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "tagspaces",
- "version": "6.0.3",
+ "version": "6.0.5",
"hasInstallScript": true,
"license": "AGPL-3.0",
"dependencies": {
diff --git a/src/renderer/components/FolderContainer.tsx b/src/renderer/components/FolderContainer.tsx
index c34512d30..18d945c6d 100644
--- a/src/renderer/components/FolderContainer.tsx
+++ b/src/renderer/components/FolderContainer.tsx
@@ -18,7 +18,7 @@
import React, { useCallback, useState } from 'react';
import { useTheme } from '@mui/material/styles';
-import { useDispatch, useSelector } from 'react-redux';
+import { useSelector } from 'react-redux';
import useMediaQuery from '@mui/material/useMediaQuery';
import TsIconButton from '-/components/TsIconButton';
import TsButton from '-/components/TsButton';
@@ -41,7 +41,6 @@ import { Pro } from '../pro';
import RenameEntryDialog from '-/components/dialogs/RenameEntryDialog';
import PathBreadcrumbs from './PathBreadcrumbs';
import { PerspectiveIDs, AvailablePerspectives } from '-/perspectives';
-// import LoadingAnimation from '-/components/LoadingAnimation';
import SearchBox from '-/components/SearchBox';
import { useTranslation } from 'react-i18next';
import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';
@@ -49,18 +48,16 @@ import RenderPerspective from '-/components/RenderPerspective';
import { adjustKeyBinding } from '-/components/dialogs/KeyboardDialog';
import { useFileUploadDialogContext } from '-/components/dialogs/hooks/useFileUploadDialogContext';
import { useProTeaserDialogContext } from '-/components/dialogs/hooks/useProTeaserDialogContext';
-import CustomDragLayer from '-/components/CustomDragLayer';
-import TargetFileBox from '-/components/TargetFileBox';
-import { NativeTypes } from 'react-dnd-html5-backend';
import { useBrowserHistoryContext } from '-/hooks/useBrowserHistoryContext';
interface Props {
toggleDrawer?: () => void;
drawerOpened: boolean;
+ style?: any;
}
function FolderContainer(props: Props) {
- const { toggleDrawer, drawerOpened } = props;
+ const { toggleDrawer, drawerOpened, style } = props;
const { t } = useTranslation();
const theme = useTheme();
@@ -175,7 +172,7 @@ function FolderContainer(props: Props) {
};
const openSearchKeyBinding = `${adjustKeyBinding(keyBindings.openSearch)}`;
- const isTinyMode = useMediaQuery(theme.breakpoints.down('md'));
+ const smallScreen = useMediaQuery(theme.breakpoints.down('md'));
return (
<div
@@ -186,6 +183,7 @@ function FolderContainer(props: Props) {
display: 'flex',
flexDirection: 'column',
position: 'relative',
+ ...style,
}}
data-tid="folderContainerTID"
>
@@ -232,7 +230,7 @@ function FolderContainer(props: Props) {
>
<GoBackIcon />
</TsIconButton>
- {isTinyMode && (
+ {smallScreen && (
<TsIconButton
tooltip={t('core:goforward') + ' - BETA'}
id="goForwardButton"
@@ -258,7 +256,7 @@ function FolderContainer(props: Props) {
flexDirection: 'column',
}}
/>
- {isTinyMode ? (
+ {smallScreen ? (
<TsIconButton
tooltip={
t('core:openSearch') + ' (' + openSearchKeyBinding + ')'
diff --git a/src/renderer/containers/MainPage.tsx b/src/renderer/containers/MainPage.tsx
index 933cfce1a..fe4b9d999 100644
--- a/src/renderer/containers/MainPage.tsx
+++ b/src/renderer/containers/MainPage.tsx
@@ -242,9 +242,16 @@ function MainPage(props: Props) {
}
if (smallScreen && openedEntry) {
return (
- <FilePropertiesContextProvider>
- <EntryContainer key="EntryContainerID" />
- </FilePropertiesContextProvider>
+ <>
+ <FolderContainer
+ style={{ display: 'none' }}
+ toggleDrawer={toggleDrawer}
+ drawerOpened={drawerOpened}
+ />
+ <FilePropertiesContextProvider>
+ <EntryContainer key="EntryContainerID" />
+ </FilePropertiesContextProvider>
+ </>
);
}
return (
@@ -259,9 +266,6 @@ function MainPage(props: Props) {
<FolderContainer
toggleDrawer={toggleDrawer}
drawerOpened={drawerOpened}
- /*openMoveCopyFilesDialog={() =>
- setMoveCopyDialogOpened(props.selectedEntries)
- }*/
/>
{openedEntry && (
<FilePropertiesContextProvider>
diff --git a/src/renderer/locales/en/core.json b/src/renderer/locales/en/core.json
index 863d877d3..f55804341 100644
--- a/src/renderer/locales/en/core.json
+++ b/src/renderer/locales/en/core.json
@@ -872,6 +872,7 @@
"uploadDirsNotSupported": "Uploading folders not supported!",
"targetLocation": "Target location",
"exportAsPNG": "Export as PNG",
+ "tagPreview": "Tag Preview",
"generateNewLocationId": "Generates new unique identifier for this location",
"-": "-"
}