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

BREAKING [react_native/css_layout] Update RN shadow nodes to hold CSSNode instead of extending CSSNode

Browse Source 
Summary:
@public

This diff makes it so ReactShadowNode holds a CSSNode instead of extending one. This will enable us to pool and re-use CSSNodes and will allow us to keep from breaking the CSSNode api assumption that nodes that have measure functions don't have children (right now, text nodes have measure functions, but they also have raw text children).

BREAKING
This diff makes ReactShadowNode no longer extend CSSNodeDEPRECATED. If you have code that depended on that, e.g. via instanceof checks, that will no longer work as expected. Subclasses that override getChildAt/addChildAt/etc will need to update your method signatures. There should be no runtime behavior changes.

Reviewed By: emilsjolander

Differential Revision: D4153818
This commit is contained in:
Andy Street
2016-11-14 04:34:57 -08:00
committed by Ahmed El-Helw
parent 947e885487
commit 1d555bff22
6 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReactAndroid/src/main/java/com/facebook/react/flat/FlatReactModalShadowNode.java
View File

@@ -16,7 +16,7 @@ import android.view.Display;
import android.view.Surface;
import android.view.WindowManager;
import com.facebook.csslayout.CSSNodeDEPRECATED;
import com.facebook.react.uimanager.ReactShadowNode;
/**
* FlatReactModalShadowNode
@@ -45,7 +45,7 @@ class FlatReactModalShadowNode extends FlatShadowNode implements AndroidView {
*/
@Override
@TargetApi(16)
public void addChildAt(CSSNodeDEPRECATED child, int i) {
public void addChildAt(ReactShadowNode child, int i) {
super.addChildAt(child, i);
Context context = getThemedContext();

9
ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootShadowNode.java
View File

@@ -18,13 +18,4 @@ package com.facebook.react.flat;
forceMountToView();
signalBackingViewIsCreated();
}
/**
* Returns true when this CSSNodeDEPRECATED tree needs to be re-laid out. If true, FlatUIImplementation
* will request LayoutEngine to perform a layout pass to update node boundaries. This is used
* to avoid unnecessary node updates.
*/
/* package */ boolean needsLayout() {
return isDirty();
}
}

2
ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
View File

@@ -201,7 +201,7 @@ import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
}
@Override
public void addChildAt(CSSNodeDEPRECATED child, int i) {
public void addChildAt(ReactShadowNode child, int i) {
super.addChildAt(child, i);
if (mForceMountChildrenToView && child instanceof FlatShadowNode) {
((FlatShadowNode) child).forceMountToView();

2
ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
View File

@@ -115,7 +115,7 @@ public class FlatUIImplementation extends UIImplementation {
ReactShadowNode node = new FlatRootShadowNode();
I18nUtil sharedI18nUtilInstance = I18nUtil.getInstance();
if (sharedI18nUtilInstance.isRTL(mReactContext)) {
node.setDirection(CSSDirection.RTL);
node.setLayoutDirection(CSSDirection.RTL);
}
return node;
}

3
ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java
View File

@@ -11,7 +11,6 @@ package com.facebook.react.flat;
import javax.annotation.Nullable;
import com.facebook.csslayout.CSSNodeDEPRECATED;
import com.facebook.csslayout.CSSNodeAPI;
import com.facebook.react.uimanager.ReactStylesDiffMap;
import com.facebook.react.uimanager.ReactShadowNode;
@@ -93,7 +92,7 @@ import com.facebook.react.uimanager.ViewManager;
}
@Override
public void addChildAt(CSSNodeDEPRECATED child, int i) {
public void addChildAt(ReactShadowNode child, int i) {
super.addChildAt(child, i);
if (mForceMountGrandChildrenToView && child instanceof FlatShadowNode) {
((FlatShadowNode) child).forceMountChildrenToView();

3
ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualText.java
View File

@@ -19,6 +19,7 @@ import android.text.TextUtils;
import com.facebook.csslayout.CSSNodeDEPRECATED;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.ReactShadowNode;
import com.facebook.react.uimanager.ViewProps;
import com.facebook.react.uimanager.annotations.ReactProp;
@@ -40,7 +41,7 @@ import com.facebook.react.uimanager.annotations.ReactProp;
private ShadowStyleSpan mShadowStyleSpan = ShadowStyleSpan.INSTANCE;
@Override
public void addChildAt(CSSNodeDEPRECATED child, int i) {
public void addChildAt(ReactShadowNode child, int i) {
super.addChildAt(child, i);
notifyChanged(true);
}