@syncfusion/ej2-pdfviewer 17.3.48-4568 → 17.3.50-4568

package/dist/es6/ej2-pdfviewer.es2015.js

@@ -17787,6 +17787,37 @@ class PdfViewerBase {
          * @private
          */
         this.isReRenderRequired = true;
+        /**
+        * @private
+        */
+        // eslint-disable-next-line
+        this.isTouchPad = false;
+        /**
+         * @private
+         */
+        // eslint-disable-next-line
+        this.isMacGestureActive = false;
+        /**
+         * @private
+         */
+        // eslint-disable-next-line
+        this.macGestureStartScale = 0;
+        /**
+         * @private
+         */
+        // eslint-disable-next-line
+        this.zoomInterval = 5;
+        /**
+         * EJ2CORE-813 - This flag is represent current device is 'iPad' or 'iPhone' or'iPod' device.
+         * @private
+         */
+        // eslint-disable-next-line
+        this.isDeviceiOS = (['iPad Simulator', 'iPhone Simulator', 'iPod Simulator', 'iPad', 'iPhone', 'iPod'].includes(navigator.platform) || (navigator.userAgent.includes("Mac") && "ontouchend" in document));
+        /**
+         * @private
+         */
+        // eslint-disable-next-line
+        this.isMacSafari = navigator.userAgent.indexOf("Safari") > -1 && navigator.userAgent.indexOf("Chrome") === -1 && !this.isDeviceiOS;
         /**
          * @private
          */
@@ -18065,6 +18096,49 @@ class PdfViewerBase {
                 this.isViewerMouseDown = false;
             }
         };
