react-native-pdf 6.6.2 → 6.7.1

package/index.js

@@ -10,14 +10,15 @@
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
 import {
-    requireNativeComponent,
     View,
     Platform,
     StyleSheet,
     Image,
     Text
 } from 'react-native';
-
+import PdfViewNativeComponent, {
+    Commands as PdfViewCommands,
+  } from './fabric/RNPDFPdfNativeComponent';
 import ReactNativeBlobUtil from 'react-native-blob-util'
 import {ViewPropTypes} from 'deprecated-react-native-prop-types';
 const SHA1 = require('crypto-js/sha1');
@@ -47,6 +48,8 @@ export default class Pdf extends Component {
         renderActivityIndicator: PropTypes.func,
         enableAntialiasing: PropTypes.bool,
         enableAnnotationRendering: PropTypes.bool,
+        showsHorizontalScrollIndicator: PropTypes.bool,
+        showsVerticalScrollIndicator: PropTypes.bool,
         enablePaging: PropTypes.bool,
         enableRTL: PropTypes.bool,
         fitPolicy: PropTypes.number,
@@ -80,6 +83,8 @@ export default class Pdf extends Component {
         page: 1,
         enableAntialiasing: true,
         enableAnnotationRendering: true,
+        showsHorizontalScrollIndicator: true,
+        showsVerticalScrollIndicator: true,
         enablePaging: false,
         enableRTL: false,
         trustAllCerts: true,
@@ -108,7 +113,6 @@ export default class Pdf extends Component {
             path: '',
             isDownloaded: false,
             progress: 0,
-            isSupportPDFKit: -1
         };
 
         this.lastRNBFTask = null;
@@ -135,14 +139,6 @@ export default class Pdf extends Component {
 
     componentDidMount() {
         this._mounted = true;
-        if (Platform.OS === "ios") {
-            const PdfViewManagerNative = require('react-native').NativeModules.PdfViewManager;
-            PdfViewManagerNative.supportPDFKit((isSupportPDFKit) => {
-                if (this._mounted) {
-                    this.setState({isSupportPDFKit: isSupportPDFKit ? 1 : 0});
-                }
-            });
-        }
         this._loadFromSource(this.props.source);
     }
 
@@ -236,7 +232,7 @@ export default class Pdf extends Component {
                 } else {
                     if (this._mounted) {
                        this.setState({
-                            path: uri.replace(/file:\/\//i, ''),
+                            path: unescape(uri.replace(/file:\/\//i, '')),
                             isDownloaded: true,
                         });
                     }
@@ -346,9 +342,19 @@ export default class Pdf extends Component {
         if ( (pageNumber === null) || (isNaN(pageNumber)) ) {
             throw new Error('Specified pageNumber is not a number');
         }
-        this.setNativeProps({
-            page: pageNumber
-        });
+        if (!!global?.nativeFabricUIManager ) {
+            if (this._root) {
+                PdfViewCommands.setNativePage(
+                    this._root,
+                    pageNumber,
+                );
+            }
+          } else {
+            this.setNativeProps({
+                page: pageNumber
+            });
+          }
+        
     }
 
     _onChange = (event) => {
@@ -407,7 +413,7 @@ export default class Pdf extends Component {
                                             onChange={this._onChange}
                                         />
                                     ):(
-                                        this.props.usePDFKit && this.state.isSupportPDFKit === 1?(
+                                        this.props.usePDFKit ?(
                                                 <PdfCustom
                                                     ref={component => (this._root = component)}
                                                     {...this.props}
@@ -437,22 +443,14 @@ export default class Pdf extends Component {
     }
 }
 
-
-if (Platform.OS === "android") {
-    var PdfCustom = requireNativeComponent('RCTPdf', Pdf, {
-        nativeOnly: {path: true, onChange: true},
-    })
-} else if (Platform.OS === "ios") {
-    var PdfCustom = requireNativeComponent('RCTPdfView', Pdf, {
-        nativeOnly: {path: true, onChange: true},
-    })
-} else if (Platform.OS === "windows") {
+if (Platform.OS === "android" || Platform.OS === "ios") {
+    var PdfCustom = PdfViewNativeComponent;
+}  else if (Platform.OS === "windows") {
     var PdfCustom = requireNativeComponent('RCTPdf', Pdf, {
         nativeOnly: {path: true, onChange: true},
     })
 }
 
-
 const styles = StyleSheet.create({
     progressContainer: {
         flex: 1,

package/index.js.flow

@@ -39,6 +39,8 @@ export type Props = {
   enableRTL?: boolean,
   fitPolicy?: FitWidth | FitHeight | FitBoth,
   horizontal?: boolean,
+  showsHorizontalScrollIndicator?: boolean,
+  showsVerticalScrollIndicator?: boolean,
   maxScale?: number,
   minScale?: number,
   singlePage?: boolean,

package/ios/{RCTPdf/PdfManager.m → RNPDFPdf/PdfManager.mm}

@@ -136,7 +136,7 @@ RCT_EXPORT_METHOD(loadFile:(NSString *)path
 {
     // release pdf docs
     for(NSValue *item in pdfDocRefs) {
-        CGPDFDocumentRef pdfItem = [item pointerValue];
+        CGPDFDocumentRef pdfItem = (CGPDFDocumentRef)[item pointerValue];
         if (pdfItem != NULL) {
 
             CGPDFDocumentRelease(pdfItem);

package/ios/{RCTPdf/RCTPdfPageView.h → RNPDFPdf/RNPDFPdfPageView.h}

@@ -13,7 +13,7 @@
 #endif
 
 
-@interface RCTPdfPageView : UIView
+@interface RNPDFPdfPageView : UIView
 
 @property(nonatomic) int fileNo;
 @property(nonatomic) int page;

package/ios/{RCTPdf/RCTPdfPageView.m → RNPDFPdf/RNPDFPdfPageView.mm}

@@ -7,7 +7,7 @@
  */
 
 #import "PdfManager.h"
-#import "RCTPdfPageView.h"
+#import "RNPDFPdfPageView.h"
 
 
 
@@ -37,15 +37,15 @@
 #define RLog( s, ... ) NSLog( @"<%p %@:(%d)> %@", self, [[NSString stringWithUTF8String:__FILE__] lastPathComponent], __LINE__, [NSString stringWithFormat:(s), ##__VA_ARGS__] )
 
 @interface CAPdfLayer : CALayer
--(void) setParentView:(RCTPdfPageView *)parentView;
+-(void) setParentView:(RNPDFPdfPageView *)parentView;
 @end
 
 @implementation CAPdfLayer
 {
-    RCTPdfPageView *_parentView;
+    RNPDFPdfPageView *_parentView;
 }
 
--(void) setParentView:(RCTPdfPageView *)parentView
+-(void) setParentView:(RNPDFPdfPageView *)parentView
 {
     _parentView = parentView;
 }
@@ -134,7 +134,7 @@
 }
 @end
 
-@implementation RCTPdfPageView {
+@implementation RNPDFPdfPageView {
     
     CAPdfLayer         *_layer;
 }

package/ios/{RCTPdf/RCTPdfPageViewManager.h → RNPDFPdf/RNPDFPdfPageViewManager.h}

@@ -13,6 +13,6 @@
 #endif
 
 
-@interface RCTPdfPageViewManager : RCTViewManager
+@interface RNPDFPdfPageViewManager : RCTViewManager
 
 @end

package/ios/{RCTPdf/RCTPdfPageViewManager.m → RNPDFPdf/RNPDFPdfPageViewManager.mm}

@@ -8,17 +8,17 @@
 
 #import <Foundation/Foundation.h>
 
-#import "RCTPdfPageViewManager.h"
-#import "RCTPdfPageView.h"
+#import "RNPDFPdfPageViewManager.h"
+#import "RNPDFPdfPageView.h"
 
 
-@implementation RCTPdfPageViewManager
+@implementation RNPDFPdfPageViewManager
 
 RCT_EXPORT_MODULE()
 
 - (UIView *)view
 {
-  return [[RCTPdfPageView alloc] init];
+  return [[RNPDFPdfPageView alloc] init];
 }
 
 RCT_EXPORT_VIEW_PROPERTY(fileNo, int);

package/ios/{RCTPdf/RCTPdfView.h → RNPDFPdf/RNPDFPdfView.h}

@@ -6,8 +6,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#ifndef RCTPdfView_h
-#define RCTPdfView_h
+#ifndef RNPDFPdfView_h
+#define RNPDFPdfView_h
 
 #if __has_include(<React/RCTAssert.h>)
 #import <React/RCTEventDispatcher.h>
@@ -17,11 +17,19 @@
 #import "UIView+React.h"
 #endif
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTViewComponentView.h>
+#endif
 
 @class RCTEventDispatcher;
 
-NS_CLASS_AVAILABLE_IOS(11_0) @interface RCTPdfView : UIView <UIGestureRecognizerDelegate>
-
+NS_CLASS_AVAILABLE_IOS(11_0) @interface RNPDFPdfView :
+#ifdef RCT_NEW_ARCH_ENABLED
+RCTViewComponentView
+#else
+UIView
+#endif
+<UIGestureRecognizerDelegate>
 - (instancetype)initWithBridge:(RCTBridge *)bridge;
 
 @property(nonatomic, strong) NSString *path;
@@ -30,6 +38,8 @@ NS_CLASS_AVAILABLE_IOS(11_0) @interface RCTPdfView : UIView <UIGestureRecognizer
 @property(nonatomic) float minScale;
 @property(nonatomic) float maxScale;
 @property(nonatomic) BOOL horizontal;
+@property(nonatomic) BOOL showsVerticalScrollIndicator;
+@property(nonatomic) BOOL showsHorizontalScrollIndicator;
 @property(nonatomic) BOOL enablePaging;
 @property(nonatomic) BOOL enableRTL;
 @property(nonatomic) BOOL enableAnnotationRendering;
@@ -43,4 +53,4 @@ NS_CLASS_AVAILABLE_IOS(11_0) @interface RCTPdfView : UIView <UIGestureRecognizer
 
 @end
 
-#endif /* RCTPdfView_h */
+#endif /* RNPDFPdfView_h */