javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-08 23:58:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(content): tap-click deadlock (#17170)

Browse Source 
fixes #17138
fixes #16863
fixes #16191
fixes #16911
This commit is contained in:
Manu MA
2019-01-18 18:53:35 +01:00
committed by GitHub
parent d513e8a952
commit 5cb7f68ee2
3 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/components/content/content.tsx
View File

@ -1,4 +1,4 @@
import { Component, ComponentInterface, Element, Event, EventEmitter, Method, Prop, QueueApi } from '@stencil/core';
import { Component, ComponentInterface, Element, Event, EventEmitter, Listen, Method, Prop, QueueApi } from '@stencil/core';
import { Color, Config, Mode, ScrollBaseDetail, ScrollDetail } from '../../interface';
import { isPlatform } from '../../utils/platform';
@ -113,8 +113,14 @@ export class Content implements ComponentInterface {
}
componentDidUnload() {
if (this.watchDog) {
clearInterval(this.watchDog);
this.onScrollEnd();
}
@Listen('click', { capture: true })
onClick(ev: Event) {
if (this.isScrolling) {
ev.preventDefault();
ev.stopPropagation();
}
}
@ -269,13 +275,14 @@ export class Content implements ComponentInterface {
}
private onScrollEnd() {
clearInterval(this.watchDog);
this.watchDog = null;
this.isScrolling = false;
this.ionScrollEnd.emit({
isScrolling: false
});
if (this.isScrolling) {
this.isScrolling = false;
this.ionScrollEnd.emit({
isScrolling: false
});
}
}
hostData() {