status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Support multiple Fabric ReactRootView running at the same time 

Reviewed By: achen1

Differential Revision: D7409472

fbshipit-source-id: 9525e610f3bce49cae8d3c5e4427f99a48c32091
This commit is contained in:
David Vacca 2018-03-27 10:44:15 -07:00 committed by Facebook Github Bot
parent 0150a0c85b
commit 45abbf36d6
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
View File

@ -50,7 +50,6 @@ public class FabricUIManager implements UIManager {
private final ViewManagerRegistry mViewManagerRegistry;
private final UIViewOperationQueue mUIViewOperationQueue;
private volatile int mCurrentBatch = 0;
private ReactShadowNode mCurrentRootShadowNode;
private FabricReconciler mFabricReconciler;
public FabricUIManager(
@ -246,32 +245,32 @@ public class FabricUIManager implements UIManager {
Log.d(TAG, "completeRoot rootTag: " + rootTag + ", childList: " + childList);
}
try {
ReactShadowNode rootNode = getRootNode(rootTag);
ReactShadowNode currentRootShadowNode = getRootNode(rootTag);
Assertions.assertNotNull(
rootNode,
currentRootShadowNode,
"Root view with tag " + rootTag + " must be added before completeRoot is called");
rootNode = calculateDiffingAndCreateNewRootNode(rootNode, childList);
currentRootShadowNode = calculateDiffingAndCreateNewRootNode(currentRootShadowNode, childList);
if (DEBUG) {
Log.d(TAG, "ReactShadowNodeHierarchy after diffing: " + rootNode.getHierarchyInfo());
Log.d(TAG, "ReactShadowNodeHierarchy after diffing: " + currentRootShadowNode.getHierarchyInfo());
}
notifyOnBeforeLayoutRecursive(rootNode);
rootNode.calculateLayout();
notifyOnBeforeLayoutRecursive(currentRootShadowNode);
currentRootShadowNode.calculateLayout();
if (DEBUG) {
Log.d(
TAG,
"ReactShadowNodeHierarchy after calculate Layout: " + rootNode.getHierarchyInfo());
"ReactShadowNodeHierarchy after calculate Layout: " + currentRootShadowNode.getHierarchyInfo());
}
applyUpdatesRecursive(rootNode, 0, 0);
applyUpdatesRecursive(currentRootShadowNode, 0, 0);
mUIViewOperationQueue.dispatchViewUpdates(
mCurrentBatch++, System.currentTimeMillis(), System.currentTimeMillis());
mCurrentRootShadowNode = rootNode;
mRootShadowNodeRegistry.addNode(currentRootShadowNode);
} catch (Exception e) {
handleException(getRootNode(rootTag), e);
}
@ -294,7 +293,7 @@ public class FabricUIManager implements UIManager {
appendChild(newRootShadowNode, child);
}
mFabricReconciler.manageChildren(mCurrentRootShadowNode, newRootShadowNode);
mFabricReconciler.manageChildren(currentRootShadowNode, newRootShadowNode);
return newRootShadowNode;
}
@ -321,7 +320,7 @@ public class FabricUIManager implements UIManager {
}
@Override
public <T extends SizeMonitoringFrameLayout & MeasureSpecProvider> int addRootView(
public synchronized <T extends SizeMonitoringFrameLayout & MeasureSpecProvider> int addRootView(
final T rootView) {
int rootTag = ReactRootViewTagGenerator.getNextRootViewTag();
ThemedReactContext themedRootContext =