From 30cbc31c6794e8f603f958f8bd3cebc41ca76c55 Mon Sep 17 00:00:00 2001
From: Mikael Sand <msand@abo.fi>
Date: Tue, 8 Jan 2019 02:12:40 +0200
Subject: [PATCH] [android] Fix cache invalidation

---
 .../main/java/com/horcrux/svg/VirtualView.java | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/android/src/main/java/com/horcrux/svg/VirtualView.java b/android/src/main/java/com/horcrux/svg/VirtualView.java
index 3d466d42..43dda73c 100644
--- a/android/src/main/java/com/horcrux/svg/VirtualView.java
+++ b/android/src/main/java/com/horcrux/svg/VirtualView.java
@@ -8,7 +8,6 @@ import android.graphics.Path;
 import android.graphics.RectF;
 import android.graphics.Region;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.ViewParent;
 
 import com.facebook.common.logging.FLog;
@@ -96,6 +95,7 @@ abstract public class VirtualView extends ReactViewGroup {
     public void invalidate() {
         super.invalidate();
         clearPath();
+        clearPathsUpToRoot();
     }
 
     private void clearPath() {
@@ -103,6 +103,7 @@ abstract public class VirtualView extends ReactViewGroup {
         canvasHeight = -1;
         canvasWidth = -1;
         fontSize = -1;
+        mStrokeRegion = null;
         mRegion = null;
         mPath = null;
     }
@@ -117,6 +118,18 @@ abstract public class VirtualView extends ReactViewGroup {
         }
     }
 
+    private void clearPathsUpToRoot() {
+        VirtualView node = this;
+        while (true) {
+            ViewParent parent = node.getParent();
+            if (!(parent instanceof VirtualView)) {
+                return;
+            }
+            node.clearPath();
+            node = (VirtualView)parent;
+        }
+    }
+
     @Nullable
     GroupView getTextRoot() {
         VirtualView node = this;
@@ -254,6 +267,7 @@ abstract public class VirtualView extends ReactViewGroup {
         }
 
         super.invalidate();
+        clearPathsUpToRoot();
     }
 
     @ReactProp(name = "responsible")
@@ -465,8 +479,6 @@ abstract public class VirtualView extends ReactViewGroup {
      * @param pright Right position, relative to parent
      * @param pbottom Bottom position, relative to parent
      */
-
-    RectF layoutRect = new RectF();
     protected void onLayout(boolean changed, int pleft, int ptop, int pright, int pbottom) {
         if (mClientRect == null) {
             return;