nodebb-plugin-pdf-secure 1.2.16 → 1.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-pdf-secure",
-  "version": "1.2.16",
+  "version": "1.2.17",
   "description": "Secure PDF viewer plugin for NodeBB - prevents downloading, enables canvas-only rendering with Premium group support",
   "main": "library.js",
   "repository": {

package/static/viewer.html

@@ -2708,63 +2708,29 @@
 
                 svg.addEventListener('touchstart', (e) => {
                     if (!currentTool || e.touches.length !== 1) return;
-
-                    // Eraser and select need immediate response
-                    if (currentTool === 'eraser' || currentTool === 'select') {
-                        e.preventDefault();
-                        startDraw(e, pageNum);
-                        touchDrawing = true;
-                        touchDrawDecided = true;
-                        return;
-                    }
-
-                    // For pen/highlight/shape: wait to decide scroll vs draw
-                    touchDrawDecided = false;
-                    touchDrawing = false;
+                    // In annotation mode, always draw immediately — no direction detection.
+                    // Pan and pinch-zoom are blocked at the container level when a tool is active.
+                    e.preventDefault();
                     touchStartX = e.touches[0].clientX;
                     touchStartYDraw = e.touches[0].clientY;
+                    startDraw(e, pageNum);
+                    touchDrawing = true;
+                    touchDrawDecided = true;
                 }, { passive: false, signal });
 
                 svg.addEventListener('touchmove', (e) => {
                     if (!currentTool || e.touches.length !== 1) return;
-
                     if (touchDrawing) {
-                        // Already decided: drawing
-                        e.preventDefault();
-                        draw(e);
-                        return;
-                    }
-
-                    if (touchDrawDecided) return; // decided scroll, let it through
-
-                    const dx = e.touches[0].clientX - touchStartX;
-                    const dy = e.touches[0].clientY - touchStartYDraw;
-
-                    if (Math.abs(dx) + Math.abs(dy) > 10) {
-                        touchDrawDecided = true;
-
-                        if (Math.abs(dy) > Math.abs(dx) * 2) {
-                            // Predominantly vertical → scroll (don't prevent default)
-                            return;
-                        }
-                        // Horizontal or diagonal → drawing
                         e.preventDefault();
-                        // Start draw from ORIGINAL touch position (not current 10px-offset position)
-                        const syntheticStart = {
-                            currentTarget: svg,
-                            touches: [{ clientX: touchStartX, clientY: touchStartYDraw }],
-                            preventDefault: () => { }
-                        };
-                        startDraw(syntheticStart, pageNum);
-                        // Then immediately draw to current position for continuity
                         draw(e);
-                        touchDrawing = true;
                     }
                 }, { passive: false, signal });
 
                 svg.addEventListener('touchend', (e) => {
-                    if (!touchDrawDecided && currentTool && currentTool !== 'eraser' && currentTool !== 'select') {
-                        // Tap without moving > 10px → draw a dot at touch position
+                    if (touchDrawing) {
+                        stopDraw(pageNum);
+                    } else if (currentTool && currentTool !== 'eraser' && currentTool !== 'select') {
+                        // Tap without moving → draw a dot at touch position
                         const syntheticStart = {
                             currentTarget: svg,
                             touches: [{ clientX: touchStartX, clientY: touchStartYDraw }],
@@ -2772,8 +2738,6 @@
                         };
                         startDraw(syntheticStart, pageNum);
                         stopDraw(pageNum);
-                    } else if (touchDrawing) {
-                        stopDraw(pageNum);
                     }
                     touchDrawDecided = false;
                     touchDrawing = false;
@@ -4651,6 +4615,11 @@
 
             container.addEventListener('touchstart', (e) => {
                 if (e.touches.length === 2) {
+                    // Block pinch-zoom when an annotation tool is active
+                    if (annotationMode && currentTool) {
+                        e.preventDefault();
+                        return;
+                    }
                     // Cancel any active drawing and clean up
                     if (isDrawing && currentDrawingPage) {
                         const savePage = currentDrawingPage;
@@ -4816,6 +4785,12 @@
                 container.addEventListener('touchmove', (e) => {
                     if (isPinching || e.touches.length !== 1) return;
 
+                    // Block all container scroll when an annotation tool is active
+                    if (annotationMode && currentTool) {
+                        e.preventDefault();
+                        return;
+                    }
+
                     const touchY = e.touches[0].clientY;
                     const deltaY = touchStartY - touchY; // positive = scrolling down