From 93bbc6482d8132def654ba6f32e1a1ac01a2d69c Mon Sep 17 00:00:00 2001
From: Rui Chen <halfjuice@fb.com>
Date: Wed, 22 Jul 2015 15:09:43 -0700
Subject: [PATCH] Unbreak the dismissing keyboard behavior on Android

---
 Libraries/Components/ScrollResponder.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Libraries/Components/ScrollResponder.js b/Libraries/Components/ScrollResponder.js
index 168cb36fa..ab03e55fb 100644
--- a/Libraries/Components/ScrollResponder.js
+++ b/Libraries/Components/ScrollResponder.js
@@ -470,7 +470,11 @@ var ScrollResponderMixin = {
   },
 
   scrollResponderKeyboardDidShow: function(e: Event) {
-    this.keyboardWillOpenTo = null;
+    // TODO(7693961): The event for DidShow is not available on iOS yet.
+    // Use the one from WillShow and do not assign.
+    if (e) {
+      this.keyboardWillOpenTo = e;
+    }
     this.props.onKeyboardDidShow && this.props.onKeyboardDidShow(e);
   },