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

Simplify native animation and setNativeProps

Browse Source 
Remove need for prefixed property names:
{use,mask,image,bb,pattern,rect}{width,height}
Can simply use width and height instead, and,
 x and y instead of position{X,Y} on Text and TSpan
This commit is contained in:
Mikael Sand
2018-10-11 18:39:15 +03:00
parent 95cdcb0834
commit 445780c121
11 changed files with 141 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/com/horcrux/svg/RenderableShadowNode.java
+1 -4
View File
@@ -316,6 +316,7 @@ abstract public class RenderableShadowNode extends VirtualNode {
RectF clientRect = new RectF();
path.computeBounds(clientRect, true);
mBox = new RectF(clientRect);
Matrix svgToViewMatrix = new Matrix(canvas.getMatrix());
svgToViewMatrix.mapRect(clientRect);
this.setClientRect(clientRect);
@@ -397,10 +398,6 @@ abstract public class RenderableShadowNode extends VirtualNode {
} else if (colorType == 1) {
Brush brush = getSvgShadowNode().getDefinedBrush(colors.getString(1));
if (brush != null) {
if (mBox == null) {
mBox = new RectF();
mPath.computeBounds(mBox, true);
}
brush.setupPaint(paint, mBox, mScale, opacity);
}
} else if (colorType == 2) {
android/src/main/java/com/horcrux/svg/RenderableViewManager.java
+73 -5
View File
@@ -318,11 +318,21 @@ class RenderableViewManager<T extends VirtualNode> extends ViewGroupManager<Rend
node.shadowNode.setPositionX(positionX);
}
@ReactProp(name = "x")
public void setX(RenderableView<TextShadowNode> node, Dynamic positionX) {
node.shadowNode.setPositionX(positionX);
}
@ReactProp(name = "positionY")
public void setPositionY(RenderableView<TextShadowNode> node, Dynamic positionY) {
node.shadowNode.setPositionY(positionY);
}
@ReactProp(name = "y")
public void setY(RenderableView<TextShadowNode> node, Dynamic positionY) {
node.shadowNode.setPositionY(positionY);
}
@ReactProp(name = "font")
public void setFont(RenderableView<TextShadowNode> node, @Nullable ReadableMap font) {
node.shadowNode.setFont(font);
@@ -339,12 +349,22 @@ class RenderableViewManager<T extends VirtualNode> extends ViewGroupManager<Rend
}
@ReactProp(name = "positionX")
public void setPositionX(RenderableView<TSpanShadowNode> node, Dynamic positionX) {
public void setPositionX(RenderableView<TextShadowNode> node, Dynamic positionX) {
node.shadowNode.setPositionX(positionX);
}
@ReactProp(name = "x")
public void setX(RenderableView<TextShadowNode> node, Dynamic positionX) {
node.shadowNode.setPositionX(positionX);
}
@ReactProp(name = "positionY")
public void setPositionY(RenderableView<TSpanShadowNode> node, Dynamic positionY) {
public void setPositionY(RenderableView<TextShadowNode> node, Dynamic positionY) {
node.shadowNode.setPositionY(positionY);
}
@ReactProp(name = "y")
public void setY(RenderableView<TextShadowNode> node, Dynamic positionY) {
node.shadowNode.setPositionY(positionY);
}
};
@@ -399,12 +419,22 @@ class RenderableViewManager<T extends VirtualNode> extends ViewGroupManager<Rend
}
@ReactProp(name = "imagewidth")
public void setImageWidth(RenderableView<ImageShadowNode> node, String width) {
node.shadowNode.setWidth(width);
}
@ReactProp(name = "width")
public void setWidth(RenderableView<ImageShadowNode> node, String width) {
node.shadowNode.setWidth(width);
}
@ReactProp(name = "imageheight")
public void seHeight(RenderableView<ImageShadowNode> node, String height) {
public void setImageHeight(RenderableView<ImageShadowNode> node, String height) {
node.shadowNode.seHeight(height);
}
@ReactProp(name = "height")
public void setHeight(RenderableView<ImageShadowNode> node, String height) {
node.shadowNode.seHeight(height);
}
@@ -511,16 +541,24 @@ class RenderableViewManager<T extends VirtualNode> extends ViewGroupManager<Rend
}
@ReactProp(name = "rectwidth")
public void setRectWidth(RenderableView<RectShadowNode> node, Dynamic width) {
node.shadowNode.setWidth(width);
}
@ReactProp(name = "width")
public void setWidth(RenderableView<RectShadowNode> node, Dynamic width) {
node.shadowNode.setWidth(width);
}
@ReactProp(name = "rectheight")
public void setHeight(RenderableView<RectShadowNode> node, Dynamic height) {
public void setRectHeight(RenderableView<RectShadowNode> node, Dynamic height) {
node.shadowNode.setHeight(height);
}
@ReactProp(name = "height")
public void setHeight(RenderableView<RectShadowNode> node, Dynamic height) {
node.shadowNode.setHeight(height);
}
@ReactProp(name = "rx")
public void setRx(RenderableView<RectShadowNode> node, String rx) {
@@ -551,11 +589,21 @@ class RenderableViewManager<T extends VirtualNode> extends ViewGroupManager<Rend
}
@ReactProp(name = "usewidth")
public void setUseWidth(RenderableView<UseShadowNode> node, String width) {
node.shadowNode.setWidth(width);
}
@ReactProp(name = "width")
public void setWidth(RenderableView<UseShadowNode> node, String width) {
node.shadowNode.setWidth(width);
}
@ReactProp(name = "useheight")
public void setUseHeight(RenderableView<UseShadowNode> node, String height) {
node.shadowNode.setHeight(height);
}
@ReactProp(name = "height")
public void setHeight(RenderableView<UseShadowNode> node, String height) {
node.shadowNode.setHeight(height);
}
@@ -611,11 +659,21 @@ class RenderableViewManager<T extends VirtualNode> extends ViewGroupManager<Rend
}
@ReactProp(name = "patternwidth")
public void setPatternWidth(RenderableView<PatternShadowNode> node, String width) {
node.shadowNode.setWidth(width);
}
@ReactProp(name = "width")
public void setWidth(RenderableView<PatternShadowNode> node, String width) {
node.shadowNode.setWidth(width);
}
@ReactProp(name = "patternheight")
public void setPatternHeight(RenderableView<PatternShadowNode> node, String height) {
node.shadowNode.setHeight(height);
}
@ReactProp(name = "height")
public void setHeight(RenderableView<PatternShadowNode> node, String height) {
node.shadowNode.setHeight(height);
}
@@ -681,11 +739,21 @@ class RenderableViewManager<T extends VirtualNode> extends ViewGroupManager<Rend
}
@ReactProp(name = "maskwidth")
public void setMaskWidth(RenderableView<MaskShadowNode> node, String width) {
node.shadowNode.setWidth(width);
}
@ReactProp(name = "width")
public void setWidth(RenderableView<MaskShadowNode> node, String width) {
node.shadowNode.setWidth(width);
}
@ReactProp(name = "maskheight")
public void setMaskHeight(RenderableView<MaskShadowNode> node, String height) {
node.shadowNode.setHeight(height);
}
@ReactProp(name = "height")
public void setHeight(RenderableView<MaskShadowNode> node, String height) {
node.shadowNode.setHeight(height);
}
android/src/main/java/com/horcrux/svg/VirtualNode.java
+1 -2
View File
@@ -59,7 +59,7 @@ abstract class VirtualNode extends LayoutShadowNode {
Matrix mTransform = new Matrix();
Matrix mInvMatrix = new Matrix();
boolean mInvertible = true;
private RectF mClientRect;
RectF mClientRect;
private int mClipRule;
private @Nullable String mClipPath;
@@ -113,7 +113,6 @@ abstract class VirtualNode extends LayoutShadowNode {
canvasWidth = -1;
mRegion = null;
mPath = null;
mBox = null;
}
void releaseCachedPath() {