react-native-pdf 6.2.0 → 6.4.0

package/index.d.ts

@@ -9,6 +9,13 @@
 import * as React from 'react';
 import * as ReactNative from 'react-native';
 
+export type TableContent = {
+    children: TableContent[],
+    mNativePtr: number,
+    pageIdx: number,
+    title: string,
+};
+
 interface Props {
     style?: ReactNative.StyleProp<ReactNative.ViewStyle>,
     source: object,
@@ -19,16 +26,16 @@ interface Props {
     horizontal?: boolean,
     spacing?: number,
     password?: string,
-    activityIndicator?: any,
-    activityIndicatorProps?: object,
+    renderActivityIndicator?: (progress: number) => React.ReactElement,
     enableAntialiasing?: boolean,
     enablePaging?: boolean,
     enableRTL?: boolean,
     enableAnnotationRendering?: boolean,
     fitPolicy?: number,
     trustAllCerts?: boolean,
+    singlePage?: boolean,
     onLoadProgress?: (percent: number,) => void,
-    onLoadComplete?: (numberOfPages: number, path: string) => void,
+    onLoadComplete?: (numberOfPages: number, path: string, size: {height: number, width: number}, tableContents?: TableContent[]) => void,
     onPageChanged?: (page: number, numberOfPages: number) => void,
     onError?: (error: object) => void,
     onPageSingleTap?: (page: number, x: number, y: number) => void,
@@ -37,6 +44,7 @@ interface Props {
 }
 
 declare class Pdf extends React.Component<Props, any> {
+    setPage: (pageNumber: number) => void;
 }
 
 export default Pdf;

package/index.js

@@ -15,13 +15,11 @@ import {
     Platform,
     ViewPropTypes,
     StyleSheet,
-    Image
+    Image,
+    Text
 } from 'react-native';
 
-import { ProgressBar } from '@react-native-community/progress-bar-android'
-import { ProgressView } from '@react-native-community/progress-view'
-
-import RNFetchBlob from 'rn-fetch-blob';
+import ReactNativeBlobUtil from 'react-native-blob-util'
 
 const SHA1 = require('crypto-js/sha1');
 import PdfView from './PdfView';
@@ -34,6 +32,7 @@ export default class Pdf extends Component {
             PropTypes.shape({
                 uri: PropTypes.string,
                 cache: PropTypes.bool,
+                cacheFileName: PropTypes.string,
                 expiration: PropTypes.number,
             }),
             // Opaque type returned by require('./test.pdf')
@@ -46,15 +45,14 @@ export default class Pdf extends Component {
         horizontal: PropTypes.bool,
         spacing: PropTypes.number,
         password: PropTypes.string,
-        progressBarColor: PropTypes.string,
-        activityIndicator: PropTypes.any,
-        activityIndicatorProps: PropTypes.any,
+        renderActivityIndicator: PropTypes.func,
         enableAntialiasing: PropTypes.bool,
         enableAnnotationRendering: PropTypes.bool,
         enablePaging: PropTypes.bool,
         enableRTL: PropTypes.bool,
         fitPolicy: PropTypes.number,
         trustAllCerts: PropTypes.bool,
+        singlePage: PropTypes.bool,
         onLoadComplete: PropTypes.func,
         onPageChanged: PropTypes.func,
         onError: PropTypes.func,
@@ -85,9 +83,9 @@ export default class Pdf extends Component {
         enableAnnotationRendering: true,
         enablePaging: false,
         enableRTL: false,
-        activityIndicatorProps: {color: '#009900', progressTintColor: '#009900'},
         trustAllCerts: true,
         usePDFKit: true,
+        singlePage: false,
         onLoadProgress: (percent) => {
         },
         onLoadComplete: (numberOfPages, path) => {
@@ -164,16 +162,15 @@ export default class Pdf extends Component {
         const source = Image.resolveAssetSource(newSource) || {};
 
         let uri = source.uri || '';
-
         // first set to initial state
         if (this._mounted) {
             this.setState({isDownloaded: false, path: '', progress: 0});
         }
-
-        const cacheFile = RNFetchBlob.fs.dirs.CacheDir + '/' + SHA1(uri) + '.pdf';
+        const filename = source.cacheFileName || SHA1(uri) + '.pdf';
+        const cacheFile = ReactNativeBlobUtil.fs.dirs.CacheDir + '/' + filename;
 
         if (source.cache) {
-            RNFetchBlob.fs
+            ReactNativeBlobUtil.fs
                 .stat(cacheFile)
                 .then(stats => {
                     if (!Boolean(source.expiration) || (source.expiration * 1000 + stats.lastModified) > (new Date().getTime())) {
@@ -204,7 +201,8 @@ export default class Pdf extends Component {
                 const isAsset = !!(uri && uri.match(/^bundle-assets:\/\//));
                 const isBase64 = !!(uri && uri.match(/^data:application\/pdf;base64/));
 
-                const cacheFile = RNFetchBlob.fs.dirs.CacheDir + '/' + SHA1(uri) + '.pdf';
+                const filename = source.cacheFileName || SHA1(uri) + '.pdf';
+                const cacheFile = ReactNativeBlobUtil.fs.dirs.CacheDir + '/' + filename;
 
                 // delete old cache file
                 this._unlinkFile(cacheFile);
@@ -212,7 +210,7 @@ export default class Pdf extends Component {
                 if (isNetwork) {
                     this._downloadFile(source, cacheFile);
                 } else if (isAsset) {
-                    RNFetchBlob.fs
+                    ReactNativeBlobUtil.fs
                         .cp(uri, cacheFile)
                         .then(() => {
                             if (this._mounted) {
@@ -225,7 +223,7 @@ export default class Pdf extends Component {
                         })
                 } else if (isBase64) {
                     let data = uri.replace(/data:application\/pdf;base64,/i, '');
-                    RNFetchBlob.fs
+                    ReactNativeBlobUtil.fs
                         .writeFile(cacheFile, data, 'base64')
                         .then(() => {
                             if (this._mounted) {
@@ -265,7 +263,7 @@ export default class Pdf extends Component {
         const tempCacheFile = cacheFile + '.tmp';
         this._unlinkFile(tempCacheFile);
 
-        this.lastRNBFTask = RNFetchBlob.config({
+        this.lastRNBFTask = ReactNativeBlobUtil.config({
             // response data will be saved to this path if it has access right.
             path: tempCacheFile,
             trusty: this.props.trustAllCerts,
@@ -280,7 +278,7 @@ export default class Pdf extends Component {
             .progress((received, total) => {
                 this.props.onLoadProgress && this.props.onLoadProgress(received / total);
                 if (this._mounted) {
-                    this.setState({progress: received / total});
+                    this.setState({progress: Math.floor(received / total)});
                 }
             });
 
@@ -294,7 +292,7 @@ export default class Pdf extends Component {
                     let actualContentLength;
 
                     try {
-                        const fileStats = await RNFetchBlob.fs.stat(res.path());
+                        const fileStats = await ReactNativeBlobUtil.fs.stat(res.path());
 
                         if (!fileStats || !fileStats.size) {
                             throw new Error("FileNotFound:" + source.uri);
@@ -311,7 +309,7 @@ export default class Pdf extends Component {
                 }
 
                 this._unlinkFile(cacheFile);
-                RNFetchBlob.fs
+                ReactNativeBlobUtil.fs
                     .cp(tempCacheFile, cacheFile)
                     .then(() => {
                         if (this._mounted) {
@@ -333,7 +331,7 @@ export default class Pdf extends Component {
 
     _unlinkFile = async (file) => {
         try {
-            await RNFetchBlob.fs.unlink(file);
+            await ReactNativeBlobUtil.fs.unlink(file);
         } catch (e) {
 
         }
@@ -373,9 +371,9 @@ export default class Pdf extends Component {
             } else if (message[0] === 'error') {
                 this._onError(new Error(message[1]));
             } else if (message[0] === 'pageSingleTap') {
-                this.props.onPageSingleTap && this.props.onPageSingleTap(message[1], message[2], message[3]);
+                this.props.onPageSingleTap && this.props.onPageSingleTap(Number(message[1]), Number(message[2]), Number(message[3]));
             } else if (message[0] === 'scaleChanged') {
-                this.props.onScaleChanged && this.props.onScaleChanged(message[1]);
+                this.props.onScaleChanged && this.props.onScaleChanged(Number(message[1]));
             } else if (message[0] === 'linkPressed') {
                 this.props.onPressLink && this.props.onPressLink(message[1]);
             }
@@ -390,30 +388,18 @@ export default class Pdf extends Component {
     };
 
     render() {
-        if (Platform.OS === "android" || Platform.OS === "ios") {
+        if (Platform.OS === "android" || Platform.OS === "ios" || Platform.OS === "windows") {
                 return (
                     <View style={[this.props.style,{overflow: 'hidden'}]}>
                         {!this.state.isDownloaded?
                             (<View
                                 style={styles.progressContainer}
                             >
-                                {this.props.activityIndicator
-                                    ? this.props.activityIndicator
-                                    : Platform.OS === 'android'
-                                        ? <ProgressBar
-                                            progress={this.state.progress}
-                                            indeterminate={false}
-                                            styleAttr="Horizontal"
-                                            style={styles.progressBar}
-                                            {...this.props.activityIndicatorProps}
-                                        />
-                                        : <ProgressView
-                                            progress={this.state.progress}
-                                            style={styles.progressBar}
-                                            {...this.props.activityIndicatorProps}
-                                        />}
+                                {this.props.renderActivityIndicator
+                                    ? this.props.renderActivityIndicator(this.state.progress)
+                                    : <Text>{`${this.state.progress}%`}</Text>}
                             </View>):(
-                                Platform.OS === "android"?(
+                                Platform.OS === "android" || Platform.OS === "windows"?(
                                         <PdfCustom
                                             ref={component => (this._root = component)}
                                             {...this.props}
@@ -461,6 +447,10 @@ if (Platform.OS === "android") {
     var PdfCustom = requireNativeComponent('RCTPdfView', Pdf, {
         nativeOnly: {path: true, onChange: true},
     })
+} else if (Platform.OS === "windows") {
+    var PdfCustom = requireNativeComponent('RCTPdf', Pdf, {
+        nativeOnly: {path: true, onChange: true},
+    })
 }
 
 

package/index.js.flow

@@ -17,6 +17,7 @@ export type FitBoth = 2;
 export type Source = {
   body?: string | FormField[],
   cache?: boolean,
+  cacheFileName?: string,
   expiration?: number,
   headers?: { [key: string]: string },
   method?: Methods,
@@ -31,8 +32,7 @@ export type TableContent = {
 };
 
 export type Props = {
-  activityIndicator?: Node,
-  activityIndicatorProps?: { [prop: string]: mixed },
+  renderActivityIndicator?: (progress: number) => Node,
   enableAnnotationRendering?: boolean,
   enableAntialiasing?: boolean,
   enablePaging?: boolean,
@@ -41,6 +41,7 @@ export type Props = {
   horizontal?: boolean,
   maxScale?: number,
   minScale?: number,
+  singlePage?: boolean,
   onError?: (error: Error) => void,
   onLoadComplete?: (numberOfPages: number, path: string, size: { height: number, width: number }, tableContents: ?TableContent[]) => void,
   onLoadProgress?: (percent: number) => void,
@@ -57,4 +58,6 @@ export type Props = {
   testID?: string
 };
 
-declare export default class Pdf extends Component<Props> {}
+declare export default class Pdf extends Component<Props> {
+  setPage: (pageNumber: number) => void;
+}

package/ios/RCTPdf/RCTPdfView.h

@@ -22,6 +22,8 @@
 
 NS_CLASS_AVAILABLE_IOS(11_0) @interface RCTPdfView : UIView <UIGestureRecognizerDelegate>
 
+- (instancetype)initWithBridge:(RCTBridge *)bridge;
+
 @property(nonatomic, strong) NSString *path;
 @property(nonatomic) int page;
 @property(nonatomic) float scale;
@@ -34,7 +36,7 @@ NS_CLASS_AVAILABLE_IOS(11_0) @interface RCTPdfView : UIView <UIGestureRecognizer
 @property(nonatomic) int fitPolicy;
 @property(nonatomic) int spacing;
 @property(nonatomic, strong) NSString *password;
-
+@property(nonatomic) BOOL singlePage;
 
 @property(nonatomic, copy) RCTBubblingEventBlock onChange;