self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-23 22:36:32 +02:00
Code Issues Releases Activity

Mobile: Plugins: Fix renderer plugins that use the settingValue API (#13131)

Browse Source
This commit is contained in:
Henry Heino
2025-09-08 02:55:42 -07:00
committed by GitHub
parent 4eb8777ed0
commit 93c908286d
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/app-mobile/contentScripts/rendererBundle/useWebViewSetup.ts
View File

@@ -17,6 +17,7 @@ import Resource from '@joplin/lib/models/Resource';
import { ResourceInfos } from '@joplin/renderer/types'; import { ResourceInfos } from '@joplin/renderer/types';
import useContentScripts from './utils/useContentScripts'; import useContentScripts from './utils/useContentScripts';
import uuid from '@joplin/lib/uuid'; import uuid from '@joplin/lib/uuid';
import AsyncActionQueue from '@joplin/lib/AsyncActionQueue';
const logger = Logger.create('renderer/useWebViewSetup'); const logger = Logger.create('renderer/useWebViewSetup');
@@ -149,6 +150,8 @@ const useWebViewSetup = (props: Props): SetUpResult<RendererControl> => {
void messenger.remoteApi.renderer.setExtraContentScriptsAndRerender(contentScripts); void messenger.remoteApi.renderer.setExtraContentScriptsAndRerender(contentScripts);
}, [messenger, contentScripts]); }, [messenger, contentScripts]);
const onRerenderRequestRef = useRef(()=>{});
const rendererControl = useMemo((): RendererControl => { const rendererControl = useMemo((): RendererControl => {
const renderer = messenger.remoteApi.renderer; const renderer = messenger.remoteApi.renderer;
@@ -201,6 +204,7 @@ const useWebViewSetup = (props: Props): SetUpResult<RendererControl> => {
const key = `${pluginId}.${settingKey}`; const key = `${pluginId}.${settingKey}`;
if (!pluginSettingKeysRef.current.has(key)) { if (!pluginSettingKeysRef.current.has(key)) {
pluginSettingKeysRef.current.add(key); pluginSettingKeysRef.current.add(key);
onRerenderRequestRef.current();
settingsChanged = true; settingsChanged = true;
} }
}, },
@@ -234,16 +238,21 @@ const useWebViewSetup = (props: Props): SetUpResult<RendererControl> => {
return { return {
rerenderToBody: async (markup, options, cancelEvent) => { rerenderToBody: async (markup, options, cancelEvent) => {
const { getSettings, getSettingsChanged } = await prepareRenderer(options); const { getSettings } = await prepareRenderer(options);
if (cancelEvent?.cancelled) return null; if (cancelEvent?.cancelled) return null;
const output = await renderer.rerenderToBody(markup, getSettings()); const render = async () => {
if (cancelEvent?.cancelled) return null; if (cancelEvent?.cancelled) return;
if (getSettingsChanged()) { await renderer.rerenderToBody(markup, getSettings());
return await renderer.rerenderToBody(markup, getSettings()); };
}
return output; const queue = new AsyncActionQueue();
onRerenderRequestRef.current = async () => {
queue.push(render);
};
return await render();
}, },
render: async (markup, options) => { render: async (markup, options) => {
const { getSettings, getSettingsChanged } = await prepareRenderer(options); const { getSettings, getSettingsChanged } = await prepareRenderer(options);