@syncfusion/ej2-image-editor 31.1.17 → 31.1.22

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

@@ -6379,8 +6379,12 @@ class Export {
             type = type ? type : 'Png';
             parent.notify('shape', { prop: 'redrawActObj', onPropertyChange: false,
                 value: { x: null, y: null, isMouseDown: null } });
+            const imageQualityObj = { currentImageQuality: 1 };
+            if (type.toLowerCase() === 'jpeg') {
+                parent.notify('toolbar', { prop: 'getcurrentImageQuality', onPropertyChange: false, value: { obj: imageQualityObj } });
+            }
             const beforeSave = { cancel: false, fileName: fileName ? fileName : imageName,
-                fileType: type, imageQuality: imgQuality };
+                fileType: type, imageQuality: imgQuality || imageQualityObj['currentImageQuality'] };
             parent.trigger('beforeSave', beforeSave);
             this.beforeSaveEvent(beforeSave, type, fileName, imageName, imgQuality);
         }
@@ -6396,7 +6400,7 @@ class Export {
                 this.toSVGImg(fileName);
             }
             else {
-                this.toBlobFn(fileName, lowerCaseType, imgQuality);
+                this.toBlobFn(fileName, lowerCaseType, observableSaveArgs.imageQuality || imgQuality);
             }
             const saved = { fileName: fileName ? fileName : imageName, fileType: type };
             parent.trigger('saved', saved);
@@ -7867,6 +7871,15 @@ class FreehandDrawing {
             case 'resetFreehandDrawSelectedId':
                 this.fhdSelID = null;
                 break;
+            case 'getFHDSelected':
+                args.value['obj']['isSelected'] = (this.parent.pointColl[this.fhdSelIdx] && this.parent.pointColl[this.fhdSelIdx].isSelected) ? this.parent.pointColl[this.fhdSelIdx].isSelected : false;
+                break;
+            case 'resetFHDIdx':
+                this.fhdHovIdx = this.fhdSelID = this.fhdSelIdx = null;
+                break;
+            case 'getHighestOrder':
+                this.getHighestOrder();
+                break;
             case 'getTempFreeHandDrawEditingStyles':
                 args.value['obj']['tempFreeHandDrawEditingStyles'] = this.tempFHDStyles;
                 break;
@@ -8049,10 +8062,11 @@ class FreehandDrawing {
         parent.notify('freehand-draw', { prop: 'getSelPointColl', onPropertyChange: false, value: { obj: selPointCollObj } });
         prevObj.selPointColl = extend([], selPointCollObj['selPointColl'], [], true);
         const fhCnt = parent.freehandCounter;
-        const order = parent.objColl.length + parent.freehandCounter + 1;
+        const penIndex = this.getHighestOrder();
+        const order = parent.objColl.length + penIndex + 1;
         parent.pointColl[fhCnt] = { points: extend([], parent.points), strokeColor: parent.activeObj.strokeSettings.strokeColor,
             strokeWidth: this.penStrokeWidth, flipState: parent.transform.currFlipState,
-            id: 'pen_' + (this.currFHDIdx + 1), order: order };
+            id: 'pen_' + (penIndex + 1), order: order };
         parent.points = [];
         this.dummyPoints = [];
         this.selPointColl[fhCnt] = { points: extend([], this.selPoints) };
@@ -8067,7 +8081,7 @@ class FreehandDrawing {
                     previousCropObj: prevCropObj, previousText: null,
                     currentText: null, previousFilter: null, isCircleCrop: null } });
         }
