Merge pull request #517 from appsquickly/bugfix/#513-transferring-con…

…straints-from-view-to-view-fix #513 Transferring constraints from view to view fix
appsquickly · Jul 13, 2016 · 48291d9 · 48291d9
2 parents a83f739 + 13dfcaa
commit 48291d9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/Source/ios/Storyboard/TyphoonViewHelpers.m b/Source/ios/Storyboard/TyphoonViewHelpers.m
@@ -43,9 +43,15 @@ + (void)transferPropertiesFromView:(UIView *)src toView:(UIView *)dst
         id firstItem = replaceFirstItem ? dst : constraint.firstItem;
         id secondItem = replaceSecondItem ? dst : constraint.secondItem;
         // Use the same constraint instance that the external outlets
-        [constraint setValue:firstItem forKey:NSStringFromSelector(@selector(firstItem))];
-        [constraint setValue:secondItem forKey:NSStringFromSelector(@selector(secondItem))];
-        [dst addConstraint:constraint];
+        NSLayoutConstraint *newConstraint = [NSLayoutConstraint constraintWithItem:firstItem
+                                                                         attribute:constraint.firstAttribute
+                                                                         relatedBy:constraint.relation
+                                                                            toItem:secondItem
+                                                                         attribute:constraint.secondAttribute
+                                                                        multiplier:constraint.multiplier
+                                                                          constant:constraint.constant];
+        newConstraint.priority = constraint.priority;
+        [dst addConstraint:newConstraint];
     }
 
     dst.frame = src.frame;

diff --git a/Tests/iOS/Storyboard/TyphoonViewHelpersTests.m b/Tests/iOS/Storyboard/TyphoonViewHelpersTests.m
@@ -17,6 +17,7 @@ @interface TyphoonViewHelpersFactory : TyphoonAssembly
 
 - (NSString *)notView;
 - (UIView *)view;
+BOOL equalProperties(NSLayoutConstraint *c1, NSLayoutConstraint *c2);
 
 @end
 
@@ -165,8 +166,7 @@ - (void)test_transfer_properties {
                 id secondItem = replaceSecondItem ? dst : srcConstraint.secondItem;
 
                 if ([dstConstraint.firstItem isEqual:firstItem] &&
-                    [dstConstraint.secondItem isEqual:secondItem] &&
-                    dstConstraint == srcConstraint) {
+                    [dstConstraint.secondItem isEqual:secondItem]) {
                     didFindEqualPointer = YES;
                     break;
                 }