[BottomSheet] Do not find scrolling child that's not visible

Resolves #1834 PiperOrigin-RevId: 452813746
material-components · Jun 3, 2022 · 1fe1618 · 1fe1618
1 parent 71bfaca
commit 1fe1618
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java b/lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java
@@ -1424,6 +1424,9 @@ boolean shouldHide(@NonNull View child, float yvel) {
   @Nullable
   @VisibleForTesting
   View findScrollingChild(View view) {
+    if (view.getVisibility() != View.VISIBLE) {
+      return null;
+    }
     if (ViewCompat.isNestedScrollingEnabled(view)) {
       return view;
     }

diff --git a/tests/javatests/com/google/android/material/bottomsheet/BottomSheetBehaviorTest.java b/tests/javatests/com/google/android/material/bottomsheet/BottomSheetBehaviorTest.java
@@ -22,6 +22,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
+import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.fail;
 
 import android.content.Context;
@@ -32,6 +33,7 @@
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
@@ -961,6 +963,20 @@ public void testFindScrollingChildEnabled() {
     assertThat(scrollingChild, is((View) enabledChild));
   }
 
+  @Test
+  @SmallTest
+  public void testWontFindScrollingChildInvisible() {
+    Context context = activityTestRule.getActivity();
+    FrameLayout parent = new FrameLayout(context);
+    NestedScrollView invisibleChild = new NestedScrollView(context);
+    invisibleChild.setNestedScrollingEnabled(true);
+    invisibleChild.setVisibility(View.INVISIBLE);
+    parent.addView(invisibleChild);
+
+    View scrollingChild = getBehavior().findScrollingChild(parent);
+    assertThat(scrollingChild, nullValue());
+  }
+
   private void checkSetState(final int state, Matcher<View> matcher) throws Throwable {
     registerIdlingResourceCallback();
     try {