@syncfusion/ej2-image-editor 24.1.43 → 24.1.44

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

@@ -1096,7 +1096,7 @@ class Draw {
                 this.updateCanvas();
                 break;
             case 'performCancel':
-                this.performCancel(args.value['isContextualToolbar']);
+                this.performCancel(args.value['isContextualToolbar'], args.value['isUndoRedo']);
                 break;
             case 'updateFlipPan':
                 this.updateFlipPan(args.value['tempSelectionObj']);
@@ -1588,13 +1588,11 @@ class Draw {
             if (destTop < 0) {
                 height += destTop;
             }
-            if (parent.currObjType.shape.toLowerCase() !== 'crop-square' && parent.currObjType.shape.toLowerCase() !== 'crop-circle') {
-                if (destLeft + destWidth > parent.lowerCanvas.width) {
-                    width -= (destLeft + destWidth - parent.lowerCanvas.width);
-                }
-                if (destTop + destHeight > parent.lowerCanvas.height) {
-                    height -= (destTop + destHeight - parent.lowerCanvas.height);
-                }
+            if (destLeft + destWidth > parent.lowerCanvas.width) {
+                width -= (destLeft + destWidth - parent.lowerCanvas.width);
+            }
+            if (destTop + destHeight > parent.lowerCanvas.height) {
+                height -= (destTop + destHeight - parent.lowerCanvas.height);
             }
         }
         switch (parent.currObjType.shape.toLowerCase()) {
@@ -3216,7 +3214,7 @@ class Draw {
                 parent.img.destHeight = maxDimension.width;
             }
             parent.img.destLeft = (parent.lowerCanvas.clientWidth - maxDimension.height) / 2;
-            parent.img.destTop = (parent.lowerCanvas.clientHeight - maxDimension.width + 1) / 2;
+            parent.img.destTop = (parent.lowerCanvas.clientHeight - maxDimension.width) / 2;
             parent.img.destWidth = maxDimension.height;
             parent.img.destHeight = maxDimension.width;
         }
@@ -3232,7 +3230,12 @@ class Draw {
                 parent.img.destHeight = maxDimension.height;
             }
             parent.img.destLeft = (parent.lowerCanvas.clientWidth - maxDimension.width) / 2;
-            parent.img.destTop = (parent.lowerCanvas.clientHeight - maxDimension.height + 1) / 2;
+            if (degree === 0) {
+                parent.img.destTop = (parent.lowerCanvas.clientHeight - maxDimension.height + 1) / 2;
+            }
+            else {
+                parent.img.destTop = (parent.lowerCanvas.clientHeight - maxDimension.height) / 2;
+            }
             parent.img.destWidth = maxDimension.width;
             parent.img.destHeight = maxDimension.height;
         }
@@ -3546,14 +3549,14 @@ class Draw {
             parent.cancelCropSelection = null;
         }
     }
