完成pagingEnabled和pageSize属性

Author: bolan9999

Examples/BasicPropsTest.js

@@ -2,7 +2,7 @@
  * @Author: 石破天惊
  * @email: shanshang130@gmail.com
  * @Date: 2021-07-16 17:29:37
- * @LastEditTime: 2021-07-19 18:00:03
+ * @LastEditTime: 2021-07-19 23:48:30
  * @LastEditors: 石破天惊
  * @Description:
  */
@@ -28,7 +28,7 @@ export class BasicPropsTest extends React.Component {
  <SpringScrollView
  {...this.state}
  pagingEnabled
- pageSize={{width:400,height:200}}
+ pageSize={{width:200,height:200}}
  >
  {Object.keys(this.state).map((key) => (
  <Row

src/SpringScrollView.js

@@ -545,5 +545,7 @@ export class SpringScrollView extends React.PureComponent<SpringScrollViewPropTy
  showsHorizontalScrollIndicator: true,
  initialContentOffset: {x: 0, y: 0},
  alwaysBounceVertical: true,
+ pagingEnabled: false,
+ pageSize: {width: 0, height: 0},
  };
 }

src/SpringScrollViewNative.js

@@ -1,3 +1,11 @@
+/*
+ * @Author: 石破天惊
+ * @email: shanshang130@gmail.com
+ * @Date: 2021-07-15 17:11:44
+ * @LastEditTime: 2021-07-19 20:34:28
+ * @LastEditors: 石破天惊
+ * @Description:
+ */
 /**
  * Author: Shi(bolan0000@icloud.com)
  * Date: 2019/1/17
@@ -19,6 +27,11 @@ export class SpringScrollViewNativeAdapter extends React.Component {
  return (
  <SpringScrollViewNative
  {...this.props}
+ pagingEnabled={Platform.select({
+ ios: false,
+ android: this.props.pagingEnabled,
+ })}
+ pagingEnabledB={this.props.pagingEnabled}
  ref={(ref) => (this._scrollViewRef = ref)}
  onTouchStart={(e) =>
  Platform.OS === 'ios' &&
@@ -49,17 +62,13 @@ export class SpringScrollViewNativeAdapter extends React.Component {
  }
 
  attachScrollNativeEvent(offset) {
- return Animated.attachNativeEvent(
- this._scrollViewRef,
- 'onScroll',
- [
- {
- nativeEvent: {
- contentOffset: offset,
- },
+ return Animated.attachNativeEvent(this._scrollViewRef, 'onScroll', [
+ {
+ nativeEvent: {
+ contentOffset: offset,
  },
- ],
- );
+ },
+ ]);
  }
 }
 

src/Types.js

@@ -21,6 +21,11 @@ export interface Offset {
  y: number
 }
 
+export interface Size {
+ width: number;
+ height: number;
+}
+
 export interface NativeContentOffset {
  x?: Animated.Value,
  y?: Animated.Value
@@ -44,6 +49,8 @@ export interface SpringScrollViewPropType extends ViewProps {
  contentStyle?: ViewStyle,
  bounces?: boolean,
  scrollEnabled?: boolean,
+ pagingEnabled?: boolean,
+ pageSize?: Size,
  directionalLockEnabled?: boolean,
  initialContentOffset?: Offset,
  showsVerticalScrollIndicator?: boolean,

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

@@ -119,8 +119,6 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
  sendEvent("onCustomScrollBeginDrag", null);
  }
  dragging = true;
- NativeGestureUtil.notifyNativeGestureStarted(this, ev);
- ReactScrollViewHelper.emitScrollBeginDragEvent(this);
  getParent().requestDisallowInterceptTouchEvent(true);
  }
  break;
@@ -145,8 +143,8 @@ private boolean shouldDrag(MotionEvent ev) {
  if (!scrollEnabled) return false;
  if (beginPoint.x == 0 && beginPoint.y == 0) return false;
  if (dragging) return true;
- if (canHorizontalScroll()) {
- return Math.abs(ev.getX() - beginPoint.x) > PixelUtil.toPixelFromDIP(10);
+ if (canHorizontalScroll() && Math.abs(ev.getX() - beginPoint.x) > PixelUtil.toPixelFromDIP(10)) {
+ return true;
  }
  return Math.abs(ev.getY() - beginPoint.y) > PixelUtil.toPixelFromDIP(5);
  }
@@ -216,15 +214,12 @@ private void onUp(MotionEvent evt) {
  }
 
  private void beginInnerHorizontalAnimation(final float initialVelocity) {
- if (Math.abs(initialVelocity) < 0.1f) {
- return;
- }
  if (!momentumScrolling) {
  momentumScrolling = true;
  sendEvent("onCustomMomentumScrollBegin", null);
  }
  final long beginTimeInterval = System.currentTimeMillis();
- float dampingCoefficient = pagingEnabled ? 0.99f : 0.997f;
+ final float dampingCoefficient = pagingEnabled ? 0.99f : 0.997f;
  float end;
  float displacement = 0;
  float v = initialVelocity;
@@ -236,7 +231,7 @@ private void beginInnerHorizontalAnimation(final float initialVelocity) {
  }
  if (pagingEnabled) {
  duration = 500;
- end = Math.round((contentOffset.x - displacement) / getPageSize().width) * getPageSize().width;
+ end = Math.round((contentOffset.x - displacement) / getPageWidth()) * getPageWidth();
  } else {
  end = contentOffset.x - displacement;
  }
@@ -248,16 +243,15 @@ public void onDecelerateUpdate(DecelerateAnimation animation, float value) {
  long interval = System.currentTimeMillis() - beginTimeInterval;
  float v = initialVelocity;
  while (interval-- > 0) {
- v *= 0.997f;
+ v *= dampingCoefficient;
  }
  animation.cancel();
  beginOuterHorizontalAnimation(v);
  }
  }
 
  @Override
- public void onDecelerateEnd(DecelerateAnimation animation) {
- }
+ public void onDecelerateEnd(DecelerateAnimation animation) {}
  });
  horizontalAnimation.start();
  }
@@ -293,17 +287,13 @@ private void beginHorizontalReboundAnimation() {
  }
 
  private void beginInnerAnimation(final float initialVelocity) {
- if (Math.abs(initialVelocity) < 0.1f) {
- onVerticalAnimationEnd();
- return;
- }
  if (!momentumScrolling) {
  momentumScrolling = true;
  sendEvent("onCustomMomentumScrollBegin", null);
  }
  final long beginTimeInterval = System.currentTimeMillis();
  float end;
- float dampingCoefficient = pagingEnabled ? 0.99f : 0.997f;
+ final float dampingCoefficient = pagingEnabled ? 0.99f : 0.997f;
  float displacement = 0;
  float v = initialVelocity;
  int duration = 0;
@@ -314,7 +304,7 @@ private void beginInnerAnimation(final float initialVelocity) {
  }
  if (pagingEnabled) {
  duration = 500;
- end = Math.round((contentOffset.y - displacement) / getPageSize().height) * getPageSize().height;
+ end = Math.round((contentOffset.y - displacement) / getPageHeight()) * getPageHeight();
  } else {
  end = contentOffset.y - displacement;
  }
@@ -326,7 +316,7 @@ public void onDecelerateUpdate(DecelerateAnimation animation, float value) {
  long interval = System.currentTimeMillis() - beginTimeInterval;
  float v = initialVelocity;
  while (interval-- > 0) {
- v *= 0.997f;
+ v *= dampingCoefficient;
  }
  animation.cancel();
  beginOuterAnimation(v);
@@ -393,7 +383,7 @@ private boolean cancelAllAnimations() {
  if (horizontalAnimation.animating) {
  cancelHorizontal = horizontalAnimation.cancel();
  }
- return cancelVertical || cancelVertical;
+ return cancelVertical || cancelHorizontal;
  }
 
 
@@ -601,8 +591,12 @@ public void setPageSize(float width, float height) {
  this.pageSize.height = height;
  }
 
- public Size getPageSize() {
- return pageSize.width == 0 && pageSize.height == 0 ? contentSize : pageSize;
+ private float getPageWidth() {
+ return pageSize.width <= 0? size.width : pageSize.width;
+ }
+
+ private float getPageHeight() {
+ return pageSize.height <= 0? size.height : pageSize.height;
  }
 
  private boolean overshootHead() {

src/index.d.ts

@@ -91,6 +91,8 @@ declare module 'react-native-spring-scrollview' {
  contentStyle?: ViewStyle;
  bounces?: boolean;
  scrollEnabled?: boolean;
+ pagingEnabled?: boolean;
+ pageSize?: Size;
  directionalLockEnabled?: boolean;
  initialContentOffset?: Offset;
  showsVerticalScrollIndicator?: boolean;

src/ios/SpringScrollView/STSpringScrollView.m

@@ -12,16 +12,18 @@
 @interface STSpringScrollView ()
 @property(nonatomic, assign) float refreshHeaderHeight;
 @property(nonatomic, assign) float loadingFooterHeight;
-//@property(nonatomic, assign) UIEdgeInsets orgInsets;
 @property(nonatomic, copy) NSString *refreshStatus;
 @property(nonatomic, copy) NSString *loadingStatus;
 @property(nonatomic, copy) NSDictionary *initialContentOffset;
+@property(nonatomic, copy) NSDictionary *pageSize;
 @property(nonatomic, assign) BOOL allLoaded;
 @property(nonatomic, assign) BOOL initialed;
+@property(nonatomic, assign) BOOL pagingEnabledB;
 @end
 
-@implementation STSpringScrollView
-
+@implementation STSpringScrollView{
+ NSHashTable *_scrollListeners;
+}
 - (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher{
  if (self=[super initWithEventDispatcher:eventDispatcher]) {
  self.refreshStatus = self.loadingStatus = @"waiting";
@@ -37,6 +39,16 @@ - (void)setInitialContentOffset:(NSDictionary *)initialContentOffset{
  }
 }
 
+- (float) getPageWidth{
+ CGFloat width = [self.pageSize[@"width"] floatValue];
+ return width<=0?self.scrollView.frame.size.width:width;
+}
+
+- (float) getPageHeight{
+ CGFloat height = [self.pageSize[@"height"] floatValue];
+ return height<=0?self.scrollView.frame.size.height:height;
+}
+
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
  CGSize size = [change[NSKeyValueChangeNewKey] CGSizeValue];
  float x = [[self.initialContentOffset objectForKey:@"x"] floatValue];
@@ -51,23 +63,46 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 
 - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate{
  [super scrollViewDidEndDragging:scrollView willDecelerate:decelerate];
- // if ([self shouldRefresh]) {
- // self.refreshStatus = @"refreshing";
- // [self.scrollView setContentInset:UIEdgeInsetsMake(self.refreshHeaderHeight, 0, 0, 0)];
- // } else
  if ([self shouldLoad]) {
  self.loadingStatus = @"loading";
  CGFloat fill = .0f;
  if(self.scrollView.frame.size.height>self.scrollView.contentSize.height){
  fill=self.scrollView.frame.size.height-self.scrollView.contentSize.height;
  }
  [self.scrollView setContentInset:UIEdgeInsetsMake(0, 0, self.loadingFooterHeight+fill, 0)];
- }
- else if ([self hitRefreshStatus:@[@"rebound"]] && !UIEdgeInsetsEqualToEdgeInsets(UIEdgeInsetsZero, scrollView.contentInset)){
+ } else if ([self hitRefreshStatus:@[@"rebound"]] && !UIEdgeInsetsEqualToEdgeInsets(UIEdgeInsetsZero, scrollView.contentInset)){
  [self.scrollView setContentOffset:CGPointMake(0, 0) animated:YES];
  }
 }
 
+- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView
+ withVelocity:(CGPoint)velocity
+ targetContentOffset:(inout CGPoint *)targetContentOffset
+{
+ if (self.pagingEnabledB) {
+ float displacement = 0;
+ float v = -velocity.x;
+ int duration = 0;
+ while (fabsf(v) > 0.01f) {
+ displacement += v;
+ v *= 0.99f;
+ duration++;
+ }
+ targetContentOffset->x = round((self.scrollView.contentOffset.x - displacement)/[self getPageWidth])*[self getPageWidth];
+ v = -velocity.y;
+ duration = 0;
+ displacement = 0;
+ while (fabsf(v) > 0.01f) {
+ displacement += v;
+ v *= 0.99f;
+ duration++;
+ }
+ targetContentOffset->y = round((self.scrollView.contentOffset.y - displacement)/[self getPageHeight])*[self getPageHeight];
+ return;
+ }
+ [super scrollViewWillEndDragging:scrollView withVelocity:velocity targetContentOffset:targetContentOffset];
+}
+
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
  if ([self shouldPulling]) {
  self.refreshStatus = @"pulling";

src/ios/SpringScrollView/STSpringScrollViewManager.m

@@ -22,6 +22,8 @@ @implementation STSpringScrollViewManager
 RCT_EXPORT_VIEW_PROPERTY(loadingFooterHeight, float)
 RCT_EXPORT_VIEW_PROPERTY(initialContentOffset, id)
 RCT_EXPORT_VIEW_PROPERTY(allLoaded, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(pageSize, id)
+RCT_EXPORT_VIEW_PROPERTY(pagingEnabledB, BOOL)
 
 - (UIView *)view
 {