fix(ios): properly dismiss search controller after editing

tidev · Jun 23, 2021 · e2894aa · e2894aa
1 parent b72d886
commit e2894aa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/iphone/Classes/TiUIListView.m b/iphone/Classes/TiUIListView.m
@@ -2082,8 +2082,11 @@ - (void)searchBarTextDidEndEditing:(UISearchBar *)searchBar
   if ([searchBar.text length] == 0) {
     self.searchString = @"";
     [self buildResultsForSearchText];
-    [self performSelector:@selector(dismissSearchController) withObject:nil afterDelay:.2];
   }
+
+  // Finished editing, always dismiss search controller.
+  // Only one search controller can be active at a time.
+  [self performSelector:@selector(dismissSearchController) withObject:nil afterDelay:.2];
 }
 
 - (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText

diff --git a/iphone/Classes/TiUITableView.m b/iphone/Classes/TiUITableView.m
@@ -1570,6 +1570,13 @@ - (void)searchBarTextDidBeginEditing:(UISearchBar *)searchBar
   // Also if a previous search string exists this reload results in blank cells.
 }
 
+- (void)searchBarTextDidEndEditing:(UISearchBar *)searchBar
+{
+  // Finished editing, always dismiss search controller.
+  // Only one search controller can be active at a time.
+  [self performSelector:@selector(dismissSearchController) withObject:nil afterDelay:.2];
+}
+
 - (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar
 {
   // called when keyboard search button pressed
@@ -2446,7 +2453,9 @@ - (void)hideDimmingView
 
 - (void)dismissSearchController
 {
-  [searchController setActive:NO];
+  if (searchController.isActive) {
+    [searchController setActive:NO];
+  }
 }
 
 - (void)keyboardWillChangeFrame:(NSNotification *)notification