From 1fa327f034ff2e4fc17f651cc8c3452967ef4430 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Fri, 13 Dec 2024 19:21:20 +0100 Subject: [PATCH] Mobile: Resolves #10609: Display html notes using white theme (#11510) --- .../components/NoteBodyViewer/bundledJs/Renderer.ts | 5 +++-- packages/renderer/types.ts | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/app-mobile/components/NoteBodyViewer/bundledJs/Renderer.ts b/packages/app-mobile/components/NoteBodyViewer/bundledJs/Renderer.ts index 759f1700fb..3114390f27 100644 --- a/packages/app-mobile/components/NoteBodyViewer/bundledJs/Renderer.ts +++ b/packages/app-mobile/components/NoteBodyViewer/bundledJs/Renderer.ts @@ -1,5 +1,5 @@ import { MarkupLanguage, MarkupToHtml } from '@joplin/renderer'; -import type { MarkupToHtmlConverter, RenderResultPluginAsset, FsDriver as RendererFsDriver } from '@joplin/renderer/types'; +import type { MarkupToHtmlConverter, RenderOptions, RenderResultPluginAsset, FsDriver as RendererFsDriver } from '@joplin/renderer/types'; import makeResourceModel from './utils/makeResourceModel'; import addPluginAssets from './utils/addPluginAssets'; import { ExtraContentScriptSource } from './types'; @@ -115,7 +115,7 @@ export default class Renderer { this.lastSettings = settings; this.lastRenderMarkup = markup; - const options = { + const options: RenderOptions = { onResourceLoaded: settings.onResourceLoaded, highlightedKeywords: settings.highlightedKeywords, resources: settings.resources, @@ -140,6 +140,7 @@ export default class Renderer { return settings.pluginSettings[settingKey]; }, + whiteBackgroundNoteRendering: markup.language === MarkupLanguage.Html, }; this.markupToHtml.clearCache(markup.language); diff --git a/packages/renderer/types.ts b/packages/renderer/types.ts index bc5e25c4c0..371f076c46 100644 --- a/packages/renderer/types.ts +++ b/packages/renderer/types.ts @@ -50,6 +50,11 @@ export interface RenderOptions { resources?: Record; + onResourceLoaded?: ()=> void; + editPopupFiletypes?: string[]; + createEditPopupSyntax?: string; + destroyEditPopupSyntax?: string; + // HtmlToHtml only whiteBackgroundNoteRendering?: boolean; }