react-native-pdf-jsi 4.1.1 → 4.1.2

package/PinchZoomView.js

@@ -6,120 +6,95 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-'use strict';
-import React, {Component} from 'react';
-import PropTypes from 'prop-types';
-import {
-    View,
-    StyleSheet,
-    PanResponder
-} from 'react-native';
-import {ViewPropTypes} from 'deprecated-react-native-prop-types';
+"use strict";
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { View, StyleSheet, PanResponder } from "react-native";
+import { ViewPropTypes } from "deprecated-react-native-prop-types";
 export default class PinchZoomView extends Component {
-
-    static propTypes = {
-        ...ViewPropTypes,
-        scalable: PropTypes.bool,
-        onScaleChanged: PropTypes.func,
-    };
-
-    static defaultProps = {
-        scalable: true,
-        onScaleChanged: (scale) => {
-        },
-    };
-
-    constructor(props) {
-
-        super(props);
-        this.state = {};
-        this.distant = 0;
-        this.gestureHandlers = PanResponder.create({
-            onStartShouldSetPanResponder: this._handleStartShouldSetPanResponder,
-            onMoveShouldSetResponderCapture: (evt, gestureState) => (true),
-            onMoveShouldSetPanResponder: this._handleMoveShouldSetPanResponder,
-            onPanResponderGrant: this._handlePanResponderGrant,
-            onPanResponderMove: this._handlePanResponderMove,
-            onPanResponderRelease: this._handlePanResponderEnd,
-            onPanResponderTerminationRequest: evt => false,
-            onPanResponderTerminate: this._handlePanResponderTerminate,
-            onShouldBlockNativeResponder: evt => true
-        });
-
+  static propTypes = {
+    ...ViewPropTypes,
+    scalable: PropTypes.bool,
+    onScaleChanged: PropTypes.func,
+  };
+
+  static defaultProps = {
+    scalable: true,
+    onScaleChanged: (scale) => {},
+  };
+
+  constructor(props) {
+    super(props);
+    this.state = {};
+    this.distant = 0;
+    this.gestureHandlers = PanResponder.create({
+      onStartShouldSetPanResponder: this._handleStartShouldSetPanResponder,
+      onMoveShouldSetResponderCapture: (evt, gestureState) => {
+        return this.props.scalable && (evt.nativeEvent.touches.length >= 2 || gestureState.numberActiveTouches >= 2);
+      },
+      onMoveShouldSetPanResponder: this._handleMoveShouldSetPanResponder,
+      onPanResponderGrant: this._handlePanResponderGrant,
+      onPanResponderMove: this._handlePanResponderMove,
+      onPanResponderRelease: this._handlePanResponderEnd,
+      onPanResponderTerminationRequest: (evt) => false,
+      onPanResponderTerminate: this._handlePanResponderTerminate,
+      onShouldBlockNativeResponder: (evt) => true,
+    });
+  }
+
+  _handleStartShouldSetPanResponder = (e, gestureState) => {
+    // don't respond to single touch to avoid shielding click on child components
+    return false;
+  };
+
+  _handleMoveShouldSetPanResponder = (e, gestureState) => {
+    return this.props.scalable && (e.nativeEvent.touches.length >= 2 || gestureState.numberActiveTouches >= 2);
+  };
+
+  _handlePanResponderGrant = (e, gestureState) => {
+    if (e.nativeEvent.touches.length >= 2 || gestureState.numberActiveTouches >= 2) {
+      let dx = Math.abs(e.nativeEvent.touches[0].pageX - e.nativeEvent.touches[1].pageX);
+      let dy = Math.abs(e.nativeEvent.touches[0].pageY - e.nativeEvent.touches[1].pageY);
+      this.distant = Math.sqrt(dx * dx + dy * dy);
     }
-
-    _handleStartShouldSetPanResponder = (e, gestureState) => {
-
-        // don't respond to single touch to avoid shielding click on child components
-        return false;
-
-    };
-
-    _handleMoveShouldSetPanResponder = (e, gestureState) => {
-
-        return this.props.scalable && (e.nativeEvent.changedTouches.length >= 2 || gestureState.numberActiveTouches >= 2);
-
-    };
-
-    _handlePanResponderGrant = (e, gestureState) => {
-
-        if (e.nativeEvent.changedTouches.length >= 2 || gestureState.numberActiveTouches >= 2) {
-            let dx = Math.abs(e.nativeEvent.touches[0].pageX - e.nativeEvent.touches[1].pageX);
-            let dy = Math.abs(e.nativeEvent.touches[0].pageY - e.nativeEvent.touches[1].pageY);
-            this.distant = Math.sqrt(dx * dx + dy * dy);
-        }
-
-    };
-
-    _handlePanResponderEnd = (e, gestureState) => {
-
-        this.distant = 0;
-
-    };
-
-    _handlePanResponderTerminate = (e, gestureState) => {
-
-        this.distant = 0;
-
-    };
-
-    _handlePanResponderMove = (e, gestureState) => {
-
-        if ((e.nativeEvent.changedTouches.length >= 2 || gestureState.numberActiveTouches >= 2) && this.distant > 100) {
-
-            let dx = Math.abs(e.nativeEvent.touches[0].pageX - e.nativeEvent.touches[1].pageX);
-            let dy = Math.abs(e.nativeEvent.touches[0].pageY - e.nativeEvent.touches[1].pageY);
-            let distant = Math.sqrt(dx * dx + dy * dy);
-            let scale = (distant / this.distant);
-            let pageX = (e.nativeEvent.touches[0].pageX + e.nativeEvent.touches[1].pageX) / 2;
-            let pageY = (e.nativeEvent.touches[0].pageY + e.nativeEvent.touches[1].pageY) / 2;
-            let pinchInfo = {scale: scale, pageX: pageX, pageY: pageY};
-
-            this.props.onScaleChanged(pinchInfo);
-            this.distant = distant;
-
-        }
-
-    };
-
-    render() {
-
-        return (
-            <View
-                {...this.props}
-                {...this.gestureHandlers?.panHandlers}
-                style={[styles.container, this.props.style]}>
-                {this.props.children}
-            </View>
-        );
-
+  };
+
+  _handlePanResponderEnd = (e, gestureState) => {
+    this.distant = 0;
+  };
+
+  _handlePanResponderTerminate = (e, gestureState) => {
+    this.distant = 0;
+  };
+
+  _handlePanResponderMove = (e, gestureState) => {
+    if ((e.nativeEvent.touches.length >= 2 || gestureState.numberActiveTouches >= 2) && this.distant > 100) {
+      let dx = Math.abs(e.nativeEvent.touches[0].pageX - e.nativeEvent.touches[1].pageX);
+      let dy = Math.abs(e.nativeEvent.touches[0].pageY - e.nativeEvent.touches[1].pageY);
+      let distant = Math.sqrt(dx * dx + dy * dy);
+      let scale = distant / this.distant;
+      let pageX = (e.nativeEvent.touches[0].pageX + e.nativeEvent.touches[1].pageX) / 2;
+      let pageY = (e.nativeEvent.touches[0].pageY + e.nativeEvent.touches[1].pageY) / 2;
+      let pinchInfo = { scale: scale, pageX: pageX, pageY: pageY };
+
+      this.props.onScaleChanged(pinchInfo);
+      this.distant = distant;
     }
+  };
+
+  render() {
+    return (
+      <View {...this.props} {...this.gestureHandlers?.panHandlers} style={[styles.container, this.props.style]}>
+        {this.props.children}
+      </View>
+    );
+  }
 }
 
 const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-        justifyContent: 'center',
-        alignItems: 'center'
-    }
+  container: {
+    flex: 1,
+    justifyContent: "center",
+    alignItems: "center",
+  },
 });

