Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ android/
apple/
windows/
src/lib/extract/transform.js
src/lib/extract/transformToRn.js
Original file line number Diff line number Diff line change
Expand Up @@ -389,15 +389,6 @@ public void setDisplay(V node, String display) {
node.setDisplay(display);
}

@ReactProp(name = "matrix")
public void setMatrix(V node, Dynamic matrixArray) {
node.setMatrix(matrixArray);
}

public void setMatrix(V view, @Nullable ReadableArray value) {
view.setMatrix(value);
}

@Override
public void setTransform(VirtualView node, @Nullable ReadableArray matrix) {
setTransformProperty(node, matrix);
Expand Down
27 changes: 0 additions & 27 deletions android/src/main/java/com/horcrux/svg/VirtualView.java
Original file line number Diff line number Diff line change
Expand Up @@ -310,33 +310,6 @@ public void setOpacity(float opacity) {
invalidate();
}

public void setMatrix(Dynamic matrixArray) {
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 setResponsible(boolean responsible) {
mResponsible = responsible;
invalidate();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
public interface RNSVGCircleManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
public interface RNSVGClipPathManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
import com.facebook.react.uimanager.LayoutShadowNode;
Expand All @@ -29,9 +28,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@

import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.ReadableArray;

public interface RNSVGDefsManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
public interface RNSVGEllipseManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
public interface RNSVGForeignObjectManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
public interface RNSVGGroupManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
public interface RNSVGImageManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
public interface RNSVGLineManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
public interface RNSVGLinearGradientManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
public interface RNSVGMarkerManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
public interface RNSVGMaskManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
public interface RNSVGPathManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
public interface RNSVGPatternManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
public interface RNSVGRadialGradientManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
public interface RNSVGRectManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
public interface RNSVGSymbolManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
public interface RNSVGTSpanManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ public void setProperty(T view, String propName, @Nullable Object value) {
case "opacity":
mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).floatValue());
break;
case "matrix":
mViewManager.setMatrix(view, (ReadableArray) value);
break;
case "mask":
mViewManager.setMask(view, value == null ? null : (String) value);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
public interface RNSVGTextManagerInterface<T extends View> {
void setName(T view, @Nullable String value);
void setOpacity(T view, float value);
void setMatrix(T view, @Nullable ReadableArray value);
void setMask(T view, @Nullable String value);
void setMarkerStart(T view, @Nullable String value);
void setMarkerMid(T view, @Nullable String value);
Expand Down
Loading
Loading