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

Merge remote-tracking branch 'origin/release-3.0' into dev

Browse Source
This commit is contained in:
Henry Heino
2024-07-25 08:10:48 -07:00
parent f7a970f466 8fdccd287e
commit db2a194b69
4 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/app-mobile/components/NoteBodyViewer/bundledJs/noteBodyViewerBundle.ts
View File

@ -1,17 +1,17 @@
import WebViewToRNMessenger from '../../../utils/ipc/WebViewToRNMessenger';
import { NoteViewerLocalApi, NoteViewerRemoteApi, RendererWebViewOptions } from './types';
import { NoteViewerLocalApi, NoteViewerRemoteApi, RendererWebViewOptions, WebViewLib } from './types';
import Renderer from './Renderer';
declare global {
interface Window {
rendererWebViewOptions: RendererWebViewOptions;
webviewLib: { postMessage: (message: string)=> void };
webviewLib: WebViewLib;
}
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
declare const webviewLib: any;
declare const webviewLib: WebViewLib;
const messenger = new WebViewToRNMessenger<NoteViewerLocalApi, NoteViewerRemoteApi>(
'note-viewer',
@ -36,6 +36,8 @@ webviewLib.initialize({
// Share the webview library globally so that the renderer can access it.
window.webviewLib = webviewLib;
window.webviewLib = webviewLib;
const renderer = new Renderer({
...window.rendererWebViewOptions,
fsDriver: messenger.remoteApi.fsDriver,

5
packages/app-mobile/components/NoteBodyViewer/bundledJs/types.ts
View File

@ -31,3 +31,8 @@ export interface NoteViewerRemoteApi {
onPostPluginMessage(contentScriptId: string, message: any): Promise<any>;
fsDriver: RendererFsDriver;
}
export interface WebViewLib {
initialize(config: unknown): void;
}