diff --git a/App.js b/App.js index 19cf752..f6492f8 100644 --- a/App.js +++ b/App.js @@ -8,16 +8,8 @@ // External dependencies import React from 'react'; -import { - Alert, - BackHandler, - Linking, - Platform, - StatusBar, - StyleSheet, - View, - WebView, -} from 'react-native'; +import { Alert, BackHandler, Linking, Platform, StatusBar, StyleSheet, View } from 'react-native'; +import { WebView } from 'react-native-webview'; import Constants from 'expo-constants'; import { Notifications } from 'expo'; @@ -276,12 +268,12 @@ export default class App extends React.Component { console.log('handleLoadEnd'); this.webView.injectJavaScript( // This is needed because we want to subscribe notifications only - // if user is authenticated window.postMessage accepts one - // argument, data, which will be available on the event object, - // event.nativeEvent.data. data must be a string. + // if user is authenticated window.ReactNativeWebView.postMessage + // accepts one argument, data, which will be available on the event + // object, event.nativeEvent.data. data must be a string. ` - if (window.user && window.user._id && typeof window.postMessage === 'function') { - window.postMessage('{ "action": "authenticated" }'); + if (window.user && window.user._id && typeof window.ReactNativeWebView.postMessage === 'function') { + window.ReactNativeWebView.postMessage('{ "action": "authenticated" }'); } ${this.appInfoJavaScript} ` diff --git a/package-lock.json b/package-lock.json index 3e7ecd3..40c3fca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3155,6 +3155,17 @@ "unimodules-permissions-interface": "~2.0.1", "unimodules-sensors-interface": "~2.0.1", "uuid-js": "^0.7.5" + }, + "dependencies": { + "react-native-webview": { + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-5.8.1.tgz", + "integrity": "sha512-b6pSvmjoiWtcz6YspggW02X+BRXJWuquHwkh37BRx1NMW1iwMZA31SnFQvTpPzWYYIb9WF/mRsy2nGtt9C6NIg==", + "requires": { + "escape-string-regexp": "1.0.5", + "invariant": "2.2.4" + } + } } }, "expo-ads-admob": { @@ -6639,9 +6650,9 @@ } }, "react-native-webview": { - "version": "5.8.1", - "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-5.8.1.tgz", - "integrity": "sha512-b6pSvmjoiWtcz6YspggW02X+BRXJWuquHwkh37BRx1NMW1iwMZA31SnFQvTpPzWYYIb9WF/mRsy2nGtt9C6NIg==", + "version": "5.8.2", + "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-5.8.2.tgz", + "integrity": "sha512-WvB5vH3xaxwXbk0RFGDIkM+MEeMfrfkhXdgYW1qj/xUuioeH5lduCpR+sID8+OR35zx+pBuamQ9jSlRGuREJrw==", "requires": { "escape-string-regexp": "1.0.5", "invariant": "2.2.4" diff --git a/package.json b/package.json index f67191b..f4289b3 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,8 @@ "react": "16.8.3", "react-dom": "^16.8.6", "react-native": "https://github.com/expo/react-native/archive/sdk-33.0.0.tar.gz", - "react-native-web": "^0.11.4" + "react-native-web": "^0.11.4", + "react-native-webview": "^5.8.2" }, "devDependencies": { "babel-preset-expo": "^5.1.1",