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

Reverted commit D3811226 

Reviewed By: astreet

Differential Revision: D3811226

fbshipit-source-id: 8ade5ef6c34e117fb10a000034b9900f8a56087d
This commit is contained in:
Konstantin Raev 2016-09-07 03:00:00 -07:00 committed by Facebook Github Bot 3
parent 6fb149596a
commit a13e1c4e2c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
View File

@ -80,7 +80,19 @@ public class ReactRootView extends SizeMonitoringFrameLayout implements RootView
@Override @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec); int widthMode = MeasureSpec.getMode(widthMeasureSpec);
int heightMode = MeasureSpec.getMode(heightMeasureSpec);
if (widthMode == MeasureSpec.UNSPECIFIED || heightMode == MeasureSpec.UNSPECIFIED) {
throw new IllegalStateException(
"The root catalyst view must have a width and height given to it by it's parent view. " +
"You can do this by specifying MATCH_PARENT or explicit width and height in the " +
"layout. widthMode=" + widthMode + ", heightMode=" + heightMode);
}
setMeasuredDimension(
MeasureSpec.getSize(widthMeasureSpec),
MeasureSpec.getSize(heightMeasureSpec));
mWasMeasured = true; mWasMeasured = true;
// Check if we were waiting for onMeasure to attach the root view // Check if we were waiting for onMeasure to attach the root view