@polotno/pdf-export 0.1.29 → 0.1.30

package/lib/svg-render.js

@@ -1,8 +1,8 @@
 import * as svg from './svg.js';
+import { Util } from 'konva/lib/Util.js';
 export async function renderSVG(doc, element, cache = null) {
-    const svgStr = await svg.urlToString(element.src, cache);
-    const src = svg.replaceColors(svgStr, new Map(Object.entries(element.colorsReplace)));
-    const str = await svg.urlToString(src, cache);
+    const str = await svg.urlToString(element.src, cache);
+    const replaceEntries = Object.entries(element.colorsReplace || {});
     doc.addSVG(str, 0, 0, {
         // Use 'none' to allow stretching to exact dimensions, 'xMinYMin meet' to preserve aspect ratio
         preserveAspectRatio: 'none',
@@ -13,8 +13,51 @@ export async function renderSVG(doc, element, cache = null) {
             if (!colors) {
                 return colors;
             }
-            const [color, opacity] = colors;
-            return [color, opacity * element.opacity];
+            const [rgb, opacity] = colors;
+            let colorString = null;
+            if (Array.isArray(rgb) && rgb.length === 3) {
+                colorString = `rgb(${rgb[0]},${rgb[1]},${rgb[2]})`;
+            }
+            else if (typeof rgb === 'string') {
+                colorString = rgb;
+            }
+            let nextColorString = colorString;
+            if (replaceEntries.length && colorString) {
+                for (const [from, to] of replaceEntries) {
+                    if (svg.sameColors(from, colorString)) {
+                        nextColorString = to;
+                        break;
+                    }
+                }
+            }
+            let nextColorArray = rgb;
+            let finalOpacity = opacity * element.opacity;
+            if (nextColorString != null) {
+                const rgbaObject = Util.colorToRGBA(nextColorString);
+                if (rgbaObject) {
+                    nextColorArray = [
+                        Math.round(rgbaObject.r),
+                        Math.round(rgbaObject.g),
+                        Math.round(rgbaObject.b),
+                    ];
+                    // Handle alpha channel from the color string
+                    if (rgbaObject.a !== undefined) {
+                        finalOpacity = rgbaObject.a * opacity * element.opacity;
+                    }
+                }
+            }
+            if (!Array.isArray(nextColorArray) &&
+                typeof nextColorArray === 'string') {
+                const rgbObject = Util.getRGB(nextColorArray);
+                if (rgbObject) {
+                    nextColorArray = [
+                        Math.round(rgbObject.r),
+                        Math.round(rgbObject.g),
+                        Math.round(rgbObject.b),
+                    ];
+                }
+            }
+            return [nextColorArray, finalOpacity];
         },
     });
 }

package/lib/svg.d.ts

@@ -8,4 +8,5 @@ export declare function getSvgSize(url: string): Promise<{
     height: number;
 }>;
 export declare function fixSize(svgString: string): string;
+export declare const sameColors: (color1: any, color2: any) => boolean;
 export declare function replaceColors(svgString: string, replaceMap: Map<string, string>): string;

package/lib/svg.js

@@ -175,7 +175,7 @@ export function fixSize(svgString) {
     const str = xmlSerializer.serializeToString(doc);
     return str;
 }
-const sameColors = (color1, color2) => {
+export const sameColors = (color1, color2) => {
     if (!color1 || !color2) {
         return false;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polotno/pdf-export",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "description": "Convert Polotno JSON into vector PDF",
   "type": "module",
   "main": "./lib/index.js",