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

Fix #844

Browse Source 
Handle svg root width/height attribute strings containing px on iOS
Inherit fill/stroke attributes from Mask elements
Set default bounding box of mask to fill viewport / allow missing x, y, width, height on mask element
This commit is contained in:
Mikael Sand
2019-01-24 20:27:45 +02:00
parent 2a5dcdcd85
commit 76fb495920
5 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/com/horcrux/svg/GroupView.java
+20 -5
View File
@@ -88,9 +88,12 @@ class GroupView extends RenderableView {
final GroupView self = this;
final RectF groupRect = new RectF();
for (int i = 0; i < getChildCount(); i++) {
View lNode = getChildAt(i);
if (lNode instanceof VirtualView) {
VirtualView node = ((VirtualView)lNode);
View child = getChildAt(i);
if (child instanceof MaskView) {
continue;
}
if (child instanceof VirtualView) {
VirtualView node = ((VirtualView)child);
if (node instanceof RenderableView) {
((RenderableView)node).mergeProperties(self);
}
@@ -111,8 +114,8 @@ class GroupView extends RenderableView {
if (node.isResponsible()) {
svg.enableTouchEvents();
}
} else if (lNode instanceof SvgView) {
SvgView svgView = (SvgView)lNode;
} else if (child instanceof SvgView) {
SvgView svgView = (SvgView)child;
svgView.drawChildren(canvas);
}
}
@@ -133,6 +136,9 @@ class GroupView extends RenderableView {
for (int i = 0; i < getChildCount(); i++) {
View node = getChildAt(i);
if (node instanceof MaskView) {
continue;
}
if (node instanceof VirtualView) {
VirtualView n = (VirtualView)node;
Matrix transform = n.mMatrix;
@@ -150,6 +156,9 @@ class GroupView extends RenderableView {
final Path.Op pop = Path.Op.valueOf(op.name());
for (int i = 0; i < getChildCount(); i++) {
View node = getChildAt(i);
if (node instanceof MaskView) {
continue;
}
if (node instanceof VirtualView) {
VirtualView n = (VirtualView)node;
Matrix transform = n.mMatrix;
@@ -169,6 +178,9 @@ class GroupView extends RenderableView {
final Region r = new Region();
for (int i = 0; i < getChildCount(); i++) {
View node = getChildAt(i);
if (node instanceof MaskView) {
continue;
}
if (node instanceof VirtualView) {
VirtualView n = (VirtualView)node;
Matrix transform = n.mMatrix;
@@ -221,6 +233,9 @@ class GroupView extends RenderableView {
if (!(child instanceof VirtualView)) {
continue;
}
if (child instanceof MaskView) {
continue;
}
VirtualView node = (VirtualView) child;