TagSpaces is an offline, open source, document manager with tagging support
In description edit mode the arrow keys are changing the files (#2289)
Stanimir34b7d4f1bdf2
diff --git a/src/renderer/components/EditDescription.tsx b/src/renderer/components/EditDescription.tsxindex 50774192d..a90a1925b 100644--- a/src/renderer/components/EditDescription.tsx+++ b/src/renderer/components/EditDescription.tsx@@ -20,7 +20,6 @@ import EditDescriptionButtons from '-/components/EditDescriptionButtons';import DescriptionMdEditor from '-/components/md/DescriptionMdEditor';import { CrepeRef } from '-/components/md/useCrepeHandler';import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';-import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';import { Pro } from '-/pro';import { MilkdownProvider } from '@milkdown/react';import { useTheme } from '@mui/material/styles';@@ -28,8 +27,7 @@ import React, { useEffect, useRef } from 'react';function EditDescription() {const theme = useTheme();- const { openedEntry } = useOpenedEntryContext();- const { setDescription, setEditDescriptionMode } = useFilePropertiesContext();+ const { setEditDescriptionMode } = useFilePropertiesContext();const milkdownDivRef = useRef<HTMLDivElement>(null);const fileDescriptionRef = useRef<CrepeRef>(null);@@ -40,20 +38,6 @@ function EditDescription() {};}, []);- const milkdownListener = React.useCallback(- (markdown: string) => {- if (markdown !== openedEntry.meta?.description) {- // description) {- //descriptionFocus.current &&- setDescription(markdown);- /*if (descriptionButtonsRef.current) {- descriptionButtonsRef.current.setDescriptionChanged(true);- }*/- }- },- [openedEntry],- );-//const noDescription = !description || description.length < 1;return (@@ -94,10 +78,7 @@ function EditDescription() {}`}</style><MilkdownProvider>- <DescriptionMdEditor- ref={fileDescriptionRef}- onChange={milkdownListener}- />+ <DescriptionMdEditor ref={fileDescriptionRef} /></MilkdownProvider></div></div>diff --git a/src/renderer/components/md/DescriptionMdEditor.tsx b/src/renderer/components/md/DescriptionMdEditor.tsxindex 05bbe1f39..c086db494 100644--- a/src/renderer/components/md/DescriptionMdEditor.tsx+++ b/src/renderer/components/md/DescriptionMdEditor.tsx@@ -15,10 +15,10 @@* along with this program. If not, see <https://www.gnu.org/licenses/>.**/-import React, { useRef, forwardRef } from 'react';+import React, { useRef, forwardRef, useEffect } from 'react';import { Milkdown, useEditor } from '@milkdown/react';import { EditorStatus, commandsCtx } from '@milkdown/kit/core';-import { $useKeymap, $command } from '@milkdown/kit/utils';+import { getMarkdown, $useKeymap, $command } from '@milkdown/kit/utils';import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';import { createCrepeEditor } from '-/components/md/utils';import { CrepeRef, useCrepeHandler } from '-/components/md/useCrepeHandler';@@ -27,20 +27,26 @@ import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';import { useTranslation } from 'react-i18next';import { Pro } from '-/pro';import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';+import { replaceAll } from '@milkdown/utils';interface CrepeMdEditorProps {- onChange?: (markdown: string, prevMarkdown: string) => void;+ //onChange?: (markdown: string, prevMarkdown: string) => void;onFocus?: () => void;}const DescriptionMdEditor = forwardRef<CrepeRef, CrepeMdEditorProps>((props, ref) => {- const { onChange, onFocus } = props;+ const { onFocus } = props;const { t } = useTranslation();const { currentDirectoryPath } = useDirectoryContentContext();- const { saveDescription, isEditDescriptionMode, description } =- useFilePropertiesContext();- const { openLink } = useOpenedEntryContext();+ const {+ saveDescription,+ isEditDescriptionMode,+ isDescriptionChanged,+ description,+ setDescription,+ } = useFilePropertiesContext();+ const { openedEntry, openLink } = useOpenedEntryContext();const crepeInstanceRef = useRef<Crepe>(undefined);const { get, loading } = useEditor(@@ -48,6 +54,9 @@ const DescriptionMdEditor = forwardRef<CrepeRef, CrepeMdEditorProps>(/*if (crepeInstanceRef.current) {return crepeInstanceRef.current;}*/+ const milkdownListener = (markdown: string) => {+ setDescription(markdown);+ };const placeholder = isEditDescriptionMode? undefined: t(@@ -63,7 +72,7 @@ const DescriptionMdEditor = forwardRef<CrepeRef, CrepeMdEditorProps>(placeholder,currentDirectoryPath,openLink,- onChange,+ milkdownListener,onFocus,);@@ -104,6 +113,22 @@ const DescriptionMdEditor = forwardRef<CrepeRef, CrepeMdEditorProps>([currentDirectoryPath, isEditDescriptionMode],);+ useEffect(() => {+ if (!isDescriptionChanged) {+ const editor = get();+ if (!loading && editor && editor.status === EditorStatus.Created) {+ try {+ const markdown = editor.action(getMarkdown());+ if (markdown !== openedEntry.meta?.description) {+ editor.action(replaceAll(openedEntry.meta?.description, true));+ }+ } catch (e) {+ console.log(e);+ }+ }+ }+ }, [openedEntry]);+useCrepeHandler(ref, () => crepeInstanceRef.current, get, loading);return <Milkdown />;diff --git a/src/renderer/hooks/FilePropertiesContextProvider.tsx b/src/renderer/hooks/FilePropertiesContextProvider.tsxindex 69680bcaa..02d29a08a 100644--- a/src/renderer/hooks/FilePropertiesContextProvider.tsx+++ b/src/renderer/hooks/FilePropertiesContextProvider.tsx@@ -112,13 +112,17 @@ export const FilePropertiesContextProvider = ({}//lastOpenedFile.current = undefined;}+ isDescriptionChanged.current = false;}, [openedEntry]);function saveDescription(): Promise<boolean> {if (!lastOpenedFile.current) return Promise.resolve(false);const location = findLocation(lastOpenedFile.current.locationID);- if (!location || location.isReadOnly) return Promise.resolve(false);+ if (!location || location.isReadOnly) {+ showNotification(t('core:readonlyModeSave'));+ return Promise.resolve(false);+ }if (!Pro) {showNotification(t('core:thisFunctionalityIsAvailableInPro'));diff --git a/src/renderer/locales/en/core.json b/src/renderer/locales/en/core.jsonindex b00c0458f..74e243cd0 100644--- a/src/renderer/locales/en/core.json+++ b/src/renderer/locales/en/core.json@@ -400,6 +400,7 @@"forceReindexing": "Force reindexing","indexEmpty": "index is empty","readonlyModeSwitch": "Open this location in read-only mode",+ "readonlyModeSave": "Can't save in read-only mode","persistIndexSwitch": "Switch to manual index creation with persisted search index","disableIndexing": "Disable Indexing","disableThumbnailGeneration": "Disable Thumbnail Generation",