@inertiajs/core 2.2.4 → 2.2.6

package/dist/index.js

@@ -2238,11 +2238,12 @@ var getScrollableParent = (element) => {
 };
 var getElementsInViewportFromCollection = (referenceElement, elements) => {
   const referenceIndex = elements.indexOf(referenceElement);
-  const visibleElements = [];
+  const upwardElements = [];
+  const downwardElements = [];
   for (let i = referenceIndex; i >= 0; i--) {
     const element = elements[i];
     if (elementInViewport(element)) {
-      visibleElements.push(element);
+      upwardElements.push(element);
     } else {
       break;
     }
@@ -2250,12 +2251,12 @@ var getElementsInViewportFromCollection = (referenceElement, elements) => {
   for (let i = referenceIndex + 1; i < elements.length; i++) {
     const element = elements[i];
     if (elementInViewport(element)) {
-      visibleElements.push(element);
+      downwardElements.push(element);
     } else {
       break;
     }
   }
-  return visibleElements;
+  return [...upwardElements.reverse(), ...downwardElements];
 };
 
 // src/formObject.ts
@@ -2429,29 +2430,37 @@ var useInfiniteScrollData = (options) => {
     }
     throw new Error(`The page object does not contain a scroll prop named "${options.getPropName()}".`);
   };
-  const { previousPage, nextPage, currentPage: lastLoadedPage } = getScrollPropFromCurrentPage();
   const state = {
+    component: null,
     loading: false,
-    previousPage,
-    nextPage,
-    lastLoadedPage,
+    previousPage: null,
+    nextPage: null,
+    lastLoadedPage: null,
     requestCount: 0
   };
-  const getRememberKey = () => `inertia:infinite-scroll-data:${options.getPropName()}`;
-  const rememberedState = router.restore(getRememberKey());
-  if (rememberedState && typeof rememberedState === "object") {
-    state.previousPage = rememberedState.previousPage;
-    state.nextPage = rememberedState.nextPage;
-    state.lastLoadedPage = rememberedState.lastLoadedPage;
-    state.requestCount = rememberedState.requestCount || 0;
-  }
-  const removeEventListener = router.on("success", () => {
+  const resetState = () => {
     const scrollProp = getScrollPropFromCurrentPage();
-    if (scrollProp.reset) {
-      state.previousPage = scrollProp.previousPage;
-      state.nextPage = scrollProp.nextPage;
-      state.lastLoadedPage = scrollProp.currentPage;
-      state.requestCount = 0;
+    state.component = page.get().component;
+    state.loading = false;
+    state.previousPage = scrollProp.previousPage;
+    state.nextPage = scrollProp.nextPage;
+    state.lastLoadedPage = scrollProp.currentPage;
+    state.requestCount = 0;
+  };
+  const getRememberKey = () => `inertia:infinite-scroll-data:${options.getPropName()}`;
+  if (typeof window !== "undefined") {
+    resetState();
+    const rememberedState = router.restore(getRememberKey());
+    if (rememberedState && typeof rememberedState === "object") {
+      state.previousPage = rememberedState.previousPage;
+      state.nextPage = rememberedState.nextPage;
+      state.lastLoadedPage = rememberedState.lastLoadedPage;
+      state.requestCount = rememberedState.requestCount || 0;
+    }
+  }
+  const removeEventListener = router.on("success", (event) => {
+    if (state.component === event.detail.page.component && getScrollPropFromCurrentPage().reset) {
+      resetState();
     }
   });
   const getScrollPropKeyForSide = (side) => {
@@ -2580,8 +2589,7 @@ var useInfiniteScrollElementManager = (options) => {
     });
     itemsMutationObserver.observe(options.getItemsElement(), { childList: true });
     itemsObserver = intersectionObservers.new(
-      (entry) => options.onItemIntersected(entry.target),
-      { threshold: 0 }
+      (entry) => options.onItemIntersected(entry.target)
     );
     const observerOptions = {
       root: options.getScrollableParent(),
@@ -2618,6 +2626,7 @@ var useInfiniteScrollElementManager = (options) => {
     }
   };
   const flushAll = () => {
+    disableTriggers();
     intersectionObservers.flushAll();
     itemsMutationObserver?.disconnect();
   };
@@ -2719,13 +2728,49 @@ var useInfiniteScrollElementManager = (options) => {
 };
 
 // src/infiniteScroll/queryString.ts
+var queue3 = new Queue();
+var initialUrl;
+var payloadUrl;
 var useInfiniteScrollQueryString = (options) => {
+  let enabled = true;
+  const queuePageUpdate = (page2) => {
+    queue3.add(() => {
+      return new Promise((resolve) => {
+        if (!enabled) {
+          initialUrl = payloadUrl = null;
+          return resolve();
+        }
+        if (!initialUrl || !payloadUrl) {
+          initialUrl = new URL(window.location.href);
+          payloadUrl = new URL(window.location.href);
+        }
+        const pageName = options.getPageName();
+        const searchParams = payloadUrl.searchParams;
+        if (page2 === "1") {
+          searchParams.delete(pageName);
+        } else {
+          searchParams.set(pageName, page2);
+        }
+        setTimeout(() => resolve());
+      });
+    }).finally(() => {
+      if (enabled && initialUrl && payloadUrl && initialUrl.href !== payloadUrl.href) {
+        router.replace({
+          url: payloadUrl.toString(),
+          preserveScroll: true,
+          preserveState: true
+        });
+      }
+      initialUrl = payloadUrl = null;
+    });
+  };
   const onItemIntersected = debounce((itemElement) => {
-    if (options.shouldPreserveUrl() || !itemElement) {
+    const itemsElement = options.getItemsElement();
+    if (!enabled || options.shouldPreserveUrl() || !itemElement || !itemsElement) {
       return;
     }
     const pageMap = /* @__PURE__ */ new Map();
-    const elements = [...options.getItemsElement().children];
+    const elements = [...itemsElement.children];
     getElementsInViewportFromCollection(itemElement, elements).forEach((element) => {
       const page2 = getPageFromElement(element) ?? "1";
       if (pageMap.has(page2)) {
@@ -2736,23 +2781,13 @@ var useInfiniteScrollQueryString = (options) => {
     });
     const sortedPages = Array.from(pageMap.entries()).sort((a, b) => b[1] - a[1]);
     const mostVisiblePage = sortedPages[0]?.[0];
-    if (mostVisiblePage === void 0) {
-      return;
+    if (mostVisiblePage !== void 0) {
+      queuePageUpdate(mostVisiblePage);
     }
-    const url = new URL(window.location.href);
-    if (mostVisiblePage === "1") {
-      url.searchParams.delete(options.getPageName());
-    } else {
-      url.searchParams.set(options.getPageName(), mostVisiblePage.toString());
-    }
-    router.replace({
-      url: url.toString(),
-      preserveScroll: true,
-      preserveState: true
-    });
   }, 250);
   return {
-    onItemIntersected
+    onItemIntersected,
+    cancel: () => enabled = false
   };
 };
 
@@ -2882,7 +2917,12 @@ function useInfiniteScroll(options) {
   };
   return {
     dataManager,
-    elementManager
+    elementManager,
+    flush: () => {
+      dataManager.removeEventListener();
+      elementManager.flushAll();
+      queryStringManager.cancel();
+    }
   };
 }
 
@@ -2940,7 +2980,7 @@ var set4 = (n) => {
   const speed = settings.speed;
   const ease = settings.easing;
   progress3.offsetWidth;
-  queue3((next) => {
+  queue4((next) => {
     const barStyles = (() => {
       if (settings.positionUsing === "translate3d") {
         return {
@@ -3072,7 +3112,7 @@ function clamp(n, min, max) {
   return n;
 }
 var toBarPercentage = (n) => (-1 + n) * 100;
-var queue3 = /* @__PURE__ */ (() => {
+var queue4 = /* @__PURE__ */ (() => {
   const pending = [];
   const next = () => {
     const fn = pending.shift();