Skip to content

Fix SET hijacked react view position index #6810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 2, 2020
Merged

Fix SET hijacked react view position index #6810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aca522e
Fix SET hijacked react view index
yogevbd Dec 2, 2020
1b70ebb
Merge branch 'master' into fixSETIndex
guyca Dec 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/ios/AnimatedReactView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ - (void)reset {
_reactView.bounds = _originalLayoutBounds;
_reactView.layer.bounds = _originalLayoutBounds;
_reactView.layer.transform = _originalTransform;
[_originalParent addSubview:_reactView];
[_originalParent insertSubview:_reactView atIndex:self.location.index];
_toElement.hidden = NO;
_reactView.backgroundColor = _fromColor;
[self removeFromSuperview];
Expand Down
1 change: 1 addition & 0 deletions lib/ios/RNNViewLocation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@property(nonatomic) CGFloat toAngle;
@property(nonatomic) CGFloat fromCornerRadius;
@property(nonatomic) CGFloat toCornerRadius;
@property(nonatomic) NSUInteger index;
@property(nonatomic) CATransform3D fromTransform;
@property(nonatomic) CATransform3D toTransform;

Expand Down
1 change: 1 addition & 0 deletions lib/ios/RNNViewLocation.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ - (instancetype)initWithFromElement:(UIView *)fromElement toElement:(UIView *)to
self.fromCornerRadius =
fromElement.layer.cornerRadius ?: [self getClippedCornerRadius:fromElement];
self.toCornerRadius = toElement.layer.cornerRadius ?: [self getClippedCornerRadius:toElement];
self.index = [fromElement.superview.subviews indexOfObject:fromElement];
return self;
}

Expand Down