@june24/expo-pdf-reader 0.1.18 → 0.1.20

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

@@ -96,8 +96,8 @@ class ExpoPdfReaderView(context: Context, appContext: AppContext) : ExpoView(con
     private var lastEmittedPageIndex = -1
     private var totalPageCount = 0
 
-    private val renderWindowBefore = 8
-    private val renderWindowAfter = 16
+    private val renderWindowBefore = 20
+    private val renderWindowAfter = 25
 
     // Annotation state
     private val pageAnnotations = mutableListOf<MutableList<Annotation>>()
@@ -405,13 +405,8 @@ class ExpoPdfReaderView(context: Context, appContext: AppContext) : ExpoView(con
 
     override fun onSizeChanged(w: Int, h: Int, oldW: Int, oldH: Int) {
         super.onSizeChanged(w, h, oldW, oldH)
-        if (w > 0 && pdfRenderer != null) {
-            if (w != oldW) {
-                pageHeights.clear()
-            }
-            if (pageHeights.isEmpty()) {
-                renderPdf()
-            }
+        if (w > 0 && pdfRenderer != null && pageHeights.isEmpty()) {
+            renderPdf()
         }
     }
 
@@ -557,11 +552,13 @@ class ExpoPdfReaderView(context: Context, appContext: AppContext) : ExpoView(con
         notifyAnnotationChange()
     }
 
+    private fun marginBetweenPages(): Int = if (displayMode == "single") 0 else 16
+
     private fun scrollToPage(pageIndex: Int) {
         if (pageHeights.isEmpty()) return
         var offset = 0
         for (i in 0 until pageIndex.coerceIn(0, pageHeights.size - 1)) {
-            offset += pageHeights[i] + 16
+            offset += pageHeights[i] + marginBetweenPages()
         }
         scrollView.post { scrollView.smoothScrollTo(0, offset) }
     }
@@ -619,7 +616,6 @@ class ExpoPdfReaderView(context: Context, appContext: AppContext) : ExpoView(con
         draggingPageIndex = -1
         dragStartBounds = null
         dragStartTouch = null
-        renderJob?.cancel()
     }
 
     private fun renderPdf() {
@@ -636,16 +632,23 @@ class ExpoPdfReaderView(context: Context, appContext: AppContext) : ExpoView(con
             updateVisiblePages()
             return
         }
-        renderJob?.cancel()
-        renderJob = scope.launch {
-            val w = width.coerceAtLeast(1)
+        val viewHeight = height.coerceAtLeast(1)
+        val viewWidth = width.coerceAtLeast(1)
+        val isSingle = displayMode == "single"
+        scope.launch {
+            val w = viewWidth
             val result = withContext(Dispatchers.Default) {
                 (0 until renderer.pageCount).map { i ->
                     val page = renderer.openPage(i)
                     try {
+                        val pageH = if (isSingle) {
+                            viewHeight
+                        } else {
+                            (w.toFloat() * page.height / page.width).toInt()
+                        }
                         Triple(
                             i,
-                            (w.toFloat() * page.height / page.width).toInt(),
+                            pageH,
                             Pair(page.width.toFloat(), page.height.toFloat())
                         )
                     } finally {
@@ -673,6 +676,7 @@ class ExpoPdfReaderView(context: Context, appContext: AppContext) : ExpoView(con
     private fun ensurePlaceholders(renderer: PdfRenderer) {
         container.removeAllViews()
         val pageCount = renderer.pageCount
+        val marginBetween = marginBetweenPages()
         pageViews = MutableList(pageCount) { null }
         overlayViews = MutableList(pageCount) { null }
         while (pageAnnotations.size < pageCount) {
@@ -683,7 +687,7 @@ class ExpoPdfReaderView(context: Context, appContext: AppContext) : ExpoView(con
                 layoutParams = LinearLayout.LayoutParams(
                     LinearLayout.LayoutParams.MATCH_PARENT,
                     pageHeights[i]
-                ).apply { setMargins(0, 0, 0, 16) }
+                ).apply { setMargins(0, 0, 0, marginBetween) }
                 setBackgroundColor(Color.LTGRAY)
             }
             val overlay = AnnotationOverlayView(context, i).apply {
@@ -702,9 +706,10 @@ class ExpoPdfReaderView(context: Context, appContext: AppContext) : ExpoView(con
         if (pageHeights.isEmpty()) return 0
         val scrollY = scrollView.scrollY
         var offset = 0
+        val gap = marginBetweenPages()
         for (i in pageHeights.indices) {
             if (scrollY < offset + pageHeights[i] / 2) return i
-            offset += pageHeights[i] + 16
+            offset += pageHeights[i] + gap
         }
         return (pageHeights.size - 1).coerceAtLeast(0)
     }
@@ -764,12 +769,13 @@ class ExpoPdfReaderView(context: Context, appContext: AppContext) : ExpoView(con
         val scrollY = scrollView.scrollY
         var offset = 0
         var detectedPage = 0
+        val gap = marginBetweenPages()
         for (i in pageHeights.indices) {
             if (scrollY < offset + pageHeights[i] / 2) {
                 detectedPage = i
                 break
             }
-            offset += pageHeights[i] + 16
+            offset += pageHeights[i] + gap
             detectedPage = i
         }
         if (detectedPage != lastEmittedPageIndex) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@june24/expo-pdf-reader",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "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",