nodebb-plugin-pdf-secure 1.2.21 → 1.2.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-pdf-secure",
-  "version": "1.2.21",
+  "version": "1.2.23",
   "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

@@ -1187,7 +1187,7 @@
             height: calc(var(--bottom-bar-height) + var(--safe-area-bottom));
             background: var(--bg-secondary);
             border-top: 1px solid var(--border-color);
-            z-index: 100;
+            z-index: 260; /* Above backdrop (250) so dropdowns inside are clickable */
             padding: 0 8px;
             padding-bottom: var(--safe-area-bottom);
             /* Flex layout: scrollable tools + fixed fullscreen button */
@@ -1381,13 +1381,15 @@
         /* ==========================================
            FULLSCREEN STATE (simulated fullscreen on mobile)
            ========================================== */
-        /* Ensure bottom toolbar is visible and viewer container makes room for it */
-        body.viewer-fullscreen #bottomToolbar {
-            display: flex;
-        }
+        /* Ensure bottom toolbar + viewerContainer adjust in fullscreen on mobile/tablet only */
+        @media (max-width: 1024px) {
+            body.viewer-fullscreen #bottomToolbar {
+                display: flex;
+            }
 
-        body.viewer-fullscreen #viewerContainer {
-            bottom: calc(var(--bottom-bar-height) + var(--safe-area-bottom));
+            body.viewer-fullscreen #viewerContainer {
+                bottom: calc(var(--bottom-bar-height) + var(--safe-area-bottom));
+            }
         }
 
         /* ==========================================
@@ -1582,7 +1584,7 @@
             align-items: center;
             justify-content: center;
             background: linear-gradient(180deg, rgba(31,31,31,0.95) 0%, rgba(20,20,20,0.98) 100%);
-            z-index: 5;
+            z-index: 15;
             text-align: center;
             padding: 20px;
         }
@@ -2249,8 +2251,16 @@
                 pageEl.appendChild(overlay);
             }
 
+            function isOverlayTampered(overlay) {
+                var s = overlay.style;
+                return s.position !== 'absolute' || s.display !== 'flex' ||
+                    s.zIndex !== '15' || s.opacity !== '1' ||
+                    s.visibility !== 'visible' || s.pointerEvents !== 'auto';
+            }
+
             function resetOverlayCSS(overlay) {
-                overlay.style.cssText = 'position:absolute;top:0;left:0;right:0;bottom:0;display:flex;z-index:5;opacity:1;visibility:visible;pointer-events:auto;';
+                if (!isOverlayTampered(overlay)) return; // Skip if already correct (prevents observer loop)
+                overlay.style.cssText = 'position:absolute;top:0;left:0;right:0;bottom:0;display:flex;z-index:15;opacity:1;visibility:visible;pointer-events:auto;';
             }
 
             function applyPageLocks() {
@@ -2313,9 +2323,11 @@
                     for (var i = 0; i < mutations.length; i++) {
                         var target = mutations[i].target;
                         if (!target || !target.classList) continue;
-                        // Overlay CSS tampered - reset it
+                        // Overlay CSS tampered - reset only if values actually differ
                         if (target.classList.contains('page-lock-overlay')) {
-                            resetOverlayCSS(target);
+                            if (isOverlayTampered(target)) {
+                                resetOverlayCSS(target);
+                            }
                         }
                         // Blur class removed from locked page - re-add it
                         if (target.classList.contains('page') && !target.classList.contains('page-locked-blur')) {
@@ -2648,10 +2660,13 @@
             function closeAllDropdowns() {
                 // Clean up swipe listeners
                 if (swipeAbortController) { swipeAbortController.abort(); swipeAbortController = null; }
-                // Reset inline transform from swipe gesture
+                // Reset inline transform and fixed positioning from dropdown
                 [highlightDropdown, drawDropdown, shapesDropdown, overflowDropdown].forEach(dd => {
                     dd.style.transform = '';
                     dd.style.transition = '';
+                    dd.style.position = '';
+                    dd.style.top = '';
+                    dd.style.left = '';
                 });
                 highlightDropdown.classList.remove('visible');
                 drawDropdown.classList.remove('visible');
@@ -2673,10 +2688,19 @@
                         dropdown.insertBefore(handle, dropdown.firstChild);
                     }
                     dropdown.classList.add('visible');
-                    // Show backdrop on mobile/tablet portrait
                     if (useBottomSheet) {
+                        // Show backdrop on mobile/tablet portrait
                         dropdownBackdrop.classList.add('visible');
                         setupBottomSheetSwipe(dropdown);
+                    } else {
+                        // Desktop/tablet landscape: use fixed positioning to escape toolbar overflow clipping
+                        const wrapper = e.target.closest('.toolbarBtnWithDropdown');
+                        if (wrapper) {
+                            const rect = wrapper.getBoundingClientRect();
+                            dropdown.style.position = 'fixed';
+                            dropdown.style.top = (rect.bottom + 4) + 'px';
+                            dropdown.style.left = rect.left + 'px';
+                        }
                     }
                 }
             }
@@ -2907,6 +2931,9 @@
 
             // Annotation Layer with Persistence
             async function injectAnnotationLayer(pageNum) {
+                // Skip annotation injection on locked pages
+                if (premiumInfo && !premiumInfo.isPremium && pageNum > 1) return;
+
                 const pageView = pdfViewer.getPageView(pageNum - 1);
                 if (!pageView?.div) return;