fix: getScreenCTM calculation

software-mansion · Oct 5, 2019 · 5c5072d · 5c5072d
1 parent f3e0b19
commit 5c5072d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/android/src/main/java/com/horcrux/svg/RNSVGRenderableManager.java b/android/src/main/java/com/horcrux/svg/RNSVGRenderableManager.java
@@ -189,15 +189,16 @@ public void getScreenCTM(int tag, Callback successCallback) {
         RenderableView svg = RenderableViewManager.getRenderableViewByTag(tag);
         Matrix screenCTM = svg.mCTM;
         SvgView root = svg.getSvgView();
+        float scale = svg.mScale;
         float[] values = new float[9];
         screenCTM.getValues(values);
         WritableMap result = Arguments.createMap();
         result.putDouble("a", values[Matrix.MSCALE_X]);
         result.putDouble("b", values[Matrix.MSKEW_Y]);
         result.putDouble("c", values[Matrix.MSKEW_X]);
         result.putDouble("d", values[Matrix.MSCALE_Y]);
-        result.putDouble("e", values[Matrix.MTRANS_X] + root.getLeft());
-        result.putDouble("f", values[Matrix.MTRANS_Y] + root.getTop());
+        result.putDouble("e", values[Matrix.MTRANS_X] + root.getLeft() / scale);
+        result.putDouble("f", values[Matrix.MTRANS_Y] + root.getTop() / scale);
         successCallback.invoke(result);
     }
 }
diff --git a/ios/Elements/RNSVGSvgView.h b/ios/Elements/RNSVGSvgView.h
@@ -28,6 +28,7 @@
 @property (nonatomic, assign) CGRect boundingBox;
 @property (nonatomic, assign) CGAffineTransform initialCTM;
 @property (nonatomic, assign) CGAffineTransform invInitialCTM;
+@property (nonatomic, assign) CGAffineTransform viewBoxTransform;
 
 
 

diff --git a/ios/Elements/RNSVGSvgView.m b/ios/Elements/RNSVGSvgView.m
@@ -18,7 +18,6 @@ @implementation RNSVGSvgView
     NSMutableDictionary<NSString *, RNSVGPainter *> *_painters;
     NSMutableDictionary<NSString *, RNSVGNode *> *_markers;
     NSMutableDictionary<NSString *, RNSVGNode *> *_masks;
-    CGAffineTransform _viewBoxTransform;
     CGAffineTransform _invviewBoxTransform;
     bool rendered;
 }

diff --git a/ios/ViewManagers/RNSVGRenderableManager.m b/ios/ViewManagers/RNSVGRenderableManager.m
@@ -226,12 +226,12 @@ - (void)withTag:(nonnull NSNumber *)reactTag success:(RNSVGSuccessBlock)successB
          callback(
                   @[
                     @{
-                        @"a":n(ctm.a),
-                        @"b":n(ctm.b),
-                        @"c":n(ctm.c),
-                        @"d":n(ctm.d),
-                        @"e":n(ctm.tx),
-                        @"f":n(ctm.ty)
+                        @"a":@(ctm.a),
+                        @"b":@(ctm.b),
+                        @"c":@(ctm.c),
+                        @"d":@(ctm.d),
+                        @"e":@(ctm.tx),
+                        @"f":@(ctm.ty)
                         }
                     ]
                   );
@@ -242,25 +242,24 @@ - (void)withTag:(nonnull NSNumber *)reactTag success:(RNSVGSuccessBlock)successB
      attempt:0];
 }
 
-static NSNumber *n(CGFloat af) {
-    return [NSNumber numberWithDouble:af];
-}
-
 RCT_EXPORT_METHOD(getScreenCTM:(nonnull NSNumber *)reactTag callback:(RCTResponseSenderBlock)callback)
 {
     [self
      withTag:reactTag
      success:^(RNSVGRenderable *svg){
-         CGAffineTransform ctm = svg.screenCTM;
+         RNSVGSvgView* root = svg.svgView;
+         CGAffineTransform viewbox = [root getViewBoxTransform];
+         CGAffineTransform ctm = CGAffineTransformConcat(svg.ctm, viewbox);
+         CGPoint offset = [root convertPoint:CGPointZero toView:svg.window];
          callback(
                   @[
                     @{
-                        @"a":n(ctm.a),
-                        @"b":n(ctm.b),
-                        @"c":n(ctm.c),
-                        @"d":n(ctm.d),
-                        @"e":n(ctm.tx),
-                        @"f":n(ctm.ty)
+                        @"a":@(ctm.a),
+                        @"b":@(ctm.b),
+                        @"c":@(ctm.c),
+                        @"d":@(ctm.d),
+                        @"e":@(ctm.tx + offset.x),
+                        @"f":@(ctm.ty + offset.y)
                         }
                     ]
                   );