react-native-pdf 6.7.6 → 7.0.0

package/PdfView.js

@@ -40,6 +40,8 @@ export default class PdfView extends Component {
         singlePage: PropTypes.bool,
         onPageSingleTap: PropTypes.func,
         onScaleChanged: PropTypes.func,
+        showsHorizontalScrollIndicator: PropTypes.bool,
+        showsVerticalScrollIndicator: PropTypes.bool,
     };
 
     static defaultProps = {
@@ -62,6 +64,8 @@ export default class PdfView extends Component {
         },
         onScaleChanged: (scale) => {
         },
+        showsHorizontalScrollIndicator: true,
+        showsVerticalScrollIndicator: true,
     };
 
     constructor(props) {

package/README.md

@@ -168,6 +168,17 @@ react-native run-ios
 ### ChangeLog
 <details>
   <summary>ChangeLog details</summary>
+v7.0.0
+1. Fixed: not rendering on iOS
+2. Added: Android 16 KB Page Size support
+3. Fixed: crash issue in io.legere:pdfiumandroid that occurred due to multithreading
+4. Added: Upgrade Fabric Example to Latest React Native 0.81.0
+5. Added: support RTL android
+
+v6.7.7
+1. Added: add support for customizable scroll indicators in PdfView component (#904)
+2. Fixed: fix field values not being visible on android. issue #864 :bug: (#896)
+
 v6.7.6
 1. Fixed: Add missing 'enableDoubleTapZoom' to fabric codegen source (#832)
 2. Fixed: added missing 'scrollEnabled' prop (#842)
@@ -324,7 +335,7 @@ const styles = StyleSheet.create({
 | style                          |                            object                             | {backgroundColor:"#eee"} | support normal view style, you can use this to set border/spacing color...                                                                                                    | ✔   | ✔       | ✔                           | <3.0 
 | progressContainerStyle         |                            object                             | {backgroundColor:"#eee"} | support normal view style, you can use this to set border/spacing color...                                                                                             | ✔   | ✔       | ✔                           | 6.9.0                     |
 | renderActivityIndicator        |                    (progress) => Component                    |      <ProgressBar/>      | when loading show it as an indicator, you can use your component                                                                                                              | ✔   | ✔       | ✖                           | <3.0                     |
-| enableAntialiasing             |                             bool                              |           true           | improve rendering a little bit on low-res screens, but maybe course some problem on Android 4.4, so add a switch                                                              | ✖   | ✔       | ✖                           | <3.0                     |
+| enableAntialiasing             |                             bool                              |           true           | improve rendering a little bit on low-res screens, but maybe cause some problem on Android 4.4, so add a switch                                                              | ✖   | ✔       | ✖                           | <3.0                     |
 | enablePaging                   |                             bool                              |          false           | only show one page in screen                                                                                                                                                  | ✔   | ✔       | ✔                           | 5.0.1                    |
 | enableRTL                      |                             bool                              |          false           | scroll page as "page3, page2, page1"                                                                                                                                          | ✔   | ✖       | ✔                           | 5.0.1                    |
 | enableAnnotationRendering      |                             bool                              |           true           | enable rendering annotation, notice:iOS only support initial setting,not support realtime changing                                                                            | ✔   | ✔       | ✖                           | 5.0.3                    |
@@ -388,4 +399,3 @@ Example:
 ```
 this.pdf.setPage(42); // Display the answer to the Ultimate Question of Life, the Universe, and Everything
 ```
-

package/android/build.gradle

@@ -126,6 +126,6 @@ dependencies {
     // The repo from zacharee is based on PdfiumAndroidKt, a much newer fork of PdfiumAndroid, with better maintenance and updated native libraries.
     implementation 'com.github.zacharee:AndroidPdfViewer:4.0.1'
     // Depend on PdfiumAndroidKt directly so this can be updated independently of AndroidPdfViewer as updates are provided.
-    implementation 'io.legere:pdfiumandroid:1.0.19'
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'io.legere:pdfiumandroid:1.0.34'
+    implementation 'com.google.code.gson:gson:2.13.2'
 }

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

@@ -99,9 +99,9 @@ public class PdfManager extends SimpleViewManager<PdfView> implements RNPDFPdfVi
         // NOOP on Android
     }
 
-    @Override
-    public void setShowsVerticalScrollIndicator(PdfView view, boolean value) {
-        // NOOP on Android
+    @ReactProp(name = "enableRTL")
+    public void setEnableRTL(PdfView view, boolean enableRTL) {
+        pdfView.setEnableRTL(enableRTL);
     }
 
     @ReactProp(name = "scrollEnabled")

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

@@ -12,6 +12,8 @@ import java.io.File;
 
 import android.content.ContentResolver;
 import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.SizeF;
 import android.view.View;
 import android.view.ViewGroup;
@@ -75,6 +77,7 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
     private FitPolicy fitPolicy = FitPolicy.WIDTH;
     private boolean singlePage = false;
     private boolean scrollEnabled = true;
+    private boolean enableRTL = false;
 
     private float originalWidth = 0;
     private float lastPageWidth = 0;
@@ -84,6 +87,10 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
     private int oldW = 0;
     private int oldH = 0;
 
+    private int totalPages = 0;
+    private int[] pagesArrays;
+    private int bookmarks = 0; 
+
     public PdfView(Context context, AttributeSet set){
         super(context, set);
     }
@@ -105,7 +112,7 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
         TopChangeEvent tce = new TopChangeEvent(surfaceId, getId(), event);
 
         if (dispatcher != null) {
-            dispatcher.dispatchEvent(tce);
+            new Handler(Looper.getMainLooper()).postDelayed(() -> dispatcher.dispatchEvent(tce), 10);
         }
 
 //        ReactContext reactContext = (ReactContext)this.getContext();
@@ -280,7 +287,34 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
 
     public void drawPdf() {
         showLog(format("drawPdf path:%s %s", this.path, this.page));
-
+        File file = new File(this.path);
+
+         if (file.exists()) {
+             try {
+                 ParcelFileDescriptor fileDescriptor = ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
+                 PdfRenderer pdfRenderer = new PdfRenderer(fileDescriptor);
+                 this.totalPages = pdfRenderer.getPageCount();
+                 int[] pagesArrays = new int[this.totalPages];
+                 if (this.enableRTL) {
+                    if(this.page>0){
+                        this.page= this.bookmarks-1;
+                    }else{
+                        this.page=this.totalPages;
+                    }
+                    for (int i = totalPages-1; i>=0; i--) {
+                        pagesArrays[i] =totalPages-1- i;
+                    }
+                    this.pagesArrays = pagesArrays;
+                    
+                }else{
+                    this.pagesArrays = null;
+                    this.page=this.bookmarks-1;
+                }
+             } catch (IOException e) {
+                 Log.e("error", "error read PDF", e);
+             }
+         }
+        
         if (this.path != null){
 
             // set scale
@@ -306,7 +340,9 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                 configurator = this.fromUri(getURI(this.path));
             }
 
-            configurator.defaultPage(this.page-1)
+            configurator
+                .pages(this.pagesArrays)
+                .defaultPage(this.page)
                 .swipeHorizontal(this.horizontal)
                 .onPageChange(this)
                 .onLoad(this)
@@ -346,9 +382,15 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
 
     // page start from 1
     public void setPage(int page) {
-        this.page = page>1?page:1;
+        this.page = page;
+        this.bookmarks = page;
     }
 
+    public void setEnableRTL(boolean enableRTL){
+        this.enableRTL= enableRTL;
+        
+     }
+
     public void setScale(float scale) {
         this.scale = scale;
     }
@@ -502,4 +544,4 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
             }
         }
     }
-}
+}

package/android/src/paper/java/com/facebook/react/viewmanagers/RNPDFPdfViewManagerDelegate.java

@@ -13,9 +13,10 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.BaseViewManager;
+import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class RNPDFPdfViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNPDFPdfViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class RNPDFPdfViewManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNPDFPdfViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public RNPDFPdfViewManagerDelegate(U viewManager) {
     super(viewManager);
   }

package/index.d.ts

@@ -65,8 +65,6 @@ export interface PdfProps {
     onPressLink?: (url: string) => void,
 }
 
-declare class Pdf extends React.Component<PdfProps, any> {
-    setPage: (pageNumber: number) => void;
-}
+declare const Pdf: React.ComponentType<PdfProps> & { setPage(pageNumber: number): void };
 
 export default Pdf;

package/ios/RNPDFPdf/RNPDFPdfView.mm

@@ -292,7 +292,10 @@ using namespace facebook::react;
     // Disable built-in double tap, so as not to conflict with custom recognizers.
     for (UIGestureRecognizer *recognizer in _pdfView.gestureRecognizers) {
         if ([recognizer isKindOfClass:[UITapGestureRecognizer class]]) {
-            recognizer.enabled = NO;
+            UITapGestureRecognizer *tap = (UITapGestureRecognizer *)recognizer;
+            if (tap.numberOfTapsRequired == 2) {
+                recognizer.enabled = NO;
+            }
         }
     }
 
@@ -479,40 +482,8 @@ using namespace facebook::react;
             }
         }
 
