@inertiajs/core 2.3.8 → 2.3.9

package/dist/index.esm.js

@@ -817,6 +817,9 @@ var CurrentPage = class {
         component: page2.component,
         url: page2.url
       };
+      if (page2.initialDeferredProps === void 0) {
+        page2.initialDeferredProps = page2.deferredProps;
+      }
     }
     this.componentId = {};
     const componentId = this.componentId;
@@ -1277,10 +1280,21 @@ var EventHandler = class {
         this.onMissingHistoryItem();
         return;
       }
-      router.cancelAll();
+      router.cancelAll({ prefetch: false });
       page.setQuietly(data, { preserveState: false }).then(() => {
         Scroll.restore(history.getScrollRegions());
         fireNavigateEvent(page.get());
+        const pendingDeferred = {};
+        const pageProps = page.get().props;
+        for (const [group, props] of Object.entries(data.initialDeferredProps ?? data.deferredProps ?? {})) {
+          const missing = props.filter((prop) => pageProps[prop] === void 0);
+          if (missing.length > 0) {
+            pendingDeferred[group] = missing;
+          }
+        }
+        if (Object.keys(pendingDeferred).length > 0) {
+          this.fireInternalEvent("loadDeferredProps", pendingDeferred);
+        }
       });
     }).catch(() => {
       this.onMissingHistoryItem();
@@ -1513,6 +1527,9 @@ var RequestParams = class _RequestParams {
   isPartial() {
     return this.params.only.length > 0 || this.params.except.length > 0 || this.params.reset.length > 0;
   }
+  isPrefetch() {
+    return this.params.prefetch === true;
+  }
   isDeferredPropsRequest() {
     return this.params.deferredProps === true;
   }
@@ -1966,6 +1983,10 @@ var Response = class _Response {
       ...page.get().flash,
       ...this.requestParams.isDeferredPropsRequest() ? {} : pageResponse.flash
     };
+    const currentOriginalDeferred = page.get().initialDeferredProps;
+    if (currentOriginalDeferred && Object.keys(currentOriginalDeferred).length > 0) {
+      pageResponse.initialDeferredProps = currentOriginalDeferred;
+    }
   }
   mergeOrMatchItems(existingItems, newItems, matchProp, matchPropsOn, shouldAppend = true) {
     const items = Array.isArray(existingItems) ? existingItems : [];
@@ -2039,6 +2060,9 @@ var Request = class _Request {
   static create(params, page2) {
     return new _Request(params, page2);
   }
+  isPrefetch() {
+    return this.requestParams.isPrefetch();
+  }
   async send() {
     this.requestParams.onCancelToken(() => this.cancel({ cancelled: true }));
     fireStartEvent(this.requestParams.all());
@@ -2155,20 +2179,17 @@ var RequestStream = class {
   interruptInFlight() {
     this.cancel({ interrupted: true }, false);
   }
-  cancelInFlight() {
-    this.cancel({ cancelled: true }, true);
+  cancelInFlight({ prefetch = true } = {}) {
+    this.requests.filter((request) => prefetch || !request.isPrefetch()).forEach((request) => request.cancel({ cancelled: true }));
   }
-  cancel({ cancelled = false, interrupted = false } = {}, force) {
-    if (!this.shouldCancel(force)) {
+  cancel({ cancelled = false, interrupted = false } = {}, force = false) {
+    if (!force && !this.shouldCancel()) {
       return;
     }
     const request = this.requests.shift();
-    request?.cancel({ interrupted, cancelled });
+    request?.cancel({ cancelled, interrupted });
   }
-  shouldCancel(force) {
-    if (force) {
-      return true;
-    }
+  shouldCancel() {
     return this.interruptible && this.requests.length >= this.maxConcurrent;
   }
 };
@@ -2258,11 +2279,14 @@ var Router = class {
     }
     return eventHandler.onGlobalEvent(type, callback);
   }
+  /**
+   * @deprecated Use cancelAll() instead.
+   */
   cancel() {
     this.syncRequestStream.cancelInFlight();
   }
-  cancelAll() {
-    this.asyncRequestStream.cancelInFlight();
+  cancelAll({ prefetch = true } = {}) {
+    this.asyncRequestStream.cancelInFlight({ prefetch });
     this.syncRequestStream.cancelInFlight();
   }
   poll(interval, requestOptions = {}, options = {}) {
@@ -2280,8 +2304,12 @@ var Router = class {
     if (events.onBefore(visit) === false || !fireBeforeEvent(visit)) {
       return;
     }
-    const requestStream = visit.async ? this.asyncRequestStream : this.syncRequestStream;
-    requestStream.interruptInFlight();
+    if (!isSameUrlWithoutHash(visit.url, hrefToUrl(page.get().url))) {
+      this.asyncRequestStream.cancelInFlight({ prefetch: false });
+    }
+    if (!visit.async) {
+      this.syncRequestStream.interruptInFlight();
+    }
     if (!page.isCleared() && !visit.preserveUrl) {
       Scroll.save();
     }
@@ -2295,6 +2323,7 @@ var Router = class {
       prefetchedRequests.use(prefetched, requestParams);
     } else {
       progress.reveal(true);
+      const requestStream = visit.async ? this.asyncRequestStream : this.syncRequestStream;
       requestStream.send(Request.create(requestParams, page.get()));
     }
   }