react-native-pdf-jsi 4.3.1 → 4.4.0

package/ios/RNPDFPdf/PDFJSIManager.m

@@ -8,9 +8,11 @@
 
 #import "PDFJSIManager.h"
 #import "PDFNativeCacheManager.h"
+#import "SearchRegistry.h"
 #import <React/RCTLog.h>
 #import <React/RCTUtils.h>
 #import <React/RCTBridge.h>
+#import <PDFKit/PDFKit.h>
 #import <dispatch/dispatch.h>
 
 @implementation PDFJSIManager {
@@ -248,6 +250,21 @@ RCT_EXPORT_METHOD(optimizeMemory:(NSString *)pdfId
     });
 }
 
+RCT_EXPORT_METHOD(registerPathForSearch:(NSString *)pdfId
+                  path:(NSString *)path
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    if (pdfId.length && path.length) {
+        [SearchRegistry registerPath:pdfId path:path];
+        RCTLogInfo(@"✅ [SearchRegistry] Registered path for pdfId: %@ (path length %lu)", pdfId, (unsigned long)path.length);
+        resolve(@YES);
+    } else {
+        RCTLogWarn(@"⚠️ [SearchRegistry] registerPathForSearch skipped: pdfId length=%lu path length=%lu", (unsigned long)pdfId.length, (unsigned long)path.length);
+        resolve(@NO);
+    }
+}
+
 RCT_EXPORT_METHOD(searchTextDirect:(NSString *)pdfId
                   searchTerm:(NSString *)searchTerm
                   startPage:(NSInteger)startPage
@@ -259,14 +276,82 @@ RCT_EXPORT_METHOD(searchTextDirect:(NSString *)pdfId
         reject(@"JSI_NOT_INITIALIZED", @"JSI is not initialized", nil);
         return;
     }
+    if (!searchTerm || searchTerm.length == 0) {
+        resolve(@[]);
+        return;
+    }
     
     dispatch_async(_backgroundQueue, ^{
         @try {
             RCTLogInfo(@"🔍 Searching text via JSI: '%@' in pages %ld-%ld", searchTerm, (long)startPage, (long)endPage);
             
-            // Simulate text search - return empty array for now
-            NSArray *results = @[];
-            resolve(results);
+            NSString *path = [SearchRegistry pathForPdfId:pdfId];
+            if (!path || path.length == 0) {
+                RCTLogWarn(@"❌ [Search] No path registered for pdfId: %@ - ensure onLoadComplete ran and pdfId is set on Pdf", pdfId);
+                resolve(@[]);
+                return;
+            }
+            if ([path hasPrefix:@"http://"] || [path hasPrefix:@"https://"]) {
+                RCTLogWarn(@"❌ [Search] Path for pdfId %@ is a URI (not a local file path) - cannot open for search", pdfId);
+                resolve(@[]);
+                return;
+            }
+            RCTLogInfo(@"📂 [Search] Path for pdfId '%@': length %lu", pdfId, (unsigned long)path.length);
+            if ([path hasPrefix:@"file://"]) {
+                path = [path substringFromIndex:7];
+            }
+            BOOL readable = [[NSFileManager defaultManager] isReadableFileAtPath:path];
+            if (!readable) {
+                RCTLogWarn(@"❌ [Search] File not readable at path (length %lu)", (unsigned long)path.length);
+                resolve(@[]);
+                return;
+            }
+            NSURL *fileURL = [NSURL fileURLWithPath:path];
+            PDFDocument *doc = [[PDFDocument alloc] initWithURL:fileURL];
+            if (!doc || doc.pageCount == 0) {
+                RCTLogWarn(@"❌ [Search] PDFDocument init failed or empty: doc=%p pageCount=%lu", (__bridge void *)doc, (unsigned long)doc.pageCount);
+                resolve(@[]);
+                return;
+            }
+            
+            NSInteger from = MAX(1, startPage);
+            NSInteger to = MIN((NSInteger)doc.pageCount, endPage);
+            NSMutableArray *out = [NSMutableArray array];
+            
+            // findString:withOptions: returns selections; each can span multiple pages
+            NSArray<PDFSelection *> *selections = [doc findString:searchTerm withOptions:NSCaseInsensitiveSearch];
+            RCTLogInfo(@"📄 [Search] findString returned %lu selection(s) for '%@'", (unsigned long)selections.count, searchTerm);
+            for (PDFSelection *sel in selections) {
+                for (PDFPage *page in sel.pages) {
+                    NSInteger pageIndex1Based = [doc indexForPage:page] + 1;
+                    if (pageIndex1Based < from || pageIndex1Based > to) continue;
+                    
+                    CGRect bounds = [sel boundsForPage:page];
+                    // PDF page coords: origin bottom-left. Serialize as "left,top,right,bottom" (y-up: top > bottom)
+                    CGFloat left = bounds.origin.x;
+                    CGFloat bottom = bounds.origin.y;
+                    CGFloat right = bounds.origin.x + bounds.size.width;
+                    CGFloat top = bounds.origin.y + bounds.size.height;
+                    NSString *rectStr = [NSString stringWithFormat:@"%g,%g,%g,%g", left, top, right, bottom];
+                    
+                    [out addObject:@{
+                        @"page": @(pageIndex1Based),
+                        @"text": sel.string ?: @"",
+                        @"rect": rectStr
+                    }];
+                }
+            }
+            
+            // Register page sizes in points for highlight scaling (use first page of range if we have selections)
+            for (NSInteger idx = from; idx <= to; idx++) {
+                PDFPage *page = [doc pageAtIndex:(NSUInteger)(idx - 1)];
+                if (page) {
+                    CGRect box = [page boundsForBox:kPDFDisplayBoxMediaBox];
+                    [SearchRegistry registerPageSizePointsForPdfId:pdfId pageIndex0Based:(idx - 1) widthPt:box.size.width heightPt:box.size.height];
+                }
+            }
+            
+            resolve([out copy]);
             
         } @catch (NSException *exception) {
             RCTLogError(@"❌ Error searching text via JSI: %@", exception.reason);
@@ -580,7 +665,7 @@ RCT_EXPORT_METHOD(testNativeCache:(RCTPromiseResolveBlock)resolve
 
                // iOS doesn't have the same 16KB page size requirements as Android
                // but we still check for compatibility
-               BOOL is16KBSupported = [self checkiOS16KBSupport];
+               (void)[self checkiOS16KBSupport];
 
                NSDictionary *result = @{
                    @"supported": @YES, // iOS is generally compatible

package/ios/RNPDFPdf/RNPDFPdfView.h

@@ -68,6 +68,8 @@ UIView
 @property(nonatomic) int spacing;
 @property(nonatomic, strong) NSString *password;
 @property(nonatomic) BOOL singlePage;
+@property(nonatomic, strong) NSString *pdfId;
+@property(nonatomic, copy) NSArray *highlightRects;
 
 @property(nonatomic, copy) RCTBubblingEventBlock onChange;
 

package/ios/RNPDFPdf/RNPDFPdfView.mm

@@ -7,6 +7,7 @@
  */
 
 #import "RNPDFPdfView.h"
+#import "SearchRegistry.h"
 
 #import <Foundation/Foundation.h>
 #import <QuartzCore/QuartzCore.h>
@@ -55,6 +56,37 @@ const float MAX_SCALE = 3.0f;
 const float MIN_SCALE = 1.0f;
 
 
+/** Overlay that draws highlight rects on top of the PDF view. */
+@interface HighlightOverlayView : UIView
+@property (nonatomic, weak) PDFView *pdfView;
+@property (nonatomic, copy) NSArray<NSDictionary *> *highlightRects;
+@end
+
+@implementation HighlightOverlayView
+- (void)drawRect:(CGRect)rect {
+    PDFView *pv = self.pdfView;
+    NSArray *items = self.highlightRects;
+    if (!pv || !pv.document || !items.count) return;
+    PDFDocument *doc = pv.document;
+    [[UIColor colorWithRed:1 green:1 blue:0 alpha:0.35] setFill];
+    for (NSDictionary *item in items) {
+        NSNumber *pageNum = item[@"page"];
+        NSString *rectStr = item[@"rect"];
+        if (!pageNum || !rectStr.length) continue;
+        int page1 = pageNum.intValue;
+        if (page1 < 1) continue;
+        PDFPage *page = [doc pageAtIndex:(NSUInteger)(page1 - 1)];
+        if (!page) continue;
+        NSArray<NSString *> *parts = [rectStr componentsSeparatedByString:@","];
+        if (parts.count != 4) continue;
+        CGFloat left = parts[0].doubleValue, top = parts[1].doubleValue, right = parts[2].doubleValue, bottom = parts[3].doubleValue;
+        CGRect pageRect = CGRectMake(left, bottom, right - left, top - bottom);
+        CGRect viewRect = [pv convertRect:pageRect fromPage:page];
+        CGContextFillRect(UIGraphicsGetCurrentContext(), viewRect);
+    }
+}
+@end
+
 @interface RNPDFScrollViewDelegateProxy : NSObject <UIScrollViewDelegate>
 - (instancetype)initWithPrimary:(id<UIScrollViewDelegate>)primary secondary:(id<UIScrollViewDelegate>)secondary;
 @end
@@ -98,10 +130,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
@@ -158,6 +213,13 @@ const float MIN_SCALE = 1.0f;
     // Track usePageViewController state to prevent unnecessary reconfiguration
     BOOL _currentUsePageViewController;
     BOOL _usePageViewControllerStateInitialized;
+    
+    // Search and highlight (iOS parity with Android)
+    NSString *_pdfId;
+    NSArray *_highlightRects;
+    HighlightOverlayView *_highlightOverlay;
+    /// Local file path when document loaded (used for SearchRegistry; may differ from _path which can be URI)
+    NSString *_lastLoadedPath;
 }
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -292,6 +354,30 @@ using namespace facebook::react;
         _scrollEnabled = newProps.scrollEnabled;
         [updatedPropNames addObject:@"scrollEnabled"];
     }
+    NSString *newPdfId = RCTNSStringFromStringNilIfEmpty(newProps.pdfId);
+    if (_pdfId != newPdfId && ![newPdfId isEqualToString:_pdfId]) {
+        if (_pdfId.length) [SearchRegistry unregisterPath:_pdfId];
+        _pdfId = [newPdfId copy];
+        [updatedPropNames addObject:@"pdfId"];
+        // Only register local file paths; never register URIs - onDocumentChanged will register when we have local path
+        NSString *pathToRegister = nil;
+        if (_lastLoadedPath.length > 0) {
+            pathToRegister = _lastLoadedPath;
+        } else if (_path.length > 0 && [_path hasPrefix:@"/"]) {
+            pathToRegister = _path;
+        }
+        if (_pdfId.length && pathToRegister.length > 0) {
+            [SearchRegistry registerPath:_pdfId path:pathToRegister];
+            RCTLogInfo(@"✅ [iOS] SearchRegistry registered path for pdfId: %@ (from updateProps)", _pdfId);
+        }
+    }
+    // Convert codegen vector of {page, rect} to NSArray for setHighlightRects
+    NSMutableArray *newHighlightRects = [NSMutableArray array];
+    for (const auto &item : newProps.highlightRects) {
+      [newHighlightRects addObject:@{ @"page": @(item.page), @"rect": [NSString stringWithUTF8String:item.rect.c_str()] }];
+    }
+    [self setHighlightRects:[newHighlightRects copy]];
+    [updatedPropNames addObject:@"highlightRects"];
     
     [super updateProps:props oldProps:oldProps];
     [self didSetProps:updatedPropNames];
@@ -306,10 +392,11 @@ using namespace facebook::react;
 - (void)prepareForRecycle
 {
     [super prepareForRecycle];
-
+    if (_pdfId.length) [SearchRegistry unregisterPath:_pdfId];
     [_pdfView removeFromSuperview];
     _pdfDocument = Nil;
     _pdfView = Nil;
+    _highlightOverlay = Nil;
     //Remove notifications
     [[NSNotificationCenter defaultCenter] removeObserver:self name:@"PDFViewDocumentChangedNotification" object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:@"PDFViewPageChangedNotification" object:nil];
@@ -419,6 +506,11 @@ using namespace facebook::react;
     _preloadQueue.maxConcurrentOperationCount = 3;
     _preloadQueue.qualityOfService = NSQualityOfServiceBackground;
 
+    _pdfId = nil;
+    _highlightRects = nil;
+    _lastLoadedPath = nil;
+    _highlightOverlay = nil;
+
     // init and config PDFView
     _pdfView = [[PDFView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)];
     _pdfView.displayMode = kPDFDisplaySinglePageContinuous;
@@ -443,10 +535,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 +757,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 +776,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"])) {
@@ -952,10 +1066,58 @@ using namespace facebook::react;
         RCTLogInfo(@"🔍 [iOS] loadComplete message: %@", message);
         
         [self notifyOnChangeWithMessage:message];
+        
+        // Store local path so we can register when pdfId is set (Fabric may set pdfId after document load)
+        _lastLoadedPath = [pathValue copy];
+        // Register path for searchTextDirect (iOS parity with Android)
+        if (_pdfId.length && pathValue.length) {
+            [SearchRegistry registerPath:_pdfId path:pathValue];
+            RCTLogInfo(@"✅ [iOS] SearchRegistry registered path for pdfId: %@ (from onDocumentChanged)", _pdfId);
+        }
     }
 
 }
 
+- (void)setPdfId:(NSString *)pdfId {
+    if (_pdfId.length && ![pdfId isEqualToString:_pdfId]) {
+        [SearchRegistry unregisterPath:_pdfId];
+    }
+    _pdfId = [pdfId copy];
+    // If document already loaded, register path now (Fabric may set pdfId after path/document load).
+    // Only register local file paths; never register URIs (http/https) - PDFDocument needs file path.
+    NSString *pathToRegister = nil;
+    if (_lastLoadedPath.length > 0) {
+        pathToRegister = _lastLoadedPath;
+    } else if (_path.length > 0 && [_path hasPrefix:@"/"]) {
+        pathToRegister = _path;
+    }
+    if (_pdfId.length && pathToRegister.length > 0) {
+        [SearchRegistry registerPath:_pdfId path:pathToRegister];
+        RCTLogInfo(@"✅ [iOS] SearchRegistry registered path for pdfId: %@ (from setPdfId)", _pdfId);
+    }
+}
+
+- (void)setHighlightRects:(NSArray *)highlightRects {
+    _highlightRects = [highlightRects copy];
+    if (!_pdfView) return;
+    if (_highlightRects.count > 0) {
+        if (!_highlightOverlay) {
+            _highlightOverlay = [[HighlightOverlayView alloc] initWithFrame:_pdfView.bounds];
+            _highlightOverlay.backgroundColor = [UIColor clearColor];
+            _highlightOverlay.userInteractionEnabled = NO;
+            _highlightOverlay.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+            _highlightOverlay.pdfView = _pdfView;
+            [_pdfView addSubview:_highlightOverlay];
+            [_pdfView bringSubviewToFront:_highlightOverlay];
+        }
+        _highlightOverlay.highlightRects = _highlightRects;
+        [_highlightOverlay setNeedsDisplay];
+    } else if (_highlightOverlay) {
+        _highlightOverlay.highlightRects = @[];
+        [_highlightOverlay setNeedsDisplay];
+    }
+}
+
 -(NSString *) getTableContents
 {
 
@@ -1073,6 +1235,7 @@ using namespace facebook::react;
 
         RLog(@"Enhanced PDF: Navigated to page %d", _page);
         [self notifyOnChangeWithMessage:[[NSString alloc] initWithString:[NSString stringWithFormat:@"pageChanged|%lu|%lu", page+1, numberOfPages]]];
+        if (_highlightOverlay) [_highlightOverlay setNeedsDisplay];
     }
 
 }
@@ -1087,6 +1250,7 @@ using namespace facebook::react;
             [self notifyOnChangeWithMessage:[[NSString alloc] initWithString:[NSString stringWithFormat:@"scaleChanged|%f", _scale]]];
         }
     }
