@syncfusion/ej2-image-editor 27.1.51 → 27.1.53

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

@@ -2284,8 +2284,13 @@ class Draw {
         const baseRadius = isTempCanvas ? radius * 10 * ((ratio.width + ratio.height) / 2) : radius * 10;
         const 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);
@@ -2295,8 +2300,13 @@ class Draw {
             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));
@@ -2305,6 +2315,15 @@ class Draw {
         canvasDraw.fill('evenodd');
         canvasDraw.closePath();
     }
+    drawRoundedRect(canvasDraw, startX, startY, width, height, radius) {
+        const 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();
+    }
     drawSelection(horLineWidth, verLineHeight) {
         const parent = this.parent;
         const actObj = parent.activeObj;
@@ -3004,12 +3023,7 @@ class Draw {
             /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
             let 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;
                 }
@@ -3107,12 +3121,7 @@ class Draw {
             /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
             let 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;
                 }
@@ -6042,10 +6051,21 @@ class Draw {
                     y: sinAngle * (p2.x - center.x) + cosAngle * (p2.y - center.y) + center.y };
                 const 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 };
+                const tempWidth = isSaveCtx ? canvasDraw.canvas.width : img.destWidth;
+                const tempHeight = isSaveCtx ? canvasDraw.canvas.height : img.destHeight;
+                const rotatedWidth = Math.abs(tempWidth * Math.cos(radians)) + Math.abs(tempHeight * Math.sin(radians));
+                const 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 {
                     let pixelSize = (obj.redactPixelate / 100) * 20;
@@ -6054,7 +6074,7 @@ class Draw {
                     }
                     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') {
@@ -7300,7 +7320,7 @@ class Filter {
     parseFilterString(filterString) {
         /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
         let filterArray = [];
-        if (filterString !== 'none') {
+        if (filterString && filterString !== 'none') {
             filterArray = filterString.split(' ').map((filter) => {
                 const [name, value] = filter.match(/([a-z-]+)\(([^)]+)\)/).slice(1, 3);
                 return { filter: name, value: value };
@@ -12006,6 +12026,7 @@ class Selection {
             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 } });
@@ -14658,7 +14679,8 @@ class Shape {
     }
     setDimension(width, height) {
         const parent = this.parent;
-        if (width && height) {
+        const 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') {
@@ -14706,7 +14728,7 @@ class Shape {
                     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;
                 const tempWidth = parent.img.destWidth > 100 ? 100 : parent.img.destWidth / 2;
                 const tempHeight = parent.img.destHeight > 100 ? 100 : parent.img.destHeight / 2;
@@ -22166,7 +22188,9 @@ let ImageEditor = ImageEditor_1 = class ImageEditor extends Component {
             this.notify('toolbar', { prop: 'getLocaleText', onPropertyChange: false, value: { obj: contentObj } });
             const 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>';
+            const 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>';
         }
         const dialog = new Dialog({
             header: headerObj['value'],
@@ -27912,7 +27936,7 @@ class ToolbarModule {
         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'
             }));
         }
@@ -28170,39 +28194,11 @@ class ToolbarModule {
             }).bind(this), 'image/jpeg', quality);
         }
         else if (!isNullOrUndefined(fileType) && fileType.toLowerCase() === 'png') {
-            if (Browser.isDevice) {
-                canvas.style.display = 'none';
-            }
-            else {
-                ctx.drawImage(tempCanvas, 0, 0);
-                tempCanvas.toBlob((function (blob) {
-                    fileSize = Math.floor(blob.size / 1024);
-                    if (fileSize > 1000) {
-                        const 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);
-            }
-        }
-        else if (!isNullOrUndefined(fileType) && fileType.toLowerCase() === 'svg') {
-            if (Browser.isDevice) {
-                canvas.style.display = 'none';
-            }
-            else {
-                ctx.drawImage(tempCanvas, 0, 0);
-                const svgDataUrl = tempCanvas.toDataURL('image/svg+xml');
-                const base64Data = svgDataUrl.split(',')[1];
-                const binaryStringLength = base64Data.length;
-                const rawByteSize = binaryStringLength;
-                let fileSize = Math.floor(rawByteSize / 1024); // KB
+            ctx.drawImage(tempCanvas, 0, 0);
+            tempCanvas.toBlob((function (blob) {
+                fileSize = Math.floor(blob.size / 1024);
                 if (fileSize > 1000) {
-                    const megabytes = fileSize / 1024; // Convert to MB
+                    const megabytes = fileSize / 1024;
                     imageNameLabel.innerHTML = this.l10n.getConstant('ImageSize') + ': ' + megabytes.toFixed(2) + ' MB';
                     fileSize = +megabytes.toFixed(2);
                 }
@@ -28210,6 +28206,30 @@ class ToolbarModule {
                     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);
+            const svgDataUrl = tempCanvas.toDataURL('image/svg+xml');
+            const base64Data = svgDataUrl.split(',')[1];
+            const binaryStringLength = base64Data.length;
+            const rawByteSize = binaryStringLength;
+            let fileSize = Math.floor(rawByteSize / 1024); // KB
+            if (fileSize > 1000) {
+                const megabytes = fileSize / 1024; // Convert to MB
+                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;
         }