TagSpaces is an offline, open source, document manager with tagging support
fix Not saved file description disappears on entry resize (#2068)
Stanimirc59df6eee706
diff --git a/src/renderer/components/EditDescription.tsx b/src/renderer/components/EditDescription.tsxindex 990499b17..901ab247c 100644--- a/src/renderer/components/EditDescription.tsx+++ b/src/renderer/components/EditDescription.tsx@@ -1,10 +1,9 @@-import React, { useRef, useState, useEffect } from 'react';+import React, { useRef, useEffect } from 'react';import { styled, useTheme } from '@mui/material/styles';import Typography from '@mui/material/Typography';import { MilkdownEditor, MilkdownRef } from '@tagspaces/tagspaces-md';import { useTranslation } from 'react-i18next';import { useDescriptionContext } from '-/hooks/useDescriptionContext';-import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';import EditDescriptionButtons from '-/components/EditDescriptionButtons';import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';@@ -27,12 +26,13 @@ const EditDescriptionRoot = styled('div')(({ theme }) => ({function EditDescription() {const { t } = useTranslation();const theme = useTheme();- const { openedEntry } = useOpenedEntryContext();+ // const { openedEntry } = useOpenedEntryContext();const { currentDirectoryPath } = useDirectoryContentContext();- const { description, setDescription } = useDescriptionContext();+ const { description, setDescription, isEditMode, setEditMode } =+ useDescriptionContext();const fileDescriptionRef = useRef<MilkdownRef>(null);- const [editMode, setEditMode] = useState<boolean>(false);+ //const [editMode, setEditMode] = useState<boolean>(false);const descriptionFocus = useRef<boolean>(false);const descriptionButtonsRef = useRef(null);@@ -54,28 +54,21 @@ function EditDescription() {const milkdownListener = React.useCallback((markdown: string) => {if (descriptionFocus.current && markdown !== description) {setDescription(markdown);- descriptionButtonsRef.current.setDescriptionChanged(true);+ if (descriptionButtonsRef.current) {+ descriptionButtonsRef.current.setDescriptionChanged(true);+ }}- // update codeMirror- /*const { current } = codeMirrorRef;- if (!current) return;- current.update(markdown);*/}, []);const noDescription = !description || description.length < 1;return (<EditDescriptionRoot>- {!openedEntry.editMode && (- <EditDescriptionButtons- buttonsRef={descriptionButtonsRef}- editMode={editMode}- setEditMode={setEditMode}- />- )}+ <EditDescriptionButtons buttonsRef={descriptionButtonsRef} /><divdata-tid="descriptionTID"onDoubleClick={() => {- if (!editMode && !openedEntry.editMode) {+ if (!isEditMode) {+ //&& !openedEntry.editMode) {setEditMode(true);}}}@@ -87,7 +80,7 @@ function EditDescription() {overflowY: 'auto',}}>- {noDescription && !editMode ? (+ {noDescription && !isEditMode ? (<Typographyvariant="caption"style={{@@ -97,7 +90,7 @@ function EditDescription() {}}>{t(- openedEntry.editMode+ isEditMode //openedEntry.editMode? 'core:editDisabled': 'core:addMarkdownDescription',)}@@ -119,9 +112,9 @@ function EditDescription() {content={description || ''}onChange={milkdownListener}onFocus={milkdownOnFocus}- readOnly={!editMode}+ readOnly={!isEditMode}lightMode={false}- excludePlugins={!editMode ? ['menu', 'upload'] : []}+ excludePlugins={!isEditMode ? ['menu', 'upload'] : []}currentFolder={currentDirectoryPath}/></>diff --git a/src/renderer/components/EditDescriptionButtons.tsx b/src/renderer/components/EditDescriptionButtons.tsxindex 7192741b3..55fc5a7d3 100644--- a/src/renderer/components/EditDescriptionButtons.tsx+++ b/src/renderer/components/EditDescriptionButtons.tsx@@ -6,7 +6,6 @@ import { Pro } from '-/pro';import { useTranslation } from 'react-i18next';import { useDescriptionContext } from '-/hooks/useDescriptionContext';import ConfirmDialog from '-/components/dialogs/ConfirmDialog';-import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';const PREFIX = 'EditDescriptionButtons';@@ -29,23 +28,17 @@ export interface DescriptionChangedRef {type Props = {buttonsRef: ForwardedRef<DescriptionChangedRef>;- editMode: boolean;- setEditMode: (edit: boolean) => void;};-const EditDescriptionButtons: React.FC<Props> = ({- buttonsRef,- editMode,- setEditMode,-}) => {+const EditDescriptionButtons: React.FC<Props> = ({ buttonsRef }) => {const { t } = useTranslation();const {- description,isSaveDescriptionConfirmOpened,setSaveDescriptionConfirmOpened,saveDescription,+ isEditMode,+ setEditMode,} = useDescriptionContext();- const { currentDirectoryPath } = useDirectoryContentContext();const [isDescriptionChanged, descriptionChanged] = useState<boolean>(false);React.useImperativeHandle(buttonsRef, () => ({@@ -55,10 +48,10 @@ const EditDescriptionButtons: React.FC<Props> = ({}));useEffect(() => {- if (!editMode && isDescriptionChanged) {+ if (!isEditMode && isDescriptionChanged) {descriptionChanged(false);}- }, [editMode]);+ }, [isEditMode]);// const printHTML = () => {// const sanitizedDescription = description@@ -81,7 +74,7 @@ const EditDescriptionButtons: React.FC<Props> = ({return (<Root>- {editMode && (+ {isEditMode && (<ButtonclassName={classes.button}onClick={() => {@@ -103,13 +96,13 @@ const EditDescriptionButtons: React.FC<Props> = ({className={classes.button}disabled={!Pro}onClick={() => {- if (editMode) {+ if (isEditMode) {saveDescription();}- setEditMode(!editMode);+ setEditMode(!isEditMode);}}>- {editMode ? t('core:confirmSaveButton') : t('core:edit')}+ {isEditMode ? t('core:confirmSaveButton') : t('core:edit')}</Button></ProTooltip><ConfirmDialogdiff --git a/src/renderer/hooks/DescriptionContextProvider.tsx b/src/renderer/hooks/DescriptionContextProvider.tsxindex a8e0cc7a0..8a652850e 100644--- a/src/renderer/hooks/DescriptionContextProvider.tsx+++ b/src/renderer/hooks/DescriptionContextProvider.tsx@@ -35,6 +35,8 @@ import { useEditedEntryMetaContext } from '-/hooks/useEditedEntryMetaContext';type DescriptionContextData = {description: string;isSaveDescriptionConfirmOpened: boolean;+ isEditMode: boolean;+ setEditMode: (editMode: boolean) => void;setSaveDescriptionConfirmOpened: (open: boolean) => void;setDescription: (description: string) => void;saveDescription: () => void;@@ -43,6 +45,8 @@ type DescriptionContextData = {export const DescriptionContext = createContext<DescriptionContextData>({description: undefined,isSaveDescriptionConfirmOpened: false,+ isEditMode: false,+ setEditMode: () => {},setSaveDescriptionConfirmOpened: () => {},setDescription: () => {},saveDescription: undefined,@@ -63,6 +67,7 @@ export const DescriptionContextProvider = ({//const description = useRef<string>(openedEntry.meta?.description);const lastOpenedFile = useRef<TS.OpenedEntry>(openedEntry);const isChanged = useRef<boolean>(false);+ const isEditMode = useRef<boolean>(false);const [isSaveDescriptionConfirmOpened, saveDescriptionConfirmOpened] =useState<boolean>(false);const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);@@ -105,6 +110,7 @@ export const DescriptionContextProvider = ({// to reload descriptionlastOpenedFile.current = { ...lastOpenedFile.current };isChanged.current = false;+ isEditMode.current = false;forceUpdate();setDescriptionChange(lastOpenedFile.current,@@ -120,10 +126,23 @@ export const DescriptionContextProvider = ({};function setDescription(d: string) {- lastOpenedFile.current.meta.description = d;+ lastOpenedFile.current = {+ ...lastOpenedFile.current,+ meta: {+ ...(lastOpenedFile.current.meta && lastOpenedFile.current.meta),+ description: d,+ },+ };isChanged.current = true;}+ function setEditMode(editMode: boolean) {+ isEditMode.current = editMode;+ isChanged.current = false;+ lastOpenedFile.current = { ...openedEntry };+ forceUpdate();+ }+function setSaveDescriptionConfirmOpened(isOpened: boolean) {if (!isOpened) {isChanged.current = false;@@ -139,8 +158,14 @@ export const DescriptionContextProvider = ({setSaveDescriptionConfirmOpened,setDescription,saveDescription,+ isEditMode: isEditMode.current,+ setEditMode,};- }, [lastOpenedFile.current, isSaveDescriptionConfirmOpened]);+ }, [+ lastOpenedFile.current,+ isEditMode.current,+ isSaveDescriptionConfirmOpened,+ ]);return (<DescriptionContext.Provider value={context}>diff --git a/src/renderer/tagspaces.namespace.d.ts b/src/renderer/tagspaces.namespace.d.tsindex c25828d49..45a2313a1 100644--- a/src/renderer/tagspaces.namespace.d.ts+++ b/src/renderer/tagspaces.namespace.d.ts@@ -194,7 +194,7 @@ export namespace TS {viewingExtensionId: string;editingExtensionPath?: string;editingExtensionId?: string;- editMode?: boolean;+ editMode?: boolean; // TODO move in DescriptionContextProviderfocused?: boolean; // TODO make it mandatory once support for multiple files is added}