-    performCancel(isContextualToolbar) {
+    performCancel(isContextualToolbar, isUndoRedo) {
         const parent = this.parent;
         const straightenObj = { bool: parent.isStraightening };
         isContextualToolbar = isContextualToolbar ? isContextualToolbar : false;
         const obj = { bool: false };
         parent.allowDownScale = true;
         parent.notify('selection', { prop: 'getFreehandDrawEditing', onPropertyChange: false, value: { obj: obj } });
-        if (JSON.stringify(parent.frameObj) !== JSON.stringify(parent.tempFrameObj)) {
+        if (isNullOrUndefined(isUndoRedo) && JSON.stringify(parent.frameObj) !== JSON.stringify(parent.tempFrameObj)) {
             extend(parent.frameObj, parent.tempFrameObj);
             this.renderImage(null, null, true);
         }
@@ -4316,16 +4319,16 @@ class Draw {
     setClientTransDim(isPreventDimension) {
         const parent = this.parent;
         if (parent.transform.degree % 90 === 0 && parent.transform.degree % 180 !== 0) {
-            parent.img.destLeft = (parent.lowerCanvas.width - parent.img.destHeight) / 2;
-            parent.img.destTop = (parent.lowerCanvas.height - parent.img.destWidth) / 2;
+            parent.img.destLeft = (parent.lowerCanvas.clientWidth - parent.img.destHeight) / 2;
+            parent.img.destTop = (parent.lowerCanvas.clientHeight - parent.img.destWidth + 1) / 2;
             const temp = parent.img.destWidth;
             parent.img.destWidth = parent.img.destHeight;
             parent.img.destHeight = temp;
         }
         else {
             if (isNullOrUndefined(isPreventDimension)) {
-                parent.img.destLeft = (parent.lowerCanvas.width - parent.img.destWidth) / 2;
-                parent.img.destTop = (parent.lowerCanvas.height - parent.img.destHeight) / 2;
+                parent.img.destLeft = (parent.lowerCanvas.clientWidth - parent.img.destWidth) / 2;
+                parent.img.destTop = (parent.lowerCanvas.clientHeight - parent.img.destHeight + 1) / 2;
             }
         }
     }
@@ -12613,7 +12616,15 @@ class Selection {
                     this.getCurrentFlipState();
                 }
                 else {
+                    const totalPannedInternalPoint = extend({}, parent.panPoint.totalPannedInternalPoint, {}, true);
+                    const destPoints = { startX: parent.img.destLeft, startY: parent.img.destTop, width: parent.img.destWidth,
+                        height: parent.img.destHeight };
                     parent.notify('draw', { prop: 'callUpdateCurrTransState', onPropertyChange: false });
+                    parent.panPoint.totalPannedInternalPoint = totalPannedInternalPoint;
+                    parent.img.destLeft = destPoints.startX;
+                    parent.img.destTop = destPoints.startY;
+                    parent.img.destWidth = destPoints.width;
+                    parent.img.destHeight = destPoints.height;
                     parent.notify('freehand-draw', { prop: 'freehandRedraw', onPropertyChange: false,
                         value: { context: this.lowerContext, points: null } });
                 }
@@ -17814,11 +17825,11 @@ class Transform {
             if (parent.img.destTop > 0) {
                 parent.img.destTop = 0;
             }
-            if (parent.img.destLeft + maxDimension.width < parent.lowerCanvas.width) {
-                parent.img.destLeft = parent.lowerCanvas.width - parent.img.destWidth;
+            if (parent.img.destLeft + maxDimension.width < parent.lowerCanvas.clientWidth) {
+                parent.img.destLeft = parent.lowerCanvas.clientWidth - parent.img.destWidth;
             }
-            if (parent.img.destTop + maxDimension.height < parent.lowerCanvas.height) {
-                parent.img.destTop = parent.lowerCanvas.height - parent.img.destHeight;
+            if (parent.img.destTop + maxDimension.height < parent.lowerCanvas.clientHeight) {
+                parent.img.destTop = parent.lowerCanvas.clientHeight - parent.img.destHeight;
             }
         }
         return maxDimension;
@@ -19431,7 +19442,7 @@ class UndoRedo {
                         this.tempCurrSelPoint = extend({}, parent.currSelectionPoint, {}, true);
                         parent.currSelectionPoint = null;
                     }
-                    parent.notify('draw', { prop: 'performCancel', value: { isContextualToolbar: null } });
+                    parent.notify('draw', { prop: 'performCancel', value: { isContextualToolbar: null, isUndoRedo: true } });
                     parent.currObjType.isActiveObj = false;
                     if (parent.transform.straighten !== 0) {
                         parent.notify('draw', { prop: 'setStraightenActObj', value: { activeObj: null } });
@@ -19994,6 +20005,16 @@ class UndoRedo {
         this.parent.notify('draw', { prop: 'getArrowDimension', onPropertyChange: false, value: { obj: arrowObj } });
         const tempArrowObj = extend({}, arrowObj['arrowDimension'], {}, true);
         if (parent.transform.zoomFactor > 0 && (obj.length > 0 || point.length > 0)) {
+            if (obj.length > 0) {
+                for (let i = 0; i < obj.length; i++) {
+                    if (obj[i].currIndex) {
+                        continue;
+                    }
+                    else {
+                        obj[i].currIndex = 'shape_' + (i + 1);
+                    }
+                }
+            }
             parent.objColl = obj;
             parent.pointColl = point;
             const isUndoRedo = parent.isUndoRedo;
@@ -27461,6 +27482,9 @@ class ToolbarModule {
                     qtArea.style.top = point.startY - (height + (height / 1.5)) + 'px';
                 }
             }
+            if (parseFloat(qtArea.style.top) < 0) {
+                qtArea.style.top = '0px';
+            }
         }
     }
     refreshDropDownBtn(isDisabled) {