fix ios direct url display

xcarpentier · Jan 7, 2020 · f97b877 · f97b877
1 parent e271914
commit f97b877
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 14 deletions.
diff --git a/App.tsx b/App.tsx
@@ -21,7 +21,8 @@ export default class App extends React.Component {
     return (
       <PdfReader
         source={{
-          uri: 'http://gahp.net/wp-content/uploads/2017/09/sample.pdf',
+          // uri: 'http://gahp.net/wp-content/uploads/2017/09/sample.pdf',
+          base64,
         }}
         style={{ paddingTop: 20 }}
         customStyle={{

diff --git a/README.md b/README.md
@@ -65,6 +65,7 @@ interface Props {
   source: Source
   style?: View['props']['style'] // style props to override default container style
   webviewStyle?: WebView['props']['style'] // style props to override default WebView style
+  webviewProps?: WebView['props']
   noLoader?: boolean
   customStyle?: {
     readerContainer?: CSS.Properties

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rn-pdf-reader-js",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "PDF reader for Expo",
   "main": "node_modules/expo/AppEntry.js",
   "types": "lib/index.d.ts",

diff --git a/src/index.tsx b/src/index.tsx
@@ -155,41 +155,59 @@ interface Props {
 interface State {
   ready: boolean
   data?: string
+  isBase64: boolean
 }
 
 class PdfReader extends React.Component<Props, State> {
   state = {
     ready: false,
     data: undefined,
+    isBase64: false,
   }
 
   init = async () => {
     try {
       const { source, customStyle } = this.props
       let ready = false
-      let data
+      let isBase64 = false
+      let data: any
       if (
         source.uri &&
         (source.uri.startsWith('http') ||
           source.uri.startsWith('file') ||
           source.uri.startsWith('content'))
       ) {
-        data = await fetchPdfAsync(source)
-        ready = !!data
+        switch (Platform.OS) {
+          case 'android': {
+            data = await fetchPdfAsync(source)
+            ready = !!data
+            isBase64 = true
+            break
+          }
+
+          default: {
+            data = source.uri
+            ready = true
+            break
+          }
+        }
       } else if (
         source.base64 &&
         source.base64.startsWith('data:application/pdf;base64,')
       ) {
         data = source.base64
         ready = true
+        isBase64 = true
       } else {
         alert('source props is not correct')
         return
       }
 
-      await writeWebViewReaderFileAsync(data!, customStyle)
+      if (isBase64) {
+        await writeWebViewReaderFileAsync(data!, customStyle)
+      }
 
-      this.setState({ ready, data })
+      this.setState({ ready, data, isBase64 })
     } catch (error) {
       alert(`Sorry, an error occurred. ${error.message}`)
       console.error(error)
@@ -201,16 +219,19 @@ class PdfReader extends React.Component<Props, State> {
   }
 
   componentWillUnmount() {
-    try {
-      removeFilesAsync()
-    } catch (error) {
-      alert(`Error on removing file. ${error.message}`)
-      console.error(error)
+    const { isBase64 } = this.state
+    if (isBase64) {
+      try {
+        removeFilesAsync()
+      } catch (error) {
+        alert(`Error on removing file. ${error.message}`)
+        console.error(error)
+      }
     }
   }
 
   render() {
-    const { ready, data } = this.state
+    const { ready, data, isBase64 } = this.state
 
     const {
       style: containerStyle,
@@ -220,11 +241,12 @@ class PdfReader extends React.Component<Props, State> {
       onLoadEnd,
       onError,
       webviewProps,
+      source: { headers },
     } = this.props
 
     const originWhitelist = ['http://*', 'https://*', 'file://*', 'data:*']
     const style = [styles.webview, webviewStyle]
-    const source = { uri: htmlPath }
+    const source = isBase64 ? { uri: htmlPath } : { uri: data!, headers }
     const isAndroid = Platform.OS === 'android'
     if (ready && data) {
       return (