@syncfusion/ej2-image-editor 24.2.3 → 24.2.4

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 24.2.3
+*  version : 24.2.4
 *  Copyright Syncfusion Inc. 2001 - 2023. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-image-editor@*",
-  "_id": "@syncfusion/ej2-image-editor@24.1.46",
+  "_id": "@syncfusion/ej2-image-editor@24.2.3",
   "_inBundle": false,
-  "_integrity": "sha512-9/5hBBSb3R+8NFqnUbJWiPyEKPjsvYL4JjtWl3Bf8qZqL7S87Do5qyBGdVB1/wayxOCVaBm8VZXeSf6acDwe6w==",
+  "_integrity": "sha512-x7X5T7QWtkwuBvlw/q4onn7aeCQicWEgLU1fPCIGcP0vYnhVMjHPBmY9kPgQK8N/pjElzq5eUC+p3p/Jz1BM4A==",
   "_location": "/@syncfusion/ej2-image-editor",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-image-editor",
     "/@syncfusion/ej2-vue-image-editor"
   ],
-  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-image-editor/-/ej2-image-editor-24.1.46.tgz",
-  "_shasum": "b5346abb18e906d54d931cf017b6efed5449024c",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-image-editor/-/ej2-image-editor-24.2.3.tgz",
+  "_shasum": "6e263c7f3a9becf2f533dddbaf18e4d26cd2dac0",
   "_spec": "@syncfusion/ej2-image-editor@*",
   "_where": "/jenkins/workspace/elease-automation_release_24.1.1/packages/included",
   "author": {
@@ -34,8 +34,8 @@
   "dependencies": {
     "@syncfusion/ej2-base": "~24.2.3",
     "@syncfusion/ej2-buttons": "~24.2.3",
-    "@syncfusion/ej2-inputs": "~24.2.3",
-    "@syncfusion/ej2-navigations": "~24.2.3",
+    "@syncfusion/ej2-inputs": "~24.2.4",
+    "@syncfusion/ej2-navigations": "~24.2.4",
     "@syncfusion/ej2-popups": "~24.2.3",
     "@syncfusion/ej2-splitbuttons": "~24.2.3"
   },
@@ -67,7 +67,7 @@
     "url": "https://github.com/syncfusion/ej2-javascript-ui-controls/tree/master/controls/imageeditor"
   },
   "typings": "index.d.ts",
-  "version": "24.2.3",
+  "version": "24.2.4",
   "sideEffects": false,
   "homepage": "https://www.syncfusion.com/javascript-ui-controls"
 }

package/src/image-editor/action/selection.d.ts

