Feature/windows vnext

.gitignore

@@ -33,3 +33,20 @@ local.properties
 node_modules/
 npm-debug.log
 *.iml
+
+
+# Windows vnext
+#
+.vs/
+packages/
+bin/
+obj/
+msbuild.binlog
+windows/RNPDFvnext/RNPDFvnext/obj/x64/Debug/intermediatexaml/RNPDFvnext.winmdobj
+*.pdb
+*.winmd
+*.xbf
+windows/RNPDFvnext/RNPDFvnext/obj/project.assets.json
+*.cache
+windows/RNPDFvnext/RNPDFvnext/obj/RNPDFvnext.csproj.nuget.dgspec.json
+windows/RNPDFvnext/RNPDFvnext/obj/RNPDFvnext.csproj.nuget.g.props

PDFView.android.js

@@ -1,6 +1,7 @@
 'use strict';
-import React,{ Component, PropTypes } from 'react';
+import React,{ Component } from 'react';
 import { requireNativeComponent, View } from 'react-native';
+import PropTypes from 'prop-types';
 
 class PDFView extends Component {
   constructor(props) {

PDFView.ios.js

@@ -1,6 +1,7 @@
 'use strict';
-import React,{ Component, PropTypes } from 'react';
+import React, { Component } from 'react';
 import { requireNativeComponent, View } from 'react-native';
+import PropTypes from 'prop-types';
 
 class PDFView extends Component {
   constructor(props) {

PDFView.windows.js

@@ -0,0 +1,40 @@
+'use strict';
+import React, { Component } from 'react';
+import { requireNativeComponent, View } from 'react-native';
+import PropTypes from 'prop-types';
+
+class PDFView extends Component {
+  constructor(props) {
+    super(props);
+    this._onChange = this._onChange.bind(this);
+  }
+
+  setNativeProps(nativeProps) {
+    this._root.setNativeProps(nativeProps);
+  }
+
+  _onChange(event:Event) {
+    this.props.onLoadComplete && this.props.onLoadComplete(Number(event.nativeEvent.message));
+  }
+
+  render() {
+    return <PDFCustomView ref={component => this._root = component} {...this.props} onChange={this._onChange}/>;
+  }
+}
+
+PDFView.propTypes = {
+  ...View.propTypes,
+  src: PropTypes.string,
+  path: PropTypes.string,
+  pageNumber: PropTypes.number,
+  zoom: PropTypes.number,
+  onLoadComplete: PropTypes.func
+};
+
+//var PDFCustomView = requireNativeComponent('RNPDFView', null);
+
+var PDFCustomView = requireNativeComponent('PDF_Render', PDFView, {
+  nativeOnly: {onChange: true}
+});
+
+export default PDFView;

README.md

@@ -1,13 +1,17 @@
 # react-native-pdf-view
 React Native PDF View (cross-platform support)
 
-### Breaking change
+### Breaking changes
 
-React native 0.19 changed the ReactProps class which led to problems with updating native view properties (see https://github.com/facebook/react-native/issues/5649). These errors are corrected in react-native-pdf-view version 0.2.0. Use version 0.2.* for react native >=0.19 and for earlier react native versions use version 0.1.3.
+* React native 0.40 moved iOS headers, thus all iOS react import statements has been changed. Use version 0.4.* for react native >=0.40. For earlier version see below breaking change.
+
+* React native 0.19 changed the ReactProps class which led to problems with updating native view properties (see https://github.com/facebook/react-native/issues/5649). These errors are corrected in react-native-pdf-view version 0.2.0. Use version 0.2.* for react native >=0.19 and for earlier react native versions use version 0.1.3.
 
 ### Installation
 ```bash
 npm i react-native-pdf-view --save
+
+react-native link react-native-pdf-view
 ```
 * In `android/setting.gradle`
 

RNPDFView/RNPDFView.h

@@ -6,18 +6,18 @@
 //  Copyright © 2016 Facebook. All rights reserved.
 //
 
-#import "RCTEventDispatcher.h"
+#import <React/RCTEventDispatcher.h>
 #import "UIView+React.h"
 
 @class RCTEventDispatcher;
 
 @interface RNPDFView : UIView
 
-@property (nonatomic, strong) NSString *src;
-@property (nonatomic, strong) NSString *path;
-@property (nonatomic, strong) NSNumber *pageNumber;
-@property (nonatomic, strong) NSNumber *zoom;
+@property(nonatomic, strong) NSString *src;
+@property(nonatomic, strong) NSString *path;
+@property(nonatomic, strong) NSNumber *pageNumber;
+@property(nonatomic, strong) NSNumber *zoom;
 
-@property (nonatomic, copy) RCTBubblingEventBlock onChange;
+@property(nonatomic, copy) RCTBubblingEventBlock onChange;
 
 @end

RNPDFView/RNPDFView.m

@@ -9,10 +9,10 @@
 #import <Foundation/Foundation.h>
 #import <QuartzCore/QuartzCore.h>
 
-#import "RCTBridgeModule.h"
-#import "RCTEventDispatcher.h"
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventDispatcher.h>
 #import "UIView+React.h"
-#import "RCTLog.h"
+#import <React/RCTLog.h>
 
 #import "TiledPDFView.h"
 #import "PDFScrollView.h"

RNPDFView/RNPDFViewManager.m

@@ -7,10 +7,10 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "RCTBridge.h"
+#import <React/RCTBridge.h>
 #import "RNPDFViewManager.h"
 #import "RNPDFView.h"
-#import "RCTEventDispatcher.h"
+#import <React/RCTEventDispatcher.h>
 
 @implementation RNPDFViewManager
 

android/build.gradle

@@ -28,6 +28,6 @@ repositories {
 }
 
 dependencies {
-    compile 'com.facebook.react:react-native:0.20.+'
-    compile 'com.joanzapata.pdfview:android-pdfview:1.0.4@aar'
+    implementation 'com.facebook.react:react-native:0.20.+'
+    implementation 'com.github.barteksc:android-pdf-viewer:2.3.0'
 }

android/src/main/java/com/keyee/pdfview/PDFViewManager.java

@@ -3,12 +3,19 @@
 import java.io.File;
 
 import android.content.Context;
+import android.view.ViewGroup;
 import android.util.Log;
 import android.graphics.PointF;
 
+import com.github.barteksc.pdfviewer.PDFView;
+import com.github.barteksc.pdfviewer.listener.OnPageChangeListener;
+import com.github.barteksc.pdfviewer.listener.OnLoadCompleteListener;
+
+/*
 import com.joanzapata.pdfview.PDFView;
 import com.joanzapata.pdfview.listener.OnPageChangeListener;
 import com.joanzapata.pdfview.listener.OnLoadCompleteListener;
+*/
 
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -22,12 +29,13 @@
 import com.facebook.react.common.MapBuilder;
 
 import static java.lang.String.format;
+import java.lang.ClassCastException;
 
 public class PDFViewManager extends SimpleViewManager<PDFView> implements OnPageChangeListener,OnLoadCompleteListener {
     private static final String REACT_CLASS = "RCTPDFViewAndroid";
     private Context context;
     private PDFView pdfView;
-    Integer pageNumber = 1;
+    Integer pageNumber = 0;
     String assetName;
     String filePath;
 
@@ -45,6 +53,16 @@ public String getName() {
     public PDFView createViewInstance(ThemedReactContext context) {
         if (pdfView == null){
             pdfView = new PDFView(context, null);
+        } else {
+          /* #39 check parent and remove self from parent */
+          try {
+            final ViewGroup parentView = (ViewGroup) pdfView.getParent();
+            if (parentView != null) {
+              parentView.removeView(pdfView);
+            }
+          } catch (ClassCastException e) {
+            showLog("does not has a parent");
+          }
         }
         return pdfView;
         //return new PDFView(context, null);
@@ -75,7 +93,7 @@ private void display(boolean jumpToFirstPage) {
         if (assetName != null) {
             pdfView.fromAsset(assetName)
                 .defaultPage(pageNumber)
-                .swipeVertical(true)
+                //.swipeVertical(true)
                 .onPageChange(this)
                 .onLoad(this)
                 .load();
@@ -87,7 +105,7 @@ private void display(boolean jumpToFirstPage) {
                 .defaultPage(pageNumber)
                 //.showMinimap(false)
                 //.enableSwipe(true)
-                .swipeVertical(true)
+                //.swipeVertical(true)
                 .onPageChange(this)
                 .onLoad(this)
                 .load();
@@ -103,7 +121,7 @@ public void setAsset(PDFView view, String ast) {
     @ReactProp(name = "pageNumber")
     public void setPageNumber(PDFView view, Integer pageNum) {
         //view.setPageNumber(pageNum);
-        if (pageNum > 0){
+        if (pageNum >= 0){
             pageNumber = pageNum;
             display(false);
         }

example/PDFExample.js

@@ -1,72 +1,75 @@
 /**
  * Created by Kevin on 16/3/9.
  */
-'use strict';
-
-import React,{
-    Component,
-    StyleSheet,
-    View,
-    Text
+import React from 'react';
+import {
+  StyleSheet,
+  View,
+  Text
 } from 'react-native';
 
 import PDFView from 'react-native-pdf-view';
 import RNFS from 'react-native-fs';
 
 const pdfDownloadURL = 'http://image.tianjimedia.com/imagelist/2009/190/caq4z56jadof.pdf';
 
-export default class PDFExample extends Component {
-    constructor(props) {
-        super(props);
-        this.state={
-            isPdfDownload: false
-        };
-        this.pdfView = null;
-        this.pdfPath = RNFS.DocumentDirectoryPath + '/test.pdf'
-    }
+export default class PDFExample extends React.Component {
+  state = {
+    isPdfDownload: false,
+  };
 
-    componentDidMount() {
-        RNFS.downloadFile(pdfDownloadURL, this.pdfPath).then(res => {
-            this.setState({isPdfDownload: true});
-        }).catch(err => {
-            console.log(err);
-        });
-    }
+  constructor(props) {
+    super(props);
+    this.pdfView = null;
+    this.pdfPath = RNFS.DocumentDirectoryPath + '/test.pdf'
+  }
 
-    zoom(val = 2.1){
-        this.pdfView && setTimeout(()=>{
-            this.pdfView.setNativeProps({zoom: val});
-        }, 3000);
-    }
+  componentDidMount() {
+    const options = {
+      fromUrl: pdfDownloadURL,
+      toFile: this.pdfPath
+    };
+    RNFS.downloadFile(options).promise.then(res => {
+      this.setState({isPdfDownload: true});
+    }).catch(err => {
+      console.log(err);
+    });
+  }
 
-    render(){
-        if (!this.state.isPdfDownload){
-            return (
-                <View style={styles.container}>
-                    <Text>Downloading</Text>
-                </View>
-            );
-        }
-        return (
-            <PDFView ref={(pdf)=>{this.pdfView = pdf;}}
-                     key="sop"
-                     path={this.pdfPath}
-                     onLoadComplete = {(pageCount)=>{
+  zoom(val = 2.1) {
+    this.pdfView && setTimeout(() => {
+      this.pdfView.setNativeProps({zoom: val});
+    }, 3000);
+  }
+
+  render() {
+    if (!this.state.isPdfDownload) {
+      return (
+        <View style={styles.container}>
+          <Text>Downloading</Text>
+        </View>
+      );
+    }
+    return (
+      <PDFView ref={(pdf)=>{this.pdfView = pdf;}}
+               key="sop"
+               path={this.pdfPath}
+               onLoadComplete={(pageCount)=>{
                         console.log(`total page count: ${pageCount}`);
                         this.zoom();
                      }}
-                     style={styles.pdf}/>
-        )
-    }
+               style={styles.pdf}/>
+    )
+  }
 }
 
 const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-        justifyContent: 'center',
-        alignItems: 'center'
-    },
-    pdf: {
-        flex:1
-    }
-});
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center'
+  },
+  pdf: {
+    flex: 1
+  }
+});