Skip to content

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

Global key combination for loading previous and next files (#2005)

Stanimirb43ce457be6a
diff --git a/app/containers/MainPage.tsx b/app/containers/MainPage.tsx
index bd33f759a..64281d03d 100644
--- a/app/containers/MainPage.tsx
+++ b/app/containers/MainPage.tsx
@@ -78,7 +78,6 @@ import useEventListener from '-/utils/useEventListener';
import ConfirmDialog from '-/components/dialogs/ConfirmDialog';
import { TS } from '-/tagspaces.namespace';
import PageNotification from '-/containers/PageNotification';
-import listen from '-/containers/RendererListener';
import MoveOrCopyFilesDialog from '-/components/dialogs/MoveOrCopyFilesDialog';
import { Pro } from '-/pro';
import NewFileDialog from '-/components/dialogs/NewFileDialog';
@@ -90,8 +89,6 @@ import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';
import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';
import { useIOActionsContext } from '-/hooks/useIOActionsContext';
-import { extractDirectoryName } from '@tagspaces/tagspaces-common/paths';
-import PlatformIO from '-/services/platform-facade';
import { useNotificationContext } from '-/hooks/useNotificationContext';
import NewAudioDialog from '-/components/dialogs/NewAudioDialog';
@@ -161,14 +158,9 @@ interface Props {
isEditTagDialogOpened: boolean;
keyBindings: any;
toggleEditTagDialog: (tag: TS.Tag) => void;
- //saveFile: () => void; // needed by electron-menus
- setZoomResetApp: () => void; // needed by electron-menus
- setZoomInApp: () => void; // needed by electron-menus
- setZoomOutApp: () => void; // needed by electron-menus
toggleNewEntryDialog: () => void; // needed by electron-menus
toggleNewFileDialog: () => void; // needed by electron-menus
toggleNewAudioDialog: () => void; // needed by electron-menus
- showCreateDirectoryDialog: () => void; // needed by electron-menus
toggleSettingsDialog: () => void; // needed by electron-menus
toggleKeysDialog: () => void; // needed by electron-menus
toggleLicenseDialog: () => void; // needed by electron-menus
@@ -336,18 +328,13 @@ function MainPage(props: Props) {
openLink,
openedEntries,
isEntryInFullWidth,
- openFsEntry,
+ goForward,
+ goBack,
setEntryInFullWidth,
- openNextFile,
- openPrevFile,
} = useOpenedEntryContext();
- const {
- loadParentDirectoryContent,
- enterSearchMode,
- exitSearchMode,
- setSearchQuery,
- } = useDirectoryContentContext();
+ const { loadParentDirectoryContent, enterSearchMode, exitSearchMode } =
+ useDirectoryContentContext();
const { showNotification } = useNotificationContext();
const theme = useTheme();
const percent = useRef<number | undefined>(undefined);
@@ -387,39 +374,11 @@ function MainPage(props: Props) {
}
});
- function goForward() {
- window.history.forward();
- window.addEventListener(
- 'popstate',
- () => {
- openLink(window.location.href, { fullWidth: false });
- },
- { once: true },
- );
- }
-
- function goBack() {
- // console.log(
- // '>>> current href: ' + decodeURIComponent(window.location.href)
- // );
- window.history.back(); // window.history.go(-1);
- window.addEventListener(
- 'popstate',
- () => {
- openLink(window.location.href, { fullWidth: false });
- // console.log(
- // '>>> last href: ' + decodeURIComponent(window.location.href)
- // );
- },
- { once: true },
- );
- }
-
useEffect(() => {
if (!AppConfig.isCordova) {
updateDimensions();
}
- listen({
+ /*listen({
...props,
goBack,
goForward,
@@ -427,7 +386,7 @@ function MainPage(props: Props) {
openNextFile,
openPrevFile,
setSearchQuery,
- });
+ });*/
}, []);
useEffect(() => {
@@ -866,14 +825,9 @@ function mapDispatchToProps(dispatch) {
toggleEditTagDialog: AppActions.toggleEditTagDialog,
toggleTruncatedConfirmDialog: AppActions.toggleTruncatedConfirmDialog,
onUploadProgress: AppActions.onUploadProgress,
- //saveFile: AppActions.saveFile,
- setZoomResetApp: SettingsActions.setZoomResetApp,
- setZoomInApp: SettingsActions.setZoomInApp,
- setZoomOutApp: SettingsActions.setZoomOutApp,
toggleNewEntryDialog: AppActions.toggleNewEntryDialog,
toggleNewFileDialog: AppActions.toggleNewFileDialog,
toggleNewAudioDialog: AppActions.toggleNewAudioDialog,
- showCreateDirectoryDialog: AppActions.showCreateDirectoryDialog,
toggleSettingsDialog: AppActions.toggleSettingsDialog,
toggleKeysDialog: AppActions.toggleKeysDialog,
toggleLicenseDialog: AppActions.toggleLicenseDialog,
@@ -894,8 +848,6 @@ function mapDispatchToProps(dispatch) {
toggleDeleteMultipleEntriesDialog:
AppActions.toggleDeleteMultipleEntriesDialog,
setFirstRun: SettingsActions.setFirstRun,
- addExtensions: AppActions.addExtensions,
- addSupportedFileTypes: SettingsActions.addSupportedFileTypes,
},
dispatch,
);
diff --git a/app/containers/RendererListener.ts b/app/containers/RendererListener.ts
deleted file mode 100644
index 3eadf5b3e..000000000
--- a/app/containers/RendererListener.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * TagSpaces - universal file and folder organizer
- * Copyright (C) 2017-present TagSpaces UG (haftungsbeschraenkt)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License (version 3) as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-import AppConfig from '-/AppConfig';
-import settings from '-/settings';
-
-export default function listen(props) {
- let ipcRenderer;
- if (AppConfig.isElectron && window.require) {
- const electron = window.require('electron');
- ({ ipcRenderer } = electron);
-
- ipcRenderer.on('cmd', (event, arg) => {
- // console.log('Global events: ' + arg);
- switch (arg) {
- case 'new-text-file':
- props.toggleNewFileDialog();
- break;
- case 'open-search':
- props.setSearchQuery({ textQuery: '' });
- break;
- case 'open-location-manager-panel':
- props.openLocationManagerPanel();
- break;
- case 'open-tag-library-panel':
- props.openTagLibraryPanel();
- break;
- case 'audio':
- // console.log('showAudioRecordingDialog');
- break;
- case 'next-file': {
- props.openNextFile();
- break;
- }
- case 'previous-file': {
- props.openPrevFile();
- break;
- }
- case 'show-create-directory-dialog': {
- props.showCreateDirectoryDialog();
- break;
- }
- case 'toggle-open-link-dialog': {
- props.toggleOpenLinkDialog();
- break;
- }
- case 'go-back': {
- props.goBack();
- break;
- }
- case 'go-forward': {
- props.goForward();
- break;
- }
- case 'set-zoom-reset-app': {
- props.setZoomResetApp();
- break;
- }
- case 'set-zoom-in-app': {
- props.setZoomInApp();
- break;
- }
- case 'set-zoom-out-app': {
- props.setZoomOutApp();
- break;
- }
- case 'exit-fullscreen': {
- try {
- if (document.fullscreenElement) {
- document.exitFullscreen();
- }
- } catch (e) {
- console.log('Failed to exit fullscreen mode:', e);
- }
- break;
- }
- case 'toggle-settings-dialog': {
- props.toggleSettingsDialog();
- break;
- }
- case 'open-help-feedback-panel': {
- props.openHelpFeedbackPanel();
- break;
- }
- case 'toggle-keys-dialog': {
- props.toggleKeysDialog();
- break;
- }
- case 'toggle-onboarding-dialog': {
- props.toggleOnboardingDialog();
- break;
- }
- /*case 'open-url-externally': {
- props.openURLExternally();
- break;
- }*/
- case 'toggle-license-dialog': {
- props.toggleLicenseDialog();
- break;
- }
- case 'toggle-third-party-libs-dialog': {
- props.toggleThirdPartyLibsDialog();
- break;
- }
- case 'toggle-about-dialog': {
- props.toggleAboutDialog();
- break;
- }
- default:
- return false;
- }
- });
-
- /*ipcRenderer.on('open-url-externally', (event, arg) => {
- const { url, skipConfirm } = arg;
- props.openURLExternally(url, skipConfirm);
- });*/
-
- ipcRenderer.on('play-pause', (event, arg) => {
- // Create the event.
- const audioEvent = new CustomEvent('toggle-resume', { detail: '' });
- window.dispatchEvent(audioEvent);
- });
-
- ipcRenderer.on('set_extensions', (event, arg) => {
- const { extensions, supportedFileTypes } = arg;
- props.addExtensions(extensions);
- props.addSupportedFileTypes(supportedFileTypes);
- //console.debug('extensions', extensions);
- //console.debug('supportedFileTypes', supportedFileTypes);
- });
-
- ipcRenderer.on('start_ws', (event, arg) => {
- const { port } = arg;
- console.debug('RendererListener start_ws port:' + port);
- settings.setUsedWsPort(port);
- });
- }
- return ipcRenderer;
-}
diff --git a/app/containers/Root.tsx b/app/containers/Root.tsx
index 3bed9d171..2ddd442ea 100644
--- a/app/containers/Root.tsx
+++ b/app/containers/Root.tsx
@@ -40,6 +40,7 @@ import {
} from '-/hooks/SelectedEntryContextProvider';
import { FSWatcherContextProvider } from '-/hooks/FSWatcherContextProvider';
import { PlatformFacadeContextProvider } from '-/hooks/PlatformFacadeContextProvider';
+import { RendererListenerContextProvider } from '-/hooks/RendererListenerContextProvider';
type RootType = {
store: Store<{}>;
@@ -70,7 +71,9 @@ export default function Root({ store, persistor }: RootType) {
<FsActionsContextProvider>
<IOActionsContextProvider>
<TaggingActionsContextProvider>
- <MainPage />
+ <RendererListenerContextProvider>
+ <MainPage />
+ </RendererListenerContextProvider>
</TaggingActionsContextProvider>
</IOActionsContextProvider>
</FsActionsContextProvider>
diff --git a/app/hooks/OpenedEntryContextProvider.tsx b/app/hooks/OpenedEntryContextProvider.tsx
index 4aeff2594..9d9e46fb6 100644
--- a/app/hooks/OpenedEntryContextProvider.tsx
+++ b/app/hooks/OpenedEntryContextProvider.tsx
@@ -96,6 +96,8 @@ type OpenedEntryContextData = {
openPrevFile: (path?: string) => void;
toggleEntryFullWidth: () => void;
openLink: (url: string, options?) => void;
+ goForward: () => void;
+ goBack: () => void;
createFileAdvanced: (
targetPath: string,
fileName: string,
@@ -125,6 +127,8 @@ export const OpenedEntryContext = createContext<OpenedEntryContextData>({
openPrevFile: () => {},
toggleEntryFullWidth: () => {},
openLink: () => {},
+ goForward: () => {},
+ goBack: () => {},
createFile: () => {},
createFileAdvanced: () => {},
reflectRenameOpenedEntry: () => {},
@@ -727,6 +731,34 @@ export const OpenedEntryContextProvider = ({
setEntryInFullWidth(!isEntryInFullWidth);
}
+ function goForward() {
+ window.history.forward();
+ window.addEventListener(
+ 'popstate',
+ () => {
+ openLink(window.location.href, { fullWidth: false });
+ },
+ { once: true },
+ );
+ }
+
+ function goBack() {
+ // console.log(
+ // '>>> current href: ' + decodeURIComponent(window.location.href)
+ // );
+ window.history.back(); // window.history.go(-1);
+ window.addEventListener(
+ 'popstate',
+ () => {
+ openLink(window.location.href, { fullWidth: false });
+ // console.log(
+ // '>>> last href: ' + decodeURIComponent(window.location.href)
+ // );
+ },
+ { once: true },
+ );
+ }
+
function openLink(url: string, options = { fullWidth: true }) {
try {
const decodedURI = decodeURI(url);
@@ -1008,6 +1040,8 @@ export const OpenedEntryContextProvider = ({
openNextFile,
openPrevFile,
toggleEntryFullWidth,
+ goForward,
+ goBack,
openLink,
createFile,
createFileAdvanced,
diff --git a/app/hooks/RendererListenerContextProvider.tsx b/app/hooks/RendererListenerContextProvider.tsx
new file mode 100644
index 000000000..f0b699070
--- /dev/null
+++ b/app/hooks/RendererListenerContextProvider.tsx
@@ -0,0 +1,201 @@
+/**
+ * TagSpaces - universal file and folder organizer
+ * Copyright (C) 2023-present TagSpaces UG (haftungsbeschraenkt)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License (version 3) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+import React, { createContext, useEffect, useMemo } from 'react';
+import { useDispatch } from 'react-redux';
+import { actions as AppActions, AppDispatch } from '-/reducers/app';
+import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
+import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';
+import AppConfig from '-/AppConfig';
+import settings from '-/settings';
+import { actions as SettingsActions } from '-/reducers/settings';
+
+type RendererListenerContextData = {};
+
+export const RendererListenerContext =
+ createContext<RendererListenerContextData>({});
+
+export type RendererListenerContextProviderProps = {
+ children: React.ReactNode;
+};
+
+export const RendererListenerContextProvider = ({
+ children,
+}: RendererListenerContextProviderProps) => {
+ const dispatch: AppDispatch = useDispatch();
+ const { setSearchQuery } = useDirectoryContentContext();
+ const { goForward, goBack, openNextFile, openPrevFile } =
+ useOpenedEntryContext();
+
+ useEffect(() => {
+ let ipcRenderer;
+ if (AppConfig.isElectron && window.require) {
+ const electron = window.require('electron');
+ ({ ipcRenderer } = electron);
+ destroy(ipcRenderer);
+
+ ipcRenderer.on('cmd', (event, arg) => {
+ // console.log('Global events: ' + arg);
+ switch (arg) {
+ case 'new-text-file':
+ dispatch(AppActions.toggleNewFileDialog());
+ break;
+ case 'open-search':
+ setSearchQuery({ textQuery: '' });
+ break;
+ case 'open-location-manager-panel':
+ dispatch(AppActions.openLocationManagerPanel());
+ break;
+ case 'open-tag-library-panel':
+ dispatch(AppActions.openTagLibraryPanel());
+ break;
+ case 'audio':
+ // console.log('showAudioRecordingDialog');
+ break;
+ case 'next-file': {
+ openNextFile();
+ break;
+ }
+ case 'previous-file': {
+ openPrevFile();
+ break;
+ }
+ case 'show-create-directory-dialog': {
+ dispatch(AppActions.showCreateDirectoryDialog());
+ break;
+ }
+ case 'toggle-open-link-dialog': {
+ dispatch(AppActions.toggleOpenLinkDialog());
+ break;
+ }
+ case 'go-back': {
+ goBack();
+ break;
+ }
+ case 'go-forward': {
+ goForward();
+ break;
+ }
+ case 'set-zoom-reset-app': {
+ dispatch(SettingsActions.setZoomResetApp());
+ break;
+ }
+ case 'set-zoom-in-app': {
+ dispatch(SettingsActions.setZoomInApp());
+ break;
+ }
+ case 'set-zoom-out-app': {
+ dispatch(SettingsActions.setZoomOutApp());
+ break;
+ }
+ case 'exit-fullscreen': {
+ try {
+ if (document.fullscreenElement) {
+ document.exitFullscreen();
+ }
+ } catch (e) {
+ console.log('Failed to exit fullscreen mode:', e);
+ }
+ break;
+ }
+ case 'toggle-settings-dialog': {
+ dispatch(AppActions.toggleSettingsDialog());
+ break;
+ }
+ case 'open-help-feedback-panel': {
+ dispatch(AppActions.openHelpFeedbackPanel());
+ break;
+ }
+ case 'toggle-keys-dialog': {
+ dispatch(AppActions.toggleKeysDialog());
+ break;
+ }
+ case 'toggle-onboarding-dialog': {
+ dispatch(AppActions.toggleOnboardingDialog());
+ break;
+ }
+ /*case 'open-url-externally': {
+ props.openURLExternally();
+ break;
+ }*/
+ case 'toggle-license-dialog': {
+ dispatch(AppActions.toggleLicenseDialog());
+ break;
+ }
+ case 'toggle-third-party-libs-dialog': {
+ dispatch(AppActions.toggleThirdPartyLibsDialog());
+ break;
+ }
+ case 'toggle-about-dialog': {
+ dispatch(AppActions.toggleAboutDialog());
+ break;
+ }
+ default:
+ return false;
+ }
+ });
+
+ /*ipcRenderer.on('open-url-externally', (event, arg) => {
+ const { url, skipConfirm } = arg;
+ props.openURLExternally(url, skipConfirm);
+ });*/
+
+ ipcRenderer.on('play-pause', (event, arg) => {
+ // Create the event.
+ const audioEvent = new CustomEvent('toggle-resume', { detail: '' });
+ window.dispatchEvent(audioEvent);
+ });
+
+ ipcRenderer.on('set_extensions', (event, arg) => {
+ const { extensions, supportedFileTypes } = arg;
+ dispatch(AppActions.addExtensions(extensions));
+ dispatch(SettingsActions.addSupportedFileTypes(supportedFileTypes));
+ //console.debug('extensions', extensions);
+ //console.debug('supportedFileTypes', supportedFileTypes);
+ });
+
+ ipcRenderer.on('start_ws', (event, arg) => {
+ const { port } = arg;
+ console.debug('RendererListener start_ws port:' + port);
+ settings.setUsedWsPort(port);
+ });
+ }
+ return () => {
+ destroy(ipcRenderer);
+ };
+ }, [openNextFile, openPrevFile]);
+
+ function destroy(ipcRenderer) {
+ if (ipcRenderer) {
+ ipcRenderer.removeAllListeners('cmd');
+ ipcRenderer.removeAllListeners('play-pause');
+ ipcRenderer.removeAllListeners('set_extensions');
+ ipcRenderer.removeAllListeners('start_ws');
+ }
+ }
+
+ const context = useMemo(() => {
+ return {};
+ }, []);
+
+ return (
+ <RendererListenerContext.Provider value={context}>
+ {children}
+ </RendererListenerContext.Provider>
+ );
+};