+        /**
+        * @param {any} event - The Wheel event.
+        * @returns {void}
+        */
+        this.detectTouchPad = (event) => {
+            // eslint-disable-next-line max-len
+            this.isTouchPad = event.wheelDeltaY ? (event.wheelDeltaY === (event.deltaY * -3) ? true : Math.abs(event.deltaY) < 60) : (event.deltaMode === 0);
+        };
+        /**
+         * @param {any} event - The Wheel event.
+         * @returns {void}
+         */
+        this.handleMacGestureStart = (event) => {
+            event.preventDefault();
+            event.stopPropagation();
+            this.macGestureStartScale = this.pdfViewer.magnification.zoomFactor;
+        };
+        /**
+         * @param {any} event - The Wheel event.
+         * @returns {void}
+         */
+        this.handleMacGestureChange = (event) => {
+            event.preventDefault();
+            event.stopPropagation();
+            let macX = event.clientX;
+            let macY = event.clientY;
+            let scale = Number((this.macGestureStartScale * event.scale).toFixed(2));
+            if (!this.isMacGestureActive) {
+                this.isMacGestureActive = true;
+                this.pdfViewer.magnification.initiateMouseZoom(macX, macY, scale * 100);
+                setTimeout(() => {
+                    this.isMacGestureActive = false;
+                }, 70);
+            }
+        };
+        /**
+         * @param {any} event - The Wheel event.
+         * @returns {void}
+         */
+        this.handleMacGestureEnd = (event) => {
+            event.preventDefault();
+            event.stopPropagation();
+        };
         this.viewerContainerOnMouseWheel = (event) => {
             this.isViewerMouseWheel = true;
             if (this.getRerenderCanvasCreated()) {
@@ -18078,13 +18152,17 @@ class PdfViewerBase {
                 if (this.pdfViewer.magnification.zoomFactor >= 2) {
                     zoomDifference = 50;
                 }
+                if (this.isTouchPad && !this.isMacSafari) {
+                    zoomDifference = zoomDifference / this.zoomInterval;
+                }
                 // eslint-disable-next-line
                 if (event.wheelDelta > 0) {
-                    this.pdfViewer.magnification.zoomTo((this.pdfViewer.magnification.zoomFactor * 100) + zoomDifference);
+                    this.pdfViewer.magnification.initiateMouseZoom(event.x, event.y, (this.pdfViewer.magnification.zoomFactor * 100) + zoomDifference);
                 }
                 else {
-                    this.pdfViewer.magnification.zoomTo((this.pdfViewer.magnification.zoomFactor * 100) - zoomDifference);
+                    this.pdfViewer.magnification.initiateMouseZoom(event.x, event.y, (this.pdfViewer.magnification.zoomFactor * 100) - zoomDifference);
                 }
+                this.isTouchPad = false;
             }
             if (this.pdfViewer.magnificationModule) {
                 this.pdfViewer.magnificationModule.pageRerenderOnMouseWheel();
@@ -18573,8 +18651,8 @@ class PdfViewerBase {
             this.previousTime = new Date().getTime();
             // tslint:disable-next-line:max-line-length
             if (touchPoints.length === 1 && !(event.target.classList.contains('e-pv-touch-select-drop') || event.target.classList.contains('e-pv-touch-ellipse'))) {
-                if (Browser.isDevice && this.pageCount > 0 && !this.isThumb && !(event.target.classList.contains('e-pv-hyperlink'))) {
-                    this.handleTaps(touchPoints);
+                if ((Browser.isDevice || (typeof navigator !== 'undefined' && navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1 && Browser.isTouch === true)) && this.pageCount > 0 && !this.isThumb && !(event.target.classList.contains('e-pv-hyperlink'))) {
+                    this.handleTaps(touchPoints, event);
                 }
                 else if (!Browser.isDevice) {
                     this.handleTextBoxTaps(touchPoints);
@@ -18603,7 +18681,6 @@ class PdfViewerBase {
                 this.pdfViewer.textSelectionModule.initiateTouchSelection(event, this.touchClientX, this.touchClientY);
                 if (Browser.isDevice) {
                     clearTimeout(this.singleTapTimer);
-                    this.singleTapTimer = null;
                     this.tapCount = 0;
                 }
             }
@@ -20115,7 +20192,16 @@ class PdfViewerBase {
         }
         this.viewerContainer.addEventListener('mousedown', this.viewerContainerOnMousedown);
         this.viewerContainer.addEventListener('mouseup', this.viewerContainerOnMouseup);
+        this.viewerContainer.addEventListener("wheel", this.detectTouchPad, false);
         this.viewerContainer.addEventListener('wheel', this.viewerContainerOnMouseWheel);
+        if (this.isMacSafari) {
+            window.addEventListener('gesturestart', e => e.preventDefault());
+            window.addEventListener('gesturechange', e => e.preventDefault());
+            window.addEventListener('gestureend', e => e.preventDefault());
+            this.viewerContainer.addEventListener('gesturestart', this.handleMacGestureStart, false);
+            this.viewerContainer.addEventListener('gesturechange', this.handleMacGestureChange, false);
+            this.viewerContainer.addEventListener('gestureend', this.handleMacGestureEnd, false);
+        }
         this.viewerContainer.addEventListener('mousemove', this.viewerContainerOnMousemove);
         this.viewerContainer.addEventListener('mouseleave', this.viewerContainerOnMouseLeave);
         this.viewerContainer.addEventListener('mouseenter', this.viewerContainerOnMouseEnter);
@@ -20139,6 +20225,12 @@ class PdfViewerBase {
         }
         else {
             this.viewerContainer.addEventListener('touchstart', this.viewerContainerOnTouchStart);
+            if (this.isWebkitMobile && this.isDeviceiOS) {
+                // eslint-disable-next-line max-len
+                this.viewerContainer.addEventListener("touchmove", (e) => { if (e.scale !== 1) {
+                    e.preventDefault();
+                } }, { passive: false });
+            }
             this.viewerContainer.addEventListener('touchmove', this.viewerContainerOnTouchMove);
             this.viewerContainer.addEventListener('touchend', this.viewerContainerOnTouchEnd);
             this.viewerContainer.addEventListener('touchleave', this.viewerContainerOnTouchEnd);
@@ -20152,7 +20244,16 @@ class PdfViewerBase {
         }
         this.viewerContainer.removeEventListener('mousedown', this.viewerContainerOnMousedown);
         this.viewerContainer.removeEventListener('mouseup', this.viewerContainerOnMouseup);
+        this.viewerContainer.removeEventListener("wheel", this.detectTouchPad, false);
         this.viewerContainer.removeEventListener('wheel', this.viewerContainerOnMouseWheel);
+        if (this.isMacSafari) {
+            window.removeEventListener('gesturestart', e => e.preventDefault());
+            window.removeEventListener('gesturechange', e => e.preventDefault());
+            window.removeEventListener('gestureend', e => e.preventDefault());
+            this.viewerContainer.removeEventListener('gesturestart', this.handleMacGestureStart, false);
+            this.viewerContainer.removeEventListener('gesturechange', this.handleMacGestureChange, false);
+            this.viewerContainer.removeEventListener('gestureend', this.handleMacGestureEnd, false);
+        }
         this.viewerContainer.removeEventListener('mousemove', this.viewerContainerOnMousemove);
         this.viewerContainer.removeEventListener('mouseleave', this.viewerContainerOnMouseLeave);
         this.viewerContainer.removeEventListener('mouseenter', this.viewerContainerOnMouseEnter);
@@ -20173,6 +20274,12 @@ class PdfViewerBase {
         }
         else {
             this.viewerContainer.removeEventListener('touchstart', this.viewerContainerOnTouchStart);
+            if (this.isWebkitMobile && this.isDeviceiOS) {
+                // eslint-disable-next-line max-len
+                this.viewerContainer.removeEventListener("touchmove", (e) => { if (e.scale !== 1) {
+                    e.preventDefault();
+                } }, false);
+            }
             this.viewerContainer.removeEventListener('touchmove', this.viewerContainerOnTouchMove);
             this.viewerContainer.removeEventListener('touchend', this.viewerContainerOnTouchEnd);
             this.viewerContainer.removeEventListener('touchleave', this.viewerContainerOnTouchEnd);
@@ -20288,28 +20395,64 @@ class PdfViewerBase {
         }
         this.isViewerContainerDoubleClick = false;
     }
-    handleTaps(touchPoints) {
-        if (!this.singleTapTimer) {
-            this.singleTapTimer = setTimeout(() => {
-                this.onSingleTap(touchPoints);
-                // tslint:disable-next-line
-            }, 300);
-            this.tapCount++;
+    handleTaps(touchPoints, event) {
+        //EJ2CORE-813 - Implemented focus removing logic for iOS devices
+        if (this.isDeviceiOS) {
+            const obj = findActiveElement(event, this, this.pdfViewer);
+            // eslint-disable-next-line
+            let isRemoveFocus = !this.pdfViewer.annotation.freeTextAnnotationModule.isNewFreeTextAnnot && (obj && this.pdfViewer.selectedItems.annotations[0] ? obj.id !== this.pdfViewer.selectedItems.annotations[0].id : true) && document.activeElement.classList.contains('free-text-input') && this.isFreeTextAnnotation(this.pdfViewer.selectedItems.annotations);
+            if (!this.singleTapTimer) {
+                this.singleTapTimer = setTimeout(() => {
+                    if (isRemoveFocus) {
+                        this.pdfViewer.clearSelection(this.pdfViewer.selectedItems.annotations[0].pageIndex);
+                        this.focusViewerContainer();
+                    }
+                    this.onSingleTap(touchPoints);
+                    // eslint-disable-next-line
+                }, 300);
+                this.tapCount++;
+            }
+            else {
+                if (this.pdfViewer.enablePinchZoom) {
+                    this.tapCount++;
+                    clearTimeout(this.singleTapTimer);
+                    this.singleTapTimer = null;
+                    this.onDoubleTap(touchPoints);
+                }
+            }
         }
         else {
-            if (this.pdfViewer.enablePinchZoom) {
+            if (!this.singleTapTimer) {
+                this.singleTapTimer = setTimeout(() => {
+                    this.onSingleTap(touchPoints);
+                    // eslint-disable-next-line
+                }, 300);
                 this.tapCount++;
-                clearTimeout(this.singleTapTimer);
-                this.singleTapTimer = null;
-                this.onDoubleTap(touchPoints);
+            }
+            else {
+                if (this.pdfViewer.enablePinchZoom) {
+                    this.tapCount++;
+                    clearTimeout(this.singleTapTimer);
+                    this.singleTapTimer = null;
+                    this.onDoubleTap(touchPoints);
+                }
             }
         }
     }
     handleTextBoxTaps(touchPoints) {
-        setTimeout(() => { this.inputTapCount = 0; }, 300);
+        setTimeout(() => {
+            this.inputTapCount = 0;
+        }, 300);
         this.inputTapCount++;
-        // tslint:disable-next-line
-        let timer = setTimeout(() => { this.onTextBoxDoubleTap(touchPoints); }, 200);
+        if (this.isDeviceiOS) {
+            // eslint-disable-next-line
+            this.onTextBoxDoubleTap(touchPoints);
+        }
+        else {
+            let timer = setTimeout(() => {
+                this.onTextBoxDoubleTap(touchPoints);
+            }, 200);
+        }
         if (this.inputTapCount > 2) {
             this.inputTapCount = 0;
         }
@@ -20408,7 +20551,7 @@ class PdfViewerBase {
         if (this.pdfViewer.textSelectionModule) {
             // tslint:disable-next-line:max-line-length
             if (!this.isPanMode && this.pdfViewer.enableTextSelection && !this.isTextSelectionDisabled && this.getSelectTextMarkupCurrentPage() == null) {
-                if (!(this.isWebkitMobile && Browser.isDevice)) {
+                if (!(this.isWebkitMobile && (Browser.isDevice || (typeof navigator !== 'undefined' && navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1 && Browser.isTouch === true)))) {
                     event.preventDefault();
                     event.stopPropagation();
                 }
@@ -21060,7 +21203,7 @@ class PdfViewerBase {
         let proxy = this;
         jsonObject = { action: 'RenderTaggedContent', elementId: this.pdfViewer.element.id, hashId: this.hashId, uniqueId: this.documentId, pageIndex: pageIndex };
         if (this.jsonDocumentId) {
-            jsonObject.document = this.jsonDocumentId;
+            jsonObject.documentId = this.jsonDocumentId;
         }
         var url = this.pdfViewer.serviceUrl + '/' + "RenderTaggedContent";
         this.taggedTextHandler = new AjaxHandler(this.pdfViewer);
@@ -25332,9 +25475,11 @@ class AjaxHandler {
          * @private
          */
         this.contentType = 'application/json;charset=UTF-8';
+        this.retryTimeout = 0;
         this.pdfViewer = pdfviewer;
         this.retryCount = pdfviewer.retryCount;
         this.retryStatusCodes = pdfviewer.retryStatusCodes;
+        this.retryTimeout = 1000 * pdfviewer.retryTimeout;
     }
     /**
      * Send the request to server
@@ -25343,6 +25488,7 @@ class AjaxHandler {
      */
     send(jsonObj) {
         this.httpRequest = new XMLHttpRequest();
+        this.httpRequest.timeout = this.retryTimeout;
         if (!this.mode) {
             setTimeout(() => { this.sendRequest(jsonObj); });
         }
@@ -25358,7 +25504,22 @@ class AjaxHandler {
                 this.retryCount = 0;
             }
             if (this.retryCount > 0) {
-                isSkip = this.resendRequest(this, jsonObj);
+                isSkip = this.resendRequest(this, jsonObj, false);
+            }
+            if (!isSkip) {
+                this.stateChange(this);
+            }
+        };
+        this.httpRequest.ontimeout = () => {
+            let isSkip = false;
+            // tslint:disable-next-line
+            let viewerBase = this.pdfViewer.viewerBase;
+            if (viewerBase && viewerBase.isPasswordAvailable && viewerBase.passwordData === '') {
+                isSkip = true;
+                this.retryCount = 0;
+            }
+            if (this.retryCount > 0) {
+                isSkip = this.resendRequest(this, jsonObj, true);
             }
             if (!isSkip) {
                 this.stateChange(this);
@@ -25367,7 +25528,7 @@ class AjaxHandler {
         this.httpRequest.onerror = () => { this.error(this); };
     }
     // tslint:disable-next-line
-    resendRequest(proxy, jsonObj) {
+    resendRequest(proxy, jsonObj, isTimeout) {
         let isSkip = false;
         let status = proxy.httpRequest.status;
         let statusString = this.retryStatusCodes.indexOf(status) !== -1;
@@ -25394,7 +25555,7 @@ class AjaxHandler {
                 }
             }
         }
-        if (statusString || isSkip) {
+        if (statusString || isSkip || isTimeout) {
             isSkip = true;
             this.retryCount--;
             proxy.send(jsonObj);
@@ -26043,7 +26204,7 @@ class Magnification {
         this.scrollWidth = 25;
         this.zoomPercentages = [10, 25, 50, 75, 100, 125, 150, 200, 400];
         this.isNotPredefinedZoom = false;
-        this.pinchStep = 0.02;
+        this.pinchStep = 0;
         this.reRenderPageNumber = 0;
         // tslint:disable-next-line
         this.magnifyPageRerenderTimer = null;
@@ -26053,6 +26214,8 @@ class Magnification {
         this.rerenderInterval = null;
         this.touchCenterX = 0;
         this.touchCenterY = 0;
+        this.mouseCenterX = 0;
+        this.mouseCenterY = 0;
         this.pageRerenderCount = 0;
         this.imageObjects = [];
         this.topValue = 0;
@@ -26089,6 +26252,10 @@ class Magnification {
          * @private
          */
         this.isAutoZoom = false;
+        /**
+         * @private
+         */
+        this.isDoubleTapZoom = false;
         this.isWebkitMobile = false;
         this.pdfViewer = pdfViewer;
         this.pdfViewerBase = viewerBase;
@@ -26102,11 +26269,13 @@ class Magnification {
      * @returns void
      */
     zoomTo(zoomValue) {
-        if (zoomValue < 10) {
-            zoomValue = 10;
+        let MaximumZoomPercentage = 400;
+        let MinmumZoomPercentage = 10;
+        if (zoomValue < MinmumZoomPercentage) {
+            zoomValue = MinmumZoomPercentage;
         }
-        else if (zoomValue > 400) {
-            zoomValue = 400;
+        else if (zoomValue > MaximumZoomPercentage) {
+            zoomValue = MaximumZoomPercentage;
         }
         this.fitType = null;
         this.isNotPredefinedZoom = false;
@@ -26246,6 +26415,16 @@ class Magnification {
             return parseInt(((viewerHeight / highestHeight) * 100).toString());
         }
     }
+    /**
+     * Initiating cursor based zoom.
+     * @private
+     */
+    initiateMouseZoom(pointX, pointY, zoomValue) {
+        let pointInViewer = this.positionInViewer(pointX, pointY);
+        this.mouseCenterX = pointInViewer.x;
+        this.mouseCenterY = pointInViewer.y;
+        this.zoomTo(zoomValue);
+    }
     /**
      * Performs pinch in operation
      */
@@ -26255,8 +26434,11 @@ class Magnification {
         if (temporaryZoomFactor < 4 && temporaryZoomFactor > 2) {
             temporaryZoomFactor = this.zoomFactor - this.pinchStep;
         }
-        if (temporaryZoomFactor < 0.1) {
-            temporaryZoomFactor = 0.1;
+        if (temporaryZoomFactor <= 1.5) {
+            temporaryZoomFactor = this.zoomFactor - (this.pinchStep / 1.5);
+        }
+        if (temporaryZoomFactor < 0.25) {
+            temporaryZoomFactor = 0.25;
         }
         this.isPinchZoomed = true;
         this.onZoomChanged(temporaryZoomFactor * 100);
@@ -26276,8 +26458,8 @@ class Magnification {
         this.fitType = null;
         let temporaryZoomFactor = this.zoomFactor + this.pinchStep;
         if (Browser.isDevice) {
-            if (temporaryZoomFactor > 2) {
-                temporaryZoomFactor = 2;
+            if (temporaryZoomFactor > 4) {
+                temporaryZoomFactor = 4;
             }
         }
         else {
@@ -26375,8 +26557,9 @@ class Magnification {
      * @private
      */
     setTouchPoints(clientX, clientY) {
-        this.touchCenterX = clientX;
-        this.touchCenterY = clientY;
+        let pointInViewer = this.positionInViewer(clientX, clientY);
+        this.touchCenterX = pointInViewer.x;
+        this.touchCenterY = pointInViewer.y;
     }
     /**
      * @private
@@ -26385,8 +26568,9 @@ class Magnification {
         this.isPinchScrolled = false;
         this.isMagnified = false;
         this.reRenderPageNumber = this.pdfViewerBase.currentPageNumber;
-        this.touchCenterX = (pointX1 + pointX2) / 2;
-        this.touchCenterY = (pointY1 + pointY2) / 2;
+        let pointInViewer = this.positionInViewer((pointX1 + pointX2) / 2, (pointY1 + pointY2) / 2);
+        this.touchCenterX = pointInViewer.x;
+        this.touchCenterY = pointInViewer.y;
         this.zoomOverPages(pointX1, pointY1, pointX2, pointY2);
     }
     magnifyPages() {
@@ -26397,7 +26581,7 @@ class Magnification {
         if (!this.pdfViewerBase.documentLoaded) {
             this.isPagesZoomed = true;
         }
-        let scrollValue = this.getMagnifiedValue(this.pdfViewerBase.viewerContainer.scrollTop);
+        const scrollValue = this.pdfViewerBase.viewerContainer.scrollTop;
         if (this.pdfViewer.textSelectionModule) {
             this.pdfViewer.textSelectionModule.maintainSelectionOnZoom(false, true);
         }
@@ -26406,6 +26590,7 @@ class Magnification {
         }
         this.updatePageLocation();
         this.resizeCanvas(this.reRenderPageNumber);
+        this.calculateScrollValuesOnMouse(scrollValue);
         if (this.pdfViewer.textSelectionModule) {
             this.pdfViewer.textSelectionModule.resizeTouchElements();
         }
@@ -26421,7 +26606,6 @@ class Magnification {
             let proxy = this;
             this.pdfViewerBase.renderedPagesList = [];
             this.pdfViewerBase.pinchZoomStorage = [];
-            this.pdfViewerBase.viewerContainer.scrollTop = scrollValue;
             if (!this.pdfViewerBase.documentLoaded) {
                 this.magnifyPageRerenderTimer = setTimeout(() => { proxy.rerenderMagnifiedPages(); }, 800);
             }
@@ -26530,19 +26714,63 @@ class Magnification {
         let pageIndex = this.pdfViewerBase.currentPageNumber - 1;
         let currentPageCanvas = this.pdfViewerBase.getElement('_pageDiv_' + pageIndex);
         if (currentPageCanvas) {
-            let currentPageBounds = currentPageCanvas.getBoundingClientRect();
+            let pointInViewer;
+            const currentPageBounds = currentPageCanvas.getBoundingClientRect();
+            if (this.pdfViewer.enableRtl && !this.isDoubleTapZoom) {
+                pointInViewer = this.positionInViewer(currentPageBounds.right, currentPageBounds.top);
+            }
+            else {
+                pointInViewer = this.positionInViewer(currentPageBounds.left, currentPageBounds.top);
+            }
+            let currentPageBoundsLeft = pointInViewer.x;
+            let currentPageBoundsTop = pointInViewer.y;
             // update scroll top for the viewer container based on pinch zoom factor
-            let previousPageTop = (currentPageBounds.top) * this.previousZoomFactor;
-            let previousY = scrollValue + this.touchCenterY;
-            // tslint:disable-next-line:max-line-length
-            let currentY = (currentPageBounds.top) * this.zoomFactor + ((previousY - previousPageTop) < 0 ? previousY - previousPageTop : (previousY -
-                // tslint:disable-next-line:max-line-length
+            const previousPageTop = (currentPageBoundsTop) * this.previousZoomFactor;
+            const canvasPreviousY = scrollValue + this.touchCenterY;
+            // eslint-disable-next-line max-len
+            const canvasCurrentY = (currentPageBoundsTop) * this.zoomFactor + ((canvasPreviousY - previousPageTop) < 0 ? canvasPreviousY - previousPageTop : (canvasPreviousY -
+                // eslint-disable-next-line max-len
                 previousPageTop) * (this.zoomFactor / this.previousZoomFactor));
-            this.pdfViewerBase.viewerContainer.scrollTop = currentY - this.touchCenterY;
+            let pageGapValue = this.zoomFactor - this.previousZoomFactor > 0 ? -this.pdfViewerBase.pageGap * (this.zoomFactor / this.previousZoomFactor) : this.pdfViewerBase.pageGap * (this.previousZoomFactor / this.zoomFactor);
+            this.pdfViewerBase.viewerContainer.scrollTop = canvasCurrentY - this.touchCenterY + pageGapValue / this.pdfViewerBase.zoomInterval;
             // update scroll left for the viewer container based on pinch zoom factor
-            let prevValue = (currentPageBounds.width * this.previousZoomFactor) / currentPageBounds.width;
-            let scaleCorrectionFactor = this.zoomFactor / prevValue - 1;
-            let scrollX = this.touchCenterX - currentPageBounds.left;
+            const previousWidthFactor = (currentPageBounds.width * this.previousZoomFactor) / currentPageBounds.width;
+            const scaleCorrectionFactor = this.zoomFactor / previousWidthFactor - 1;
+            const scrollX = this.touchCenterX - currentPageBoundsLeft;
+            this.pdfViewerBase.viewerContainer.scrollLeft += scrollX * scaleCorrectionFactor;
+        }
+    }
+    calculateScrollValuesOnMouse(scrollValue) {
+        const pageIndex = this.pdfViewerBase.currentPageNumber - 1;
+        const currentPageCanvas = this.pdfViewerBase.getElement('_pageDiv_' + pageIndex);
+        if (currentPageCanvas) {
+            let pointInViewer;
+            const currentPageBounds = currentPageCanvas.getBoundingClientRect();
+            if (this.pdfViewer.enableRtl) {
+                pointInViewer = this.positionInViewer(currentPageBounds.right, currentPageBounds.top);
+            }
+            else {
+                pointInViewer = this.positionInViewer(currentPageBounds.left, currentPageBounds.top);
+            }
+            let currentPageBoundsLeft = pointInViewer.x;
+            let currentPageBoundsTop = pointInViewer.y;
+            // update scroll top for the viewer container based on mouse zoom factor
+            const previousPageTop = (currentPageBoundsTop) * this.previousZoomFactor;
+            const canvasPreviousY = scrollValue + this.mouseCenterY;
+            // eslint-disable-next-line max-len
+            const canvasCurrentY = (currentPageBoundsTop) * this.zoomFactor + ((canvasPreviousY - previousPageTop) < 0 ? canvasPreviousY - previousPageTop : (canvasPreviousY -
+                // eslint-disable-next-line max-len
+                previousPageTop) * (this.zoomFactor / this.previousZoomFactor));
+            // eslint-disable-next-line max-len
+            let pageGapValue = this.zoomFactor - this.previousZoomFactor > 0 ? -this.pdfViewerBase.pageGap * (this.zoomFactor / this.previousZoomFactor) : this.pdfViewerBase.pageGap * (this.previousZoomFactor / this.zoomFactor);
+            if (this.pdfViewerBase.isTouchPad && !this.pdfViewerBase.isMacSafari) {
+                pageGapValue = pageGapValue / this.pdfViewerBase.zoomInterval;
+            }
+            this.pdfViewerBase.viewerContainer.scrollTop = canvasCurrentY - this.mouseCenterY + pageGapValue;
+            // update scroll left for the viewer container based on mouse zoom factor
+            const previousWidthFactor = (currentPageBounds.width * this.previousZoomFactor) / currentPageBounds.width;
+            const scaleCorrectionFactor = this.zoomFactor / previousWidthFactor - 1;
+            const scrollX = this.mouseCenterX - currentPageBoundsLeft;
             this.pdfViewerBase.viewerContainer.scrollLeft += scrollX * scaleCorrectionFactor;
         }
     }
@@ -26905,9 +27133,11 @@ class Magnification {
         let currentDifference = Math.sqrt(Math.pow((pointX1 - pointX2), 2) + Math.pow((pointY1 - pointY2), 2));
         if (this.previousTouchDifference > -1) {
             if (currentDifference > this.previousTouchDifference) {
+                this.pinchStep = this.getPinchStep(currentDifference, this.previousTouchDifference);
                 this.pinchOut();
             }
             else if (currentDifference < this.previousTouchDifference) {
+                this.pinchStep = this.getPinchStep(this.previousTouchDifference, currentDifference);
                 this.pinchIn();
             }
         }
@@ -27020,19 +27250,24 @@ class Magnification {
             this.pdfViewer.toolbarModule.showToolbar(false);
         }
         let scrollValue = this.pdfViewerBase.viewerContainer.scrollTop;
-        if (!this.isTapToFitZoom) {
-            if (this.zoomFactor < 2) {
-                this.zoomTo(200);
+        if (!this.pdfViewer.selectedItems.annotations[0]) {
+            this.isDoubleTapZoom = true;
+            if (!this.isTapToFitZoom) {
+                if (this.zoomFactor < 2) {
+                    this.zoomTo(200);
+                }
+                else {
+                    this.fitToWidth();
+                }
             }
             else {
                 this.fitToWidth();
             }
+            this.calculateScrollValues(scrollValue);
+            this.isTapToFitZoom = !this.isTapToFitZoom;
+            setTimeout(() => { this.isMagnified = false; }, 500);
+            this.isDoubleTapZoom = false;
         }
-        else {
-            this.fitToWidth();
-        }
-        this.calculateScrollValues(scrollValue);
-        this.isTapToFitZoom = !this.isTapToFitZoom;
     }
     downwardScrollFitPage(currentPageIndex) {
         if (currentPageIndex !== (this.pdfViewerBase.pageCount - 1)) {
@@ -27067,6 +27302,32 @@ class Magnification {
     getModuleName() {
         return 'Magnification';
     }
+    /**
+    * Returns the pinch step value.
+    * @param higherValue
+    * @param lowerValue
+    */
+    getPinchStep(higherValue, lowerValue) {
+        let defaultPinchStep = 0.02; // Default pinch step value.
+        let higherPinchStep = 1; // higher pinch step value.
+        let pinchstep = (higherValue - lowerValue) / 100;
+        if (pinchstep < defaultPinchStep) {
+            pinchstep = defaultPinchStep;
+        }
+        else if (pinchstep > higherPinchStep) {
+            pinchstep = 0.1; // set the pinch step as 0.1 if the pinch reaches the higher pinch step value.
+        }
+        return pinchstep;
+    }
+    /**
+    * Returns Point value respect to Main container.
+    * @param pointX
+    * @param pointY
+    */
+    positionInViewer(pointX, pointY) {
+        let mainRect = this.pdfViewerBase.mainContainer.getBoundingClientRect();
+        return { x: pointX - mainRect.left, y: pointY - mainRect.top };
+    }
 }
 
 /**
@@ -27812,7 +28073,9 @@ class Toolbar$1 {
     showToolbar(enableToolbar) {
         let toolbar = this.toolbarElement;
         if (enableToolbar) {
-            toolbar.style.display = 'block';
+            if (toolbar) {
+                toolbar.style.display = 'block';
+            }
             if (Browser.isDevice && this.pdfViewer.toolbarModule && this.pdfViewer.toolbarModule.annotationToolbarModule) {
                 this.pdfViewer.toolbarModule.annotationToolbarModule.hideMobileAnnotationToolbar();
             }
@@ -36534,15 +36797,18 @@ __decorate$2([
 __decorate$2([
     Property(true)
 ], PdfViewer.prototype, "enableZoomOptimization", void 0);
+__decorate$2([
+    Property([500])
+], PdfViewer.prototype, "retryStatusCodes", void 0);
+__decorate$2([
+    Property(0)
+], PdfViewer.prototype, "retryTimeout", void 0);
 __decorate$2([
     Property(false)
 ], PdfViewer.prototype, "isExtractText", void 0);
 __decorate$2([
     Property(true)
 ], PdfViewer.prototype, "enableTaggedPDF", void 0);
-__decorate$2([
-    Property([500])
-], PdfViewer.prototype, "retryStatusCodes", void 0);
 __decorate$2([
     Property({ showTooltip: true, toolbarItems: ['OpenOption', 'UndoRedoTool', 'PageNavigationTool', 'MagnificationTool', 'PanTool', 'SelectionTool', 'CommentTool', 'AnnotationEditTool', 'FreeTextAnnotationOption', 'InkAnnotationOption', 'ShapeAnnotationOption', 'StampAnnotation', 'SignatureOption', 'SearchOption', 'PrintOption', 'DownloadOption'] })
 ], PdfViewer.prototype, "toolbarSettings", void 0);