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:
parent
7da5ef372c
commit
f5d9b5210e
|
@ -301,30 +301,8 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init)
|
||||||
super.contentOffset = contentOffset;
|
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
|
- (void)setFrame:(CGRect)frame
|
||||||
{
|
{
|
||||||
if (isRectInvalid(frame)) {
|
|
||||||
RCTLogError(@"Attempted to set an invalid frame to inner scrollview: %@", NSStringFromCGRect(frame));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Preserving and revalidating `contentOffset`.
|
// Preserving and revalidating `contentOffset`.
|
||||||
CGPoint originalOffset = self.contentOffset;
|
CGPoint originalOffset = self.contentOffset;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue