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

Fix setMeasureFunction during cloning

Browse Source 
Reviewed By: achen1

Differential Revision: D7753602

fbshipit-source-id: 284ec13b4cd784dfc61eeb0205f5779847854aac
This commit is contained in:
David Vacca
2018-04-25 09:43:27 -07:00
committed by Facebook Github Bot
parent c6b96c0df7
commit 409dbd2057
6 changed files with 71 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java
View File

@@ -7,6 +7,7 @@
package com.facebook.react.views.progressbar;
import com.facebook.react.uimanager.ReactShadowNodeImpl;
import javax.annotation.Nullable;
import java.util.HashSet;
@@ -41,7 +42,7 @@ public class ProgressBarShadowNode extends LayoutShadowNode implements YogaMeasu
mHeight = new SparseIntArray();
mWidth = new SparseIntArray();
mMeasured = new HashSet<>();
setMeasureFunction(this);
initMeasureFunction();
}
public ProgressBarShadowNode(ProgressBarShadowNode node) {
@@ -49,11 +50,28 @@ public class ProgressBarShadowNode extends LayoutShadowNode implements YogaMeasu
mWidth = node.mWidth.clone();
mHeight = node.mHeight.clone();
mMeasured = new HashSet<>(node.mMeasured);
}
@Override
public ReactShadowNodeImpl mutableCopyWithNewChildren() {
ProgressBarShadowNode node = (ProgressBarShadowNode) super.mutableCopyWithNewChildren();
node.initMeasureFunction();
return node;
}
private void initMeasureFunction() {
setMeasureFunction(this);
}
@Override
protected ProgressBarShadowNode copy() {
public ReactShadowNodeImpl mutableCopy() {
ProgressBarShadowNode node = (ProgressBarShadowNode) super.mutableCopy();
node.initMeasureFunction();
return node;
}
@Override
public ProgressBarShadowNode copy() {
return new ProgressBarShadowNode(this);
}

15
ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
View File

@@ -17,6 +17,7 @@ import android.widget.SeekBar;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.common.MapBuilder;
import com.facebook.react.uimanager.LayoutShadowNode;
import com.facebook.react.uimanager.ReactShadowNodeImpl;
import com.facebook.react.uimanager.SimpleViewManager;
import com.facebook.react.uimanager.ThemedReactContext;
import com.facebook.react.uimanager.UIManagerModule;
@@ -63,6 +64,20 @@ public class ReactSliderManager extends SimpleViewManager<ReactSlider> {
setMeasureFunction(this);
}
@Override
public ReactShadowNodeImpl mutableCopy() {
ReactSliderShadowNode reactShadowNode = (ReactSliderShadowNode) super.mutableCopy();
reactShadowNode.initMeasureFunction();
return reactShadowNode;
}
@Override
public ReactShadowNodeImpl mutableCopyWithNewChildren() {
ReactSliderShadowNode reactShadowNode = (ReactSliderShadowNode) super.mutableCopyWithNewChildren();
reactShadowNode.initMeasureFunction();
return reactShadowNode;
}
@Override
protected ReactSliderShadowNode copy() {
return new ReactSliderShadowNode(this);

16
ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
View File

@@ -13,6 +13,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.CompoundButton;
import com.facebook.react.uimanager.ReactShadowNodeImpl;
import com.facebook.yoga.YogaMeasureMode;
import com.facebook.yoga.YogaMeasureFunction;
import com.facebook.yoga.YogaNode;
@@ -48,13 +49,26 @@ public class ReactSwitchManager extends SimpleViewManager<ReactSwitch> {
mWidth = node.mWidth;
mHeight = node.mHeight;
mMeasured = node.mMeasured;
initMeasureFunction();
}
private void initMeasureFunction() {
setMeasureFunction(this);
}
@Override
public ReactShadowNodeImpl mutableCopy() {
ReactSwitchShadowNode reactShadowNode = (ReactSwitchShadowNode) super.mutableCopy();
reactShadowNode.initMeasureFunction();
return reactShadowNode;
}
@Override
public ReactShadowNodeImpl mutableCopyWithNewChildren() {
ReactSwitchShadowNode reactShadowNode = (ReactSwitchShadowNode) super.mutableCopyWithNewChildren();
reactShadowNode.initMeasureFunction();
return reactShadowNode;
}
@Override
protected ReactSwitchShadowNode copy() {
return new ReactSwitchShadowNode(this);

10
ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
View File

@@ -46,7 +46,7 @@ public class ReactTextInputShadowNode extends ReactBaseTextShadowNode
mTextBreakStrategy = (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) ?
0 : Layout.BREAK_STRATEGY_SIMPLE;
setMeasureFunction(this);
initMeasureFunction();
}
private ReactTextInputShadowNode(ReactTextInputShadowNode node) {
@@ -64,7 +64,7 @@ public class ReactTextInputShadowNode extends ReactBaseTextShadowNode
@Override
public ReactTextInputShadowNode mutableCopy() {
ReactTextInputShadowNode node = (ReactTextInputShadowNode) super.mutableCopy();
node.setMeasureFunction(this);
node.initMeasureFunction();
ThemedReactContext themedContext = getThemedContext();
if (themedContext != null) {
node.setThemedContext(themedContext);
@@ -72,10 +72,14 @@ public class ReactTextInputShadowNode extends ReactBaseTextShadowNode
return node;
}
private void initMeasureFunction() {
setMeasureFunction(this);
}
@Override
public ReactTextInputShadowNode mutableCopyWithNewChildren() {
ReactTextInputShadowNode node = (ReactTextInputShadowNode) super.mutableCopyWithNewChildren();
node.setMeasureFunction(this);
node.initMeasureFunction();
ThemedReactContext themedContext = getThemedContext();
if (themedContext != null) {
node.setThemedContext(themedContext);