From 41e2923ba3ab412518177aacab3a148a4b79833e Mon Sep 17 00:00:00 2001 From: Alexander Harding <2166114+aeharding@users.noreply.github.com> Date: Sat, 7 Oct 2023 19:33:43 -0500 Subject: [PATCH] Fix transition speed on swipe back --- core/src/components/router-outlet/router-outlet.tsx | 4 +++- core/src/utils/gesture/swipe-back.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/components/router-outlet/router-outlet.tsx b/core/src/components/router-outlet/router-outlet.tsx index d25234f814e..b5ee81957cc 100644 --- a/core/src/components/router-outlet/router-outlet.tsx +++ b/core/src/components/router-outlet/router-outlet.tsx @@ -111,7 +111,9 @@ export class RouterOutlet implements ComponentInterface, NavOutlet { this.ani.easing('cubic-bezier(1, 0, 0.68, 0.28)'); newStepValue += getTimeGivenProgression([0, 0], [1, 0], [0.68, 0.28], [1, 1], step)[0]; } else { - newStepValue += getTimeGivenProgression([0, 0], [0.32, 0.72], [0, 1], [1, 1], step)[0]; + this.ani.easing('linear'); + + newStepValue += step; } this.ani.progressEnd(shouldComplete ? 1 : 0, newStepValue, dur); diff --git a/core/src/utils/gesture/swipe-back.ts b/core/src/utils/gesture/swipe-back.ts index 2a8da3abd30..b031da296a0 100644 --- a/core/src/utils/gesture/swipe-back.ts +++ b/core/src/utils/gesture/swipe-back.ts @@ -70,7 +70,7 @@ export const createSwipeBackGesture = ( let realDur = 0; if (missingDistance > 5) { const dur = missingDistance / Math.abs(velocity); - realDur = Math.min(dur, 540); + realDur = Math.min(dur, 200); } onEndHandler(shouldComplete, stepValue <= 0 ? 0.01 : clamp(0, stepValue, 0.9999), realDur);