@syncfusion/ej2-image-editor 27.1.51 → 27.1.53

package/dist/es6/ej2-image-editor.es5.js

@@ -2313,8 +2313,13 @@ var Draw = /** @__PURE__ @class */ (function () {
         var baseRadius = isTempCanvas ? radius * 10 * ((ratio.width + ratio.height) / 2) : radius * 10;
         var adjustedRadius = baseRadius + (baseRadius * zoomFactor);
         if (radius !== null) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            canvasDraw.roundRect(startX, startY, width, height, adjustedRadius);
+            if (parent.isSafari) {
+                this.drawRoundedRect(canvasDraw, startX, startY, width, height, adjustedRadius);
+            }
+            else {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                canvasDraw.roundRect(startX, startY, width, height, adjustedRadius);
+            }
         }
         else {
             canvasDraw.rect(startX, startY, width, height);
@@ -2324,8 +2329,13 @@ var Draw = /** @__PURE__ @class */ (function () {
             canvasDraw.fill();
         }
         if (radius !== null) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            canvasDraw.roundRect(startX + strokeWidth, startY + strokeWidth, width - (2 * strokeWidth), height - (2 * strokeWidth), adjustedRadius);
+            if (parent.isSafari) {
+                this.drawRoundedRect(canvasDraw, startX + strokeWidth, startY + strokeWidth, width - (2 * strokeWidth), height - (2 * strokeWidth), adjustedRadius);
+            }
+            else {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                canvasDraw.roundRect(startX + strokeWidth, startY + strokeWidth, width - (2 * strokeWidth), height - (2 * strokeWidth), adjustedRadius);
+            }
         }
         else {
             canvasDraw.rect(startX + strokeWidth, startY + strokeWidth, width - (2 * strokeWidth), height - (2 * strokeWidth));
@@ -2334,6 +2344,15 @@ var Draw = /** @__PURE__ @class */ (function () {
         canvasDraw.fill('evenodd');
         canvasDraw.closePath();
     };
+    Draw.prototype.drawRoundedRect = function (canvasDraw, startX, startY, width, height, radius) {
+        var rectRadius = Math.max(0, Math.min(radius, width / 2, height / 2));
+        canvasDraw.moveTo(startX + rectRadius, startY);
+        canvasDraw.arcTo(startX + width, startY, startX + width, startY + height, rectRadius);
+        canvasDraw.arcTo(startX + width, startY + height, startY, startY + height, rectRadius);
+        canvasDraw.arcTo(startX, startY + height, startX, startY, rectRadius);
+        canvasDraw.arcTo(startX, startY, startX + width, startY, rectRadius);
+        canvasDraw.closePath();
+    };
     Draw.prototype.drawSelection = function (horLineWidth, verLineHeight) {
         var parent = this.parent;
         var actObj = parent.activeObj;
@@ -3033,12 +3052,7 @@ var Draw = /** @__PURE__ @class */ (function () {
             /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
             var coll = actObj.rotateFlipColl[i];
             if (typeof (coll) === 'number') {
-                if (actObj.shapeDegree === 0) {
-                    tempDegree = coll;
-                }
-                else {
-                    tempDegree = coll - actObj.shapeDegree;
-                }
+                tempDegree = coll;
                 if (tempDegree === -450) {
                     tempDegree = -90;
                 }
@@ -3136,12 +3150,7 @@ var Draw = /** @__PURE__ @class */ (function () {
             /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
             var coll = actObj.rotateFlipColl[i];
             if (typeof (coll) === 'number') {
-                if (actObj.shapeDegree === 0) {
-                    tempDegree = coll;
-                }
-                else {
-                    tempDegree = coll - actObj.shapeDegree;
-                }
+                tempDegree = coll;
                 if (tempDegree === -450) {
                     tempDegree = -90;
                 }
@@ -6088,10 +6097,21 @@ var Draw = /** @__PURE__ @class */ (function () {
                     y: sinAngle * (p2.x - center.x) + cosAngle * (p2.y - center.y) + center.y };
                 var newP3 = { x: cosAngle * (p3.x - center.x) - sinAngle * (p3.y - center.y) + center.x,
                     y: sinAngle * (p3.x - center.x) + cosAngle * (p3.y - center.y) + center.y };
+                var tempWidth = isSaveCtx ? canvasDraw.canvas.width : img.destWidth;
+                var tempHeight = isSaveCtx ? canvasDraw.canvas.height : img.destHeight;
+                var rotatedWidth = Math.abs(tempWidth * Math.cos(radians)) + Math.abs(tempHeight * Math.sin(radians));
+                var rotatedHeight = Math.abs(tempWidth * Math.sin(radians)) + Math.abs(tempHeight * Math.cos(radians));
+                straightenCanvas.width = rotatedWidth;
+                straightenCanvas.height = rotatedHeight;
+                straightenCtx.save();
+                straightenCtx.translate(rotatedWidth / 2, rotatedHeight / 2);
+                straightenCtx.rotate(radians);
+                straightenCtx.drawImage(tempCanvas, -tempCanvas.width / 2, -tempCanvas.height / 2);
+                straightenCtx.restore();
                 if (this.parent.activeObj.redactType === 'blur') {
                     offscreenCanvas.width = width;
                     offscreenCanvas.height = height;
-                    offscreenCtx.drawImage(straightenCanvas, newP1.x, newP1.y, newP2.x - newP1.x, newP3.y - newP2.y, 0, 0, width, height);
+                    offscreenCtx.drawImage(straightenCanvas, newP1.x + ((rotatedWidth - tempCanvas.width) / 2), newP1.y + ((rotatedHeight - tempCanvas.height) / 2), newP2.x - newP1.x, newP3.y - newP2.y, 0, 0, width, height);
                 }
                 else {
                     var pixelSize = (obj.redactPixelate / 100) * 20;
@@ -6100,7 +6120,7 @@ var Draw = /** @__PURE__ @class */ (function () {
                     }
                     offscreenCanvas.width = Math.ceil(width / pixelSize);
                     offscreenCanvas.height = Math.ceil(height / pixelSize);
-                    offscreenCtx.drawImage(straightenCanvas, newP1.x, newP1.y, newP2.x - newP1.x, newP3.y - newP2.y, 0, 0, offscreenCanvas.width, offscreenCanvas.height);
+                    offscreenCtx.drawImage(straightenCanvas, newP1.x + ((rotatedWidth - tempCanvas.width) / 2), newP1.y + ((rotatedHeight - tempCanvas.height) / 2), newP2.x - newP1.x, newP3.y - newP2.y, 0, 0, offscreenCanvas.width, offscreenCanvas.height);
                 }
             }
             if (this.parent.activeObj.redactType === 'blur') {
@@ -7349,7 +7369,7 @@ var Filter = /** @__PURE__ @class */ (function () {
     Filter.prototype.parseFilterString = function (filterString) {
         /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
         var filterArray = [];
-        if (filterString !== 'none') {
+        if (filterString && filterString !== 'none') {
             filterArray = filterString.split(' ').map(function (filter) {
                 var _a = filter.match(/([a-z-]+)\(([^)]+)\)/).slice(1, 3), name = _a[0], value = _a[1];
                 return { filter: name, value: value };
@@ -12068,6 +12088,7 @@ var Selection = /** @__PURE__ @class */ (function () {
             this.triggerShapeChange(shapeResizingArgs, shapeMovingArgs, 'mouse-down');
             parent.activeObj.activePoint = activePoint;
             parent.isShapeDrawing = true;
+            this.tempActiveObj = extend({}, parent.activeObj, {}, true);
             return;
         }
         parent.notify('draw', { prop: 'resetFrameZoom', onPropertyChange: false, value: { isOk: true } });
@@ -14721,7 +14742,8 @@ var Shape = /** @__PURE__ @class */ (function () {
     };
     Shape.prototype.setDimension = function (width, height) {
         var parent = this.parent;
-        if (width && height) {
+        var shape = parent.activeObj.shape;
+        if ((width && height) || ((shape === 'line' || shape === 'arrow') && (width || height))) {
             parent.activeObj.activePoint.width = width;
             parent.activeObj.activePoint.height = height;
             if (parent.currObjType.shape.toLowerCase() === 'ellipse') {
@@ -14769,7 +14791,7 @@ var Shape = /** @__PURE__ @class */ (function () {
                     strokeSettings.strokeWidth = 0;
                 }
                 strokeSettings.strokeColor = strokeColor ? strokeColor : strokeSettings.strokeColor;
-                strokeSettings.fillColor = fillColor ? fillColor : strokeSettings.fillColor;
+                strokeSettings.fillColor = fillColor || fillColor === '' ? fillColor : strokeSettings.fillColor;
                 strokeSettings.radius = radius ? radius : strokeSettings.radius;
                 var tempWidth = parent.img.destWidth > 100 ? 100 : parent.img.destWidth / 2;
                 var tempHeight = parent.img.destHeight > 100 ? 100 : parent.img.destHeight / 2;
@@ -22272,7 +22294,9 @@ var ImageEditor = /** @__PURE__ @class */ (function (_super) {
             this.notify('toolbar', { prop: 'getLocaleText', onPropertyChange: false, value: { obj: contentObj } });
             var supportObj = { key: 'SupportText' };
             this.notify('toolbar', { prop: 'getLocaleText', onPropertyChange: false, value: { obj: supportObj } });
-            content = '<span>' + contentObj['value'] + ' ' + supportObj['value'] + '<b> JPG, PNG, and SVG</b></span>';
+            var andObj = { key: 'And' };
+            this.notify('toolbar', { prop: 'getLocaleText', onPropertyChange: false, value: { obj: andObj } });
+            content = '<span>' + contentObj['value'] + ' ' + supportObj['value'] + '<b> JPG, PNG, ' + andObj['value'] + ' SVG</b></span>';
         }
         var dialog = new Dialog({
             header: headerObj['value'],
@@ -28029,7 +28053,7 @@ var ToolbarModule = /** @__PURE__ @class */ (function () {
         qualityOptionDiv.appendChild(parent.createElement('button', { id: id + '_qualitybuttonIcon', className: 'e-ie-img-icon-button', attrs: { type: 'button' } }));
         qualityNameDiv.appendChild(qualityOptionDiv);
         if (Browser.isDevice) {
-            qualityNameDiv.appendChild(parent.createElement('span', {
+            dialogRightContent.appendChild(parent.createElement('span', {
                 id: id + '_qualitySize', className: 'e-ie-img-quality-size'
             }));
         }
@@ -28289,48 +28313,44 @@ var ToolbarModule = /** @__PURE__ @class */ (function () {
             }).bind(this), 'image/jpeg', quality);
         }
         else if (!isNullOrUndefined(fileType) && fileType.toLowerCase() === 'png') {
-            if (Browser.isDevice) {
-                canvas.style.display = 'none';
+            ctx.drawImage(tempCanvas, 0, 0);
+            tempCanvas.toBlob((function (blob) {
+                fileSize = Math.floor(blob.size / 1024);
+                if (fileSize > 1000) {
+                    var megabytes = fileSize / 1024;
+                    imageNameLabel.innerHTML = this.l10n.getConstant('ImageSize') + ': ' + megabytes.toFixed(2) + ' MB';
+                    fileSize = +megabytes.toFixed(2);
+                }
+                else {
+                    imageNameLabel.innerHTML = this.l10n.getConstant('ImageSize') + ': ' + fileSize.toFixed(2) + ' KB';
+                    fileSize = +fileSize.toFixed(2);
+                }
+                if (Browser.isDevice) {
+                    canvas.style.display = 'none';
+                }
+                this.fileSize = fileSize;
+            }).bind(this), 'image/png', 1);
+        }
+        else if (!isNullOrUndefined(fileType) && fileType.toLowerCase() === 'svg') {
+            ctx.drawImage(tempCanvas, 0, 0);
+            var svgDataUrl = tempCanvas.toDataURL('image/svg+xml');
+            var base64Data = svgDataUrl.split(',')[1];
+            var binaryStringLength = base64Data.length;
+            var rawByteSize = binaryStringLength;
+            var fileSize_1 = Math.floor(rawByteSize / 1024); // KB
+            if (fileSize_1 > 1000) {
+                var megabytes = fileSize_1 / 1024; // Convert to MB
+                imageNameLabel.innerHTML = this.l10n.getConstant('ImageSize') + ': ' + megabytes.toFixed(2) + ' MB';
+                fileSize_1 = +megabytes.toFixed(2);
             }
             else {
-                ctx.drawImage(tempCanvas, 0, 0);
-                tempCanvas.toBlob((function (blob) {
-                    fileSize = Math.floor(blob.size / 1024);
-                    if (fileSize > 1000) {
-                        var megabytes = fileSize / 1024;
-                        imageNameLabel.innerHTML = this.l10n.getConstant('ImageSize') + ': ' + megabytes.toFixed(2) + ' MB';
-                        fileSize = +megabytes.toFixed(2);
-                    }
-                    else {
-                        imageNameLabel.innerHTML = this.l10n.getConstant('ImageSize') + ': ' + fileSize.toFixed(2) + ' KB';
-                        fileSize = +fileSize.toFixed(2);
-                    }
-                    this.fileSize = fileSize;
-                }).bind(this), 'image/png', 1);
+                imageNameLabel.innerHTML = this.l10n.getConstant('ImageSize') + ': ' + fileSize_1.toFixed(2) + ' KB';
+                fileSize_1 = +fileSize_1.toFixed(2);
             }
-        }
-        else if (!isNullOrUndefined(fileType) && fileType.toLowerCase() === 'svg') {
             if (Browser.isDevice) {
                 canvas.style.display = 'none';
             }
-            else {
-                ctx.drawImage(tempCanvas, 0, 0);
-                var svgDataUrl = tempCanvas.toDataURL('image/svg+xml');
-                var base64Data = svgDataUrl.split(',')[1];
-                var binaryStringLength = base64Data.length;
-                var rawByteSize = binaryStringLength;
-                var fileSize_1 = Math.floor(rawByteSize / 1024); // KB
-                if (fileSize_1 > 1000) {
-                    var megabytes = fileSize_1 / 1024; // Convert to MB
-                    imageNameLabel.innerHTML = this.l10n.getConstant('ImageSize') + ': ' + megabytes.toFixed(2) + ' MB';
-                    fileSize_1 = +megabytes.toFixed(2);
-                }
-                else {
-                    imageNameLabel.innerHTML = this.l10n.getConstant('ImageSize') + ': ' + fileSize_1.toFixed(2) + ' KB';
-                    fileSize_1 = +fileSize_1.toFixed(2);
-                }
-            }
-            this.fileSize = fileSize;
+            this.fileSize = fileSize_1;
         }
         else {
             if (Browser.isDevice) {