@syncfusion/ej2-image-editor 24.1.43 → 24.1.45

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);
         }
@@ -3627,11 +3630,19 @@ class Draw {
             if (!isBlazor()) {
                 parent.element.querySelector('.e-contextual-toolbar-wrapper').classList.add('e-hide');
                 parent.notify('toolbar', { prop: 'refresh-toolbar', onPropertyChange: false, value: eventargs });
+                if (parent.activeObj.shape && parent.activeObj.shape === 'image') {
+                    parent.notify('toolbar', { prop: 'destroy-qa-toolbar', onPropertyChange: false });
+                }
             }
             else {
                 parent.updateToolbar(parent.element, 'imageLoaded');
+                if (parent.activeObj.shape && parent.activeObj.shape === 'image') {
+                    parent.updateToolbar(parent.element, 'destroyQuickAccessToolbar');
+                }
             }
             parent.notify('undo-redo', { prop: 'updateCurrUrc', value: { type: 'cancel' } });
+            parent.notify('shape', { prop: 'refreshActiveObj', onPropertyChange: false });
+            this.upperContext.clearRect(0, 0, parent.upperCanvas.width, parent.upperCanvas.height);
         }
         else {
             if (isContextualToolbar && (!Browser.isDevice || (Browser.isDevice && !straightenObj['bool']))) {
@@ -4316,16 +4327,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;
             }
         }
     }
@@ -5039,9 +5050,9 @@ class Draw {
                         }
                     }
                 }
