view pager allows setPage without animation

machard · Nov 6, 2015 · 7fe9e78 · 7fe9e78 · machard · Nov 6, 2015
1 parent 48278f8
commit 7fe9e78
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js
@@ -18,6 +18,7 @@ var VIEWPAGER_REF = 'viewPager';
 
 var ViewPagerValidAttributes = {
   selectedPage: true,
+  showAnimation: true
 };
 
 /**
@@ -148,15 +149,17 @@ var ViewPagerAndroid = React.createClass({
       this.props.onPageSelected(event);
     }
   },
-  setPage: function(selectedPage) {
+  setPage: function(selectedPage, showAnimation = true) {
     this.setState({
       selectedPage,
+      showAnimation
     });
   },
   render: function() {
     return (
       <NativeAndroidViewPager
         ref={VIEWPAGER_REF}
+        showAnimation={this.state.showAnimation}
         style={this.props.style}
         selectedPage={this.state.selectedPage}
         onPageScroll={this._onPageScroll}

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
@@ -124,9 +124,9 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
     getAdapter().addView(child, index);
   }
 
-  /* package */ void setCurrentItemFromJs(int item) {
+  /* package */ void setCurrentItemFromJs(int item, boolean showAnimation) {
     mIsCurrentItemFromJs = true;
-    setCurrentItem(item);
+    setCurrentItem(item, showAnimation);
     mIsCurrentItemFromJs = false;
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPagerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPagerManager.java
@@ -24,6 +24,8 @@
 public class ReactViewPagerManager extends ViewGroupManager<ReactViewPager> {
 
   private static final String REACT_CLASS = "AndroidViewPager";
+  private int nextPage;
+  private boolean showAnimation;
 
   @Override
   public String getName() {
@@ -38,7 +40,18 @@ protected ReactViewPager createViewInstance(ThemedReactContext reactContext) {
   @ReactProp(name = "selectedPage")
   public void setSelectedPage(ReactViewPager view, int page) {
     // TODO(8496821): Handle selectedPage property cleanup correctly, now defaults to 0
-    view.setCurrentItemFromJs(page);
+    nextPage = page;
+  }
+
+  @ReactProp(name = "showAnimation", defaultBoolean = true)
+  public void setShowAnimation(ReactViewPager view, boolean value) {
+    showAnimation = value;
+  }
+
+  @Override
+  protected void onAfterUpdateTransaction(ReactViewPager view) {
+    view.setCurrentItemFromJs(nextPage, showAnimation);
+    super.onAfterUpdateTransaction(view);
   }
 
   @Override