@syncfusion/ej2-image-editor 23.2.4 → 23.2.6

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

@@ -11065,6 +11065,10 @@ class Selection {
     performEnterAction(e) {
         const parent = this.parent;
         if (parent.isResize) {
+            const isValue = this.isValueUpdated();
+            if (!isValue) {
+                return;
+            }
             const point = this.getNumTextValue();
             const aspectRatioElement = this.parent.element.querySelector('#' + this.parent.element.id + '_aspectratio');
             const blrAspRatElem = this.parent.element.querySelector('.e-ie-toolbar-aspect-ratio-btn');
@@ -11094,15 +11098,19 @@ class Selection {
                 const aspectRatioHeight = parent.element.querySelector('#' + parent.element.id + '_resizeHeight');
                 const aspectRatioWidth = parent.element.querySelector('#' + parent.element.id + '_resizeWidth');
                 if (isNullOrUndefined(aspectRatioElement)) {
-                    let elem = getComponent(aspectRatioHeight, 'numerictextbox');
-                    if (aspectRatioHeight && isNullOrUndefined(elem.value)) {
-                        elem.value = parseFloat(elem.placeholder);
-                        aspectRatioHeight.value = Math.floor(parent.img.destHeight).toString() + ' px';
-                    }
-                    elem = getComponent(aspectRatioWidth, 'numerictextbox');
-                    if (aspectRatioWidth && isNullOrUndefined(elem.value)) {
-                        elem.value = parseFloat(elem.placeholder);
-                        aspectRatioWidth.value = Math.floor(parent.img.destWidth).toString() + ' px';
+                    if (aspectRatioHeight) {
+                        const elem = getComponent(aspectRatioHeight, 'numerictextbox');
+                        if (aspectRatioHeight && isNullOrUndefined(elem.value)) {
+                            elem.value = parseFloat(elem.placeholder);
+                            aspectRatioHeight.value = Math.floor(parent.img.destHeight).toString() + ' px';
+                        }
+                    }
+                    if (aspectRatioWidth) {
+                        const elem = getComponent(aspectRatioWidth, 'numerictextbox');
+                        if (aspectRatioWidth && isNullOrUndefined(elem.value)) {
+                            elem.value = parseFloat(elem.placeholder);
+                            aspectRatioWidth.value = Math.floor(parent.img.destWidth).toString() + ' px';
+                        }
                     }
                 }
             }
@@ -12078,6 +12086,25 @@ class Selection {
         }
         return { x: width, y: height };
     }
+    isValueUpdated() {
+        let isValue = true;
+        let widthElement;
+        let heightElement;
+        if (!isBlazor()) {
+            widthElement = this.parent.element.querySelector('#' + this.parent.element.id + '_resizeWidth');
+            heightElement = this.parent.element.querySelector('#' + this.parent.element.id + '_resizeHeight');
+        }
+        else {
+            widthElement = this.parent.element.querySelector('.e-ie-toolbar-e-resize-width-input .e-numerictextbox');
+            heightElement = this.parent.element.querySelector('.e-ie-toolbar-e-resize-height-input .e-numerictextbox');
+        }
+        if (widthElement && heightElement) {
+            if (heightElement.value.replace(/,/g, '') === '' && widthElement.value.replace(/,/g, '') === '') {
+                isValue = false;
+            }
+        }
+        return isValue;
+    }
 }
 
 class Shape {
@@ -15758,7 +15785,9 @@ class Transform {
             const previousZoomFactor = parent.zoomSettings.zoomFactor - (zoomFactor * 10);
             const zoomEventArgs = { zoomPoint: zoomPoint, cancel: false, previousZoomFactor: previousZoomFactor,
                 currentZoomFactor: parent.zoomSettings.zoomFactor, zoomTrigger: obj['zoomType'] };
-            if (!parent.isCropToolbar && isBlazor() && parent.events && parent.events.zooming.hasDelegate === true) {
+            if (isBlazor() && !parent.isCropToolbar && parent.currentToolbar !== 'resize-toolbar' && parent.currentToolbar !== 'frame-toolbar'
+                && parent.events && parent.events.zooming.hasDelegate === true) {
+                zoomEventArgs.zoomTrigger = parseInt(this.getZoomTriggerType(zoomEventArgs.zoomTrigger));
                 /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
                 parent.dotNetRef.invokeMethodAsync('ZoomEventAsync', 'OnZoom', zoomEventArgs).then((args) => {
                     this.zoomEvent(args, zoomFactor);
@@ -15772,6 +15801,18 @@ class Transform {
             }
         }
     }
+    getZoomTriggerType(type) {
+        switch (type) {
+            case 'MouseWheel':
+                return '1';
+            case 'Pinch':
+                return '2';
+            case 'Commands':
+                return '4';
+            default:
+                return '8';
+        }
+    }
     zoomEvent(zoomEventArgs, zoomFactor) {
         const parent = this.parent;
         if (zoomEventArgs.cancel) {
@@ -16591,7 +16632,8 @@ class Transform {
         }
     }
     getCurrentZoomFactor(zoomFactor) {
-        return (zoomFactor - this.prevZoomValue) * 0.1;
+        return zoomFactor >= 1 ? (this.prevZoomValue < 1 ? (zoomFactor - this.prevZoomValue) : (zoomFactor - this.prevZoomValue) * 0.1) :
+            (zoomFactor - this.prevZoomValue);
     }
     setCurrPanRegion(region, type, obj) {
         let panRegion = region;
@@ -17250,7 +17292,9 @@ class Transform {
     resizeEventHandler(args) {
         const parent = this.parent;
         let isRotate;
+        const aspectRatioWidth = parent.element.querySelector('#' + parent.element.id + '_resizeWidth');
         const aspectRatioHeight = parent.element.querySelector('#' + parent.element.id + '_resizeHeight');
+        const widthElem = parent.element.querySelector(".e-ie-toolbar-e-resize-width-input .e-numerictextbox");
         const heightElem = parent.element.querySelector(".e-ie-toolbar-e-resize-height-input .e-numerictextbox");
         if (args.isAspectRatio) {
             if (this.resizedImgAngle == null || this.resizedImgAngle !== parent.transform.degree) {
@@ -17263,10 +17307,19 @@ class Transform {
                     getComponent(aspectRatioHeight, 'numerictextbox').value = Math.floor(parent.img.destHeight);
                     aspectRatioHeight.value = Math.floor(parent.img.destHeight).toString() + ' px';
                     parent.aspectHeight = Math.floor(parent.img.destHeight);
+                    if (aspectRatioWidth && aspectRatioWidth.value === '') {
+                        getComponent(aspectRatioWidth, 'numerictextbox').value = Math.floor(parent.img.destWidth);
+                        aspectRatioWidth.value = Math.floor(parent.img.destWidth).toString() + ' px';
+                        parent.aspectWidth = Math.floor(parent.img.destWidth);
+                    }
                 }
                 else if (heightElem) {
                     heightElem.value = Math.floor(parent.img.destHeight).toString();
                     parent.aspectHeight = Math.floor(parent.img.destHeight);
+                    if (widthElem && widthElem.value === '') {
+                        widthElem.value = Math.floor(parent.img.destWidth).toString();
+                        parent.aspectWidth = Math.floor(parent.img.destWidth);
+                    }
                 }
             }
             else {
@@ -19190,6 +19243,7 @@ let ImageEditor = ImageEditor_1 = class ImageEditor extends Component {
             this.currentFilter = '';
             this.tempFrameZoomLevel = null;
             this.cxtTbarHeight = null;
+            this.aspectWidth = this.aspectHeight = null;
             const obj = { initialZoomValue: false };
             this.notify('draw', { prop: 'getInitialZoomValue', onPropertyChange: false, value: { obj: obj } });
             if (obj['initialZoomValue']) {
@@ -22317,13 +22371,17 @@ class ToolbarModule {
     getResizeToolbarItem() {
         const toolbarItems = [];
         const isResize = this.parent.aspectWidth && this.parent.aspectHeight ? true : false;
+        const width = this.parent.transform.degree % 90 === 0 && this.parent.transform.degree % 180 !== 0 ?
+            Math.ceil(this.parent.img.srcHeight).toString() : Math.ceil(this.parent.img.srcWidth).toString();
+        const height = this.parent.transform.degree % 90 === 0 && this.parent.transform.degree % 180 !== 0 ?
+            Math.ceil(this.parent.img.srcWidth).toString() : Math.ceil(this.parent.img.srcHeight).toString();
         const spanWidth = document.createElement('span');
         spanWidth.innerHTML = this.l10n.getConstant('W');
         toolbarItems.push({ id: this.parent.element.id + '_width', cssClass: 'e-ie-resize-width', template: spanWidth, align: 'Center' });
         toolbarItems.push({ id: this.parent.element.id + '_resizeWidth', prefixIcon: 'e-icons e-anti-clock-wise',
             tooltipText: this.l10n.getConstant('Width'), align: 'Center', type: 'Input', template: new NumericTextBox({ width: 75, htmlAttributes: { maxLength: "4" },
                 showSpinButton: false, value: isResize ? this.parent.aspectWidth : null,
-                placeholder: isResize ? null : Math.ceil(this.parent.img.srcWidth).toString(), format: '###.## px' })
+                placeholder: isResize ? null : width, format: '###.## px' })
         });
         const spanHeight = document.createElement('span');
         spanHeight.innerHTML = this.l10n.getConstant('H');
@@ -22331,7 +22389,7 @@ class ToolbarModule {
         toolbarItems.push({ id: this.parent.element.id + '_resizeHeight', prefixIcon: 'e-icons e-clock-wise',
             tooltipText: this.l10n.getConstant('Height'), align: 'Center', type: 'Input', template: new NumericTextBox({ width: 75, htmlAttributes: { maxLength: "4" },
                 showSpinButton: false, value: isResize ? this.parent.aspectHeight : null,
-                placeholder: isResize ? null : Math.ceil(this.parent.img.srcHeight).toString(), format: '###.## px' })
+                placeholder: isResize ? null : height, format: '###.## px' })
         });
         if (!this.isAspectRatio) {
             toolbarItems.push({ id: this.parent.element.id + '_aspectratio', prefixIcon: 'e-icons e-lock', align: 'Center', tooltipText: this.l10n.getConstant('AspectRatio'), type: 'Button' });