From 41134b86362420c1198e884ad45643555c166913 Mon Sep 17 00:00:00 2001
From: Mikael Sand <msand@abo.fi>
Date: Sun, 19 Aug 2018 21:49:49 +0300
Subject: [PATCH] Improve width and height calculation

---
 .../main/java/com/horcrux/svg/SvgViewShadowNode.java | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java b/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java
index ee255282..cceaf198 100644
--- a/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java
+++ b/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java
@@ -29,7 +29,6 @@ import com.facebook.react.uimanager.annotations.ReactProp;
 import java.io.ByteArrayOutputStream;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Stack;
 
 /**
  * Shadow node for RNSVG virtual tree root - RNSVGSvgView
@@ -157,15 +156,12 @@ public class SvgViewShadowNode extends LayoutShadowNode {
         mCanvas = canvas;
         if (mAlign != null) {
             RectF vbRect = getViewBox();
-            float width;
-            float height;
+            float width = canvas.getWidth();
+            float height = canvas.getHeight();
             boolean nested = getNativeParent() instanceof SvgViewShadowNode;
             if (nested) {
-                width = (float) PropHelper.fromRelative(mbbWidth, canvas.getWidth(), 0f, mScale, 12);
-                height = (float) PropHelper.fromRelative(mbbHeight, canvas.getHeight(), 0f, mScale, 12);
-            } else {
-                width = getLayoutWidth();
-                height = getLayoutHeight();
+                width = (float) PropHelper.fromRelative(mbbWidth, width, 0f, mScale, 12);
+                height = (float) PropHelper.fromRelative(mbbHeight, height, 0f, mScale, 12);
             }
             RectF eRect = new RectF(0,0, width, height);
             if (nested) {