@capgo/capacitor-transitions 8.0.2 → 8.0.4

package/dist/index.js

@@ -943,12 +943,15 @@ var init_transition_controller = __esm({
           animation.pause();
           animation.currentTime = 0;
         }
+        const animationDurations = animations.map((animation) => this.getAnimationDuration(animation, duration));
         this.currentAnimations = animations;
         this.interactiveBackTransition = {
           enteringState,
           leavingState,
           animations,
-          duration
+          animationDurations,
+          duration,
+          progress: 0
         };
         return true;
       }
@@ -961,9 +964,12 @@ var init_transition_controller = __esm({
           return;
         }
         const progress = Math.max(0, Math.min(step, 0.9999));
-        for (const animation of transition.animations) {
-          const duration = this.getAnimationDuration(animation, transition.duration);
-          animation.pause();
+        if (Math.abs(progress - transition.progress) < 5e-4) {
+          return;
+        }
+        transition.progress = progress;
+        for (const [index, animation] of transition.animations.entries()) {
+          const duration = transition.animationDurations[index] ?? transition.duration;
           animation.currentTime = duration * progress;
         }
       }
@@ -1142,15 +1148,16 @@ var init_transition_controller = __esm({
           return;
         }
         if (releaseDuration <= 0) {
-          for (const animation of transition.animations) {
-            const duration = this.getAnimationDuration(animation, transition.duration);
+          transition.progress = targetProgress;
+          for (const [index, animation] of transition.animations.entries()) {
+            const duration = transition.animationDurations[index] ?? transition.duration;
             animation.pause();
             animation.currentTime = duration * targetProgress;
           }
           return;
         }
-        const finished = transition.animations.map((animation) => {
-          const duration = this.getAnimationDuration(animation, transition.duration);
+        const finished = transition.animations.map((animation, index) => {
+          const duration = transition.animationDurations[index] ?? transition.duration;
           const currentTime = typeof animation.currentTime === "number" ? animation.currentTime : 0;
           const targetTime = duration * targetProgress;
           const distance = Math.abs(targetTime - currentTime);
@@ -1163,6 +1170,7 @@ var init_transition_controller = __esm({
           return animation.finished.catch(() => void 0);
         });
         await Promise.all(finished);
+        transition.progress = targetProgress;
       }
       /**
        * Resolve configured easing presets after platform/direction are known.
@@ -1334,6 +1342,8 @@ var init_cap_router_outlet = __esm({
       pendingPage = null;
       ignoredNodes = /* @__PURE__ */ new WeakSet();
       swipeGesturePointer = null;
+      swipeGestureFrame = 0;
+      swipeGesturePendingStep = null;
       swipeGestureListenersActive = false;
       skipNextHistoryBackTransition = false;
       swipeBackDepth = 0;
@@ -1376,6 +1386,7 @@ var init_cap_router_outlet = __esm({
         this.style.width = "100%";
         this.style.height = "100%";
         this.style.overflow = "hidden";
+        this.style.overscrollBehaviorX = "contain";
         this.lastNavigationHref = this.getCurrentNavigationHref();
         this.lastNavigationPosition = this.getCurrentNavigationPosition();
         this.ownerDocument.defaultView?.addEventListener("popstate", this.handleHistoryPopState);
@@ -1683,6 +1694,10 @@ var init_cap_router_outlet = __esm({
         this.removeEventListener("pointerup", this.handleSwipeGesturePointerEnd);
         this.removeEventListener("pointercancel", this.handleSwipeGesturePointerCancel);
         this.swipeGestureListenersActive = false;
+        this.clearQueuedSwipeGestureStep();
+        if (this.swipeGesturePointer?.transitionStarted) {
+          this.controller.cancelInteractiveBack();
+        }
         this.swipeGesturePointer = null;
       }
       isSwipeGestureEnabled() {
@@ -1875,12 +1890,14 @@ var init_cap_router_outlet = __esm({
         if (!this.canStartSwipeGesture(event)) {
           return;
         }
+        const width = Math.max(this.getBoundingClientRect().width, 1);
         this.swipeGesturePointer = {
           pointerId: event.pointerId,
           startX: event.clientX,
           startY: event.clientY,
           currentX: event.clientX,
           currentY: event.clientY,
+          width,
           startTime: performance.now(),
           dragging: false,
           transitionStarted: false
@@ -1927,8 +1944,7 @@ var init_cap_router_outlet = __esm({
             return;
           }
           if (event.cancelable) event.preventDefault();
-          const width = Math.max(this.getBoundingClientRect().width, 1);
-          this.controller.stepInteractiveBack(deltaX / width);
+          this.queueSwipeGestureStep(deltaX / pointer.width);
         }
       };
       handleSwipeGesturePointerEnd = (event) => {
@@ -1941,12 +1957,17 @@ var init_cap_router_outlet = __esm({
         const deltaX = this.getSwipeGestureDeltaX(pointer);
         const elapsed = Math.max(performance.now() - pointer.startTime, 1);
         const velocityX = deltaX / elapsed;
-        const width = Math.max(this.getBoundingClientRect().width, 1);
+        const width = pointer.width;
         const step = deltaX / width;
         const shouldCommit = pointer.dragging && pointer.transitionStarted && velocityX >= 0 && (velocityX > this.swipeGestureMinimumVelocity || deltaX > width / 2);
         const missing = shouldCommit ? 1 - step : step;
         const missingDistance = Math.max(missing, 0) * width;
         const releaseDuration = missingDistance > 5 && Math.abs(velocityX) > 0 ? Math.min(missingDistance / Math.abs(velocityX), 540) : 0;
+        if (pointer.transitionStarted) {
+          this.flushQueuedSwipeGestureStep();
+        } else {
+          this.clearQueuedSwipeGestureStep();
+        }
         this.releaseSwipeGesturePointer(event.pointerId);
         void this.finishSwipeGestureBack(shouldCommit, releaseDuration);
       };
@@ -1954,6 +1975,7 @@ var init_cap_router_outlet = __esm({
         this.cancelSwipeGesture(event.pointerId);
       };
       cancelSwipeGesturePointer(pointerId) {
+        this.clearQueuedSwipeGestureStep();
         this.releaseSwipeGesturePointer(pointerId);
       }
       releaseSwipeGesturePointer(pointerId) {
@@ -1972,10 +1994,44 @@ var init_cap_router_outlet = __esm({
           return;
         }
         this.releaseSwipeGesturePointer(pointerId);
+        this.clearQueuedSwipeGestureStep();
         if (pointer.transitionStarted) {
           void this.finishSwipeGestureBack(false, 0);
         }
       }
+      queueSwipeGestureStep(step) {
+        this.swipeGesturePendingStep = step;
+        if (this.swipeGestureFrame !== 0) {
+          return;
+        }
+        const win = this.ownerDocument.defaultView;
+        if (!win) {
+          this.flushQueuedSwipeGestureStep();
+          return;
+        }
+        this.swipeGestureFrame = win.requestAnimationFrame(() => {
+          this.swipeGestureFrame = 0;
+          this.flushQueuedSwipeGestureStep();
+        });
+      }
+      flushQueuedSwipeGestureStep() {
+        const step = this.swipeGesturePendingStep;
+        this.swipeGesturePendingStep = null;
+        if (this.swipeGestureFrame !== 0) {
+          this.ownerDocument.defaultView?.cancelAnimationFrame(this.swipeGestureFrame);
+          this.swipeGestureFrame = 0;
+        }
+        if (step !== null) {
+          this.controller.stepInteractiveBack(step);
+        }
+      }
+      clearQueuedSwipeGestureStep() {
+        if (this.swipeGestureFrame !== 0) {
+          this.ownerDocument.defaultView?.cancelAnimationFrame(this.swipeGestureFrame);
+          this.swipeGestureFrame = 0;
+        }
+        this.swipeGesturePendingStep = null;
+      }
       async finishSwipeGestureBack(shouldComplete, releaseDuration) {
         const canComplete = shouldComplete && this.getSwipeBackDestination() !== null;
         const shouldUseHistory = canComplete && typeof window !== "undefined" && window.history.length > 1;