[TIMOB-11510] reproxy subviews of tableview rows when className specified

iphone/Classes/TiUITableViewRowProxy.m

@@ -679,6 +679,9 @@ -(UIView*)view
 
 - (void)prepareTableRowForReuse
 {
+	if (![self.tableClass isEqualToString:defaultRowTableClass]) {
+		return;
+	}
 	RELEASE_TO_NIL(rowContainerView);
 
     // ... But that's not enough. We need to detatch the views
@@ -720,26 +723,52 @@ -(void)configureChildren:(UITableViewCell*)cell
 				break;
 			}
 		}
+		NSArray *rowChildren = [self children];
+		if (rowContainerView != nil) {
+			__block BOOL canReproxy = YES;
+			NSArray *existingSubviews = [rowContainerView subviews];
+			if ([rowChildren count] != [existingSubviews count]) {
+				canReproxy = NO;
+			} else {
+				[rowChildren enumerateObjectsUsingBlock:^(TiViewProxy *proxy, NSUInteger idx, BOOL *stop) {
+					TiUIView *uiview = [existingSubviews objectAtIndex:idx];
+					if (![uiview validateTransferToProxy:proxy deep:YES]) {
+						canReproxy = NO;
+						*stop = YES;
+					}
+				}];
+			}
+			if (!canReproxy) {
+				DebugLog(@"[ERROR] TableViewRow structures for className %@ does not match", self.tableClass);
+				[existingSubviews enumerateObjectsUsingBlock:^(TiUIView *child, NSUInteger idx, BOOL *stop) {
+					[(TiViewProxy *)child.proxy detachView];
+				}];
+			}
+		}
 		if (rowContainerView == nil) {
 			rowContainerView = [[TiUITableViewRowContainer alloc] initWithFrame:rect];
 			[contentView addSubview:rowContainerView];
 		}
 		[rowContainerView setBackgroundColor:[UIColor clearColor]];
 		[rowContainerView setAutoresizingMask:UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight];
 
-        NSArray* subviews = [self children];
-		for (TiViewProxy *proxy in subviews)
-		{
+		NSArray *existingSubviews = [rowContainerView subviews];
+		[rowChildren enumerateObjectsUsingBlock:^(TiViewProxy *proxy, NSUInteger idx, BOOL *stop) {
+			TiUIView *uiview = idx < [existingSubviews count] ? [existingSubviews objectAtIndex:idx] : nil;
 			if (!CGRectEqualToRect([proxy sandboxBounds], rect)) {
 				[proxy setSandboxBounds:rect];
 			}
 			[proxy windowWillOpen];
+			if (uiview != nil) {
+				[uiview transferProxy:proxy deep:YES];
+			}
 			[proxy setReproxying:YES];
-			TiUIView *uiview = [proxy view];
 			[self redelegateViews:proxy toView:contentView];
-			[rowContainerView addSubview:uiview];
+			if (uiview == nil) {
+				[rowContainerView addSubview:[proxy view]];
+			}
 			[proxy setReproxying:NO];
-		}
+		}];
 	}
 	configuredChildren = YES;
 }

iphone/Classes/TiUIView.h

@@ -175,8 +175,16 @@ void ModifyScrollViewForKeyboardHeightAndContentHeightWithResponderRect(UIScroll
 /*
  Tells the view to change its proxy to the new one provided.
  @param newProxy The new proxy to set on the view.
+ @param deep true for deep transfer
  */
--(void)transferProxy:(TiViewProxy*)newProxy;
+-(void)transferProxy:(TiViewProxy*)newProxy deep:(BOOL)deep;
+
+/*
+ Returns whether the view tree matches proxy tree for later transfer.
+ @param proxy The proxy to validate view tree with.
+ @param deep true for deep validation
+ */
+-(BOOL)validateTransferToProxy:(TiViewProxy*)proxy deep:(BOOL)deep;
 
 /**
  Tells the view to update its touch handling state.

iphone/Classes/TiUIView.m

@@ -704,7 +704,7 @@ -(void)setKrollValue:(id)value forKey:(NSString *)key withObject:(id)props
 	}	
 }
 
--(void)transferProxy:(TiViewProxy*)newProxy
+-(void)transferProxy:(TiViewProxy*)newProxy deep:(BOOL)deep
 {
 	TiViewProxy * oldProxy = (TiViewProxy *)[self proxy];
 
@@ -752,13 +752,48 @@ -(void)transferProxy:(TiViewProxy*)newProxy
 			[self setKrollValue:newValue forKey:thisKey withObject:nil];
 		}
 
+		if (deep) {
+			NSArray *subProxies = [newProxy children];
+			[[oldProxy children] enumerateObjectsUsingBlock:^(TiViewProxy *oldSubProxy, NSUInteger idx, BOOL *stop) {
+				TiViewProxy *newSubProxy = idx < [subProxies count] ? [subProxies objectAtIndex:idx] : nil;
+				[[oldSubProxy view] transferProxy:newSubProxy deep:YES];
+			}];
+		}
 		[oldProxy release];
 
 		[newProxy setReproxying:NO];
 		[self release];
 	}
 }
 
+-(BOOL)validateTransferToProxy:(TiViewProxy*)newProxy deep:(BOOL)deep
+{
+	TiViewProxy * oldProxy = (TiViewProxy *)[self proxy];
+
+	if (oldProxy == newProxy) {
+		return YES;
+	}
+	if (![newProxy isMemberOfClass:[oldProxy class]]) {
+		return NO;
+	}
+
+	__block BOOL result = YES;
+	if (deep) {
+		NSArray *subProxies = [newProxy children];
+		NSArray *oldSubProxies = [oldProxy children];
+		if ([subProxies count] != [oldSubProxies count]) {
+			return NO;
+		}
+		[oldSubProxies enumerateObjectsUsingBlock:^(TiViewProxy *oldSubProxy, NSUInteger idx, BOOL *stop) {
+			TiViewProxy *newSubProxy = [subProxies objectAtIndex:idx];
+			result = [[oldSubProxy view] validateTransferToProxy:newSubProxy deep:YES];
+			if (!result) {
+				*stop = YES;
+			}
+		}];
+	}
+	return result;
+}
 
 -(id)proxyValueForKey:(NSString *)key
 {