Merge branch 'master' into 3898-bug-api-internal-pages-not-updated

Author: HackbrettXXX

src/libs/WebPDecoder.js

@@ -3179,9 +3179,6 @@ function WebPDecoder(imageData) {
       Ga(a, b, c, d, e);
       d[e + 3] = 255;
     }
-    function ga(a, b) {
-      return 0 > a ? 0 : a > b ? b : a;
-    }
     function la(a, b, c) {
       self[a] = function(a, e, f, g, h, k, l, m, n) {
         for (var d = m + (n & -2) * c; m != d; )

src/modules/cell.js

@@ -278,7 +278,8 @@ import { jsPDF } from "../jspdf.js";
         arguments[2],
         arguments[3],
         arguments[4],
-        arguments[5]
+        arguments[5],
+        arguments[6]
       );
     }
     _initialize.call(this);

src/modules/context2d.js

@@ -450,14 +450,19 @@ import {
     });
 
     var _fontFaceMap = null;
+    var _cachedFontList = null;
 
     function getFontFaceMap(pdf, fontFaces) {
-      if (_fontFaceMap === null) {
-        var fontMap = pdf.getFontList();
+      var currentFontMap = pdf.getFontList();
 
-        var convertedFontFaces = convertToFontFaces(fontMap);
+      // Check if the font list has changed by comparing the JSON representation
+      var currentFontMapString = JSON.stringify(currentFontMap);
+
+      if (_fontFaceMap === null || _cachedFontList !== currentFontMapString) {
+        var convertedFontFaces = convertToFontFaces(currentFontMap);
 
         _fontFaceMap = buildFontFaceMap(convertedFontFaces.concat(fontFaces));
+        _cachedFontList = currentFontMapString;
       }
 
       return _fontFaceMap;
@@ -533,6 +538,7 @@ import {
       },
       set: function(value) {
         _fontFaceMap = null;
+        _cachedFontList = null;
         _fontFaces = value;
       }
     });

test/specs/context2d.spec.js

@@ -376,7 +376,7 @@ describe("Context2D: standard tests", () => {
     ctx.closePath();
     ctx.stroke();
     y += pad + 40;
-    
+
     ctx.beginPath();
     ctx.arc(50, y, 20, -Math.PI / 3, Math.PI, true);
     ctx.closePath();
@@ -399,14 +399,14 @@ describe("Context2D: standard tests", () => {
     ctx.arc(150, y, 65, 0, Math.PI * 0.8);
     ctx.fill();
     ctx.stroke();
-    
+
     y = 280;
     ctx.beginPath();
     ctx.moveTo(150, y);
     ctx.arc(150, y, 30, 0, 2 * Math.PI);
     ctx.fill();
     ctx.stroke();
-    
+
     comparePdf(doc.output(), "arc.pdf", "context2d");
   });
 
@@ -742,4 +742,50 @@ describe("Context2D: standard tests", () => {
     ctx.margin = [1, 2, 3, 4];
     expect(ctx.margin).toEqual([1, 2, 3, 4]);
   });
+
+  it("font face map cache invalidation", () => {
+    var doc = new jsPDF({
+      orientation: "p",
+      unit: "pt",
+      format: "a4",
+      floatPrecision: 2
+    });
+    var ctx = doc.context2d;
+
+    // Set up font faces for context2d
+    var fontFaces = [
+      {
+        family: "CustomFont",
+        weight: "normal",
+        style: "normal",
+        ref: { name: "CustomFont", style: "normal" }
+      }
+    ];
+    ctx.fontFaces = fontFaces;
+
+    // Set a font that uses the font face map
+    ctx.font = "12pt CustomFont, Arial, sans-serif";
+
+    // Add a new font to the document (simulating dynamic font loading)
+    // This should trigger font face map cache invalidation
+    doc.addFont("dummy-font-data", "NewCustomFont", "normal");
+
+    // Change font again - this should rebuild the font face map
+    // and not use stale cached data
+    ctx.font = "12pt NewCustomFont, CustomFont, Arial, sans-serif";
+
+    // If the bug existed, the font face map would not be rebuilt
+    // and the new font would not be recognized
+    // This test ensures the fix works by not throwing errors
+    // and properly handling the font change
+
+    // Test that we can still use the original font face
+    ctx.font = "12pt CustomFont, Arial, sans-serif";
+
+    // Draw some text to ensure the font handling works
+    ctx.fillText("Font state management test", 20, 20);
+
+    // The test passes if no errors are thrown during font changes
+    expect(true).toBe(true);
+  });
 });