-        const shapeSettings = { id: 'pen_' + (this.currFHDIdx + 1), type: ShapeType.FreehandDraw,
+        const shapeSettings = { id: 'pen_' + (penIndex + 1), type: ShapeType.FreehandDraw,
             startX: this.freehandDownPoint.x, startY: this.freehandDownPoint.y,
             strokeColor: parent.activeObj.strokeSettings.strokeColor, strokeWidth: this.penStrokeWidth,
             points: parent.pointColl[this.currFHDIdx].points, index: order };
@@ -8076,6 +8090,17 @@ class FreehandDrawing {
         this.triggerShapeChanging(shapeChangingArgs);
         this.currFHDIdx++;
     }
+    getHighestOrder() {
+        const parent = this.parent;
+        let index = 0;
+        for (let i = 0; i < parent.pointColl.length; i++) {
+            const value = parseInt(parent.pointColl[i].id.split('_')[1], 10);
+            if (index < value) {
+                index = value;
+            }
+        }
+        return index;
+    }
     freehandMoveHandler(e) {
         this.isFreehandPointMoved = true;
         const rect = this.parent.upperCanvas.getBoundingClientRect();
@@ -8464,6 +8489,7 @@ class FreehandDrawing {
             }
             parent.freehandCounter -= 1;
             this.fhdHovIdx = this.fhdSelIdx = null;
+            this.currFHDIdx--;
             parent.notify('selection', { prop: 'resetFreehandDrawVariables' });
             parent.notify('draw', { prop: 'render-image', value: { isMouseWheel: null } });
             parent.notify('toolbar', { prop: 'refresh-main-toolbar', onPropertyChange: false });
@@ -8860,6 +8886,11 @@ class FreehandDrawing {
         const parent = this.parent;
         const point = parent.pointColl[this.fhdSelIdx];
         parent.trigger('shapeChanging', shapeChangingArgs);
+        if (shapeChangingArgs.cancel) {
+            parent.editCompleteArgs = shapeChangingArgs;
+            this.cancelFhd();
+            return;
+        }
         if (parent.element.getAttribute('data-value') === 'mask-drawing' && !this.isMasking) {
             this.isMasking = true;
             parent.upperCanvas.style.cursor = 'crosshair';
@@ -12381,6 +12412,9 @@ class Selection {
                 const objColl = extend([], parent.objColl, [], true);
                 if (!isNullOrUndefined(obj['index']) && obj['index'] > -1) {
                     parent.notify('freehand-draw', { prop: 'selectFhd', value: { type: 'ok' } });
+                    if (!this.isFhdPoint) {
+                        return;
+                    }
                     parent.notify('freehand-draw', { prop: 'hoverFhd', onPropertyChange: false,
                         value: { strokeColor: null, strokeWidth: null } });
                     parent.notify('toolbar', { prop: 'renderQAT', onPropertyChange: false, value: { isPenEdit: true } });
@@ -12925,7 +12959,9 @@ class Selection {
                 this.currentDrawingShape = parent.drawingShape.toLowerCase();
                 if (dummyClick) {
                     parent.enableShapeDrawing(parent.toPascalCase(parent.drawingShape), true);
-                    parent.upperCanvas.style.cursor = 'crosshair';
+                    if (parent.cursor !== 'move') {
+                        parent.upperCanvas.style.cursor = 'crosshair';
+                    }
                 }
             }
             parent.isShapeDrawing = false;
@@ -13947,7 +13983,14 @@ class Selection {
                 }
                 if (!this.isCropSelection && parent.activeObj.shape !== 'redact') {
                     parent.trigger('shapeChanging', shapeChangingArgs);
-                    this.shapeEvent(shapeChangingArgs);
+                    if (shapeChangingArgs.cancel) {
+                        parent.objColl.splice(i, 0, temp);
+                        parent.notify('shape', { prop: 'refreshActiveObj', onPropertyChange: false });
+                        parent.notify('draw', { prop: 'render-image', value: { isMouseWheel: null } });
+                    }
+                    else {
+                        this.shapeEvent(shapeChangingArgs);
+                    }
                     parent.editCompleteArgs = shapeChangingArgs;
                 }
                 else {
@@ -21457,6 +21500,12 @@ class UndoRedo {
                 parent.initialAdjustmentValue = this.lowerContext.filter;
                 parent.notify('filter', { prop: 'setBevelFilter', onPropertyChange: false, value: { bevelFilter: this.lowerContext.filter } });
                 const editCompleteArgs = { action: this.getUndoRedoAction(obj.operation) };
+                let isSelected;
+                if (obj.operation === 'freehanddraw' || obj.operation === 'freehand-draw') {
+                    const object = { isSelected: null };
+                    parent.notify('freehand-draw', { prop: 'getFHDSelected', onPropertyChange: false, value: { obj: object } });
+                    isSelected = object['isSelected'];
+                }
                 switch (obj.operation) {
                     case 'shapeTransform':
                     case 'brightness':
@@ -21484,6 +21533,10 @@ class UndoRedo {
                         this.updateFreehandDraw(obj.previousPointColl, obj.previousSelPointColl);
                         parent.notify('freehand-draw', { prop: 'setCurrentFreehandDrawIndex',
                             value: { value: parent.pointColl.length } });
+                        if (isSelected) {
+                            parent.notify('freehand-draw', { prop: 'resetFHDIdx' });
+                            parent.notify('selection', { prop: 'resetFreehandDrawVariables' });
+                        }
                         break;
                     case 'freehanddrawCustomized':
                         this.updateFreehandDrawCustomized(obj.previousObjColl, obj.previousPointColl);
@@ -24343,7 +24396,7 @@ let ImageEditor = ImageEditor_1 = class ImageEditor extends Component {
      * @returns {void}.
      */
     undo() {
-        this.manageActiveAction();
+        this.handlePenActiveState();
         this.notify('undo-redo', { prop: 'undo', onPropertyChange: false });
         this.notify('draw', { prop: 'redrawDownScale' });
     }
@@ -24355,7 +24408,7 @@ let ImageEditor = ImageEditor_1 = class ImageEditor extends Component {
      * @returns {void}.
      */
     redo() {
-        this.manageActiveAction();
+        this.handlePenActiveState();
         this.notify('undo-redo', { prop: 'redo', onPropertyChange: false });
         this.notify('draw', { prop: 'redrawDownScale' });
     }
@@ -27121,6 +27174,13 @@ let ImageEditor = ImageEditor_1 = class ImageEditor extends Component {
         }
         return isRedact;
     }
+    handlePenActiveState() {
+        const freehandDrawObj = { freehandDrawSelectedId: null };
+        this.notify('freehand-draw', { prop: 'getFreehandDrawSelectedId', onPropertyChange: false, value: { obj: freehandDrawObj } });
+        if (isNullOrUndefined(freehandDrawObj['freehandDrawSelectedId'])) {
+            this.manageActiveAction();
+        }
+    }
 };
 __decorate([
     Property('')
@@ -27817,6 +27877,9 @@ class ToolbarModule {
             case 'getToolbarHeight':
                 args.value['obj']['toolbarHeight'] = this.toolbarHeight;
                 break;
+            case 'getcurrentImageQuality':
+                args.value['obj']['currentImageQuality'] = this.currentQuality;
+                break;
             case 'setToolbarHeight':
                 if (isNullOrUndefined(parent.toolbar) || (parent.toolbar && parent.toolbar.length > 0 && parent.toolbar.indexOf('Open') > -1)) {
                     this.toolbarHeight = args.value['height'];