mirror of
https://github.com/status-im/react-native-webview-bridge.git
synced 2025-02-23 04:28:06 +00:00
Fixes for react-native 0.49 (#8)
* 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:
parent
68fad86e4f
commit
5ac2043b14
@ -500,7 +500,7 @@ public class WebViewBridgeManager extends ReactWebViewManager {
|
|||||||
((ReactWebView) webView).cleanupCallbacksAndDestroy();
|
((ReactWebView) webView).cleanupCallbacksAndDestroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void dispatchEvent(WebView webView, Event event) {
|
protected static void dispatchEvent(WebView webView, Event event) {
|
||||||
ReactContext reactContext = (ReactContext) webView.getContext();
|
ReactContext reactContext = (ReactContext) webView.getContext();
|
||||||
EventDispatcher eventDispatcher =
|
EventDispatcher eventDispatcher =
|
||||||
reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
|
reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
|
||||||
|
@ -33,7 +33,6 @@ public class WebViewBridgePackage implements ReactPackage {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<Class<? extends JavaScriptModule>> createJSModules() {
|
public List<Class<? extends JavaScriptModule>> createJSModules() {
|
||||||
return Arrays.asList();
|
return Arrays.asList();
|
||||||
}
|
}
|
||||||
|
@ -18,6 +18,7 @@ var ReactNative = require('react-native');
|
|||||||
var invariant = require('invariant');
|
var invariant = require('invariant');
|
||||||
var keyMirror = require('keymirror');
|
var keyMirror = require('keymirror');
|
||||||
var resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource');
|
var resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource');
|
||||||
|
var createReactClass = require('create-react-class');
|
||||||
|
|
||||||
var {
|
var {
|
||||||
ReactNativeViewAttributes,
|
ReactNativeViewAttributes,
|
||||||
@ -33,7 +34,8 @@ var {
|
|||||||
WebViewBridgeManager
|
WebViewBridgeManager
|
||||||
}
|
}
|
||||||
} = ReactNative;
|
} = ReactNative;
|
||||||
var { PropTypes } = React;
|
|
||||||
|
var PropTypes = require('prop-types');
|
||||||
|
|
||||||
var RCT_WEBVIEWBRIDGE_REF = 'webviewbridge';
|
var RCT_WEBVIEWBRIDGE_REF = 'webviewbridge';
|
||||||
|
|
||||||
@ -48,7 +50,7 @@ var RCTWebViewBridge = requireNativeComponent('RCTWebViewBridge', WebViewBridge)
|
|||||||
/**
|
/**
|
||||||
* Renders a native WebView.
|
* Renders a native WebView.
|
||||||
*/
|
*/
|
||||||
var WebViewBridge = React.createClass({
|
var WebViewBridge = createReactClass({
|
||||||
|
|
||||||
propTypes: {
|
propTypes: {
|
||||||
...RCTWebViewBridge.propTypes,
|
...RCTWebViewBridge.propTypes,
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import React, {
|
import React from 'react';
|
||||||
PropTypes
|
|
||||||
} from 'react';
|
|
||||||
import ReactNative, {
|
import ReactNative, {
|
||||||
requireNativeComponent,
|
requireNativeComponent,
|
||||||
EdgeInsetsPropType,
|
EdgeInsetsPropType,
|
||||||
@ -13,6 +11,10 @@ import ReactNative, {
|
|||||||
Text,
|
Text,
|
||||||
ActivityIndicatorIOS
|
ActivityIndicatorIOS
|
||||||
} from 'react-native';
|
} from 'react-native';
|
||||||
|
|
||||||
|
var createReactClass = require('create-react-class');
|
||||||
|
var PropTypes = require('prop-types');
|
||||||
|
|
||||||
import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
|
import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
|
||||||
import deprecatedPropType from 'react-native/Libraries/Utilities/deprecatedPropType';
|
import deprecatedPropType from 'react-native/Libraries/Utilities/deprecatedPropType';
|
||||||
import invariant from 'fbjs/lib/invariant';
|
import invariant from 'fbjs/lib/invariant';
|
||||||
@ -73,7 +75,7 @@ var defaultRenderError = (errorDomain, errorCode, errorDesc) => (
|
|||||||
* Renders a native WebView.
|
* Renders a native WebView.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var WKWebView = React.createClass({
|
var WKWebView = createReactClass({
|
||||||
statics: {
|
statics: {
|
||||||
JSNavigationScheme: JSNavigationScheme,
|
JSNavigationScheme: JSNavigationScheme,
|
||||||
NavigationType: NavigationType,
|
NavigationType: NavigationType,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user