@june24/expo-pdf-reader 0.1.27 → 0.1.28

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

@@ -95,6 +95,8 @@ class ExpoPdfReaderView(
     private var windowStart = 0            // pageEntries[0]-н absolute page index
     private var chunkLoading = false       // chunk дуусах хүртэл дахин trigger хийхгүй
     private var currentViewWidth = 0       // chunk load-д дахин хэрэглэнэ
+    /** Thumbnail panel нээх/хаах зэргээр RN өргөн өөрчлөгдөнө — reflow-ийн суурь */
+    private var lastHostWidthForPdf = 0
     private var loadingFooter: View? = null
 
     companion object {
@@ -133,41 +135,51 @@ class ExpoPdfReaderView(
     private var maxZoom = 5.0f
     private var currentZoom = 1.0f
 
+    /** RN / Drawer зэрэг дээд scroll хуудас pinch-ийг scroll болгож идэвхжүүлэхээс сэргийлнэ */
+    private fun propagateDisallowInterceptFrom(view: View, disallow: Boolean) {
+        var p: ViewParent? = view.parent
+        while (p is ViewGroup) {
+            p.requestDisallowInterceptTouchEvent(disallow)
+            p = p.parent
+        }
+    }
+
     /**
-     * continuous / twoup / twoupcontinuous — pinch + zoom үед зөвхөн pan (босоо scroll унтрах).
-     * Pinch-ийг [dispatchTouchEvent]-ийн эхэнд дуудаж хүү canvas POINTER_DOWN-д баригдахаас өмнө 2 хуруу хүлээнэ.
+     * continuous / twoup / twoupcontinuous — pinch-ийг [dispatchTouchEvent]-ийн эхэнд дуудаж
+     * 2 хурууны POINTER_DOWN canvas-д баригдахаас өмнө хүлээнэ. Zoom хийсэн ч босоо scroll хэвээр (зөвхөн pinch үед scroll intercept унтрана).
      */
     private inner class ZoomableScrollView(ctx: Context) : ScrollView(ctx) {
-        /** ScrollView-д [isScrollEnabled] байхгүй тул: false үед босоо scroll (super) ажиллахгүй. */
-        var allowVerticalScrollFromTouch = true
 
         private val pinch = ScaleGestureDetector(
             ctx,
             object : ScaleGestureDetector.SimpleOnScaleGestureListener() {
                 override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {
                     if (activeTool != null) return false
+                    stopNestedScroll()
+                    this@ExpoPdfReaderView.propagateDisallowInterceptFrom(this@ZoomableScrollView, true)
                     parent?.requestDisallowInterceptTouchEvent(true)
                     return true
                 }
 
                 override fun onScale(detector: ScaleGestureDetector): Boolean {
                     if (activeTool != null) return false
-                    applyZoom((currentZoom * detector.scaleFactor).coerceIn(minZoom, maxZoom))
+                    applyZoom(
+                        (currentZoom * detector.scaleFactor).coerceIn(minZoom, maxZoom),
+                        detector.focusX,
+                        detector.focusY
+                    )
                     return true
                 }
 
                 override fun onScaleEnd(detector: ScaleGestureDetector) {
                     parent?.requestDisallowInterceptTouchEvent(false)
+                    this@ExpoPdfReaderView.propagateDisallowInterceptFrom(this@ZoomableScrollView, false)
                 }
             }
         )
-        private var panLastX = 0f
-        private var panLastY = 0f
 
         override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
             if (activeTool != null) return super.onInterceptTouchEvent(ev)
-            // 2+ хуруу эсвэл pinch эхэлсэн үед ScrollView босоо scroll intercept хийхгүй (scroll + zoom өрсөлдөнө)
-            if (!allowVerticalScrollFromTouch) return false
             if (ev.pointerCount > 1 || pinch.isInProgress) return false
             return super.onInterceptTouchEvent(ev)
         }
@@ -179,8 +191,14 @@ class ExpoPdfReaderView(
                     stopNestedScroll()
                 }
                 if (pinch.isInProgress || ev.pointerCount > 1) {
+                    this@ExpoPdfReaderView.propagateDisallowInterceptFrom(this@ZoomableScrollView, true)
                     parent?.requestDisallowInterceptTouchEvent(true)
                 }
+                if (ev.actionMasked == MotionEvent.ACTION_UP ||
+                    ev.actionMasked == MotionEvent.ACTION_CANCEL
+                ) {
+                    this@ExpoPdfReaderView.propagateDisallowInterceptFrom(this@ZoomableScrollView, false)
+                }
             }
             return super.dispatchTouchEvent(ev)
         }
@@ -190,23 +208,6 @@ class ExpoPdfReaderView(
             if (pinch.isInProgress || ev.pointerCount > 1) {
                 return true
             }
-            if (currentZoom > 1.02f) {
-                when (ev.actionMasked) {
-                    MotionEvent.ACTION_DOWN -> {
-                        panLastX = ev.x
-                        panLastY = ev.y
-                    }
-                    MotionEvent.ACTION_MOVE -> {
-                        val dx = ev.x - panLastX
-                        val dy = ev.y - panLastY
-                        panLastX = ev.x
-                        panLastY = ev.y
-                        applyContainerPanDelta(dx, dy)
-                    }
-                }
-                return true
-            }
-            if (!allowVerticalScrollFromTouch) return true
             return super.onTouchEvent(ev)
         }
     }
