dompdf.js 1.1.1 → 1.2.0

package/dist/dompdf.js

@@ -1,5 +1,5 @@
 /*!
- * dompdf.js 1.1.0 <https://dompdfjs.lisky.com.cn>
+ * dompdf.js 1.2.0 <https://dompdfjs.lisky.com.cn>
  * Copyright (c) 2026 lfc <https://dompdfjs.lisky.com.cn/>
  * Released under MIT License
  */
@@ -6054,9 +6054,7 @@
     };
 
     var LIST_OWNERS$1 = ['OL', 'UL', 'MENU'];
-    // let foreignObjectRendererList: any = []
     var parseNodeTree$1 = function (context, node, parent, root, foreignObjectRendererList) {
-        // console.log('parseNodeTree', context,node,parent,root)
         for (var childNode = node.firstChild, nextNode = void 0; childNode; childNode = nextNode) {
             nextNode = childNode.nextSibling;
             if (isTextNode$1(childNode) && childNode.data.trim().length > 0) {
@@ -6095,9 +6093,6 @@
                         if (isElementNode$1(node) && node.hasAttribute('foreignobjectrendering')) {
                             foreignObjectRendererList.push(node);
                         }
-                        // if (parent.foreignobjectrendering){
-                        //     container.foreignobjectrendering = true;
-                        // }
                         parent.elements.push(container);
                         childNode.slot;
                         if (childNode.shadowRoot) {
@@ -6143,13 +6138,6 @@
         }
         return new ElementContainer$1(context, element);
     };
-    // export const parseTree = (context: Context, element: HTMLElement): ElementContainer => {
-    //     const container = createContainer(context, element);
-    //     container.flags |= FLAGS.CREATES_REAL_STACKING_CONTEXT;
-    //     console.log(element,'nodedom解析')
-    //     parseNodeTree(context, element, container, container);
-    //     return container;
-    // };
     var createsRealStackingContext$1 = function (node, container, root) {
         return (container.styles.isPositionedWithZIndex() ||
             container.styles.opacity < 1 ||
@@ -6183,9 +6171,6 @@
                             var itemNode = uniqueList[index];
                             var width = itemNode.offsetWidth || itemNode.getBoundingClientRect().width || 100;
                             var height = itemNode.offsetHeight || itemNode.getBoundingClientRect().height || 100;
-                            // const rect = itemNode.getBoundingClientRect();
-                            // const scrollX = window.scrollX || document.documentElement.scrollLeft;
-                            // const scrollY = window.scrollY || document.documentElement.scrollTop;
                             // 创建图片容器
                             var bgContainer = document.createElement('div');
                             bgContainer.style.width = Math.ceil(width) + 'px';
@@ -6275,53 +6260,6 @@
             }
         });
     }); };
-    // 修复3：安全截图（不修改原始 DOM）
-    // const renderForeignObject = async (element: HTMLElement) => {
-    //     // 1. 克隆元素（包括所有子元素）
-    //     const clone = element.cloneNode(true) as HTMLElement;
-    //     // 2. 创建临时容器（确保正确计算样式）
-    //     const container = document.createElement('div');
-    //     container.style.position = 'absolute';
-    //     container.style.left = '-9999px';
-    //     container.appendChild(clone);
-    //     document.body.appendChild(container);
-    //     // 3. 应用透明样式到克隆体
-    //     const applyInvisibleStyle = (el: Element) => {
-    //         if (el instanceof HTMLElement) {
-    //             el.style.color = 'transparent';
-    //             el.style.backgroundColor = 'transparent';
-    //             Array.from(el.children).forEach(applyInvisibleStyle);
-    //         }
-    //     };
-    //     applyInvisibleStyle(clone);
-    //     // 4. 获取尺寸
-    //     const rect = clone.getBoundingClientRect();
-    //     if (rect.width === 0 || rect.height === 0) {
-    //         document.body.removeChild(container);
-    //         return null;
-    //     }
-    //     try {
-    //         // 5. 截图克隆体
-    //         const capture = await snapdom(clone, {
-    //             // width: Math.ceil(rect.width),
-    //             // height: Math.ceil(rect.height)
-    //         });
-    //         const pngData = await capture.toPng({
-    //             quality: 0.9,
-    //             // width: Math.ceil(rect.width),
-    //             // height: Math.ceil(rect.height)
-    //         });
-    //         return pngData;
-    //     } catch (error) {
-    //         console.error('截图失败:', error);
-    //         return null;
-    //     } finally {
-    //         // 6. 确保清理临时元素
-    //         document.body.removeChild(container);
-    //     }
-    // };
-    // 修复4：移除原有的 makeInvisible 函数
-    // 不再需要，因为新方法使用克隆体
     var createsStackingContext$1 = function (styles) { return styles.isPositioned() || styles.isFloating(); };
     var isTextNode$1 = function (node) { return node.nodeType === Node.TEXT_NODE; };
     var isElementNode$1 = function (node) { return node.nodeType === Node.ELEMENT_NODE; };
