Skip to content

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

Add context menu for history and bookmarks (#2379)

Stanimir3b8be8519df5
diff --git a/src/renderer/components/CommonIcons.tsx b/src/renderer/components/CommonIcons.tsx
index 9427ea6de..33e30ae4d 100644
--- a/src/renderer/components/CommonIcons.tsx
+++ b/src/renderer/components/CommonIcons.tsx
@@ -52,7 +52,7 @@ export { default as InfoIcon } from '@mui/icons-material/InfoOutlined';
export { default as EntryPropertiesIcon } from '@mui/icons-material/InfoOutlined';
-export { default as RemoveIcon } from '@mui/icons-material/DeleteOutline';
+export { default as RemoveIcon } from '@mui/icons-material/RemoveCircleOutlineOutlined';
export { default as HistoryIcon } from '@mui/icons-material/History';
@@ -62,6 +62,8 @@ export { default as PerspectiveSettingsIcon } from '@mui/icons-material/DisplayS
export { default as CreateFileIcon } from '@mui/icons-material/AddCircleOutlineOutlined';
+export { default as AddIcon } from '@mui/icons-material/AddCircleOutlineOutlined';
+
export { default as LocalLocationIcon } from '@mui/icons-material/WorkOutline';
export { default as CloudLocationIcon } from '@mui/icons-material/CloudQueue';
@@ -311,3 +313,5 @@ export { default as ZoomLevelIcon } from '@mui/icons-material/Loupe';
export { default as PinGroupingOffIcon } from '@mui/icons-material/Grain'; // ScatterPlotOutlined
export { default as PinGroupingOnIcon } from '@mui/icons-material/ScatterPlotTwoTone';
+
+export { default as CopyToClipboardIcon } from '@mui/icons-material/ContentCopy';
diff --git a/src/renderer/components/RenderHistory.tsx b/src/renderer/components/RenderHistory.tsx
index 0948f0ef5..c4fc2412a 100644
--- a/src/renderer/components/RenderHistory.tsx
+++ b/src/renderer/components/RenderHistory.tsx
@@ -18,32 +18,42 @@
import AppConfig from '-/AppConfig';
import {
+ CopyToClipboardIcon,
EntryBookmarkIcon,
HistoryIcon,
+ MoreMenuIcon,
+ OpenFileIcon,
+ OpenNewWindowIcon,
RemoveIcon,
} from '-/components/CommonIcons';
import TsButton from '-/components/TsButton';
import TsIconButton from '-/components/TsIconButton';
import { useBrowserHistoryContext } from '-/hooks/useBrowserHistoryContext';
+import { useHistoryContext } from '-/hooks/useHistoryContext';
import { Pro } from '-/pro';
import { dataTidFormat } from '-/services/test';
+import { createNewInstance } from '-/services/utils-io';
import { TS } from '-/tagspaces.namespace';
import { Tooltip } from '@mui/material';
import ListItem from '@mui/material/ListItem';
+import ListItemIcon from '@mui/material/ListItemIcon';
+import ListItemText from '@mui/material/ListItemText';
+import Menu from '@mui/material/Menu';
+import MenuItem from '@mui/material/MenuItem';
import {
extractDirectoryName,
extractFileName,
} from '@tagspaces/tagspaces-common/paths';
-import { useContext } from 'react';
+import { useContext, useState } from 'react';
import { useTranslation } from 'react-i18next';
-import { useHistoryContext } from '-/hooks/useHistoryContext';
+import TsMenuList from './TsMenuList';
interface Props {
historyKey: string;
items: Array<TS.HistoryItem> | Array<TS.BookmarkItem>;
update: () => void;
maxItems?: number | undefined;
- showDelete?: boolean;
+ showMenu?: boolean;
}
function RenderHistory(props: Props) {
const { t } = useTranslation();
@@ -52,7 +62,84 @@ function RenderHistory(props: Props) {
const bookmarksContext = Pro?.contextProviders?.BookmarksContext
? useContext<TS.BookmarksContextData>(Pro.contextProviders.BookmarksContext)
: undefined;
- const { historyKey, items, update, maxItems, showDelete = true } = props;
+ const { historyKey, items, update, maxItems, showMenu = true } = props;
+
+ const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
+ const [selectedItem, setSelectedItem] = useState<
+ TS.HistoryItem | TS.BookmarkItem | null
+ >(null);
+ const menuOpen = Boolean(anchorEl);
+
+ const handleMenuOpen = (
+ event: React.MouseEvent<HTMLElement>,
+ item: TS.HistoryItem | TS.BookmarkItem,
+ ) => {
+ setAnchorEl(event.currentTarget);
+ setSelectedItem(item);
+ };
+
+ const handleMenuClose = () => {
+ setAnchorEl(null);
+ setSelectedItem(null);
+ };
+
+ const handleOpen = () => {
+ if (selectedItem) {
+ openHistoryItem(selectedItem as TS.HistoryItem);
+ }
+ handleMenuClose();
+ };
+
+ const handleOpenInNewWindow = async () => {
+ if (!selectedItem) {
+ handleMenuClose();
+ return;
+ }
+ try {
+ let newInstanceLink = window.location.href.split('?')[0];
+ const queryIndex = selectedItem.url.indexOf('?');
+ if (queryIndex !== -1) {
+ newInstanceLink += selectedItem.url.substring(queryIndex);
+ }
+ createNewInstance(newInstanceLink);
+ } catch (err) {
+ console.error('Open in new window failed', err);
+ } finally {
+ handleMenuClose();
+ }
+ };
+
+ const handleCopyLink = async () => {
+ if (!selectedItem) {
+ handleMenuClose();
+ return;
+ }
+ try {
+ if (navigator?.clipboard?.writeText) {
+ await navigator.clipboard.writeText(selectedItem.url);
+ }
+ } catch (err) {
+ console.error('Copy failed', err);
+ } finally {
+ handleMenuClose();
+ }
+ };
+
+ const handleRemove = () => {
+ if (!selectedItem) {
+ handleMenuClose();
+ return;
+ }
+ if (historyKey === Pro?.keys.bookmarksKey) {
+ // del bookmark
+ bookmarksContext?.delBookmark(selectedItem.path);
+ } else {
+ // del history entry
+ delHistory(historyKey, selectedItem.creationTimeStamp);
+ }
+ update();
+ handleMenuClose();
+ };
return (
<>
@@ -74,8 +161,8 @@ function RenderHistory(props: Props) {
textTransform: 'none',
fontWeight: 'normal',
justifyContent: 'start',
- minWidth: 255,
- maxWidth: 255,
+ minWidth: 270,
+ maxWidth: 270,
}}
onClick={() => openHistoryItem(item as TS.HistoryItem)}
>
@@ -112,27 +199,58 @@ function RenderHistory(props: Props) {
{itemName}
</span>
</TsButton>
- {showDelete && (
+ {showMenu && (
<TsIconButton
- tooltip={t('delete')}
- aria-label={t('core:clearHistory')}
- onClick={() => {
- if (historyKey === Pro?.keys.bookmarksKey) {
- //del bookmarks
- bookmarksContext.delBookmark(item.path);
- } else {
- delHistory(historyKey, item.creationTimeStamp);
- }
- update();
- }}
- data-tid="deleteHistoryItemTID"
+ tooltip={t('options')}
+ aria-label={t('options')}
+ onClick={(e) => handleMenuOpen(e, item)}
+ data-tid={'historyItemMenuTID' + dataTidFormat(itemName)}
+ size="small"
>
- <RemoveIcon fontSize="small" />
+ <MoreMenuIcon />
</TsIconButton>
)}
</ListItem>
);
})}
+
+ <Menu
+ anchorEl={anchorEl}
+ open={menuOpen}
+ onClose={handleMenuClose}
+ anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
+ transformOrigin={{ vertical: 'top', horizontal: 'right' }}
+ >
+ <TsMenuList>
+ <MenuItem onClick={handleOpen} data-tid="historyMenuOpen">
+ <ListItemIcon>
+ <OpenFileIcon />
+ </ListItemIcon>
+ <ListItemText primary={t('openEntry')} />
+ </MenuItem>
+ <MenuItem
+ onClick={handleOpenInNewWindow}
+ data-tid="historyMenuOpenNewWindow"
+ >
+ <ListItemIcon>
+ <OpenNewWindowIcon />
+ </ListItemIcon>
+ <ListItemText primary={t('openInWindow')} />
+ </MenuItem>
+ <MenuItem onClick={handleCopyLink} data-tid="historyMenuCopyLink">
+ <ListItemIcon>
+ <CopyToClipboardIcon />
+ </ListItemIcon>
+ <ListItemText primary={t('copyLinkToClipboard')} />
+ </MenuItem>
+ <MenuItem onClick={handleRemove} data-tid="historyMenuRemove">
+ <ListItemIcon>
+ <RemoveIcon />
+ </ListItemIcon>
+ <ListItemText primary={t('remove')} />
+ </MenuItem>
+ </TsMenuList>
+ </Menu>
</>
);
}
diff --git a/src/renderer/components/StoredSearches.tsx b/src/renderer/components/StoredSearches.tsx
index 8b91bb2eb..0257d9f4e 100644
--- a/src/renderer/components/StoredSearches.tsx
+++ b/src/renderer/components/StoredSearches.tsx
@@ -201,6 +201,7 @@ function StoredSearches(props: Props) {
}}
/>
<TsIconButton
+ size="small"
data-tid="StoredSearchesMenuTID"
onClick={handleSearchMenu}
>
@@ -290,6 +291,7 @@ function StoredSearches(props: Props) {
menuHistoryKey.current = historyKeys.fileOpenKey;
setBookmarksMenuAnchorEl(event.currentTarget);
}}
+ size="small"
>
<MoreMenuIcon />
</TsIconButton>
@@ -342,6 +344,7 @@ function StoredSearches(props: Props) {
menuHistoryKey.current = historyKeys.fileOpenKey;
setHistoryMenuAnchorEl(event.currentTarget);
}}
+ size="small"
>
<MoreMenuIcon />
</TsIconButton>
@@ -390,6 +393,7 @@ function StoredSearches(props: Props) {
menuHistoryKey.current = historyKeys.fileEditKey;
setHistoryMenuAnchorEl(event.currentTarget);
}}
+ size="small"
>
<MoreMenuIcon />
</TsIconButton>
@@ -441,6 +445,7 @@ function StoredSearches(props: Props) {
</Grid>
<Grid size={2} style={{ textAlign: 'right' }}>
<TsIconButton
+ size="small"
data-tid="FolderOpenMenuTID"
onClick={(event: any) => {
menuHistoryKey.current = historyKeys.folderOpenKey;
diff --git a/src/renderer/components/WelcomePanel.tsx b/src/renderer/components/WelcomePanel.tsx
index e7dc33838..d96821dd4 100644
--- a/src/renderer/components/WelcomePanel.tsx
+++ b/src/renderer/components/WelcomePanel.tsx
@@ -95,7 +95,7 @@ function WelcomePanel() {
const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
- const showDelete = false;
+ const showMenu = false;
const maxRecentItems = 5;
function renderRecentItems() {
@@ -111,7 +111,7 @@ function WelcomePanel() {
items={fileOpenHistory}
update={forceUpdate}
maxItems={maxRecentItems}
- showDelete={showDelete}
+ showMenu={showMenu}
/>
</List>
) : (
@@ -129,7 +129,7 @@ function WelcomePanel() {
items={fileEditHistory}
update={forceUpdate}
maxItems={maxRecentItems}
- showDelete={showDelete}
+ showMenu={showMenu}
/>
</List>
) : (
@@ -147,7 +147,7 @@ function WelcomePanel() {
items={folderOpenHistory}
update={forceUpdate}
maxItems={maxRecentItems}
- showDelete={showDelete}
+ showMenu={showMenu}
/>
</List>
) : (
diff --git a/src/renderer/components/dialogs/components/SettingsAdvanced.tsx b/src/renderer/components/dialogs/components/SettingsAdvanced.tsx
index 5822dd57a..ba3a91038 100644
--- a/src/renderer/components/dialogs/components/SettingsAdvanced.tsx
+++ b/src/renderer/components/dialogs/components/SettingsAdvanced.tsx
@@ -566,7 +566,7 @@ function SettingsAdvanced(props: Props) {
disabled={!Pro}
onClick={(event) => editWorkSpacesClick(event)}
>
- {t('addWorkspace')}
+ {t('createWorkspace')}
</TsButton>
</ListItem>
{workSpaces && workSpaces.length > 0 && (
diff --git a/src/renderer/components/dialogs/components/WorkSpacesDropdown.tsx b/src/renderer/components/dialogs/components/WorkSpacesDropdown.tsx
index f6f6f0387..802b264a2 100644
--- a/src/renderer/components/dialogs/components/WorkSpacesDropdown.tsx
+++ b/src/renderer/components/dialogs/components/WorkSpacesDropdown.tsx
@@ -15,14 +15,14 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
-import React, { useEffect, useRef } from 'react';
-import TsSelect from '-/components/TsSelect';
+import { AddIcon, RemoveIcon } from '-/components/CommonIcons';
import TsIconButton from '-/components/TsIconButton';
-import MenuItem from '@mui/material/MenuItem';
-import InputAdornment from '@mui/material/InputAdornment';
-import AddIcon from '@mui/icons-material/Add';
-import { RemoveIcon } from '-/components/CommonIcons';
+import TsSelect from '-/components/TsSelect';
import { TS } from '-/tagspaces.namespace';
+import InputAdornment from '@mui/material/InputAdornment';
+import MenuItem from '@mui/material/MenuItem';
+import React, { useEffect, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
interface WorkSpacesDropdownProps {
workSpaceId: string | undefined;
@@ -45,6 +45,7 @@ const WorkSpacesDropdown: React.FC<WorkSpacesDropdownProps> = ({
}) => {
// Keep track of initial workSpaces to detect additions (keeps original behavior from EditTagGroupDialog)
const initWorkSpaces = useRef<TS.WorkSpace[]>(workSpaces);
+ const { t } = useTranslation();
useEffect(() => {
// handle new workSpace add
@@ -75,11 +76,13 @@ const WorkSpacesDropdown: React.FC<WorkSpacesDropdownProps> = ({
slotProps={{
input: {
startAdornment: (
- <InputAdornment position="start" sx={{ ml: -2 }}>
+ <InputAdornment position="start">
<TsIconButton
- aria-label="add-wspace"
+ style={{ marginLeft: -10 }}
+ aria-label="add-workspace"
onClick={() => onOpenNewWorkspace && onOpenNewWorkspace()}
data-tid="wSpaceAddTID"
+ tooltip={t('createWorkspace')}
>
<AddIcon />
</TsIconButton>
@@ -88,9 +91,11 @@ const WorkSpacesDropdown: React.FC<WorkSpacesDropdownProps> = ({
endAdornment: workSpaceId && (
<InputAdornment position="end">
<TsIconButton
- aria-label="delete-wspace"
+ aria-label="delete-workspace"
onClick={() => setWorkSpaceId('')}
data-tid="wSpaceResetTID"
+ style={{ marginRight: 15 }}
+ tooltip={t('removeWorkspace')}
>
<RemoveIcon />
</TsIconButton>
diff --git a/src/renderer/locales/en/core.json b/src/renderer/locales/en/core.json
index 64e99612a..ec62c1be9 100644
--- a/src/renderer/locales/en/core.json
+++ b/src/renderer/locales/en/core.json
@@ -1091,7 +1091,8 @@
"workspace": "Workspace",
"currentWorkspace": "Current Workspace",
"all": "All",
- "addWorkspace": "Add Workspace",
+ "createWorkspace": "Create Workspace",
+ "removeWorkspace": "Remove Workspace",
"fullName": "Full name",
"shortName": "Short name",
"shortNameRequired": "Short name required",