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

Desktop: Resolves #2810: Ctrl+Shift+B to viewer when editor invisible (#4537)

Browse Source
This commit is contained in:
Neeraj Kashyap
2021-03-14 08:06:38 -07:00
committed by GitHub
parent 6e0ec05d17
commit fd390dff6b
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx
View File

@@ -141,7 +141,11 @@ function CodeMirror(props: NoteBodyEditorProps, ref: any) {
reg.logger().warn('CodeMirror: unsupported drop item: ', cmd);
}
} else if (cmd.name === 'editor.focus') {
editorRef.current.focus();
if (props.visiblePanes.indexOf('editor') >= 0) {
editorRef.current.focus();
} else {
webviewRef.current.wrappedInstance.focus();
}
} else {
commandProcessed = false;
}
@@ -242,7 +246,7 @@ function CodeMirror(props: NoteBodyEditorProps, ref: any) {
return commandOutput;
},
};
}, [props.content, addListItem, wrapSelectionWithStrings, setEditorPercentScroll, setViewerPercentScroll, resetScroll, renderedBody]);
}, [props.content, props.visiblePanes, addListItem, wrapSelectionWithStrings, setEditorPercentScroll, setViewerPercentScroll, resetScroll, renderedBody]);
const onEditorPaste = useCallback(async (event: any = null) => {
const resourceMds = await handlePasteEvent(event);

6
packages/app-desktop/gui/NoteTextViewer.tsx
View File

@@ -114,6 +114,12 @@ class NoteTextViewerComponent extends React.Component<Props, any> {
this.domReady_ = false;
}
focus() {
if (this.webviewRef_.current) {
this.webviewRef_.current.focus();
}
}
tryInit() {
if (!this.initialized_ && this.webviewRef_.current) {
this.initWebview();