Close toolbar search on BackAndroid press

xotahal · Oct 6, 2016 · c6335be · c6335be
1 parent dbc8556
commit c6335be
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/src/Toolbar/Toolbar.react.js b/src/Toolbar/Toolbar.react.js
@@ -1,9 +1,11 @@
 import React, { Component, PropTypes } from 'react';
 import {
     Animated,
+    BackAndroid,
     findNodeHandle,
-    StyleSheet,
     NativeModules,
+    Platform,
+    StyleSheet,
     Text,
     TextInput,
     TouchableWithoutFeedback,
@@ -220,6 +222,10 @@ class Toolbar extends Component {
             }
         );
     };
+    onSearchCloseRequested = () => {
+        this.onSearchClosePressed();
+        return true; // because we need to stop propagation
+    }
     onSearchTextChanged = (value) => {
         const { searchable } = this.props;
 
@@ -232,10 +238,16 @@ class Toolbar extends Component {
     onSearchPressed = () => {
         const { searchable } = this.props;
 
+        // on android it's typical that back button closes search input on toolbar
+        if (Platform.OS !== 'ios') {
+            BackAndroid.addEventListener('onSearchCloseRequested', this.onSearchCloseRequested);
+        }
+
         if (searchable && isFunction(searchable.onSearchPressed)) {
             searchable.onSearchPressed();
         }
 
+
         this.setState({
             isSearchActive: true,
             searchValue: '',
@@ -244,10 +256,15 @@ class Toolbar extends Component {
     onSearchClosePressed = () => {
         const { searchable } = this.props;
 
+        if (Platform.OS !== 'ios') {
+            BackAndroid.removeEventListener('onSearchCloseRequested', this.onSearchCloseRequested);
+        }
+
         if (searchable && isFunction(searchable.onSearchClosed)) {
             searchable.onSearchClosed();
         }
 
+
         this.setState({
             isSearchActive: false,
             searchValue: '',