@@ -43,6 +43,7 @@ export declare class Selection {
     private isImageClarity;
     private isPinching;
     private isSliding;
+    private mouseDown;
     constructor(parent: ImageEditor);
     destroy(): void;
     private addEventListener;

package/src/image-editor/action/selection.js

@@ -34,6 +34,7 @@ var Selection = /** @class */ (function () {
         this.isImageClarity = true;
         this.isPinching = false;
         this.isSliding = false;
+        this.mouseDown = '';
         this.parent = parent;
         this.addEventListener();
     }
@@ -322,6 +323,7 @@ var Selection = /** @class */ (function () {
         this.currentDrawingShape = '';
         this.initialPrevObj = {};
         this.resizedElement = '';
+        this.mouseDown = '';
     };
     Selection.prototype.performTabAction = function () {
         var parent = this.parent;
@@ -2740,6 +2742,8 @@ var Selection = /** @class */ (function () {
     Selection.prototype.mouseDownEventHandler = function (e) {
         var _this = this;
         var parent = this.parent;
+        this.mouseDown = e.currentTarget === parent.lowerCanvas || e.currentTarget === parent.upperCanvas ?
+            'canvas' : '';
         if (e.type === 'touchstart') {
             this.isTouch = true;
         }
@@ -3177,6 +3181,10 @@ var Selection = /** @class */ (function () {
                 && !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;
         }
@@ -3436,6 +3444,7 @@ var Selection = /** @class */ (function () {
             parent.currObjType.shape = '';
         }
         this.dragElement = '';
+        this.mouseDown = '';
         parent.currObjType.isInitialLine = parent.currObjType.isDragging = false;
         this.selMouseUpEvent();
     };

package/src/image-editor/action/undo-redo.js

@@ -267,6 +267,7 @@ var UndoRedo = /** @class */ (function () {
     UndoRedo.prototype.undo = function () {
         var 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();
@@ -405,6 +406,7 @@ var UndoRedo = /** @class */ (function () {
     UndoRedo.prototype.redo = function () {
         var 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();

package/src/image-editor/renderer/toolbar.d.ts

@@ -136,5 +136,9 @@ export declare class ToolbarModule {
     private refreshMainToolbar;
     private destroySubComponents;
     private setInitialShapeSettings;
+    private isToolbarString;
+    private excludeItems;
+    private isSameIndex;
+    private getIndex;
     getModuleName(): string;
 }

package/src/image-editor/renderer/toolbar.js

@@ -1665,7 +1665,13 @@ var ToolbarModule = /** @class */ (function () {
         var 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;
+        }
         var toolbar = new Toolbar({
             width: '100%',
             items: this.defToolbarItems,
@@ -1675,8 +1681,12 @@ var ToolbarModule = /** @class */ (function () {
                 _this.createShapeColor(items);
                 _this.createShapeBtn(items);
                 if (parent.activeObj.shape === 'arrow') {
-                    _this.createStartBtn();
-                    _this.createEndBtn();
+                    if (items.some(function (item) { return item.toLowerCase().indexOf('start') > -1; })) {
+                        _this.createStartBtn();
+                    }
+                    if (items.some(function (item) { return item.toLowerCase().indexOf('end') > -1; })) {
+                        _this.createEndBtn();
+                    }
                 }
                 _this.wireZoomBtnEvents();
                 if (!Browser.isDevice) {
@@ -1840,24 +1850,24 @@ var ToolbarModule = /** @class */ (function () {
     ToolbarModule.prototype.createShapeBtn = function (items) {
         var parent = this.parent;
         var id = parent.element.id;
-        var 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) {
+            var 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') }
+                ];
+            }
             var strokeWidthBtn = document.getElementById(id + '_borderWidthBtn');
             var spanElem_1 = document.createElement('span');
             spanElem_1.innerHTML = this.l10n.getConstant('XSmall');
@@ -2074,7 +2084,13 @@ var ToolbarModule = /** @class */ (function () {
         }
         var 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;
+        }
         var toolbar = new Toolbar({
             width: '100%',
             items: this.defToolbarItems,
@@ -2560,7 +2576,8 @@ var ToolbarModule = /** @class */ (function () {
                 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>' });
         }
@@ -2597,7 +2614,13 @@ var ToolbarModule = /** @class */ (function () {
         }
         var 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;
+        }
         var toolbar = new Toolbar({
             width: '100%',
             items: this.defToolbarItems,
@@ -3739,6 +3762,8 @@ var ToolbarModule = /** @class */ (function () {
             var ctx = void 0;
             parent.notify('draw', { prop: 'getNewPath', value: { obj: pathObject } });
             var type = args.item.id.replace(id + '_', '').toLowerCase();
+            var left = void 0;
+            var right = void 0;
             switch (type) {
                 case 'duplicate':
                     if (!parent.element.querySelector('#' + id + '_duplicate').classList.contains('e-disabled')) {
@@ -3788,8 +3813,10 @@ var ToolbarModule = /** @class */ (function () {
                     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;
@@ -4919,6 +4946,80 @@ var ToolbarModule = /** @class */ (function () {
         parent.activeObj.textFlip = parent.transform.currFlipState;
         parent.activeObj.flipObjColl = [];
     };
+    ToolbarModule.prototype.isToolbarString = function (items) {
+        var isString = false;
+        for (var i = 0; i < items.length; i++) {
+            if (typeof (items[i]) === 'string') {
+                isString = true;
+                break;
+            }
+        }
+        return isString;
+    };
+    ToolbarModule.prototype.excludeItems = function (items) {
+        var indexArr = [];
+        for (var i = 0; i < items.length; i++) {
+            var index = this.getIndex(items[i]);
+            if (index !== -1) {
+                indexArr.push(index);
+            }
+        }
+        var negativeIndexArr = [];
+        for (var 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 (var i = negativeIndexArr.length - 1; i >= 0; i--) {
+            this.defToolbarItems.splice(negativeIndexArr[i], 1);
+        }
+    };
+    ToolbarModule.prototype.isSameIndex = function (indexArr, index) {
+        for (var i = 0; i < indexArr.length; i++) {
+            if (indexArr[i] === index) {
+                return true;
+            }
+        }
+        return false;
+    };
+    ToolbarModule.prototype.getIndex = function (item) {
+        var index = -1;
+        var 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 (var i = 0; i < this.defToolbarItems.length; i++) {
+            var id = this.defToolbarItems[i].id;
+            if (id && id.toLowerCase().indexOf(item.toLowerCase()) !== -1) {
+                index = i;
+                break;
+            }
+        }
+        if (isFontColor) {
+            item = 'fontColor';
+        }
+        return index;
+    };
     ToolbarModule.prototype.getModuleName = function () {
         return 'toolbar-module';
     };