From 7e0040e7d1b39c2cf2cc3d4793db1dd0f3568c7c Mon Sep 17 00:00:00 2001
From: Seth Benjamin <animecyc@gmail.com>
Date: Thu, 9 Jan 2014 12:25:20 -0500
Subject: [PATCH] Fixing a performance issue with iOS and mapped views with
 many children.

---
 android/src/ti/draggable/ConfigProxy.java   |  4 ---
 ios/Classes/TiDraggableGesture.m            |  9 ++++---
 ios/Classes/TiDraggableModule.m             |  2 +-
 ios/Classes/TiViewProxy+ViewProxyExtended.h |  7 +++++
 ios/Classes/TiViewProxy+ViewProxyExtended.m | 30 +++++++++++++++++++++
 ios/draggable.xcodeproj/project.pbxproj     |  8 ++++++
 ios/manifest                                |  2 +-
 7 files changed, 53 insertions(+), 9 deletions(-)
 create mode 100644 ios/Classes/TiViewProxy+ViewProxyExtended.h
 create mode 100644 ios/Classes/TiViewProxy+ViewProxyExtended.m

diff --git a/android/src/ti/draggable/ConfigProxy.java b/android/src/ti/draggable/ConfigProxy.java
index e8e3439..f130cd6 100644
--- a/android/src/ti/draggable/ConfigProxy.java
+++ b/android/src/ti/draggable/ConfigProxy.java
@@ -62,10 +62,6 @@ public ConfigProxy(KrollDict config)
 		properties.put("enabled", config != null && config.containsKeyAndNotNull("enabled") ? TiConvert.toBoolean(config, "enabled", true) : true);
 		properties.put("ensureRight", config != null && config.containsKeyAndNotNull("ensureRight") ? TiConvert.toBoolean(config, "ensureRight", false) : false);
 		properties.put("ensureBottom", config != null && config.containsKeyAndNotNull("ensureBottom") ? TiConvert.toBoolean(config, "ensureBottom", false) : false);
-		properties.put("minLeft", config != null && config.containsKeyAndNotNull("minLeft") ? TiConvert.toDouble(config, "minLeft") : null);
-		properties.put("maxLeft", config != null && config.containsKeyAndNotNull("minLeft") ? TiConvert.toDouble(config, "maxLeft") : null);
-		properties.put("minTop",config != null &&  config.containsKeyAndNotNull("minTop") ? TiConvert.toDouble(config, "minTop") : null);
-		properties.put("maxTop", config != null && config.containsKeyAndNotNull("maxTop") ? TiConvert.toDouble(config, "maxTop") : null);
 		properties.put("axis", config != null && config.containsKeyAndNotNull("axis") ? TiConvert.toString(config, "axis") : null);
 		properties.put("maps", config != null && config.containsKeyAndNotNull("maps") ? (Object[]) config.get("maps") : null);
 
diff --git a/ios/Classes/TiDraggableGesture.m b/ios/Classes/TiDraggableGesture.m
index 621a9bf..c864515 100644
--- a/ios/Classes/TiDraggableGesture.m
+++ b/ios/Classes/TiDraggableGesture.m
@@ -34,6 +34,9 @@
  * limitations under the License.
  */
 
+#import <objc/runtime.h>
+#import <objc/message.h>
+#import "TiViewProxy+ViewProxyExtended.h"
 #import "TiDraggableGesture.h"
 
 @implementation TiDraggableGesture
@@ -333,7 +336,7 @@ - (void)correctMappedProxyPositions
                 layoutProperties->top = TiDimensionDip([proxy view].frame.origin.y);
             }
 
-            [proxy refreshView:nil];
+            [proxy respositionEx];
         }];
     }
 }
@@ -595,8 +598,8 @@ - (void)mapProxyOriginToCollection:(NSArray*)proxies withTranslationX:(float)tra
             {
                 layoutProperties->right = TiDimensionDip(layoutProperties->left.value * -1);
             }
