diff --git a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js index 2a430d46369..07925d69450 100644 --- a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js +++ b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js @@ -141,7 +141,7 @@ class ViewPagerAndroid extends React.Component { }; componentDidMount() { - if (this.props.initialPage) { + if (this.props.initialPage != null) { this.setPageWithoutAnimation(this.props.initialPage); } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollEvent.java index 79a4cca9146..6eeac56d747 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollEvent.java @@ -34,7 +34,10 @@ import com.facebook.react.uimanager.events.RCTEventEmitter; protected PageScrollEvent(int viewTag, int position, float offset) { super(viewTag); mPosition = position; - mOffset = offset; + + // folly::toJson default options don't support serialize NaN or Infinite value + mOffset = (Float.isInfinite(offset) || Float.isNaN(offset)) + ? 0.0f : offset; } @Override