@june24/expo-pdf-reader 0.1.28 → 0.1.29

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

@@ -145,11 +145,17 @@ class ExpoPdfReaderView(
     }
 
     /**
-     * continuous / twoup / twoupcontinuous — pinch-ийг [dispatchTouchEvent]-ийн эхэнд дуудаж
-     * 2 хурууны POINTER_DOWN canvas-д баригдахаас өмнө хүлээнэ. Zoom хийсэн ч босоо scroll хэвээр (зөвхөн pinch үед scroll intercept унтрана).
+     * continuous / twoup / twoupcontinuous — pinch + zoom хийсэн үед pan (хөндлөн/босоо),
+     * scroll-ийг идэвхгүй болгоно. Zoom = 1 үед хэвийн босоо scroll.
      */
     private inner class ZoomableScrollView(ctx: Context) : ScrollView(ctx) {
 
+        private var panX = 0f
+        private var panY = 0f
+
+        private fun isZoomedForPan(): Boolean =
+            activeTool == null && currentZoom > 1.02f
+
         private val pinch = ScaleGestureDetector(
             ctx,
             object : ScaleGestureDetector.SimpleOnScaleGestureListener() {
@@ -181,6 +187,9 @@ class ExpoPdfReaderView(
         override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
             if (activeTool != null) return super.onInterceptTouchEvent(ev)
             if (ev.pointerCount > 1 || pinch.isInProgress) return false
+            if (isZoomedForPan() && ev.actionMasked == MotionEvent.ACTION_DOWN) {
+                return true
+            }
             return super.onInterceptTouchEvent(ev)
         }
 
@@ -205,11 +214,42 @@ class ExpoPdfReaderView(
 
         override fun onTouchEvent(ev: MotionEvent): Boolean {
             if (activeTool != null) return super.onTouchEvent(ev)
+
             if (pinch.isInProgress || ev.pointerCount > 1) {
                 return true
             }
+
+            if (isZoomedForPan()) {
+                when (ev.actionMasked) {
+                    MotionEvent.ACTION_DOWN -> {
+                        stopNestedScroll()
+                        panX = ev.x
+                        panY = ev.y
+                    }
+                    MotionEvent.ACTION_MOVE -> {
+                        container.translationX += ev.x - panX
+                        container.translationY += ev.y - panY
+                        panX = ev.x
+                        panY = ev.y
+                        clampContainerTranslationsInPlace()
+                    }
+                    MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> { }
+                }
+                return true
+            }
+
             return super.onTouchEvent(ev)
         }
+
+        override fun canScrollVertically(direction: Int): Boolean {
+            if (isZoomedForPan()) return false
+            return super.canScrollVertically(direction)
+        }
+
+        override fun canScrollHorizontally(direction: Int): Boolean {
+            if (isZoomedForPan()) return false
+            return super.canScrollHorizontally(direction)
+        }
     }
 
     // ── UI ───────────────────────────────────────────────────────────────────
@@ -287,6 +327,7 @@ class ExpoPdfReaderView(
     private fun reflowForHostWidthChange() {
         val w = width.takeIf { it > 0 } ?: return
         if (renderer == null) return
+        if (w <= 0) return
         if (lastHostWidthForPdf > 0 && kotlin.math.abs(w - lastHostWidthForPdf) <= 4) return
         lastHostWidthForPdf = w
         currentViewWidth = w
@@ -923,7 +964,7 @@ class ExpoPdfReaderView(
     private suspend fun renderTwoUpRange(
         pdf: PdfRenderer, pageCount: Int, viewWidth: Int, startPage: Int, endPage: Int
     ) {
-        val halfWidth = viewWidth / 2
+        val halfWidth = (viewWidth / 2).coerceAtLeast(1)
         var i = startPage
         while (i < endPage) {
             val leftBmp = renderPageBitmap(pdf, i, halfWidth)
@@ -987,12 +1028,21 @@ class ExpoPdfReaderView(
         }
     }
 
+    private fun resolveViewWidthForRender(): Int {
+        val w = when {
+            currentViewWidth > 0 -> currentViewWidth
+            width > 0 -> width
+            else -> resources.displayMetrics.widthPixels
+        }
+        return w.coerceAtLeast(1)
+    }
+
     private suspend fun loadNextChunk() {
         val pdf = renderer ?: return
         val start = renderedUpTo + 1
         if (start >= totalPages) return
         val end = minOf(start + PAGE_CHUNK, totalPages)
-        val viewWidth = currentViewWidth
+        val viewWidth = resolveViewWidthForRender()
 
         withContext(Dispatchers.Main) { removeLoadingFooter() }
 
@@ -1055,7 +1105,7 @@ class ExpoPdfReaderView(
         val prevStart = maxOf(0, windowStart - PAGE_CHUNK)
         val prevEnd = windowStart
         if (prevStart >= prevEnd) return
-        val viewWidth = currentViewWidth
+        val viewWidth = resolveViewWidthForRender()
 
         data class PageBmp(val bmp: Bitmap, val idx: Int, val pdfW: Float, val pdfH: Float)
         val pages = mutableListOf<PageBmp>()
@@ -1092,8 +1142,8 @@ class ExpoPdfReaderView(
         val prevStart = maxOf(0, windowStart - PAGE_CHUNK)
         val prevEnd = windowStart
         if (prevStart >= prevEnd) return
-        val viewWidth = currentViewWidth
-        val halfW = viewWidth / 2
+        val viewWidth = resolveViewWidthForRender()
+        val halfW = (viewWidth / 2).coerceAtLeast(1)
 
         data class RowBmps(val leftIdx: Int, val leftBmp: Bitmap, val rightBmp: Bitmap?)
         val rows = mutableListOf<RowBmps>()
@@ -1229,7 +1279,7 @@ class ExpoPdfReaderView(
      */
     private fun jumpToPage(targetPage: Int) {
         val pdf = renderer ?: return
-        val viewWidth = currentViewWidth.takeIf { it > 0 } ?: width.takeIf { it > 0 } ?: return
+        val viewWidth = resolveViewWidthForRender()
         renderJob?.cancel()
         renderJob = scope.launch {
             try {
@@ -1348,14 +1398,15 @@ class ExpoPdfReaderView(
 
     private suspend fun renderPageBitmap(pdf: PdfRenderer, index: Int, targetWidth: Int): Bitmap =
         withContext(pdfDispatcher) {
+            val safeWidth = targetWidth.coerceAtLeast(1)
             pdf.openPage(index).use { page ->
                 if (index < pagePdfW.size) {
                     pagePdfW[index] = page.width
                     pagePdfH[index] = page.height
                 }
-                val s = targetWidth.toFloat() / page.width.toFloat()
+                val s = safeWidth.toFloat() / page.width.toFloat()
                 val h = (page.height * s).toInt().coerceAtLeast(1)
-                val bmp = Bitmap.createBitmap(targetWidth, h, Bitmap.Config.ARGB_8888)
+                val bmp = Bitmap.createBitmap(safeWidth, h, Bitmap.Config.ARGB_8888)
                 bmp.eraseColor(Color.WHITE)
                 page.render(bmp, null, null, PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY)
                 bmp
@@ -1446,7 +1497,18 @@ class ExpoPdfReaderView(
 
             holder.loadJob = scope.launch {
                 val pdf = renderer ?: return@launch
-                val bmp = renderPageBitmap(pdf, position, this@ExpoPdfReaderView.width)
+                val viewWidth = this@ExpoPdfReaderView.width
+                if (viewWidth <= 0) {
+                    withContext(Dispatchers.Main) {
+                        post {
+                            if (holder.boundPage == position && this@ExpoPdfReaderView.width > 0) {
+                                notifyItemChanged(position)
+                            }
+                        }
+                    }
+                    return@launch
+                }
+                val bmp = renderPageBitmap(pdf, position, viewWidth)
                 val pdfW = pagePdfW.getOrElse(position) { 1 }.toFloat()
                 val pdfH = pagePdfH.getOrElse(position) { 1 }.toFloat()
                 withContext(Dispatchers.Main) {

package/package.json

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