kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-02-11 09:11:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Pass the correct URL to Android WebView events

Browse Source 
Summary:
`WebView.getUrl()` doesn't return the correct value in WebView callbacks
(e.g. `onPageFinished`).
For example, when navigating to a URL, we report that loading finished,
but still with the old URL. This diff fixes that.

public

Reviewed By: andreicoman11

Differential Revision: D2769597

fb-gh-sync-id: f14bdd405290469ac0a20d0fb89aa2a27d33e758
This commit is contained in:
Martin Konicek
2015-12-18 03:40:51 -08:00
committed by facebook-github-bot-5
parent 85e8a463f2
commit b436943a27
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
View File

@@ -91,7 +91,7 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
if (!mLastLoadFailed) {
ReactWebView reactWebView = (ReactWebView) webView;
reactWebView.callInjectedJavaScript();
emitFinishEvent(webView);
emitFinishEvent(webView, url);
}
}
@@ -107,7 +107,7 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
new TopLoadingStartEvent(
webView.getId(),
SystemClock.uptimeMillis(),
createWebViewEvent(webView)));
createWebViewEvent(webView, url)));
}
@Override
@@ -120,11 +120,11 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
mLastLoadFailed = true;
// In case of an error JS side expect to get a finish event first, and then get an error event
// Android WebView does it in the oposite way, so we need to simulate that behavior
emitFinishEvent(webView);
// Android WebView does it in the opposite way, so we need to simulate that behavior
emitFinishEvent(webView, failingUrl);
ReactContext reactContext = (ReactContext) ((ReactWebView) webView).getContext();
WritableMap eventData = createWebViewEvent(webView);
WritableMap eventData = createWebViewEvent(webView, failingUrl);
eventData.putDouble("code", errorCode);
eventData.putString("description", description);
@@ -145,10 +145,10 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
new TopLoadingStartEvent(
webView.getId(),
SystemClock.uptimeMillis(),
createWebViewEvent(webView)));
createWebViewEvent(webView, url)));
}
private void emitFinishEvent(WebView webView) {
private void emitFinishEvent(WebView webView, String url) {
ReactContext reactContext = (ReactContext) webView.getContext();
EventDispatcher eventDispatcher =
@@ -157,13 +157,15 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
new TopLoadingFinishEvent(
webView.getId(),
SystemClock.uptimeMillis(),
createWebViewEvent(webView)));
createWebViewEvent(webView, url)));
}
private WritableMap createWebViewEvent(WebView webView) {
private WritableMap createWebViewEvent(WebView webView, String url) {
WritableMap event = Arguments.createMap();
event.putDouble("target", webView.getId());
event.putString("url", webView.getUrl());
// Don't use webView.getUrl() here, the URL isn't updated to the new value yet in callbacks
// like onPageFinished
event.putString("url", url);
event.putBoolean("loading", !mLastLoadFailed && webView.getProgress() != 100);
event.putString("title", webView.getTitle());
event.putBoolean("canGoBack", webView.canGoBack());
@@ -279,7 +281,7 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
public void setUrl(WebView view, @Nullable String url) {
// TODO(8495359): url and html are coupled as they both call loadUrl, therefore in case when
// property url is removed in favor of property html being added in single transaction we may
// end up in a state when blank url is loaded as it depends onthe oreder of update operations!
// end up in a state when blank url is loaded as it depends on the order of update operations!
if (url != null) {
view.loadUrl(url);
} else {