@syncfusion/ej2-image-editor 27.1.52 → 27.1.57

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;
@@ -6032,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;
@@ -6044,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') {
@@ -13262,10 +13292,6 @@ class Selection {
     }
     handleScroll(e) {
         this.mouseWheel++;
-        if (this.mouseWheel === 2) {
-            this.mouseWheel = 0;
-            return;
-        }
         const parent = this.parent;
         let x;
         let y;
@@ -13282,6 +13308,13 @@ class Selection {
             y < parent.img.destTop + parent.img.destHeight) {
             isInsideCanvas = true;
         }
+        if (this.mouseWheel === 2) {
+            this.mouseWheel = 0;
+            if (e.ctrlKey === true && isInsideCanvas) {
+                e.preventDefault();
+            }
+            return;
+        }
         e.stopPropagation();
         if (e.ctrlKey === true && isInsideCanvas) {
             e.preventDefault();
@@ -14649,7 +14682,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') {
@@ -14697,7 +14731,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;
@@ -22157,7 +22191,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'],