From ac929ef4f6069dfbf4a9be93a33dd938b3801e6c Mon Sep 17 00:00:00 2001 From: David Vacca Date: Mon, 5 Mar 2018 21:07:37 -0800 Subject: [PATCH] Fix subtle bugs in cloning and FabricUIManager Reviewed By: achen1 Differential Revision: D7164980 fbshipit-source-id: 86e9f3f11b67c8947b177aac23f99808083c3121 --- .../main/java/com/facebook/react/fabric/FabricUIManager.java | 1 + .../java/com/facebook/react/uimanager/ReactShadowNodeImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java index ed8369cba..4ac993cf5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -64,6 +64,7 @@ public class FabricUIManager implements UIManager { ReactShadowNode node = viewManager.createShadowNodeInstance(mReactApplicationContext); ReactShadowNode rootNode = getRootNode(rootTag); node.setRootNode(rootNode); + node.setViewClassName(viewName); node.setReactTag(reactTag); node.setThemedContext(rootNode.getThemedContext()); diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java index fe807cfc2..5624324c0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java @@ -104,7 +104,7 @@ public class ReactShadowNodeImpl implements ReactShadowNode mShouldNotifyOnLayout = original.mShouldNotifyOnLayout; mNodeUpdated = original.mNodeUpdated; mChildren = original.mChildren == null ? null : new ArrayList<>(original.mChildren); - mParent = original.mParent; + mParent = null; mIsLayoutOnly = original.mIsLayoutOnly; mTotalNativeChildren = original.mTotalNativeChildren; mNativeParent = original.mNativeParent;