zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-05-12 23:34:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(ios): only invalidate foreignObject on did mount if not ready

Browse Source
This commit is contained in:
Mikael Sand
2020-01-12 01:31:16 +02:00
parent d54969846d
commit b5b1ececc0
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ios/Elements/RNSVGForeignObject.m
View File

@@ -40,12 +40,20 @@
- (void)uiManagerDidPerformMounting:(RCTUIManager *)manager
{
[manager addUIBlock:^(__unused RCTUIManager *uiManager, __unused NSDictionary<NSNumber *, UIView *> *viewRegistry) {
if (!self->_ready && !self.dirty) {
if (!self->_ready) {
[self invalidate];
}
}];
}
- (void)renderChildTo:(CGContextRef)context rect:(CGRect)rect node:(UIView*)node
{
node.hidden = false;
self->_ready = [node drawViewHierarchyInRect:rect afterScreenUpdates:true];
[node.layer renderInContext:context];
node.hidden = true;
}
- (void)renderLayerTo:(CGContextRef)context rect:(CGRect)rect
{
[self clip:context];

1
ios/Elements/RNSVGGroup.h
View File

@@ -20,6 +20,7 @@
- (void)renderPathTo:(CGContextRef)context rect:(CGRect)rect;
- (void)renderGroupTo:(CGContextRef)context rect:(CGRect)rect;
- (void)renderChildTo:(CGContextRef)context rect:(CGRect)rect node:(UIView*)node;
- (RNSVGGlyphContext *)getGlyphContext;
- (void)pushGlyphContext;

11
ios/Elements/RNSVGGroup.m
View File

@@ -72,9 +72,7 @@
CGContextClipToRect(context, rect);
[svgView drawToContext:context withRect:rect];
} else {
node.hidden = false;
[node.layer renderInContext:context];
node.hidden = true;
[self renderChildTo:context rect:rect node:node];
}
return YES;
@@ -107,6 +105,13 @@
[self popGlyphContext];
}
- (void)renderChildTo:(CGContextRef)context rect:(CGRect)rect node:(UIView*)node
{
node.hidden = false;
[node.layer renderInContext:context];
node.hidden = true;
}
- (void)setupGlyphContext:(CGContextRef)context
{
CGRect clipBounds = CGContextGetClipBoundingBox(context);