@@ -244,13 +245,18 @@ class ExpoPdfReaderView(
                 override fun onScrollStateChanged(rv: RecyclerView, newState: Int) {
                     if (newState == RecyclerView.SCROLL_STATE_IDLE) {
                         val lm = rv.layoutManager as? LinearLayoutManager ?: return
-                        val pos = lm.findFirstCompletelyVisibleItemPosition()
-                            .takeIf { it >= 0 } ?: return
+                        var pos = lm.findFirstCompletelyVisibleItemPosition()
+                        if (pos < 0) pos = lm.findFirstVisibleItemPosition()
+                        if (pos < 0) return
                         if (pos != currentPageIndex) {
                             currentPageIndex = pos
                             // Хуудас солигдоход zoom-г reset хийнэ
                             (pager as? ZoomRecyclerView)?.resetZoom()
                             onPageChange(mapOf("currentPage" to pos, "totalPage" to totalPages))
+                        } else {
+                            // scrollToPage() нь currentPageIndex-ийг урьдчилан тохируулдаг тул энд орохгүй —
+                            // гэхдээ zoom transform + Fabric layout-оос хуудас шинэчлэгдэхгүй үлдэхээс сэргийлнэ
+                            (pager as? ZoomRecyclerView)?.resetZoom()
                         }
                     }
                 }
@@ -268,8 +274,32 @@ class ExpoPdfReaderView(
                 startLoad(it)
             }
         }
