self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Desktop: WYSIWYG: Restored focus logic and fixed undo issue

Browse Source
This commit is contained in:
Laurent Cozic 2020-03-26 17:19:13 +00:00
parent 351306eb03
commit 5e5b6cdc42
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ElectronClient/gui/NoteText2.tsx
View File

@ -442,20 +442,36 @@ function NoteText2(props:NoteTextProps) {
saveNoteIfWillChange(formNote, editorRef, props.dispatch);
const loadNote = async () => {
function handleAutoFocus(noteIsTodo:boolean) {
if (!props.isProvisional) return;
const focusSettingName = noteIsTodo ? 'newTodoFocus' : 'newNoteFocus';
requestAnimationFrame(() => {
if (Setting.value(focusSettingName) === 'title') {
if (titleInputRef.current) titleInputRef.current.focus();
} else {
if (editorRef.current) editorRef.current.execCommand({ name: 'focus' });
}
});
}
async function loadNote() {
const n = await Note.load(props.noteId);
if (cancelled) return;
if (!n) throw new Error(`Cannot find note with ID: ${props.noteId}`);
reg.logger().debug('Loaded note:', n);
initNoteState(n, setFormNote, setDefaultEditorState);
};
handleAutoFocus(!!n.is_todo);
}
loadNote();
return () => {
cancelled = true;
};
}, [props.noteId, formNote, waitingToSaveNote]);
}, [props.noteId, props.isProvisional, formNote, waitingToSaveNote]);
const onFieldChange = useCallback((field:string, value:any, changeId: number = 0) => {
handleProvisionalFlag();

7
ElectronClient/gui/editors/TinyMCE.tsx
View File

@ -415,6 +415,13 @@ const TinyMCE = (props:TinyMCEProps, ref:any) => {
editor.getDoc().addEventListener('click', onEditorContentClick);
// Need to clear UndoManager to avoid this problem:
// - Load note 1
// - Make a change
// - Load note 2
// - Undo => content is that of note 1
editor.undoManager.clear();
dispatchDidUpdate(editor);
};