@syncfusion/ej2-image-editor 24.1.46 → 24.2.4

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) {
@@ -8299,6 +8302,7 @@ class Selection {
         this.isImageClarity = true;
         this.isPinching = false;
         this.isSliding = false;
+        this.mouseDown = '';
         this.parent = parent;
         this.addEventListener();
     }
@@ -8587,6 +8591,7 @@ class Selection {
         this.currentDrawingShape = '';
         this.initialPrevObj = {};
         this.resizedElement = '';
+        this.mouseDown = '';
     }
     performTabAction() {
         const parent = this.parent;
@@ -11002,6 +11007,8 @@ class Selection {
     }
     mouseDownEventHandler(e) {
         const parent = this.parent;
+        this.mouseDown = e.currentTarget === parent.lowerCanvas || e.currentTarget === parent.upperCanvas ?
+            'canvas' : '';
         if (e.type === 'touchstart') {
             this.isTouch = true;
         }
@@ -11439,6 +11446,10 @@ class Selection {
                 && !parent.element.querySelector('#' + id + '_headWrapper').parentElement.classList.contains('e-hide')))) {
             return;
         }
+        else if (e.currentTarget === document && this.mouseDown === '') {
+            e.stopImmediatePropagation();
+            return;
+        }
         if (e.type === 'touchstart') {
             this.isTouch = false;
         }
@@ -11560,13 +11571,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 = '';
@@ -11698,6 +11709,7 @@ class Selection {
             parent.currObjType.shape = '';
         }
         this.dragElement = '';
+        this.mouseDown = '';
         parent.currObjType.isInitialLine = parent.currObjType.isDragging = false;
         this.selMouseUpEvent();
     }
@@ -13725,7 +13737,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;
                         });
@@ -13751,7 +13763,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;
                     }
@@ -13848,7 +13860,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;
                 });
@@ -13857,7 +13869,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;
             }
