@sdcx/bottom-sheet 0.5.0 → 0.7.0

package/README.md

@@ -65,7 +65,7 @@ const App = () => {
 
   - `'hidden'`，隐藏状态，此时 BottomSheet 的高度为 0。
 
-- `fitToContents`，是指 BottomSheet 在展开时，是否适应内容的高度，默认是 `false`。
+- `fitToContents`，是指 BottomSheet 在展开时，是否适应内容的高度，默认是 `false`。当和可滚动列表，譬如 ScrollView 一起使用时，请保持默认值。
 
 ### 回调
 

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)) {
+            if (!view.canScrollHorizontally(1) && !view.canScrollHorizontally(-1) &&
+                    (view.canScrollVertically(-1) || view.canScrollVertically(1))) {
                 return view;
             }
         }
@@ -187,6 +193,7 @@ public class BottomSheet extends ReactViewGroup implements NestedScrollingParent
                 }
             }
         }
+
         return null;
     }
 
@@ -252,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/package.json

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