Merge branch 'master' into docs/nav-state-changes

.gitignore

@@ -48,3 +48,7 @@ bundles/
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+
+android/gradle
+android/gradlew
+android/gradlew.bat

README.md

@@ -8,6 +8,8 @@
 - [x] Android
 - [ ] Windows 10 (coming soon)
 
+_Note: React Native WebView is not currently supported by Expo unless you "eject"._
+
 ## Versioning
 
 If you need the exact same WebView as the one from react-native, please use version **2.0.0**. Future versions will follow [semantic versioning](https://semver.org/).
@@ -26,30 +28,34 @@ Read our [Getting Started Guide](./docs/Getting-Started.md) for more.
 Import the `WebView` component from `react-native-webview` and use it like so:
 
 ```jsx
-import React, { Component } from 'react';
-import { StyleSheet, Text, View } from 'react-native';
-import { WebView } from 'react-native-webview';
+import React, { Component } from "react";
+import { StyleSheet, Text, View } from "react-native";
+import { WebView } from "react-native-webview";
 
 // ...
 class MyWebComponent extends Component {
   render() {
     return (
       <WebView
-        source={{ uri: 'https://infinite.red/react-native' }}
+        source={{ uri: "https://infinite.red/react-native" }}
         style={{ marginTop: 20 }}
-        onLoadProgress={e=>console.log(e.nativeEvent.progress)}
+        onLoadProgress={e => console.log(e.nativeEvent.progress)}
       />
     );
   }
 }
 ```
 
-For more, read the [API Reference](./docs/Reference.md) and [Guide](./docs/Guide.md).
+For more, read the [API Reference](./docs/Reference.md) and [Guide](./docs/Guide.md). If you're interested in contributing, check out the [Contributing Guide](./docs/Contributing.md).
 
 ## Migrate from React Native core WebView to React Native WebView
 
 Simply install React Native WebView and then use it in place of the core WebView. Their APIs are currently identical, except that this package defaults `useWebKit={true}` unlike the built-in WebView.
 
+## Troubleshooting
+
+- If you're getting `Invariant Violation: Native component for "RNCWKWebView does not exist"` it likely means you forgot to run `react-native link` or there was some error with the linking process
+
 ### Contributor Notes
 
 - I've removed all PropTypes for now. Instead, we'll be using Flow types. TypeScript types will be added at a later date.
@@ -65,6 +71,7 @@ Simply install React Native WebView and then use it in place of the core WebView
 
 - [Jamon Holmgren](https://github.com/jamonholmgren) ([Twitter @jamonholmgren](https://twitter.com/jamonholmgren)) from [Infinite Red](https://infinite.red/react-native)
 - [Thibault Malbranche](https://github.com/Titozzz) ([Twitter @titozzz](https://twitter.com/titozzz)) from [Brigad](https://brigad.co/about)
+- [Empyrical](https://github.com/empyrical) ([Twitter @empyrical](https://twitter.com/empyrical))
 
 ## License
 

android/build.gradle

@@ -1,22 +1,91 @@
+buildscript {
+    ext.kotlin_version = '1.2.71'
+    repositories {
+        google()
+        jcenter()
+        maven {
+            url 'https://maven.fabric.io/public'
+        }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
-def DEFAULT_COMPILE_SDK_VERSION             = 27
-def DEFAULT_BUILD_TOOLS_VERSION             = "27.0.3"
-def DEFAULT_MIN_SDK_VERSION                 = 16
-def DEFAULT_TARGET_SDK_VERSION              = 26
 
-android {
-    compileSdkVersion rootProject.findProperty('compileSdkVersion') ?: DEFAULT_COMPILE_SDK_VERSION
-    buildToolsVersion rootProject.findProperty('buildToolsVersion') ?: DEFAULT_BUILD_TOOLS_VERSION
+def DEFAULT_COMPILE_SDK_VERSION = 27
+def DEFAULT_BUILD_TOOLS_VERSION = "28.0.3"
+def DEFAULT_TARGET_SDK_VERSION = 27
 
+android {
+    compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
+    buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
     defaultConfig {
-        minSdkVersion rootProject.findProperty('minSdkVersion') ?: DEFAULT_MIN_SDK_VERSION
-        targetSdkVersion rootProject.findProperty('targetSdkVersion') ?: DEFAULT_TARGET_SDK_VERSION
+        minSdkVersion 16
+        targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
         versionCode 1
         versionName "1.0"
     }
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    productFlavors {
+    }
+    lintOptions {
+        disable 'GradleCompatible'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+repositories {
+    mavenCentral()
+    maven {
+        url 'https://maven.google.com/'
+        name 'Google'
+    }
+
+    // Stolen from react-native-firebase, thanks dudes!
+    def found = false
+    def parentDir = rootProject.projectDir
+    def reactNativeAndroidName = 'React Native (Node Modules)'
+
+    1.upto(4, {
+        if (found) return true
+        parentDir = parentDir.parentFile
+        def reactNativeAndroid = new File(
+                parentDir,
+                'node_modules/react-native/android'
+        )
+
+        if (reactNativeAndroid.exists()) {
+            maven {
+                url reactNativeAndroid.toString()
+                name reactNativeAndroidName
+            }
+
+            println "${project.name}: using React Native sources from ${reactNativeAndroid.toString()}"
+            found = true
+        }
+    })
+
+    if (!found) {
+        throw new GradleException(
+                "${project.name}: unable to locate React Native Android sources, " +
+                        "ensure you have you installed React Native as a dependency and try again."
+        )
+    }
 }
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java

@@ -56,12 +56,6 @@ import com.reactnativecommunity.webview.events.TopLoadingFinishEvent;
 import com.reactnativecommunity.webview.events.TopLoadingStartEvent;
 import com.reactnativecommunity.webview.events.TopMessageEvent;
 import com.reactnativecommunity.webview.events.TopLoadingProgressEvent;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import javax.annotation.Nullable;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -510,6 +504,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     }
   }
 
+  @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
   @ReactProp(name = "mediaPlaybackRequiresUserAction")
   public void setMediaPlaybackRequiresUserAction(WebView view, boolean requires) {
     view.getSettings().setMediaPlaybackRequiresUserGesture(requires);

android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingErrorEvent.java

@@ -1,40 +0,0 @@
-package com.reactnativecommunity.webview.events;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-/**
- * Event emitted when there is an error in loading.
- */
-public class TopLoadingErrorEvent extends Event<TopLoadingErrorEvent> {
-
-  public static final String EVENT_NAME = "topLoadingError";
-  private WritableMap mEventData;
-
-  public TopLoadingErrorEvent(int viewId, WritableMap eventData) {
-    super(viewId);
-    mEventData = eventData;
-  }
-
-  @Override
-  public String getEventName() {
-    return EVENT_NAME;
-  }
-
-  @Override
-  public boolean canCoalesce() {
-    return false;
-  }
-
-  @Override
-  public short getCoalescingKey() {
-    // All events for a given view can be coalesced.
-    return 0;
-  }
-
-  @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), mEventData);
-  }
-}

android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingErrorEvent.kt

@@ -0,0 +1,25 @@
+package com.reactnativecommunity.webview.events
+
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+/**
+ * Event emitted when there is an error in loading.
+ */
+class TopLoadingErrorEvent(viewId: Int, private val mEventData: WritableMap) :
+    Event<TopLoadingErrorEvent>(viewId) {
+    companion object {
+        const val EVENT_NAME = "topLoadingError"
+    }
+
+    override fun getEventName(): String = EVENT_NAME
+
+    override fun canCoalesce(): Boolean = false
+
+    override fun getCoalescingKey(): Short = 0
+
+    override fun dispatch(rctEventEmitter: RCTEventEmitter) =
+        rctEventEmitter.receiveEvent(viewTag, eventName, mEventData)
+
+}

android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingFinishEvent.java

@@ -1,40 +0,0 @@
-package com.reactnativecommunity.webview.events;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-/**
- * Event emitted when loading is completed.
- */
-public class TopLoadingFinishEvent extends Event<TopLoadingFinishEvent> {
-
-  public static final String EVENT_NAME = "topLoadingFinish";
-  private WritableMap mEventData;
-
-  public TopLoadingFinishEvent(int viewId, WritableMap eventData) {
-    super(viewId);
-    mEventData = eventData;
-  }
-
-  @Override
-  public String getEventName() {
-    return EVENT_NAME;
-  }
-
-  @Override
-  public boolean canCoalesce() {
-    return false;
-  }
-
-  @Override
-  public short getCoalescingKey() {
-    // All events for a given view can be coalesced.
-    return 0;
-  }
-
-  @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), mEventData);
-  }
-}

android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingFinishEvent.kt

@@ -0,0 +1,24 @@
+package com.reactnativecommunity.webview.events
+
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+/**
+ * Event emitted when loading is completed.
+ */
+class TopLoadingFinishEvent(viewId: Int, private val mEventData: WritableMap) :
+    Event<TopLoadingFinishEvent>(viewId) {
+    companion object {
+        const val EVENT_NAME = "topLoadingFinish"
+    }
+
+    override fun getEventName(): String = EVENT_NAME
+
+    override fun canCoalesce(): Boolean = false
+
+    override fun getCoalescingKey(): Short = 0
+
+    override fun dispatch(rctEventEmitter: RCTEventEmitter) =
+        rctEventEmitter.receiveEvent(viewTag, eventName, mEventData)
+}

android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingProgressEvent.java

@@ -1,36 +0,0 @@
-package com.reactnativecommunity.webview.events;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-public class TopLoadingProgressEvent extends Event<TopLoadingProgressEvent> {
-    public static final String EVENT_NAME = "topLoadingProgress";
-    private WritableMap mEventData;
-
-    public TopLoadingProgressEvent(int viewId, WritableMap eventData) {
-        super(viewId);
-        mEventData = eventData;
-    }
-
-    @Override
-    public String getEventName() {
-        return EVENT_NAME;
-    }
-
-    @Override
-    public boolean canCoalesce() {
-        return false;
-    }
-
-    @Override
-    public short getCoalescingKey() {
-        // All events for a given view can be coalesced.
-        return 0;
-    }
-
-    @Override
-    public void dispatch(RCTEventEmitter rctEventEmitter) {
-        rctEventEmitter.receiveEvent(getViewTag(), getEventName(), mEventData);
-    }
-}

android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingProgressEvent.kt

@@ -0,0 +1,24 @@
+package com.reactnativecommunity.webview.events
+
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+/**
+ * Event emitted when there is a loading progress event.
+ */
+class TopLoadingProgressEvent(viewId: Int, private val mEventData: WritableMap) :
+    Event<TopLoadingProgressEvent>(viewId) {
+    companion object {
+        const val EVENT_NAME = "topLoadingProgress"
+    }
+
+    override fun getEventName(): String = EVENT_NAME
+
+    override fun canCoalesce(): Boolean = false
+
+    override fun getCoalescingKey(): Short = 0
+
+    override fun dispatch(rctEventEmitter: RCTEventEmitter) =
+        rctEventEmitter.receiveEvent(viewTag, eventName, mEventData)
+}

android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingStartEvent.java

@@ -1,40 +0,0 @@
-package com.reactnativecommunity.webview.events;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-/**
- * Event emitted when loading has started
- */
-public class TopLoadingStartEvent extends Event<TopLoadingStartEvent> {
-
-  public static final String EVENT_NAME = "topLoadingStart";
-  private WritableMap mEventData;
-
-  public TopLoadingStartEvent(int viewId, WritableMap eventData) {
-    super(viewId);
-    mEventData = eventData;
-  }
-
-  @Override
-  public String getEventName() {
-    return EVENT_NAME;
-  }
-
-  @Override
-  public boolean canCoalesce() {
-    return false;
-  }
-
-  @Override
-  public short getCoalescingKey() {
-    // All events for a given view can be coalesced.
-    return 0;
-  }
-
-  @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), mEventData);
-  }
-}

