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(refresher): properly dismiss refresher when completed synchronously (#20815)

Browse Source 
fixes #20803
This commit is contained in:
Liam DeBeasi
2020-03-19 09:52:49 -04:00
committed by Liam DeBeasi
parent cdfd50b554
commit b1a87c8892
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ import { Component, ComponentInterface, Element, Event, EventEmitter, Host, Meth
import { getTimeGivenProgression } from '../../'; import { getTimeGivenProgression } from '../../';
import { getIonMode } from '../../global/ionic-global'; import { getIonMode } from '../../global/ionic-global';
import { Animation, Gesture, GestureDetail, RefresherEventDetail } from '../../interface'; import { Animation, Gesture, GestureDetail, RefresherEventDetail } from '../../interface';
import { clamp } from '../../utils/helpers'; import { clamp, raf } from '../../utils/helpers';
import { hapticImpact } from '../../utils/native/haptic'; import { hapticImpact } from '../../utils/native/haptic';
import { createPullingAnimation, createSnapBackAnimation, getRefresherAnimationType, handleScrollWhilePulling, handleScrollWhileRefreshing, setSpinnerOpacity, shouldUseNativeRefresher, transitionEndAsync, translateElement } from './refresher.utils'; import { createPullingAnimation, createSnapBackAnimation, getRefresherAnimationType, handleScrollWhilePulling, handleScrollWhileRefreshing, setSpinnerOpacity, shouldUseNativeRefresher, transitionEndAsync, translateElement } from './refresher.utils';
@ -442,7 +442,7 @@ export class Refresher implements ComponentInterface {
// Do not reset scroll el until user removes pointer from screen // Do not reset scroll el until user removes pointer from screen
if (!this.pointerDown) { if (!this.pointerDown) {
this.resetNativeRefresher(this.elementToTransform, RefresherState.Completing); raf(() => raf(() => this.resetNativeRefresher(this.elementToTransform, RefresherState.Completing)));
} }
} else { } else {
this.close(RefresherState.Completing, '120ms'); this.close(RefresherState.Completing, '120ms');
@ -457,7 +457,7 @@ export class Refresher implements ComponentInterface {
if (this.nativeRefresher) { if (this.nativeRefresher) {
// Do not reset scroll el until user removes pointer from screen // Do not reset scroll el until user removes pointer from screen
if (!this.pointerDown) { if (!this.pointerDown) {
this.resetNativeRefresher(this.elementToTransform, RefresherState.Cancelling); raf(() => raf(() => this.resetNativeRefresher(this.elementToTransform, RefresherState.Cancelling)));
} }
} else { } else {
this.close(RefresherState.Cancelling, ''); this.close(RefresherState.Cancelling, '');