mirror of
https://github.com/zoriya/react-native-svg.git
synced 2026-06-05 16:04:38 +00:00
Merge branch 'master' into patch-1
This commit is contained in:
@@ -221,8 +221,8 @@ public class SvgView extends ReactViewGroup implements ReactCompoundView, ReactC
|
||||
mRendered = true;
|
||||
float width = getWidth();
|
||||
float height = getHeight();
|
||||
boolean early = Float.isNaN(width) || Float.isNaN(height) || width * height == 0 || (Math.log10(width) + Math.log10(height) > 42);
|
||||
if (early || width == 0 || height == 0) {
|
||||
boolean invalid = Float.isNaN(width) || Float.isNaN(height) || width < 1 || height < 1 || (Math.log10(width) + Math.log10(height) > 42);
|
||||
if (invalid) {
|
||||
return null;
|
||||
}
|
||||
Bitmap bitmap = Bitmap.createBitmap(
|
||||
|
||||
@@ -169,7 +169,7 @@
|
||||
NSPredicate *const anyActive = [NSPredicate predicateWithFormat:@"active == TRUE"];
|
||||
NSArray *const filtered = [self.subviews filteredArrayUsingPredicate:anyActive];
|
||||
if ([filtered count] != 0) {
|
||||
return [filtered.firstObject hitTest:transformed withEvent:event];
|
||||
return [filtered.lastObject hitTest:transformed withEvent:event];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -23,9 +23,4 @@ RCT_EXPORT_MODULE()
|
||||
return [self node];
|
||||
}
|
||||
|
||||
- (RCTShadowView *)shadowView
|
||||
{
|
||||
return nil;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
Reference in New Issue
Block a user