-                const panX = (parent.lowerCanvas.clientWidth / 2) - Math.floor(currObj.activePoint.startX +
+                const panX = (parent.lowerCanvas.clientWidth / 2) - (currObj.activePoint.startX +
                     (currObj.activePoint.width / 2));
-                const panY = (parent.lowerCanvas.clientHeight / 2) - Math.floor(currObj.activePoint.startY +
+                const panY = ((parent.lowerCanvas.clientHeight + 1) / 2) - (currObj.activePoint.startY +
                     (currObj.activePoint.height / 2));
                 if (isNullOrUndefined(parent.activeObj.shape)) {
                     parent.activeObj = extend({}, activeObj, {}, true);
@@ -12613,7 +12624,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 +17833,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;
@@ -19042,9 +19061,7 @@ class Transform {
             parent.notify('toolbar', { prop: 'performCropTransformClick', value: { shape: null } });
         }
         parent.setStraighten(degree, true);
-        if ((isBlazor() && parent.events && parent.events.straightening.hasDelegate === false) || !isBlazor()) {
-            parent.okBtn();
-        }
+        parent.okBtn();
     }
 }
 
@@ -19431,7 +19448,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 +20011,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;
@@ -24274,7 +24301,7 @@ class ToolbarModule {
             this.createLeftToolbarControls();
             const mToolbar = document.getElementById(id + '_toolbar');
             if (toolbar) {
-                this.toolbarHeight = mToolbar.scrollHeight;
+                this.toolbarHeight = mToolbar.clientHeight;
             }
         }
         else {
@@ -24575,10 +24602,10 @@ class ToolbarModule {
         }
         if (!isBlazor()) {
             if (parent.toolbarTemplate) {
-                this.toolbarHeight = parent.element.querySelector('#' + parent.element.id + '_toolbarArea').offsetHeight;
+                this.toolbarHeight = parent.element.querySelector('#' + parent.element.id + '_toolbarArea').clientHeight;
             }
             else if (parent.element.querySelector('#' + parent.element.id + '_toolbar')) {
-                this.toolbarHeight = parent.element.querySelector('#' + parent.element.id + '_toolbar').offsetHeight;
+                this.toolbarHeight = parent.element.querySelector('#' + parent.element.id + '_toolbar').clientHeight;
             }
             parent.toolbarHeight = this.toolbarHeight;
         }
@@ -24589,7 +24616,7 @@ class ToolbarModule {
                 cHt = cusWrapper.offsetHeight + 2;
             }
             const ht = parent.element.querySelector('#' + id + '_canvasWrapper').offsetHeight;
-            contextualToolbarArea.style.top = this.toolbarHeight + ht - cHt + 'px';
+            contextualToolbarArea.style.top = this.toolbarHeight + 1 + ht - cHt + 'px';
             if (cType === 'straighten') {
                 parent.isStraightening = true;
                 const ctxToolbar = parent.element.querySelector('#' + id + '_contextualToolbarArea');
@@ -24606,7 +24633,7 @@ class ToolbarModule {
             }
         }
         else {
-            contextualToolbarArea.style.top = this.toolbarHeight + 'px';
+            contextualToolbarArea.style.top = this.toolbarHeight + 1 + 'px';
         }
     }
     processToolbar(position) {
@@ -25426,8 +25453,8 @@ class ToolbarModule {
         }
         const slider = parent.element.querySelector('#' + id + '_straightenSlider');
         if ((isNullOrUndefined(parent.toolbar) || (parent.toolbar && parent.toolbar.indexOf('Straightening') > -1))
-            && slider && slider.parentElement.scrollHeight > this.toolbarHeight) {
-            this.toolbarHeight = parent.toolbarHeight = slider.parentElement.scrollHeight;
+            && slider && slider.parentElement.clientHeight > this.toolbarHeight) {
+            this.toolbarHeight = parent.toolbarHeight = slider.parentElement.clientHeight;
         }
         this.enableDisableTbrBtn();
         parent.notify('transform', { prop: 'disableZoomOutBtn', value: { isZoomOut: true } });
@@ -27461,6 +27488,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) {
@@ -28311,20 +28341,23 @@ class ToolbarModule {
         if (type === 'transparency') {
             labelWrapper = hdrWrapper.appendChild(parent.createElement('label', {
                 id: id + '_labelWrapper',
-                styles: Browser.isDevice ? 'position: absolute; top: 25%; left: calc(50% - 150px); font-size: 15px; text-transform: capitalize; font-weight: 400;'
-                    : 'position: absolute; top: 25%; left: calc(50% - 250px); font-size: 15px; text-transform: capitalize; font-weight: 400;'
+                className: 'e-ie-finetune-slider-label',
+                styles: Browser.isDevice ? 'position: absolute; top: 31%; left: calc(50% - 150px); font-size: 15px; text-transform: capitalize; font-weight: 400;'
+                    : 'position: absolute; top: 31%; left: calc(50% - 220px); font-size: 15px; text-transform: capitalize; font-weight: 400;'
             }));
         }
         else {
             labelWrapper = hdrWrapper.appendChild(parent.createElement('label', {
                 id: id + '_labelWrapper',
-                styles: Browser.isDevice ? ('position: absolute; top: 25%; left: calc(50% - 150px); font-size: 15px; text-transform: capitalize; font-weight: 400;')
+                className: 'e-ie-finetune-slider-label',
+                styles: Browser.isDevice ? ('position: absolute; top: 31%; left: calc(50% - 160px); font-size: 15px; text-transform: capitalize; font-weight: 400;')
                     : 'position: absolute; top: 25%; left: calc(50% - 226px); font-size: 15px; text-transform: capitalize; font-weight: 400;'
             }));
         }
         labelWrapper.textContent = this.l10n.getConstant(parent.toPascalCase(type === 'transparency' ? 'opacity' : type));
         const sliderWrapper = hdrWrapper.appendChild(parent.createElement('div', {
             id: id + '_sliderWrapper',
+            className: 'e-ie-finetune-slider-wrap',
             styles: 'position: absolute'
         }));
         let value = parent.getCurrAdjustmentValue(type);
@@ -28403,8 +28436,8 @@ class ToolbarModule {
         if (type === 'straighten' && Browser.isDevice) {
             const sLabelWrapper = hdrWrapper.appendChild(parent.createElement('label', {
                 id: id + '_sLabelWrapper',
-                className: 'e-ie-straighten-value-span',
-                styles: 'position: absolute; top: 25%; margin-left: 20px; font-size: 15px; text-transform: capitalize; font-weight: 400;'
+                className: 'e-ie-straighten-value-span e-ie-finetune-value-span',
+                styles: 'position: absolute; top: 31%; margin-left: 20px; font-size: 15px; text-transform: capitalize; font-weight: 400;'
             }));
             sLabelWrapper.innerHTML = parent.transform.straighten.toString() + '&#176';
             sliderWrapper.parentElement.classList.add('e-straighten-slider');
@@ -28417,6 +28450,9 @@ class ToolbarModule {
                     'position: absolute; top: 25%; left: calc(50% + 190px); font-size: 15px; text-transform: capitalize; font-weight: 400;'
             }));
             sliderWrapper.parentElement.classList.add('e-finetune-slider');
+            if (type === 'transparency' && Browser.isDevice) {
+                sliderWrapper.parentElement.classList.add('e-ie-device-transparency-slider');
+            }
             this.updateFinetuneSpan(type);
         }
     }