react-native-pdf 6.5.0 → 6.6.2

package/DoubleTapView.js

@@ -10,11 +10,10 @@
 import React, {Component} from 'react';
 import {
     View,
-    PanResponder,
-    ViewPropTypes,
+    PanResponder
 } from 'react-native';
 import PropTypes from 'prop-types';
-
+import {ViewPropTypes} from 'deprecated-react-native-prop-types';
 export default class DoubleTapView extends Component {
 
     static propTypes = {

package/PdfPageView.js

@@ -11,10 +11,9 @@
 import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
 import {
-    ViewPropTypes,
     requireNativeComponent,
 } from 'react-native';
-
+import {ViewPropTypes} from 'deprecated-react-native-prop-types';
 export default class PdfPageView extends PureComponent {
     _getStylePropsProps = () => {
         const {width, height} = this.props;

package/PdfView.js

@@ -8,8 +8,8 @@
 
 'use strict';
 import React, {Component} from 'react';
-import {ScrollView, FlatList, View, StyleSheet, ViewPropTypes} from 'react-native';
-
+import {ScrollView, FlatList, View, StyleSheet} from 'react-native';
+import {ViewPropTypes} from 'deprecated-react-native-prop-types';
 import PropTypes from 'prop-types';
 
 import PdfManager from './PdfManager';

package/PinchZoomView.js

@@ -12,10 +12,9 @@ import PropTypes from 'prop-types';
 import {
     View,
     StyleSheet,
-    PanResponder,
-    ViewPropTypes,
+    PanResponder
 } from 'react-native';
-
+import {ViewPropTypes} from 'deprecated-react-native-prop-types';
 export default class PinchZoomView extends Component {
 
     static propTypes = {

package/README.md

@@ -169,6 +169,19 @@ react-native run-ios
 <details>
   <summary>ChangeLog details</summary>
 
+v6.6.2
+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
+
+v6.6.1 depresed
+
+v6.6.0 depresed
+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. Fix: replace mavenCentral with maven
 2. Breaking Change(Android): replace deprecated repository: jcenter()

package/index.js

@@ -13,14 +13,13 @@ import {
     requireNativeComponent,
     View,
     Platform,
-    ViewPropTypes,
     StyleSheet,
     Image,
     Text
 } from 'react-native';
 
 import ReactNativeBlobUtil from 'react-native-blob-util'
-
+import {ViewPropTypes} from 'deprecated-react-native-prop-types';
 const SHA1 = require('crypto-js/sha1');
 import PdfView from './PdfView';
 

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,6 +1,6 @@
 {
     "name": "react-native-pdf",
-    "version": "6.5.0",
+    "version": "6.6.2",
     "summary": "A react native PDF view component",
     "description": "A react native PDF view component, support ios and android platform",
     "main": "index.js",
@@ -28,7 +28,8 @@
         "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"