@amafil/react-native-pdf-toolkit 1.0.8 → 1.0.9

package/README.md

@@ -170,6 +170,13 @@ react-native run-ios
 ### ChangeLog
 <details>
   <summary>ChangeLog details</summary>
+
+v7.0.4
+1. Fixed: Android PDF crash: IllegalStateException: Already closed (#989) (#999)
+2. Fixed: scrollTop on initial render on iOS (#1001)
+3. Feature(ios): add text selection support via PDFKit (#1003)
+
+
 v7.0.3
 1. Fixed: RefObject types, and setPage not working in android (#985)
 

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

@@ -27,6 +27,11 @@ import android.view.MotionEvent;
 import android.graphics.Canvas;
 import android.graphics.pdf.PdfRenderer;
 
+import io.legere.pdfiumandroid.util.Config;
+import io.legere.pdfiumandroid.util.ConfigKt;
+import io.legere.pdfiumandroid.util.AlreadyClosedBehavior;
+import io.legere.pdfiumandroid.DefaultLogger;
+
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.github.barteksc.pdfviewer.PDFView;
@@ -50,12 +55,6 @@ import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.Event;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
 
-import io.legere.pdfiumandroid.util.AlreadyClosedBehavior;
-import io.legere.pdfiumandroid.util.Config;
-import io.legere.pdfiumandroid.util.ConfigKt;
-import io.legere.pdfiumandroid.DefaultLogger;
-
-
 import static java.lang.String.format;
 
 import java.io.FileNotFoundException;
@@ -108,12 +107,8 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
 
     public PdfView(Context context, AttributeSet set){
         super(context, set);
-        autoScrollResumeHandler = new Handler(Looper.getMainLooper());
-
-        // Avoid IllegalStateException("Already closed") when the PDF document is recycled
-        // on the main thread while the background RenderingHandler thread is still rendering.
-        // This race condition causes ANRs reported on Google Play Console.
         ConfigKt.setPdfiumConfig(new Config(new DefaultLogger(), AlreadyClosedBehavior.IGNORE));
+        autoScrollResumeHandler = new Handler(Looper.getMainLooper());
     }
 
     @Override

package/index.d.ts

@@ -27,6 +27,17 @@ export type Source = {
     method?: string;
 };
 
+export type TextSelectionChangeEvent = {
+  nativeEvent:
+    | {
+        type: 'selectionCleared';
+      }
+    | {
+        type: 'selectionChanged';
+        text: string;
+      };
+};
+
 export interface PdfProps {
     style?: ReactNative.StyleProp<ReactNative.ViewStyle>,
     progressContainerStyle?: ReactNative.StyleProp<ReactNative.ViewStyle>,
@@ -47,6 +58,10 @@ export interface PdfProps {
     enableRTL?: boolean,
     enableAnnotationRendering?: boolean,
     enableDoubleTapZoom?: boolean;
+    /**
+     * Only works on iOS. Defaults to `true`.
+     */
+    enableTextSelection?: boolean;
     /**
      * Fit policy.  This will adjust the initial zoom of the PDF based on the initial size of the view and the scale factor.
      * 0 = fit width
@@ -64,6 +79,8 @@ export interface PdfProps {
     onScaleChanged?: (scale: number) => void,
     onPressLink?: (url: string) => void,
     onAutoScrollEnd?: () => void,
+    onTextSelectionChange?: (event: TextSelectionChangeEvent) => void,
+    onAutoScrollEnd?: () => void,
 }
 
 export interface PdfRef {

package/index.js

@@ -64,6 +64,8 @@ export default class Pdf extends Component {
         onScaleChanged: PropTypes.func,
         onPressLink: PropTypes.func,
         onAutoScrollEnd: PropTypes.func,
+        enableTextSelection: PropTypes.bool,
+        onTextSelectionChange: PropTypes.func,
 
         // Props that are not available in the earlier react native version, added to prevent crashed on android
         accessibilityLabel: PropTypes.string,
@@ -108,6 +110,9 @@ export default class Pdf extends Component {
         },
         onPressLink: (url) => {
         },
+        enableTextSelection: true,
+        onTextSelectionChange: (event) => {
+        },
         onAutoScrollEnd: () => {
         },
     };
@@ -408,10 +413,29 @@ export default class Pdf extends Component {
     }
 
     _onChange = (event) => {
+        // Handle direct events for text selection/highlight
+        if (event.nativeEvent.type) {
+            this.props.onTextSelectionChange && this.props.onTextSelectionChange(event);
+            return;
+        }
 
         let message = event.nativeEvent.message.split('|');
         //__DEV__ && console.log("onChange: " + message);
         if (message.length > 0) {
+
+            // Handle text selection messages
+            if (message[0] === 'textSelected') {
+                this.props.onTextSelectionChange && this.props.onTextSelectionChange({
+                    nativeEvent: { type: 'selectionChanged', text: message.slice(1).join('|') }
+                });
+                return;
+            } else if (message[0] === 'textSelectionCleared') {
+                this.props.onTextSelectionChange && this.props.onTextSelectionChange({
+                    nativeEvent: { type: 'selectionCleared' }
+                });
+                return;
+            }
+
             if (message.length > 5) {
                 message[4] = message.splice(4).join('|');
             }

package/ios/RNPDFPdf/RNPDFPdfView.h

@@ -21,6 +21,8 @@
 #import <React/RCTViewComponentView.h>
 #endif
 
+#import <PDFKit/PDFKit.h>
+
 @class RCTEventDispatcher;
 
 NS_CLASS_AVAILABLE_IOS(11_0) @interface RNPDFPdfView :
@@ -54,6 +56,11 @@ UIView
 
 @property(nonatomic, copy) RCTBubblingEventBlock onChange;
 
+@property(nonatomic, strong) NSString *selectedText;
+@property(nonatomic) BOOL enableTextSelection;
+@property(nonatomic, strong) PDFSelection *currentPDFSelection;
+
+@property(nonatomic, copy) RCTBubblingEventBlock onTextSelectionChange;
 
 @end
 

package/ios/RNPDFPdf/RNPDFPdfView.mm

@@ -289,6 +289,9 @@ using namespace facebook::react;
     _showsHorizontalScrollIndicator = YES;
     _showsVerticalScrollIndicator = YES;
     _scrollEnabled = YES;
+    _enableTextSelection = YES;
+    _selectedText = nil;
+    _currentPDFSelection = nil;
 
     // init and config PDFView
     _pdfView = [[PDFView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)];
@@ -334,6 +337,12 @@ using namespace facebook::react;
     }
 
     [self bindTap];
+
+    // Register for selection change notifications
+    [[NSNotificationCenter defaultCenter] addObserver:self 
+                                         selector:@selector(handleSelectionChanged:) 
+                                             name:PDFViewSelectionChangedNotification 
+                                           object:_pdfView];
 }
 
 - (void)PDFViewWillClickOnLink:(PDFView *)sender withURL:(NSURL *)url
@@ -345,6 +354,28 @@ using namespace facebook::react;
                        @"linkPressed|%s", _url.UTF8String]]];
 }
 
+- (void)handleSelectionChanged:(NSNotification *)notification
+{
+    if (!_enableTextSelection || notification.object != _pdfView) return;
+    
+    // Store a copy of the selection to avoid it being cleared
+    _currentPDFSelection = [_pdfView.currentSelection copy];
+    
+    if (_currentPDFSelection && _currentPDFSelection.string.length > 0) {
+        _selectedText = _currentPDFSelection.string;
+        
+        // Use the existing onChange callback with a message format
+        [self notifyOnChangeWithMessage:
+         [[NSString alloc] initWithString:
+          [NSString stringWithFormat:@"textSelected|%@", _selectedText]]];
+    } else {
+        _selectedText = nil;
+        
+        // Use the existing onChange callback for clearing
+        [self notifyOnChangeWithMessage:@"textSelectionCleared"];
+    }
+}
+
 - (void)didSetProps:(NSArray<NSString *> *)changedProps
 {
     if (!_initialed) {
@@ -542,13 +573,15 @@ using namespace facebook::react;
 
             PDFPage *pdfPage = [_pdfDocument pageAtIndex:_page-1];
             if (pdfPage && _page == 1) {
-                // goToDestination() would be better. However, there is an
-                // error in the pointLeftTop computation that often results in
-                // scrolling to the middle of the page.
-                // Special case workaround to make starting at the first page
-                // align acceptably.
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    [self->_pdfView goToRect:CGRectMake(0, NSUIntegerMax, 1, 1) onPage:pdfPage];
+                    [self->_pdfView goToFirstPage:nil];
+                    for (UIView *subview in self->_pdfView.subviews) {
+                        if ([subview isKindOfClass:[UIScrollView class]]) {
+                            UIScrollView *scrollView = (UIScrollView *)subview;
+                            [scrollView setContentOffset:CGPointMake(0, 0) animated:NO];
+                            break;
+                        }
+                    }
                 });
             } else if (pdfPage) {
                 CGRect pdfPageRect = [pdfPage boundsForBox:kPDFDisplayBoxCropBox];
@@ -610,7 +643,8 @@ using namespace facebook::react;
     [[NSNotificationCenter defaultCenter] removeObserver:self name:@"PDFViewDocumentChangedNotification" object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:@"PDFViewPageChangedNotification" object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:@"PDFViewScaleChangedNotification" object:nil];
-
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:PDFViewSelectionChangedNotification object:nil];
+    
     _doubleTapRecognizer = nil;
     _singleTapRecognizer = nil;
     _pinchRecognizer = nil;

package/ios/RNPDFPdf/RNPDFPdfViewManager.mm

@@ -51,6 +51,30 @@ 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(enableTextSelection, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(onTextSelectionChange, RCTBubblingEventBlock);
+
+RCT_EXPORT_METHOD(startAutoScroll:(nonnull NSNumber *)reactTag
+                  pixels:(double)pixels
+                  resumeDelay:(double)resumeDelay)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        RNPDFPdfView *view = (RNPDFPdfView *)viewRegistry[reactTag];
+        if ([view isKindOfClass:[RNPDFPdfView class]]) {
+            [view startAutoScroll:(CGFloat)pixels resumeDelay:(NSTimeInterval)(resumeDelay / 1000.0)];
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(stopAutoScroll:(nonnull NSNumber *)reactTag)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        RNPDFPdfView *view = (RNPDFPdfView *)viewRegistry[reactTag];
+        if ([view isKindOfClass:[RNPDFPdfView class]]) {
+            [view stopAutoScroll];
+        }
+    }];
+}
 
 RCT_EXPORT_METHOD(startAutoScroll:(nonnull NSNumber *)reactTag
                   pixels:(double)pixels

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@amafil/react-native-pdf-toolkit",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "summary": "A react native PDF view component",
     "description": "A react native PDF view component, support ios and android platform",
     "main": "index.js",