支持decelerationRate

Author: bolan9999

Examples/Test.js

@@ -2,7 +2,7 @@
  * @Author: 石破天惊
  * @email: shanshang130@gmail.com
  * @Date: 2021-07-16 17:29:37
- * @LastEditTime: 2021-07-27 18:23:18
+ * @LastEditTime: 2021-07-30 00:10:08
  * @LastEditors: 石破天惊
  * @Description:
  */
@@ -35,6 +35,7 @@ export class Test extends React.Component {
  showsHorizontalScrollIndicator: true,
  dragToHideKeyboard: true,
  pagingEnabled: false,
+ decelerationRate: 0.997,
  pageSize: { width: 200, height: 200 },
  contentStyle: { width: "100%", height: "350%" },
 
@@ -46,6 +47,7 @@ export class Test extends React.Component {
 
  _contentStyleRef = React.createRef();
  _pageSizeRef = React.createRef();
+ _decelerationRateRef = React.createRef();
 
  render() {
  const propertyKeys = Object.keys(this.state).filter(
@@ -68,7 +70,11 @@ export class Test extends React.Component {
  <SpringScrollView
  {...this.state}
  inputToolBarHeight={Platform.select({ ios: 44, android: 200 })}
- textInputRefs={[this._contentStyleRef, this._pageSizeRef]}
+ textInputRefs={[
+ this._contentStyleRef,
+ this._pageSizeRef,
+ this._decelerationRateRef,
+ ]}
  ref={(ref) => (this._main = ref)}
  onScroll={this._onScroll}
  onTouchBegin={this._onTouchBegin}
@@ -94,6 +100,8 @@ export class Test extends React.Component {
  let inputRef;
  if (key === "contentStyle") inputRef = this._contentStyleRef;
  if (key === "pageSize") inputRef = this._pageSizeRef;
+ if (key === "decelerationRate")
+ inputRef = this._decelerationRateRef;
  return (
  <this.Row
  key={key}

docs/en/V3/BasicControl.md

@@ -2,7 +2,7 @@
  * @Author: 石破天惊
  * @email: shanshang130@gmail.com
  * @Date: 2021-07-23 23:43:47
- * @LastEditTime: 2021-07-24 00:00:31
+ * @LastEditTime: 2021-07-29 23:42:11
  * @LastEditors: 石破天惊
  * @Description: 
 -->
@@ -24,4 +24,5 @@ onSizeChange | ({width:number,height:number})=>any | undefined | The callback wh
 onContentSizeChange | ({width:number,height:number})=>any | undefined | The callback when the content view size changed.
 inverted | boolean | false | inverted. It is a service for LargeList.
 pagingEnabled | boolean | false | When true, the scroll view stops on multiples of `pageSize` when scrolling. This can be used for pagination on both horizontal and vertical directions.
+decelerationRate | number | 0.997 | decelerationRate
 pageSize | {width:number, height:number} | {width:0,height:0} | Works only when `pagingEnabled=true`, the scroll view stops on multiples of `pageSize` when scrolling. This can be used for pagination on both horizontal and vertical directions。If the width or height set to 0, it will equal to the view port of the SpringScrollView's width or height.

docs/zh-cn/V3/BasicControl.md

@@ -2,7 +2,7 @@
  * @Author: 石破天惊
  * @email: shanshang130@gmail.com
  * @Date: 2021-07-22 10:22:58
- * @LastEditTime: 2021-07-23 23:18:42
+ * @LastEditTime: 2021-07-29 23:41:55
  * @LastEditors: 石破天惊
  * @Description: 
 -->
@@ -23,6 +23,7 @@ dragToHideKeyboard | boolean | true | 点击SpringScrollView是否收起键盘
 onSizeChange | ({width:number,height:number})=>any | undefined | 外部Wrapper视图宽高变化时回调
 onContentSizeChange | ({width:number,height:number})=>any | undefined | 内部ContentView视图宽高变化时回调
 inverted | boolean | false | 将SpringScrollView上下翻转，此属性单独意义不大，主要是为了LargeList提供功能
+decelerationRate | number | 0.997 | decelerationRate
 pagingEnabled | boolean | false | 当值为 true 时，滚动条会停在设置的pageSize整数倍位置。这个属性在iOS和安卓上都支持双向分页。
 pageSize | {width:number, height:number} | {width:0,height:0} | 配合pagingEnabled使用分页，使滑动停止在设置的整数倍位置。同时支持水平和垂直双向分页。0代表使用SpringScrollView的视口大小。
 

src/SpringScrollView.js

@@ -572,6 +572,7 @@ export class SpringScrollView extends React.PureComponent<SpringScrollViewPropTy
  refreshHeader: NormalHeader,
  loadingFooter: NormalFooter,
  textInputRefs: [],
+ decelerationRate: 0.997,
  inputToolBarHeight: 44,
  dragToHideKeyboard: true,
  keyboardShouldPersistTaps: "handled",

src/Types.js

@@ -1,10 +1,10 @@
 /*
- *
- * Created by Stone
- * https://github.com/bolan9999
- * Email: shanshang130@gmail.com
- * Date: 2018/7/17
- *
+ * @Author: 石破天惊
+ * @email: shanshang130@gmail.com
+ * @Date: 2021-07-21 13:05:32
+ * @LastEditTime: 2021-07-29 23:34:45
+ * @LastEditors: 石破天惊
+ * @Description: 
  */
 
 import {Animated, ViewProps, ViewStyle} from 'react-native';
@@ -51,6 +51,7 @@ export interface SpringScrollViewPropType extends ViewProps {
  scrollEnabled?: boolean;
  pagingEnabled?: boolean;
  pageSize?: Size;
+ decelerationRate?: number;
  directionalLockEnabled?: boolean;
  initialContentOffset?: Offset;
  showsVerticalScrollIndicator?: boolean;

src/android/src/main/java/com/bolan9999/SpringScrollView.java

@@ -18,9 +18,9 @@
 import com.facebook.react.views.view.ReactViewGroup;
 
 public class SpringScrollView extends ReactViewGroup implements View.OnLayoutChangeListener, SpringAnimatorListener {
- private float refreshHeaderHeight, loadingFooterHeight;
+ private float refreshHeaderHeight, loadingFooterHeight, decelerationRate;
  private boolean momentumScrolling, bounces, scrollEnabled, dragging, inverted,
- directionalLockEnabled, pagingEnabled, shouldVerticalRebound;
+ directionalLockEnabled, pagingEnabled;
  private VelocityTracker tracker;
  private SpringAnimator verticalAnimation, horizontalAnimation;
  private String refreshStatus, loadingStatus, draggingDirection;
@@ -258,12 +258,12 @@ private void onUp(MotionEvent evt) {
  sendEvent("onCustomMomentumScrollBegin", null);
  }
  float maxY = contentSize.height + contentInsets.bottom - size.height;
- verticalAnimation.startInner(contentOffset.y, -vy, pagingEnabled ? 0.99f : 0.997f,
+ verticalAnimation.startInner(contentOffset.y, -vy, pagingEnabled ? 0.99f : decelerationRate,
  -contentInsets.top, maxY, pagingEnabled, getPageHeight());
 
  if (contentSize.width <= size.width) return;
  float maxX = contentSize.width - size.width + contentInsets.right;
- horizontalAnimation.startInner(contentOffset.x, -vx, pagingEnabled ? 0.99f : 0.997f,
+ horizontalAnimation.startInner(contentOffset.x, -vx, pagingEnabled ? 0.99f : decelerationRate,
  -contentInsets.left, maxX, pagingEnabled, getPageWidth());
  }
 
@@ -455,6 +455,10 @@ public void scrollTo(float x, float y, boolean animated) {
  }
  }
 
+ public void setDecelerationRate(float rate){
+ decelerationRate = rate;
+ }
+
  public void setBounces(boolean bounces) {
  this.bounces = bounces;
  }

src/android/src/main/java/com/bolan9999/SpringScrollViewManager.java

@@ -49,6 +49,11 @@ public void setScrollEnabled(SpringScrollView view, boolean scrollEnabled) {
  view.setScrollEnabled(scrollEnabled);
  }
 
+ @ReactProp(name = "decelerationRate")
+ public void setDecelerationRate(SpringScrollView view, float decelerationRate) {
+ view.setDecelerationRate(decelerationRate);
+ }
+
  @ReactProp(name = "initialContentOffset")
  public void setInitContentOffset(SpringScrollView view, ReadableMap offset) {
  float x = offset != null ? PixelUtil.toPixelFromDIP(offset.getDouble("x")) : 0;

src/index.d.ts

@@ -93,6 +93,7 @@ declare module 'react-native-spring-scrollview' {
  scrollEnabled?: boolean;
  pagingEnabled?: boolean;
  pageSize?: Size;
+ decelerationRate?: number;
  directionalLockEnabled?: boolean;
  initialContentOffset?: Offset;
  showsVerticalScrollIndicator?: boolean;