@syncfusion/ej2-image-editor 24.2.3 → 24.2.4

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

@@ -8302,6 +8302,7 @@ class Selection {
         this.isImageClarity = true;
         this.isPinching = false;
         this.isSliding = false;
+        this.mouseDown = '';
         this.parent = parent;
         this.addEventListener();
     }
@@ -8590,6 +8591,7 @@ class Selection {
         this.currentDrawingShape = '';
         this.initialPrevObj = {};
         this.resizedElement = '';
+        this.mouseDown = '';
     }
     performTabAction() {
         const parent = this.parent;
@@ -11005,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;
         }
@@ -11442,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;
         }
@@ -11701,6 +11709,7 @@ class Selection {
             parent.currObjType.shape = '';
         }
         this.dragElement = '';
+        this.mouseDown = '';
         parent.currObjType.isInitialLine = parent.currObjType.isDragging = false;
         this.selMouseUpEvent();
     }
@@ -19354,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();
@@ -19492,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();
@@ -25574,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,
@@ -25584,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) {
@@ -25748,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');
@@ -25981,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,
@@ -26466,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>' });
         }
@@ -26502,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,
@@ -27640,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')) {
@@ -27689,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;
@@ -28817,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';
     }