diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java index e173b0795..ecdfd2837 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java @@ -149,6 +149,7 @@ public class UIManagerModule extends ReactContextBaseJavaModule implements getReactApplicationContext().unregisterComponentCallbacks(mMemoryTrimCallback); YogaNodePool.get().clear(); + ViewManagerPropertyUpdater.clear(); } private static Map createConstants( diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerPropertyUpdater.java index 363c50a0a..47d9ecf1c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerPropertyUpdater.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerPropertyUpdater.java @@ -30,6 +30,12 @@ public class ViewManagerPropertyUpdater { new HashMap<>(); private static final Map, ShadowNodeSetter> SHADOW_NODE_SETTER_MAP = new HashMap<>(); + public static void clear() { + ViewManagersPropertyCache.clear(); + VIEW_MANAGER_SETTER_MAP.clear(); + SHADOW_NODE_SETTER_MAP.clear(); + } + public static void updateProps( T manager, V v, diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java index 43d2509de..cfdd34be2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java @@ -28,6 +28,11 @@ import com.facebook.react.uimanager.annotations.ReactPropGroup; private static final Map> CLASS_PROPS_CACHE = new HashMap<>(); private static final Map EMPTY_PROPS_MAP = new HashMap<>(); + public static void clear() { + CLASS_PROPS_CACHE.clear(); + EMPTY_PROPS_MAP.clear(); + } + /*package*/ static abstract class PropSetter { protected final String mPropName;