@@ -22790,13 +22728,29 @@
                     return false;
                 }
             }
-            // 3. 枚举值校验：fontWeight 只能是 400 或 700
+            // check：fontWeight is only 400 or 700
             if (![400, 700].includes(config.fontWeight)) {
                 console.error("The fontWeight value is invalid. It can only be 400 or 700. Actual value:".concat(config.fontWeight));
                 return false;
             }
+            if (config.iconFont !== undefined && typeof config.iconFont !== 'boolean') {
+                console.error("The field iconFont has a type error. Expected boolean, but received ".concat(typeof config.iconFont));
+                return false;
+            }
         }
         return true;
+    }
+    // The core function for handling configuration and populating default values
+    function setOptionFontConfig(rawConfig) {
+        if (!validateFontConfig(rawConfig)) {
+            return undefined;
+        }
+        var configList = isArray$1(rawConfig) ? rawConfig : [rawConfig];
+        var processedList = configList.map(function (config) {
+            var _a;
+            return (__assign$1(__assign$1({}, config), { iconFont: (_a = config.iconFont) !== null && _a !== void 0 ? _a : false }));
+        });
+        return processedList;
     }
 
     /**
@@ -23065,13 +23019,7 @@
         // reset all font
         CanvasRenderer.prototype.resetJsPDFFont = function () {
             var _this = this;
-            // if fontConfig is a single FontConfig object
-            if (isObject$4(this.options.fontConfig) &&
-                this.options.fontConfig &&
-                this.options.fontConfig.fontFamily) {
-                this.jspdfCtx.setFont(this.options.fontConfig.fontFamily);
-            }
-            else if (isArray$1(this.options.fontConfig) && !isEmptyValue(this.options.fontConfig)) {
+            if (isArray$1(this.options.fontConfig) && !isEmptyValue(this.options.fontConfig)) {
                 this.options.fontConfig.forEach(function (v) {
                     v.fontFamily && _this.jspdfCtx.setFont(v.fontFamily);
                 });
@@ -23080,16 +23028,25 @@
         // setFont form options
         CanvasRenderer.prototype.setTextFont = function (styles) {
             var _a, _b, _c;
-            // console.log(styles.fontWeight, styles.fontStyle, 'styles');
+            // console.log(styles.fontWeight, styles.fontStyle, styles.fontFamily, 'styles');
             if (isEmptyValue(this.options.fontConfig)) {
                 return '';
             }
-            if (this.options.fontConfig.length === 1) {
-                var fontFamilyCustom_1 = (_a = this.options.fontConfig[0].fontFamily) !== null && _a !== void 0 ? _a : '';
+            var fontConfigRef = this.options.fontConfig;
+            // 处理字体图标场景
+            var isIconFont = fontConfigRef.find(function (v) { return v.iconFont; });
+            var otherFonts = fontConfigRef.filter(function (v) { return !v.iconFont; });
+            if (isIconFont && styles.fontFamily.some(function (family) { return family.includes(isIconFont.fontFamily); })) {
+                isIconFont.fontFamily && this.jspdfCtx.setFont(isIconFont.fontFamily);
+                return isIconFont.fontFamily;
+            }
+            // 除开字体图标场景
+            if (otherFonts.length === 1) {
+                var fontFamilyCustom_1 = (_a = otherFonts[0].fontFamily) !== null && _a !== void 0 ? _a : '';
                 fontFamilyCustom_1 && this.jspdfCtx.setFont(fontFamilyCustom_1);
                 return fontFamilyCustom_1;
             }
-            var fontFamilyCustom = (_c = (_b = this.options.fontConfig.find(function (v) { return v.fontWeight === styles.fontWeight && v.fontStyle === styles.fontStyle; })) === null || _b === void 0 ? void 0 : _b.fontFamily) !== null && _c !== void 0 ? _c : '';
+            var fontFamilyCustom = (_c = (_b = otherFonts.find(function (v) { return v.fontWeight === (styles.fontWeight > 500 ? 700 : 400) && v.fontStyle === styles.fontStyle; })) === null || _b === void 0 ? void 0 : _b.fontFamily) !== null && _c !== void 0 ? _c : '';
             fontFamilyCustom && this.jspdfCtx.setFont(fontFamilyCustom);
             return fontFamilyCustom;
         };
@@ -23207,7 +23164,7 @@
                     _a = this.createFontStyle(styles), font = _a[0], fontFamily = _a[1], fontSize = _a[2];
                     fontFamilyFinal = this.setTextFont(styles);
                     this.context2dCtx.font = fontFamilyFinal || font;
-                    // console.log(fontFamilyFinal, 'render getFont', this.jspdfCtx.getFont());
+                    // console.log(fontFamilyFinal, styles, 'render getFont', this.jspdfCtx.getFont());
                     // jspdf context2d not supported ‘direction’
                     // this.context2dCtx.direction = styles.direction === DIRECTION.RTL ? 'rtl' : 'ltr';
                     this.context2dCtx.textAlign = 'left';
@@ -24046,22 +24003,32 @@
                             _a.sent();
                             this.applyEffects([]);
                             if (cfg === null || cfg === void 0 ? void 0 : cfg.header) {
-                                headerText = String(cfg.header.content)
-                                    .replace('${currentPage}', String(pageNum))
-                                    .replace('${totalPages}', String(this.totalPages));
-                                this.jspdfCtx.setFontSize(this.safe(this.pxToPt(cfg.header.contentFontSize), 1));
-                                this.setTextColorFromString(cfg.header.contentColor);
-                                headerPos = this.computeContentPosition(cfg.header.contentPosition, pageW, pageH, cfg.header.height, mt, mb, 'header', cfg.header.padding);
-                                this.textPdf(headerText, headerPos.x, headerPos.y, headerPos.align);
+                                if (typeof cfg.header.content === 'function') {
+                                    cfg.header.content(this, String(pageNum));
+                                }
+                                else {
+                                    headerText = String(cfg.header.content)
+                                        .replace('${currentPage}', String(pageNum))
+                                        .replace('${totalPages}', String(this.totalPages));
+                                    this.jspdfCtx.setFontSize(this.safe(this.pxToPt(cfg.header.contentFontSize), 1));
+                                    this.setTextColorFromString(cfg.header.contentColor);
+                                    headerPos = this.computeContentPosition(cfg.header.contentPosition, pageW, pageH, cfg.header.height, mt, mb, 'header', cfg.header.padding);
+                                    this.textPdf(headerText, headerPos.x, headerPos.y, headerPos.align);
+                                }
                             }
                             if (cfg === null || cfg === void 0 ? void 0 : cfg.footer) {
-                                footerText = String(cfg.footer.content)
-                                    .replace('${currentPage}', String(pageNum))
-                                    .replace('${totalPages}', String(this.totalPages));
-                                this.jspdfCtx.setFontSize(this.safe(this.pxToPt(cfg.footer.contentFontSize), 1));
-                                this.setTextColorFromString(cfg.footer.contentColor);
-                                footerPos = this.computeContentPosition(cfg.footer.contentPosition, pageW, pageH, cfg.footer.height, mt, mb, 'footer', cfg.footer.padding);
-                                this.textPdf(footerText, footerPos.x, footerPos.y, footerPos.align);
+                                if (typeof cfg.footer.content === 'function') {
+                                    cfg.footer.content(this, String(pageNum));
+                                }
+                                else {
+                                    footerText = String(cfg.footer.content)
+                                        .replace('${currentPage}', String(pageNum))
+                                        .replace('${totalPages}', String(this.totalPages));
+                                    this.jspdfCtx.setFontSize(this.safe(this.pxToPt(cfg.footer.contentFontSize), 1));
+                                    this.setTextColorFromString(cfg.footer.contentColor);
+                                    footerPos = this.computeContentPosition(cfg.footer.contentPosition, pageW, pageH, cfg.footer.height, mt, mb, 'footer', cfg.footer.padding);
+                                    this.textPdf(footerText, footerPos.x, footerPos.y, footerPos.align);
+                                }
                             }
                             return [2 /*return*/];
                     }
