@syncfusion/ej2-image-editor 24.1.45 → 24.2.3

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

@@ -4889,6 +4889,9 @@ class Draw {
         if (lastDotIndex !== -1) {
             return url.slice(lastDotIndex + 1).toLowerCase();
         }
+        else if (url.indexOf('base64') !== -1) {
+            return url.slice(url.indexOf('/') + 1, url.indexOf(';')).toLowerCase();
+        }
         return null;
     }
     fileSelect(inputElement, args) {
@@ -11560,13 +11563,13 @@ class Selection {
                 if (this.currentDrawingShape === 'text') {
                     const prevCropObj = extend({}, parent.cropObj, {}, true);
                     parent.notify('undo-redo', { prop: 'updateUndoRedoColl', onPropertyChange: false,
-                        value: { operation: 'shapeTransform', previousObj: this.initialPrevObj, previousObjColl: this.initialPrevObj.objColl,
+                        value: { operation: 'shapeInsert', previousObj: this.initialPrevObj, previousObjColl: this.initialPrevObj.objColl,
                             previousPointColl: this.initialPrevObj.pointColl, previousSelPointColl: this.initialPrevObj.selPointColl,
                             previousCropObj: prevCropObj, previousText: null,
                             currentText: null, previousFilter: null, isCircleCrop: null } });
                 }
                 else {
-                    parent.notify('undo-redo', { prop: 'updateUrObj', onPropertyChange: false, value: { objColl: this.initialPrevObj.objColl } });
+                    parent.notify('undo-redo', { prop: 'updateUrObj', onPropertyChange: false, value: { objColl: this.initialPrevObj.objColl, operation: 'shapeInsert' } });
                 }
                 this.isShapeInserted = true;
                 this.currentDrawingShape = '';
@@ -12414,8 +12417,8 @@ class Selection {
         actPoint.height = height;
         actPoint.startX = (this.dragPoint.startX = (originalWidth - width) / 2) + arcRadius;
         actPoint.startY = (this.dragPoint.startY = (originalHeight - height) / 2) + arcRadius;
-        actPoint.endX = ((originalWidth - width) / 2 + width) - arcRadius;
-        actPoint.endY = ((originalHeight - height) / 2 + height) - arcRadius;
+        actPoint.endX = actPoint.startX + actPoint.width;
+        actPoint.endY = actPoint.startY + actPoint.height;
         if (actPoint.startX < destLeft && destLeft + destWidth > parent.lowerCanvas.clientWidth) {
             actPoint.startX = destLeft;
             actPoint.endX = actPoint.startX + width - arcRadius;
@@ -12899,7 +12902,9 @@ class Selection {
         }
         if (!isInside) {
             if (isNullOrUndefined(parent.activeObj.currIndex)) {
-                parent.activeObj.currIndex = 'shape_' + (parent.objColl.length + 1);
+                const shapeIDObj = { id: 'shape_' + (parent.objColl.length + 1) };
+                parent.notify('shape', { prop: 'getNewShapeId', onPropertyChange: false, value: { obj: shapeIDObj } });
+                parent.activeObj.currIndex = shapeIDObj['id'];
             }
             parent.notify('shape', { prop: 'updImgRatioForActObj', onPropertyChange: false });
             if (parent.activeObj.horTopLine !== undefined && parent.activeObj.horTopLine.startX !== 0 && parent.activeObj.horTopLine.endX
@@ -13522,6 +13527,9 @@ class Shape {
             case 'setFlipState':
                 this.setFlipState(args.value['x'], args.value['y'], args.value['obj'], args.value['object']);
                 break;
+            case 'getNewShapeId':
+                args.value['obj']['id'] = this.getNewShapeId();
+                break;
         }
     }
     getModuleName() {
@@ -13720,7 +13728,7 @@ class Shape {
                             parent.notify('selection', { prop: 'isShapeInserted', onPropertyChange: false, value: { bool: true } });
                             parent.notify('undo-redo', { prop: 'updateUrObj', onPropertyChange: false, value: { objColl: objColl } });
                             if (parent.isPublicMethod) {
-                                parent.notify('undo-redo', { prop: 'updateUndoRedo', onPropertyChange: false });
+                                parent.notify('undo-redo', { prop: 'updateUndoRedo', value: { operation: 'shapeInsert' }, onPropertyChange: false });
                             }
                             parent.isPublicMethod = false;
                         });
@@ -13746,7 +13754,7 @@ class Shape {
                                 isApplyBtn: null, isCropping: null, isZooming: null, cType: null } });
                         parent.notify('toolbar', { prop: 'update-toolbar-items', onPropertyChange: false });
                         if (parent.isPublicMethod) {
-                            parent.notify('undo-redo', { prop: 'updateUndoRedo', onPropertyChange: false });
+                            parent.notify('undo-redo', { prop: 'updateUndoRedo', value: { operation: 'shapeInsert' }, onPropertyChange: false });
                         }
                         parent.isPublicMethod = false;
                     }
@@ -13843,7 +13851,7 @@ class Shape {
                 parent.dotNetRef.invokeMethodAsync('ShapeEventAsync', 'OnShape', shapeChangingArgs, null).then((shapeChangingArgs) => {
                     this.drawShapeTextEvent(shapeChangingArgs);
                     if (parent.isPublicMethod) {
-                        parent.notify('undo-redo', { prop: 'updateUndoRedo', onPropertyChange: false });
+                        parent.notify('undo-redo', { prop: 'updateUndoRedo', value: { operation: 'shapeInsert' }, onPropertyChange: false });
                     }
                     parent.isPublicMethod = false;
                 });
@@ -13852,7 +13860,7 @@ class Shape {
                 parent.trigger('shapeChanging', shapeChangingArgs);
                 this.drawShapeTextEvent(shapeChangingArgs);
                 if (parent.isPublicMethod) {
-                    parent.notify('undo-redo', { prop: 'updateUndoRedo', onPropertyChange: false });
+                    parent.notify('undo-redo', { prop: 'updateUndoRedo', value: { operation: 'shapeInsert' }, onPropertyChange: false });
                 }
                 parent.isPublicMethod = false;
             }
@@ -13865,7 +13873,7 @@ class Shape {
         parent.objColl.push(parent.activeObj);
         const prevCropObj = extend({}, parent.cropObj, {}, true);
         parent.notify('undo-redo', { prop: 'updateUndoRedoColl', onPropertyChange: false,
-            value: { operation: 'shapeTransform', previousObj: this.prevObj, previousObjColl: this.prevObj.objColl,
+            value: { operation: 'shapeInsert', previousObj: this.prevObj, previousObjColl: this.prevObj.objColl,
                 previousPointColl: this.prevObj.pointColl, previousSelPointColl: this.prevObj.selPointColl, previousCropObj: prevCropObj,
                 previousText: null, currentText: null, previousFilter: null, isCircleCrop: null } });
         parent.notify('selection', { prop: 'redrawShape', onPropertyChange: false,
@@ -13896,7 +13904,7 @@ class Shape {
         parent.objColl.push(parent.activeObj);
         const prevCropObj = extend({}, parent.cropObj, {}, true);
         parent.notify('undo-redo', { prop: 'updateUndoRedoColl', onPropertyChange: false,
-            value: { operation: 'shapeTransform', previousObj: this.prevObj, previousObjColl: this.prevObj.objColl,
+            value: { operation: 'shapeInsert', previousObj: this.prevObj, previousObjColl: this.prevObj.objColl,
                 previousPointColl: this.prevObj.pointColl, previousSelPointColl: this.prevObj.selPointColl,
                 previousCropObj: prevCropObj, previousText: null, currentText: null, previousFilter: null, isCircleCrop: null } });
         parent.notify('selection', { prop: 'redrawShape', onPropertyChange: false,
@@ -13910,6 +13918,7 @@ class Shape {
         parent.notify('selection', { prop: 'isShapeInserted', onPropertyChange: false, value: { bool: true } });
         if (isBlazor()) {
             parent.updateToolbar(parent.element, 'text');
+            parent.getFontSizes();
         }
         else {
             parent.notify('toolbar', { prop: 'refresh-toolbar', onPropertyChange: false, value: { type: 'text',
@@ -15976,7 +15985,7 @@ class Shape {
                 }
                 if (!isActObj) {
                     if (isNullOrUndefined(parent.activeObj.currIndex)) {
-                        parent.activeObj.currIndex = 'shape_' + (parent.objColl.length + 1);
+                        parent.activeObj.currIndex = this.getNewShapeId();
                     }
                     this.updImgRatioForActObj();
                     const splitWords = parent.activeObj.currIndex.split('_');
@@ -16012,6 +16021,17 @@ class Shape {
             }
         }
     }
+    getNewShapeId() {
+        const parent = this.parent;
+        let value = parent.objColl.length + 1;
+        for (let i = 0; i < parent.objColl.length; i++) {
+            if (parent.objColl[i].currIndex === 'shape_' + value) {
+                value++;
+                i = -1;
+            }
+        }
+        return 'shape_' + value;
+    }
     alignTextAreaIntoCanvas() {
         const parent = this.parent;
         const letters = parent.textArea.value;
@@ -16122,6 +16142,7 @@ class Shape {
             case 'text':
                 shapeDetails.text = obj.keyHistory;
                 shapeDetails.fontSize = obj.textSettings.fontSize;
+                shapeDetails.fontFamily = obj.textSettings.fontFamily;
                 shapeDetails.color = obj.strokeSettings.strokeColor;
                 shapeDetails.fontStyle = [];
                 if (obj.textSettings.bold) {
@@ -19123,10 +19144,10 @@ class UndoRedo {
                 this.redo();
                 break;
             case 'updateUrObj':
-                this.updateUrObj(args.value['objColl']);
+                this.updateUrObj(args.value['objColl'], args.value['operation']);
                 break;
             case 'updateUndoRedo':
-                this.updateUndoRedo();
+                this.updateUndoRedo(args.value ? args.value['operation'] : null);
                 break;
             case 'getAppliedUndoRedoColl':
                 args.value['obj']['appliedUndoRedoColl'] = this.appliedUndoRedoColl;
@@ -19393,6 +19414,7 @@ class UndoRedo {
                     case 'invert':
                     case 'sharpen':
                     case 'imageRotate':
+                    case 'shapeInsert':
                         this.shapeTransform(obj.previousObjColl);
                         break;
                     case 'freehanddraw':
@@ -19526,6 +19548,7 @@ class UndoRedo {
                     case 'invert':
                     case 'sharpen':
                     case 'imageRotate':
+                    case 'shapeInsert':
                         this.shapeTransform(obj.currentObjColl);
                         break;
                     case 'freehanddraw':
@@ -19863,6 +19886,37 @@ class UndoRedo {
         }
         parent.notify('filter', { prop: 'setAdjustmentValue', onPropertyChange: false, value: { adjustmentValue: this.lowerContext.filter } });
         parent.currObjType.isCustomCrop = false;
+        if (isBlazor() && parent.events && parent.events.historyChanged.hasDelegate === true) {
+            let imageAction = this.getImageAction(operation);
+            const args = { length: this.undoRedoColl.length, index: this.undoRedoStep, actionTrigger: isUndo ? 'Undo' : 'Redo', imageAction: imageAction };
+            parent.dotNetRef.invokeMethodAsync('OnHistoryChangedAsync', args);
+        }
+    }
+    getImageAction(operation) {
+        if (['brightness', 'contrast', 'saturation', 'opacity', 'blur', 'hue'].indexOf(operation) !== -1) {
+            return 'FinetuneApplied';
+        }
+        else if (['chrome', 'cold', 'warm', 'grayscale', 'blackandwhite', 'sepia', 'invert'].indexOf(operation) !== -1) {
+            return 'FilterApplied';
+        }
+        else if (operation === 'frame') {
+            return 'FrameApplied';
+        }
+        else if (operation === 'resize') {
+            return 'ImageResized';
+        }
+        else if (['deleteFreehandDrawing', 'deleteObj'].indexOf(operation) !== -1) {
+            return 'ShapeDeleted';
+        }
+        else if (operation === 'crop') {
+            return 'Cropped';
+        }
+        else if (['shapeInsert', 'freehanddraw', 'freehand-draw'].indexOf(operation) !== -1) {
+            return 'ShapeInserted';
+        }
+        else {
+            return 'ShapeCustomized';
+        }
     }
     updateUrc(operation, previousObj, previousObjColl, previousPointColl, previousSelPointColl, previousCropObj, previousText, currentText, previousFilter, isCircleCrop) {
         const parent = this.parent;
@@ -19930,7 +19984,7 @@ class UndoRedo {
             }
         }
     }
-    updateUrObj(objColl) {
+    updateUrObj(objColl, operation) {
         const parent = this.parent;
         if (parent.allowUndoRedo) {
             if (parent.currObjType.isUndoAction) {
@@ -19951,7 +20005,8 @@ class UndoRedo {
             parent.notify('freehand-draw', { prop: 'getSelPointColl', onPropertyChange: false,
                 value: { obj: selPointCollObj } });
             obj.selPointColl = extend([], selPointCollObj['selPointColl'], [], true);
-            this.undoRedoColl.push({ operation: 'shapeTransform', previousObj: obj, currentObj: obj,
+            let oper = operation ? operation : 'shapeTransform';
+            this.undoRedoColl.push({ operation: oper, previousObj: obj, currentObj: obj,
                 previousObjColl: objColl, currentObjColl: obj.objColl,
                 previousPointColl: obj.pointColl, currentPointColl: obj.pointColl,
                 previousSelPointColl: obj.selPointColl, currentSelPointColl: obj.selPointColl,
@@ -19960,7 +20015,7 @@ class UndoRedo {
                 value: { obj: parent.objColl[parent.objColl.length - 1] } });
         }
     }
-    updateUndoRedo() {
+    updateUndoRedo(operation) {
         const parent = this.parent;
         const prevCropObj = extend({}, parent.cropObj, {}, true);
         const object = { currObj: {} };
@@ -19977,7 +20032,8 @@ class UndoRedo {
             parent.notify('shape', { prop: 'updImgRatioForActObj', onPropertyChange: false });
         }
         parent.objColl.push(parent.activeObj);
-        this.updateUrc('shapeTransform', prevObj, prevObj.objColl, prevObj.pointColl, prevObj.selPointColl, prevCropObj);
+        let oper = operation ? operation : 'shapeTransform';
+        this.updateUrc(oper, prevObj, prevObj.objColl, prevObj.pointColl, prevObj.selPointColl, prevCropObj);
         parent.objColl.pop();
         parent.notify('shape', { prop: 'applyActObj', onPropertyChange: false, value: { isMouseDown: null } });
         parent.notify('shape', { prop: 'refreshActiveObj', onPropertyChange: false });
@@ -21261,6 +21317,7 @@ let ImageEditor = ImageEditor_1 = class ImageEditor extends Component {
      *
      */
     zoom(zoomFactor, zoomPoint) {
+        this.isZoomBtnClick = true;
         this.notify('transform', { prop: 'zoom', onPropertyChange: false,
             value: { zoomFactor: zoomFactor, zoomPoint: zoomPoint } });
         this.notify('draw', { prop: 'redrawDownScale' });