@syncfusion/ej2-image-editor 27.1.48 → 27.1.51

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

@@ -1992,7 +1992,7 @@ class Draw {
                 }
                 this.drawArrowHead(canvasDraw, true);
                 this.drawArrowHead(canvasDraw, false);
-                if (actObj.end === 'none') {
+                if (actObj.end === 'none' && actObj.start !== 'circle' && actObj.start !== 'square') {
                     this.shapeLine(canvasDraw, actPoint.startX, actPoint.startY, actPoint.endX, actPoint.endY);
                 }
                 canvasDraw.fillStyle = tempFillStyle;
@@ -2396,9 +2396,10 @@ class Draw {
         const isStartArrow = actObj.start === 'arrow';
         const isEndArrow = actObj.end === 'arrow';
         const isEndCircleOrSquare = actObj.end === 'circle' || actObj.end === 'square';
+        const isStartCircleOrSquare = actObj.start === 'circle' || actObj.start === 'square';
         if ((start && actObj.triangleDirection === 'left' || actObj.triangleDirection === 'right') &&
-            ((isStartArrow && actObj.end === 'none') || (isStartArrow && !isEndCircleOrSquare)) ||
-            (!start && (isEndArrow && actObj.start === 'none' || !isStartArrow && !isEndCircleOrSquare))) {
+            ((isStartArrow && actObj.end === 'none') || (isStartArrow && !isEndCircleOrSquare && !isStartCircleOrSquare)) ||
+            (!start && (isEndArrow && actObj.start === 'none' || !isStartArrow && !isEndCircleOrSquare && !isStartCircleOrSquare))) {
             this.shapeLine(canvasDraw, startX, startY, endX, endY);
         }
         if ((start && actObj.triangleDirection === 'left') || (!start && actObj.triangleDirection === 'right')) {
@@ -2433,9 +2434,10 @@ class Draw {
         const angle = Math.atan2(this.dy, this.dx);
         const isStartArrowSolid = actObj.start === 'arrowSolid';
         const isEndArrowSolid = actObj.end === 'arrowSolid';
+        const isStartCircleOrSquare = actObj.start === 'circle' || actObj.start === 'square';
         const isEndCircleOrSquare = actObj.end === 'circle' || actObj.end === 'square';
-        if ((start && (isStartArrowSolid && actObj.end === 'none') || (isStartArrowSolid && !isEndCircleOrSquare)) ||
-            (!start && (isEndArrowSolid && actObj.start === 'none' || !isStartArrowSolid && !isEndCircleOrSquare))) {
+        if ((start && (isStartArrowSolid && actObj.end === 'none') || (isStartArrowSolid && !isEndCircleOrSquare && !isStartCircleOrSquare)) ||
+            (!start && (isEndArrowSolid && actObj.start === 'none' || !isStartArrowSolid && !isEndCircleOrSquare && !isStartCircleOrSquare))) {
             this.shapeLine(canvasDraw, startX, startY, endX, endY);
         }
         if ((start && actObj.triangleDirection === 'left') || (!start && actObj.triangleDirection === 'right')) {
@@ -3433,11 +3435,19 @@ class Draw {
                 parent.notify('filter', { prop: 'update-finetunes', onPropertyChange: false });
             }
             proxy.lowerContext.drawImage(parent.baseImg, 0, 0, proxy.parent.lowerCanvas.width, proxy.parent.lowerCanvas.height);
+            let isCropped = false;
+            let isSameDimension = false;
+            if (parent.isImageUpdated) {
+                const { srcWidth, srcHeight } = parent.img;
+                const { width, height } = parent.baseImgCanvas;
+                isCropped = srcWidth !== width || srcHeight !== height;
+                isSameDimension = parent.baseImg.width === width && parent.baseImg.height === height;
+            }
             hideSpinner(parent.element);
             parent.element.style.opacity = '1';
             proxy.updateBaseImgCanvas();
             const fileOpened = { fileName: this.fileName, fileType: this.fileType, isValidImage: true };
-            proxy.updateCanvas();
+            proxy.updateCanvas(isCropped, isSameDimension);
             if (parent.currObjType.isUndoZoom) {
                 parent.currObjType.isUndoZoom = false;
                 proxy.parent.lowerCanvas.style.display = 'block';
@@ -3479,12 +3489,26 @@ class Draw {
         parent.baseImgCanvas.height = parent.baseImg.height;
         parent.baseImgCanvas.getContext('2d').drawImage(parent.baseImg, 0, 0);
     }
-    updateCanvas() {
+    updateCanvas(isCropped, isSameDimension) {
         const parent = this.parent;
-        if (!parent.isImageUpdated) {
+        if (!parent.isImageUpdated || !isCropped) {
             parent.img.srcWidth = parent.baseImgCanvas.width;
             parent.img.srcHeight = parent.baseImgCanvas.height;
         }
+        else if (!isSameDimension && isCropped) {
+            parent.img.srcLeft = 0;
+            parent.img.srcTop = 0;
+            parent.img.srcWidth = parent.baseImgCanvas.width;
+            parent.img.srcHeight = parent.baseImgCanvas.height;
+            parent.currSelectionPoint = null;
+            parent.cropObj = { cropZoom: 0, defaultZoom: 0, totalPannedPoint: { x: 0, y: 0 }, totalPannedClientPoint: { x: 0, y: 0 },
+                totalPannedInternalPoint: { x: 0, y: 0 }, tempFlipPanPoint: { x: 0, y: 0 }, activeObj: {}, rotateFlipColl: [],
+                degree: 0, currFlipState: '', straighten: 0, destPoints: { startX: 0, startY: 0, width: 0, height: 0 },
+                srcPoints: { startX: 0, startY: 0, width: 0, height: 0 }, filter: '', isBrightAdjust: false,
+                zoomFactor: 0, previousZoomValue: 0, aspectWidth: null, aspectHeight: null, frame: 'none', straightenZoom: 0,
+                adjustmentLevel: { brightness: 0, contrast: 0, hue: 0, opacity: 100, saturation: 0, blur: 0,
+                    exposure: 0, transparency: 100, sharpen: false, bw: false }, currentFilter: '' };
+        }
         const obj = { width: 0, height: 0 };
         parent.notify('transform', { prop: 'calcMaxDimension', onPropertyChange: false,
             value: { width: parent.img.srcWidth, height: parent.img.srcHeight, obj: obj, isImgShape: null } });
@@ -8758,6 +8782,9 @@ class Selection {
         this.isSliderActive = false;
         this.arrowShape = [ArrowheadType.None, ArrowheadType.SolidArrow];
         this.isTouchDblClick = false;
+        this.isMouseDown = false;
+        this.isMouseUp = false;
+        this.mouseWheel = 0;
         this.parent = parent;
         this.addEventListener();
     }
@@ -9068,6 +9095,7 @@ class Selection {
         this.isPreventDragging = false;
         this.timer = undefined;
         this.tempObjColl = undefined;
+        this.mouseWheel = 0;
         this.textRow = 1;
         this.mouseDownPoint = { x: 0, y: 0 };
         this.previousPoint = { x: 0, y: 0 };
@@ -9088,6 +9116,7 @@ class Selection {
         this.mouseDown = '';
         this.isSliderActive = false;
         this.arrowShape = [ArrowheadType.None, ArrowheadType.SolidArrow];
+        this.isMouseDown = this.isMouseUp = false;
     }
     performTabAction() {
         const parent = this.parent;
@@ -10086,6 +10115,12 @@ class Selection {
                 parent.notify('shape', { prop: 'updateShapeChangeEventArgs', onPropertyChange: false, value: { shapeSettings: shapeResizingArgs.currentShapeSettings, allowShapeOverflow: shapeResizingArgs.allowShapeOverflow } });
             }
             else {
+                if (this.isMouseDown) {
+                    shapeResizingArgs.action = 'resize-start';
+                }
+                else if (this.isMouseUp) {
+                    shapeResizingArgs.action = 'resize-end';
+                }
                 const selectionResizingArgs = { action: shapeResizingArgs.action,
                     previousSelectionSettings: { type: parent.getSelectionType(parent.activeObj.shape),
                         startX: shapeResizingArgs.previousShapeSettings.startX,
@@ -11878,6 +11913,8 @@ class Selection {
         }
         const imageEditorClickEventArgs = { point: this.setXYPoints(e) };
         parent.trigger('click', imageEditorClickEventArgs);
+        this.isMouseDown = true;
+        this.isMouseUp = false;
         this.clickEvent(imageEditorClickEventArgs, e);
     }
     getImagePoints(x, y) {
@@ -12239,6 +12276,7 @@ class Selection {
                         }
                     }
                     if (type !== '') {
+                        parent.isZoomBtnClick = true;
                         parent.notify('draw', { prop: 'performPointZoom', onPropertyChange: false,
                             value: { x: center.x, y: center.y, type: type, isResize: null } });
                     }
@@ -12321,11 +12359,14 @@ class Selection {
                 this.dragCanvas = parent.togglePan = true;
             }
         }
+        this.isMouseDown = false;
+        this.isMouseUp = false;
     }
     mouseUpEventHandler(e) {
         const parent = this.parent;
         const id = parent.element.id;
-        parent.isKBDNavigation = false;
+        parent.isKBDNavigation = this.isMouseDown = false;
+        this.isMouseUp = true;
         if (!Browser.isDevice && ((parent.element.querySelector('#' + id + '_contextualToolbar') &&
             !parent.element.querySelector('#' + id + '_contextualToolbar').parentElement.classList.contains('e-hide')) ||
             (parent.element.querySelector('#' + id + '_headWrapper')
@@ -12495,6 +12536,11 @@ class Selection {
                         parent.notify('toolbar', { prop: 'destroy-qa-toolbar', onPropertyChange: false });
                     }
                 }
+                else if (isCropSelection && this.isMouseUp && parent.cursor.indexOf('resize') > -1) {
+                    const previousShapeSettings = this.updatePrevShapeSettings();
+                    const shapeResizingArgs = { cancel: false, action: 'resize-end', previousShapeSettings: previousShapeSettings };
+                    this.triggerShapeChange(shapeResizingArgs, shapeResizingArgs, 'resize');
+                }
                 if (parent.activeObj) {
                     let isCropSelection = false;
                     let splitWords;
@@ -12614,6 +12660,7 @@ class Selection {
             parent.isShapeDrawing = false;
             parent.notify('freehand-draw', { prop: 'resetSelPoints', onPropertyChange: false });
         }
+        this.isMouseUp = false;
     }
     adjustActObjForLineArrow(obj) {
         let isAdjusted = false;
@@ -13069,6 +13116,7 @@ class Selection {
             case (e.ctrlKey && '+'):
                 if ((parent.zoomSettings.zoomTrigger & ZoomTrigger.Commands) === ZoomTrigger.Commands) {
                     this.zoomType = 'Commands';
+                    parent.isZoomBtnClick = true;
                     parent.notify('transform', { prop: 'zoomAction', onPropertyChange: false,
                         value: { zoomFactor: .1, zoomPoint: null }, isResize: null });
                     parent.notify('draw', { prop: 'redrawDownScale' });
@@ -13085,6 +13133,7 @@ class Selection {
             case (e.ctrlKey && '-'):
                 if ((parent.zoomSettings.zoomTrigger & ZoomTrigger.Commands) === ZoomTrigger.Commands) {
                     this.zoomType = 'Commands';
+                    parent.isZoomBtnClick = true;
                     parent.notify('transform', { prop: 'zoomAction', onPropertyChange: false,
                         value: { zoomFactor: -.1, zoomPoint: null }, isResize: null });
                     parent.notify('draw', { prop: 'redrawDownScale' });
@@ -13221,6 +13270,11 @@ class Selection {
         e.stopImmediatePropagation();
     }
     handleScroll(e) {
+        this.mouseWheel++;
+        if (this.mouseWheel === 2) {
+            this.mouseWheel = 0;
+            return;
+        }
         const parent = this.parent;
         let x;
         let y;
@@ -13256,6 +13310,7 @@ class Selection {
                 }
             }
             if (type !== '') {
+                parent.isZoomBtnClick = true;
                 parent.notify('draw', { prop: 'performPointZoom', onPropertyChange: false,
                     value: { x: x, y: y, type: type, isResize: null } });
                 parent.notify('draw', { prop: 'redrawDownScale' });
@@ -13620,6 +13675,12 @@ class Selection {
                     parent.editCompleteArgs = shapeChangingArgs;
                 }
                 else {
+                    if (this.isMouseDown) {
+                        shapeChangingArgs.action = 'resize-start';
+                    }
+                    else if (this.isMouseUp) {
+                        shapeChangingArgs.action = 'resize-end';
+                    }
                     const selectionChangingArgs = { action: shapeChangingArgs.action,
                         previousSelectionSettings: { type: parent.getSelectionType(parent.activeObj.shape),
                             startX: shapeChangingArgs.previousShapeSettings.startX,
@@ -14640,6 +14701,10 @@ class Shape {
                     parent.activeObj.opacity = opacity;
                 }
                 strokeSettings.strokeWidth = strokeWidth ? strokeWidth : strokeSettings.strokeWidth;
+                const shape = parent.activeObj.shape;
+                if ((shape === 'rectangle' || shape === 'ellipse') && strokeWidth === 0) {
+                    strokeSettings.strokeWidth = 0;
+                }
                 strokeSettings.strokeColor = strokeColor ? strokeColor : strokeSettings.strokeColor;
                 strokeSettings.fillColor = fillColor ? fillColor : strokeSettings.fillColor;
                 strokeSettings.radius = radius ? radius : strokeSettings.radius;
@@ -21430,13 +21495,23 @@ class UndoRedo {
     updateObjColl() {
         const parent = this.parent;
         for (let i = 0; i < parent.objColl.length; i++) {
-            const obj = parent.objColl[i];
+            let obj = parent.objColl[i];
+            let isUpdated = false;
             if (obj.shape === 'line' || obj.shape === 'arrow') {
                 if (obj.activePoint.width < 0) {
                     obj.activePoint.width = Math.abs(obj.activePoint.width);
+                    isUpdated = true;
                 }
                 if (obj.activePoint.height < 0) {
                     obj.activePoint.height = Math.abs(obj.activePoint.height);
+                    isUpdated = true;
+                }
+                if (isUpdated) {
+                    const activeObj = extend({}, parent.activeObj, {}, true);
+                    parent.activeObj = obj;
+                    parent.notify('shape', { prop: 'updImgRatioForActObj', onPropertyChange: false });
+                    obj = parent.activeObj;
+                    parent.activeObj = activeObj;
                 }
             }
         }
@@ -22186,6 +22261,8 @@ let ImageEditor = ImageEditor_1 = class ImageEditor extends Component {
         this.notify('toolbar', { prop: 'getLocaleText', onPropertyChange: false, value: { obj: browseObj } });
         const supportObj = { key: 'SupportText' };
         this.notify('toolbar', { prop: 'getLocaleText', onPropertyChange: false, value: { obj: supportObj } });
+        const andObj = { key: 'And' };
+        this.notify('toolbar', { prop: 'getLocaleText', onPropertyChange: false, value: { obj: andObj } });
         const dropAreaElement = this.createElement('div', { id: this.element.id + '_dropArea', className: 'e-ie-drop-area', attrs: { style: 'position: relative;' } });
         const dropIconElement = this.createElement('span', { className: 'e-ie-drop-icon e-icons e-image', attrs: { style: 'position: absolute;' } });
         const dropContentElement = this.createElement('span', { className: 'e-ie-drop-content', attrs: { style: 'position: absolute; display: none;' } });
@@ -22201,7 +22278,7 @@ let ImageEditor = ImageEditor_1 = class ImageEditor extends Component {
         dropAnchorElement.href = '';
         minDropAnchorElem.href = '';
         const dropInfoElement = this.createElement('span', { className: 'e-ie-drop-info', attrs: { position: 'absolute' } });
-        dropInfoElement.textContent = supportObj['value'] + ' SVG, PNG, and JPG';
+        dropInfoElement.textContent = supportObj['value'] + ' SVG, PNG, ' + andObj['value'] + ' JPG';
         const dropUploader = dropAreaElement.appendChild(this.createElement('input', {
             id: this.element.id + '_dropfileUpload', className: 'e-fileUpload e-image-upload'
         }));
@@ -22445,7 +22522,7 @@ let ImageEditor = ImageEditor_1 = class ImageEditor extends Component {
             this.notify('draw', { prop: 'open', value: { data: data } });
         }
         else {
-            this.updateImage(data, imageSettings.backgroundColor);
+            this.updateImage(data, imageSettings ? imageSettings.backgroundColor : null);
         }
     }
     /**
@@ -23670,7 +23747,7 @@ let ImageEditor = ImageEditor_1 = class ImageEditor extends Component {
         }
     }
     updateImage(data, imageBackgroundColor) {
-        if (data || imageBackgroundColor) {
+        if (data || imageBackgroundColor || imageBackgroundColor === '') {
             const prevCropObj = extend({}, this.cropObj, {}, true);
             const object = { currObj: {} };
             this.notify('filter', { prop: 'getCurrentObj', onPropertyChange: false, value: { object: object } });
@@ -23712,7 +23789,7 @@ let ImageEditor = ImageEditor_1 = class ImageEditor extends Component {
                     }
                 }, 100);
             }
-            if (imageBackgroundColor) {
+            if (imageBackgroundColor || imageBackgroundColor === '') {
                 this.notify('draw', { prop: 'imageBackgroundColor', onPropertyChange: false, value: { color: imageBackgroundColor } });
                 this.notify('draw', { prop: 'render-image', value: { isMouseWheel: false } });
                 if (!data) {
@@ -26419,7 +26496,8 @@ class ToolbarModule {
             BorderRadius: 'Border Radius',
             TextOutlineColor: 'Outline Color',
             TextOutlineWidth: 'Outline Width',
-            PixelSize: 'Pixel Size'
+            PixelSize: 'Pixel Size',
+            And: 'and'
         };
         this.l10n = new L10n('image-editor', this.defaultLocale, this.parent.locale);
     }
@@ -27084,13 +27162,11 @@ class ToolbarModule {
             zoomIn.addEventListener('mousedown', this.zoomInBtnMouseDownHandler.bind(this));
             zoomIn.addEventListener('mouseup', this.zoomBtnMouseUpHandler.bind(this));
             zoomIn.addEventListener('click', this.zoomInBtnClickHandler.bind(this));
-            zoomIn.addEventListener('touchstart', this.zoomInBtnClickHandler.bind(this));
         }
         if (zoomOut) {
             zoomOut.addEventListener('mousedown', this.zoomOutBtnMouseDownHandler.bind(this));
             zoomOut.addEventListener('mouseup', this.zoomBtnMouseUpHandler.bind(this));
             zoomOut.addEventListener('click', this.zoomOutBtnClickHandler.bind(this));
-            zoomIn.addEventListener('touchstart', this.zoomInBtnClickHandler.bind(this));
         }
     }
     widthPress(e) {
@@ -27604,6 +27680,9 @@ class ToolbarModule {
                 zOrderElement.classList.remove('e-overlay');
             }
         }
+        if (zOrderElement && (parent.shapeColl.length === 0 || (obj['freehandDrawSelectedId'] && parent.shapeColl.length === 1))) {
+            zOrderElement.classList.add('e-overlay');
+        }
     }
     renderStraightenSlider() {
         const parent = this.parent;
@@ -28068,11 +28147,11 @@ class ToolbarModule {
                 fileSize = Math.floor(blob.size / 1024);
                 if (fileSize > 1000) {
                     const megabytes = fileSize / 1024;
-                    imageNameLabel.innerHTML = 'Image size: ' + megabytes.toFixed(2) + ' MB';
+                    imageNameLabel.innerHTML = this.l10n.getConstant('ImageSize') + ': ' + megabytes.toFixed(2) + ' MB';
                     fileSize = +megabytes.toFixed(2);
                 }
                 else {
-                    imageNameLabel.innerHTML = 'Image size: ' + fileSize.toFixed(2) + ' KB';
+                    imageNameLabel.innerHTML = this.l10n.getConstant('ImageSize') + ': ' + fileSize.toFixed(2) + ' KB';
                     fileSize = +fileSize.toFixed(2);
                 }
                 if (Browser.isDevice) {
@@ -28090,6 +28169,50 @@ class ToolbarModule {
                 this.fileSize = fileSize;
             }).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
+                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);
+                }
+            }
+            this.fileSize = fileSize;
+        }
         else {
             if (Browser.isDevice) {
                 canvas.style.display = 'none';
@@ -31610,6 +31733,7 @@ class ToolbarModule {
                     parent.notify('draw', { prop: 'render-image', value: { isMouseWheel: null, isPreventClearRect: null, isFrame: true } });
                     parent.isFrameBtnClick = true;
                     parent.curFrameObjEvent = { previousFrameSetting: parent.tempFrameObj, currentFrameSetting: parent.frameObj };
+                    parent.notify('draw', { prop: 'triggerFrameChange', value: { prevFrameSettings: parent.tempFrameObj, obj: { frameChangeEventArgs: null } } });
                     break;
                 case 'redact':
                     parent.currObjType.isRedact = true;
@@ -31736,6 +31860,7 @@ class ToolbarModule {
                 parent.img.destTop += (parent.cxtTbarHeight / 2);
             }
             this.callFrameToolbar();
+            parent.notify('draw', { prop: 'triggerFrameChange', value: { prevFrameSettings: parent.frameObj, obj: { frameChangeEventArgs: null } } });
         }
     }
     zoomToFrameRange() {