javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(scroll-view): android 'isScrollEnabled' will apply if changed while gesture is underway (#8695)

Browse Source
This commit is contained in:
DimitrisRK
2020-07-07 05:05:40 +03:00
committed by GitHub
parent 635f31f81f
commit 02ec7f104d
5 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
e2e/ui-tests-app/app/scroll-view/main-page.ts
View File

@@ -17,6 +17,7 @@ export function loadExamples() {
examples.set("safe-area-images", "scroll-view/safe-area-images-page");
examples.set("safe-area-images-overflow", "scroll-view/safe-area-images-overflow-page");
examples.set("layout-outside-scroll", "scroll-view/layout-outside-scroll-page");
examples.set("scroll-enabled", "scroll-view/scroll-enabled-page");
return examples;
}

25
e2e/ui-tests-app/app/scroll-view/scroll-enabled-page.ts Normal file
View File

@@ -0,0 +1,25 @@
import { EventData as ObservableEventData } from "tns-core-modules/data/observable";
import { GestureStateTypes, PanGestureEventData } from "tns-core-modules/ui/gestures";
import { Page } from "tns-core-modules/ui/page";
export function pageLoaded(args: ObservableEventData) {
var page = <Page>args.object;
}
export function panLayout(args: PanGestureEventData)
{
const scrollView = args.object.parent;
if (args.state === GestureStateTypes.began) {
args.object.previousDeltaY = 0;
scrollView.isScrollEnabled = false;
}
else if (args.state === GestureStateTypes.changed) {
const diff = (args.deltaY - args.object.previousDeltaY);
args.object.translateY += diff;
args.object.previousDeltaY = args.deltaY;
}
else if (args.state === GestureStateTypes.ended) {
scrollView.isScrollEnabled = true;
}
}

7
e2e/ui-tests-app/app/scroll-view/scroll-enabled-page.xml Normal file
View File

@@ -0,0 +1,7 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd" loaded="pageLoaded" class="page">
<ScrollView id="scroll-view" height="300">
<StackLayout height="500" backgroundColor="red" pan="panLayout">
<Label text="Move Me" color="#fff" fontSize="22"/>
</StackLayout>
</ScrollView>
</Page>

2
tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/HorizontalScrollView.java
View File

@@ -70,7 +70,7 @@ public class HorizontalScrollView extends android.widget.HorizontalScrollView {
@Override
public boolean onTouchEvent(MotionEvent ev) {
if (!this.scrollEnabled && ev.getAction() == MotionEvent.ACTION_DOWN) {
if (!this.scrollEnabled && (ev.getAction() == MotionEvent.ACTION_DOWN || ev.getAction() == MotionEvent.ACTION_MOVE)) {
return false;
}

2
tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/VerticalScrollView.java
View File

@@ -70,7 +70,7 @@ public class VerticalScrollView extends ScrollView {
@Override
public boolean onTouchEvent(MotionEvent ev) {
if (!this.scrollEnabled && ev.getAction() == MotionEvent.ACTION_DOWN) {
if (!this.scrollEnabled && (ev.getAction() == MotionEvent.ACTION_DOWN || ev.getAction() == MotionEvent.ACTION_MOVE)) {
return false;
}