kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-06 09:31:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for custom AndroidViews

Browse Source 
Summary: This diff adds an `AndroidView` as a proxy for custom Views in FlatUIImplementation. Any ReactShadowNode that FlatUIImplementation doesn't recognize (because they don't extend from FlatShadowNode) will be wrapped with AndroidView to ensure that it measures and displays correctly. While not perfect, this is the easiest way to support custom Views (EditTexts, DrawerLayouts, ScrollViews etc).

Reviewed By: ahmedre

Differential Revision: D2751716
This commit is contained in:
Denis Koroskin
2015-12-15 20:07:57 -08:00
committed by Ahmed El-Helw
parent 1da7049426
commit dbe9cc333c
4 changed files with 133 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java
View File

@@ -149,7 +149,14 @@ import com.facebook.react.uimanager.CatalystStylesDiffMap;
mNodeRegions.start(node.getNodeRegions());
mNativeChildren.start(node.getNativeChildren());
collectStateRecursively(node, 0, 0, width, height);
boolean isAndroidView = false;
boolean needsCustomLayoutForChildren = false;
if (node instanceof AndroidView) {
isAndroidView = true;
needsCustomLayoutForChildren = ((AndroidView) node).needsCustomLayoutForChildren();
}
collectStateRecursively(node, 0, 0, width, height, isAndroidView, needsCustomLayoutForChildren);
boolean shouldUpdateMountState = false;
final DrawCommand[] drawCommands = mDrawCommands.finish();
@@ -248,7 +255,9 @@ import com.facebook.react.uimanager.CatalystStylesDiffMap;
float left,
float top,
float right,
float bottom) {
float bottom,
boolean isAndroidView,
boolean needsCustomLayoutForChildren) {
if (node.hasNewLayout()) {
node.markLayoutSeen();
}
@@ -257,7 +266,7 @@ import com.facebook.react.uimanager.CatalystStylesDiffMap;
for (int i = 0, childCount = node.getChildCount(); i != childCount; ++i) {
FlatShadowNode child = (FlatShadowNode) node.getChildAt(i);
processNodeAndCollectState(child, left, top);
processNodeAndCollectState(child, left, top, isAndroidView, needsCustomLayoutForChildren);
}
}
@@ -267,7 +276,9 @@ import com.facebook.react.uimanager.CatalystStylesDiffMap;
private void processNodeAndCollectState(
FlatShadowNode node,
float parentLeft,
float parentTop) {
float parentTop,
boolean parentIsAndroidView,
boolean needsCustomLayout) {
int tag = node.getReactTag();
float width = node.getLayoutWidth();
@@ -284,12 +295,17 @@ import com.facebook.react.uimanager.CatalystStylesDiffMap;
ensureBackingViewIsCreated(node, tag, null);
addNativeChild(node);
mDrawCommands.add(DrawView.INSTANCE);
if (!parentIsAndroidView) {
mDrawCommands.add(DrawView.INSTANCE);
}
collectStateForMountableNode(node, tag, width, height);
mViewsToUpdateBounds.add(node);
if (!needsCustomLayout) {
mViewsToUpdateBounds.add(node);
}
} else {
collectStateRecursively(node, left, top, right, bottom);
collectStateRecursively(node, left, top, right, bottom, false, false);
addNodeRegion(node.getNodeRegion());
}
}