Skip to content

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

fix unsaved description changes

sytolk3ef918a95c12
diff --git a/src/renderer/components/md/DescriptionMdEditor.tsx b/src/renderer/components/md/DescriptionMdEditor.tsx
index 01f9d66dc..1ade25ac8 100644
--- a/src/renderer/components/md/DescriptionMdEditor.tsx
+++ b/src/renderer/components/md/DescriptionMdEditor.tsx
@@ -101,7 +101,7 @@ const DescriptionMdEditor = React.forwardRef<CrepeRef, CrepeMdEditorProps>(
return crepe;
},
- [currentDirectoryPath, isEditDescriptionMode],
+ [currentDirectoryPath, isEditDescriptionMode, description],
);
useCrepeHandler(ref, () => crepeInstanceRef.current, get, loading);
diff --git a/src/renderer/containers/MainPage.tsx b/src/renderer/containers/MainPage.tsx
index 94fe737e8..2fbd3d2ea 100644
--- a/src/renderer/containers/MainPage.tsx
+++ b/src/renderer/containers/MainPage.tsx
@@ -249,11 +249,11 @@ function MainPage(props: Props) {
toggleDrawer={toggleDrawer}
drawerOpened={drawerOpened}
/>
- <FullScreenContextProvider>
- <FilePropertiesContextProvider>
+ <FilePropertiesContextProvider>
+ <FullScreenContextProvider>
<EntryContainer key="EntryContainerID" />
- </FilePropertiesContextProvider>
- </FullScreenContextProvider>
+ </FullScreenContextProvider>
+ </FilePropertiesContextProvider>
</>
);
}
@@ -270,13 +270,13 @@ function MainPage(props: Props) {
toggleDrawer={toggleDrawer}
drawerOpened={drawerOpened}
/>
- {openedEntry && (
- <FullScreenContextProvider>
- <FilePropertiesContextProvider>
+ <FilePropertiesContextProvider>
+ {openedEntry && (
+ <FullScreenContextProvider>
<EntryContainer key="EntryContainerID" />
- </FilePropertiesContextProvider>
- </FullScreenContextProvider>
- )}
+ </FullScreenContextProvider>
+ )}
+ </FilePropertiesContextProvider>
</Split>
);
}
diff --git a/src/renderer/hooks/FilePropertiesContextProvider.tsx b/src/renderer/hooks/FilePropertiesContextProvider.tsx
index aca99c2a9..0920098fc 100644
--- a/src/renderer/hooks/FilePropertiesContextProvider.tsx
+++ b/src/renderer/hooks/FilePropertiesContextProvider.tsx
@@ -97,7 +97,10 @@ export const FilePropertiesContextProvider = ({
forceUpdate();
}
} else {
- lastOpenedFile.current = undefined;
+ if (isDescriptionChanged.current) {
+ saveDescriptionConfirmOpened(true);
+ }
+ //lastOpenedFile.current = undefined;
}
}, [openedEntry]);
@@ -116,7 +119,7 @@ export const FilePropertiesContextProvider = ({
lastOpenedFile.current,
lastOpenedFile.current.meta?.description,
).then(() => {
- if (lastOpenedFile.current.path !== openedEntry.path) {
+ if (lastOpenedFile.current.path !== openedEntry?.path) {
lastOpenedFile.current = { ...openedEntry };
} else {
// to reload description
@@ -206,7 +209,7 @@ export const FilePropertiesContextProvider = ({
open={isSaveDescriptionConfirmOpened}
onClose={() => setSaveDescriptionConfirmOpened(false)}
title={t('core:confirm')}
- content={t('core:saveFileBeforeClosingFile')}
+ content={t('core:saveDescriptionOnClosing')}
confirmCallback={(result) => {
if (result) {
saveDescription();
diff --git a/src/renderer/locales/en/core.json b/src/renderer/locales/en/core.json
index 5d5ba599c..7991880af 100644
--- a/src/renderer/locales/en/core.json
+++ b/src/renderer/locales/en/core.json
@@ -351,6 +351,7 @@
"toggleEntryProperties": "Toggle entry properties",
"closeEntry": "Close entry",
"saveFileBeforeClosingFile": "Do you want to save the changes before closing the file?",
+ "saveDescriptionOnClosing": "Description is changed do you want to save the changes?",
"openDirectoryMenu": "Open folder menu",
"pleaseOpenLocation": "Please open location",
"thisIsStartupLocation": "This is the startup location",