Zoom dans le PDF en mode desktop avec ctrl et la molette ou ctrl + -

public/js/app.js

@@ -357,6 +357,25 @@ loadingTask.promise.then(function(pdf) {
             activeCanvas.add(copiedObject).renderAll();
             return;
         }
+
+        if(event.ctrlKey && (event.key == 'à' || event.key == '0')) {
+            autoZoom();
+            event.preventDefault() && event.stopPropagation();
+
+            return;
+        }
+        if(event.ctrlKey && (event.key == '=' || event.key == '+')) {
+            zoomChange(1);
+            event.preventDefault() && event.stopPropagation();
+
+            return;
+        }
+        if(event.ctrlKey && event.key == '-') {
+            zoomChange(-1);
+            event.preventDefault() && event.stopPropagation();
+
+            return;
+        }
     });
     
     var addSvgInCanvas = function(canvas, item, x, y) {
@@ -389,8 +408,10 @@ loadingTask.promise.then(function(pdf) {
         });
     }
     var resizeTimeout;
+    var currentScale = 1.5;
     var windowWidth = window.innerWidth;
     window.addEventListener('resize', function(event) {
+        event.preventDefault() && event.stopPropagation();
         if(windowWidth == window.innerWidth) {
             return;
         }
@@ -404,24 +425,77 @@ loadingTask.promise.then(function(pdf) {
         }
         menu.classList.remove('d-md-block');
         menu.classList.remove('d-none');
-        clearTimeout(resizeTimeout);
+        
-        resizeTimeout = setTimeout(resizePDF, 250);
+        autoZoom();
     });
-    var resizePDF = function () {
+    document.addEventListener('wheel', function(event) {
+        if(!event.ctrlKey) {
+            return;
+        }
+        event.preventDefault() && event.stopPropagation();
+        
+        if(event.deltaY > 0) {
+            zoomChange(-1)
+        } else {
+            zoomChange(1)
+        }
+    }, { passive: false });
+    
+    var autoZoom = function() {
+        clearTimeout(resizeTimeout);
+        resizeTimeout = setTimeout(resizePDF, 100);
+    }
+    
+    var zoomChange = function (inOrOut) {
+        if(resizeTimeout) {
+            return;
+        }
+        
+        var deltaScale = 0.2 * inOrOut;
+        
+        if(currentScale + deltaScale < 0) {
+            return 
+        }
+        if(currentScale + deltaScale > 3) {
+            return 
+        }
+        
+        clearTimeout(resizeTimeout);
+        currentScale += deltaScale;
+        
+        console.log(currentScale);
+
+        resizeTimeout = setTimeout(resizePDF(currentScale), 50);
+    }
+    
+    var resizePDF = function (scale = 'auto') {
+        renderComplete = true;
+        pdfRenderTasks.forEach(function(renderTask) {
+            if(!renderTask) {
+                renderComplete = false;
+            }
+        });
+        
+        if(!renderComplete) {
+            clearTimeout(resizeTimeout);
+            resizeTimeout = setTimeout(function(){ resizePDF(scale) }, 50);
+            return;
+        }
+        
         pdfPages.forEach(function(page, pageIndex) {
             var renderTask = pdfRenderTasks[pageIndex];
-            if(!renderTask) {
+            
-                clearTimeout(resizeTimeout);
+            if(scale == 'auto' && page.getViewport({scale: 1.5}).width > document.getElementById('container-pages').clientWidth - 40) {
-                resizeTimeout = setTimeout(resizePDF, 250);
+                scale = (document.getElementById('container-pages').clientWidth - 40) / page.getViewport({scale: 1}).width;
-                return;
             }
-            var scale = 1.5;
+
+            if(scale == 'auto') {
+                scale = 1.5;
+            }
+
             var viewport = page.getViewport({scale: scale});
-            if(viewport.width > document.getElementById('container-pages').clientWidth - 40) {
+            currentScale = scale;
-                viewport = page.getViewport({scale: 1});
+
-                scale = (document.getElementById('container-pages').clientWidth - 40) / viewport.width;
-                viewport = page.getViewport({ scale: scale });
-            }
             var canvasPDF = document.getElementById('canvas-pdf-' + pageIndex);
             var context = canvasPDF.getContext('2d');
             canvasPDF.height = viewport.height;
@@ -442,7 +516,7 @@ loadingTask.promise.then(function(pdf) {
             canvasEdition.setHeight(canvasEdition.getHeight() * scaleMultiplier);
             canvasEdition.renderAll();
             canvasEdition.calcOffset();
-
+            
             var renderContext = {
               canvasContext: context,
               viewport: viewport,
@@ -453,6 +527,8 @@ loadingTask.promise.then(function(pdf) {
             renderTask = page.render(renderContext);
             renderTask.promise.then(function () {
                 pdfRenderTasks[pageIndex] = renderTask;
+                clearTimeout(resizeTimeout);
+                resizeTimeout = null;
             });
         });
     }
@@ -470,7 +546,7 @@ loadingTask.promise.then(function(pdf) {
           var pageIndex = page.pageNumber - 1;
           
           document.getElementById('form_pdf').insertAdjacentHTML('beforeend', '<input name="svg[' + pageIndex + ']" id="data-svg-' + pageIndex + '" type="hidden" value="" />');
-          document.getElementById('container-pages').insertAdjacentHTML('beforeend', '<div class="position-relative mt-2 d-inline-block" id="canvas-container-' + pageIndex +'"><canvas id="canvas-pdf-'+pageIndex+'" class="shadow"></canvas><div class="position-absolute top-0 start-0"><canvas id="canvas-edition-'+pageIndex+'"></canvas></div></div>');
+          document.getElementById('container-pages').insertAdjacentHTML('beforeend', '<div class="position-relative mt-1 ms-1 me-1 d-inline-block" id="canvas-container-' + pageIndex +'"><canvas id="canvas-pdf-'+pageIndex+'" class="shadow-sm"></canvas><div class="position-absolute top-0 start-0"><canvas id="canvas-edition-'+pageIndex+'"></canvas></div></div>');
           
           var canvasPDF = document.getElementById('canvas-pdf-' + pageIndex);
           var canvasEditionHTML = document.getElementById('canvas-edition-' + pageIndex);

templates/pdf.html.php

@@ -27,11 +27,11 @@
     <div class="container-fluid">
         <div style="height: 65px;" class="d-md-none"></div>
         <div class="row">
-            <div id="container-pages" class="col-xxl-9 col-xl-8 col-lg-7 col-md-6 col-sm-12 col-xs-12 text-center">
+            <div id="container-pages" style="overflow-x: auto" class="col-xxl-9 col-xl-8 col-lg-7 col-md-6 col-sm-12 col-xs-12 pt-1 pb-1 text-center">
             </div>
         </div>
         <div style="height: 55px;" class="d-md-none"></div>
-        <div class="offcanvas offcanvas-end show d-none d-md-block" data-bs-backdrop="false" data-bs-scroll="true" data-keyboard="false" tabindex="-1" id="offcanvasTop" aria-labelledby="offcanvasTopLabel">
+        <div class="offcanvas offcanvas-end show d-none d-md-block shadow-sm" data-bs-backdrop="false" data-bs-scroll="true" data-keyboard="false" tabindex="-1" id="offcanvasTop" aria-labelledby="offcanvasTopLabel">
             <div class="offcanvas-header">
                 <h5 id="offcanvasTopLabel">Signature du PDF</h5>
                 <button type="button" class="btn-close text-reset d-md-none" data-bs-dismiss="offcanvas" aria-label="Close"></button>