@@ -24287,6 +24254,8 @@
     var activePageHeight = 1123;
     var pageMarginTop = 0;
     var pageMarginBottom = 0;
+    // let realPageSize = 0;
+    var pageTopOffset = 10;
     var cloneContainerShallow = function (src) {
         var c = Object.create(Object.getPrototypeOf(src));
         var srcObj = src;
@@ -24334,11 +24303,14 @@
         for (var _i = 0, _a = container.textNodes; _i < _a.length; _i++) {
             var tc = _a[_i];
             var filtered = [];
-            for (var _b = 0, _c = tc.textBounds; _b < _c.length; _b++) {
-                var tb = _c[_b];
+            var _loop_1 = function (tb) {
                 var pageIndex = Math.floor(pageEnd / activePageHeight);
                 var maxKey = Math.max.apply(Math, Object.keys(offSetPageObj).map(function (k) { return +k; }));
-                var activePageOffset = offSetPageObj[maxKey] || 0;
+                var activePageOffset = pageIndex === 1 ? 0 : offSetPageObj[maxKey] || 0;
+                var prevMaxKey = Math.max.apply(Math, Object.keys(offSetPageObj)
+                    .filter(function (k) { return +k < pageIndex; })
+                    .map(function (k) { return +k; }));
+                var prevPageOffset = offSetPageObj[prevMaxKey] || 0;
                 var top_1 = tb.bounds.top + activePageOffset;
                 var bottom = tb.bounds.top + tb.bounds.height + activePageOffset;
                 var intersects = bottom > pageStart && top_1 < pageEnd;
@@ -24346,11 +24318,24 @@
                 if (intersects && !crossesToNextPage) {
                     var offsetNum = 0;
                     if (top_1 < pageStart) {
-                        offsetNum = pageStart - top_1;
-                        if (!offSetPageObj[pageIndex] ||
-                            (offSetPageObj[pageIndex] && offSetPageObj[pageIndex] < offsetNum)) {
-                            if (offSetPageObj[pageIndex] && offSetPageObj[pageIndex] < offsetNum) {
-                                offSetTotal = offSetTotal - offSetPageObj[pageIndex] + offsetNum;
+                        if (prevPageOffset || pageIndex > 1) {
+                            // Because the offset is only increased when paging occurs, and each time elements are paged, a full traversal is performed
+                            // Determine that the current text does not require pagination rendering based on the height calculated on the previous page, so proceed directly to continue
+                            var prevPageStart = pageStart - activePageHeight;
+                            var prevPageEnd = pageEnd - activePageHeight;
+                            var prevTop = tb.bounds.top + prevPageOffset;
+                            var prevBottom = tb.bounds.top + tb.bounds.height + prevPageOffset;
+                            var prevIntersects = prevBottom > prevPageStart && prevTop < prevPageEnd;
+                            var prevCrossesToNextPage = prevBottom > prevPageEnd;
+                            if (prevIntersects && !prevCrossesToNextPage) {
+                                return "continue";
+                            }
+                        }
+                        offsetNum = pageStart - top_1 + pageTopOffset;
+                        var prev = offSetPageObj[pageIndex] || 0;
+                        if (!offSetPageObj[pageIndex] || prev < offsetNum) {
+                            if (prev < offsetNum) {
+                                offSetTotal = offSetTotal - prev + offsetNum;
                             }
                             else {
                                 offSetTotal += offsetNum;
@@ -24359,29 +24344,26 @@
                         }
                         // Fix the issue where no offset is added for the first text container
                         bottom += offsetNum;
+                        top_1 += offsetNum;
+                        // fix add realpageSize
+                        // TODO
+                        // if (offsetNum && realPageSize <= pageIndex) {
+                        //     realPageSize = pageIndex + 1;
+                        // }
                     }
                     var visibleTop = Math.max(top_1, pageStart);
                     var visibleBottom = Math.min(bottom, pageEnd);
                     var newTop = visibleTop - pageStart;
                     var newHeight = Math.max(0, visibleBottom - visibleTop);
-                    // 根据可见区域生成新的 Bounds
+                    // Generate new Bounds based on the visible area
                     var nb = new Bounds$1(tb.bounds.left, newTop + pageMarginTop, tb.bounds.width, newHeight);
-                    // if (pageIndex == 3) {
-                    //     console.log(
-                    //         'nb',
-                    //         nb,
-                    //         'pageStart',
-                    //         pageStart,
-                    //         'tb.bounds.top',
-                    //         tb.bounds.top,
-                    //         'activePageOffset',
-                    //         activePageOffset,
-                    //         (tb as any).text
-                    //     );
-                    // }
-                    // 把文字内容和新的 bounds 一起放进 filtered
+                    // Put the text content and the new bounds into filtered
                     filtered.push({ text: tb.text, bounds: nb });
                 }
+            };
+            for (var _b = 0, _c = tc.textBounds; _b < _c.length; _b++) {
+                var tb = _c[_b];
+                _loop_1(tb);
             }
             if (filtered.length > 0) {
                 var clone = cloneTextContainerShallow(tc);
@@ -24394,26 +24376,37 @@
     var filterElementForPage = function (container, pageStart, pageEnd) {
         var pageIndex = Math.floor(pageEnd / activePageHeight);
         var maxKey = Math.max.apply(Math, Object.keys(offSetPageObj).map(function (k) { return +k; }));
-        var activePageOffset = offSetPageObj[maxKey] || 0;
+        var activePageOffset = pageIndex === 1 ? 0 : offSetPageObj[maxKey] || 0;
         var top = container.bounds.top + activePageOffset;
         var bottom = container.bounds.top + container.bounds.height + activePageOffset;
         if (container.divisionDisable && bottom > pageEnd && top < pageEnd) {
-            var offsetNum = pageEnd - top;
+            var offsetNum = pageEnd - top + pageTopOffset;
             var prev = offSetPageObj[pageIndex] || 0;
             if (!offSetPageObj[pageIndex] || prev < offsetNum) {
                 offSetTotal += offsetNum - prev;
                 offSetPageObj[pageIndex] = offSetTotal;
             }
+            // fix add realpageSize
+            // TODO
+            // if (offsetNum && realPageSize <= pageIndex) {
+            //     realPageSize = pageIndex + 1;
+            // }
             return null;
         }
         var children = [];
+        // Modify the order of `filterTextNodesForPage` and `filterElementForPage`, traversing text nodes first and then child elements, to avoid incorrect setting of `activePageOffset` when the current section spans multiple pages
+        var textNodes = filterTextNodesForPage(container, pageStart, pageEnd);
         for (var _i = 0, _a = container.elements; _i < _a.length; _i++) {
             var child = _a[_i];
             var part = filterElementForPage(child, pageStart, pageEnd);
             if (part)
                 children.push(part);
         }
-        var textNodes = filterTextNodesForPage(container, pageStart, pageEnd);
+        // Prevent the outer container from not synchronizing the offsetPage when the text spans multiple pages
+        maxKey = Math.max.apply(Math, Object.keys(offSetPageObj).map(function (k) { return +k; }));
+        activePageOffset = pageIndex === 1 ? 0 : offSetPageObj[maxKey] || 0;
+        top = container.bounds.top + activePageOffset;
+        bottom = container.bounds.top + container.bounds.height + activePageOffset;
         var visibleTop = Math.max(top, pageStart);
         var visibleBottom = Math.min(bottom, pageEnd);
         var newHeight = Math.max(0, visibleBottom - visibleTop);
@@ -24427,18 +24420,19 @@
         clone.bounds = new Bounds$1(container.bounds.left, newTop + pageMarginTop, container.bounds.width, newHeight);
         return clone;
     };
-    var paginateNode = function (root, pageHeight, initialOffset, pageConfig) {
+    var paginateNode = function (root, pageHeight, initialOffset, totalHeight, pageConfig) {
         var _a, _b;
         if (initialOffset === void 0) { initialOffset = 0; }
         if (initialOffset < 0)
             initialOffset = 0;
         offSetTotal = 0;
         offSetPageObj = {};
-        var maxBottom = computeMaxBottom(root);
+        var maxBottom = totalHeight || computeMaxBottom(root);
         pageMarginTop = ((_a = pageConfig === null || pageConfig === void 0 ? void 0 : pageConfig.header) === null || _a === void 0 ? void 0 : _a.height) || 0;
         pageMarginBottom = ((_b = pageConfig === null || pageConfig === void 0 ? void 0 : pageConfig.footer) === null || _b === void 0 ? void 0 : _b.height) || 0;
         activePageHeight = pageHeight - pageMarginTop - pageMarginBottom;
         var totalPages = Math.max(1, Math.ceil((maxBottom - initialOffset) / activePageHeight));
+        // realPageSize = totalPages;
         var pages = [];
         for (var i = 0; i < totalPages; i++) {
             var pageStart = initialOffset + i * activePageHeight;
@@ -24447,6 +24441,16 @@
             if (pageRoot)
                 pages.push(pageRoot);
         }
+        // If the number of pages increases due to divisionDisable or text truncation, recalculation of pages is required
+        // TODO
+        // if (realPageSize > totalPages) {
+        //     for (let i = totalPages; i < realPageSize; i++) {
+        //         const pageStart = initialOffset + i * activePageHeight;
+        //         const pageEnd = pageStart + activePageHeight;
+        //         const pageRoot = filterElementForPage(root, pageStart, pageEnd);
+        //         if (pageRoot) pages.push(pageRoot);
+        //     }
+        // }
         // console.log(offSetPageObj, '偏移量');
         return pages;
     };
@@ -24548,11 +24552,7 @@
                         y: ((_q = opts.y) !== null && _q !== void 0 ? _q : 0) + top,
                         width: (_r = opts.width) !== null && _r !== void 0 ? _r : Math.ceil(width),
                         height: (_s = opts.height) !== null && _s !== void 0 ? _s : Math.ceil(height),
-                        fontConfig: validateFontConfig(opts.fontConfig)
-                            ? isArray$1(opts.fontConfig)
-                                ? opts.fontConfig
-                                : [opts.fontConfig]
-                            : undefined,
+                        fontConfig: setOptionFontConfig(opts.fontConfig),
                         encryption: isEmptyValue(opts.encryption) ? undefined : opts.encryption,
                         precision: (_t = opts.precision) !== null && _t !== void 0 ? _t : 16,
                         floatPrecision: (_u = opts.floatPrecision) !== null && _u !== void 0 ? _u : 16,
@@ -24614,7 +24614,7 @@
                         };
                         adjustTop_1(root, offsetY);
                     }
-                    pageRoots = paginateNode(root, pageHeight, renderOptions.y, renderOptions.pageConfig);
+                    pageRoots = paginateNode(root, pageHeight, renderOptions.y, renderOptions.height, renderOptions.pageConfig);
                     Reflect.deleteProperty(root, 'context');
                     if (backgroundColor === root.styles.backgroundColor) {
                         root.styles.backgroundColor = COLORS$1.TRANSPARENT;