@inertiajs/core 2.1.4 → 2.1.6

package/dist/index.esm.js

@@ -395,6 +395,7 @@ var CurrentPage = class {
     this.listeners = [];
     this.isFirstPageLoad = true;
     this.cleared = false;
+    this.pendingDeferredProps = null;
   }
   init({ initialPage, swapComponent, resolveComponent }) {
     this.page = initialPage;
@@ -407,6 +408,13 @@ var CurrentPage = class {
     preserveScroll = false,
     preserveState = false
   } = {}) {
+    if (Object.keys(page2.deferredProps || {}).length) {
+      this.pendingDeferredProps = {
+        deferredProps: page2.deferredProps,
+        component: page2.component,
+        url: page2.url
+      };
+    }
     this.componentId = {};
     const componentId = this.componentId;
     if (page2.clearHistory) {
@@ -436,7 +444,10 @@ var CurrentPage = class {
           if (!preserveScroll) {
             Scroll.reset();
           }
-          eventHandler.fireInternalEvent("loadDeferredProps");
+          if (this.pendingDeferredProps && this.pendingDeferredProps.component === page2.component && this.pendingDeferredProps.url === page2.url) {
+            eventHandler.fireInternalEvent("loadDeferredProps", this.pendingDeferredProps.deferredProps);
+          }
+          this.pendingDeferredProps = null;
           if (!replace) {
             fireNavigateEvent(page2);
           }
@@ -736,8 +747,8 @@ var EventHandler = class {
     page.clear();
     this.fireInternalEvent("missingHistoryItem");
   }
-  fireInternalEvent(event) {
-    this.internalListeners.filter((listener) => listener.event === event).forEach((listener) => listener.listener());
+  fireInternalEvent(event, ...args) {
+    this.internalListeners.filter((listener) => listener.event === event).forEach((listener) => listener.listener(...args));
   }
   registerListener(type, listener) {
     document.addEventListener(type, listener);
@@ -1394,6 +1405,7 @@ var Response = class _Response {
     this.requestParams = requestParams;
     this.response = response;
     this.originatingPage = originatingPage;
+    this.wasPrefetched = false;
   }
   static create(params, response, originatingPage) {
     return new _Response(params, response, originatingPage);
@@ -1408,6 +1420,7 @@ var Response = class _Response {
   }
   async process() {
     if (this.requestParams.all().prefetch) {
+      this.wasPrefetched = true;
       this.requestParams.all().prefetch = false;
       this.requestParams.all().onPrefetched(this.response, this.requestParams.all());
       firePrefetchedEvent(this.response, this.requestParams.all());
@@ -1427,6 +1440,9 @@ var Response = class _Response {
       return this.requestParams.all().onError(scopedErrors);
     }
     router.flushByCacheTags(this.requestParams.all().invalidateCacheTags || []);
+    if (!this.wasPrefetched) {
+      router.flush(page.get().url);
+    }
     fireSuccessEvent(page.get());
     await this.requestParams.all().onSuccess(page.get());
     history.preserveUrl = false;
@@ -1773,8 +1789,8 @@ var Router = class {
         this.visit(window.location.href, { preserveState: true, preserveScroll: true, replace: true });
       }
     });
-    eventHandler.on("loadDeferredProps", () => {
-      this.loadDeferredProps();
+    eventHandler.on("loadDeferredProps", (deferredProps) => {
+      this.loadDeferredProps(deferredProps);
     });
   }
   get(url, data = {}, options = {}) {
@@ -2049,8 +2065,7 @@ var Router = class {
       })
     };
   }
-  loadDeferredProps() {
-    const deferred = page.get()?.deferredProps;
+  loadDeferredProps(deferred) {
     if (deferred) {
       Object.entries(deferred).forEach(([_, group]) => {
         this.reload({ only: group });