From 0dd4899789dbc26785423927febb00cddb05ee88 Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Mon, 5 Nov 2018 17:02:54 -0200
Subject: [PATCH] [FIX] Dismiss keyboard on room close (#530)

---
 app/views/RoomView/index.js      |  3 ++-
 app/views/RoomsListView/index.js |  5 +++--
 package-lock.json                | 21 +++++++++++----------
 package.json                     |  2 +-
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/views/RoomView/index.js b/app/views/RoomView/index.js
index ac66983d..0ee080d8 100644
--- a/app/views/RoomView/index.js
+++ b/app/views/RoomView/index.js
@@ -67,7 +67,8 @@ export default class RoomView extends LoggedView {
 					testID: 'room-view-header-star',
 					icon: iconsMap.starOutline
 				}]
-			}
+			},
+			blurOnUnmount: true
 		};
 	}
 
diff --git a/app/views/RoomsListView/index.js b/app/views/RoomsListView/index.js
index 244b72c1..04dda44a 100644
--- a/app/views/RoomsListView/index.js
+++ b/app/views/RoomsListView/index.js
@@ -90,7 +90,8 @@ export default class RoomsListView extends LoggedView {
 				right: {
 					enabled: true
 				}
-			}
+			},
+			blurOnUnmount: true
 		};
 	}
 
@@ -379,6 +380,7 @@ export default class RoomsListView extends LoggedView {
 	}
 
 	goRoom = (rid) => {
+		this.cancelSearchingAndroid();
 		Navigation.push('RoomsListView', {
 			component: {
 				name: 'RoomView',
@@ -387,7 +389,6 @@ export default class RoomsListView extends LoggedView {
 				}
 			}
 		});
-		this.cancelSearchingAndroid();
 	}
 
 	_onPressItem = async(item = {}) => {
diff --git a/package-lock.json b/package-lock.json
index 625fc665..b1f64825 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17316,28 +17316,29 @@
       }
     },
     "react-native-navigation": {
-      "version": "2.0.2588",
-      "resolved": "https://registry.npmjs.org/react-native-navigation/-/react-native-navigation-2.0.2588.tgz",
-      "integrity": "sha512-ljVz3RWNv8Cj2vRcedkWAUuMbDac9ZduBRgYPCQ3GXFVhmpthLSaZLWuMfqqkpznHyPGy0kwEG+XX6Z93cqemw==",
+      "version": "2.0.2641",
+      "resolved": "https://registry.npmjs.org/react-native-navigation/-/react-native-navigation-2.0.2641.tgz",
+      "integrity": "sha512-Pk8SUV0Fh8gev7/axDXjp0BcjliS+LnJy3QDfNtqeNgLd3P3Ht+08dOLvzGoTAJ7BYYDlXpxxM3TqT1yNrLKrA==",
       "requires": {
         "hoist-non-react-statics": "3.x.x",
         "lodash": "4.x.x",
         "prop-types": "15.x.x",
-        "react-lifecycles-compat": "2.0.0"
+        "react-lifecycles-compat": "2.0.0",
+        "tslib": "1.9.3"
       },
       "dependencies": {
         "hoist-non-react-statics": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.0.1.tgz",
-          "integrity": "sha512-1kXwPsOi0OGQIZNVMPvgWJ9tSnGMiMfJdihqEzrPEXlHOBh9AAHXX/QYmAJTXztnz/K+PQ8ryCb4eGaN6HlGbQ==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.1.0.tgz",
+          "integrity": "sha512-MYcYuROh7SBM69xHGqXEwQqDux34s9tz+sCnxJmN18kgWh6JFdTw/5YdZtqsOdZJXddE/wUpCzfEdDrJj8p0Iw==",
           "requires": {
             "react-is": "^16.3.2"
           }
         },
         "react-is": {
-          "version": "16.5.2",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.5.2.tgz",
-          "integrity": "sha512-hSl7E6l25GTjNEZATqZIuWOgSnpXb3kD0DVCujmg46K5zLxsbiKaaT6VO9slkSBDPZfYs30lwfJwbOFOnoEnKQ=="
+          "version": "16.6.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.6.0.tgz",
+          "integrity": "sha512-q8U7k0Fi7oxF1HvQgyBjPwDXeMplEsArnKt2iYhuIF86+GBbgLHdAmokL3XUFjTd7Q363OSNG55FOGUdONVn1g=="
         },
         "react-lifecycles-compat": {
           "version": "2.0.0",
diff --git a/package.json b/package.json
index ff6f0d92..9aa8efd9 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "react-native-markdown-renderer": "^3.2.8",
     "react-native-meteor": "^1.4.0",
     "react-native-modal": "^6.5.0",
-    "react-native-navigation": "^2.0.2588",
+    "react-native-navigation": "^2.0.2641",
     "react-native-notifications": "^1.1.20",
     "react-native-optimized-flatlist": "^1.0.4",
     "react-native-picker-select": "^4.4.0",