react-native-pdf 6.4.0 → 6.6.1

package/README.md

@@ -23,14 +23,17 @@ So you should install react-native-pdf and react-native-blob-util
 | react-native-pdf          | 4.x.x - 5.0.x   | 5.0.9+  | 6.0.0+   | 6.2.0+   | 6.4.0+   |
 | react-native-blob-util    |                 |         |          |          | 0.13.7+  |
 
+
+> 🚨 Expo: This package is not available in the [Expo Go](https://expo.dev/client) app. Learn how you can use this package in [Custom Dev Clients](https://docs.expo.dev/development/getting-started/) via the out-of-tree [Expo Config Plugin](https://github.com/expo/config-plugins/tree/master/packages/react-native-pdf). Example: [`with-pdf`](https://github.com/expo/examples/tree/master/with-pdf).
+
 ### Installation
 
 ```bash
 # Using npm
-npm install react-native-pdf react-native-blob-util fbjs --save
+npm install react-native-pdf react-native-blob-util --save
 
 # or using yarn:
-yarn add react-native-pdf react-native-blob-util fbjs
+yarn add react-native-pdf react-native-blob-util
 ```
 
 Then follow the instructions for your platform to link react-native-pdf into your project:
@@ -166,6 +169,19 @@ react-native run-ios
 <details>
   <summary>ChangeLog details</summary>
 
+v6.6.0
+1. Fixed: Migrate to ViewPropTypes exported from 'deprecated-react-native-prop-types'
+2. Added: Decode File Path for iOS
+3. Improved: prefer current page for calculating scale factor on fit
+4. Improved: Typescript version source
+
+v6.5.0
+1. Fixed: replace mavenCentral with maven
+2. Breaking Change(Android): replace deprecated repository: jcenter()
+3. Fixed: loading progress
+4. Added: Typed "source" prop
+5. Removed: dependency to fbjs
+
 v6.4.0
 1. Remove sample for reducing NPM package size
 2. Add support for setting a filename for the cached pdf file

package/android/build.gradle

@@ -2,7 +2,7 @@ description = 'react-native-pdf'
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
 
@@ -12,11 +12,11 @@ buildscript {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
     maven {
         url 'https://jitpack.io'
         content {
-            // Use Jitpack only for AndroidPdfViewer; the rest is hosted at jcenter.
+            // Use Jitpack only for AndroidPdfViewer; the rest is hosted at mavenCentral.
             includeGroup "com.github.TalbotGooday"
         }
     }

package/index.d.ts

@@ -16,9 +16,20 @@ export type TableContent = {
     title: string,
 };
 
-interface Props {
-    style?: ReactNative.StyleProp<ReactNative.ViewStyle>,
-    source: object,
+export type Source = {
+    uri?: string;
+    headers?: {
+        [key: string]: string;
+    };
+    cache?: boolean;
+    cacheFileName?: string;
+    expiration?: number;
+    method?: string;
+    body?: any
+};
+
+export interface PdfProps extends ReactNative.ViewProps {
+    source: Source | number,
     page?: number,
     scale?: number,
     minScale?: number,
@@ -26,25 +37,83 @@ interface Props {
     horizontal?: boolean,
     spacing?: number,
     password?: string,
-    renderActivityIndicator?: (progress: number) => React.ReactElement,
+    renderActivityIndicator: (progress: number) => React.ReactElement,
     enableAntialiasing?: boolean,
+    enableAnnotationRendering?: boolean,
     enablePaging?: boolean,
     enableRTL?: boolean,
-    enableAnnotationRendering?: boolean,
     fitPolicy?: number,
     trustAllCerts?: boolean,
     singlePage?: boolean,
-    onLoadProgress?: (percent: number,) => void,
+    onLoadProgress?: (percent: number) => void,
     onLoadComplete?: (numberOfPages: number, path: string, size: {height: number, width: number}, tableContents?: TableContent[]) => void,
     onPageChanged?: (page: number, numberOfPages: number) => void,
-    onError?: (error: object) => void,
+    onError?: (error: any) => void,
     onPageSingleTap?: (page: number, x: number, y: number) => void,
     onScaleChanged?: (scale: number) => void,
     onPressLink?: (url: string) => void,
+    setPage: (pageNumber: number) => void;
+
+    usePDFKit?: boolean
 }
 
-declare class Pdf extends React.Component<Props, any> {
-    setPage: (pageNumber: number) => void;
+export type PdfState = {
+    path: string
+    isDownloaded: boolean
+    progress: number
+    isSupportPDFKit: number
+}
+
+export interface PdfViewProps extends ReactNative.ViewProps {
+    path: string
+    password?: string
+    scale: number
+    minScale: number
+    maxScale: number
+    spacing: number
+    fitPolicy?: number
+    horizontal?: boolean
+    page: number
+    currentPage: number
+    singlePage: boolean
+    enablePaging: boolean
+    onPageSingleTap: PdfProps['onPageSingleTap']
+    onScaleChanged: PdfProps['onScaleChanged']
+    onLoadComplete: PdfProps['onLoadComplete']
+    onError: PdfProps['onError']
+    onPageChanged: PdfProps['onPageChanged']
+}
+
+export type PdfViewState = {
+    pdfLoaded: boolean
+    fileNo: number
+    numberOfPages:number
+    page: number
+    currentPage: number
+    pageAspectRate: number
+    pdfPageSize: {width: number, height: number}
+    contentContainerSize: {width: number, height: number}
+    scale: number
+    contentOffset: {x: number, y: number}
+    newContentOffset: {x: number, y: number}
+    centerContent: boolean
+}
+
+export interface PdfPageViewProps extends ReactNative.ViewProps {
+    fileNo: number
+    page: number
+    width: number
+    height: number
+}
+
+export interface PinchZoomViewProps extends ReactNative.ViewProps {
+    scalable: boolean
+    onScaleChanged: (scaled: {pageX: number; pageY: number; scale: number}) => void
 }
 
-export default Pdf;
+export interface DoubleTapViewProps extends ReactNative.ViewProps {
+    delay: number
+    radius: number
+    onSingleTap: PropTypes.func,
+    onDoubleTap: PropTypes.func,
+}

package/ios/RCTPdf/PdfManager.m

@@ -50,7 +50,17 @@ RCT_EXPORT_METHOD(loadFile:(NSString *)path
 
     if (path != nil && path.length != 0) {
 
-        NSURL *pdfURL = [NSURL fileURLWithPath:path];
+        NSString *decodedPath = (__bridge_transfer NSString *)CFURLCreateStringByReplacingPercentEscapes(NULL, (CFStringRef)path, CFSTR(""));
+        
+        NSString *finalPath = NULL;
+        if (decodedPath == NULL) {
+            // use orignal provided path
+            finalPath = path;
+        } else {
+            finalPath = decodedPath;
+        }
+        
+        NSURL *pdfURL = [NSURL fileURLWithPath:finalPath];
         CGPDFDocumentRef pdfRef = CGPDFDocumentCreateWithURL((__bridge CFURLRef) pdfURL);
 
         if (pdfRef == NULL) {

package/ios/RCTPdf/RCTPdfView.m

@@ -132,6 +132,9 @@ const float MIN_SCALE = 1.0f;
                     _pdfDocument = [[PDFDocument alloc] initWithData:blobData];
                 }
             } else {
+            
+                // decode file path
+                _path = (__bridge_transfer NSString *)CFURLCreateStringByReplacingPercentEscapes(NULL, (CFStringRef)_path, CFSTR(""));
                 NSURL *fileURL = [NSURL fileURLWithPath:_path];
                 _pdfDocument = [[PDFDocument alloc] initWithURL:fileURL];
             }
@@ -200,7 +203,7 @@ const float MIN_SCALE = 1.0f;
 
         if (_pdfDocument && ([changedProps containsObject:@"path"] || [changedProps containsObject:@"fitPolicy"] || [changedProps containsObject:@"minScale"] || [changedProps containsObject:@"maxScale"])) {
 
-            PDFPage *pdfPage = [_pdfDocument pageAtIndex:_pdfDocument.pageCount-1];
+            PDFPage *pdfPage = _pdfView.currentPage ? _pdfView.currentPage : [_pdfDocument pageAtIndex:_pdfDocument.pageCount-1];
             CGRect pdfPageRect = [pdfPage boundsForBox:kPDFDisplayBoxCropBox];
 
             // some pdf with rotation, then adjust it

package/package.json

@@ -1,10 +1,9 @@
 {
     "name": "react-native-pdf",
-    "version": "6.4.0",
+    "version": "6.6.1",
     "summary": "A react native PDF view component",
     "description": "A react native PDF view component, support ios and android platform",
     "main": "index.js",
-    "typings": "./index.d.ts",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/wonday/react-native-pdf.git"
@@ -28,15 +27,20 @@
         "url": "https://github.com/wonday/react-native-pdf/issues"
     },
     "dependencies": {
-        "crypto-js": "^3.2.0"
+        "crypto-js": "^3.2.0",
+        "deprecated-react-native-prop-types": "^2.3.0"
     },
     "devDependencies": {
-        "prop-types": "^15.7.2"
+        "@types/react-native": "^0.68.0",
+        "react-native": "^0.68.0",
+        "typescript": "^4.7.4"
     },
     "files": [
         "android/",
         "ios/",
         "windows/",
+        "dist/",
+        "react-native-pdf.podspec",
         "DoubleTapView.js",
         "index.d.ts",
         "index.js",
@@ -45,7 +49,9 @@
         "PdfPageView.js",
         "PdfView.js",
         "PdfViewFlatList.js",
-        "PinchZoomView.js",
-        "react-native-pdf.podspec"
-    ]
-}
+        "PinchZoomView.js"
+    ],
+    "scripts": {
+        "build": "rm -rf dist/ && tsc"
+    }
+}

package/windows/RCTPdf/RCTPdfControl.xaml

@@ -18,7 +18,6 @@
     UseSystemFocusVisuals="False"
     PointerWheelChanged="PagesContainer_PointerWheelChanged"
     Tapped="PagesContainer_Tapped"
-    DoubleTapped="PagesContainer_DoubleTapped"
     ViewChanged="PagesContainer_ViewChanged"
     >
     <ItemsControl x:Name="Pages" HorizontalAlignment="Center"

package/DoubleTapView.js

@@ -1,126 +0,0 @@
-/**
- * Copyright (c) 2017-present, Wonday (@wonday.org)
- * All rights reserved.
- *
- * This source code is licensed under the MIT-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-'use strict';
-import React, {Component} from 'react';
-import {
-    View,
-    PanResponder,
-    ViewPropTypes,
-} from 'react-native';
-import PropTypes from 'prop-types';
-
-export default class DoubleTapView extends Component {
-
-    static propTypes = {
-        ...ViewPropTypes,
-        delay: PropTypes.number,
-        radius: PropTypes.number,
-        onSingleTap: PropTypes.func,
-        onDoubleTap: PropTypes.func,
-    };
-
-    static defaultProps = {
-        delay: 300,
-        radius: 50,
-        onSingleTap: () => {
-        },
-        onDoubleTap: () => {
-        },
-    };
-
-    constructor() {
-        super();
-
-        this.gestureHandlers = PanResponder.create({
-            onStartShouldSetPanResponder: (evt, gestureState) => (gestureState.numberActiveTouches === 1),
-            onStartShouldSetResponderCapture: (evt, gestureState) => (gestureState.numberActiveTouches === 1),
-            onMoveShouldSetPanResponder: (evt, gestureState) => (false),
-            onMoveShouldSetResponderCapture: (evt, gestureState) => (false),
-            onPanResponderTerminationRequest: (evt, gestureState) => false,
-            onPanResponderRelease: this.handlePanResponderRelease,
-
-        });
-
-        this.prevTouchInfo = {
-            prevTouchX: 0,
-            prevTouchY: 0,
-            prevTouchTimeStamp: 0,
-        };
-
-        this.timer = null;
-
-    }
-
-
-    distance = (x0, y0, x1, y1) => {
-        return Math.sqrt(Math.pow((x1 - x0), 2) + Math.pow((y1 - y0), 2)).toFixed(1);
-    };
-
-    isDoubleTap = (currentTouchTimeStamp, {x0, y0}) => {
-        const {prevTouchX, prevTouchY, prevTouchTimeStamp} = this.prevTouchInfo;
-        const dt = currentTouchTimeStamp - prevTouchTimeStamp;
-        const {delay, radius} = this.props;
-
-        return (prevTouchTimeStamp > 0 && dt < delay && this.distance(prevTouchX, prevTouchY, x0, y0) < radius);
-    };
-
-    handlePanResponderRelease = (evt, gestureState) => {
-
-        const currentTouchTimeStamp = Date.now();
-        const x = evt.nativeEvent.locationX;
-        const y = evt.nativeEvent.locationY; 
-
-        if (this.timer) {
-
-            if (this.isDoubleTap(currentTouchTimeStamp, gestureState)) {
-
-                clearTimeout(this.timer);
-                this.timer = null;
-                this.props.onDoubleTap();
-
-            } else {
-
-                const {prevTouchX, prevTouchY, prevTouchTimeStamp} = this.prevTouchInfo;
-                const {radius} = this.props;
-
-                // if not in radius, it's a move
-                if (this.distance(prevTouchX, prevTouchY, gestureState.x0, gestureState.y0) < radius) {
-                    this.timer = null;
-                    this.props.onSingleTap(x, y);
-                }
-
-            }
-        } else {
-            // do not count scroll gestures as taps
-            if (this.distance(0, gestureState.dx, 0, gestureState.dy) < 10) {
-
-                this.timer = setTimeout(() => {
-                    this.props.onSingleTap(x, y);
-                    this.timer = null;
-                }, this.props.delay);
-            }
-        }
-
-
-        this.prevTouchInfo = {
-            prevTouchX: gestureState.x0,
-            prevTouchY: gestureState.y0,
-            prevTouchTimeStamp: currentTouchTimeStamp,
-        };
-
-    };
-
-    render() {
-        return (
-            <View {...this.props} {...this.gestureHandlers.panHandlers}>
-                {this.props.children}
-            </View>
-        );
-    }
-}

package/PdfManager.js

@@ -1,31 +0,0 @@
-/**
- * Copyright (c) 2017-present, Wonday (@wonday.org)
- * All rights reserved.
- *
- * This source code is licensed under the MIT-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-'use strict';
-const invariant = require('fbjs/lib/invariant');
-const PdfManagerNative = require('react-native').NativeModules.PdfManager;
-
-
-export default class PdfManager {
-
-    static loadFile(path: string,
-                    password?: string,): Promise<string> {
-
-        invariant(
-            typeof path === 'string',
-            'path must be a valid string.',
-        );
-
-        if (password === undefined) {
-            password = "";
-        }
-
-        return PdfManagerNative.loadFile(path, password);
-
-    }
-}

package/PdfPageView.js

@@ -1,54 +0,0 @@
-/**
- * Copyright (c) 2017-present, Wonday (@wonday.org)
- * All rights reserved.
- *
- * This source code is licensed under the MIT-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-
-'use strict';
-import React, {PureComponent} from 'react';
-import PropTypes from 'prop-types';
-import {
-    ViewPropTypes,
-    requireNativeComponent,
-} from 'react-native';
-
-export default class PdfPageView extends PureComponent {
-    _getStylePropsProps = () => {
-        const {width, height} = this.props;
-        if (width || height) {
-            return {width, height};
-        }
-        return {};
-    };
-
-    render() {
-        const {
-            style,
-            ...restProps
-        } = this.props;
-        return (
-            <PdfPageViewCustom
-                {...restProps}
-                style={[style, this._getStylePropsProps()]}
-            />
-        );
-
-    }
-}
-
-PdfPageView.propTypes = {
-    ...ViewPropTypes,
-    fileNo: PropTypes.number,
-    page: PropTypes.number,
-    width: PropTypes.number,
-    height: PropTypes.number
-};
-
-PdfPageView.defaultProps = {
-    style: {}
-};
-
-let PdfPageViewCustom = requireNativeComponent('RCTPdfPageView', PdfPageView, {nativeOnly: {}});