@@ -13870,7 +13882,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,
@@ -13901,7 +13913,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,
@@ -19141,10 +19153,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;
@@ -19351,6 +19363,7 @@ class UndoRedo {
     undo() {
         const parent = this.parent;
         this.cancelCropSelection();
+        parent.notify('draw', { prop: 'resetFrameZoom', onPropertyChange: false, value: { isOk: false } });
         if (!parent.disabled && parent.isImageLoaded) {
             if (this.undoRedoStep > 0) {
                 this.refreshToolbarActions();
@@ -19411,6 +19424,7 @@ class UndoRedo {
                     case 'invert':
                     case 'sharpen':
                     case 'imageRotate':
+                    case 'shapeInsert':
                         this.shapeTransform(obj.previousObjColl);
                         break;
                     case 'freehanddraw':
@@ -19488,6 +19502,7 @@ class UndoRedo {
     redo() {
         const parent = this.parent;
         this.cancelCropSelection();
+        parent.notify('draw', { prop: 'resetFrameZoom', onPropertyChange: false, value: { isOk: false } });
         if (!parent.disabled && parent.isImageLoaded) {
             if (this.undoRedoStep < this.appliedUndoRedoColl.length) {
                 this.refreshToolbarActions();
@@ -19544,6 +19559,7 @@ class UndoRedo {
                     case 'invert':
                     case 'sharpen':
                     case 'imageRotate':
+                    case 'shapeInsert':
                         this.shapeTransform(obj.currentObjColl);
                         break;
                     case 'freehanddraw':
@@ -19881,6 +19897,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;
@@ -19948,7 +19995,7 @@ class UndoRedo {
             }
         }
     }
-    updateUrObj(objColl) {
+    updateUrObj(objColl, operation) {
         const parent = this.parent;
         if (parent.allowUndoRedo) {
             if (parent.currObjType.isUndoAction) {
@@ -19969,7 +20016,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,
@@ -19978,7 +20026,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: {} };
@@ -19995,7 +20043,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 });
@@ -25536,7 +25585,13 @@ class ToolbarModule {
         const args = { toolbarType: parent.activeObj.shape ? parent.activeObj.shape : 'shapes',
             toolbarItems: this.defToolbarItems };
         parent.trigger('toolbarUpdating', args);
-        this.defToolbarItems = args.toolbarItems;
+        if (this.isToolbarString(args.toolbarItems)) {
+            items = args.toolbarItems;
+            this.excludeItems(args.toolbarItems);
+        }
+        else {
+            this.defToolbarItems = args.toolbarItems;
+        }
         const toolbar = new Toolbar({
             width: '100%',
             items: this.defToolbarItems,
@@ -25546,8 +25601,12 @@ class ToolbarModule {
                 this.createShapeColor(items);
                 this.createShapeBtn(items);
                 if (parent.activeObj.shape === 'arrow') {
-                    this.createStartBtn();
-                    this.createEndBtn();
+                    if (items.some(item => item.toLowerCase().indexOf('start') > -1)) {
+                        this.createStartBtn();
+                    }
+                    if (items.some(item => item.toLowerCase().indexOf('end') > -1)) {
+                        this.createEndBtn();
+                    }
                 }
                 this.wireZoomBtnEvents();
                 if (!Browser.isDevice) {
@@ -25710,24 +25769,24 @@ class ToolbarModule {
     createShapeBtn(items) {
         const parent = this.parent;
         const id = parent.element.id;
-        let strokeWidthItems = [
-            { id: '1', text: this.l10n.getConstant('XSmall') },
-            { id: '2', text: this.l10n.getConstant('Small') },
-            { id: '3', text: this.l10n.getConstant('Medium') },
-            { id: '4', text: this.l10n.getConstant('Large') },
-            { id: '5', text: this.l10n.getConstant('XLarge') }
-        ];
-        if (parent.activeObj.shape && (parent.activeObj.shape === 'rectangle' || parent.activeObj.shape === 'ellipse')) {
-            strokeWidthItems = [
-                { id: '1', text: this.l10n.getConstant('NoOutline') },
-                { id: '2', text: this.l10n.getConstant('XSmall') },
-                { id: '3', text: this.l10n.getConstant('Small') },
-                { id: '4', text: this.l10n.getConstant('Medium') },
-                { id: '5', text: this.l10n.getConstant('Large') },
-                { id: '6', text: this.l10n.getConstant('XLarge') }
-            ];
-        }
         if (items.indexOf('strokeWidth') > -1) {
+            let strokeWidthItems = [
+                { id: '1', text: this.l10n.getConstant('XSmall') },
+                { id: '2', text: this.l10n.getConstant('Small') },
+                { id: '3', text: this.l10n.getConstant('Medium') },
+                { id: '4', text: this.l10n.getConstant('Large') },
+                { id: '5', text: this.l10n.getConstant('XLarge') }
+            ];
+            if (parent.activeObj.shape && (parent.activeObj.shape === 'rectangle' || parent.activeObj.shape === 'ellipse')) {
+                strokeWidthItems = [
+                    { id: '1', text: this.l10n.getConstant('NoOutline') },
+                    { id: '2', text: this.l10n.getConstant('XSmall') },
+                    { id: '3', text: this.l10n.getConstant('Small') },
+                    { id: '4', text: this.l10n.getConstant('Medium') },
+                    { id: '5', text: this.l10n.getConstant('Large') },
+                    { id: '6', text: this.l10n.getConstant('XLarge') }
+                ];
+            }
             const strokeWidthBtn = document.getElementById(id + '_borderWidthBtn');
             const spanElem = document.createElement('span');
             spanElem.innerHTML = this.l10n.getConstant('XSmall');
@@ -25943,7 +26002,13 @@ class ToolbarModule {
         }
         const args = { toolbarType: 'text', toolbarItems: this.defToolbarItems };
         parent.trigger('toolbarUpdating', args);
-        this.defToolbarItems = args.toolbarItems;
+        if (this.isToolbarString(args.toolbarItems)) {
+            items = args.toolbarItems;
+            this.excludeItems(args.toolbarItems);
+        }
+        else {
+            this.defToolbarItems = args.toolbarItems;
+        }
         const toolbar = new Toolbar({
             width: '100%',
             items: this.defToolbarItems,
@@ -26428,7 +26493,8 @@ class ToolbarModule {
                 template: '<button id="' + id + '_penColorBtn"></button>' });
         }
         if (items.indexOf('strokeWidth') > -1) {
-            toolbarItems.push({ prefixIcon: 'e-icons e-copy', cssClass: 'top-icon e-size',
+            toolbarItems.push({ prefixIcon: 'e-icons e-copy', id: id + '_pen_strokewidth',
+                cssClass: 'top-icon e-size',
                 tooltipText: this.l10n.getConstant('StrokeWidth'),
                 align: 'Center', type: 'Input', template: '<button id="' + id + '_penStrokeWidth"></button>' });
         }
@@ -26464,7 +26530,13 @@ class ToolbarModule {
         }
         const args = { toolbarType: 'pen', toolbarItems: this.defToolbarItems };
         parent.trigger('toolbarUpdating', args);
-        this.defToolbarItems = args.toolbarItems;
+        if (this.isToolbarString(args.toolbarItems)) {
+            items = args.toolbarItems;
+            this.excludeItems(args.toolbarItems);
+        }
+        else {
+            this.defToolbarItems = args.toolbarItems;
+        }
         const toolbar = new Toolbar({
             width: '100%',
             items: this.defToolbarItems,
@@ -27602,6 +27674,8 @@ class ToolbarModule {
             let ctx;
             parent.notify('draw', { prop: 'getNewPath', value: { obj: pathObject } });
             const type = args.item.id.replace(id + '_', '').toLowerCase();
+            let left;
+            let right;
             switch (type) {
                 case 'duplicate':
                     if (!parent.element.querySelector('#' + id + '_duplicate').classList.contains('e-disabled')) {
@@ -27651,8 +27725,10 @@ class ToolbarModule {
                     break;
                 case 'rotleft':
                 case 'rotright':
-                    if (!parent.element.querySelector('#' + id + '_rotLeft').classList.contains('e-disabled') ||
-                        !parent.element.querySelector('#' + id + '_rotRight').classList.contains('e-disabled')) {
+                    left = parent.element.querySelector('#' + id + '_rotLeft');
+                    right = parent.element.querySelector('#' + id + '_rotRight');
+                    if ((left && !left.classList.contains('e-disabled')) ||
+                        (right && !right.classList.contains('e-disabled'))) {
                         parent.rotateImage(args.item.id.replace(id + '_', '').toLowerCase());
                     }
                     break;
@@ -28779,6 +28855,80 @@ class ToolbarModule {
         parent.activeObj.textFlip = parent.transform.currFlipState;
         parent.activeObj.flipObjColl = [];
     }
+    isToolbarString(items) {
+        let isString = false;
+        for (let i = 0; i < items.length; i++) {
+            if (typeof (items[i]) === 'string') {
+                isString = true;
+                break;
+            }
+        }
+        return isString;
+    }
+    excludeItems(items) {
+        const indexArr = [];
+        for (let i = 0; i < items.length; i++) {
+            const index = this.getIndex(items[i]);
+            if (index !== -1) {
+                indexArr.push(index);
+            }
+        }
+        const negativeIndexArr = [];
+        for (let i = 0; i < this.defToolbarItems.length; i++) {
+            if (this.defToolbarItems[i].align === 'Center' && !this.isSameIndex(indexArr, i) &&
+                this.defToolbarItems[i].id !== this.parent.element.id + '_' + 'annotation') {
+                negativeIndexArr.push(i);
+            }
+        }
+        for (let i = negativeIndexArr.length - 1; i >= 0; i--) {
+            this.defToolbarItems.splice(negativeIndexArr[i], 1);
+        }
+    }
+    isSameIndex(indexArr, index) {
+        for (let i = 0; i < indexArr.length; i++) {
+            if (indexArr[i] === index) {
+                return true;
+            }
+        }
+        return false;
+    }
+    getIndex(item) {
+        let index = -1;
+        let isFontColor = false;
+        if (item === 'rotateLeft') {
+            item = 'rotLeft';
+        }
+        if (item === 'rotateRight') {
+            item = 'rotRight';
+        }
+        if (item === 'horizontalFlip') {
+            item = 'hflip';
+        }
+        if (item === 'verticalFlip') {
+            item = 'vflip';
+        }
+        if (item === 'arrowStart') {
+            item = 'start';
+        }
+        if (item === 'arrowEnd') {
+            item = 'end';
+        }
+        if (item === 'fontColor') {
+            item = 'strokeColor';
+            isFontColor = true;
+        }
+        for (let i = 0; i < this.defToolbarItems.length; i++) {
+            const id = this.defToolbarItems[i].id;
+            if (id && id.toLowerCase().indexOf(item.toLowerCase()) !== -1) {
+                index = i;
+                break;
+            }
+        }
+        if (isFontColor) {
+            item = 'fontColor';
+        }
+        return index;
+    }
     getModuleName() {
         return 'toolbar-module';
     }