watermark-js-plus 1.5.2 → 1.5.4

package/dist/index.cjs.js

@@ -1,5 +1,5 @@
 /*!
- * watermark-js-plus v1.5.2
+ * watermark-js-plus v1.5.4
  * (c) 2022-2024 Michael Sun
  * Released under the MIT License.
  */
@@ -139,8 +139,15 @@ var createSVGElement = function (tagName, attrs, namespaceURI) {
 var getMultiLineData = function (ctx, text, maxWidth) {
     var result = [];
     var str = '';
+    var word = '';
     for (var i = 0, len = text.length; i < len; i++) {
-        str += text.charAt(i);
+        word = text.charAt(i);
+        if (word === '\n') {
+            result.push(str);
+            str = '';
+            continue;
+        }
+        str += word;
         if (ctx.measureText(str).width > maxWidth) {
             result.push(str.substring(0, str.length - 1));
             str = '';
@@ -252,7 +259,10 @@ function convertImgToBase64(bodyElement) {
     });
 }
 var convertSVGToImage = function (svg) {
-    var richContent = svg.outerHTML.replace(/<img(.*?)>/g, '<img$1/>').replace(/\n/g, '').replace(/\t/g, '').replace(/#/g, '%23');
+    var richContent = svg.outerHTML
+        .replace(/<(img|br|input|hr|embed)(.*?)>/g, '<$1$2/>')
+        .replace(/\n/g, '').replace(/\t/g, '')
+        .replace(/#/g, '%23');
     return "data:image/svg+xml;charset=utf-8,".concat(richContent);
 };
 var getValue = function (v1, v2) {
@@ -767,7 +777,7 @@ var WatermarkCanvas = /** @class */ (function () {
         var lines = this.recommendOptions.textLine.data;
         var yOffsetValue = this.recommendOptions.textLine.yOffsetValue;
         lines.forEach(function (text, index) {
-            _this.setText(ctx, { text: text, x: 0, y: _this.options.lineHeight * index - yOffsetValue });
+            _this.setText(ctx, { text: text, x: 0, y: _this.options.lineHeight * index - yOffsetValue, maxWidth: _this.options.textRowMaxWidth || _this.options.width });
         });
         resolve(ctx.canvas);
     };
@@ -925,8 +935,9 @@ var Watermark = /** @class */ (function () {
     function Watermark(args) {
         if (args === void 0) { args = {}; }
         this.parentElement = document.body;
+        this.isCreating = false;
         this.props = args;
-        this.options = Object.assign({}, initialOptions, args);
+        this.options = __assign(__assign({}, initialOptions), args);
         this.changeParentElement(this.options.parent);
         this.watermarkCanvas = new WatermarkCanvas(this.props, this.options);
         bootstrap();
@@ -967,10 +978,16 @@ var Watermark = /** @class */ (function () {
             return __generator(this, function (_h) {
                 switch (_h.label) {
                     case 0:
+                        if (this.isCreating) {
+                            return [2 /*return*/];
+                        }
+                        this.isCreating = true;
                         if (!this.validateUnique()) {
+                            this.isCreating = false;
                             return [2 /*return*/];
                         }
                         if (!this.validateContent()) {
+                            this.isCreating = false;
                             return [2 /*return*/];
                         }
                         firstDraw = isUndefined(this.watermarkDom);
@@ -988,7 +1005,7 @@ var Watermark = /** @class */ (function () {
                         this.watermarkDom.style.cssText = "\n      z-index:".concat(this.options.zIndex, "!important;display:block!important;visibility:visible!important;transform:none!important;scale:none!important;\n      ").concat(parentElementType === 'custom' ? 'top:0!important;bottom:0!important;left:0!important;right:0!important;height:100%!important;pointer-events:none!important;position:absolute!important;' : 'position:relative!important;', "\n    ");
                         backgroundSize = generateBackgroundSize(this.options);
                         watermarkInnerDom.style.cssText = "\n      display:block!important;visibility:visible!important;pointer-events:none;top:0;bottom:0;left:0;right:0;transform:none!important;scale:none!important;\n      position:".concat(parentElementType === 'root' ? 'fixed' : 'absolute', "!important;-webkit-print-color-adjust:exact!important;width:100%!important;height:100%!important;\n      z-index:").concat(this.options.zIndex, "!important;background-image:url(").concat(image, ")!important;background-repeat:").concat(this.options.backgroundRepeat, "!important;\n      background-size:").concat(backgroundSize[0], "px ").concat(backgroundSize[1], "px!important;background-position:").concat(this.options.backgroundPosition, ";\n      ").concat(this.options.movable ? 'animation: 200s ease 0s infinite normal none running watermark !important;' : '', "\n    ");
-                        this.watermarkDom.append(watermarkInnerDom);
+                        this.watermarkDom.appendChild(watermarkInnerDom);
                         this.parentElement.appendChild(this.watermarkDom);
                         if (this.options.mutationObserve) {
                             try {
@@ -999,6 +1016,7 @@ var Watermark = /** @class */ (function () {
                             }
                         }
                         firstDraw && ((_g = (_f = this.options).onSuccess) === null || _g === void 0 ? void 0 : _g.call(_f));
+                        this.isCreating = false;
                         return [2 /*return*/];
                 }
             });
@@ -1028,13 +1046,13 @@ var Watermark = /** @class */ (function () {
         });
     };
     Watermark.prototype.remove = function () {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         (_b = (_a = this.options).onBeforeDestroy) === null || _b === void 0 ? void 0 : _b.call(_a);
         (_c = this.observer) === null || _c === void 0 ? void 0 : _c.disconnect();
         (_d = this.parentObserve) === null || _d === void 0 ? void 0 : _d.disconnect();
         this.unbindCheckWatermarkElementEvent();
-        (_e = this.watermarkDom) === null || _e === void 0 ? void 0 : _e.remove();
-        (_g = (_f = this.options).onDestroyed) === null || _g === void 0 ? void 0 : _g.call(_f);
+        (_f = (_e = this.watermarkDom) === null || _e === void 0 ? void 0 : _e.parentNode) === null || _f === void 0 ? void 0 : _f.removeChild(this.watermarkDom);
+        (_h = (_g = this.options).onDestroyed) === null || _h === void 0 ? void 0 : _h.call(_g);
     };
     Watermark.prototype.initConfigData = function (args, mode) {
         var _this = this;
@@ -1047,7 +1065,7 @@ var Watermark = /** @class */ (function () {
         else {
             this.props = args;
         }
-        this.options = Object.assign({}, initialOptions, this.props);
+        this.options = __assign(__assign({}, initialOptions), this.props);
         this.changeParentElement(this.options.parent);
         this.watermarkCanvas = new WatermarkCanvas(this.props, this.options);
     };
@@ -1059,10 +1077,13 @@ var Watermark = /** @class */ (function () {
         else {
             this.parentElement = parent;
         }
+        if (!this.parentElement) {
+            console.error('[WatermarkJsPlus]: please pass a valid parent element.');
+        }
     };
     Watermark.prototype.validateUnique = function () {
         var result = true;
-        this.parentElement.childNodes.forEach(function (node) {
+        Array.from(this.parentElement.childNodes).forEach(function (node) {
             if (!result) {
                 return;
             }
@@ -1244,7 +1265,7 @@ var ImageWatermark = /** @class */ (function () {
         var _a;
         this.drew = false;
         this.props = args;
-        this.options = Object.assign({}, initialOptions, args);
+        this.options = __assign(__assign({}, initialOptions), args);
         this.watermarkCanvas = new WatermarkCanvas(this.props, this.options);
         this.originalSrc = (_a = this.props.dom) === null || _a === void 0 ? void 0 : _a.src;
         this.backgroundImage = this.getBackgroundImage();