fix(ios): fixed transition hickup when using borderWidth

IjzerenHein · Jan 7, 2020 · ca0628c · ca0628c
1 parent f9d81c9
commit ca0628c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/ios/RNSharedElementContent.h b/ios/RNSharedElementContent.h
@@ -12,8 +12,9 @@
 @interface RNSharedElementContent : NSObject
 @property (nonatomic, assign) id data;
 @property (nonatomic, assign) RNSharedElementContentType type;
+@property (nonatomic, assign) UIEdgeInsets insets;
 
-- (instancetype)initWithData:(id) data type:(RNSharedElementContentType)type;
+- (instancetype)initWithData:(id) data type:(RNSharedElementContentType)type insets:(UIEdgeInsets)insets;
 - (NSString*) typeName;
 
 + (BOOL) isKindOfImageView:(UIView*) view;

diff --git a/ios/RNSharedElementContent.m b/ios/RNSharedElementContent.m
@@ -10,10 +10,11 @@ @implementation RNSharedElementContent
     // nop
 }
 
-- (instancetype)initWithData:(id) data type:(RNSharedElementContentType)type
+- (instancetype)initWithData:(id) data type:(RNSharedElementContentType)type insets:(UIEdgeInsets)insets
 {
     _data = data;
     _type = type;
+    _insets = insets;
     return self;
 }
 
@@ -64,6 +65,8 @@ + (CGRect) layoutForRect:(CGRect)layout content:(RNSharedElementContent*) conten
     if (content == nil || content.data == nil) return layout;
     if (content.type != RNSharedElementContentTypeRawImage) return layout;
     CGSize size = layout.size;
+    size.width -= (content.insets.left + content.insets.right);
+    size.height -= (content.insets.top + content.insets.bottom);
     CGSize contentSize = [RNSharedElementContent sizeForRect:layout content:content];
     CGFloat contentAspectRatio = (contentSize.width / contentSize.height);
     BOOL lo = (size.width / size.height) < contentAspectRatio;

diff --git a/ios/RNSharedElementNode.m b/ios/RNSharedElementNode.m
@@ -263,6 +263,7 @@ - (void) updateContent
     if (_contentRequests == nil) return;
 
     CGRect bounds = view.bounds;
+    CGRect frame = contentView.frame;
     if (!bounds.size.width || !bounds.size.height) {
         return;
     }
@@ -272,14 +273,21 @@ - (void) updateContent
     if ([RNSharedElementContent isKindOfImageView:contentView]) {
         UIImageView* imageView = [RNSharedElementContent imageViewFromView:contentView];
         UIImage* image = imageView.image;
-        content = [[RNSharedElementContent alloc]initWithData:image type:RNSharedElementContentTypeRawImage];
+        UIEdgeInsets imageInsets = UIEdgeInsetsZero;
+        if (contentView != view) {
+            imageInsets.left = frame.origin.x;
+            imageInsets.top = frame.origin.y;
+            imageInsets.right = bounds.size.width - frame.size.width - frame.origin.x;
+            imageInsets.bottom = bounds.size.height - frame.size.height - frame.origin.y;
+        }
+        content = [[RNSharedElementContent alloc]initWithData:image type:RNSharedElementContentTypeRawImage insets:imageInsets];
     }
     else if ([NSStringFromClass(view.class) isEqualToString:@"RCTView"] && !view.subviews.count) {
-        content = [[RNSharedElementContent alloc]initWithData:[[UIView alloc]init] type:RNSharedElementContentTypeSnapshotView];
+        content = [[RNSharedElementContent alloc]initWithData:[[UIView alloc]init] type:RNSharedElementContentTypeSnapshotView insets:UIEdgeInsetsZero];
     }
     else {
         UIView* snapshotView = [view snapshotViewAfterScreenUpdates:NO];
-        content = [[RNSharedElementContent alloc]initWithData:snapshotView type:RNSharedElementContentTypeSnapshotView];
+        content = [[RNSharedElementContent alloc]initWithData:snapshotView type:RNSharedElementContentTypeSnapshotView insets:UIEdgeInsetsZero];
     }
     /*else {
      NSLog(@"drawViewHierarchyInRect: bounds: %@", NSStringFromCGRect(bounds));