@very-simple/ajax 1.0.0-beta.8 → 1.0.0-beta.9

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 interface AjaxState extends Record<string, unknown> {
     regions?: string[];
+    index?: number;
 }
 /** Also accepts all `Config` options, e.g. `merge`, `scrollBehavior`, etc. */
 interface VisitOptions extends Config {
@@ -8,7 +9,7 @@ interface VisitOptions extends Config {
     autoFocus?: boolean;
     request?: RequestInit;
     regions?: string[];
-    state?: Omit<AjaxState, 'regions'>;
+    state?: Omit<AjaxState, 'regions' | 'index'>;
 }
 type StartOptions = Config;
 interface LoadingOptions {

package/dist/index.js

@@ -272,7 +272,11 @@ var visit = async (url, {
   url = normalizeUrl(url);
   const fromUrl = currentUrl;
   const fromState = currentState;
-  state = { ...state, regions };
+  if (!(isBackForward && state)) {
+    const currentIndex = currentState?.index ?? 0;
+    const index = historyMode === "push" ? currentIndex + 1 : currentIndex;
+    state = { ...state, regions, index };
+  }
   currentVisitController?.abort();
   currentVisitController = new AbortController();
   const { signal } = currentVisitController;
@@ -287,7 +291,13 @@ var visit = async (url, {
   let newDocument;
   if (isBackForward) {
     const html = cache.get(url);
-    if (html) newDocument = parseHtml(html);
+    if (html) {
+      const cached = parseHtml(html);
+      const isComplete = regions.every(
+        (selector) => !document.querySelector(selector) || cached.querySelector(selector)
+      );
+      if (isComplete) newDocument = cached;
+    }
   }
   if (!newDocument) {
     const options = { loadingDelay, progressHideDelay, request };
@@ -488,10 +498,12 @@ var interceptForms = () => {
 var interceptHistory = () => {
   window.addEventListener("popstate", (event) => {
     if (normalizeUrl(window.location.href) === normalizeUrl(currentUrl)) return;
+    const isBack = (event.state?.index ?? 0) < (currentState?.index ?? 0);
+    const regions = isBack ? currentState?.regions : event.state?.regions;
     visit(window.location.href, {
       history: "none",
       isBackForward: true,
-      regions: currentState?.regions ?? config.regions,
+      regions: regions ?? config.regions,
       state: event.state
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@very-simple/ajax",
-  "version": "1.0.0-beta.8",
+  "version": "1.0.0-beta.9",
   "description": "A very simple turbolinks inspired ajax library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",