+    if (_highlightOverlay) [_highlightOverlay setNeedsDisplay];
 }
 
 #pragma mark gesture process
@@ -1328,6 +1492,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 +1512,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");
         }
     }
     
@@ -1371,9 +1554,11 @@ using namespace facebook::react;
 #pragma mark - UIScrollViewDelegate
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+    // Redraw highlight overlay so rects stay aligned when user scrolls (pan)
+    if (_highlightOverlay) [_highlightOverlay setNeedsDisplay];
     static int scrollEventCount = 0;
     scrollEventCount++;
-    
+
     // Log scroll events periodically (every 10th event to avoid spam)
     if (scrollEventCount % 10 == 0) {
         RCTLogInfo(@"📜 [iOS Scroll] scrollViewDidScroll #%d - offset=(%.2f, %.2f), contentSize=(%.2f, %.2f), bounds=(%.2f, %.2f), scrollEnabled=%d", 
@@ -1440,6 +1625,59 @@ using namespace facebook::react;
     }
 }
 
+#pragma mark - UIScrollViewDelegate Zoom Support
+
+- (void)scrollViewDidZoom:(UIScrollView *)scrollView {
+    // Called during pinch-to-zoom — redraw highlight overlay so rects stay aligned with zoomed content
+    if (_highlightOverlay) [_highlightOverlay setNeedsDisplay];
+    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 {
+    // Redraw highlight overlay so rects match final zoom level
+    if (_highlightOverlay) [_highlightOverlay setNeedsDisplay];
+    RCTLogInfo(@"🔍 [iOS Zoom] Did end zooming at scale %f", scale);
+}
+
 // Enhanced progressive loading methods
 - (void)preloadAdjacentPages:(int)currentPage
 {

package/ios/RNPDFPdf/RNPDFPdfViewManager.mm

@@ -52,6 +52,8 @@ RCT_EXPORT_VIEW_PROPERTY(spacing, int);
 RCT_EXPORT_VIEW_PROPERTY(password, NSString);
 RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(singlePage, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(pdfId, NSString);
+RCT_EXPORT_VIEW_PROPERTY(highlightRects, NSArray);
 
 RCT_EXPORT_METHOD(supportPDFKit:(RCTResponseSenderBlock)callback)
 {
@@ -177,12 +179,14 @@ RCT_EXPORT_METHOD(optimizeMemory:(NSString *)pdfId
 
 RCT_EXPORT_METHOD(searchTextDirect:(NSString *)pdfId
                   searchTerm:(NSString *)searchTerm
+                  startPage:(NSInteger)startPage
+                  endPage:(NSInteger)endPage
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
     PDFJSIManager *jsiManager = [self.bridge moduleForClass:[PDFJSIManager class]];
     if (jsiManager) {
-        [jsiManager searchTextDirect:pdfId searchTerm:searchTerm startPage:1 endPage:999 resolver:resolve rejecter:reject];
+        [jsiManager searchTextDirect:pdfId searchTerm:searchTerm startPage:startPage endPage:endPage resolver:resolve rejecter:reject];
     } else {
         reject(@"JSI_NOT_AVAILABLE", @"PDFJSIManager not available", nil);
     }

package/ios/RNPDFPdf/SearchRegistry.h

@@ -0,0 +1,21 @@
+/**
+ * Registry mapping pdfId to current PDF file path for programmatic search.
+ * RNPDFPdfView registers when a document loads with pdfId; searchTextDirect looks up path by pdfId.
+ * Also stores PDF page sizes in points (per pdfId + pageIndex) for highlight coordinate scaling.
+ */
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SearchRegistry : NSObject
+
++ (void)registerPath:(NSString *)pdfId path:(NSString *)path;
++ (void)unregisterPath:(NSString *)pdfId;
++ (nullable NSString *)pathForPdfId:(NSString *)pdfId;
+
++ (void)registerPageSizePointsForPdfId:(NSString *)pdfId pageIndex0Based:(NSInteger)pageIndex widthPt:(CGFloat)widthPt heightPt:(CGFloat)heightPt;
++ (void)getPageSizePointsForPdfId:(NSString *)pdfId pageIndex0Based:(NSInteger)pageIndex widthOut:(CGFloat *)widthOut heightOut:(CGFloat *)heightOut;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/RNPDFPdf/SearchRegistry.m

@@ -0,0 +1,71 @@
+/**
+ * Registry mapping pdfId to current PDF file path for programmatic search.
+ */
+#import "SearchRegistry.h"
+
+@implementation SearchRegistry
+
+static NSMutableDictionary<NSString *, NSString *> *_pathByPdfId;
+static NSMutableDictionary<NSString *, NSValue *> *_pageSizeByKey; // key = "pdfId_pageIndex", value = NSValue with CGSize
+static dispatch_queue_t _queue;
+
++ (void)initialize {
+    if (self == [SearchRegistry class]) {
+        _pathByPdfId = [NSMutableDictionary new];
+        _pageSizeByKey = [NSMutableDictionary new];
+        _queue = dispatch_queue_create("com.rnpdf.searchregistry", DISPATCH_QUEUE_SERIAL);
+    }
+}
+
++ (void)registerPath:(NSString *)pdfId path:(NSString *)path {
+    if (!pdfId.length || !path.length) return;
+    dispatch_sync(_queue, ^{
+        _pathByPdfId[pdfId] = path;
+    });
+}
+
++ (void)unregisterPath:(NSString *)pdfId {
+    if (!pdfId.length) return;
+    dispatch_sync(_queue, ^{
+        [_pathByPdfId removeObjectForKey:pdfId];
+        NSString *prefix = [pdfId stringByAppendingString:@"_"];
+        NSArray *keysToRemove = [_pageSizeByKey.allKeys filteredArrayUsingPredicate:
+            [NSPredicate predicateWithBlock:^BOOL(NSString *key, id _) { return [key hasPrefix:prefix]; }]];
+        [_pageSizeByKey removeObjectsForKeys:keysToRemove];
+    });
+}
+
++ (NSString *)pathForPdfId:(NSString *)pdfId {
+    if (!pdfId.length) return nil;
+    __block NSString *path = nil;
+    dispatch_sync(_queue, ^{
+        path = _pathByPdfId[pdfId];
+    });
+    return path;
+}
+
++ (void)registerPageSizePointsForPdfId:(NSString *)pdfId pageIndex0Based:(NSInteger)pageIndex widthPt:(CGFloat)widthPt heightPt:(CGFloat)heightPt {
+    if (!pdfId.length || widthPt <= 0 || heightPt <= 0) return;
+    NSString *key = [NSString stringWithFormat:@"%@_%ld", pdfId, (long)pageIndex];
+    dispatch_sync(_queue, ^{
+        _pageSizeByKey[key] = [NSValue valueWithCGSize:CGSizeMake(widthPt, heightPt)];
+    });
+}
+
++ (void)getPageSizePointsForPdfId:(NSString *)pdfId pageIndex0Based:(NSInteger)pageIndex widthOut:(CGFloat *)widthOut heightOut:(CGFloat *)heightOut {
+    if (!pdfId.length || !widthOut || !heightOut) return;
+    *widthOut = 0;
+    *heightOut = 0;
+    NSString *key = [NSString stringWithFormat:@"%@_%ld", pdfId, (long)pageIndex];
+    __block NSValue *val = nil;
+    dispatch_sync(_queue, ^{
+        val = _pageSizeByKey[key];
+    });
+    if (val) {
+        CGSize s = [val CGSizeValue];
+        *widthOut = s.width;
+        *heightOut = s.height;
+    }
+}
+
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-pdf-jsi",
-    "version": "4.3.1",
+    "version": "4.4.0",
     "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",
@@ -80,7 +80,9 @@
     },
     "scripts": {
         "build:plugin": "tsc -p plugin/tsconfig.json",
-        "prepublishOnly": "npm run build:plugin"
+        "prepublishOnly": "npm run build:plugin",
+        "clean:for-publish": "node -e \"const fs=require('fs'),path=require('path');['android/.cxx','android/.gradle','android/build'].forEach(p=>{try{fs.rmSync(path.join(__dirname,p),{recursive:true});console.log('Removed',p);}catch(e){}})\"",
+        "prepack": "npm run clean:for-publish"
     },
     "peerDependencies": {
         "@react-native-async-storage/async-storage": ">=1.17.0",