status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ScrollView: Couple of unnecessary checks was removed from RCTCustomScrollView 

Summary:
* Now `setFrame:` is called by autoresizing masks, so it is safe.
* Nobody calls `setBounds:`, so it is also safe.

Reviewed By: javache

Differential Revision: D5414441

fbshipit-source-id: 6fc51c7598c4817301db51f627aa1e9840642fec
This commit is contained in:
Valentin Shergin 2017-07-18 14:33:56 -07:00 committed by Facebook Github Bot
parent 7da5ef372c
commit f5d9b5210e
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
React/Views/RCTScrollView.m
View File

@ -301,30 +301,8 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init)
super.contentOffset = contentOffset;
}
static inline BOOL isRectInvalid(CGRect rect) {
return isnan(rect.origin.x) || isinf(rect.origin.x) ||
isnan(rect.origin.y) || isinf(rect.origin.y) ||
isnan(rect.size.width) || isinf(rect.size.width) ||
isnan(rect.size.height) || isinf(rect.size.height);
}
- (void)setBounds:(CGRect)bounds
{
if (isRectInvalid(bounds)) {
RCTLogError(@"Attempted to set an invalid bounds to inner scrollview: %@", NSStringFromCGRect(bounds));
return;
}
[super setBounds:bounds];
}
- (void)setFrame:(CGRect)frame
{
if (isRectInvalid(frame)) {
RCTLogError(@"Attempted to set an invalid frame to inner scrollview: %@", NSStringFromCGRect(frame));
return;
}
// Preserving and revalidating `contentOffset`.
CGPoint originalOffset = self.contentOffset;