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

Mobile: Fix note editor's settings and plugins updated on every keystroke (#10116)

Browse Source
This commit is contained in:
Henry Heino 2024-03-14 11:42:22 -07:00 committed by GitHub
parent a53a8d67a1
commit 04298f0eba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ import { defaultSearchState, SearchPanel } from './SearchPanel';
import ExtendedWebView, { WebViewControl } from '../ExtendedWebView';
import * as React from 'react';
import { forwardRef, useEffect, useImperativeHandle } from 'react';
import { forwardRef, RefObject, useEffect, useImperativeHandle } from 'react';
import { useMemo, useState, useCallback, useRef } from 'react';
import { LayoutChangeEvent, NativeSyntheticEvent, View, ViewStyle } from 'react-native';
import { editorFont } from '../global-style';
@ -139,12 +139,11 @@ function editorTheme(themeId: number) {
};
}
type OnInjectJSCallback = (js: string)=> void;
type OnSetVisibleCallback = (visible: boolean)=> void;
type OnSearchStateChangeCallback = (state: SearchState)=> void;
const useEditorControl = (
bodyControl: EditorBodyControl,
injectJS: OnInjectJSCallback,
webviewRef: RefObject<WebViewControl>,
setLinkDialogVisible: OnSetVisibleCallback,
setSearchState: OnSearchStateChangeCallback,
): EditorControl => {
@ -245,7 +244,7 @@ const useEditorControl = (
setLinkDialogVisible(false);
},
hideKeyboard() {
injectJS('document.activeElement?.blur();');
webviewRef.current.injectJS('document.activeElement?.blur();');
},
setContentScripts: async (plugins: ContentScriptData[]) => {
@ -280,7 +279,7 @@ const useEditorControl = (
};
return control;
}, [injectJS, setLinkDialogVisible, setSearchState, bodyControl]);
}, [webviewRef, bodyControl, setLinkDialogVisible, setSearchState]);
};
function NoteEditor(props: Props, ref: any) {
@ -371,11 +370,6 @@ function NoteEditor(props: Props, ref: any) {
const [linkDialogVisible, setLinkDialogVisible] = useState(false);
const [searchState, setSearchState] = useState(defaultSearchState);
// Runs [js] in the context of the CodeMirror frame.
const injectJS = (js: string) => {
webviewRef.current.injectJS(js);
};
const onEditorEvent = useRef((_event: EditorEvent) => {});
const editorMessenger = useMemo(() => {
@ -394,7 +388,7 @@ function NoteEditor(props: Props, ref: any) {
}, []);
const editorControl = useEditorControl(
editorMessenger.remoteApi, injectJS, setLinkDialogVisible, setSearchState,
editorMessenger.remoteApi, webviewRef, setLinkDialogVisible, setSearchState,
);
useEffect(() => {