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

chore(): sync with master

Browse Source
This commit is contained in:
Liam DeBeasi
2021-04-05 16:40:39 -04:00
parent 073883a098 6df1215ee2
commit 4fb81b7450
81 changed files with 47634 additions and 2087 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/components/refresher/refresher.tsx
View File

@ -320,6 +320,7 @@ export class Refresher implements ComponentInterface {
canStart: () => this.state !== RefresherState.Refreshing && this.state !== RefresherState.Completing && this.scrollEl!.scrollTop === 0,
onStart: (ev: GestureDetail) => {
ev.data = { animation: undefined, didStart: false, cancelled: false };
this.state = RefresherState.Pulling;
},
onMove: (ev: GestureDetail) => {
if ((ev.velocityY < 0 && this.progress === 0 && !ev.data.didStart) || ev.data.cancelled) {
@ -330,19 +331,14 @@ export class Refresher implements ComponentInterface {
if (!ev.data.didStart) {
ev.data.didStart = true;
this.state = RefresherState.Pulling;
writeTask(() => {
const animationType = getRefresherAnimationType(contentEl);
const animation = createPullingAnimation(animationType, pullingRefresherIcon);
ev.data.animation = animation;
writeTask(() => this.scrollEl!.style.setProperty('--overflow', 'hidden'));
this.scrollEl!.style.setProperty('--overflow', 'hidden');
animation.progressStart(false, 0);
this.ionStart.emit();
this.animations.push(animation);
});
const animationType = getRefresherAnimationType(contentEl);
const animation = createPullingAnimation(animationType, pullingRefresherIcon);
ev.data.animation = animation;
animation.progressStart(false, 0);
this.ionStart.emit();
this.animations.push(animation);
return;
}