fix: animated transform last frame

android/src/main/java/com/horcrux/svg/GroupView.java

@@ -58,9 +58,6 @@ void setupGlyphContext(Canvas canvas) {
     if (mMatrix != null) {
       mMatrix.mapRect(clipBounds);
     }
-    if (mTransform != null) {
-      mTransform.mapRect(clipBounds);
-    }
     mGlyphContext = new GlyphContext(mScale, clipBounds.width(), clipBounds.height());
   }
 
@@ -258,7 +255,7 @@ Path getPath(final Canvas canvas, final Paint paint, final Region.Op op) {
 
   @Override
   int hitTest(final float[] src) {
-    if (!mInvertible || !mTransformInvertible) {
+    if (!mInvertible) {
       return -1;
     }
 

android/src/main/java/com/horcrux/svg/RenderableView.java

@@ -677,7 +677,7 @@ private void setupPaint(Paint paint, float opacity, ReadableArray colors) {
 
   @Override
   int hitTest(final float[] src) {
-    if (mPath == null || !mInvertible || !mTransformInvertible) {
+    if (mPath == null || !mInvertible) {
       return -1;
     }
 

android/src/main/java/com/horcrux/svg/RenderableViewManager.java

@@ -518,8 +518,8 @@ public void setTransform(VirtualView node, @Nullable ReadableArray matrix) {
     }
 
     Matrix m = node.getMatrix();
-    node.mTransform = m;
-    node.mTransformInvertible = m.invert(node.mInvTransform);
+    node.mMatrix = m;
+    node.mInvertible = m.invert(node.mInvMatrix);
   }
 
   @ReactProp(name = "transform")

android/src/main/java/com/horcrux/svg/TSpanView.java

@@ -1212,7 +1212,7 @@ int hitTest(final float[] src) {
     if (mContent == null) {
       return super.hitTest(src);
     }
-    if (mPath == null || !mInvertible || !mTransformInvertible) {
+    if (mPath == null || !mInvertible) {
       return -1;
     }
 

android/src/main/java/com/horcrux/svg/UseView.java

@@ -101,7 +101,7 @@ void draw(Canvas canvas, Paint paint, float opacity) {
 
   @Override
   int hitTest(float[] src) {
-    if (!mInvertible || !mTransformInvertible) {
+    if (!mInvertible) {
       return -1;
     }
 

android/src/main/java/com/horcrux/svg/VirtualView.java

@@ -54,13 +54,11 @@ public abstract class VirtualView extends ReactViewGroup {
   float mOpacity = 1f;
   Matrix mCTM = new Matrix();
   Matrix mMatrix = new Matrix();
-  Matrix mTransform = new Matrix();
   Matrix mInvCTM = new Matrix();
   Matrix mInvMatrix = new Matrix();
   final Matrix mInvTransform = new Matrix();
   boolean mInvertible = true;
   boolean mCTMInvertible = true;
-  boolean mTransformInvertible = true;
   private RectF mClientRect;
 
   int mClipRule;
@@ -249,7 +247,7 @@ void render(Canvas canvas, Paint paint, float opacity) {
    */
   int saveAndSetupCanvas(Canvas canvas, Matrix ctm) {
     int count = canvas.save();
-    mCTM.setConcat(mMatrix, mTransform);
+    mCTM.set(mMatrix);
     canvas.concat(mCTM);
     mCTM.preConcat(ctm);
     mCTMInvertible = mCTM.invert(mInvCTM);
@@ -360,7 +358,6 @@ Path getClipPath(Canvas canvas, Paint paint) {
                 ? mClipNode.getPath(canvas, paint)
                 : mClipNode.getPath(canvas, paint, Region.Op.UNION);
         clipPath.transform(mClipNode.mMatrix);
-        clipPath.transform(mClipNode.mTransform);
         switch (mClipRule) {
           case CLIP_RULE_EVENODD:
             clipPath.setFillType(Path.FillType.EVEN_ODD);

apple/Elements/RNSVGForeignObject.mm

@@ -160,9 +160,8 @@ - (void)renderGroupTo:(CGContextRef)context rect:(CGRect)rect
     self.ctm = svgToClientTransform;
     self.screenCTM = current;
 
-    CGAffineTransform transform = CGAffineTransformConcat(self.matrix, self.transforms);
     CGPoint mid = CGPointMake(CGRectGetMidX(bounds), CGRectGetMidY(bounds));
-    CGPoint center = CGPointApplyAffineTransform(mid, transform);
+    CGPoint center = CGPointApplyAffineTransform(mid, self.matrix);
 
     self.bounds = bounds;
     if (!isnan(center.x) && !isnan(center.y)) {

apple/Elements/RNSVGGroup.mm

@@ -139,9 +139,8 @@ - (void)renderGroupTo:(CGContextRef)context rect:(CGRect)rect
     self.ctm = svgToClientTransform;
     self.screenCTM = current;
 
-    CGAffineTransform transform = CGAffineTransformConcat(self.matrix, self.transforms);
     CGPoint mid = CGPointMake(CGRectGetMidX(bounds), CGRectGetMidY(bounds));
-    CGPoint center = CGPointApplyAffineTransform(mid, transform);
+    CGPoint center = CGPointApplyAffineTransform(mid, self.matrix);
 
     self.bounds = bounds;
     if (!isnan(center.x) && !isnan(center.y)) {
@@ -163,7 +162,6 @@ - (void)setupGlyphContext:(CGContextRef)context
   }
 #endif // macOS]
   clipBounds = CGRectApplyAffineTransform(clipBounds, self.matrix);
-  clipBounds = CGRectApplyAffineTransform(clipBounds, self.transforms);
   CGFloat width = CGRectGetWidth(clipBounds);
   CGFloat height = CGRectGetHeight(clipBounds);
 
@@ -200,7 +198,7 @@ - (CGPathRef)getPath:(CGContextRef)context
   CGMutablePathRef __block path = CGPathCreateMutable();
   [self traverseSubviews:^(RNSVGNode *node) {
     if ([node isKindOfClass:[RNSVGNode class]] && ![node isKindOfClass:[RNSVGMask class]]) {
-      CGAffineTransform transform = CGAffineTransformConcat(node.matrix, node.transforms);
+      CGAffineTransform transform = node.matrix;
       CGPathAddPath(path, &transform, [node getPath:context]);
       CGPathAddPath(path, &transform, [node markerPath]);
       node.dirty = false;
@@ -216,7 +214,6 @@ - (CGPathRef)getPath:(CGContextRef)context
 - (RNSVGPlatformView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 {
   CGPoint transformed = CGPointApplyAffineTransform(point, self.invmatrix);
-  transformed = CGPointApplyAffineTransform(transformed, self.invTransform);
 
   if (!CGRectContainsPoint(self.pathBounds, transformed)) {
     return nil;

apple/Elements/RNSVGImage.mm

@@ -356,9 +356,8 @@ - (void)renderLayerTo:(CGContextRef)context rect:(CGRect)rect
   self.ctm = svgToClientTransform;
   self.screenCTM = current;
 
-  CGAffineTransform transform = CGAffineTransformConcat(self.matrix, self.transforms);
   CGPoint mid = CGPointMake(CGRectGetMidX(bounds), CGRectGetMidY(bounds));
-  CGPoint center = CGPointApplyAffineTransform(mid, transform);
+  CGPoint center = CGPointApplyAffineTransform(mid, self.matrix);
 
   self.bounds = bounds;
   if (!isnan(center.x) && !isnan(center.y)) {

apple/Elements/RNSVGUse.mm

@@ -176,9 +176,8 @@ - (void)renderLayerTo:(CGContextRef)context rect:(CGRect)rect
   self.ctm = svgToClientTransform;
   self.screenCTM = current;
 
-  CGAffineTransform transform = CGAffineTransformConcat(self.matrix, self.transforms);
   CGPoint mid = CGPointMake(CGRectGetMidX(bounds), CGRectGetMidY(bounds));
-  CGPoint center = CGPointApplyAffineTransform(mid, transform);
+  CGPoint center = CGPointApplyAffineTransform(mid, self.matrix);
 
   self.bounds = bounds;
   if (!isnan(center.x) && !isnan(center.y)) {
@@ -190,7 +189,6 @@ - (void)renderLayerTo:(CGContextRef)context rect:(CGRect)rect
 - (RNSVGPlatformView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 {
   CGPoint transformed = CGPointApplyAffineTransform(point, self.invmatrix);
-  transformed = CGPointApplyAffineTransform(transformed, self.invTransform);
   RNSVGNode const *definedTemplate = [self.svgView getDefinedTemplate:self.href];
   if (event) {
     self.active = NO;

apple/RNSVGNode.h

@@ -48,9 +48,7 @@ extern CGFloat const RNSVG_DEFAULT_FONT_SIZE;
 @property (nonatomic, assign) CGAffineTransform ctm;
 @property (nonatomic, assign) CGAffineTransform screenCTM;
 @property (nonatomic, assign) CGAffineTransform matrix;
-@property (nonatomic, assign) CGAffineTransform transforms;
 @property (nonatomic, assign) CGAffineTransform invmatrix;
-@property (nonatomic, assign) CGAffineTransform invTransform;
 @property (nonatomic, assign) BOOL active;
 @property (nonatomic, assign) BOOL dirty;
 @property (nonatomic, assign) BOOL merging;
@@ -148,4 +146,6 @@ extern CGFloat const RNSVG_DEFAULT_FONT_SIZE;
 
 - (CGFloat)getCanvasHeight;
 
+- (void)setTransforms:(CGAffineTransform)transforms;
+
 @end

apple/RNSVGNode.mm

@@ -38,8 +38,6 @@ - (instancetype)init
     self.opaque = false;
 #endif
     self.matrix = CGAffineTransformIdentity;
-    self.transforms = CGAffineTransformIdentity;
-    self.invTransform = CGAffineTransformIdentity;
     _merging = false;
     _dirty = false;
   }
@@ -250,11 +248,11 @@ - (void)setMatrix:(CGAffineTransform)matrix
 
 - (void)setTransforms:(CGAffineTransform)transforms
 {
-  if (CGAffineTransformEqualToTransform(transforms, _transforms)) {
+  if (CGAffineTransformEqualToTransform(transforms, _matrix)) {
     return;
   }
 
-  _transforms = transforms;
+  _matrix = transforms;
   [self invalidate];
 }
 
@@ -377,7 +375,7 @@ - (CGPathRef)getClipPath:(CGContextRef)context
     if (_cachedClipPath) {
       CGPathRelease(_cachedClipPath);
     }
-    CGAffineTransform transform = CGAffineTransformConcat(_clipNode.matrix, _clipNode.transforms);
+    CGAffineTransform transform = _clipNode.matrix;
     _cachedClipPath = CGPathCreateCopyByTransformingPath([_clipNode getPath:context], &transform);
   }
 
@@ -630,8 +628,6 @@ - (void)prepareForRecycle
   self.opaque = false;
 #endif
   self.matrix = CGAffineTransformIdentity;
-  self.transforms = CGAffineTransformIdentity;
-  self.invTransform = CGAffineTransformIdentity;
   _merging = false;
   _dirty = false;
 
@@ -652,9 +648,7 @@ - (void)prepareForRecycle
   _ctm = CGAffineTransformIdentity;
   _screenCTM = CGAffineTransformIdentity;
   _matrix = CGAffineTransformIdentity;
-  _transforms = CGAffineTransformIdentity;
   _invmatrix = CGAffineTransformIdentity;
-  _invTransform = CGAffineTransformIdentity;
   _active = NO;
   _skip = NO;
   if (_markerPath) {

apple/RNSVGRenderable.mm

@@ -255,7 +255,6 @@ - (void)renderTo:(CGContextRef)context rect:(CGRect)rect
   // This needs to be painted on a layer before being composited.
   CGContextSaveGState(context);
   CGContextConcatCTM(context, self.matrix);
-  CGContextConcatCTM(context, self.transforms);
   CGContextSetAlpha(context, self.opacity);
 
   [self beginTransparencyLayer:context];
@@ -530,8 +529,7 @@ - (void)renderLayerTo:(CGContextRef)context rect:(CGRect)rect
   }
 
   CGAffineTransform vbmatrix = self.svgView.getViewBoxTransform;
-  CGAffineTransform transform = CGAffineTransformConcat(self.matrix, self.transforms);
-  CGAffineTransform matrix = CGAffineTransformConcat(transform, vbmatrix);
+  CGAffineTransform matrix = CGAffineTransformConcat(self.matrix, vbmatrix);
 
   CGRect bounds = CGRectMake(0, 0, CGRectGetWidth(clientRect), CGRectGetHeight(clientRect));
   CGPoint mid = CGPointMake(CGRectGetMidX(pathBounds), CGRectGetMidY(pathBounds));
@@ -687,7 +685,6 @@ - (RNSVGPlatformView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
   }
 
   CGPoint transformed = CGPointApplyAffineTransform(point, self.invmatrix);
-  transformed = CGPointApplyAffineTransform(transformed, self.invTransform);
 
   if (!CGRectContainsPoint(self.pathBounds, transformed) && !CGRectContainsPoint(self.markerBounds, transformed)) {
     return nil;

apple/Utils/RNSVGFabricConversions.h

@@ -71,11 +71,12 @@ void setCommonNodeProps(const T &nodeProps, RNSVGNode *node)
         nodeProps.matrix.at(4),
         nodeProps.matrix.at(5));
   }
-  auto newTransform = nodeProps.resolveTransform(MinimalLayoutMetrics);
-  CATransform3D transform3d = RCTCATransform3DFromTransformMatrix(newTransform);
-  CGAffineTransform transform = CATransform3DGetAffineTransform(transform3d);
-  node.invTransform = CGAffineTransformInvert(transform);
-  node.transforms = transform;
+  if (nodeProps.transform.operations.size() > 0) {
+    auto newTransform = nodeProps.resolveTransform(MinimalLayoutMetrics);
+    CATransform3D transform3d = RCTCATransform3DFromTransformMatrix(newTransform);
+    CGAffineTransform transform = CATransform3DGetAffineTransform(transform3d);
+    node.transforms = transform;
+  }
   node.mask = RCTNSStringFromStringNilIfEmpty(nodeProps.mask);
   node.markerStart = RCTNSStringFromStringNilIfEmpty(nodeProps.markerStart);
   node.markerMid = RCTNSStringFromStringNilIfEmpty(nodeProps.markerMid);

apple/ViewManagers/RNSVGNodeManager.mm

@@ -32,7 +32,6 @@ - (RNSVGPlatformView *)view
 {
   CATransform3D transform3d = json ? [RCTConvert CATransform3D:json] : defaultView.layer.transform;
   CGAffineTransform transform = CATransform3DGetAffineTransform(transform3d);
-  view.invTransform = CGAffineTransformInvert(transform);
   view.transforms = transform;
 }
 RCT_EXPORT_VIEW_PROPERTY(mask, NSString)