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

fix: handle null passed to matrix and tintColor (#1904)

Browse Source 
PR adding handling of null values passed to matrix and tintColor props on Android. It should not happen from normal render method, but can still be passed with Animated or Reanimated through native updates or setNativeProps.
This commit is contained in:
Wojciech Lewicki
2022-11-02 14:54:32 +01:00
committed by GitHub
parent 8cf4068880
commit f2130ad7cf
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/src/main/java/com/horcrux/svg/SvgView.java
View File

@@ -186,7 +186,7 @@ public class SvgView extends ReactViewGroup implements ReactCompoundView, ReactC
}
public void setTintColor(Integer tintColor) {
mTintColor = tintColor;
mTintColor = tintColor != null ? tintColor : 0;
invalidate();
clearChildCache();
}

37
android/src/main/java/com/horcrux/svg/VirtualView.java
View File

@@ -291,30 +291,27 @@ public abstract class VirtualView extends ReactViewGroup {
}
public void setMatrix(Dynamic matrixArray) {
ReadableType type = matrixArray.getType();
if (!matrixArray.isNull() && type.equals(ReadableType.Array)) {
ReadableArray matrix = matrixArray.asArray();
setMatrix(matrix);
boolean isArrayType = !matrixArray.isNull() && matrixArray.getType().equals(ReadableType.Array);
setMatrix(isArrayType ? matrixArray.asArray() : null);
}
public void setMatrix(@Nullable ReadableArray matrixArray) {
if (matrixArray != null) {
int matrixSize = PropHelper.toMatrixData(matrixArray, sRawMatrix, mScale);
if (matrixSize == 6) {
if (mMatrix == null) {
mMatrix = new Matrix();
mInvMatrix = new Matrix();
}
mMatrix.setValues(sRawMatrix);
mInvertible = mMatrix.invert(mInvMatrix);
} else if (matrixSize != -1) {
FLog.w(ReactConstants.TAG, "RNSVG: Transform matrices must be of size 6");
}
} else {
mMatrix.reset();
mInvMatrix.reset();
mInvertible = true;
super.invalidate();
clearParentCache();
}
}
public void setMatrix(ReadableArray matrixArray) {
int matrixSize = PropHelper.toMatrixData(matrixArray, sRawMatrix, mScale);
if (matrixSize == 6) {
if (mMatrix == null) {
mMatrix = new Matrix();
mInvMatrix = new Matrix();
}
mMatrix.setValues(sRawMatrix);
mInvertible = mMatrix.invert(mInvMatrix);
} else if (matrixSize != -1) {
FLog.w(ReactConstants.TAG, "RNSVG: Transform matrices must be of size 6");
}
super.invalidate();
clearParentCache();