@capgo/capacitor-transitions 8.0.2 → 8.0.4

package/dist/solid/index.js

@@ -829,12 +829,15 @@ var TransitionController = class {
       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;
   }
@@ -847,9 +850,12 @@ var TransitionController = class {
       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;
     }
   }
@@ -1028,15 +1034,16 @@ var TransitionController = class {
       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);
@@ -1049,6 +1056,7 @@ var TransitionController = class {
       return animation.finished.catch(() => void 0);
     });
     await Promise.all(finished);
+    transition.progress = targetProgress;
   }
   /**
    * Resolve configured easing presets after platform/direction are known.
@@ -1238,6 +1246,8 @@ var CapRouterOutlet = class extends HTMLElement {
   pendingPage = null;
   ignoredNodes = /* @__PURE__ */ new WeakSet();
   swipeGesturePointer = null;
+  swipeGestureFrame = 0;
+  swipeGesturePendingStep = null;
   swipeGestureListenersActive = false;
   skipNextHistoryBackTransition = false;
   swipeBackDepth = 0;
@@ -1280,6 +1290,7 @@ var CapRouterOutlet = class extends HTMLElement {
     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);
@@ -1587,6 +1598,10 @@ var CapRouterOutlet = class extends HTMLElement {
     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() {
@@ -1779,12 +1794,14 @@ var CapRouterOutlet = class extends HTMLElement {
     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
@@ -1831,8 +1848,7 @@ var CapRouterOutlet = class extends HTMLElement {
         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) => {
@@ -1845,12 +1861,17 @@ var CapRouterOutlet = class extends HTMLElement {
     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);
   };
@@ -1858,6 +1879,7 @@ var CapRouterOutlet = class extends HTMLElement {
     this.cancelSwipeGesture(event.pointerId);
   };
   cancelSwipeGesturePointer(pointerId) {
+    this.clearQueuedSwipeGestureStep();
     this.releaseSwipeGesturePointer(pointerId);
   }
   releaseSwipeGesturePointer(pointerId) {
@@ -1876,10 +1898,44 @@ var CapRouterOutlet = class extends HTMLElement {
       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;