-        if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"showsHorizontalScrollIndicator"])) {
-            if (_showsHorizontalScrollIndicator) {
-                for (UIView *subview in _pdfView.subviews) {
-                    if ([subview isKindOfClass:[UIScrollView class]]) {
-                        UIScrollView *scrollView = (UIScrollView *)subview;
-                        scrollView.showsHorizontalScrollIndicator = YES;
-                    }
-                }
-            } else {
-                for (UIView *subview in _pdfView.subviews) {
-                    if ([subview isKindOfClass:[UIScrollView class]]) {
-                        UIScrollView *scrollView = (UIScrollView *)subview;
-                        scrollView.showsHorizontalScrollIndicator = NO;
-                    }
-                }
-            }
-        }
-
-        if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"showsVerticalScrollIndicator"])) {
-            if (_showsVerticalScrollIndicator) {
-                for (UIView *subview in _pdfView.subviews) {
-                    if ([subview isKindOfClass:[UIScrollView class]]) {
-                        UIScrollView *scrollView = (UIScrollView *)subview;
-                        scrollView.showsVerticalScrollIndicator = YES;
-                    }
-                }
-            } else {
-                for (UIView *subview in _pdfView.subviews) {
-                    if ([subview isKindOfClass:[UIScrollView class]]) {
-                        UIScrollView *scrollView = (UIScrollView *)subview;
-                        scrollView.showsVerticalScrollIndicator = NO;
-                    }
-                }
-            }
+        if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"showsHorizontalScrollIndicator"] || [changedProps containsObject:@"showsVerticalScrollIndicator"])) {
+            [self setScrollIndicators:self horizontal:_showsHorizontalScrollIndicator vertical:_showsVerticalScrollIndicator depth:0];
         }
 
         if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"scrollEnabled"])) {
@@ -928,6 +899,23 @@ using namespace facebook::react;
     return !_singlePage;
 }
 
