@june24/expo-pdf-reader 0.1.21 → 0.1.22

package/android/src/main/java/expo/modules/pdfreader/ExpoPdfReaderView.kt

@@ -384,6 +384,7 @@ class ExpoPdfReaderView(context: Context, appContext: AppContext) : ExpoView(con
         addView(scrollView)
         scrollView.viewTreeObserver.addOnScrollChangedListener {
             notifyPageChange()
+            scrollView.post { updateVisiblePages() }
         }
         viewTreeObserver.addOnGlobalLayoutListener {
             if (width <= 0) {
@@ -660,27 +661,36 @@ class ExpoPdfReaderView(context: Context, appContext: AppContext) : ExpoView(con
             return
         }
         val viewWidth = width.coerceAtLeast(1)
+        val viewHeight = height.coerceAtLeast(1)
         val isTwoUp = displayMode == "twoUp" || displayMode == "twoUpContinuous"
+        val isSingle = displayMode == "single"
         val effectiveWidth = if (isTwoUp) viewWidth / 2 else viewWidth
         scope.launch {
             val w = effectiveWidth
+            val minSlotHeight = if (isSingle) viewHeight else 0
             val result = withContext(Dispatchers.Default) {
                 (0 until renderer.pageCount).map { i ->
                     val page = renderer.openPage(i)
                     try {
-                        val pageH = (w.toFloat() * page.height / page.width).toInt()
+                        val naturalH = (w.toFloat() * page.height / page.width).toInt()
+                        val pageH = if (isSingle) maxOf(naturalH, minSlotHeight) else naturalH
                         Triple(
                             i,
                             pageH,
                             Pair(page.width.toFloat(), page.height.toFloat())
                         )
                     } finally {
-                        page.close()
+                        try {
+                            page.close()
+                        } catch (e: Exception) {
+                            // Renderer may have been closed on main thread (e.g. resetRenderer)
+                        }
                     }
                 }
             }
             if (!isActive) return@launch
             withContext(Dispatchers.Main) {
+                if (pdfRenderer == null) return@launch
                 pageHeights.clear()
                 rowHeights.clear()
                 pageWidthsPdf.clear()
@@ -783,10 +793,12 @@ class ExpoPdfReaderView(context: Context, appContext: AppContext) : ExpoView(con
             }
             return (pageHeights.size - 1).coerceAtLeast(0)
         }
+        val viewportCenter = scrollY + scrollView.height / 2
         var offset = 0
         for (i in pageHeights.indices) {
-            if (scrollY < offset + pageHeights[i] / 2) return i
-            offset += pageHeights[i] + gap
+            val pageEnd = offset + pageHeights[i]
+            if (viewportCenter < pageEnd) return i
+            offset = pageEnd + gap
         }
         return (pageHeights.size - 1).coerceAtLeast(0)
     }
@@ -794,8 +806,12 @@ class ExpoPdfReaderView(context: Context, appContext: AppContext) : ExpoView(con
     private fun updateVisiblePages() {
         val renderer = pdfRenderer ?: return
         val currentPage = currentPageFromScroll()
-        val from = (currentPage - renderWindowBefore).coerceAtLeast(0)
-        val to = (currentPage + renderWindowAfter).coerceAtMost(renderer.pageCount - 1)
+        val (from, to) = if (displayMode == "single") {
+            currentPage to currentPage
+        } else {
+            (currentPage - renderWindowBefore).coerceAtLeast(0) to
+                (currentPage + renderWindowAfter).coerceAtMost(renderer.pageCount - 1)
+        }
 
         for (i in pageViews.indices) {
             if (i in from..to) continue

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@june24/expo-pdf-reader",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "description": "A PDF reader for Expo apps with annotation and zoom controls",
   "homepage": "git@gitlab.com:june_241/expo-pdf-reader.git",
   "main": "build/index.js",