From 1a08f9cedcb747fd230be717fe815c686e4427cb Mon Sep 17 00:00:00 2001 From: xiesubin Date: Wed, 29 May 2019 22:07:52 +0800 Subject: [PATCH 1/2] upgrade webview and rn support --- lib/Canvas.js | 3 ++- package.json | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/Canvas.js b/lib/Canvas.js index 3b1ab26..a46421a 100644 --- a/lib/Canvas.js +++ b/lib/Canvas.js @@ -6,10 +6,11 @@ var createReactClass = require('create-react-class'); var { View, - WebView, Platform } = require('react-native'); +var {WebView} = require('react-native-webview'); + var Canvas = createReactClass({ propTypes: { style: PropTypes.object, diff --git a/package.json b/package.json index c051fa9..5542466 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-qrcode", - "version": "0.2.7", + "version": "0.3.0", "description": "react-native qrocode generator", "main": "index.js", "repository": { @@ -16,6 +16,11 @@ "bugs": { "url": "https://github.com/cssivision/react-native-qrcode/issues" }, + "peerDependencies": { + "react": "*", + "react-native": ">= 0.59.0", + "react-native-webview": "^5.4.0" + }, "homepage": "https://github.com/cssivision/react-native-qrcode#readme", "dependencies": { "create-react-class": "^15.6.0", From 6c545b21647075307633b7640d16143e814e1c26 Mon Sep 17 00:00:00 2001 From: xiesubin Date: Tue, 20 Aug 2019 10:32:10 +0800 Subject: [PATCH 2/2] fix --- lib/Canvas.js | 3 +-- package.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/Canvas.js b/lib/Canvas.js index a46421a..812615f 100644 --- a/lib/Canvas.js +++ b/lib/Canvas.js @@ -26,15 +26,14 @@ var Canvas = createReactClass({ return ( *{margin:0;padding:0;}canvas{transform:translateZ(0);}"}} opaque={false} underlayColor={'transparent'} style={this.props.style} javaScriptEnabled={true} - scrollEnabled={false} onLoad={this.props.onLoad} onLoadEnd={this.props.onLoadEnd} originWhitelist={['*']} diff --git a/package.json b/package.json index 5542466..64489b3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-qrcode", - "version": "0.3.0", + "version": "0.3.1", "description": "react-native qrocode generator", "main": "index.js", "repository": {