self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-13 00:10:37 +02:00
Code Issues Releases Activity

Desktop: Fixes #8652: Fix editor not refreshed when the current note changes during sync (#8654)

Browse Source
This commit is contained in:
Henry Heino
2023-08-14 10:33:15 -07:00
committed by GitHub
parent eca1afb6d5
commit 357c23b588
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/app-desktop/gui/NoteEditor/utils/useFormNote.ts
View File

@ -64,6 +64,7 @@ export default function useFormNote(dependencies: HookDependencies) {
const { syncStarted, noteId, isProvisional, titleInputRef, editorRef, onBeforeLoad, onAfterLoad } = dependencies; const { syncStarted, noteId, isProvisional, titleInputRef, editorRef, onBeforeLoad, onAfterLoad } = dependencies;
const [formNote, setFormNote] = useState<FormNote>(defaultFormNote()); const [formNote, setFormNote] = useState<FormNote>(defaultFormNote());
const [formNoteRefeshScheduled, setFormNoteRefreshScheduled] = useState<boolean>(false);
const [isNewNote, setIsNewNote] = useState(false); const [isNewNote, setIsNewNote] = useState(false);
const prevSyncStarted = usePrevious(syncStarted); const prevSyncStarted = usePrevious(syncStarted);
const previousNoteId = usePrevious(formNote.id); const previousNoteId = usePrevious(formNote.id);
@ -106,14 +107,7 @@ export default function useFormNote(dependencies: HookDependencies) {
} }
useEffect(() => { useEffect(() => {
// Check that synchronisation has just finished - and if (!formNoteRefeshScheduled) return () => {};
// if the note has never been changed, we reload it.
// If the note has already been changed, it's a conflict
// that's already been handled by the synchronizer.
if (!prevSyncStarted) return () => {};
if (syncStarted) return () => {};
if (formNote.hasChanged) return () => {};
reg.logger().info('Sync has finished and note has never been changed - reloading it'); reg.logger().info('Sync has finished and note has never been changed - reloading it');
@ -132,6 +126,7 @@ export default function useFormNote(dependencies: HookDependencies) {
} }
await initNoteState(n); await initNoteState(n);
setFormNoteRefreshScheduled(false);
}; };
void loadNote(); void loadNote();
@ -139,8 +134,23 @@ export default function useFormNote(dependencies: HookDependencies) {
return () => { return () => {
cancelled = true; cancelled = true;
}; };
// eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied }, [formNoteRefeshScheduled, noteId]);
}, [prevSyncStarted, syncStarted, formNote]);
useEffect(() => {
// Check that synchronisation has just finished - and
// if the note has never been changed, we reload it.
// If the note has already been changed, it's a conflict
// that's already been handled by the synchronizer.
if (!prevSyncStarted) return;
if (syncStarted) return;
if (formNote.hasChanged) return;
// Refresh the form note.
// This is kept separate from the above logic so that when prevSyncStarted is changed
// from true to false, it doesn't cancel the note from loading.
setFormNoteRefreshScheduled(true);
}, [prevSyncStarted, syncStarted, formNote.hasChanged]);
useEffect(() => { useEffect(() => {
if (!noteId) { if (!noteId) {