android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingStartEvent.kt

@@ -0,0 +1,25 @@
+package com.reactnativecommunity.webview.events
+
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+/**
+ * Event emitted when loading has started
+ */
+class TopLoadingStartEvent(viewId: Int, private val mEventData: WritableMap) :
+    Event<TopLoadingStartEvent>(viewId) {
+    companion object {
+        const val EVENT_NAME = "topLoadingStart"
+    }
+
+    override fun getEventName(): String = EVENT_NAME
+
+    override fun canCoalesce(): Boolean = false
+
+    override fun getCoalescingKey(): Short = 0
+
+    override fun dispatch(rctEventEmitter: RCTEventEmitter) =
+        rctEventEmitter.receiveEvent(viewTag, eventName, mEventData)
+
+}

android/src/main/java/com/reactnativecommunity/webview/events/TopMessageEvent.java

@@ -1,43 +0,0 @@
-package com.reactnativecommunity.webview.events;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-/**
- * Event emitted when there is an error in loading.
- */
-public class TopMessageEvent extends Event<TopMessageEvent> {
-
-  public static final String EVENT_NAME = "topMessage";
-  private final String mData;
-
-  public TopMessageEvent(int viewId, String data) {
-    super(viewId);
-    mData = data;
-  }
-
-  @Override
-  public String getEventName() {
-    return EVENT_NAME;
-  }
-
-  @Override
-  public boolean canCoalesce() {
-    return false;
-  }
-
-  @Override
-  public short getCoalescingKey() {
-    // All events for a given view can be coalesced.
-    return 0;
-  }
-
-  @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    WritableMap data = Arguments.createMap();
-    data.putString("data", mData);
-    rctEventEmitter.receiveEvent(getViewTag(), EVENT_NAME, data);
-  }
-}

