@inertiajs/core 2.3.22 → 2.3.24

package/dist/index.esm.js

@@ -277,6 +277,15 @@ var getKeyFromSessionStorage = async () => {
 import { cloneDeep } from "lodash-es";
 
 // src/objectUtils.ts
+var stripTopLevelUndefined = (obj) => {
+  const result = {};
+  for (const key of Object.keys(obj)) {
+    if (obj[key] !== void 0) {
+      result[key] = obj[key];
+    }
+  }
+  return result;
+};
 var objectsAreEqual = (obj1, obj2, excludeKeys) => {
   if (obj1 === obj2) {
     return true;
@@ -1551,11 +1560,17 @@ var InitialVisit = class {
 // src/poll.ts
 var Poll = class {
   constructor(interval, cb, options) {
-    this.id = null;
+    this.intervalId = null;
+    this.timeoutId = null;
     this.throttle = false;
     this.keepAlive = false;
     this.cbCount = 0;
+    this.inFlight = false;
+    this.currentCancel = null;
+    this.stopped = true;
+    this.instanceId = 0;
     this.keepAlive = options.keepAlive ?? false;
+    this.mode = options.mode ?? "overlap";
     this.cb = cb;
     this.interval = interval;
     if (options.autoStart ?? true) {
@@ -1563,8 +1578,17 @@ var Poll = class {
     }
   }
   stop() {
-    if (this.id) {
-      clearInterval(this.id);
+    this.stopped = true;
+    this.instanceId++;
+    this.inFlight = false;
+    this.currentCancel = null;
+    if (this.intervalId) {
+      clearInterval(this.intervalId);
+      this.intervalId = null;
+    }
+    if (this.timeoutId) {
+      clearTimeout(this.timeoutId);
+      this.timeoutId = null;
     }
   }
   start() {
@@ -1572,14 +1596,12 @@ var Poll = class {
       return;
     }
     this.stop();
-    this.id = window.setInterval(() => {
-      if (!this.throttle || this.cbCount % 10 === 0) {
-        this.cb();
-      }
-      if (this.throttle) {
-        this.cbCount++;
-      }
-    }, this.interval);
+    this.stopped = false;
+    if (this.mode === "rest") {
+      this.scheduleNext();
+      return;
+    }
+    this.intervalId = window.setInterval(() => this.tick(), this.interval);
   }
   isInBackground(hidden) {
     this.throttle = this.keepAlive ? false : hidden;
@@ -1587,6 +1609,50 @@ var Poll = class {
       this.cbCount = 0;
     }
   }
+  scheduleNext() {
+    if (this.stopped) {
+      return;
+    }
+    this.timeoutId = window.setTimeout(() => {
+      this.timeoutId = null;
+      this.tick();
+    }, this.interval);
+  }
+  tick() {
+    if (!this.throttle || this.cbCount % 10 === 0) {
+      this.fire();
+    } else if (this.mode === "rest") {
+      this.scheduleNext();
+    }
+    if (this.throttle) {
+      this.cbCount++;
+    }
+  }
+  fire() {
+    if (this.inFlight && this.mode === "cancel") {
+      this.currentCancel?.();
+    }
+    const instance = this.instanceId;
+    this.cb({
+      onStart: (cancel) => {
+        if (instance !== this.instanceId) {
+          return;
+        }
+        this.inFlight = true;
+        this.currentCancel = cancel;
+      },
+      onFinish: () => {
+        if (instance !== this.instanceId) {
+          return;
+        }
+        this.inFlight = false;
+        this.currentCancel = null;
+        if (this.mode === "rest") {
+          this.scheduleNext();
+        }
+      }
+    });
+  }
 };
 
 // src/polls.ts
@@ -1595,12 +1661,19 @@ var Polls = class {
     this.polls = [];
     this.setupVisibilityListener();
   }
+  get count() {
+    return this.polls.length;
+  }
   add(interval, cb, options) {
     const poll = new Poll(interval, cb, options);
     this.polls.push(poll);
     return {
       stop: () => poll.stop(),
-      start: () => poll.start()
+      start: () => poll.start(),
+      destroy: () => {
+        poll.stop();
+        this.polls = this.polls.filter((p) => p !== poll);
+      }
     };
   }
   clear() {
@@ -1779,6 +1852,7 @@ import { get as get2, isEqual as isEqual2, set as set2 } from "lodash-es";
 var modal_default = {
   modal: null,
   listener: null,
+  previousBodyOverflow: null,
   createIframeAndPage(html) {
     if (typeof html === "object") {
       html = `All Inertia requests must receive a valid Inertia response, however a plain JSON response was received.<hr>${JSON.stringify(
@@ -1809,6 +1883,7 @@ var modal_default = {
     this.modal.addEventListener("click", () => this.hide());
     this.modal.appendChild(iframe);
     document.body.prepend(this.modal);
+    this.previousBodyOverflow = document.body.style.overflow;
     document.body.style.overflow = "hidden";
     iframe.srcdoc = page2.outerHTML;
     this.listener = this.hideOnEscape.bind(this);
@@ -1817,7 +1892,8 @@ var modal_default = {
   hide() {
     this.modal.outerHTML = "";
     this.modal = null;
-    document.body.style.overflow = "visible";
+    document.body.style.overflow = this.previousBodyOverflow ?? "";
+    this.previousBodyOverflow = null;
     document.removeEventListener("keydown", this.listener);
   },
   hideOnEscape(event) {
@@ -2418,6 +2494,9 @@ var Router = class {
   cancel() {
     this.syncRequestStream.cancelInFlight();
   }
+  get activePolls() {
+    return polls.count;
+  }
   cancelAll({ async = true, prefetch = true, sync = true } = {}) {
     if (async) {
       this.asyncRequestStream.cancelInFlight({ prefetch });
@@ -2427,10 +2506,28 @@ var Router = class {
     }
   }
   poll(interval, requestOptions = {}, options = {}) {
-    return polls.add(interval, () => this.reload(requestOptions), {
-      autoStart: options.autoStart ?? true,
-      keepAlive: options.keepAlive ?? false
-    });
+    return polls.add(
+      interval,
+      ({ onStart, onFinish }) => {
+        const resolved = typeof requestOptions === "function" ? requestOptions() : requestOptions;
+        this.reload({
+          ...resolved,
+          onCancelToken: (token) => {
+            onStart(token.cancel);
+            resolved.onCancelToken?.(token);
+          },
+          onFinish: (visit) => {
+            onFinish();
+            resolved.onFinish?.(visit);
+          }
+        });
+      },
+      {
+        autoStart: options.autoStart ?? true,
+        keepAlive: options.keepAlive ?? false,
+        mode: options.mode
+      }
+    );
   }
   visit(href, options = {}) {
     const visit = this.getPendingVisit(href, {
@@ -2683,8 +2780,8 @@ var Router = class {
       prefetch: false,
       invalidateCacheTags: [],
       viewTransition: false,
-      ...options,
-      ...configuredOptions
+      ...stripTopLevelUndefined(options),
+      ...stripTopLevelUndefined(configuredOptions)
     };
     const [url, _data] = transformUrlAndData(
       href,
@@ -3158,7 +3255,9 @@ var useInfiniteScrollData = (options) => {
       },
       onFinish: (visit) => {
         state.loading = false;
-        side === "next" ? options.onCompleteNextRequest(state.lastLoadedPage) : options.onCompletePreviousRequest(state.lastLoadedPage);
+        const completed = visit.completed;
+        const page3 = completed ? state.lastLoadedPage : null;
+        side === "next" ? options.onCompleteNextRequest(page3, { page: page3, completed }) : options.onCompletePreviousRequest(page3, { page: page3, completed });
         reloadOptions.onFinish?.(visit);
       }
     });
@@ -3510,13 +3609,17 @@ function useInfiniteScroll(options) {
     // so they don't get confused with server-loaded content
     onBeforeUpdate: elementManager.processManuallyAddedElements,
     // After successful request, tag new server content
-    onCompletePreviousRequest: (loadedPage) => {
-      options.onCompletePreviousRequest();
-      requestAnimationFrame(() => elementManager.processServerLoadedElements(loadedPage), 2);
+    onCompletePreviousRequest: (_, details) => {
+      options.onCompletePreviousRequest(details);
+      if (details.completed) {
+        requestAnimationFrame(() => elementManager.processServerLoadedElements(details.page), 2);
+      }
     },
-    onCompleteNextRequest: (loadedPage) => {
-      options.onCompleteNextRequest();
-      requestAnimationFrame(() => elementManager.processServerLoadedElements(loadedPage), 2);
+    onCompleteNextRequest: (_, details) => {
+      options.onCompleteNextRequest(details);
+      if (details.completed) {
+        requestAnimationFrame(() => elementManager.processServerLoadedElements(details.page), 2);
+      }
     },
     onReset: options.onDataReset
   });
@@ -3939,7 +4042,7 @@ function setupProgress({
 }
 
 // src/resetFormFields.ts
-var FormComponentResetSymbol = /* @__PURE__ */ Symbol("FormComponentReset");
+var FormComponentResetSymbol = Symbol("FormComponentReset");
 function isFormElement(element) {
   return element instanceof HTMLInputElement || element instanceof HTMLSelectElement || element instanceof HTMLTextAreaElement;
 }