Adding support to float values for Android snapToInterval

mdvacca · facebook-github-bot · commit b2848a54b054 · 2018-01-09T12:32:53.000-08:00
Reviewed By: fkgozali

Differential Revision: D6684529

fbshipit-source-id: 51efa0a2d38acf4134bb824c462973e5c6bdf17a
diff --git a/RNTester/js/ScrollViewSimpleExample.js b/RNTester/js/ScrollViewSimpleExample.js
@@ -50,7 +50,7 @@ class ScrollViewSimpleExample extends React.Component<{}> {
       <ScrollView
         key={'scrollViewSnap'}
         horizontal
-        snapToInterval={210}
+        snapToInterval={210.0}
         pagingEnabled
       >
         {this.makeItems(NUM_ITEMS, [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
@@ -73,9 +73,10 @@ public void setShowsHorizontalScrollIndicator(ReactHorizontalScrollView view, bo
   }
 
   @ReactProp(name = "snapToInterval")
-  public void setSnapToInterval(ReactHorizontalScrollView view, int snapToInterval) {
+  public void setSnapToInterval(ReactHorizontalScrollView view, float snapToInterval) {
+    // snapToInterval needs to be exposed as a float because of the Javascript interface.
     DisplayMetrics screenDisplayMetrics = DisplayMetricsHolder.getScreenDisplayMetrics();
-    view.setSnapInterval((int)(snapToInterval * screenDisplayMetrics.density));
+    view.setSnapInterval((int) (snapToInterval * screenDisplayMetrics.density));
   }
 
   @ReactProp(name = ReactClippingViewGroupHelper.PROP_REMOVE_CLIPPED_SUBVIEWS)

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class ScrollViewSimpleExample extends React.Component<{}> {`
`50`	`50`	`<ScrollView`
`51`	`51`	`key={'scrollViewSnap'}`
`52`	`52`	`horizontal`
`53`		`- snapToInterval={210}`
	`53`	`+ snapToInterval={210.0}`
`54`	`54`	`pagingEnabled`
`55`	`55`	`>`
`56`	`56`	`{this.makeItems(NUM_ITEMS, [`
Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,10 @@ public void setShowsHorizontalScrollIndicator(ReactHorizontalScrollView view, bo`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`@ReactProp(name = "snapToInterval")`
`76`		`- public void setSnapToInterval(ReactHorizontalScrollView view, int snapToInterval) {`
	`76`	`+ public void setSnapToInterval(ReactHorizontalScrollView view, float snapToInterval) {`
	`77`	`+ // snapToInterval needs to be exposed as a float because of the Javascript interface.`
`77`	`78`	`DisplayMetrics screenDisplayMetrics = DisplayMetricsHolder.getScreenDisplayMetrics();`
`78`		`- view.setSnapInterval((int)(snapToInterval * screenDisplayMetrics.density));`
	`79`	`+ view.setSnapInterval((int) (snapToInterval * screenDisplayMetrics.density));`
`79`	`80`	`}`
`80`	`81`
`81`	`82`	`@ReactProp(name = ReactClippingViewGroupHelper.PROP_REMOVE_CLIPPED_SUBVIEWS)`