react-native-pdf 6.2.2 → 6.5.0

package/PdfManager.js

@@ -7,25 +7,20 @@
  */
 
 'use strict';
-const invariant = require('fbjs/lib/invariant');
-const PdfManagerNative = require('react-native').NativeModules.PdfManager;
 
+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.',
-        );
+    static loadFile(path, password) {
+        if (typeof path !== 'string') {
+            throw new TypeError('path must be a valid string.');
+        }
 
         if (password === undefined) {
             password = "";
         }
 
         return PdfManagerNative.loadFile(path, password);
-
     }
-}
+}

package/PinchZoomView.js

@@ -108,7 +108,7 @@ export default class PinchZoomView extends Component {
         return (
             <View
                 {...this.props}
-                {...this.gestureHandlers.panHandlers}
+                {...this.gestureHandlers?.panHandlers}
                 style={[styles.container, this.props.style]}>
                 {this.props.children}
             </View>

package/README.md

@@ -5,7 +5,7 @@ A react native PDF view component (cross-platform support)
 
 ### Feature
 
-* read a PDF from url/local file/asset and can cache it.
+* read a PDF from url, blob, local file or asset and can cache it.
 * display horizontally or vertically
 * drag and zoom
 * double tap for zoom
@@ -13,26 +13,27 @@ A react native PDF view component (cross-platform support)
 * jump to a specific page in the pdf
 
 ### Supported versions
-We use [`rn-fetch-blob`](https://github.com/joltup/rn-fetch-blob) to handle file system access in this package,
-So you should install react-native-pdf and rn-fetch-blob
+We use [`react-native-blob-util`](https://github.com/RonRadtke/react-native-blob-util) to handle file system access in this package,
+So you should install react-native-pdf and react-native-blob-util
 
-> The table below shows the supported versions of React Native and rn-fetch-blob for different versions of `react-native-pdf`.
+> The table below shows the supported versions of React Native and react-native-blob-util for different versions of `react-native-pdf`.
 
-| React Native              | 0.4x - 0.56     | 0.57    | 0.60+    | 0.62+    |
-| ------------------------- | --------------- | ------- | -------- | -------- |
-| react-native-pdf          | 4.x.x - 5.0.x   | 5.0.9+  | 6.0.0+   | 6.2.0+   |
-| rn-fetch-blob             | 0.10.15         | 0.10.15 | 0.11.0+  | 0.11.0+  |
-| progress-bar-android      |                 |         |          | 1.0.3+   |
-| progress-view             |                 |         |          | 1.0.3+   |
+| React Native              | 0.4x - 0.56     | 0.57    | 0.60+    | 0.62+    | 0.62+    |
+| ------------------------- | --------------- | ------- | -------- | -------- | -------- |
+| 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 rn-fetch-blob @react-native-community/progress-bar-android @react-native-community/progress-view --save
+npm install react-native-pdf react-native-blob-util --save
 
 # or using yarn:
-yarn add react-native-pdf rn-fetch-blob @react-native-community/progress-bar-android @react-native-community/progress-view
+yarn add react-native-pdf react-native-blob-util
 ```
 
 Then follow the instructions for your platform to link react-native-pdf into your project:
@@ -48,9 +49,7 @@ Run `pod install` in the `ios` directory. Linking is not required in React Nativ
 **React Native 0.59 and below**
 
 ```bash
-react-native link rn-fetch-blob
-react-native link @react-native-community/progress-bar-android
-react-native link @react-native-community/progress-view
+react-native link react-native-blob-util
 react-native link react-native-pdf
 ```
 </details>
@@ -77,15 +76,40 @@ android {
 
 **React Native 0.59.0 and below**
 ```bash
-react-native link rn-fetch-blob
-react-native link @react-native-community/progress-bar-android
-react-native link @react-native-community/progress-view
+react-native link react-native-blob-util
 react-native link react-native-pdf
 ```
 
 
 </details>
 
+### Windows installation
+<details>
+  <sumary>Windows details</summary>
+
+- Open your solution in Visual Studio 2019 (eg. `windows\yourapp.sln`)
+- Right-click Solution icon in Solution Explorer > Add > Existing Project...
+- If running RNW 0.62: add `node_modules\react-native-pdf\windows\RCTPdf\RCTPdf.vcxproj`
+- If running RNW 0.62: add `node_modules\react-native-blob-util\windows\ReactNativeBlobUtil\ReactNativeBlobUtil.vcxproj`
+- Right-click main application project > Add > Reference...
+- Select `progress-view` and  in Solution Projects
+  - If running 0.62, also select `RCTPdf` and `ReactNativeBlobUtil`
+- In app `pch.h` add `#include "winrt/RCTPdf.h"`
+  - If running 0.62, also select `#include "winrt/ReactNativeBlobUtil.h"`
+- In `App.cpp` add `PackageProviders().Append(winrt::progress_view::ReactPackageProvider());` before `InitializeComponent();`
+  - If running RNW 0.62, also add `PackageProviders().Append(winrt::RCTPdf::ReactPackageProvider());` and `PackageProviders().Append(winrt::ReactNativeBlobUtil::ReactPackageProvider());`
+
+
+#### Bundling PDFs with the app
+To add a `test.pdf` like in the example add:
+```
+<None Include="..\..\test.pdf">
+  <DeploymentContent>true</DeploymentContent>
+</None>
+```
+in the app `.vcxproj` file, before `<None Include="packages.config" />`.
+</details>
+
 ### FAQ
 <details>
   <summary>FAQ details</summary>
@@ -145,6 +169,24 @@ react-native run-ios
 <details>
   <summary>ChangeLog details</summary>
 
+v6.5.0
+1. Fix: replace mavenCentral with maven
+2. Breaking Change(Android): replace deprecated repository: jcenter()
+3. Fix: loading progress
+4. Add: Typed "source" prop
+5. Remove: 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
+3. Use react-native-blob-util instead of rn-fetch-blob
+4. Add blob support
+5. remove progress-view dependency
+
+v6.3.0
+1. Add windows support
+2. Fixed some bugs
+
 v6.2.2
 1. Fixed incorrect type of onPageSingleTap and onScaleChanged argument
 2. Fixed included missing setPage method in TypeScript and Flow types
@@ -180,25 +222,6 @@ v6.0.0
 1. Add JS callback onPressLink for pdf link press listener
 2. Fix calling setState while unmounted
 
-v5.1.7
-1. Downgraded to AndroidPdfViewer 3.1.0-beta.1
-
-v5.1.6
-1. Fixed componentWillReceiveProps and componentWillMount warnings
-
-v5.1.5
-1. Added setPage() method
-2. Upgraded to AndroidPdfViewer to 3.2.0-beta.1
-3. Fixed some codes ,readme and sample
-
-v5.1.4
-1. Updated example project to RN 0.60.4
-2. Fixed blank view after native module got recycled in onDetachedFromWindow event
-3. Restore singleTap, only callback, do not change scale
-
-v5.1.3
-1. Removed singleTap action from iOS, make the same with Android.
-
 
 [[more]](https://github.com/wonday/react-native-pdf/releases)
 
@@ -217,38 +240,38 @@ v5.1.3
 
 import React from 'react';
 import { StyleSheet, Dimensions, View } from 'react-native';
-
 import Pdf from 'react-native-pdf';
 
 export default class PDFExample extends React.Component {
     render() {
-        const source = {uri:'http://samples.leanpub.com/thereactnativebook-sample.pdf',cache:true};
+        const source = { uri: 'http://samples.leanpub.com/thereactnativebook-sample.pdf', cache: true };
         //const source = require('./test.pdf');  // ios only
-        //const source = {uri:'bundle-assets://test.pdf'};
-
+        //const source = {uri:'bundle-assets://test.pdf' };
         //const source = {uri:'file:///sdcard/test.pdf'};
         //const source = {uri:"data:application/pdf;base64,JVBERi0xLjcKJc..."};
+        //const source = {uri:"content://com.example.blobs/xxxxxxxx-...?offset=0&size=xxx"};
+        //const source = {uri:"blob:xxxxxxxx-...?offset=0&size=xxx"};
 
         return (
             <View style={styles.container}>
                 <Pdf
                     source={source}
-                    onLoadComplete={(numberOfPages,filePath)=>{
-                        console.log(`number of pages: ${numberOfPages}`);
+                    onLoadComplete={(numberOfPages,filePath) => {
+                        console.log(`Number of pages: ${numberOfPages}`);
                     }}
-                    onPageChanged={(page,numberOfPages)=>{
-                        console.log(`current page: ${page}`);
+                    onPageChanged={(page,numberOfPages) => {
+                        console.log(`Current page: ${page}`);
                     }}
-                    onError={(error)=>{
+                    onError={(error) => {
                         console.log(error);
                     }}
-                    onPressLink={(uri)=>{
-                        console.log(`Link presse: ${uri}`)
+                    onPressLink={(uri) => {
+                        console.log(`Link pressed: ${uri}`);
                     }}
                     style={styles.pdf}/>
             </View>
         )
-  }
+    }
 }
 
 const styles = StyleSheet.create({
@@ -270,57 +293,60 @@ const styles = StyleSheet.create({
 
 ### Configuration
 
-| Property      | Type          | Default          | Description         | iOS   | Android | FirstRelease |
-| ------------- |:-------------:|:----------------:| ------------------- | ------| ------- | ------------ |
-| source        | object        | not null         | PDF source like {uri:xxx, cache:false}. see the following for detail.| ✔ | ✔ | <3.0 |
-| page          | number        | 1                | initial page index          | ✔   | ✔ | <3.0 |
-| scale         | number        | 1.0              | should minScale<=scale<=maxScale| ✔   | ✔ | <3.0 |
-| minScale         | number        | 1.0              | min scale| ✔   | ✔ | 5.0.5 |
-| maxScale         | number        | 3.0              | max scale| ✔   | ✔ | 5.0.5 |
-| horizontal    | bool          | false            | draw page direction, if you want to listen the orientation change, you can use  [[react-native-orientation-locker]](https://github.com/wonday/react-native-orientation-locker)| ✔   | ✔ | <3.0 |
-| fitWidth      | bool          | false            | if true fit the width of view, can not use fitWidth=true together with scale| ✔   | ✔ | <3.0, abandoned from 3.0 |
-| fitPolicy     | number        | 2                | 0:fit width, 1:fit height, 2:fit both(default)| ✔   | ✔ | 3.0 |
-| spacing       | number        | 10               | the breaker size between pages| ✔   | ✔ | <3.0 |
-| password      | string        | ""               | pdf password, if password error, will call OnError() with message "Password required or incorrect password."        | ✔   | ✔ | <3.0 |
-| style         | object        | {backgroundColor:"#eee"} | support normal view style, you can use this to set border/spacing color... | ✔   | ✔ | <3.0 |
-| activityIndicator   | Component       | <ProgressBar/> | when loading show it as an indicator, you can use your component| ✔   | ✔ | <3.0 |
-| activityIndicatorProps  | object      | {color:'#009900', progressTintColor:'#009900'} | activityIndicator props | ✔ | ✔ | 3.1 |
-| 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 |
-| 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 |
-| trustAllCerts  | bool            | true        | Allow connections to servers with self-signed certification  | ✔ | ✔ | 6.0.? |
-| singlePage  | bool  | false | Only show first page, useful for thumbnail views | ✔ | ✔ | 6.1.2 |
-| onLoadProgress      | function(percent) | null        | callback when loading, return loading progress (0-1) | ✔   | ✔ | <3.0 |
-| onLoadComplete      | function(numberOfPages, path, {width, height}, tableContents) | null        | callback when pdf load completed, return total page count, pdf local/cache path, {width,height} and table of contents | ✔   | ✔ | <3.0 |
-| onPageChanged       | function(page,numberOfPages)  | null        | callback when page changed ,return current page and total page count | ✔   | ✔ | <3.0 |
-| onError       | function(error) | null        | callback when error happened | ✔   | ✔ | <3.0 |
-| onPageSingleTap   | function(page)  | null        | callback when page was single tapped | ✔ | ✔ | 3.0 |
-| onScaleChanged    | function(scale) | null        | callback when scale page | ✔ | ✔ | 3.0 |
-| onPressLink       | function(uri)   | null        | callback when link tapped | ✔ | ✔ | 6.0.0 |
+| Property      | Type          | Default          | Description         | iOS   | Android | Windows | FirstRelease |
+| ------------- |:-------------:|:----------------:| ------------------- | ------| ------- | ------- | ------------ |
+| source        | object        | not null         | PDF source like {uri:xxx, cache:false}. see the following for detail.| ✔ | ✔ | ✔ | <3.0 |
+| page          | number        | 1                | initial page index          | ✔   | ✔ | ✔ | <3.0 |
+| scale         | number        | 1.0              | should minScale<=scale<=maxScale| ✔   | ✔ | ✔ | <3.0 |
+| minScale         | number        | 1.0              | min scale| ✔   | ✔ | ✔ | 5.0.5 |
+| maxScale         | number        | 3.0              | max scale| ✔   | ✔ | ✔ | 5.0.5 |
+| horizontal    | bool          | false            | draw page direction, if you want to listen the orientation change, you can use  [[react-native-orientation-locker]](https://github.com/wonday/react-native-orientation-locker)| ✔   | ✔ | ✔ | <3.0 |
+| fitWidth      | bool          | false            | if true fit the width of view, can not use fitWidth=true together with scale| ✔   | ✔ | ✔ | <3.0, abandoned from 3.0 |
+| fitPolicy     | number        | 2                | 0:fit width, 1:fit height, 2:fit both(default)| ✔   | ✔ | ✔ | 3.0 |
+| spacing       | number        | 10               | the breaker size between pages| ✔   | ✔ | ✔ | <3.0 |
+| password      | string        | ""               | pdf password, if password error, will call OnError() with message "Password required or incorrect password."        | ✔   | ✔ | ✔ | <3.0 |
+| style         | object        | {backgroundColor:"#eee"} | support normal view style, you can use this to set border/spacing color... | ✔   | ✔ | ✔ | <3.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 |
+| 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 |
+| trustAllCerts  | bool            | true        | Allow connections to servers with self-signed certification  | ✔ | ✔ | ✖ | 6.0.? |
+| singlePage  | bool  | false | Only show first page, useful for thumbnail views | ✔ | ✔ | ✔ | 6.2.1 |
+| onLoadProgress      | function(percent) | null        | callback when loading, return loading progress (0-1) | ✔   | ✔ | ✖ | <3.0 |
+| onLoadComplete      | function(numberOfPages, path, {width, height}, tableContents) | null        | callback when pdf load completed, return total page count, pdf local/cache path, {width,height} and table of contents | ✔   | ✔ | ✔ but without tableContents | <3.0 |
+| onPageChanged       | function(page,numberOfPages)  | null        | callback when page changed ,return current page and total page count | ✔   | ✔ | ✔ | <3.0 |
+| onError       | function(error) | null        | callback when error happened | ✔   | ✔ | ✔ | <3.0 |
+| onPageSingleTap   | function(page)  | null        | callback when page was single tapped | ✔ | ✔ | ✔ | 3.0 |
+| onScaleChanged    | function(scale) | null        | callback when scale page | ✔ | ✔ | ✔ | 3.0 |
+| onPressLink       | function(uri)   | null        | callback when link tapped | ✔ | ✔ | ✖ | 6.0.0 |
 
 #### parameters of source
 
-| parameter    | Description | default | iOS | Android |
-| ------------ | ----------- | ------- | --- | ------- |
-| uri          | pdf source, see the forllowing for detail.| required | ✔   | ✔ |
-| cache        | use cache or not | false | ✔ | ✔ |
-| expiration   | cache file expired seconds (0 is not expired) | 0 | ✔ | ✔ |
-| method       | request method when uri is a url | "GET" | ✔ | ✔ |
-| headers      | request headers when uri is a url | {} | ✔ | ✔ |
+| parameter    | Description | default | iOS | Android | Windows |
+| ------------ | ----------- | ------- | --- | ------- | ------- |
+| uri          | pdf source, see the forllowing for detail.| required | ✔   | ✔ | ✔ |
+| cache        | use cache or not | false | ✔ | ✔ | ✖ |
+| cacheFileName | specific file name for cached pdf file | SHA1(uri) result | ✔ | ✔ | ✖ |
+| expiration   | cache file expired seconds (0 is not expired) | 0 | ✔ | ✔ | ✖ |
+| method       | request method when uri is a url | "GET" | ✔ | ✔ | ✖ |
+| headers      | request headers when uri is a url | {} | ✔ | ✔ | ✖ |
 
 #### types of source.uri
 
-| Usage    | Description | iOS | Android |
-| ------------ | ----------- | --- | ------- |
-| `{uri:"http://xxx/xxx.pdf"}` | load pdf from a url | ✔   | ✔ |
-| `{require("./test.pdf")}` | load pdf relate to js file (do not need add by xcode) | ✔ | ✖ |
-| `{uri:"bundle-assets://path/to/xxx.pdf"}` | load pdf from assets, the file should be at android/app/src/main/assets/path/to/xxx.pdf | ✖ | ✔ |
-| `{uri:"bundle-assets://xxx.pdf"}` | load pdf from assets, you must add pdf to project by xcode. this does not support folder. | ✔ | ✖ |
-| `{uri:"data:application/pdf;base64,JVBERi0xLjcKJc..."}` | load pdf from base64 string | ✔   | ✔ |
-| `{uri:"file:///absolute/path/to/xxx.pdf"}` | load pdf from local file system | ✔   | ✔ |
-
-
+| Usage        | Description | iOS | Android | Windows |
+| ------------ | ----------- | --- | ------- | ------- |
+| `{uri:"http://xxx/xxx.pdf"}` | load pdf from a url | ✔   | ✔ | ✔ |
+| `{require("./test.pdf")}` | load pdf relate to js file (do not need add by xcode) | ✔ | ✖ | ✖ |
+| `{uri:"bundle-assets://path/to/xxx.pdf"}` | load pdf from assets, the file should be at android/app/src/main/assets/path/to/xxx.pdf | ✖ | ✔ | ✖ |
+| `{uri:"bundle-assets://xxx.pdf"}` | load pdf from assets, you must add pdf to project by xcode. this does not support folder. | ✔ | ✖ | ✖ |
+| `{uri:"data:application/pdf;base64,JVBERi0xLjcKJc..."}` | load pdf from base64 string | ✔   | ✔ | ✔ |
+| `{uri:"file:///absolute/path/to/xxx.pdf"}` | load pdf from local file system | ✔  | ✔ | ✔  |
+| `{uri:"ms-appx:///xxx.pdf"}}` | load pdf bundled with UWP app |  ✖ | ✖ | ✔ |
+| `{uri:"content://com.example.blobs/xxxxxxxx-...?offset=0&size=xxx"}` | load pdf from content URI | ✔* | ✖ | ✖ |
+| `{uri:"blob:xxxxxxxx-...?offset=0&size=xxx"}` | load pdf from blob URL | ✖ | ✔ | ✖ |
+
+\*) requires building React Native from source with [this patch](https://github.com/facebook/react-native/pull/31789)
 ### Methods
 * [setPage](#setPage)
 

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Sat Oct 12 21:44:37 CST 2019
+gradle.version=5.6.1

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/android/src/main/java/org/wonday/pdf/PdfView.java

@@ -10,6 +10,7 @@ package org.wonday.pdf;
 
 import java.io.File;
 
+import android.content.ContentResolver;
 import android.content.Context;
 import android.view.View;
 import android.view.ViewGroup;
@@ -49,6 +50,9 @@ import com.facebook.common.logging.FLog;
 import com.facebook.react.common.ReactConstants;
 
 import static java.lang.String.format;
+
+import java.io.FileNotFoundException;
+import java.io.InputStream;
 import java.lang.ClassCastException;
 
 import com.shockwave.pdfium.PdfDocument;
@@ -222,8 +226,23 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
             Constants.Pinch.MINIMUM_ZOOM = this.minScale;
             Constants.Pinch.MAXIMUM_ZOOM = this.maxScale;
 
-            Configurator configurator = this.fromUri(getURI(this.path))
-                .defaultPage(this.page-1)
+            Configurator configurator;
+
+            if (this.path.startsWith("content://")) {
+                ContentResolver contentResolver = getContext().getContentResolver();
+                InputStream inputStream = null;
+                Uri uri = Uri.parse(this.path);
+                try {
+                    inputStream = contentResolver.openInputStream(uri);
+                } catch (FileNotFoundException e) {
+                    throw new RuntimeException(e.getMessage());
+                }
+                configurator = this.fromStream(inputStream);
+            } else {
+                configurator = this.fromUri(getURI(this.path));
+            }
+
+            configurator.defaultPage(this.page-1)
                 .swipeHorizontal(this.horizontal)
                 .onPageChange(this)
                 .onLoad(this)

package/index.d.ts

@@ -16,9 +16,20 @@ export type TableContent = {
     title: string,
 };
 
+export type Source = {
+    uri?: string;
+    headers?: {
+        [key: string]: string;
+    };
+    cache?: boolean;
+    cacheFileName?: string;
+    expiration?: number;
+    method?: string;
+};
+
 interface Props {
     style?: ReactNative.StyleProp<ReactNative.ViewStyle>,
-    source: object,
+    source: Source | number,
     page?: number,
     scale?: number,
     minScale?: number,
@@ -26,8 +37,7 @@ interface Props {
     horizontal?: boolean,
     spacing?: number,
     password?: string,
-    activityIndicator?: any,
-    activityIndicatorProps?: object,
+    renderActivityIndicator?: (progress: number) => React.ReactElement,
     enableAntialiasing?: boolean,
     enablePaging?: boolean,
     enableRTL?: boolean,

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,9 +45,7 @@ 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,
@@ -86,7 +83,6 @@ export default class Pdf extends Component {
         enableAnnotationRendering: true,
         enablePaging: false,
         enableRTL: false,
-        activityIndicatorProps: {color: '#009900', progressTintColor: '#009900'},
         trustAllCerts: true,
         usePDFKit: true,
         singlePage: false,
@@ -166,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())) {
@@ -206,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);
@@ -214,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) {
@@ -227,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) {
@@ -267,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,
@@ -296,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);
@@ -313,7 +309,7 @@ export default class Pdf extends Component {
                 }
 
                 this._unlinkFile(cacheFile);
-                RNFetchBlob.fs
+                ReactNativeBlobUtil.fs
                     .cp(tempCacheFile, cacheFile)
                     .then(() => {
                         if (this._mounted) {
@@ -335,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) {
 
         }
@@ -392,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 * 100).toFixed(2)}%`}</Text>}
                             </View>):(
-                                Platform.OS === "android"?(
+                                Platform.OS === "android" || Platform.OS === "windows"?(
                                         <PdfCustom
                                             ref={component => (this._root = component)}
                                             {...this.props}
@@ -463,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},
+    })
 }