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

fix(gestures)propagate touch to parent so that gestures can work (#6171)

Browse Source 
* propagate gesture touch to parent so that gestures can work

* test: swipe passtrough test
This commit is contained in:
Martin Guillon
2018-09-17 09:11:50 +02:00
committed by Alexander Vakrilov
parent bd91bfb28a
commit 8a5f73055e
4 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/app/ui-tests-app/events/main-page.ts
View File

@ -14,6 +14,7 @@ export function loadExamples() {
examples.set("gestures", "events/gestures");
examples.set("touch", "events/touch-event");
examples.set("pan", "events/pan-event");
examples.set("swipe-passtrough", "events/swipe-event-passtrough");
examples.set("handlers", "events/handlers");
examples.set("console", "events/console");
examples.set("i61", "events/i61");

22
apps/app/ui-tests-app/events/swipe-event-passtrough.ts Normal file
View File

@ -0,0 +1,22 @@
import { EventData } from "tns-core-modules/data/observable";
import { Page } from "tns-core-modules/ui/page";
import { SwipeGestureEventData } from "tns-core-modules/ui/gestures";
import { TextView } from "tns-core-modules/ui/text-view";
let outputText: TextView;
export function navigatingTo(args: EventData) {
var page = <Page>args.object;
outputText = page.getViewById<TextView>("output");
}
export function onSwipe(data: SwipeGestureEventData) {
const msg = `swipe state:${data.direction}`;
console.log(msg);
outputText.text += msg + "\n";
}
export function onTap(args) {
const msg = `tapEvent triggered`;
console.log(msg);
outputText.text += msg + "\n";
}

10
apps/app/ui-tests-app/events/swipe-event-passtrough.xml Normal file
View File

@ -0,0 +1,10 @@
<Page navigatingTo="navigatingTo">
<GridLayout rows="*, *" columns="*, *, *" swipe="onSwipe" backgroundColor="lightgreen">
<StackLayout row="0" col="1" text="swipe here" tap="onTap" backgroundColor="lightblue">
<Label text="swipe/tap inside" verticalAlignement="top"/>
</StackLayout>
<Label row="1" colSpan="3"
text="" textWrap="true"
id="output" automationText="output" style="font-size: 10, font-family: monospace;"/>
</GridLayout>
</Page>

19
tns-core-modules/ui/core/view/view.android.ts
View File

@ -72,12 +72,7 @@ function initializeTouchListener(): void {
onTouch(view: android.view.View, event: android.view.MotionEvent): boolean {
const owner = this.owner;
for (let type in owner._gestureObservers) {
let list = owner._gestureObservers[type];
list.forEach(element => {
element.androidOnTouchEvent(event);
});
}
owner.handleGestureTouch(event);
let nativeView = owner.nativeViewProtected;
if (!nativeView || !nativeView.onTouchEvent) {
@ -320,6 +315,18 @@ export class View extends ViewCommon {
return false;
}
public handleGestureTouch(event: android.view.MotionEvent): any {
for (let type in this._gestureObservers) {
let list = this._gestureObservers[type];
list.forEach(element => {
element.androidOnTouchEvent(event);
});
}
if (this.parent instanceof View) {
this.parent.handleGestureTouch(event);
}
}
private hasGestureObservers() {
return this._gestureObservers && Object.keys(this._gestureObservers).length > 0
}