@sdcx/bottom-sheet 0.6.0 → 0.8.0

package/android/src/main/java/com/reactnative/bottomsheet/BottomSheet.java

@@ -91,6 +91,11 @@ public class BottomSheet extends ReactViewGroup implements NestedScrollingParent
             viewDragHelper = ViewDragHelper.create(this, dragCallback);
         }
 
+        viewDragHelper.abort();
+        if (settleRunnable != null && settleRunnable.isPosted) {
+            settleRunnable.run();
+        }
+
         layoutChild();
     }
 
@@ -110,7 +115,7 @@ public class BottomSheet extends ReactViewGroup implements NestedScrollingParent
             if (state == COLLAPSED) {
                 child.offsetTopAndBottom(collapsedOffset - top);
             } else if (state == EXPANDED) {
-                child.offsetTopAndBottom(expandedOffset -top);
+                child.offsetTopAndBottom(expandedOffset - top);
             } else if (state == HIDDEN) {
                 child.offsetTopAndBottom(getHeight() - top);
             }
@@ -170,7 +175,8 @@ public class BottomSheet extends ReactViewGroup implements NestedScrollingParent
     @VisibleForTesting
     View findScrollingChild(View view) {
         if (ViewCompat.isNestedScrollingEnabled(view)) {
-            if (!view.canScrollHorizontally(1) && !view.canScrollHorizontally(-1) && (view.canScrollVertically(-1) || view.canScrollVertically(1))) {
+            if (!view.canScrollHorizontally(1) && !view.canScrollHorizontally(-1) &&
+                    (view.canScrollVertically(-1) || view.canScrollVertically(1))) {
                 return view;
             }
         }
@@ -253,7 +259,7 @@ public class BottomSheet extends ReactViewGroup implements NestedScrollingParent
         // it is not the top most view of its parent. This is not necessary when the touch event is
         // happening over the scrolling content as nested scrolling logic handles that case.
         View scroll = nestedScrollingChildRef != null ? nestedScrollingChildRef.get() : null;
-        return  action == MotionEvent.ACTION_MOVE
+        return action == MotionEvent.ACTION_MOVE
                 && scroll != null
                 && !ignoreEvents
                 && state != DRAGGING

package/ios/BottomSheet/RNBottomSheet.m

@@ -158,7 +158,7 @@
         }
     }
     
-    if (pan.state == UIGestureRecognizerStateEnded) {
+    if (pan.state == UIGestureRecognizerStateEnded || pan.state == UIGestureRecognizerStateCancelled) {
         if (self.lastDragDistance > 0) {
             if (self.target && self.target.contentOffset.y <= 0) {
                 //如果是类似轻扫的那种
@@ -307,6 +307,11 @@
 }
 
 - (void)stopWatchBottomSheetTransition {
+    if ([self.state isEqualToString:@"collapsed"]) {
+        [self dispatchOnSlide:self.maxY];
+    } else if ([self.state isEqualToString:@"expanded"]) {
+        [self dispatchOnSlide:self.minY];
+    }
     if(_displayLink){
         [_displayLink invalidate];
         _displayLink = nil;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sdcx/bottom-sheet",
   "description": "A react-native BottomSheet component.",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
   "react-native": "src/index",