package/ios/RNPDFPdf/RNPDFPdfView.mm

@@ -54,6 +54,58 @@
 const float MAX_SCALE = 3.0f;
 const float MIN_SCALE = 1.0f;
 
+
+@interface RNPDFScrollViewDelegateProxy : NSObject <UIScrollViewDelegate>
+- (instancetype)initWithPrimary:(id<UIScrollViewDelegate>)primary secondary:(id<UIScrollViewDelegate>)secondary;
+@end
+
+@implementation RNPDFScrollViewDelegateProxy {
+    __weak id<UIScrollViewDelegate> _primary;
+    __weak id<UIScrollViewDelegate> _secondary;
+}
+
+- (instancetype)initWithPrimary:(id<UIScrollViewDelegate>)primary secondary:(id<UIScrollViewDelegate>)secondary {
+    if (self = [super init]) {
+        _primary = primary;
+        _secondary = secondary;
+    }
+    return self;
+}
+
+- (BOOL)respondsToSelector:(SEL)aSelector {
+    return [super respondsToSelector:aSelector]
+        || (_primary && [_primary respondsToSelector:aSelector])
+        || (_secondary && [_secondary respondsToSelector:aSelector]);
+}
+
+- (id)forwardingTargetForSelector:(SEL)aSelector {
+    if (_primary && [_primary respondsToSelector:aSelector]) {
+        return _primary;
+    }
+    if (_secondary && [_secondary respondsToSelector:aSelector]) {
+        return _secondary;
+    }
+    return [super forwardingTargetForSelector:aSelector];
+}
+
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+    if (_primary && [_primary respondsToSelector:@selector(scrollViewDidScroll:)]) {
+        [_primary scrollViewDidScroll:scrollView];
+    }
+    if (_secondary && [_secondary respondsToSelector:@selector(scrollViewDidScroll:)]) {
+        [_secondary scrollViewDidScroll:scrollView];
+    }
+}
+
+- (UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollView {
+    if (_primary && [_primary respondsToSelector:@selector(viewForZoomingInScrollView:)]) {
+        return [_primary viewForZoomingInScrollView:scrollView];
+    }
+    return nil;
+}
+
+@end
+
 @interface RNPDFPdfView() <PDFDocumentDelegate, PDFViewDelegate
 #ifdef RCT_NEW_ARCH_ENABLED
 , RCTRNPDFPdfViewViewProtocol
@@ -68,6 +120,7 @@ const float MIN_SCALE = 1.0f;
     PDFView *_pdfView;
     UIScrollView *_internalScrollView;
     id<UIScrollViewDelegate> _originalScrollDelegate;
+    RNPDFScrollViewDelegateProxy *_scrollDelegateProxy;
     PDFOutline *root;
     float _fixScaleFactor;
     bool _initialed;
@@ -559,10 +612,15 @@ using namespace facebook::react;
         if (_pdfDocument && ([changedProps containsObject:@"path"] || 
                              [changedProps containsObject:@"scrollEnabled"])) {
             // If path changed, restore original delegate before reconfiguring
-            if ([changedProps containsObject:@"path"] && _internalScrollView && _originalScrollDelegate) {
-                _internalScrollView.delegate = _originalScrollDelegate;
+            if ([changedProps containsObject:@"path"] && _internalScrollView) {
+                if (_originalScrollDelegate) {
+                    _internalScrollView.delegate = _originalScrollDelegate;
+                } else {
+                    _internalScrollView.delegate = nil;
+                }
                 _internalScrollView = nil;
                 _originalScrollDelegate = nil;
+                _scrollDelegateProxy = nil;
             }
             
             // Use dispatch_async to ensure view hierarchy is fully set up after document load
@@ -1021,16 +1079,20 @@ using namespace facebook::react;
         scrollView.alwaysBounceHorizontal = NO;
         // Keep vertical bounce enabled for natural scrolling feel
         scrollView.bounces = YES;
-        
-        // Set delegate for scroll tracking (only once to avoid conflicts)
-        // Store original delegate before replacing it to preserve PDFView's internal scrolling
+
+        // 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) {
             _internalScrollView = scrollView;
-            // Store original delegate if it exists and is not us
             if (scrollView.delegate && scrollView.delegate != self) {
                 _originalScrollDelegate = scrollView.delegate;
             }
-            scrollView.delegate = self;
+            if (_originalScrollDelegate) {
+                _scrollDelegateProxy = [[RNPDFScrollViewDelegateProxy alloc] initWithPrimary:_originalScrollDelegate secondary:(id<UIScrollViewDelegate>)self];
+                scrollView.delegate = (id<UIScrollViewDelegate>)_scrollDelegateProxy;
+            } else {
+                scrollView.delegate = self;
+            }
         }
     }
     
@@ -1042,11 +1104,7 @@ using namespace facebook::react;
 #pragma mark - UIScrollViewDelegate
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
-    // Forward to original delegate first if it exists (important for PDFView's scrolling)
-    if (_originalScrollDelegate && [_originalScrollDelegate respondsToSelector:@selector(scrollViewDidScroll:)]) {
-        [_originalScrollDelegate scrollViewDidScroll:scrollView];
-    }
-    
+
     if (!_pdfDocument || _singlePage) {
         return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-pdf-jsi",
-    "version": "4.1.1",
+    "version": "4.1.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",