From 61658d66498aca60509ee498b8661f690eca281b Mon Sep 17 00:00:00 2001 From: Sergey Linev Date: Mon, 17 Feb 2025 13:05:20 +0100 Subject: [PATCH] Build with makePDF fix --- build/jsroot.js | 13 ++++++++++--- changes.md | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/build/jsroot.js b/build/jsroot.js index c745deabd..37b3d7a1a 100644 --- a/build/jsroot.js +++ b/build/jsroot.js @@ -143537,6 +143537,8 @@ async function makePDF(svg, args) { } }); + let pr = Promise.resolve(); + if (nodejs) { const doc = internals.nodejs_document; doc.originalCreateElementNS = doc.createElementNS; @@ -143558,6 +143560,10 @@ async function makePDF(svg, args) { }; return res; }; + + pr = Promise.resolve().then(function () { return _rollup_plugin_ignore_empty_module_placeholder$1; }).then(handle => { + globalThis.Image = handle.Image; + }); } const orientation = (svg.width < svg.height) ? 'portrait' : 'landscape'; @@ -143594,10 +143600,9 @@ async function makePDF(svg, args) { doc.addFont(filename, fcfg.n, fcfg.s || 'normal'); }); - let pr = Promise.resolve(); if (need_symbols && !custom_fonts[kSymbol] && settings.LoadSymbolTtf) { const handler = new FontHandler(122, 10); - pr = handler.load().then(() => { + pr = pr.then(() => handler.load()).then(() => { handler.addCustomFontToSvg(select(svg.node)); doc.addFileToVFS(kSymbol + '.ttf', handler.base64); doc.addFont(kSymbol + '.ttf', kSymbol, 'normal'); @@ -143630,8 +143635,10 @@ async function makePDF(svg, args) { globalThis.document = undefined; globalThis.CSSStyleSheet = undefined; globalThis.CSSStyleRule = undefined; + globalThis.Image = undefined; internals.nodejs_document.createElementNS = internals.nodejs_document.originalCreateElementNS; - if (args?.as_buffer) return Buffer.from(res); + if (args?.as_buffer) + return Buffer.from(res); } return res; diff --git a/changes.md b/changes.md index fb05a1893..f6001380b 100644 --- a/changes.md +++ b/changes.md @@ -16,6 +16,7 @@ 1. Upgrade three.js r168 -> r173 1. Internals - use private members in JSROOT classes like `#draw_object` 1. Fix - handle `TPave` NDC position also when fInit is not set +1. Fix - properly handle image sizes in svg2pdf ## Changes in 7.8.1