+- (void)setScrollIndicators:(UIView *)view horizontal:(BOOL)horizontal vertical:(BOOL)vertical depth:(int)depth {
+    // max depth, prevent infinite loop
+    if (depth > 10) {
+        return;
+    }
+    
+    if ([view isKindOfClass:[UIScrollView class]]) {
+        UIScrollView *scrollView = (UIScrollView *)view;
+        scrollView.showsHorizontalScrollIndicator = horizontal;
+        scrollView.showsVerticalScrollIndicator = vertical;
+    }
+    
+    for (UIView *subview in view.subviews) {
+        [self setScrollIndicators:subview horizontal:horizontal vertical:vertical depth:depth + 1];
+    }
+}
+
 @end
 
 #ifdef RCT_NEW_ARCH_ENABLED

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-pdf",
-    "version": "6.7.6",
+    "version": "7.0.0",
     "summary": "A react native PDF view component",
     "description": "A react native PDF view component, support ios and android platform",
     "main": "index.js",
@@ -62,7 +62,12 @@
         "type": "components",
         "jsSrcsDir": "./fabric",
         "android": {
-          "javaPackageName": "org.wonday.pdf"
+            "javaPackageName": "org.wonday.pdf"
+        },
+        "ios": {
+            "componentProvider": {
+                "RNPDFPdfView": "RNPDFPdfView"
+            }
         }
-      }
+    }
 }