android/src/main/java/com/reactnativecommunity/webview/events/TopMessageEvent.kt

@@ -0,0 +1,26 @@
+package com.reactnativecommunity.webview.events
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+/**
+ * Event emitted when there is an error in loading.
+ */
+class TopMessageEvent(viewId: Int, private val mData: String) : Event<TopMessageEvent>(viewId) {
+    companion object {
+        const val EVENT_NAME = "topMessage"
+    }
+
+    override fun getEventName(): String = EVENT_NAME
+
+    override fun canCoalesce(): Boolean = false
+
+    override fun getCoalescingKey(): Short = 0
+
+    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
+        val data = Arguments.createMap()
+        data.putString("data", mData)
+        rctEventEmitter.receiveEvent(viewTag, EVENT_NAME, data)
+    }
+}

docs/Contributing.md

@@ -0,0 +1,54 @@
+# Contributing to React Native WebView
+
+First off, _thank you_ for considering contributing to the React Native Community. The community-supported packages are only possible because of amazing people like you.
+
+Secondly, we'd like the contribution experience to be as good as possible. While we are a small all-volunteer team, we are happy to hear feedback about your experience, and if we can make the docs or experience better please let us know.
+
+## How to test changes
+
+After you fork the repo, clone it to your machine, and make your changes, you'll want to test them in an app.
+
+In a new `react-native init` project, do this:
+
+```
+$ yarn add ../react-native-webview
+$ react-native link react-native-webview
+```
+
+You may run into a problem where the `jest-haste-map` module map says react-native was added twice:
+
+```
+Loading dependency graph...(node:32651) UnhandledPromiseRejectionWarning: Error: jest-haste-map: Haste module naming collision:
+  Duplicate module name: react-native
+  Paths: /Users/myuser/TestApp/node_modules/react-native/package.json collides with /Users/myuser/TestApp/node_modules/react-native-webview/node_modules/react-native/package.json
+```
+
+Just remove the second path like this:
+
+```
+$ rm -rf ./node_modules/react-native-webview/node_modules/react-native
+```
+
+And then re-run the packager:
+
+```
+$ react-native start --reset-cache
+```
+
+When you make a change, you'll probably need to unlink, remove, re-add, and re-link `react-native-webview`:
+
+```
+$ react-native unlink react-native-webview && yarn remove react-native-webview
+$ yarn add ../react-native-webview && react-native link react-native-webview
+```
+
+## Notes
+
+- We use Flow types. TypeScript types will probably be added at a later date.
+- We don't intend to support UIWebView and will remove it soon.
+- After pulling this repo and installing all dependencies, you can run flow on iOS and Android-specific files using the commands:
+  - `yarn test:ios:flow` for iOS
+  - `yarn test:android:flow` for Android
+- If you want to add another React Native platform to this repository, you will need to create another `.flowconfig` for it. If your platform is `example`, copy the main flowconfig and rename it to `.flowconfig.example`. Then edit the config to ignore other platforms, and add `.*/*[.]example.js` to the ignore lists of the other platforms. Then add an entry to `package.json` like this:
+  - `"test:example:flow": "flow check --flowconfig-name .flowconfig.example"`
+- Currently you need to install React Native 0.57 to be able to test these types - `flow check` will not pass against 0.56.

