self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-26 18:58:21 +02:00
Code Issues Releases Activity

Mobile: Fixes #10637: Fix refocusing the note editor (#10644)

Browse Source
This commit is contained in:
Henry Heino 2024-06-21 09:16:12 -07:00 committed by GitHub
parent 4115e2054f
commit 77e74112ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.ts
View File

@ -14,6 +14,7 @@ import createEditor from '@joplin/editor/CodeMirror/createEditor';
import CodeMirrorControl from '@joplin/editor/CodeMirror/CodeMirrorControl'; import CodeMirrorControl from '@joplin/editor/CodeMirror/CodeMirrorControl';
import WebViewToRNMessenger from '../../../utils/ipc/WebViewToRNMessenger'; import WebViewToRNMessenger from '../../../utils/ipc/WebViewToRNMessenger';
import { WebViewToEditorApi } from '../types'; import { WebViewToEditorApi } from '../types';
import { focus } from '@joplin/lib/utils/focusHandler';
export const initCodeMirror = ( export const initCodeMirror = (
parentElement: HTMLElement, parentElement: HTMLElement,
@ -47,6 +48,15 @@ export const initCodeMirror = (
} }
}); });
// Note: Just adding an onclick listener seems sufficient to focus the editor when its background
// is tapped.
parentElement.addEventListener('click', (event) => {
const activeElement = document.querySelector(':focus');
if (!parentElement.contains(activeElement) && event.target === parentElement) {
focus('initial editor focus', control);
}
});
messenger.setLocalInterface(control); messenger.setLocalInterface(control);
return control; return control;
}; };

4
packages/app-mobile/components/NoteEditor/NoteEditor.tsx
View File

@ -101,10 +101,6 @@ function useHtml(initialCss: string): string {
scrolling. */ scrolling. */
.cm-scroller { .cm-scroller {
overflow: none; overflow: none;
/* Ensure that the editor can be focused by clicking on the lower half of the screen.
Don't use 100vh to prevent a scrollbar being present for empty notes. */
min-height: 80vh;
} }
</style> </style>
<style class=${JSON.stringify(themeStyleSheetClassName)}> <style class=${JSON.stringify(themeStyleSheetClassName)}>