Merge pull request #4133 from mstepanov/timob-13499-31x

[TIMOB-13499] iOS: ListView: clear selection on show
tidev · Apr 9, 2013 · 485b313 · 485b313
2 parents c29bb12 + a765154
commit 485b313
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/iphone/Classes/TiUIListView.h b/iphone/Classes/TiUIListView.h
@@ -10,9 +10,12 @@
 
 @interface TiUIListView : TiUIView <UITableViewDelegate, UITableViewDataSource, UIGestureRecognizerDelegate, TiScrolling >
 
+#pragma mark - Private APIs
+
 @property (nonatomic, readonly) UITableView *tableView;
 
 - (void)setTemplates_:(id)args;
+- (void)deselectAll:(BOOL)animated;
 
 + (UITableViewRowAnimation)animationStyleForProperties:(NSDictionary*)properties;
 

diff --git a/iphone/Classes/TiUIListView.m b/iphone/Classes/TiUIListView.m
@@ -89,7 +89,14 @@ - (TiUIListViewProxy *)listViewProxy
 	return (TiUIListViewProxy *)self.proxy;
 }
 
-#pragma mark - Public API
+- (void)deselectAll:(BOOL)animated
+{
+	if (_tableView != nil) {
+		[_tableView.indexPathsForSelectedRows enumerateObjectsUsingBlock:^(NSIndexPath *indexPath, NSUInteger idx, BOOL *stop) {
+			[_tableView deselectRowAtIndexPath:indexPath animated:animated];
+		}];
+	}
+}
 
 - (void)setTemplates_:(id)args
 {
@@ -101,6 +108,8 @@ - (void)setTemplates_:(id)args
 	}
 }
 
+#pragma mark - Public API
+
 - (void)setDefaultItemTemplate_:(id)args
 {
 	if (![args isKindOfClass:[NSString class]] && ![args isKindOfClass:[NSNumber class]]) {

diff --git a/iphone/Classes/TiUIListViewProxy.m b/iphone/Classes/TiUIListViewProxy.m
@@ -144,6 +144,12 @@ - (void)viewDidAttach
 	[self.listView tableView];
 }
 
+- (void)willShow
+{
+	[self.listView deselectAll:YES];
+	[super willShow];
+}
+
 #pragma mark - Public API
 
 - (void)setTemplates:(id)args