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

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

@@ -17978,6 +17978,37 @@ var PdfViewerBase = /** @class */ (function () {
          * @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
          */
@@ -18258,6 +18289,49 @@ var PdfViewerBase = /** @class */ (function () {
                 _this.isViewerMouseDown = false;
             }
         };
+        /**
+        * @param {any} event - The Wheel event.
+        * @returns {void}
+        */
+        this.detectTouchPad = function (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 = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+            _this.macGestureStartScale = _this.pdfViewer.magnification.zoomFactor;
+        };
+        /**
+         * @param {any} event - The Wheel event.
+         * @returns {void}
+         */
+        this.handleMacGestureChange = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+            var macX = event.clientX;
+            var macY = event.clientY;
+            var scale = Number((_this.macGestureStartScale * event.scale).toFixed(2));
+            if (!_this.isMacGestureActive) {
+                _this.isMacGestureActive = true;
+                _this.pdfViewer.magnification.initiateMouseZoom(macX, macY, scale * 100);
+                setTimeout(function () {
+                    _this.isMacGestureActive = false;
+                }, 70);
+            }
+        };
+        /**
+         * @param {any} event - The Wheel event.
+         * @returns {void}
+         */
+        this.handleMacGestureEnd = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
         this.viewerContainerOnMouseWheel = function (event) {
             _this.isViewerMouseWheel = true;
             if (_this.getRerenderCanvasCreated()) {
@@ -18271,13 +18345,17 @@ var PdfViewerBase = /** @class */ (function () {
                 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();
@@ -18766,8 +18844,8 @@ var PdfViewerBase = /** @class */ (function () {
             _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);
@@ -18796,7 +18874,6 @@ var PdfViewerBase = /** @class */ (function () {
                 _this.pdfViewer.textSelectionModule.initiateTouchSelection(event, _this.touchClientX, _this.touchClientY);
                 if (Browser.isDevice) {
                     clearTimeout(_this.singleTapTimer);
-                    _this.singleTapTimer = null;
                     _this.tapCount = 0;
                 }
             }
@@ -20314,7 +20391,16 @@ var PdfViewerBase = /** @class */ (function () {
         }
         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', function (e) { return e.preventDefault(); });
+            window.addEventListener('gesturechange', function (e) { return e.preventDefault(); });
+            window.addEventListener('gestureend', function (e) { return 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);
@@ -20338,6 +20424,12 @@ var PdfViewerBase = /** @class */ (function () {
         }
         else {
             this.viewerContainer.addEventListener('touchstart', this.viewerContainerOnTouchStart);
+            if (this.isWebkitMobile && this.isDeviceiOS) {
+                // eslint-disable-next-line max-len
+                this.viewerContainer.addEventListener("touchmove", function (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);
@@ -20351,7 +20443,16 @@ var PdfViewerBase = /** @class */ (function () {
         }
         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', function (e) { return e.preventDefault(); });
+            window.removeEventListener('gesturechange', function (e) { return e.preventDefault(); });
+            window.removeEventListener('gestureend', function (e) { return 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);
@@ -20372,6 +20473,12 @@ var PdfViewerBase = /** @class */ (function () {
         }
         else {
             this.viewerContainer.removeEventListener('touchstart', this.viewerContainerOnTouchStart);
+            if (this.isWebkitMobile && this.isDeviceiOS) {
+                // eslint-disable-next-line max-len
+                this.viewerContainer.removeEventListener("touchmove", function (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);
@@ -20487,30 +20594,66 @@ var PdfViewerBase = /** @class */ (function () {
         }
         this.isViewerContainerDoubleClick = false;
     };
-    PdfViewerBase.prototype.handleTaps = function (touchPoints) {
+    PdfViewerBase.prototype.handleTaps = function (touchPoints, event) {
         var _this = this;
-        if (!this.singleTapTimer) {
-            this.singleTapTimer = setTimeout(function () {
-                _this.onSingleTap(touchPoints);
-                // tslint:disable-next-line
-            }, 300);
-            this.tapCount++;
+        //EJ2CORE-813 - Implemented focus removing logic for iOS devices
+        if (this.isDeviceiOS) {
+            var obj = findActiveElement(event, this, this.pdfViewer);
+            // eslint-disable-next-line
+            var isRemoveFocus_1 = !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(function () {
+                    if (isRemoveFocus_1) {
+                        _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(function () {
+                    _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);
+                }
             }
         }
     };
     PdfViewerBase.prototype.handleTextBoxTaps = function (touchPoints) {
         var _this = this;
-        setTimeout(function () { _this.inputTapCount = 0; }, 300);
+        setTimeout(function () {
+            _this.inputTapCount = 0;
+        }, 300);
         this.inputTapCount++;
-        // tslint:disable-next-line
-        var timer = setTimeout(function () { _this.onTextBoxDoubleTap(touchPoints); }, 200);
+        if (this.isDeviceiOS) {
+            // eslint-disable-next-line
+            this.onTextBoxDoubleTap(touchPoints);
+        }
+        else {
+            var timer = setTimeout(function () {
+                _this.onTextBoxDoubleTap(touchPoints);
+            }, 200);
+        }
         if (this.inputTapCount > 2) {
             this.inputTapCount = 0;
         }
@@ -20609,7 +20752,7 @@ var PdfViewerBase = /** @class */ (function () {
         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();
                 }
@@ -21267,7 +21410,7 @@ var PdfViewerBase = /** @class */ (function () {
         var 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);
@@ -25552,9 +25695,11 @@ var AjaxHandler = /** @class */ (function () {
          * @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
@@ -25564,6 +25709,7 @@ var AjaxHandler = /** @class */ (function () {
     AjaxHandler.prototype.send = function (jsonObj) {
         var _this = this;
         this.httpRequest = new XMLHttpRequest();
+        this.httpRequest.timeout = this.retryTimeout;
         if (!this.mode) {
             setTimeout(function () { _this.sendRequest(jsonObj); });
         }
@@ -25579,7 +25725,22 @@ var AjaxHandler = /** @class */ (function () {
                 _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 = function () {
+            var isSkip = false;
+            // tslint:disable-next-line
+            var 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);
@@ -25588,7 +25749,7 @@ var AjaxHandler = /** @class */ (function () {
         this.httpRequest.onerror = function () { _this.error(_this); };
     };
     // tslint:disable-next-line
-    AjaxHandler.prototype.resendRequest = function (proxy, jsonObj) {
+    AjaxHandler.prototype.resendRequest = function (proxy, jsonObj, isTimeout) {
         var isSkip = false;
         var status = proxy.httpRequest.status;
         var statusString = this.retryStatusCodes.indexOf(status) !== -1;
@@ -25615,7 +25776,7 @@ var AjaxHandler = /** @class */ (function () {
                 }
             }
         }
-        if (statusString || isSkip) {
+        if (statusString || isSkip || isTimeout) {
             isSkip = true;
             this.retryCount--;
             proxy.send(jsonObj);
@@ -26267,7 +26428,7 @@ var Magnification = /** @class */ (function () {
         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;
@@ -26277,6 +26438,8 @@ var Magnification = /** @class */ (function () {
         this.rerenderInterval = null;
         this.touchCenterX = 0;
         this.touchCenterY = 0;
+        this.mouseCenterX = 0;
+        this.mouseCenterY = 0;
         this.pageRerenderCount = 0;
         this.imageObjects = [];
         this.topValue = 0;
@@ -26313,6 +26476,10 @@ var Magnification = /** @class */ (function () {
          * @private
          */
         this.isAutoZoom = false;
+        /**
+         * @private
+         */
+        this.isDoubleTapZoom = false;
         this.isWebkitMobile = false;
         this.pdfViewer = pdfViewer;
         this.pdfViewerBase = viewerBase;
@@ -26326,11 +26493,13 @@ var Magnification = /** @class */ (function () {
      * @returns void
      */
     Magnification.prototype.zoomTo = function (zoomValue) {
-        if (zoomValue < 10) {
-            zoomValue = 10;
+        var MaximumZoomPercentage = 400;
+        var 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;
@@ -26470,6 +26639,16 @@ var Magnification = /** @class */ (function () {
             return parseInt(((viewerHeight / highestHeight) * 100).toString());
         }
     };
+    /**
+     * Initiating cursor based zoom.
+     * @private
+     */
+    Magnification.prototype.initiateMouseZoom = function (pointX, pointY, zoomValue) {
+        var pointInViewer = this.positionInViewer(pointX, pointY);
+        this.mouseCenterX = pointInViewer.x;
+        this.mouseCenterY = pointInViewer.y;
+        this.zoomTo(zoomValue);
+    };
     /**
      * Performs pinch in operation
      */
@@ -26479,8 +26658,11 @@ var Magnification = /** @class */ (function () {
         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);
@@ -26500,8 +26682,8 @@ var Magnification = /** @class */ (function () {
         this.fitType = null;
         var temporaryZoomFactor = this.zoomFactor + this.pinchStep;
         if (Browser.isDevice) {
-            if (temporaryZoomFactor > 2) {
-                temporaryZoomFactor = 2;
+            if (temporaryZoomFactor > 4) {
+                temporaryZoomFactor = 4;
             }
         }
         else {
@@ -26599,8 +26781,9 @@ var Magnification = /** @class */ (function () {
      * @private
      */
     Magnification.prototype.setTouchPoints = function (clientX, clientY) {
-        this.touchCenterX = clientX;
-        this.touchCenterY = clientY;
+        var pointInViewer = this.positionInViewer(clientX, clientY);
+        this.touchCenterX = pointInViewer.x;
+        this.touchCenterY = pointInViewer.y;
     };
     /**
      * @private
@@ -26609,8 +26792,9 @@ var Magnification = /** @class */ (function () {
         this.isPinchScrolled = false;
         this.isMagnified = false;
         this.reRenderPageNumber = this.pdfViewerBase.currentPageNumber;
-        this.touchCenterX = (pointX1 + pointX2) / 2;
-        this.touchCenterY = (pointY1 + pointY2) / 2;
+        var pointInViewer = this.positionInViewer((pointX1 + pointX2) / 2, (pointY1 + pointY2) / 2);
+        this.touchCenterX = pointInViewer.x;
+        this.touchCenterY = pointInViewer.y;
         this.zoomOverPages(pointX1, pointY1, pointX2, pointY2);
     };
     Magnification.prototype.magnifyPages = function () {
@@ -26621,7 +26805,7 @@ var Magnification = /** @class */ (function () {
         if (!this.pdfViewerBase.documentLoaded) {
             this.isPagesZoomed = true;
         }
-        var scrollValue = this.getMagnifiedValue(this.pdfViewerBase.viewerContainer.scrollTop);
+        var scrollValue = this.pdfViewerBase.viewerContainer.scrollTop;
         if (this.pdfViewer.textSelectionModule) {
             this.pdfViewer.textSelectionModule.maintainSelectionOnZoom(false, true);
         }
@@ -26630,6 +26814,7 @@ var Magnification = /** @class */ (function () {
         }
         this.updatePageLocation();
         this.resizeCanvas(this.reRenderPageNumber);
+        this.calculateScrollValuesOnMouse(scrollValue);
         if (this.pdfViewer.textSelectionModule) {
             this.pdfViewer.textSelectionModule.resizeTouchElements();
         }
@@ -26645,7 +26830,6 @@ var Magnification = /** @class */ (function () {
             var proxy_1 = this;
             this.pdfViewerBase.renderedPagesList = [];
             this.pdfViewerBase.pinchZoomStorage = [];
-            this.pdfViewerBase.viewerContainer.scrollTop = scrollValue;
             if (!this.pdfViewerBase.documentLoaded) {
                 this.magnifyPageRerenderTimer = setTimeout(function () { proxy_1.rerenderMagnifiedPages(); }, 800);
             }
@@ -26755,22 +26939,66 @@ var Magnification = /** @class */ (function () {
         var pageIndex = this.pdfViewerBase.currentPageNumber - 1;
         var currentPageCanvas = this.pdfViewerBase.getElement('_pageDiv_' + pageIndex);
         if (currentPageCanvas) {
+            var pointInViewer = void 0;
             var currentPageBounds = currentPageCanvas.getBoundingClientRect();
+            if (this.pdfViewer.enableRtl && !this.isDoubleTapZoom) {
+                pointInViewer = this.positionInViewer(currentPageBounds.right, currentPageBounds.top);
+            }
+            else {
+                pointInViewer = this.positionInViewer(currentPageBounds.left, currentPageBounds.top);
+            }
+            var currentPageBoundsLeft = pointInViewer.x;
+            var currentPageBoundsTop = pointInViewer.y;
             // update scroll top for the viewer container based on pinch zoom factor
-            var previousPageTop = (currentPageBounds.top) * this.previousZoomFactor;
-            var previousY = scrollValue + this.touchCenterY;
-            // tslint:disable-next-line:max-line-length
-            var currentY = (currentPageBounds.top) * this.zoomFactor + ((previousY - previousPageTop) < 0 ? previousY - previousPageTop : (previousY -
-                // tslint:disable-next-line:max-line-length
+            var previousPageTop = (currentPageBoundsTop) * this.previousZoomFactor;
+            var canvasPreviousY = scrollValue + this.touchCenterY;
+            // eslint-disable-next-line max-len
+            var 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;
+            var 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
-            var prevValue = (currentPageBounds.width * this.previousZoomFactor) / currentPageBounds.width;
-            var scaleCorrectionFactor = this.zoomFactor / prevValue - 1;
-            var scrollX_1 = this.touchCenterX - currentPageBounds.left;
+            var previousWidthFactor = (currentPageBounds.width * this.previousZoomFactor) / currentPageBounds.width;
+            var scaleCorrectionFactor = this.zoomFactor / previousWidthFactor - 1;
+            var scrollX_1 = this.touchCenterX - currentPageBoundsLeft;
             this.pdfViewerBase.viewerContainer.scrollLeft += scrollX_1 * scaleCorrectionFactor;
         }
     };
+    Magnification.prototype.calculateScrollValuesOnMouse = function (scrollValue) {
+        var pageIndex = this.pdfViewerBase.currentPageNumber - 1;
+        var currentPageCanvas = this.pdfViewerBase.getElement('_pageDiv_' + pageIndex);
+        if (currentPageCanvas) {
+            var pointInViewer = void 0;
+            var currentPageBounds = currentPageCanvas.getBoundingClientRect();
+            if (this.pdfViewer.enableRtl) {
+                pointInViewer = this.positionInViewer(currentPageBounds.right, currentPageBounds.top);
+            }
+            else {
+                pointInViewer = this.positionInViewer(currentPageBounds.left, currentPageBounds.top);
+            }
+            var currentPageBoundsLeft = pointInViewer.x;
+            var currentPageBoundsTop = pointInViewer.y;
+            // update scroll top for the viewer container based on mouse zoom factor
+            var previousPageTop = (currentPageBoundsTop) * this.previousZoomFactor;
+            var canvasPreviousY = scrollValue + this.mouseCenterY;
+            // eslint-disable-next-line max-len
+            var 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
+            var 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
+            var previousWidthFactor = (currentPageBounds.width * this.previousZoomFactor) / currentPageBounds.width;
+            var scaleCorrectionFactor = this.zoomFactor / previousWidthFactor - 1;
+            var scrollX_2 = this.mouseCenterX - currentPageBoundsLeft;
+            this.pdfViewerBase.viewerContainer.scrollLeft += scrollX_2 * scaleCorrectionFactor;
+        }
+    };
     Magnification.prototype.rerenderOnScroll = function () {
         var _this = this;
         this.isPinchZoomed = false;
@@ -27133,9 +27361,11 @@ var Magnification = /** @class */ (function () {
         var 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();
             }
         }
@@ -27244,23 +27474,29 @@ var Magnification = /** @class */ (function () {
      * @private
      */
     Magnification.prototype.onDoubleTapMagnification = function () {
+        var _this = this;
         if (this.pdfViewer.toolbarModule) {
             this.pdfViewer.toolbarModule.showToolbar(false);
         }
         var 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(function () { _this.isMagnified = false; }, 500);
+            this.isDoubleTapZoom = false;
         }
-        else {
-            this.fitToWidth();
-        }
-        this.calculateScrollValues(scrollValue);
-        this.isTapToFitZoom = !this.isTapToFitZoom;
     };
     Magnification.prototype.downwardScrollFitPage = function (currentPageIndex) {
         if (currentPageIndex !== (this.pdfViewerBase.pageCount - 1)) {
@@ -27295,6 +27531,32 @@ var Magnification = /** @class */ (function () {
     Magnification.prototype.getModuleName = function () {
         return 'Magnification';
     };
+    /**
+    * Returns the pinch step value.
+    * @param higherValue
+    * @param lowerValue
+    */
+    Magnification.prototype.getPinchStep = function (higherValue, lowerValue) {
+        var defaultPinchStep = 0.02; // Default pinch step value.
+        var higherPinchStep = 1; // higher pinch step value.
+        var 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
+    */
+    Magnification.prototype.positionInViewer = function (pointX, pointY) {
+        var mainRect = this.pdfViewerBase.mainContainer.getBoundingClientRect();
+        return { x: pointX - mainRect.left, y: pointY - mainRect.top };
+    };
     return Magnification;
 }());
 
@@ -28045,7 +28307,9 @@ var Toolbar$1 = /** @class */ (function () {
     Toolbar$$1.prototype.showToolbar = function (enableToolbar) {
         var 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();
             }
@@ -37023,15 +37287,18 @@ var PdfViewer = /** @class */ (function (_super) {
     __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);