Skip to content

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

Share files in context menu do not work (#2318)

Stanimir23bfd3637a2e
diff --git a/src/renderer/components/EntryContainer.tsx b/src/renderer/components/EntryContainer.tsx
index dcbe5c81e..617b3f020 100644
--- a/src/renderer/components/EntryContainer.tsx
+++ b/src/renderer/components/EntryContainer.tsx
@@ -59,6 +59,7 @@ import React, {
import { GlobalHotKeys } from 'react-hotkeys';
import { useTranslation } from 'react-i18next';
import { useSelector } from 'react-redux';
+import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';
function EntryContainer() {
const { t } = useTranslation();
@@ -93,7 +94,7 @@ function EntryContainer() {
flexDirection: 'column',
};
const [isPanelOpened, setPanelOpened] = useState<boolean>(
- tabIndex !== undefined && tabIndex !== -1,
+ tabIndex !== undefined && tabIndex !== TabNames.closedTabs,
);
const smallScreen = useMediaQuery(theme.breakpoints.down('md'));
diff --git a/src/renderer/components/EntryContainerTabs.tsx b/src/renderer/components/EntryContainerTabs.tsx
index f89c9910b..e15e9e8ab 100644
--- a/src/renderer/components/EntryContainerTabs.tsx
+++ b/src/renderer/components/EntryContainerTabs.tsx
@@ -166,7 +166,7 @@ function EntryContainerTabs(props: EntryContainerTabsProps) {
selectedTabIndex === index //parseInt(event.currentTarget.id.split('-')[1], 10)
) {
// when selected tab is clicked...
- dispatch(SettingsActions.setEntryContainerTab(undefined));
+ dispatch(SettingsActions.setEntryContainerTab(TabNames.closedTabs));
toggleProperties();
console.log('tab click:' + index);
}
diff --git a/src/renderer/components/dialogs/EditEntryTagDialog.tsx b/src/renderer/components/dialogs/EditEntryTagDialog.tsx
index 679914829..6990754ce 100644
--- a/src/renderer/components/dialogs/EditEntryTagDialog.tsx
+++ b/src/renderer/components/dialogs/EditEntryTagDialog.tsx
@@ -36,7 +36,13 @@ import FormHelperText from '@mui/material/FormHelperText';
import Paper from '@mui/material/Paper';
import { useTheme } from '@mui/material/styles';
import useMediaQuery from '@mui/material/useMediaQuery';
-import React, { ChangeEvent, useMemo, useRef, useState } from 'react';
+import React, {
+ ChangeEvent,
+ useMemo,
+ useReducer,
+ useRef,
+ useState,
+} from 'react';
import { useTranslation } from 'react-i18next';
interface Props {
@@ -56,7 +62,7 @@ function EditEntryTagDialog({ open, entries, tag, onClose }: Props) {
const [editDisabled, setEditDisabled] = useState(false);
const { setError, haveError } = useValidation();
const titleRef = useRef<string>(tag?.title || '');
- //const [, forceUpdate] = useReducer((x) => x + 1, 0);
+ const [, forceUpdate] = useReducer((x) => x + 1, 0);
const theme = useTheme();
const smallScreen = useMediaQuery(theme.breakpoints.down('md'));
@@ -109,7 +115,7 @@ function EditEntryTagDialog({ open, entries, tag, onClose }: Props) {
const setTitle = (newTitle: string) => {
titleRef.current = newTitle;
- //forceUpdate();
+ forceUpdate();
};
const renderContent = () => {
@@ -134,7 +140,7 @@ function EditEntryTagDialog({ open, entries, tag, onClose }: Props) {
handleValidation(value);
setTitle(value);
}}
- defaultValue={tag?.title}
+ value={titleRef.current || tag?.title}
data-tid="editTagEntryDialog_input"
slotProps={{
input: {
diff --git a/src/renderer/components/dialogs/hooks/MenuContextProvider.tsx b/src/renderer/components/dialogs/hooks/MenuContextProvider.tsx
index 65429125d..c45e6341c 100644
--- a/src/renderer/components/dialogs/hooks/MenuContextProvider.tsx
+++ b/src/renderer/components/dialogs/hooks/MenuContextProvider.tsx
@@ -28,6 +28,7 @@ import LoadingLazy from '-/components/LoadingLazy';
import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';
import { TS } from '-/tagspaces.namespace';
import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
+import { Pro } from '-/pro';
type MenuContextData = {
openMenu: (
@@ -44,7 +45,8 @@ type MenuContextData = {
openFileMenu: (
event: MouseEvent | React.MouseEvent<Element, MouseEvent>,
dirPath: string,
- openShareFiles?: () => void,
+ orderTop?: () => void,
+ orderBottom?: () => void,
) => void;
// setMousePosition: (x: number, y: number) => void;
closeDirectoryMenu: () => void;
@@ -54,6 +56,8 @@ type MenuContextData = {
closeMoveCopyFilesDialog: () => void;
openAddRemoveTagsDialog: (entries?: TS.FileSystemEntry[]) => void;
closeAddRemoveTagsDialog: () => void;
+ openShareFilesDialog: (entries?: TS.FileSystemEntry[]) => void;
+ closeShareFilesDialog: () => void;
};
export const MenuContext = createContext<MenuContextData>({
@@ -67,6 +71,8 @@ export const MenuContext = createContext<MenuContextData>({
closeMoveCopyFilesDialog: undefined,
openAddRemoveTagsDialog: undefined,
closeAddRemoveTagsDialog: undefined,
+ openShareFilesDialog: undefined,
+ closeShareFilesDialog: undefined,
});
export type MenuContextProviderProps = {
@@ -101,7 +107,7 @@ const AddRemoveTagsDialog = React.lazy(
export const MenuContextProvider = ({ children }: MenuContextProviderProps) => {
const { findLocation } = useCurrentLocationContext();
- const { setSelectedEntries, selectedEntries } = useSelectedEntriesContext();
+ const { selectedEntries } = useSelectedEntriesContext();
const [directoryContextMenuAnchorEl, setDirectoryContextMenuAnchorEl] =
useState<null | HTMLElement>(null);
const [fileContextMenuAnchorEl, setFileContextMenuAnchorEl] =
@@ -110,18 +116,20 @@ export const MenuContextProvider = ({ children }: MenuContextProviderProps) => {
const openRenameEntry = useRef<boolean>(false);
const openMoveCopyFiles = useRef<boolean>(false);
const openAddRemoveTags = useRef<boolean>(false);
+ const openShareFiles = useRef<boolean>(false);
const perspectiveMode = useRef<boolean>(false);
const switchPerspectives = useRef<boolean>(false);
const directoryPath = useRef<string>(undefined);
const mouseX = useRef<number>(undefined);
const mouseY = useRef<number>(undefined);
- const openShareFilesDialog = useRef<() => void>(undefined);
const reorderTop = useRef<() => void>(undefined);
const reorderBottom = useRef<() => void>(undefined);
const menuItems = useRef<React.ReactNode>(undefined);
const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
+ const ShareFilesDialog = Pro && Pro.UI ? Pro.UI.ShareFilesDialog : false;
+
const openMenu = (
event: MouseEvent | React.MouseEvent<Element, MouseEvent>,
entry: TS.FileSystemEntry,
@@ -171,7 +179,6 @@ export const MenuContextProvider = ({ children }: MenuContextProviderProps) => {
const openFileMenu = (
event: MouseEvent | React.MouseEvent<Element, MouseEvent>,
dirPath: string,
- openShareFiles?: () => void,
orderTop?: () => void,
orderBottom?: () => void,
) => {
@@ -179,7 +186,7 @@ export const MenuContextProvider = ({ children }: MenuContextProviderProps) => {
directoryPath.current = dirPath;
mouseX.current = event.clientX;
mouseY.current = event.clientY;
- openShareFilesDialog.current = openShareFiles;
+ //openShareFilesDialog.current = openShareFiles;
reorderTop.current = orderTop;
reorderBottom.current = orderBottom;
// @ts-ignore
@@ -214,6 +221,12 @@ export const MenuContextProvider = ({ children }: MenuContextProviderProps) => {
forceUpdate();
};
+ const openShareFilesDialog = (entries?: TS.FileSystemEntry[]) => {
+ openShareFiles.current = true;
+ currentEntries.current = entries;
+ forceUpdate();
+ };
+
const closeRenameEntryDialog = () => {
openRenameEntry.current = false;
forceUpdate();
@@ -226,6 +239,10 @@ export const MenuContextProvider = ({ children }: MenuContextProviderProps) => {
openAddRemoveTags.current = false;
forceUpdate();
};
+ const closeShareFilesDialog = () => {
+ openShareFiles.current = false;
+ forceUpdate();
+ };
function DirectoryMenuAsync(props) {
return (
@@ -277,6 +294,8 @@ export const MenuContextProvider = ({ children }: MenuContextProviderProps) => {
closeMoveCopyFilesDialog,
openAddRemoveTagsDialog,
closeAddRemoveTagsDialog,
+ openShareFilesDialog,
+ closeShareFilesDialog,
};
}, []);
@@ -300,6 +319,12 @@ export const MenuContextProvider = ({ children }: MenuContextProviderProps) => {
currentEntries.current ? currentEntries.current : selectedEntries
}
/>
+ {ShareFilesDialog && (
+ <ShareFilesDialog
+ open={openShareFiles.current}
+ onClose={closeShareFilesDialog}
+ />
+ )}
<DirectoryMenuAsync
open={Boolean(directoryContextMenuAnchorEl)}
onClose={() => closeDirectoryMenu()}
@@ -318,7 +343,6 @@ export const MenuContextProvider = ({ children }: MenuContextProviderProps) => {
selectedFilePath={directoryPath.current}
mouseX={mouseX.current}
mouseY={mouseY.current}
- openShareFilesDialog={openShareFilesDialog}
reorderTop={reorderTop.current}
reorderBottom={reorderBottom.current}
/>
diff --git a/src/renderer/components/menus/FileMenu.tsx b/src/renderer/components/menus/FileMenu.tsx
index e828b8758..5ae7e233d 100644
--- a/src/renderer/components/menus/FileMenu.tsx
+++ b/src/renderer/components/menus/FileMenu.tsx
@@ -78,28 +78,14 @@ interface Props {
mouseY?: number;
open: boolean;
onClose: () => void;
- openShareFilesDialog?: () => void;
- /**
- * @deprecated use selectedEntries instead
- */
- // selectedFilePath?: string;
reorderTop?: () => void;
reorderBottom?: () => void;
onDuplicateFile?: (fileDirPath: string) => void;
}
function FileMenu(props: Props) {
- const {
- openShareFilesDialog,
- reorderTop,
- reorderBottom,
- anchorEl,
- mouseX,
- mouseY,
- open,
- onClose,
- // selectedFilePath,
- } = props;
+ const { reorderTop, reorderBottom, anchorEl, mouseX, mouseY, open, onClose } =
+ props;
const keyBindings = useSelector(getKeyBindingObject);
const { t } = useTranslation();
@@ -107,6 +93,7 @@ function FileMenu(props: Props) {
openAddRemoveTagsDialog,
openMoveCopyFilesDialog,
openRenameEntryDialog,
+ openShareFilesDialog,
} = useMenuContext();
const { selectedEntries, lastSelectedEntry } = useSelectedEntriesContext();
const { openDeleteMultipleEntriesDialog } =
diff --git a/src/renderer/hooks/EntryPropsTabsContextProvider.tsx b/src/renderer/hooks/EntryPropsTabsContextProvider.tsx
index 310e33314..1ef920336 100644
--- a/src/renderer/hooks/EntryPropsTabsContextProvider.tsx
+++ b/src/renderer/hooks/EntryPropsTabsContextProvider.tsx
@@ -49,6 +49,7 @@ export const TabNames = {
revisionsTab: 'revisionsTab',
aiTab: 'aiTab',
linksTab: 'linksTab',
+ closedTabs: 'closedTabs',
};
type EntryPropsTabsContextData = {
diff --git a/src/renderer/perspectives/grid/components/MainContainer.tsx b/src/renderer/perspectives/grid/components/MainContainer.tsx
index 2cdc7a62e..d3099a244 100644
--- a/src/renderer/perspectives/grid/components/MainContainer.tsx
+++ b/src/renderer/perspectives/grid/components/MainContainer.tsx
@@ -81,8 +81,6 @@ function GridPerspective(props: Props) {
setSelectedEntries(selected);
};
- const ShareFilesDialog = Pro && Pro.UI ? Pro.UI.ShareFilesDialog : false;
-
const [mouseX, setMouseX] = useState<number>(undefined);
const [mouseY, setMouseY] = useState<number>(undefined);
const selectedEntry = useRef<TS.FileSystemEntry>(undefined);
@@ -96,8 +94,6 @@ function GridPerspective(props: Props) {
useState<null | HTMLElement>(null);
const [isAddTagDialogOpened, setIsAddTagDialogOpened] =
useState<TS.Tag>(undefined);
- const [isShareFilesDialogOpened, setIsShareFilesDialogOpened] =
- useState<boolean>(false);
const [isGridSettingsDialogOpened, setIsGridSettingsDialogOpened] =
useState<boolean>(false);
const firstRender = useFirstRender();
@@ -178,13 +174,6 @@ function GridPerspective(props: Props) {
setOptionsContextMenuAnchorEl(null);
};
- const openShareFilesDialog = () => {
- const currentLocation = findLocation();
- if (currentLocation && currentLocation.haveObjectStoreSupport()) {
- setIsShareFilesDialogOpened(true);
- }
- };
-
const keyMap = {
nextDocument: keyBindings.nextDocument,
prevDocument: keyBindings.prevDocument,
@@ -335,7 +324,6 @@ function GridPerspective(props: Props) {
handleSortingMenu={handleSortingMenu}
handleExportCsvMenu={handleExportCsvMenu}
openSettings={openSettings}
- openShareFilesDialog={openShareFilesDialog}
/>
<GlobalHotKeys
keyMap={keyMap}
@@ -373,12 +361,6 @@ function GridPerspective(props: Props) {
handleSortingMenu={handleSortingMenu}
/>
)}
- {isShareFilesDialogOpened && Pro && (
- <ShareFilesDialog
- open={isShareFilesDialogOpened}
- onClose={() => setIsShareFilesDialogOpened(false)}
- />
- )}
{/* TODO EntryTagMenu is used in TagSelect we cannot move confirm dialog from menu */}
<EntryTagMenu
anchorEl={tagContextMenuAnchorEl}
diff --git a/src/renderer/perspectives/grid/components/MainToolbar.tsx b/src/renderer/perspectives/grid/components/MainToolbar.tsx
index 64cbb9fb9..8fd0eece6 100644
--- a/src/renderer/perspectives/grid/components/MainToolbar.tsx
+++ b/src/renderer/perspectives/grid/components/MainToolbar.tsx
@@ -60,7 +60,6 @@ interface Props {
handleSortingMenu: (event: Object) => void;
handleExportCsvMenu: () => void;
openSettings: () => void;
- openShareFilesDialog?: () => void;
}
function MainToolbar(props: Props) {
@@ -70,10 +69,13 @@ function MainToolbar(props: Props) {
handleSortingMenu,
handleExportCsvMenu,
openSettings,
- openShareFilesDialog,
} = props;
- const { openMoveCopyFilesDialog, openAddRemoveTagsDialog } = useMenuContext();
+ const {
+ openMoveCopyFilesDialog,
+ openAddRemoveTagsDialog,
+ openShareFilesDialog,
+ } = useMenuContext();
const { haveLocalSetting } = usePerspectiveSettingsContext();
const { openAiGenerationDialog } = useAiGenerationDialogContext();
const { nativeDragModeEnabled, setNativeDragModeEnabled } =
@@ -233,13 +235,13 @@ function MainToolbar(props: Props) {
<DeleteIcon />
</TsToolbarButton>
)}
- {openShareFilesDialog && currentLocation?.haveObjectStoreSupport() && (
+ {Pro && currentLocation?.haveObjectStoreSupport() && (
<TsToolbarButton
tooltip={t('core:shareFiles')}
title={t('core:shareFiles')}
aria-label={t('core:shareFiles')}
data-tid={prefixDataTID + 'PerspectiveShareFiles'}
- onClick={openShareFilesDialog}
+ onClick={() => openShareFilesDialog()}
disabled={selectedEntries.length < 1}
>
<ShareIcon />
diff --git a/src/renderer/perspectives/list/components/MainContainer.tsx b/src/renderer/perspectives/list/components/MainContainer.tsx
index 0ac9556eb..cf96e89a1 100644
--- a/src/renderer/perspectives/list/components/MainContainer.tsx
+++ b/src/renderer/perspectives/list/components/MainContainer.tsx
@@ -81,8 +81,6 @@ function ListPerspective(props: Props) {
setSelectedEntries(selected);
};
- const ShareFilesDialog = Pro && Pro.UI ? Pro.UI.ShareFilesDialog : false;
-
const [mouseX, setMouseX] = useState<number>(undefined);
const [mouseY, setMouseY] = useState<number>(undefined);
const selectedEntry = useRef<TS.FileSystemEntry>(undefined);
@@ -96,8 +94,6 @@ function ListPerspective(props: Props) {
useState<null | HTMLElement>(null);
const [isAddTagDialogOpened, setIsAddTagDialogOpened] =
useState<TS.Tag>(undefined);
- const [isShareFilesDialogOpened, setIsShareFilesDialogOpened] =
- useState<boolean>(false);
const [isGridSettingsDialogOpened, setIsGridSettingsDialogOpened] =
useState<boolean>(false);
const firstRender = useFirstRender();
@@ -178,13 +174,6 @@ function ListPerspective(props: Props) {
setOptionsContextMenuAnchorEl(null);
};
- const openShareFilesDialog = () => {
- const currentLocation = findLocation();
- if (currentLocation && currentLocation.haveObjectStoreSupport()) {
- setIsShareFilesDialogOpened(true);
- }
- };
-
const keyMap = {
nextDocument: keyBindings.nextDocument,
prevDocument: keyBindings.prevDocument,
@@ -335,7 +324,6 @@ function ListPerspective(props: Props) {
handleSortingMenu={handleSortingMenu}
handleExportCsvMenu={handleExportCsvMenu}
openSettings={openSettings}
- openShareFilesDialog={openShareFilesDialog}
/>
<GlobalHotKeys
keyMap={keyMap}
@@ -373,12 +361,6 @@ function ListPerspective(props: Props) {
handleSortingMenu={handleSortingMenu}
/>
)}
- {isShareFilesDialogOpened && Pro && (
- <ShareFilesDialog
- open={isShareFilesDialogOpened}
- onClose={() => setIsShareFilesDialogOpened(false)}
- />
- )}
{/* TODO EntryTagMenu is used in TagSelect we cannot move confirm dialog from menu */}
<EntryTagMenu
anchorEl={tagContextMenuAnchorEl}