[TIMOB-25552] Android: Fixed nested scrolling within disabled ScrollV…

…iew to propagate to parent view. (#9835) - Fixed in ScrollView, TableView, and ListView. (I don't think it's possible to reproduce in TableView and ListView though.)
tidev · Feb 27, 2018 · fdbadf1 · fdbadf1
1 parent b1e6919
commit fdbadf1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIScrollView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIScrollView.java
@@ -397,6 +397,8 @@ public void onNestedScroll(View target, int dxConsumed, int dyConsumed, int dxUn
 		{
 			if (mScrollingEnabled) {
 				super.onNestedScroll(target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed);
+			} else {
+				dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, null);
 			}
 		}
 

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiNestedListView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiNestedListView.java
@@ -457,6 +457,8 @@ public void onNestedScroll(View target, int dxConsumed, int dyConsumed, int dxUn
 			{
 				if (isTouchScrollable()) {
 					super.onNestedScroll(target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed);
+				} else {
+					dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, null);
 				}
 			}
 		}