TagSpaces is an offline, open source, document manager with tagging support
chore: adding FAB menu for perspective change in mobile mode
Ilian Sapundshiev1638adfb100d
diff --git a/src/renderer/components/FolderContainer.tsx b/src/renderer/components/FolderContainer.tsxindex 552f6fdc6..3bf208211 100644--- a/src/renderer/components/FolderContainer.tsx+++ b/src/renderer/components/FolderContainer.tsx@@ -38,7 +38,10 @@ import {getDefaultAIProvider,getDesktopMode,getKeyBindingObject,+ isDevMode,} from '-/reducers/settings';+import BlurOnIcon from '@mui/icons-material/BlurOn';+import { Fab, ListItemIcon, ListItemText, Menu, MenuItem } from '@mui/material';import Box from '@mui/material/Box';import CircularProgress from '@mui/material/CircularProgress';import ToggleButton from '@mui/material/ToggleButton';@@ -46,6 +49,7 @@ import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';import Typography from '@mui/material/Typography';import { useTheme } from '@mui/material/styles';import useMediaQuery from '@mui/material/useMediaQuery';+import { useState } from 'react';import { useTranslation } from 'react-i18next';import { useSelector } from 'react-redux';import {@@ -55,7 +59,9 @@ import {MainMenuIcon,SearchIcon,} from './CommonIcons';+import { BetaLabel } from './HelperComponents';import PathBreadcrumbs from './PathBreadcrumbs';+import TsMenuList from './TsMenuList';interface Props {toggleDrawer?: () => void;@@ -64,6 +70,7 @@ interface Props {}function FolderContainer(props: Props) {+ const devMode: boolean = useSelector(isDevMode);const { toggleDrawer, drawerOpened, style } = props;const { t } = useTranslation();const theme = useTheme();@@ -86,6 +93,16 @@ function FolderContainer(props: Props) {const isDesktopMode = useSelector(getDesktopMode);const progress = useSelector(getProgress);+ const [perspectiveMenuAnchorEl, setPerspectiveMenuAnchorEl] =+ useState<null | HTMLElement>(null);+ const open = Boolean(perspectiveMenuAnchorEl);+ const perspectiveMenuOpenClick = (event: React.MouseEvent<HTMLElement>) => {+ setPerspectiveMenuAnchorEl(event.currentTarget);+ };+ const handlePerspectiveMenuClose = () => {+ setPerspectiveMenuAnchorEl(null);+ };+const showWelcomePanel =!currentDirectoryPath && currentDirectoryEntries.length < 1;@@ -146,7 +163,7 @@ function FolderContainer(props: Props) {const perspectiveToggleButtons = [];AvailablePerspectives.forEach((perspective) => {- if (perspective.id === PerspectiveIDs.CALENDAR) {+ if (!devMode && perspective.id === PerspectiveIDs.CALENDAR) {return;}perspectiveToggleButtons.push(@@ -183,6 +200,40 @@ function FolderContainer(props: Props) {const smallScreen = useMediaQuery(theme.breakpoints.down('md'));const readOnlyLocation = findLocation()?.isReadOnly;+ const perspectiveMenuItem = [];+ AvailablePerspectives.forEach((perspective) => {+ let badge = <></>;+ // if (!Pro && perspective.pro) {+ // badge = <ProLabel />;+ // }+ if (perspective.beta) {+ badge = <BetaLabel />;+ }+ if (!devMode && perspective.id === PerspectiveIDs.CALENDAR) {+ return;+ }+ perspectiveMenuItem.push(+ <MenuItem+ key={perspective.key}+ data-tid={perspective.key}+ onClick={() => {+ handlePerspectiveMenuClose();+ switchPerspective(perspective.id);+ }}+ >+ <ListItemIcon>{perspective.icon}</ListItemIcon>+ <ListItemText+ primary={+ <>+ {perspective.title}+ {badge}+ </>+ }+ />+ </MenuItem>,+ );+ });+return (<divstyle={{@@ -327,7 +378,7 @@ function FolderContainer(props: Props) {<a href="#" id="downloadFile" /><RenderPerspective /></div>- {isDesktopMode && (+ {isDesktopMode ? (<ToggleButtonGroupvalue={currentPerspective}size="small"@@ -375,6 +426,39 @@ function FolderContainer(props: Props) {</Tooltip>)}</ToggleButtonGroup>+ ) : (+ <>+ <Fab+ size="medium"+ color="secondary"+ aria-label="add"+ style={{+ bottom: -30,+ right: 20,+ position: 'absolute',+ }}+ onClick={perspectiveMenuOpenClick}+ >+ <BlurOnIcon />+ </Fab>+ <Menu+ id="demo-positioned-menu"+ aria-labelledby="demo-positioned-button"+ anchorEl={perspectiveMenuAnchorEl}+ open={open}+ onClose={handlePerspectiveMenuClose}+ anchorOrigin={{+ vertical: 'top',+ horizontal: 'left',+ }}+ transformOrigin={{+ vertical: 'bottom',+ horizontal: 'center',+ }}+ >+ <TsMenuList>{perspectiveMenuItem}</TsMenuList>+ </Menu>+ </>)}</div>);diff --git a/src/renderer/components/MobileNavigation.tsx b/src/renderer/components/MobileNavigation.tsxindex 8a0db09cb..c44f45e2f 100644--- a/src/renderer/components/MobileNavigation.tsx+++ b/src/renderer/components/MobileNavigation.tsx@@ -469,17 +469,17 @@ function MobileNavigation(props: Props) {</Popper></ClickAwayListener><LocationManager- reduceHeightBy={150}+ reduceHeightBy={desktopMode ? 150 : 180}show={currentOpenedPanel === 'locationManagerPanel'}/>{currentOpenedPanel === 'tagLibraryPanel' && (- <TagLibrary reduceHeightBy={140} />+ <TagLibrary reduceHeightBy={desktopMode ? 140 : 170} />)}{currentOpenedPanel === 'searchPanel' && (- <StoredSearches reduceHeightBy={140} />+ <StoredSearches reduceHeightBy={desktopMode ? 140 : 165} />)}{currentOpenedPanel === 'helpFeedbackPanel' && (- <HelpFeedbackPanel reduceHeightBy={150} />+ <HelpFeedbackPanel reduceHeightBy={desktopMode ? 150 : 175} />)}</Box><Boxdiff --git a/src/renderer/perspectives/common/DirectoryMenuItems.tsx b/src/renderer/perspectives/common/DirectoryMenuItems.tsxindex 46c0c10bb..7d2a19326 100644--- a/src/renderer/perspectives/common/DirectoryMenuItems.tsx+++ b/src/renderer/perspectives/common/DirectoryMenuItems.tsx@@ -22,10 +22,9 @@ import {RenameIcon,TagIcon,} from '-/components/CommonIcons';-import { BetaLabel, ProLabel } from '-/components/HelperComponents';+import { ProLabel } from '-/components/HelperComponents';import InfoIcon from '-/components/InfoIcon';import MenuKeyBinding from '-/components/menus/MenuKeyBinding';-import { AvailablePerspectives, PerspectiveIDs } from '-/perspectives';import { Pro } from '-/pro';import { getKeyBindingObject, isDevMode } from '-/reducers/settings';import { TS } from '-/tagspaces.namespace';@@ -342,6 +341,7 @@ export function getDirectoryMenuItems(}}if (Pro && !isReadOnlyMode && selectedEntries.length < 2) {+ menuItems.push(<Divider key={`divider-${menuItems.length}`} />);if (setFolderThumbnail && perspectiveMode) {menuItems.push(<MenuItem@@ -480,41 +480,41 @@ export function getDirectoryMenuItems(</MenuItem>,);}- if (!perspectiveMode && switchPerspective) {- menuItems.push(<Divider key={`divider-${menuItems.length}`} />);- AvailablePerspectives.forEach((perspective) => {- let badge = <></>;- // if (!Pro && perspective.pro) {- // badge = <ProLabel />;- // }- if (perspective.beta) {- badge = <BetaLabel />;- }- if (!devMode && perspective.id === PerspectiveIDs.CALENDAR) {- return;- }- menuItems.push(- <MenuItem- key={perspective.key}- data-tid={perspective.key}- onClick={() => {- onClose();- switchPerspective(perspective.id);- }}- >- <ListItemIcon>{perspective.icon}</ListItemIcon>- <ListItemText- primary={- <>- {perspective.title}- {badge}- </>- }- />- </MenuItem>,- );- });- }+ // if (!perspectiveMode && switchPerspective) {+ // menuItems.push(<Divider key={`divider-${menuItems.length}`} />);+ // AvailablePerspectives.forEach((perspective) => {+ // let badge = <></>;+ // // if (!Pro && perspective.pro) {+ // // badge = <ProLabel />;+ // // }+ // if (perspective.beta) {+ // badge = <BetaLabel />;+ // }+ // if (!devMode && perspective.id === PerspectiveIDs.CALENDAR) {+ // return;+ // }+ // menuItems.push(+ // <MenuItem+ // key={perspective.key}+ // data-tid={perspective.key}+ // onClick={() => {+ // onClose();+ // switchPerspective(perspective.id);+ // }}+ // >+ // <ListItemIcon>{perspective.icon}</ListItemIcon>+ // <ListItemText+ // primary={+ // <>+ // {perspective.title}+ // {badge}+ // </>+ // }+ // />+ // </MenuItem>,+ // );+ // });+ // }if (selectedEntries.length < 2 && showProperties) {menuItems.push(<Divider key={`divider-${menuItems.length}`} />);