-
-            [proxy refreshView:nil];
+            
+            [proxy respositionEx];
         }];
     }
 }
diff --git a/ios/Classes/TiDraggableModule.m b/ios/Classes/TiDraggableModule.m
index 39c5904..4570a65 100644
--- a/ios/Classes/TiDraggableModule.m
+++ b/ios/Classes/TiDraggableModule.m
@@ -81,7 +81,7 @@ - (id)createProxy:(NSArray*)args forName:(NSString*)name context:(id<TiEvaluator
     else
     {
         Ivar nameLookupIvar = class_getInstanceVariable([super class], "classNameLookup");
-        CFMutableDictionaryRef cnLookup = (CFMutableDictionaryRef)object_getIvar(self, nameLookupIvar);
+        CFMutableDictionaryRef cnLookup = (CFMutableDictionaryRef) object_getIvar(self, nameLookupIvar);
         Class resultClass = (Class) CFDictionaryGetValue(cnLookup, name);
 
         if (resultClass == NULL)
diff --git a/ios/Classes/TiViewProxy+ViewProxyExtended.h b/ios/Classes/TiViewProxy+ViewProxyExtended.h
new file mode 100644
index 0000000..78b3b5a
--- /dev/null
+++ b/ios/Classes/TiViewProxy+ViewProxyExtended.h
@@ -0,0 +1,7 @@
+#import "TiViewProxy.h"
+
+@interface TiViewProxy (ViewProxyExtended)
+
+- (void)respositionEx;
+
+@end
diff --git a/ios/Classes/TiViewProxy+ViewProxyExtended.m b/ios/Classes/TiViewProxy+ViewProxyExtended.m
new file mode 100644
index 0000000..0ff141c
--- /dev/null
+++ b/ios/Classes/TiViewProxy+ViewProxyExtended.m
@@ -0,0 +1,30 @@
+#import "TiViewProxy+ViewProxyExtended.h"
+
+@implementation TiViewProxy (ViewProxyExtended)
+
+- (void)respositionEx
+{
+    if (! repositioning)
+	{
+		ENSURE_UI_THREAD_0_ARGS
+        
+		repositioning = YES;
+        
+        UIView *parentView = [parent parentViewForChild:self];
+        CGSize referenceSize = (parentView != nil) ? parentView.bounds.size : sandboxBounds.size;
+        
+		positionCache = PositionConstraintGivenSizeBoundsAddingResizing(&layoutProperties, self, sizeCache.size,
+                                                                        [[view layer] anchorPoint], referenceSize, sandboxBounds.size, &autoresizeCache);
+        
+		positionCache.x += sizeCache.origin.x + sandboxBounds.origin.x;
+		positionCache.y += sizeCache.origin.y + sandboxBounds.origin.y;
+        
+		[view setCenter:positionCache];
+		[self refreshPosition];
+        
+		repositioning = NO;
+	}
+
+}
+
+@end
\ No newline at end of file
diff --git a/ios/draggable.xcodeproj/project.pbxproj b/ios/draggable.xcodeproj/project.pbxproj
index a21e9ba..b84c013 100644
--- a/ios/draggable.xcodeproj/project.pbxproj
+++ b/ios/draggable.xcodeproj/project.pbxproj
@@ -28,6 +28,8 @@
 		24DE9E1211C5FE74003F90F6 /* TiDraggableModuleAssets.m in Sources */ = {isa = PBXBuildFile; fileRef = 24DE9E1011C5FE74003F90F6 /* TiDraggableModuleAssets.m */; };
 		AA747D9F0F9514B9006C5449 /* TiDraggable_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* TiDraggable_Prefix.pch */; };
 		AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
+		ED58400F187F0C5400AA3A61 /* TiViewProxy+ViewProxyExtended.h in Headers */ = {isa = PBXBuildFile; fileRef = ED58400D187F0C5400AA3A61 /* TiViewProxy+ViewProxyExtended.h */; };
+		ED584010187F0C5400AA3A61 /* TiViewProxy+ViewProxyExtended.m in Sources */ = {isa = PBXBuildFile; fileRef = ED58400E187F0C5400AA3A61 /* TiViewProxy+ViewProxyExtended.m */; };
 		EDB9F4E31829500B009E1A17 /* TiDraggableGesture.h in Headers */ = {isa = PBXBuildFile; fileRef = EDB9F4E11829500B009E1A17 /* TiDraggableGesture.h */; };
 		EDB9F4E41829500B009E1A17 /* TiDraggableGesture.m in Sources */ = {isa = PBXBuildFile; fileRef = EDB9F4E21829500B009E1A17 /* TiDraggableGesture.m */; };
 /* End PBXBuildFile section */
@@ -51,6 +53,8 @@
 		AA747D9E0F9514B9006C5449 /* TiDraggable_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TiDraggable_Prefix.pch; sourceTree = SOURCE_ROOT; };
 		AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		D2AAC07E0554694100DB518D /* libTiDraggable.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libTiDraggable.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		ED58400D187F0C5400AA3A61 /* TiViewProxy+ViewProxyExtended.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "TiViewProxy+ViewProxyExtended.h"; path = "Classes/TiViewProxy+ViewProxyExtended.h"; sourceTree = "<group>"; };
+		ED58400E187F0C5400AA3A61 /* TiViewProxy+ViewProxyExtended.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "TiViewProxy+ViewProxyExtended.m"; path = "Classes/TiViewProxy+ViewProxyExtended.m"; sourceTree = "<group>"; };
 		EDB9F4E11829500B009E1A17 /* TiDraggableGesture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TiDraggableGesture.h; path = Classes/TiDraggableGesture.h; sourceTree = "<group>"; };
 		EDB9F4E21829500B009E1A17 /* TiDraggableGesture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TiDraggableGesture.m; path = Classes/TiDraggableGesture.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -97,6 +101,8 @@
 		08FB77AEFE84172EC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				ED58400D187F0C5400AA3A61 /* TiViewProxy+ViewProxyExtended.h */,
+				ED58400E187F0C5400AA3A61 /* TiViewProxy+ViewProxyExtended.m */,
 				EDB9F4E11829500B009E1A17 /* TiDraggableGesture.h */,
 				EDB9F4E21829500B009E1A17 /* TiDraggableGesture.m */,
 				24DE9E0F11C5FE74003F90F6 /* TiDraggableModuleAssets.h */,
@@ -124,6 +130,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				AA747D9F0F9514B9006C5449 /* TiDraggable_Prefix.pch in Headers */,
+				ED58400F187F0C5400AA3A61 /* TiViewProxy+ViewProxyExtended.h in Headers */,
 				24DD6CF91134B3F500162E58 /* TiDraggableModule.h in Headers */,
 				24DE9E1111C5FE74003F90F6 /* TiDraggableModuleAssets.h in Headers */,
 				EDB9F4E31829500B009E1A17 /* TiDraggableGesture.h in Headers */,
@@ -200,6 +207,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				EDB9F4E41829500B009E1A17 /* TiDraggableGesture.m in Sources */,
+				ED584010187F0C5400AA3A61 /* TiViewProxy+ViewProxyExtended.m in Sources */,
 				24DD6CFA1134B3F500162E58 /* TiDraggableModule.m in Sources */,
 				24DE9E1211C5FE74003F90F6 /* TiDraggableModuleAssets.m in Sources */,
 			);
diff --git a/ios/manifest b/ios/manifest
index fee8ca0..7581859 100644
--- a/ios/manifest
+++ b/ios/manifest
@@ -1,4 +1,4 @@
-version: 2.0.0
+version: 2.0.1
 apiversion: 2
 description: Ti.Draggable
 author: Seth Benjamin