react-native-pdf-jsi 3.3.1 → 3.4.2

package/ios/RNPDFPdf/RNPDFPdfView.mm

@@ -66,6 +66,8 @@ const float MIN_SCALE = 1.0f;
     RCTBridge *_bridge;
     PDFDocument *_pdfDocument;
     PDFView *_pdfView;
+    UIScrollView *_internalScrollView;
+    id<UIScrollViewDelegate> _originalScrollDelegate;
     PDFOutline *root;
     float _fixScaleFactor;
     bool _initialed;
@@ -103,13 +105,45 @@ using namespace facebook::react;
 
 + (ComponentDescriptorProvider)componentDescriptorProvider
 {
-  return concreteComponentDescriptorProvider<RNPDFPdfViewComponentDescriptor>();
+  // Defensive check: Ensure the descriptor class exists before returning
+  // This prevents nil object insertion in RCTThirdPartyComponentsProvider
+  // The component name must match the codegen name: "RNPDFPdfView"
+  // Using static to ensure the provider is initialized only once
+  static ComponentDescriptorProvider provider = concreteComponentDescriptorProvider<RNPDFPdfViewComponentDescriptor>();
+  return provider;
 }
 
 // Needed because of this: https://github.com/facebook/react-native/pull/37274
 + (void)load
 {
   [super load];
+  
+  // Force class to be loaded before React Native tries to register it
+  // This ensures RNPDFPdfViewCls() returns a valid class, preventing nil insertion
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    // Force class initialization by accessing the class
+    Class cls = [self class];
+    if (cls == nil) {
+      RCTLogError(@"RNPDFPdfView: Class is nil in +load");
+      return;
+    }
+    
+    // Ensure component name is properly set for registration
+    // This helps React Native's RCTThirdPartyComponentsProvider find the component
+    // The component name must match the codegen name: "RNPDFPdfView"
+    NSString *componentName = NSStringFromClass(cls);
+    if (componentName == nil || componentName.length == 0) {
+      RCTLogError(@"RNPDFPdfView: Component name is nil or empty");
+    } else if (![componentName isEqualToString:@"RNPDFPdfView"]) {
+      RCTLogWarn(@"RNPDFPdfView: Component name mismatch. Expected 'RNPDFPdfView', got '%@'", componentName);
+    }
+    
+    // Verify class is accessible (RNPDFPdfViewCls is defined later, so we just verify the class itself)
+    if (cls != RNPDFPdfView.class) {
+      RCTLogError(@"RNPDFPdfView: Class mismatch in +load");
+    }
+  });
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -196,11 +230,6 @@ using namespace facebook::react;
         [updatedPropNames addObject:@"scrollEnabled"];
     }
     
-    if (_enableMomentum != newProps.enableMomentum) {
-        _enableMomentum = newProps.enableMomentum;
-        [updatedPropNames addObject:@"enableMomentum"];
-    }
-
     [super updateProps:props oldProps:oldProps];
     [self didSetProps:updatedPropNames];
 }
@@ -255,7 +284,7 @@ using namespace facebook::react;
 
 - (void)setNativePage:(NSInteger)page
 {
-    _page = page;
+    _page = (int)page;
     [self didSetProps:[NSArray arrayWithObject:@"page"]];
 }
 
@@ -289,7 +318,6 @@ using namespace facebook::react;
     _showsHorizontalScrollIndicator = YES;
     _showsVerticalScrollIndicator = YES;
     _scrollEnabled = YES;
-    _enableMomentum = YES;
 
     // Enhanced properties
     _enableCaching = YES;
@@ -529,37 +557,21 @@ using namespace facebook::react;
             [self setScrollIndicators:self horizontal:_showsHorizontalScrollIndicator vertical:_showsVerticalScrollIndicator depth:0];
         }
 
