From fc278437e00939258b222eef4d3e2c40890c1164 Mon Sep 17 00:00:00 2001 From: Sunim Acharya Date: Mon, 14 Oct 2019 09:30:46 +0545 Subject: [PATCH 1/5] Fix the Webview for Android --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index 97f3bf63..d6274e03 100644 --- a/package.json +++ b/package.json @@ -61,6 +61,9 @@ "name": "react-native-wkwebview-reborn", "optionalDependencies": {}, "peerDependencies": { + "react": "*", + "react-native": ">= 0.59.0", + "react-native-webview": "^5.4.0", "prop-types": "^15.6.0" }, "pre-push#master": [ From 64efb40d7ece09dd6dfde2b46db7cc63b58e1501 Mon Sep 17 00:00:00 2001 From: Sunim Acharya Date: Mon, 14 Oct 2019 09:34:16 +0545 Subject: [PATCH 2/5] Import from 'react-native-webview' --- WKWebView.android.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WKWebView.android.js b/WKWebView.android.js index 31b329a2..08386f02 100644 --- a/WKWebView.android.js +++ b/WKWebView.android.js @@ -2,6 +2,6 @@ import { WebView, -} from 'react-native'; +} from 'react-native-webview'; export default WebView; From b8cd6b4b0e55747fc8f7d78d6b68f7a4539bd72f Mon Sep 17 00:00:00 2001 From: Sunim Acharya Date: Mon, 14 Oct 2019 09:35:09 +0545 Subject: [PATCH 3/5] Path for react-native-navigation --- ios/RCTWKWebView/CRAWKWebView.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/RCTWKWebView/CRAWKWebView.m b/ios/RCTWKWebView/CRAWKWebView.m index fdc27ce3..74dd2299 100644 --- a/ios/RCTWKWebView/CRAWKWebView.m +++ b/ios/RCTWKWebView/CRAWKWebView.m @@ -14,6 +14,8 @@ #import +NSString *const RCTJSNavigationScheme = @"react-js-navigation"; + // runtime trick to remove WKWebView keyboard default toolbar // see: http://stackoverflow.com/questions/19033292/ios-7-uiwebview-keyboard-issue/19042279#19042279 @interface _SwizzleHelperWK : NSObject @end From 8cfa572758e4f8d33e77001c4d58a66b5512c909 Mon Sep 17 00:00:00 2001 From: Sunim Acharya Date: Mon, 14 Oct 2019 11:08:21 +0545 Subject: [PATCH 4/5] Remove duplicate _SwizzleHelperWK --- ios/RCTWKWebView/CRAWKWebView.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ios/RCTWKWebView/CRAWKWebView.m b/ios/RCTWKWebView/CRAWKWebView.m index 74dd2299..e318131a 100644 --- a/ios/RCTWKWebView/CRAWKWebView.m +++ b/ios/RCTWKWebView/CRAWKWebView.m @@ -19,12 +19,12 @@ // runtime trick to remove WKWebView keyboard default toolbar // see: http://stackoverflow.com/questions/19033292/ios-7-uiwebview-keyboard-issue/19042279#19042279 @interface _SwizzleHelperWK : NSObject @end -@implementation _SwizzleHelperWK --(id)inputAccessoryView -{ - return nil; -} -@end +// @implementation _SwizzleHelperWK +// -(id)inputAccessoryView +// { +// return nil; +// } +// @end @interface CRAWKWebView () From a0bd1f25bc654fbff896069982e78a00df9f51ef Mon Sep 17 00:00:00 2001 From: Sunim Acharya Date: Mon, 14 Oct 2019 11:32:35 +0545 Subject: [PATCH 5/5] Update Readme for Rn@0.60 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2c015b10..89fda87b 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ React Native comes with [WebView](http://facebook.github.io/react-native/docs/we ### Install -1. Install from npm (note the postfix in the package name): `npm install react-native-wkwebview-reborn` -2. run `react-native link react-native-wkwebview-reborn` +1. Install from npm (note the postfix in the package name): `npm install react-native-wkwebview-reborn react-native-webview` +2. run `cd ios && pod install` **Manual alternative**