@syncfusion/ej2-image-editor 25.1.37 → 25.1.39

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

@@ -7023,6 +7023,9 @@ class FreehandDrawing {
             case 'reset':
                 this.reset();
                 break;
+            case 'triggerShapeChanging':
+                this.triggerShapeChanging(args.value['shapeChangingArgs']);
+                break;
         }
     }
     updateFhdPvtVar() {
@@ -14971,6 +14974,7 @@ class Shape {
         const shapeChangingArgs = { cancel: false, action: 'insert', previousShapeSettings: shapeSettings,
             currentShapeSettings: shapeSettings };
         parent.trigger('shapeChanging', shapeChangingArgs);
+        isSelect = isSelect ? isSelect : isSelected;
         this.drawShapeImageEvent(shapeChangingArgs, isSelect);
         if (parent.isPublicMethod && !isSelected) {
             parent.notify('undo-redo', { prop: 'updateUndoRedo', onPropertyChange: false });
@@ -16256,7 +16260,7 @@ class Transform {
                 this.resetZoom();
                 break;
             case 'pan':
-                this.pan(args.value['value']);
+                this.pan(args.value['value'], args.value['x'], args.value['y']);
                 break;
             case 'zoom':
                 this.zoom(args.value['zoomFactor'], args.value['zoomPoint']);
@@ -17269,12 +17273,12 @@ class Transform {
         parent.notify('selection', { prop: 'getPanDown', onPropertyChange: false, value: { obj: obj } });
         const panEventArgs = { startPoint: obj['panDown'], endPoint: this.panMove, cancel: false };
         parent.trigger('panning', panEventArgs);
-        this.panEvent(panEventArgs, xDiff, yDiff);
-    }
-    panEvent(panEventArgs, xDiff, yDiff) {
         if (panEventArgs.cancel) {
             return;
         }
+        this.panEvent(xDiff, yDiff);
+    }
+    panEvent(xDiff, yDiff, isPanMethod) {
         const parent = this.parent;
         let isObjCreated = false;
         if (parent.activeObj.shape && parent.activeObj.shape === 'shape') {
@@ -17312,8 +17316,13 @@ class Transform {
         }
         if (parent.transform.degree === 0) {
             let point;
-            if (isNullOrUndefined(xDiff) && isNullOrUndefined(yDiff)) {
-                point = this.updatePanPoints();
+            if ((isNullOrUndefined(xDiff) && isNullOrUndefined(yDiff)) || isPanMethod) {
+                if (isPanMethod) {
+                    point = this.updatePanPoints(xDiff, yDiff);
+                }
+                else {
+                    point = this.updatePanPoints();
+                }
             }
             else {
                 point = { x: xDiff, y: yDiff };
@@ -17334,8 +17343,13 @@ class Transform {
         else {
             const tempFlipState = parent.transform.currFlipState;
             parent.isCropTab = true;
-            if (isNullOrUndefined(xDiff) && isNullOrUndefined(yDiff)) {
-                parent.panPoint.currentPannedPoint = this.updatePanPoints();
+            if ((isNullOrUndefined(xDiff) && isNullOrUndefined(yDiff)) || isPanMethod) {
+                if (isPanMethod) {
+                    parent.panPoint.currentPannedPoint = this.updatePanPoints(xDiff, yDiff);
+                }
+                else {
+                    parent.panPoint.currentPannedPoint = this.updatePanPoints();
+                }
             }
             else {
                 parent.panPoint.currentPannedPoint = { x: xDiff, y: yDiff };
@@ -17622,7 +17636,7 @@ class Transform {
         parent.notify('draw', { prop: 'updateActiveObject', onPropertyChange: false, value: { actPoint: actPoint,
                 obj: parent.activeObj, isMouseMove: null, x: null, y: null } });
     }
-    pan(value) {
+    pan(value, x, y) {
         const parent = this.parent;
         if (!parent.disabled && parent.isImageLoaded) {
             if (value) {
@@ -17632,6 +17646,18 @@ class Transform {
                 parent.notify('selection', { prop: 'setDragCanvas', value: { bool: true } });
                 parent.lowerCanvas.style.cursor = parent.upperCanvas.style.cursor = parent.cursor = 'grab';
                 parent.notify('selection', { prop: 'setPanDown', onPropertyChange: false, value: { panDown: null } });
+                if (x || y) {
+                    x = x ? x : 0;
+                    y = y ? y : 0;
+                    if (isNullOrUndefined(this.panMove)) {
+                        this.panMove = { x: x, y: y };
+                    }
+                    if (isNullOrUndefined(this.tempPanMove)) {
+                        this.tempPanMove = { x: this.panMove.x, y: this.panMove.y };
+                    }
+                    this.panEvent(x, y, true);
+                    this.tempPanMove = null;
+                }
             }
             else {
                 parent.togglePan = parent.currObjType.isCustomCrop = false;
@@ -17946,6 +17972,9 @@ class Transform {
             const cxtTbar = parent.element.querySelector('#' + parent.element.id + '_contextualToolbarArea');
             canvasMaxHeight -= cxtTbar ? cxtTbar.clientHeight : 0;
         }
+        if (!isImgShape && parent.element.clientHeight === 0) {
+            canvasMaxHeight = 0;
+        }
         if (isNullOrUndefined(isImgShape)) {
             if (canvasMaxWidth > 30) {
                 canvasMaxWidth -= 30;
@@ -17982,7 +18011,7 @@ class Transform {
         }
         return { width: cssMaxWidth, height: cssMaxHeight };
     }
-    updatePanPoints() {
+    updatePanPoints(x, y) {
         const parent = this.parent;
         const tempActObj = extend({}, parent.activeObj, {}, true);
         const tempDestLeft = parent.img.destLeft;
@@ -17992,6 +18021,10 @@ class Transform {
         }
         let xDiff = this.panMove.x - this.tempPanMove.x;
         let yDiff = this.panMove.y - this.tempPanMove.y;
+        if (x || y) {
+            xDiff = x;
+            yDiff = y;
+        }
         parent.img.destLeft += xDiff;
         parent.img.destTop += yDiff;
         this.limitPan();
@@ -20456,14 +20489,16 @@ let ImageEditor = ImageEditor_1 = class ImageEditor extends Component {
      * Enable or disable a panning on the Image Editor.
      *
      * @param {boolean} value - Specifies a value whether enable or disable panning.
+     * @param {number} x - Optional, Specifies a value to pan the image horizontally.
+     * @param {number} y - Optional, Specifies a value to pan the image vertically.
      *
      * @remarks
      * This option will take into effect once the image's visibility is hidden when zooming an image or selection has been performed.
      *
      * @returns {void}.
      */
-    pan(value) {
-        this.notify('transform', { prop: 'pan', onPropertyChange: false, value: { value: value } });
+    pan(value, x, y) {
+        this.notify('transform', { prop: 'pan', onPropertyChange: false, value: { value: value, x: x, y: y } });
     }
     /**
      * Zoom in or out on a point in the image editor.
@@ -21445,7 +21480,7 @@ let ImageEditor = ImageEditor_1 = class ImageEditor extends Component {
             this.notify('toolbar', { prop: 'destroy-qa-toolbar' });
             this.notify('undo-redo', { prop: 'updateCurrUrc', value: { type: 'ok' } });
         }
-        else if ((this.activeObj.activePoint.width !== 0 && this.activeObj.activePoint.height !== 0) ||
+        else if ((this.activeObj.activePoint.width !== 0 || this.activeObj.activePoint.height !== 0) ||
             (this.activeObj.shape === 'path' && this.activeObj.pointColl.length > 0)) {
             if (this.activeObj.shape === 'image') {
                 this.notify('draw', { prop: 'setImageApply', onPropertyChange: false, value: { bool: true } });
@@ -21606,6 +21641,7 @@ let ImageEditor = ImageEditor_1 = class ImageEditor extends Component {
      * An string which returns the SelectionType.
      */
     getSelectionType(type) {
+        type = type === 'crop-custom' ? 'CropCustom' : type;
         const typeToSelectionType = { 'CropCustom': 'Custom', 'CropSquare': 'Square', 'CropCircle': 'Circle',
             'Crop3:2': '3:2', 'Crop4:3': '4:3', 'Crop5:4': '5:4', 'Crop7:5': '7:5', 'Crop16:9': '16:9',
             'Crop2:3': '2:3', 'Crop3:4': '3:4', 'Crop4:5': '4:5', 'Crop5:7': '5:7', 'Crop9:16': '9:16' };
@@ -24145,6 +24181,10 @@ class ToolbarModule {
             this.parent.showDialogPopup();
         }
     }
+    triggerTbarClickEvent(args) {
+        const clickEvent = { item: args.item, originalEvent: args.event };
+        this.parent.trigger('toolbarItemClicked', clickEvent);
+    }
     renderAnnotationBtn(isContextualToolbar) {
         const parent = this.parent;
         let isCustomized = false;
@@ -24233,6 +24273,7 @@ class ToolbarModule {
                 }
             },
             select: (args) => {
+                this.triggerTbarClickEvent(args);
                 parent.okBtn();
                 let isCropSelection = false;
                 let splitWords;
@@ -24253,6 +24294,9 @@ class ToolbarModule {
                 }
                 const obj = { currentFreehandDrawIndex: null };
                 parent.notify('freehand-draw', { prop: 'getCurrentFreehandDrawIndex', value: { obj: obj } });
+                const prevObj = { shapeSettingsObj: {} };
+                let shapeSettings;
+                let shapeChangingArgs;
                 drpDownBtn.iconCss = 'e-icons ' + this.getCurrentShapeIcon(args.item.id);
                 switch (args.item.id) {
                     case 'pen':
@@ -24260,6 +24304,12 @@ class ToolbarModule {
                         parent.notify('draw', { prop: 'setTempCurrentFreehandDrawIndex', value: { tempCurrentFreehandDrawIndex: obj['currentFreehandDrawIndex'] } });
                         this.currentToolbar = 'pen';
                         parent.freeHandDraw(true);
+                        parent.notify('selection', { prop: 'updatePrevShapeSettings', onPropertyChange: false, value: { obj: prevObj } });
+                        shapeSettings = prevObj['shapeSettingsObj'];
+                        shapeSettings.type = ShapeType.FreehandDraw;
+                        shapeChangingArgs = { cancel: false, action: 'insert', previousShapeSettings: shapeSettings,
+                            currentShapeSettings: shapeSettings };
+                        parent.notify('freehand-draw', { prop: 'triggerShapeChanging', value: { shapeChangingArgs: shapeChangingArgs } });
                         break;
                     case 'text':
                         this.currentToolbar = 'text';
@@ -24269,12 +24319,22 @@ class ToolbarModule {
                         this.currentToolbar = 'shapes';
                         parent.element.querySelector('#' + id + '_fileUpload').click();
                         break;
-                    default:
+                    case 'ellipse':
+                    case 'arrow':
+                    case 'line':
+                    case 'rectangle':
+                    case 'path':
                         this.currentToolbar = 'shapes';
                         this.setInitialShapeSettings(args);
                         parent.notify('selection', { prop: 'annotate', value: { shape: args.item.id } });
                         parent.notify('toolbar', { prop: 'refresh-toolbar', onPropertyChange: false, value: { type: 'shapes',
                                 isApplyBtn: null, isCropping: null, isZooming: null, cType: null } });
+                        parent.notify('selection', { prop: 'updatePrevShapeSettings', onPropertyChange: false, value: { obj: prevObj } });
+                        shapeSettings = prevObj['shapeSettingsObj'];
+                        shapeChangingArgs = { cancel: false, action: 'insert', previousShapeSettings: shapeSettings,
+                            currentShapeSettings: shapeSettings };
+                        parent.trigger('shapeChanging', shapeChangingArgs);
+                        parent.notify('shape', { prop: 'updateShapeChangeEventArgs', value: { shapeSettings: shapeChangingArgs.currentShapeSettings } });
                         break;
                 }
                 this.updateToolbarItems();
@@ -24379,6 +24439,7 @@ class ToolbarModule {
             },
             items: items,
             select: (args) => {
+                this.triggerTbarClickEvent(args);
                 this.cropSelect(args);
                 drpDownBtn.iconCss = 'e-icons ' + this.getCurrentShapeIcon('crop-' + args.item.id);
                 drpDownBtn.content = Browser.isDevice ? null : parent.toPascalCase(args.item.id);
@@ -24413,7 +24474,11 @@ class ToolbarModule {
                     elem.style.display = 'block';
                 }
             },
-            items: items, select: parent.transformSelect.bind(this),
+            items: items,
+            select: (args) => {
+                this.triggerTbarClickEvent(args);
+                parent.transformSelect.bind(this);
+            },
             iconCss: 'e-icons e-transform', cssClass: 'e-image-popup'
         });
         drpDownBtn.appendTo('#' + parent.element.id + '_transformBtn');
@@ -24431,6 +24496,7 @@ class ToolbarModule {
             // Initialize the DropDownButton component.
             const saveDrpDownBtn = new DropDownButton({ items: saveItems, cssClass: 'e-caret-hide e-image-popup', iconCss: 'e-icons e-save',
                 select: (args) => {
+                    this.triggerTbarClickEvent(args);
                     parent.export(args.item.text);
                     parent.isChangesSaved = true;
                     parent.notify('draw', { prop: 'redrawDownScale' });
@@ -24903,6 +24969,7 @@ class ToolbarModule {
                     }
                 },
                 select: (args) => {
+                    this.triggerTbarClickEvent(args);
                     spanElem.textContent = args.item.text;
                     parent.updateStrokeWidth(args.item.id);
                     if (Browser.isDevice) {
@@ -24959,6 +25026,7 @@ class ToolbarModule {
                 }
             },
             select: (args) => {
+                this.triggerTbarClickEvent(args);
                 spanElem.textContent = args.item.text;
                 parent.updateArrow('startArrow', args.item.id);
             }
@@ -25000,6 +25068,7 @@ class ToolbarModule {
                 }
             },
             select: (args) => {
+                this.triggerTbarClickEvent(args);
                 spanElem.textContent = args.item.text;
                 parent.updateArrow('endArrow', args.item.id);
             }
@@ -25236,6 +25305,7 @@ class ToolbarModule {
                     }
                 },
                 select: (args) => {
+                    this.triggerTbarClickEvent(args);
                     spanElem.textContent = args.item.text;
                     if (Browser.isDevice) {
                         spanElem.setAttribute('style', 'font-family:' + args.item.id);
@@ -25264,6 +25334,7 @@ class ToolbarModule {
                     args.element.querySelector('[aria-label *= ' + '"' + activeBtn + '"' + ']').classList.add('e-selected-btn');
                 },
                 select: (args) => {
+                    this.triggerTbarClickEvent(args);
                     fontSizeSpanElem.textContent = args.item.text;
                     parent.updateFontSize(args.item.text);
                 }
@@ -25695,6 +25766,7 @@ class ToolbarModule {
             parent.element.querySelector('.e-template.e-pen-stroke-color').appendChild(parent.createElement('input', {
                 id: id + '_pen_stroke'
             }));
+            const presentVal = parent.activeObj.strokeSettings.strokeColor;
             const penColor = new ColorPicker({
                 modeSwitcher: false, value: '#fff',
                 showButtons: false, mode: 'Palette', cssClass: 'e-pen-color',
@@ -25720,6 +25792,9 @@ class ToolbarModule {
             }, '#' + id + '_penColorBtn');
             penColor.inline = true;
             penColor.value = penColor.getValue(parent.activeObj.strokeSettings.strokeColor, 'rgba');
+            if (penColor.value === 'null') {
+                penColor.value = presentVal;
+            }
             const obj = { tempFreeHandDrawEditingStyles: null };
             parent.notify('freehand-draw', { prop: 'getTempFreeHandDrawEditingStyles', value: { obj: obj } });
             const indexObj = { freehandSelectedIndex: null };
@@ -25768,6 +25843,7 @@ class ToolbarModule {
                     args.element.querySelector('[aria-label = ' + '"' + activeBtn + '"' + ']').classList.add('e-selected-btn');
                 },
                 select: (args) => {
+                    this.triggerTbarClickEvent(args);
                     spanElem.textContent = args.item.text;
                     parent.updatePenStrokeWidth(args.item.id);
                     if (Browser.isDevice) {
@@ -26075,6 +26151,7 @@ class ToolbarModule {
                 }
             },
             select: (args) => {
+                this.triggerTbarClickEvent(args);
                 prevFrameSettings = { type: parent.toPascalCase(parent.frameObj.type), color: parent.frameObj.color,
                     gradientColor: parent.frameObj.gradientColor, size: parent.frameObj.size, inset: parent.frameObj.inset,
                     offset: parent.frameObj.offset, borderRadius: parent.frameObj.radius, frameLineStyle: parent.toPascalCase(parent.frameObj.border),
@@ -26150,6 +26227,7 @@ class ToolbarModule {
                 }
             },
             select: (args) => {
+                this.triggerTbarClickEvent(args);
                 prevFrameSettings = { type: parent.toPascalCase(parent.frameObj.type), color: parent.frameObj.color,
                     gradientColor: parent.frameObj.gradientColor, size: parent.frameObj.size, inset: parent.frameObj.inset,
                     offset: parent.frameObj.offset, borderRadius: parent.frameObj.radius, frameLineStyle: parent.toPascalCase(parent.frameObj.border),
@@ -26225,6 +26303,7 @@ class ToolbarModule {
                 }
             },
             select: (args) => {
+                this.triggerTbarClickEvent(args);
                 prevFrameSettings = { type: parent.toPascalCase(parent.frameObj.type), color: parent.frameObj.color,
                     gradientColor: parent.frameObj.gradientColor, size: parent.frameObj.size, inset: parent.frameObj.inset,
                     offset: parent.frameObj.offset, borderRadius: parent.frameObj.radius, frameLineStyle: parent.toPascalCase(parent.frameObj.border),
@@ -26301,6 +26380,7 @@ class ToolbarModule {
                 }
             },
             select: (args) => {
+                this.triggerTbarClickEvent(args);
                 prevFrameSettings = { type: parent.toPascalCase(parent.frameObj.type), color: parent.frameObj.color,
                     gradientColor: parent.frameObj.gradientColor, size: parent.frameObj.size, inset: parent.frameObj.inset,
                     offset: parent.frameObj.offset, borderRadius: parent.frameObj.radius, frameLineStyle: parent.toPascalCase(parent.frameObj.border),
@@ -26376,6 +26456,7 @@ class ToolbarModule {
                 }
             },
             select: (args) => {
+                this.triggerTbarClickEvent(args);
                 prevFrameSettings = { type: parent.toPascalCase(parent.frameObj.type), color: parent.frameObj.color,
                     gradientColor: parent.frameObj.gradientColor, size: parent.frameObj.size, inset: parent.frameObj.inset,
                     offset: parent.frameObj.offset, borderRadius: parent.frameObj.radius, frameLineStyle: parent.toPascalCase(parent.frameObj.border),
@@ -26449,6 +26530,7 @@ class ToolbarModule {
                 }
             },
             select: (args) => {
+                this.triggerTbarClickEvent(args);
                 prevFrameSettings = { type: parent.toPascalCase(parent.frameObj.type), color: parent.frameObj.color,
                     gradientColor: parent.frameObj.gradientColor, size: parent.frameObj.size, inset: parent.frameObj.inset,
                     offset: parent.frameObj.offset, borderRadius: parent.frameObj.radius, frameLineStyle: parent.toPascalCase(parent.frameObj.border),