-        // Note: width өөрчлөгдөхөд triggerRender дуудахгүй —
-        // forced layout (forceLayoutScrollView) нь pages-г шууд харагдуулдаг
+        // RN: thumbnail panel нээх/хаахад өргөн өөрчлөгдөнө; Fabric child requestLayout сул → reflow шаардлагатай
+        if (renderer != null && isLayoutReady && lastHostWidthForPdf > 0 && width > 0) {
+            val dw = kotlin.math.abs(width - lastHostWidthForPdf)
+            if (dw > 4) {
+                post { reflowForHostWidthChange() }
+            }
+        }
+    }
+
+    /** Хостын өргөн өөрчлөгдсөний дараа PDF-ийг шинэ өргөнөөр дахин тохируулна */
+    private fun reflowForHostWidthChange() {
+        val w = width.takeIf { it > 0 } ?: return
+        if (renderer == null) return
+        if (lastHostWidthForPdf > 0 && kotlin.math.abs(w - lastHostWidthForPdf) <= 4) return
+        lastHostWidthForPdf = w
+        currentViewWidth = w
+        when (displayMode) {
+            "single" -> {
+                forcePagerLayout()
+                singleAdapter?.notifyDataSetChanged()
+                forcePagerLayout()
+                val p = currentPageIndex.coerceIn(0, maxOf(0, totalPages - 1))
+                post { scrollToPage(p, smooth = false) }
+            }
+            else -> triggerRender()
+        }
     }
 
     override fun onDetachedFromWindow() {
@@ -536,25 +566,46 @@ class ExpoPdfReaderView(
     // Zoom
     // ─────────────────────────────────────────────────────────────────────────
 
-    private fun applyZoom(newZoom: Float) {
+    /**
+     * Scroll mode: pivot (0,0) + translation — pinch төв (focus) тогтвортой үлдэхийн тулд translation-ийг
+     * scrollX/scrollY-тай нийлүүлэн шинэчилнэ (ZoomRecyclerView-тай ижил математик).
+     */
+    private fun applyZoom(
+        newZoom: Float,
+        pinchFocusX: Float = Float.NaN,
+        pinchFocusY: Float = Float.NaN
+    ) {
+        val prevZoom = currentZoom
         currentZoom = newZoom.coerceIn(minZoom, maxZoom)
         container.pivotX = 0f
         container.pivotY = 0f
-        container.scaleX = currentZoom
-        container.scaleY = currentZoom
+
         if (displayMode != "single") {
             if (currentZoom <= 1.02f) {
-                scrollView.allowVerticalScrollFromTouch = true
                 container.translationX = 0f
                 container.translationY = 0f
-            } else {
-                scrollView.allowVerticalScrollFromTouch = false
+            } else if (!pinchFocusX.isNaN() && !pinchFocusY.isNaN() && prevZoom > 0.01f) {
+                val af = currentZoom / prevZoom
+                if (kotlin.math.abs(af - 1f) > 1e-5f) {
+                    val scrX = scrollView.scrollX.toFloat()
+                    val scrY = scrollView.scrollY.toFloat()
+                    val tx = container.translationX
+                    val ty = container.translationY
+                    val contentFx = pinchFocusX + scrX
+                    val contentFy = pinchFocusY + scrY
+                    container.translationX = contentFx - (contentFx - tx) * af
+                    container.translationY = contentFy - (contentFy - ty) * af
+                }
             }
         }
+        container.scaleX = currentZoom
+        container.scaleY = currentZoom
+        if (displayMode != "single" && currentZoom > 1.02f) {
+            clampContainerTranslationsInPlace()
+        }
     }
 
-    /** Zoom > 1 үед container-ийг translation-оор pan (хуудас хоорондын scroll унтраасан) */
-    private fun applyContainerPanDelta(dx: Float, dy: Float) {
+    private fun clampContainerTranslationsInPlace() {
         val ch = container.height.toFloat()
         val cw = container.width.toFloat()
         if (ch <= 0f || cw <= 0f) return
@@ -562,8 +613,8 @@ class ExpoPdfReaderView(
         val scaledW = cw * currentZoom
         val vw = scrollView.width.toFloat()
         val vh = scrollView.height.toFloat()
-        var tx = container.translationX + dx
-        var ty = container.translationY + dy
+        var tx = container.translationX
+        var ty = container.translationY
         if (scaledW <= vw) tx = 0f else tx = tx.coerceIn(vw - scaledW, 0f)
         if (scaledH <= vh) ty = 0f else ty = ty.coerceIn(vh - scaledH, 0f)
         container.translationX = tx
@@ -662,10 +713,17 @@ class ExpoPdfReaderView(
 
     private fun scrollToPage(pageIndex: Int, smooth: Boolean = true) {
         if (displayMode == "single") {
-            if (smooth) pager.smoothScrollToPosition(pageIndex)
-            else pager.scrollToPosition(pageIndex)
+            pager.stopScroll()
             currentPageIndex = pageIndex
             onPageChange(mapOf("currentPage" to pageIndex, "totalPage" to totalPages))
+            // scrollToPosition нь заримдаа layout/bind хойшлуулна (RN Fabric); post + forcePagerLayout
+            pager.post {
+                if (smooth) pager.smoothScrollToPosition(pageIndex)
+                else pager.scrollToPosition(pageIndex)
+                forcePagerLayout()
+                singleAdapter?.notifyItemChanged(pageIndex)
+                (pager as? ZoomRecyclerView)?.resetZoom()
+            }
             return
         }
         if (pageEntries.isEmpty()) return
@@ -743,7 +801,6 @@ class ExpoPdfReaderView(
             container.scaleY = 1f
             container.translationX = 0f
             container.translationY = 0f
-            scrollView.allowVerticalScrollFromTouch = true
             container.removeAllViews()
             pageEntries.clear()
             loadingFooter = null
@@ -771,6 +828,7 @@ class ExpoPdfReaderView(
                     "height" to (this@ExpoPdfReaderView.height / density).toDouble()
                 )
             )
+            lastHostWidthForPdf = this@ExpoPdfReaderView.width.takeIf { it > 0 } ?: viewWidth
         }
     }
 
@@ -1307,7 +1365,11 @@ class ExpoPdfReaderView(
     private fun safeCloseRenderer() {
         try { renderer?.close(); fileDescriptor?.close() }
         catch (_: Exception) { }
-        finally { renderer = null; fileDescriptor = null }
+        finally {
+            renderer = null
+            fileDescriptor = null
+            lastHostWidthForPdf = 0
+        }
     }
 
     private suspend fun resolveFile(url: String): File = withContext(pdfDispatcher) {
@@ -1447,6 +1509,14 @@ class ExpoPdfReaderView(
 
         private val zoomDetector = ScaleGestureDetector(context,
             object : ScaleGestureDetector.SimpleOnScaleGestureListener() {
+                override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {
+                    if (activeTool != null) return false
+                    stopScroll()
+                    this@ExpoPdfReaderView.propagateDisallowInterceptFrom(this@ZoomRecyclerView, true)
+                    parent?.requestDisallowInterceptTouchEvent(true)
+                    return true
+                }
+
                 override fun onScale(d: ScaleGestureDetector): Boolean {
                     val newScale = (currentScale * d.scaleFactor).coerceIn(minZoom, maxZoom)
                     val af = newScale / currentScale
@@ -1457,6 +1527,11 @@ class ExpoPdfReaderView(
                     clampAndApply()
                     return true
                 }
+
+                override fun onScaleEnd(detector: ScaleGestureDetector) {
+                    parent?.requestDisallowInterceptTouchEvent(false)
+                    this@ExpoPdfReaderView.propagateDisallowInterceptFrom(this@ZoomRecyclerView, false)
+                }
             }
         )
 
@@ -1467,8 +1542,14 @@ class ExpoPdfReaderView(
                     stopScroll()
                 }
                 if (ev.pointerCount > 1 || zoomDetector.isInProgress) {
+                    this@ExpoPdfReaderView.propagateDisallowInterceptFrom(this@ZoomRecyclerView, true)
                     parent?.requestDisallowInterceptTouchEvent(true)
                 }
+                if (ev.actionMasked == MotionEvent.ACTION_UP ||
+                    ev.actionMasked == MotionEvent.ACTION_CANCEL
+                ) {
+                    this@ExpoPdfReaderView.propagateDisallowInterceptFrom(this@ZoomRecyclerView, false)
+                }
             }
             return super.dispatchTouchEvent(ev)
         }

package/ios/ExpoPdfReaderView.swift

@@ -56,6 +56,8 @@ final class ExpoPdfReaderView: ExpoView {
     // Zoom range: minZoom=1.0 (fit width), maxZoom=5.0 → pinch-to-zoom дэмжинэ
     private var minZoom: CGFloat = 1.0
     private var maxZoom: CGFloat = 5.0
+    /// RN thumbnail panel нээх/хаахад bounds өргөн өөрчлөгдөнө — scaleToFit дахин хийх суурь
+    private var lastHostWidthForPdf: CGFloat = 0
 
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
@@ -164,11 +166,31 @@ final class ExpoPdfReaderView: ExpoView {
         super.layoutSubviews()
         pdfView.frame = bounds
 
-        // Only auto-scale when there is a document.
-        // Do NOT constantly override user zoom – only when scaleFactor is "uninitialized".
-        if pdfView.document != nil, pdfView.scaleFactor == 0 {
-            scaleToFitWidth()
+        guard let document = pdfView.document, document.pageCount > 0 else { return }
+        let w = bounds.width
+        guard w > 1 else { return }
+
+        // Анх: зөвхөн scaleFactor идэвхгүй үед fit (өмнөх зан)
+        if lastHostWidthForPdf <= 0 {
+            lastHostWidthForPdf = w
+            if pdfView.scaleFactor == 0 {
+                scaleToFitWidth()
+            }
+            return
         }
+
+        // Thumbnail / side panel нээх эсвэл хаахад өргөн өөрчлөгдөнө → fit width дахин (жижиг үлдэхээс сэргийлнэ)
+        let dw = abs(w - lastHostWidthForPdf)
+        guard dw > 4 else { return }
+
+        let maxIdx = max(0, document.pageCount - 1)
+        let idx = min(max(0, lastPageIndex), maxIdx)
+        lastHostWidthForPdf = w
+        scaleToFitWidth()
+        if let page = document.page(at: idx) {
+            pdfView.go(to: page)
+        }
+        requestDisplayUpdate()
     }
 
     /// Custom hitTest:
@@ -198,6 +220,7 @@ final class ExpoPdfReaderView: ExpoView {
     
     func load(url: URL) {
         if pdfView.document?.documentURL == url { return }
+        lastHostWidthForPdf = 0
         if let document = PDFDocument(url: url) {
             pdfView.document = document
             // New document → start from first page logically
@@ -209,6 +232,7 @@ final class ExpoPdfReaderView: ExpoView {
             // Defer scaling until the view has correct bounds
             DispatchQueue.main.async {
                 self.scaleToFitWidth()
+                self.lastHostWidthForPdf = self.bounds.width
                 // Document load хийгдсэний дараа pending annotation-уудыг load хийх
                 if let pending = self.pendingAnnotations {
                     self.pendingAnnotations = nil
@@ -286,6 +310,7 @@ final class ExpoPdfReaderView: ExpoView {
                 self.pdfView.go(to: page)
             }
             self.scaleToFitWidth()
+            self.lastHostWidthForPdf = self.bounds.width
         }
     }
 

package/package.json

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