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

package/src/pdfviewer/magnification/magnification.js

@@ -19,7 +19,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;
@@ -29,6 +29,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;
@@ -65,6 +67,10 @@ var Magnification = /** @class */ (function () {
          * @private
          */
         this.isAutoZoom = false;
+        /**
+         * @private
+         */
+        this.isDoubleTapZoom = false;
         this.isWebkitMobile = false;
         this.pdfViewer = pdfViewer;
         this.pdfViewerBase = viewerBase;
@@ -78,11 +84,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;
@@ -222,6 +230,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
      */
@@ -231,8 +249,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);
@@ -252,8 +273,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 {
@@ -351,8 +372,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
@@ -361,8 +383,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 () {
@@ -373,7 +396,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);
         }
@@ -382,6 +405,7 @@ var Magnification = /** @class */ (function () {
         }
         this.updatePageLocation();
         this.resizeCanvas(this.reRenderPageNumber);
+        this.calculateScrollValuesOnMouse(scrollValue);
         if (this.pdfViewer.textSelectionModule) {
             this.pdfViewer.textSelectionModule.resizeTouchElements();
         }
@@ -397,7 +421,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);
             }
@@ -507,22 +530,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;
@@ -885,9 +952,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();
             }
         }
@@ -996,23 +1065,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)) {
@@ -1047,6 +1122,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;
 }());
 export { Magnification };

package/src/pdfviewer/pdfviewer-model.d.ts

@@ -2015,6 +2015,21 @@ export interface PdfViewerModel extends ComponentModel{
      */
     enableZoomOptimization?: boolean;
 
+    /**
+     * Specifies the response status codes for retrying a failed request with a "3xx", "4xx", or "5xx" response status code.
+     * The value can have multiple values, such as [500, 401, 400], and the default value is 500.
+     *
+     * @default [500]
+     */
+    retryStatusCodes?: number[];
+
+    /**
+     * The time span timeout for retries in seconds.
+     *
+     * @default 0
+     */
+    retryTimeout?: number;
+
     /**
      * Enable or disables the get the document text collections.
      * @default false
@@ -2027,14 +2042,6 @@ export interface PdfViewerModel extends ComponentModel{
      */
     enableTaggedPDF?: boolean;
 
-    /**
-     * Specifies the response status codes for retrying a failed request with a "3xx", "4xx", or "5xx" response status code.
-     * The value can have multiple values, such as [500, 401, 400], and the default value is 500.
-     *
-     * @default [500]
-     */
-    retryStatusCodes?: number[];
-
     /**
      * Defines the settings of the PdfViewer toolbar.
      */

package/src/pdfviewer/pdfviewer.d.ts

@@ -1679,6 +1679,19 @@ export declare class PdfViewer extends Component<HTMLElement> implements INotify
      * @default true
      */
     enableZoomOptimization: boolean;
+    /**
+     * Specifies the response status codes for retrying a failed request with a "3xx", "4xx", or "5xx" response status code.
+     * The value can have multiple values, such as [500, 401, 400], and the default value is 500.
+     *
+     * @default [500]
+     */
+    retryStatusCodes: number[];
+    /**
+     * The time span timeout for retries in seconds.
+     *
+     * @default 0
+     */
+    retryTimeout: number;
     /**
      * Enable or disables the get the document text collections.
      * @default false
@@ -1689,13 +1702,6 @@ export declare class PdfViewer extends Component<HTMLElement> implements INotify
      * @default true
      */
     enableTaggedPDF: boolean;
-    /**
-     * Specifies the response status codes for retrying a failed request with a "3xx", "4xx", or "5xx" response status code.
-     * The value can have multiple values, such as [500, 401, 400], and the default value is 500.
-     *
-     * @default [500]
-     */
-    retryStatusCodes: number[];
     /**
      * Defines the settings of the PdfViewer toolbar.
      */

package/src/pdfviewer/pdfviewer.js

@@ -2691,15 +2691,18 @@ var PdfViewer = /** @class */ (function (_super) {
     __decorate([
         Property(true)
     ], PdfViewer.prototype, "enableZoomOptimization", void 0);
+    __decorate([
+        Property([500])
+    ], PdfViewer.prototype, "retryStatusCodes", void 0);
+    __decorate([
+        Property(0)
+    ], PdfViewer.prototype, "retryTimeout", void 0);
     __decorate([
         Property(false)
     ], PdfViewer.prototype, "isExtractText", void 0);
     __decorate([
         Property(true)
     ], PdfViewer.prototype, "enableTaggedPDF", void 0);
-    __decorate([
-        Property([500])
-    ], PdfViewer.prototype, "retryStatusCodes", void 0);
     __decorate([
         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);

package/src/pdfviewer/toolbar/toolbar.js

@@ -152,7 +152,9 @@ var Toolbar = /** @class */ (function () {
     Toolbar.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();
             }