react-native-pdf-jsi 4.3.0 → 4.3.2

package/PdfView.js

@@ -393,7 +393,7 @@ export default class PdfView extends Component {
                 renderScrollComponent={(props) => <ScrollView
                     {...props}
                     centerContent={this.state.centerContent}
-                    pinchGestureEnabled={false}
+                    pinchGestureEnabled={true}
                 />}
                 initialScrollIndex={this.props.page < 1 ? 0 : this.props.page - 1}
                 onViewableItemsChanged={this._onViewableItemsChanged}

package/README.md

@@ -12,6 +12,7 @@
 [![Expo Compatible](https://img.shields.io/badge/Expo-Compatible-4630EB?style=flat-square&logo=expo)](https://expo.dev)
 [![total downloads](https://img.shields.io/npm/dt/react-native-pdf-jsi?style=flat-square&logo=npm&color=cb3837)](https://www.npmjs.com/package/react-native-pdf-jsi)
 [![weekly downloads](https://img.shields.io/npm/dw/react-native-pdf-jsi?style=flat-square&logo=npm&color=cb3837)](https://www.npmjs.com/package/react-native-pdf-jsi)
+[![monthly downloads](https://img.shields.io/npm/dm/react-native-pdf-jsi?style=flat-square&logo=npm&color=cb3837)](https://www.npmjs.com/package/react-native-pdf-jsi)
 [![GitHub stars](https://img.shields.io/github/stars/126punith/react-native-pdf-jsi?style=flat-square&logo=github&color=181717)](https://github.com/126punith/react-native-pdf-jsi)
 [![license](https://img.shields.io/npm/l/react-native-pdf-jsi?style=flat-square&color=green)](https://github.com/126punith/react-native-pdf-jsi/blob/main/LICENSE)
 
@@ -456,6 +457,12 @@ MIT License - see [LICENSE](LICENSE) file for details.
 
 ## Recent Fixes
 
+### iOS Pinch-to-Zoom (v4.3.2)
+Fixed iOS pinch-to-zoom not working when the scroll view delegate was set to the view itself or when the delegate proxy's primary didn't implement `viewForZoomingInScrollView`. Implemented the missing `viewForZoomingInScrollView:` in RNPDFPdfView so the scroll view receives the correct zoomable view. Fixes [#23](https://github.com/126punith/react-native-pdf-jsi/issues/23) (PR [#22](https://github.com/126punith/react-native-pdf-jsi/pull/22)).
+
+### Android PDF Preserved on Navigation (v4.3.1)
+Fixed issue where the PDF instance was destroyed on Android when navigating away and returning to the screen ([#20](https://github.com/126punith/react-native-pdf-jsi/issues/20)). The PDF is now preserved in memory during navigation (matching iOS behavior) and only recycled when the component unmounts.
+
 ### Expo Support (v4.3.0)
 Added Expo config plugin for seamless integration with Expo development builds. The package now works with `npx expo prebuild` and `npx expo run:ios/android`.
 

package/android/src/main/java/org/wonday/pdf/PdfManager.java

@@ -60,7 +60,8 @@ public class PdfManager extends SimpleViewManager<PdfView> implements RNPDFPdfVi
 
     @Override
     public void onDropViewInstance(PdfView pdfView) {
-        pdfView = null;
+        pdfView.recycle();
+        this.pdfView = null;
     }
 
     @ReactProp(name = "path")

package/android/src/main/java/org/wonday/pdf/PdfView.java

@@ -349,6 +349,18 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
             this.drawPdf();
     }
 
+    /**
+     * Override to prevent barteksc PDFView's recycle() on navigation.
+     * The parent class calls recycle() in onDetachedFromWindow, which destroys the PDF
+     * when the view is temporarily detached (e.g., navigating to another screen).
+     * We only recycle when PdfManager.onDropViewInstance is called (component unmount).
+     */
+    @Override
+    protected void onDetachedFromWindow() {
+        // Intentionally skip super to prevent barteksc PDFView's recycle() which destroys
+        // the PDF on navigation. We only recycle when PdfManager.onDropViewInstance is called.
+    }
+
     public void drawPdf() {
         
         // FIX: Check if we actually need to reload the document

package/ios/RNPDFPdf/RNPDFPdfView.mm

@@ -98,10 +98,33 @@ const float MIN_SCALE = 1.0f;
 }
 
 - (UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollView {
+    // First check if primary delegate (PDFView's internal) handles it
     if (_primary && [_primary respondsToSelector:@selector(viewForZoomingInScrollView:)]) {
-        return [_primary viewForZoomingInScrollView:scrollView];
+        UIView *zoomView = [_primary viewForZoomingInScrollView:scrollView];
+        if (zoomView != nil) {
+            NSLog(@"🔍 [iOS Zoom Delegate] Primary delegate returned zoom view: %@", NSStringFromClass([zoomView class]));
+            return zoomView;
+        }
     }
-    return nil;
+
+    // PDFKit's scroll view needs to zoom the PDFDocumentView
+    // Search for it in the hierarchy
+    for (UIView *subview in scrollView.subviews) {
+        NSString *className = NSStringFromClass([subview class]);
+        if ([className containsString:@"PDFDocumentView"] || [className containsString:@"PDFPage"]) {
+            NSLog(@"🔍 [iOS Zoom Delegate] Found PDF view for zooming: %@", className);
+            return subview;
+        }
+    }
+
+    // Fallback to first subview if it exists
+    UIView *fallback = scrollView.subviews.firstObject;
+    if (fallback) {
+        NSLog(@"🔍 [iOS Zoom Delegate] Using fallback zoom view: %@", NSStringFromClass([fallback class]));
+    } else {
+        NSLog(@"⚠️ [iOS Zoom Delegate] WARNING: No view found for zooming! Scroll view has %lu subviews", (unsigned long)scrollView.subviews.count);
+    }
+    return fallback;
 }
 
 @end
@@ -443,10 +466,14 @@ using namespace facebook::react;
     [[_pdfView document] setDelegate: self];
     [_pdfView setDelegate: self];
 
-    // Disable built-in double tap, so as not to conflict with custom recognizers.
+    // Only disable double-tap recognizers to avoid conflicts with custom double-tap
+    // Leave all other gestures (including pinch) enabled
     for (UIGestureRecognizer *recognizer in _pdfView.gestureRecognizers) {
         if ([recognizer isKindOfClass:[UITapGestureRecognizer class]]) {
-            recognizer.enabled = NO;
+            UITapGestureRecognizer *tapGesture = (UITapGestureRecognizer *)recognizer;
+            if (tapGesture.numberOfTapsRequired == 2) {
+                recognizer.enabled = NO;
+            }
         }
     }
 
@@ -661,6 +688,18 @@ using namespace facebook::react;
                     _pdfView.maxScaleFactor = _fixScaleFactor*_maxScale;
                 }
             }
+            
+            // CRITICAL: Also configure the internal scroll view zoom scales
+            // This must be done AFTER _fixScaleFactor is set above
+            if (_internalScrollView && _fixScaleFactor > 0) {
+                _internalScrollView.minimumZoomScale = _fixScaleFactor * _minScale;
+                _internalScrollView.maximumZoomScale = _fixScaleFactor * _maxScale;
+                _internalScrollView.zoomScale = _pdfView.scaleFactor;
+                RCTLogInfo(@"🔍 [iOS Zoom] Configured internal scroll view zoom scales - min=%f, max=%f, current=%f", 
+                          _internalScrollView.minimumZoomScale, 
+                          _internalScrollView.maximumZoomScale, 
+                          _internalScrollView.zoomScale);
+            }
 
         }
 
@@ -668,6 +707,12 @@ using namespace facebook::react;
             _pdfView.scaleFactor = _scale * _fixScaleFactor;
             if (_pdfView.scaleFactor>_pdfView.maxScaleFactor) _pdfView.scaleFactor = _pdfView.maxScaleFactor;
             if (_pdfView.scaleFactor<_pdfView.minScaleFactor) _pdfView.scaleFactor = _pdfView.minScaleFactor;
+            
+            // Also update internal scroll view zoom scale when scale changes
+            if (_internalScrollView && _fixScaleFactor > 0) {
+                _internalScrollView.zoomScale = _pdfView.scaleFactor;
+                RCTLogInfo(@"🔍 [iOS Zoom] Updated internal scroll view zoom scale to %f", _internalScrollView.zoomScale);
+            }
         }
 
         if (_pdfDocument && ([effectiveChangedProps containsObject:@"path"] || [changedProps containsObject:@"horizontal"])) {
@@ -1328,6 +1373,18 @@ using namespace facebook::react;
         // Keep vertical bounce enabled for natural scrolling feel
         scrollView.bounces = YES;
         
+        // Configure scroll view zoom scales to match PDFView's scale factors
+        // This enables native pinch-to-zoom gestures
+        if (_fixScaleFactor > 0) {
+            scrollView.minimumZoomScale = _fixScaleFactor * _minScale;
+            scrollView.maximumZoomScale = _fixScaleFactor * _maxScale;
+            scrollView.zoomScale = _pdfView.scaleFactor;
+            RCTLogInfo(@"🔍 [iOS Zoom] Configured zoom scales - min=%f, max=%f, current=%f", 
+                      scrollView.minimumZoomScale, 
+                      scrollView.maximumZoomScale, 
+                      scrollView.zoomScale);
+        }
+        
         RCTLogInfo(@"📊 [iOS Scroll] ScrollView config - scrollEnabled=%d, alwaysBounceHorizontal=%d, bounces=%d, delegate=%@", 
                   scrollView.scrollEnabled,
                   scrollView.alwaysBounceHorizontal,
@@ -1336,23 +1393,30 @@ using namespace facebook::react;
         
         // IMPORTANT: PDFKit relies on the scrollView delegate for pinch-zoom (viewForZoomingInScrollView).
         // Install a proxy delegate that forwards to the original delegate, while still letting us observe scroll events.
-        if (!_internalScrollView) {
-            RCTLogInfo(@"✅ [iOS Scroll] Setting internal scroll view reference");
+        // CRITICAL FIX: Always set up delegate for new scroll views (PDFView may recreate scroll view on document load)
+        if (!_internalScrollView || _internalScrollView != scrollView) {
+            RCTLogInfo(@"✅ [iOS Scroll] Setting up scroll view delegate (new=%d)", _internalScrollView == nil);
             _internalScrollView = scrollView;
-            if (scrollView.delegate && scrollView.delegate != self) {
-                _originalScrollDelegate = scrollView.delegate;
-                RCTLogInfo(@"📝 [iOS Scroll] Stored original scroll delegate");
+            
+            // Get the current delegate (might be PDFView's internal delegate)
+            id<UIScrollViewDelegate> currentDelegate = scrollView.delegate;
+            
+            // Only capture original delegate if it's not us or our proxy
+            if (currentDelegate && currentDelegate != self && ![currentDelegate isKindOfClass:[RNPDFScrollViewDelegateProxy class]]) {
+                _originalScrollDelegate = currentDelegate;
+                RCTLogInfo(@"📝 [iOS Scroll] Captured original scroll delegate: %@", NSStringFromClass([currentDelegate class]));
             }
+            
             if (_originalScrollDelegate) {
                 _scrollDelegateProxy = [[RNPDFScrollViewDelegateProxy alloc] initWithPrimary:_originalScrollDelegate secondary:(id<UIScrollViewDelegate>)self];
                 scrollView.delegate = (id<UIScrollViewDelegate>)_scrollDelegateProxy;
                 RCTLogInfo(@"🔗 [iOS Scroll] Installed scroll delegate proxy");
             } else {
                 scrollView.delegate = self;
-                RCTLogInfo(@"🔗 [iOS Scroll] Set self as scroll delegate");
+                RCTLogInfo(@"🔗 [iOS Scroll] Set self as scroll delegate (no original delegate)");
             }
         } else {
-            RCTLogInfo(@"⚠️ [iOS Scroll] Internal scroll view already set, skipping delegate setup");
+            RCTLogInfo(@"⚠️ [iOS Scroll] Same scroll view, delegate already configured");
         }
     }
     
@@ -1440,6 +1504,57 @@ using namespace facebook::react;
     }
 }
 
+#pragma mark - UIScrollViewDelegate Zoom Support
+
+- (void)scrollViewDidZoom:(UIScrollView *)scrollView {
+    // Called during pinch-to-zoom
+    if (_fixScaleFactor > 0 && _pdfView.scaleFactor > 0) {
+        float newScale = _pdfView.scaleFactor / _fixScaleFactor;
+
+        // Only notify if scale changed significantly (prevent spam)
+        if (fabs(_scale - newScale) > 0.01f) {
+            _scale = newScale;
+            RCTLogInfo(@"🔍 [iOS Zoom] Pinch zoom - scale changed to %f", _scale);
+            [self notifyOnChangeWithMessage:[[NSString alloc] initWithString:
+                [NSString stringWithFormat:@"scaleChanged|%f", _scale]]];
+        }
+    }
+}
+
+// CRITICAL: Return the view that should be zoomed
+- (UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollView {
+    // Search for PDFDocumentView in the scroll view's hierarchy
+    for (UIView *subview in scrollView.subviews) {
+        NSString *className = NSStringFromClass([subview class]);
+        if ([className containsString:@"PDFDocumentView"] || [className containsString:@"PDFPage"]) {
+            RCTLogInfo(@"🔍 [iOS Zoom] viewForZoomingInScrollView returning: %@", className);
+            return subview;
+        }
+    }
+    
+    // Fallback to first subview
+    UIView *fallback = scrollView.subviews.firstObject;
+    if (fallback) {
+        RCTLogInfo(@"🔍 [iOS Zoom] viewForZoomingInScrollView using fallback: %@", NSStringFromClass([fallback class]));
+        return fallback;
+    }
+    
+    RCTLogInfo(@"⚠️ [iOS Zoom] viewForZoomingInScrollView returning NIL - no view to zoom!");
+    return nil;
+}
+
+- (void)scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(UIView *)view {
+    // Optional: Track zoom start
+    RCTLogInfo(@"🔍 [iOS Zoom] Will begin zooming");
+}
+
+- (void)scrollViewDidEndZooming:(UIScrollView *)scrollView
+                        withView:(UIView *)view
+                         atScale:(CGFloat)scale {
+    // Optional: Track zoom end
+    RCTLogInfo(@"🔍 [iOS Zoom] Did end zooming at scale %f", scale);
+}
+
 // Enhanced progressive loading methods
 - (void)preloadAdjacentPages:(int)currentPage
 {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-pdf-jsi",
-    "version": "4.3.0",
+    "version": "4.3.2",
     "summary": "High-performance React Native PDF viewer with JSI acceleration - up to 80x faster than traditional bridge",
     "description": "🚀 Ultra-fast React Native PDF viewer with JSI (JavaScript Interface) integration for maximum performance. Features lazy loading, smart caching, progressive loading, and zero-bridge overhead operations. Perfect for large PDF files with 30-day persistent cache and advanced memory optimization. Google Play 16KB page size compliant for Android 15+. Supports iOS, Android, and Windows platforms.",
     "main": "index.js",