-        if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"scrollEnabled"])) {
-            if (_scrollEnabled) {
-                for (UIView *subview in _pdfView.subviews) {
-                    if ([subview isKindOfClass:[UIScrollView class]]) {
-                        UIScrollView *scrollView = (UIScrollView *)subview;
-                        scrollView.scrollEnabled = YES;
-                    }
-                }
-            } else {
-                for (UIView *subview in _pdfView.subviews) {
-                    if ([subview isKindOfClass:[UIScrollView class]]) {
-                        UIScrollView *scrollView = (UIScrollView *)subview;
-                        scrollView.scrollEnabled = NO;
-                    }
-                }
-            }
-        }
-        
-        // Apply momentum property
+        // Configure scroll view (scrollEnabled)
         if (_pdfDocument && ([changedProps containsObject:@"path"] || 
-                             [changedProps containsObject:@"enableMomentum"])) {
-            for (UIView *subview in _pdfView.subviews) {
-                if ([subview isKindOfClass:[UIScrollView class]]) {
-                    UIScrollView *scrollView = (UIScrollView *)subview;
-                    
-                    // Apply momentum (bounces)
-                    scrollView.bounces = _enableMomentum;
-                    scrollView.alwaysBounceVertical = _enableMomentum;
-                    scrollView.alwaysBounceHorizontal = _enableMomentum;
-                }
+                             [changedProps containsObject:@"scrollEnabled"])) {
+            // If path changed, restore original delegate before reconfiguring
+            if ([changedProps containsObject:@"path"] && _internalScrollView && _originalScrollDelegate) {
+                _internalScrollView.delegate = _originalScrollDelegate;
+                _internalScrollView = nil;
+                _originalScrollDelegate = nil;
             }
+            
+            // Use dispatch_async to ensure view hierarchy is fully set up after document load
+            dispatch_async(dispatch_get_main_queue(), ^{
+                // Search within _pdfView's hierarchy for scroll views
+                [self configureScrollView:self->_pdfView enabled:self->_scrollEnabled depth:0];
+            });
         }
 
         if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"enablePaging"] || [changedProps containsObject:@"horizontal"] || [changedProps containsObject:@"page"])) {
@@ -796,7 +808,7 @@ using namespace facebook::react;
  *  Tap
  *  zoom reset or zoom in
  *
- *  @param recognizer
+ *  @param recognizer The tap gesture recognizer
  */
 - (void)handleDoubleTap:(UITapGestureRecognizer *)recognizer
 {
@@ -869,7 +881,7 @@ using namespace facebook::react;
  *  Single Tap
  *  stop zoom
  *
- *  @param recognizer
+ *  @param sender The tap gesture recognizer
  */
 - (void)handleSingleTap:(UITapGestureRecognizer *)sender
 {
@@ -893,7 +905,7 @@ using namespace facebook::react;
  *  Pinch
  *
  *
- *  @param recognizer
+ *  @param sender The pinch gesture recognizer
  */
 -(void)handlePinch:(UIPinchGestureRecognizer *)sender{
     [self onScaleChanged:Nil];
@@ -990,6 +1002,83 @@ using namespace facebook::react;
     }
 }
 
+- (void)configureScrollView:(UIView *)view enabled:(BOOL)enabled depth:(int)depth {
+    // max depth, prevent infinite loop
+    if (depth > 10) {
+        return;
+    }
+    
+    if ([view isKindOfClass:[UIScrollView class]]) {
+        UIScrollView *scrollView = (UIScrollView *)view;
+        // Since we're starting the recursion from _pdfView, all scroll views found are within its hierarchy
+        // Configure scroll properties
+        scrollView.scrollEnabled = enabled;
+        
+        // Disable horizontal bouncing to prevent interference with navigation swipe-back
+        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
+        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;
+        }
+    }
+    
+    for (UIView *subview in view.subviews) {
+        [self configureScrollView:subview enabled:enabled depth:depth + 1];
+    }
+}
+
+#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;
+    }
+    
+    // Calculate visible page based on scroll position
+    // Use the center point of the visible viewport
+    CGPoint centerPoint = CGPointMake(
+        scrollView.contentOffset.x + scrollView.bounds.size.width / 2,
+        scrollView.contentOffset.y + scrollView.bounds.size.height / 2
+    );
+    
+    // Convert to PDFView coordinates
+    CGPoint pdfPoint = [scrollView convertPoint:centerPoint toView:_pdfView];
+    PDFPage *visiblePage = [_pdfView pageForPoint:pdfPoint nearest:YES];
+    
+    if (visiblePage) {
+        unsigned long pageIndex = [_pdfDocument indexForPage:visiblePage];
+        int newPage = (int)pageIndex + 1;
+        
+        // Only update if page actually changed and is valid
+        if (newPage != _page && newPage > 0 && newPage <= (int)_pdfDocument.pageCount) {
+            _page = newPage;
+            _pageCount = (int)_pdfDocument.pageCount;
+            
+            // Trigger preloading if enabled
+            if (_enablePreloading) {
+                [self preloadAdjacentPages:_page];
+            }
+            
+            // Notify about page change
+            [self notifyOnChangeWithMessage:[[NSString alloc] initWithString:[NSString stringWithFormat:@"pageChanged|%d|%lu", newPage, _pdfDocument.pageCount]]];
+        }
+    }
+}
+
 // Enhanced progressive loading methods
 - (void)preloadAdjacentPages:(int)currentPage
 {
@@ -1069,9 +1158,6 @@ using namespace facebook::react;
     for (int pageIndex = 0; pageIndex < _pdfDocument.pageCount; pageIndex++) {
         PDFPage *page = [_pdfDocument pageAtIndex:pageIndex];
         
-        // Get the page bounds
-        CGRect pageBounds = [page boundsForBox:kPDFDisplayBoxCropBox];
-        
         // Search for text in the page
         PDFSelection *selection = [page selectionForRange:NSMakeRange(0, page.string.length)];
         if (selection && selection.string.length > 0) {
@@ -1105,9 +1191,33 @@ using namespace facebook::react;
 @end
 
 #ifdef RCT_NEW_ARCH_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 Class<RCTComponentViewProtocol> RNPDFPdfViewCls(void)
 {
-    return RNPDFPdfView.class;
+    // Defensive check: Ensure class is loaded and valid before returning
+    // This prevents nil object insertion in RCTThirdPartyComponentsProvider
+    Class cls = RNPDFPdfView.class;
+    if (cls == nil) {
+        RCTLogError(@"RNPDFPdfView: Class is nil in RNPDFPdfViewCls");
+        // Return a fallback to prevent crash, though this shouldn't happen
+        return [RCTViewComponentView class];
+    }
+    return cls;
+}
+
+// Alias function based on codegen name "rnpdf" - ensures codegen can find the function
+// even if it uses the codegen name instead of componentProvider name
+Class<RCTComponentViewProtocol> rnpdfCls(void)
+{
+    return RNPDFPdfViewCls();
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-pdf-jsi",
-    "version": "3.3.1",
+    "version": "3.4.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",
@@ -64,7 +64,8 @@
     },
     "dependencies": {
         "crypto-js": "4.2.0",
-        "deprecated-react-native-prop-types": "^2.3.0"
+        "deprecated-react-native-prop-types": "^2.3.0",
+        "react-native-pdf-jsi": "^2.2.4"
     },
     "devDependencies": {
         "@babel/core": "^7.20.2",
@@ -72,10 +73,10 @@
         "prop-types": "^15.7.2"
     },
     "peerDependencies": {
+        "@react-native-async-storage/async-storage": ">=1.17.0",
         "react": "*",
         "react-native": "*",
-        "react-native-blob-util": ">=0.13.7",
-        "@react-native-async-storage/async-storage": ">=1.17.0"
+        "react-native-blob-util": ">=0.13.7"
     },
     "files": [
         "android/",
@@ -93,7 +94,9 @@
         "PinchZoomView.js",
         "react-native-pdf-jsi.podspec",
         "fabric/",
-        "README_JSI.md"
+        "README.md",
+        "README_JSI.md",
+        "LICENSE"
     ],
     "codegenConfig": {
         "name": "rnpdf",
@@ -103,7 +106,9 @@
             "javaPackageName": "org.wonday.pdf"
         },
         "ios": {
-            "componentProvider": "RNPDFPdfView"
+            "componentProvider": {
+                "RNPDFPdfView": "RNPDFPdfView"
+            }
         }
     }
 }

package/src/PDFJSI.js

@@ -75,18 +75,23 @@ class PDFJSIManager {
         this.cacheMetrics = new Map();
         this.initializationPromise = null;
         
-        this.initializeJSI();
+        // Don't initialize JSI in constructor - it will be initialized lazily when first accessed
+        // This prevents hooks from being called before React is ready
     }
     
     /**
      * Initialize JSI availability check
+     * This is now called lazily when first accessed, not at module load
      */
     async initializeJSI() {
         if (this.initializationPromise) {
             return this.initializationPromise;
         }
         
-        this.initializationPromise = this.checkJSIAvailability();
+        // Defer initialization to prevent hooks from being called before React is ready
+        this.initializationPromise = Promise.resolve().then(() => {
+            return this.checkJSIAvailability();
+        });
         return this.initializationPromise;
     }
     
@@ -814,8 +819,28 @@ class PDFJSIManager {
     }
 }
 
