html2canvas-pro 1.5.4 → 1.5.6

package/dist/html2canvas-pro.js

@@ -1,5 +1,5 @@
 /*!
- * html2canvas-pro 1.5.4 <undefined>
+ * undefined 1.5.6 <https://yorickshan.github.io/html2canvas-pro/>
  * Copyright (c) 2024 yorickshan <https://github.com/yorickshan>
  * Released under MIT License
  */
@@ -7,7 +7,7 @@
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
     typeof define === 'function' && define.amd ? define(factory) :
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.html2canvas = factory());
-}(this, (function () { 'use strict';
+})(this, (function () { 'use strict';
 
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -2560,7 +2560,7 @@
                             .replace(/r|x/, color[0].toString())
                             .replace(/g|y/, color[1].toString())
                             .replace(/b|z/, color[2].toString());
-                        return eval(expression);
+                        return new Function('return ' + expression)();
                     }
                 }
                 return null;
@@ -7017,7 +7017,6 @@
             while (parent) {
                 var croplessEffects = parent.effects.filter(function (effect) { return !isClipEffect(effect); });
                 if (inFlow || parent.container.styles.position !== 0 /* POSITION.STATIC */ || !parent.parent) {
-                    effects.unshift.apply(effects, croplessEffects);
                     inFlow = [2 /* POSITION.ABSOLUTE */, 3 /* POSITION.FIXED */].indexOf(parent.container.styles.position) === -1;
                     if (parent.container.styles.overflowX !== 0 /* OVERFLOW.VISIBLE */) {
                         var borderBox = calculateBorderBoxPath(parent.curves);
@@ -7026,6 +7025,7 @@
                             effects.unshift(new ClipEffect(paddingBox, 2 /* EffectTarget.BACKGROUND_BORDERS */ | 4 /* EffectTarget.CONTENT */));
                         }
                     }
+                    effects.unshift.apply(effects, croplessEffects);
                 }
                 else {
                     effects.unshift.apply(effects, croplessEffects);
@@ -7606,7 +7606,7 @@
                             switch (paintOrderLayer) {
                                 case 0 /* PAINT_ORDER_LAYER.FILL */:
                                     _this.ctx.fillStyle = asString(styles.color);
-                                    _this.renderTextWithLetterSpacing(text, styles.letterSpacing, baseline);
+                                    _this.renderTextWithLetterSpacing(text, styles.letterSpacing, styles.fontSize.number);
                                     var textShadows = styles.textShadow;
                                     if (textShadows.length && text.text.trim().length) {
                                         textShadows
@@ -7617,7 +7617,7 @@
                                             _this.ctx.shadowOffsetX = textShadow.offsetX.number * _this.options.scale;
                                             _this.ctx.shadowOffsetY = textShadow.offsetY.number * _this.options.scale;
                                             _this.ctx.shadowBlur = textShadow.blur.number;
-                                            _this.renderTextWithLetterSpacing(text, styles.letterSpacing, baseline);
+                                            _this.renderTextWithLetterSpacing(text, styles.letterSpacing, styles.fontSize.number);
                                         });
                                         _this.ctx.shadowColor = '';
                                         _this.ctx.shadowOffsetX = 0;
@@ -8767,5 +8767,5 @@
 
     return html2canvas;
 
-})));
+}));
 //# sourceMappingURL=html2canvas-pro.js.map