docs/Reference.md

@@ -44,6 +44,8 @@ This document lays out the current public properties and methods for the React N
 - [`html`](Reference.md#html)
 - [`hideKeyboardAccessoryView`](Reference.md#hidekeyboardaccessoryview)
 - [`allowsBackForwardNavigationGestures`](Reference.md#allowsbackforwardnavigationgestures)
+- [`allowFileAccess`](Reference.md#allowFileAccess)
+- [`saveFormDataDisabled`](Reference.md#saveFormDataDisabled)
 
 ## Methods Index
 
@@ -108,7 +110,7 @@ Set this to provide JavaScript that will be injected into the web page when the
 
 ### `mediaPlaybackRequiresUserAction`
 
-Boolean that determines whether HTML5 audio and video requires the user to tap them before they start playing. The default value is `true`.
+Boolean that determines whether HTML5 audio and video requires the user to tap them before they start playing. The default value is `true`. (Android API minimum version 17)
 
 | Type | Required |
 | ---- | -------- |
@@ -495,6 +497,25 @@ If true, this will be able horizontal swipe gestures when using the WKWebView. T
 | ------- | -------- | -------- |
 | boolean | No       | iOS      |
 
+---
+
+### `allowFileAccess`
+
+If true, this will allow access to the file system via `file://` URI's. The default value is `false`.
+
+| Type    | Required | Platform |
+| ------- | -------- | -------- |
+| boolean | No       | Android  |
+
+---
+
+### `saveFormDataDisabled`
+
+Sets whether the WebView should disable saving form data. The default value is `false`. This function does not have any effect from Android API level 26 onwards as there is an Autofill feature which stores form data.
+
+| Type    | Required | Platform |
+| ------- | -------- | -------- |
+| boolean | No       | Android  |
 
 ## Methods
 
@@ -539,7 +560,7 @@ Stop loading the current page.
 ### `injectJavaScript(str)`
 
 ```javascript
-injectJavaScript("... javascript string ...");
+injectJavaScript('... javascript string ...');
 ```
 
 Executes the JavaScript string.

ios/RNCWKWebView.m

@@ -11,6 +11,7 @@
 
 #import "objc/runtime.h"
 
+static NSTimer *keyboardTimer;
 static NSString *const MessageHanderName = @"ReactNative";
 
 // runtime trick to remove WKWebView keyboard default toolbar
@@ -74,6 +75,19 @@ static NSString *const MessageHanderName = @"ReactNative";
     _automaticallyAdjustContentInsets = YES;
     _contentInset = UIEdgeInsetsZero;
   }
+    
+  // Workaround for a keyboard dismissal bug present in iOS 12
+  // https://openradar.appspot.com/radar?id=5018321736957952
+  if (@available(iOS 12.0, *)) {
+    [[NSNotificationCenter defaultCenter]
+      addObserver:self
+      selector:@selector(keyboardWillHide)
+      name:UIKeyboardWillHideNotification object:nil];
+    [[NSNotificationCenter defaultCenter]
+      addObserver:self
+      selector:@selector(keyboardWillShow)
+      name:UIKeyboardWillShowNotification object:nil];
+  }
   return self;
 }
 
@@ -92,7 +106,9 @@ static NSString *const MessageHanderName = @"ReactNative";
     wkWebViewConfig.mediaTypesRequiringUserActionForPlayback = _mediaPlaybackRequiresUserAction
       ? WKAudiovisualMediaTypeAll
       : WKAudiovisualMediaTypeNone;
-   wkWebViewConfig.dataDetectorTypes = _dataDetectorTypes;
+    wkWebViewConfig.dataDetectorTypes = _dataDetectorTypes;
+#else
+    wkWebViewConfig.mediaPlaybackRequiresUserAction = _mediaPlaybackRequiresUserAction;
 #endif
 
     _webView = [[WKWebView alloc] initWithFrame:self.bounds configuration: wkWebViewConfig];
@@ -120,6 +136,25 @@ static NSString *const MessageHanderName = @"ReactNative";
   }
 }
 
+-(void)keyboardWillHide
+{
+    keyboardTimer = [NSTimer scheduledTimerWithTimeInterval:0 target:self selector:@selector(keyboardDisplacementFix) userInfo:nil repeats:false];
+    [[NSRunLoop mainRunLoop] addTimer:keyboardTimer forMode:NSRunLoopCommonModes];
+}
+-(void)keyboardWillShow
+{
+    if (keyboardTimer != nil) {
+        [keyboardTimer invalidate];
+    }
+}
+-(void)keyboardDisplacementFix
+{
+    // https://stackoverflow.com/a/9637807/824966
+    [UIView animateWithDuration:.25 animations:^{
+        self.webView.scrollView.contentOffset = CGPointMake(0, 0);
+    }];
+}
+
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
     if ([keyPath isEqual:@"estimatedProgress"] && object == self.webView) {
         if(_onLoadingProgress){
@@ -216,7 +251,7 @@ static NSString *const MessageHanderName = @"ReactNative";
 
 -(void)setHideKeyboardAccessoryView:(BOOL)hideKeyboardAccessoryView
 {
-    
+
     if (_webView == nil) {
         _savedHideKeyboardAccessoryView = hideKeyboardAccessoryView;
         return;
@@ -225,29 +260,29 @@ static NSString *const MessageHanderName = @"ReactNative";
     if (_savedHideKeyboardAccessoryView == false) {
         return;
     }
-    
+
     UIView* subview;
     for (UIView* view in _webView.scrollView.subviews) {
         if([[view.class description] hasPrefix:@"WK"])
             subview = view;
     }
-    
+
     if(subview == nil) return;
-    
+
     NSString* name = [NSString stringWithFormat:@"%@_SwizzleHelperWK", subview.class.superclass];
     Class newClass = NSClassFromString(name);
-    
+
     if(newClass == nil)
     {
         newClass = objc_allocateClassPair(subview.class, [name cStringUsingEncoding:NSASCIIStringEncoding], 0);
         if(!newClass) return;
-        
+
         Method method = class_getInstanceMethod([_SwizzleHelperWK class], @selector(inputAccessoryView));
         class_addMethod(newClass, @selector(inputAccessoryView), method_getImplementation(method), method_getTypeEncoding(method));
-        
+
         objc_registerClassPair(newClass);
     }
-    
+
     object_setClass(subview, newClass);
 }
 

package.json

@@ -8,7 +8,7 @@
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
   ],
   "license": "MIT",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "homepage": "https://github.com/react-native-community/react-native-webview#readme",
   "scripts": {
     "test:ios:flow": "flow check",