status-im/react-native-webview-bridge
2
0
Fork 0
mirror of https://github.com/status-im/react-native-webview-bridge.git synced 2025-02-22 12:08:07 +00:00
Code Issues Projects Releases Wiki Activity

Fixes for react-native 0.49 (#8)

Browse Source 
* remove override depreacted in react-native 0.47

* fix weaker access priviledges on dispatchEvent method

* fix prop-types and create-class
This commit is contained in:
Eric Dvorsak 2017-11-15 11:04:24 +01:00 committed by Roman Volosovskyi
parent 68fad86e4f
commit 5ac2043b14
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/src/main/java/com/github/alinz/reactnativewebviewbridge/WebViewBridgeManager.java
View File

@ -500,7 +500,7 @@ public class WebViewBridgeManager extends ReactWebViewManager {
((ReactWebView) webView).cleanupCallbacksAndDestroy();
}
private static void dispatchEvent(WebView webView, Event event) {
protected static void dispatchEvent(WebView webView, Event event) {
ReactContext reactContext = (ReactContext) webView.getContext();
EventDispatcher eventDispatcher =
reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();

1
android/src/main/java/com/github/alinz/reactnativewebviewbridge/WebViewBridgePackage.java
View File

@ -33,7 +33,6 @@ public class WebViewBridgePackage implements ReactPackage {
);
}
@Override
public List<Class<? extends JavaScriptModule>> createJSModules() {
return Arrays.asList();
}

6
webview-bridge/index.android.js
View File

@ -18,6 +18,7 @@ var ReactNative = require('react-native');
var invariant = require('invariant');
var keyMirror = require('keymirror');
var resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource');
var createReactClass = require('create-react-class');
var {
ReactNativeViewAttributes,
@ -33,7 +34,8 @@ var {
WebViewBridgeManager
}
} = ReactNative;
var { PropTypes } = React;
var PropTypes = require('prop-types');
var RCT_WEBVIEWBRIDGE_REF = 'webviewbridge';
@ -48,7 +50,7 @@ var RCTWebViewBridge = requireNativeComponent('RCTWebViewBridge', WebViewBridge)
/**
* Renders a native WebView.
*/
var WebViewBridge = React.createClass({
var WebViewBridge = createReactClass({
propTypes: {
...RCTWebViewBridge.propTypes,

10
webview-bridge/index.ios.js
View File

@ -1,8 +1,6 @@
'use strict';
import React, {
PropTypes
} from 'react';
import React from 'react';
import ReactNative, {
requireNativeComponent,
EdgeInsetsPropType,
@ -13,6 +11,10 @@ import ReactNative, {
Text,
ActivityIndicatorIOS
} from 'react-native';
var createReactClass = require('create-react-class');
var PropTypes = require('prop-types');
import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
import deprecatedPropType from 'react-native/Libraries/Utilities/deprecatedPropType';
import invariant from 'fbjs/lib/invariant';
@ -73,7 +75,7 @@ var defaultRenderError = (errorDomain, errorCode, errorDesc) => (
* Renders a native WebView.
*/
var WKWebView = React.createClass({
var WKWebView = createReactClass({
statics: {
JSNavigationScheme: JSNavigationScheme,
NavigationType: NavigationType,