@capgo/capacitor-transitions 8.0.1 → 8.0.2

package/dist/solid/index.mjs

@@ -1209,9 +1209,26 @@ var CapRouterOutlet = class extends HTMLElement {
   skipNextHistoryBackTransition = false;
   swipeBackDepth = 0;
   lastNavigationHref = null;
+  lastNavigationPosition = null;
+  pendingHistoryDirection = null;
+  navigationHrefs = [];
   swipeGestureEdgeWidth = 50;
   swipeGestureThreshold = 10;
   swipeGestureMinimumVelocity = 0.2;
+  handleHistoryPopState = () => {
+    const currentPosition = this.getCurrentNavigationPosition();
+    if (currentPosition !== null && this.lastNavigationPosition !== null) {
+      if (currentPosition < this.lastNavigationPosition) {
+        this.pendingHistoryDirection = "back";
+        return;
+      }
+      if (currentPosition > this.lastNavigationPosition) {
+        this.pendingHistoryDirection = "forward";
+        return;
+      }
+    }
+    this.pendingHistoryDirection = "back";
+  };
   static get observedAttributes() {
     return ["platform", "duration", "keep-in-dom", "max-cached", "swipe-gesture"];
   }
@@ -1231,6 +1248,8 @@ var CapRouterOutlet = class extends HTMLElement {
     this.style.height = "100%";
     this.style.overflow = "hidden";
     this.lastNavigationHref = this.getCurrentNavigationHref();
+    this.lastNavigationPosition = this.getCurrentNavigationPosition();
+    this.ownerDocument.defaultView?.addEventListener("popstate", this.handleHistoryPopState);
     this.observer = new MutationObserver((mutations) => {
       this.handleMutations(mutations);
     });
@@ -1246,10 +1265,14 @@ var CapRouterOutlet = class extends HTMLElement {
   }
   disconnectedCallback() {
     this.observer?.disconnect();
+    this.ownerDocument.defaultView?.removeEventListener("popstate", this.handleHistoryPopState);
     this.removeSwipeGestureListeners();
     this.controller.clear();
     this.swipeBackDepth = 0;
     this.lastNavigationHref = null;
+    this.lastNavigationPosition = null;
+    this.pendingHistoryDirection = null;
+    this.navigationHrefs = [];
   }
   attributeChangedCallback(name, _oldValue, newValue) {
     switch (name) {
@@ -1330,13 +1353,16 @@ var CapRouterOutlet = class extends HTMLElement {
     this.controller.pageStack.push(state);
     this.swipeBackDepth = 0;
     this.lastNavigationHref = this.getCurrentNavigationHref();
+    this.lastNavigationPosition = this.getCurrentNavigationPosition();
+    this.navigationHrefs = [this.lastNavigationHref];
   }
   /**
    * Handle a new page being added
    */
   async handleNewPage(page) {
     const outletDirection = this.dataset.direction;
-    const direction = page.dataset.direction || outletDirection || "forward";
+    const explicitDirection = page.dataset.direction || outletDirection;
+    const direction = this.resolveNavigationDirection(explicitDirection);
     if (outletDirection) {
       delete this.dataset.direction;
     }
@@ -1451,7 +1477,7 @@ var CapRouterOutlet = class extends HTMLElement {
    * Check if we can go back
    */
   get canGoBack() {
-    return this.controller.stack.length > 1 && this.swipeBackDepth > 0;
+    return this.getSwipeBackDestination() !== null;
   }
   /**
    * Get whether edge swipe-back gesture is enabled.
@@ -1543,30 +1569,132 @@ var CapRouterOutlet = class extends HTMLElement {
   getCurrentNavigationHref() {
     return this.ownerDocument.defaultView?.location.href ?? null;
   }
+  getCurrentNavigationPosition() {
+    const win = this.ownerDocument.defaultView;
+    if (!win) {
+      return null;
+    }
+    const navigationIndex = win.navigation?.currentEntry?.index;
+    if (typeof navigationIndex === "number" && Number.isFinite(navigationIndex)) {
+      return navigationIndex;
+    }
+    const state = win.history.state;
+    for (const key of ["idx", "position", "index"]) {
+      const value = state?.[key];
+      if (typeof value === "number" && Number.isFinite(value)) {
+        return value;
+      }
+    }
+    return null;
+  }
+  resolveNavigationDirection(explicitDirection) {
+    if (explicitDirection) {
+      this.pendingHistoryDirection = null;
+      return explicitDirection;
+    }
+    const currentHref = this.getCurrentNavigationHref();
+    const existingHrefIndex = this.findNavigationHrefIndex(currentHref, this.navigationHrefs.length - 2);
+    if (existingHrefIndex !== -1) {
+      this.pendingHistoryDirection = null;
+      return "back";
+    }
+    if (currentHref !== null && currentHref === this.lastNavigationHref) {
+      this.pendingHistoryDirection = null;
+      return "none";
+    }
+    if (this.pendingHistoryDirection) {
+      const direction = this.pendingHistoryDirection;
+      this.pendingHistoryDirection = null;
+      return direction;
+    }
+    const currentPosition = this.getCurrentNavigationPosition();
+    if (currentPosition !== null && this.lastNavigationPosition !== null) {
+      if (currentPosition < this.lastNavigationPosition) {
+        return "back";
+      }
+      if (currentPosition === this.lastNavigationPosition) {
+        return "none";
+      }
+    }
+    return "forward";
+  }
   recordCompletedNavigation(direction, options) {
     const currentHref = this.getCurrentNavigationHref();
+    const currentPosition = this.getCurrentNavigationPosition();
     if (!options.hadPageBefore || direction === "root") {
-      this.swipeBackDepth = 0;
-      this.lastNavigationHref = currentHref;
+      this.resetNavigationDepth(currentHref, currentPosition);
       return;
     }
     if (direction === "back") {
-      this.swipeBackDepth = Math.max(0, this.swipeBackDepth - 1);
+      this.recordBackNavigation(currentHref);
+      this.lastNavigationPosition = currentPosition;
+      return;
+    }
+    if (direction === "none") {
+      if (this.navigationHrefs.length === 0) {
+        this.navigationHrefs = [currentHref];
+      } else {
+        this.navigationHrefs[this.navigationHrefs.length - 1] = currentHref;
+      }
+      this.syncSwipeBackDepth();
       this.lastNavigationHref = currentHref;
+      this.lastNavigationPosition = currentPosition;
       return;
     }
-    if (direction === "forward" || direction === "none") {
+    if (direction === "forward") {
       const hrefChanged = currentHref === null || this.lastNavigationHref === null || currentHref !== this.lastNavigationHref;
       if (options.forceForward || hrefChanged) {
-        this.swipeBackDepth += 1;
+        this.navigationHrefs.push(currentHref);
+      } else if (this.navigationHrefs.length === 0) {
+        this.navigationHrefs = [currentHref];
       }
+      this.syncSwipeBackDepth();
       this.lastNavigationHref = currentHref;
+      this.lastNavigationPosition = currentPosition;
       return;
     }
     this.lastNavigationHref = currentHref;
+    this.lastNavigationPosition = currentPosition;
+  }
+  resetNavigationDepth(currentHref, currentPosition) {
+    this.navigationHrefs = [currentHref];
+    this.swipeBackDepth = 0;
+    this.lastNavigationHref = currentHref;
+    this.lastNavigationPosition = currentPosition;
+  }
+  recordBackNavigation(currentHref) {
+    const existingHrefIndex = this.findNavigationHrefIndex(currentHref, this.navigationHrefs.length - 2);
+    if (existingHrefIndex !== -1) {
+      this.navigationHrefs = this.navigationHrefs.slice(0, existingHrefIndex + 1);
+    } else if (this.navigationHrefs.length > 1) {
+      this.navigationHrefs.pop();
+      this.navigationHrefs[this.navigationHrefs.length - 1] = currentHref;
+    } else {
+      this.navigationHrefs = [currentHref];
+    }
+    this.syncSwipeBackDepth();
+    this.lastNavigationHref = currentHref;
+  }
+  findNavigationHrefIndex(href, fromIndex) {
+    for (let index = Math.min(fromIndex, this.navigationHrefs.length - 1); index >= 0; index -= 1) {
+      if (this.navigationHrefs[index] === href) {
+        return index;
+      }
+    }
+    return -1;
+  }
+  syncSwipeBackDepth() {
+    this.swipeBackDepth = Math.max(0, this.navigationHrefs.length - 1);
+  }
+  getSwipeBackDestination() {
+    const stack = this.controller.stack;
+    if (this.swipeBackDepth <= 0 || stack.length <= 1) {
+      return null;
+    }
+    return stack[stack.length - 2] ?? null;
   }
   canStartSwipeGesture(event) {
-    if (!this.isSwipeGestureEnabled() || this.controller.animating || this.pendingPage || !this.canGoBack) {
+    if (!this.isSwipeGestureEnabled() || this.controller.animating || this.pendingPage || !this.getSwipeBackDestination()) {
       return false;
     }
     if (!event.isPrimary || event.pointerType === "mouse" && event.button !== 0) {
@@ -1653,6 +1781,10 @@ var CapRouterOutlet = class extends HTMLElement {
       return;
     }
     if (!pointer.dragging && deltaX > this.swipeGestureThreshold && absX > absY) {
+      if (!this.getSwipeBackDestination()) {
+        this.cancelSwipeGesturePointer(event.pointerId);
+        return;
+      }
       pointer.dragging = true;
       pointer.transitionStarted = this.controller.beginInteractiveBack({ direction: "back" });
       if (!pointer.transitionStarted) {
@@ -1661,6 +1793,10 @@ var CapRouterOutlet = class extends HTMLElement {
       }
     }
     if (pointer.dragging && pointer.transitionStarted) {
+      if (!this.getSwipeBackDestination()) {
+        this.cancelSwipeGesture(event.pointerId);
+        return;
+      }
       if (event.cancelable) event.preventDefault();
       const width = Math.max(this.getBoundingClientRect().width, 1);
       this.controller.stepInteractiveBack(deltaX / width);
@@ -1712,9 +1848,10 @@ var CapRouterOutlet = class extends HTMLElement {
     }
   }
   async finishSwipeGestureBack(shouldComplete, releaseDuration) {
-    const shouldUseHistory = shouldComplete && typeof window !== "undefined" && window.history.length > 1;
-    await this.controller.endInteractiveBack(shouldComplete, releaseDuration, !shouldUseHistory);
-    if (!shouldComplete) {
+    const canComplete = shouldComplete && this.getSwipeBackDestination() !== null;
+    const shouldUseHistory = canComplete && typeof window !== "undefined" && window.history.length > 1;
+    await this.controller.endInteractiveBack(canComplete, canComplete ? releaseDuration : 0, !shouldUseHistory);
+    if (!canComplete) {
       return;
     }
     if (shouldUseHistory) {