-// Create singleton instance
-const pdfJSIManager = new PDFJSIManager();
+// Create singleton instance lazily to prevent initialization before React is ready
+let pdfJSIManagerInstance = null;
+
+const getPDFJSIManager = () => {
+    if (!pdfJSIManagerInstance) {
+        pdfJSIManagerInstance = new PDFJSIManager();
+    }
+    return pdfJSIManagerInstance;
+};
+
+// Export a proxy that lazy-loads the instance
+const pdfJSIManager = new Proxy({}, {
+    get(target, prop) {
+        const instance = getPDFJSIManager();
+        const value = instance[prop];
+        // If it's a method, bind it to the instance
+        if (typeof value === 'function') {
+            return value.bind(instance);
+        }
+        return value;
+    }
+});
 
 export default pdfJSIManager;
 

package/src/components/AnalyticsPanel.jsx

@@ -12,10 +12,23 @@ const AnalyticsPanel = ({
   analytics,
   licenseInfo,
 }) => {
-  const timeInMinutes = Math.round(analytics.timeSpent / 60);
+  // Handle null/undefined analytics with defaults
+  const safeAnalytics = analytics || {
+    timeSpent: 0,
+    pagesRead: [],
+    totalPages: 0,
+    percentage: 0,
+    sessions: 0,
+    currentPage: 1,
+    lastRead: null,
+  };
+  
+  const timeInMinutes = Math.round((safeAnalytics.timeSpent || 0) / 60);
+  const pagesReadArray = Array.isArray(safeAnalytics.pagesRead) ? safeAnalytics.pagesRead : [];
+  const totalPages = safeAnalytics.totalPages || 0;
   const readingSpeed =
-    timeInMinutes > 0 ? analytics.pagesRead.length / timeInMinutes : 0;
-  const remainingPages = analytics.totalPages - analytics.pagesRead.length;
+    timeInMinutes > 0 ? pagesReadArray.length / timeInMinutes : 0;
+  const remainingPages = totalPages - pagesReadArray.length;
   const estimatedTimeRemaining =
     readingSpeed > 0 ? Math.round(remainingPages / readingSpeed) : 0;
 
@@ -34,13 +47,13 @@ const AnalyticsPanel = ({
           <View style={styles.progressSection}>
             <View style={styles.progressRing}>
               <Text style={styles.progressPercent}>
-                {analytics.percentage}%
+                {safeAnalytics.percentage || 0}%
               </Text>
               <Text style={styles.progressLabel}>Complete</Text>
             </View>
             <View style={styles.progressStats}>
               <Text style={styles.statValue}>
-                {analytics.pagesRead.length}/{analytics.totalPages}
+                {pagesReadArray.length}/{totalPages}
               </Text>
               <Text style={styles.statLabel}>Pages Read</Text>
             </View>
@@ -64,7 +77,7 @@ const AnalyticsPanel = ({
 
             <View style={styles.statCard}>
               <Text style={styles.statIcon}>🔄</Text>
-              <Text style={styles.statCardValue}>{analytics.sessions}</Text>
+              <Text style={styles.statCardValue}>{safeAnalytics.sessions || 0}</Text>
               <Text style={styles.statCardLabel}>Sessions</Text>
             </View>
 
@@ -81,11 +94,11 @@ const AnalyticsPanel = ({
           <View style={styles.sessionCard}>
             <Text style={styles.sessionTitle}>Current Session</Text>
             <Text style={styles.sessionInfo}>
-              Page {analytics.currentPage} of {analytics.totalPages}
+              Page {safeAnalytics.currentPage || 1} of {totalPages}
             </Text>
-            {analytics.lastRead && (
+            {safeAnalytics.lastRead && (
               <Text style={styles.sessionTime}>
-                Last read: {new Date(analytics.lastRead).toLocaleTimeString()}
+                Last read: {new Date(safeAnalytics.lastRead).toLocaleTimeString()}
               </Text>
             )}
           </View>

package/src/managers/AnalyticsManager.js

@@ -10,8 +10,7 @@
  * OPTIMIZATION: Memoized analytics for 95% faster repeated calls
  */
 
-import bookmarkManager from '../bookmarks/BookmarkManager';
-import licenseManager from '../license/LicenseManager';
+import bookmarkManager from './BookmarkManager';
 import MemoizedAnalytics from '../utils/MemoizedAnalytics';
 
 /**
@@ -28,9 +27,6 @@ export class AnalyticsManager {
      * Initialize analytics
      */
     async initialize() {
-        // Check Pro license
-        licenseManager.requirePro('Reading Analytics');
-        
         if (!this.initialized) {
             await bookmarkManager.initialize();
             this.initialized = true;

package/src/managers/BookmarkManager.js

@@ -11,7 +11,6 @@
  */
 
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import licenseManager, { ProFeature } from '../license/LicenseManager';
 
 const STORAGE_KEY = '@react-native-pdf-jsi/bookmarks';
 const PROGRESS_KEY = '@react-native-pdf-jsi/progress';
@@ -94,10 +93,7 @@ export class BookmarkManager {
     async createBookmark(pdfId, bookmark) {
         await this.initialize();
 
-        // Check if using Pro features (colors)
-        if (bookmark.color && bookmark.color !== '#000000') {
-            licenseManager.requirePro('Bookmark Colors');
-        }
+        // All features enabled by default
 
         const newBookmark = {
             id: this.generateId(),
@@ -255,11 +251,7 @@ export class BookmarkManager {
     async updateProgress(pdfId, progressData) {
         await this.initialize();
 
-        // Basic progress tracking is free
-        // Advanced analytics require Pro
-        if (progressData.timeSpent || progressData.sessions) {
-            licenseManager.requirePro('Reading Progress Tracking');
-        }
+        // All features enabled by default
 
         const currentProgress = this.progress.get(pdfId) || {
             pdfId,

package/src/managers/CacheManager.js

@@ -16,7 +16,20 @@ import { NativeModules, NativeEventEmitter, Platform } from 'react-native';
 const { PDFJSIManager } = NativeModules;
 
 // Event emitter for progress updates
-const eventEmitter = PDFJSIManager ? new NativeEventEmitter(PDFJSIManager) : null;
+// Safely create event emitter only if the module supports event listeners
+let eventEmitter = null;
+if (PDFJSIManager) {
+    try {
+        // Check if NativeEventEmitter is available and the module supports events
+        if (typeof NativeEventEmitter !== 'undefined' && 
+            (typeof PDFJSIManager.addListener === 'function' || typeof PDFJSIManager.removeListeners === 'function')) {
+            eventEmitter = new NativeEventEmitter(PDFJSIManager);
+        }
+    } catch (error) {
+        console.warn('[CacheManager] Failed to create NativeEventEmitter:', error);
+        eventEmitter = null;
+    }
+}
 
 class CacheManager {
     constructor() {

package/src/managers/ExportManager.js

@@ -13,7 +13,6 @@
 
 import { NativeModules, Platform, Share } from 'react-native';
 import PDFTextExtractor from '../utils/PDFTextExtractor';
-import licenseManager, { ProFeature } from '../license/LicenseManager';
 
 const { PDFExporter } = NativeModules;
 
@@ -167,9 +166,7 @@ export class ExportManager {
      * @returns {Promise<Array>} Array of image paths
      */
     async exportToImages(filePath, options = {}) {
-        // ⚠️ PRO FEATURE - Requires license
-        licenseManager.requirePro('Export to Images');
-
+        // All features enabled by default
         const {
             pages = null, // null = all pages
             format = ExportFormat.JPEG,
@@ -230,11 +227,7 @@ export class ExportManager {
         });
 
         try {
-            // ⚠️ PRO FEATURE - Requires license
-            console.log('🔑 [ExportManager] Checking license for Export to Images...');
-            licenseManager.requirePro('Export to Images');
-            console.log('✅ [ExportManager] License check passed');
-
+            // All features enabled by default
             if (this.isNativeAvailable) {
                 console.log('📱 [ExportManager] Calling native PDFExporter.exportPageToImage...');
                 console.log('📱 [ExportManager] Parameters:', {
@@ -277,9 +270,7 @@ export class ExportManager {
      * @returns {Promise<string>} Path to merged PDF
      */
     async mergePDFs(filePaths, outputPath = null) {
-        // ⚠️ PRO FEATURE - Requires license
-        licenseManager.requirePro('PDF Operations');
-
+        // All features enabled by default
         console.log(`📤 ExportManager: Merging ${filePaths.length} PDFs...`);
 
         try {
@@ -313,10 +304,7 @@ export class ExportManager {
         });
 
         try {
-            console.log('🔑 [ExportManager] Checking license for PDF Operations...');
-            licenseManager.requirePro('PDF Operations');
-            console.log('✅ [ExportManager] License check passed');
-
+            // All features enabled by default
             if (this.isNativeAvailable) {
                 console.log('📱 [ExportManager] Calling native PDFExporter.splitPDF...');
                 console.log('📱 [ExportManager] Ranges:', JSON.stringify(ranges));
@@ -354,10 +342,7 @@ export class ExportManager {
         });
 
         try {
-            console.log('🔑 [ExportManager] Checking license for PDF Operations...');
-            licenseManager.requirePro('PDF Operations');
-            console.log('✅ [ExportManager] License check passed');
-
+            // All features enabled by default
             if (this.isNativeAvailable) {
                 // Convert to 0-indexed
                 const pageIndices = pages.map(p => p - 1);

package/src/utils/ErrorHandler.js

@@ -157,16 +157,6 @@ export const validatePageNumber = (page, totalPages) => {
   }
 };
 
-export const validateLicense = (licenseManager, featureName) => {
-  if (!licenseManager.isProActive()) {
-    throw new PDFError(
-      `${featureName} requires a Pro license`,
-      ErrorCodes.LICENSE_REQUIRED,
-      {feature: featureName}
-    );
-  }
-};
-
 export default {
   PDFError,
   ErrorCodes,
@@ -175,5 +165,4 @@ export default {
   withErrorHandling,
   validatePDFPath,
   validatePageNumber,
-  validateLicense,
 };