@inertiajs/core 2.3.2 → 2.3.4

package/dist/index.js

@@ -153,6 +153,9 @@ var firePrefetchedEvent = (response, visit) => {
 var firePrefetchingEvent = (visit) => {
   return fireEvent("prefetching", { detail: { visit } });
 };
+var fireFlashEvent = (flash) => {
+  return fireEvent("flash", { detail: { flash } });
+};
 
 // src/history.ts
 var import_lodash_es3 = require("lodash-es");
@@ -583,6 +586,7 @@ var PrefetchedRequests = class {
         "onCancel",
         "onSuccess",
         "onError",
+        "onFlash",
         "onPrefetched",
         "onCancelToken",
         "onPrefetching",
@@ -788,7 +792,7 @@ function mergeDataIntoQueryString(method, href, data, qsArrayFormat = "brackets"
   const hasHash = href.toString().includes("#");
   const url = new URL(href.toString(), typeof window === "undefined" ? "http://localhost" : window.location.toString());
   if (hasDataForQueryString) {
-    const parseOptions = { ignoreQueryPrefix: true, parseArrays: false };
+    const parseOptions = { ignoreQueryPrefix: true, arrayLimit: -1 };
     url.search = qs.stringify(
       { ...qs.parse(url.search, parseOptions), ...data },
       {
@@ -825,7 +829,7 @@ function isUrlMethodPair(href) {
   return href !== null && typeof href === "object" && href !== void 0 && "url" in href && "method" in href;
 }
 function urlHasProtocol(url) {
-  return /^[a-z][a-z0-9+.-]*:\/\//i.test(url);
+  return /^([a-z][a-z0-9+.-]*:)?\/\/[^/]/i.test(url);
 }
 function urlToString(url, absolute) {
   const urlObj = typeof url === "string" ? hrefToUrl(url) : url;
@@ -844,11 +848,13 @@ var CurrentPage = class {
   init({
     initialPage,
     swapComponent,
-    resolveComponent
+    resolveComponent,
+    onFlash
   }) {
-    this.page = initialPage;
+    this.page = { ...initialPage, flash: initialPage.flash ?? {} };
     this.swapComponent = swapComponent;
     this.resolveComponent = resolveComponent;
+    this.onFlashCallback = onFlash;
     return this;
   }
   set(page2, {
@@ -878,9 +884,10 @@ var CurrentPage = class {
       const location = !isServer2 ? window.location : new URL(page2.url);
       const scrollRegions = !isServer2 && preserveScroll ? Scroll.getScrollRegions() : [];
       replace = replace || isSameUrlWithoutHash(hrefToUrl(page2.url), location);
-      return new Promise((resolve) => {
-        replace ? history.replaceState(page2, () => resolve(null)) : history.pushState(page2, () => resolve(null));
-      }).then(() => {
+      const pageForHistory = { ...page2, flash: {} };
+      return new Promise(
+        (resolve) => replace ? history.replaceState(pageForHistory, resolve) : history.pushState(pageForHistory, resolve)
+      ).then(() => {
         const isNewComponent = !this.isTheSame(page2);
         if (!isNewComponent && Object.keys(page2.props.errors || {}).length > 0) {
           viewTransition = false;
@@ -938,12 +945,19 @@ var CurrentPage = class {
   get() {
     return this.page;
   }
+  getWithoutFlashData() {
+    return { ...this.page, flash: {} };
+  }
   hasOnceProps() {
     return Object.keys(this.page.onceProps ?? {}).length > 0;
   }
   merge(data) {
     this.page = { ...this.page, ...data };
   }
+  setFlash(flash) {
+    this.page = { ...this.page, flash };
+    this.onFlashCallback?.(flash);
+  }
   setUrlHash(hash) {
     if (!this.page.url.includes(hash)) {
       this.page.url += hash;
@@ -1038,7 +1052,7 @@ var History = class {
   }
   remember(data, key) {
     this.replaceState({
-      ...page.get(),
+      ...page.getWithoutFlashData(),
       rememberedState: {
         ...page.get()?.rememberedState ?? {},
         [key]: data
@@ -1268,7 +1282,7 @@ var EventHandler = class {
     if (state === null) {
       const url = hrefToUrl(page.get().url);
       url.hash = window.location.hash;
-      history.replaceState({ ...page.get(), url: url.href });
+      history.replaceState({ ...page.getWithoutFlashData(), url: url.href });
       Scroll.reset();
       return;
     }
@@ -1386,7 +1400,12 @@ var InitialVisit = class {
       } else {
         Scroll.scrollToAnchor();
       }
-      fireNavigateEvent(page.get());
+      const page2 = page.get();
+      fireNavigateEvent(page2);
+      const flash = page2.flash;
+      if (Object.keys(flash).length > 0) {
+        fireFlashEvent(flash);
+      }
     });
   }
 };
@@ -1484,6 +1503,7 @@ var RequestParams = class _RequestParams {
         onCancel: this.wrapCallback(params, "onCancel"),
         onSuccess: this.wrapCallback(params, "onSuccess"),
         onError: this.wrapCallback(params, "onError"),
+        onFlash: this.wrapCallback(params, "onFlash"),
         onCancelToken: this.wrapCallback(params, "onCancelToken"),
         onPrefetched: this.wrapCallback(params, "onPrefetched"),
         onPrefetching: this.wrapCallback(params, "onPrefetching")
@@ -1753,6 +1773,7 @@ var Response = class _Response {
     }
     await history.processQueue();
     history.preserveUrl = this.requestParams.all().preserveUrl;
+    const previousFlash = page.get().flash;
     await this.setPage();
     const errors = page.get().props.errors || {};
     if (Object.keys(errors).length > 0) {
@@ -1764,6 +1785,11 @@ var Response = class _Response {
     if (!this.wasPrefetched) {
       router.flush(page.get().url);
     }
+    const { flash } = page.get();
+    if (Object.keys(flash).length > 0 && (!this.requestParams.isPartial() || !(0, import_lodash_es4.isEqual)(flash, previousFlash))) {
+      fireFlashEvent(flash);
+      this.requestParams.all().onFlash(flash);
+    }
     fireSuccessEvent(page.get());
     await this.requestParams.all().onSuccess(page.get());
     history.preserveUrl = false;
@@ -1772,7 +1798,8 @@ var Response = class _Response {
     this.requestParams.merge(params);
   }
   getPageResponse() {
-    return this.response.data = this.getDataFromResponse(this.response.data);
+    const data = this.getDataFromResponse(this.response.data);
+    return this.response.data = { ...data, flash: data.flash ?? {} };
   }
   async handleNonInertiaResponse() {
     if (this.isLocationVisit()) {
@@ -1952,6 +1979,10 @@ var Response = class _Response {
         ...pageResponse.onceProps || {}
       };
     }
+    pageResponse.flash = {
+      ...page.get().flash,
+      ...this.requestParams.isDeferredPropsRequest() ? {} : pageResponse.flash
+    };
   }
   mergeOrMatchItems(existingItems, newItems, matchProp, matchPropsOn, shouldAppend = true) {
     const items = Array.isArray(existingItems) ? existingItems : [];
@@ -2175,12 +2206,14 @@ var Router = class {
   init({
     initialPage,
     resolveComponent,
-    swapComponent
+    swapComponent,
+    onFlash
   }) {
     page.init({
       initialPage,
       resolveComponent,
-      swapComponent
+      swapComponent,
+      onFlash
     });
     InitialVisit.handle();
     eventHandler.init();
@@ -2399,16 +2432,35 @@ var Router = class {
   push(params) {
     this.clientVisit(params);
   }
+  flash(keyOrData, value) {
+    const current = page.get().flash;
+    let flash;
+    if (typeof keyOrData === "function") {
+      flash = keyOrData(current);
+    } else if (typeof keyOrData === "string") {
+      flash = { ...current, [keyOrData]: value };
+    } else if (keyOrData && Object.keys(keyOrData).length) {
+      flash = { ...current, ...keyOrData };
+    } else {
+      return;
+    }
+    page.setFlash(flash);
+    if (Object.keys(flash).length) {
+      fireFlashEvent(flash);
+    }
+  }
   clientVisit(params, { replace = false } = {}) {
     this.clientVisitQueue.add(() => this.performClientVisit(params, { replace }));
   }
   performClientVisit(params, { replace = false } = {}) {
     const current = page.get();
     const props = typeof params.props === "function" ? params.props(current.props) : params.props ?? current.props;
-    const { viewTransition, onError, onFinish, onSuccess, ...pageParams } = params;
+    const flash = typeof params.flash === "function" ? params.flash(current.flash) : params.flash;
+    const { viewTransition, onError, onFinish, onFlash, onSuccess, ...pageParams } = params;
     const page2 = {
       ...current,
       ...pageParams,
+      flash: flash ?? {},
       props
     };
     const preserveScroll = RequestParams.resolvePreserveOption(params.preserveScroll ?? false, page2);
@@ -2419,6 +2471,11 @@ var Router = class {
       preserveState,
       viewTransition
     }).then(() => {
+      const currentFlash = page.get().flash;
+      if (Object.keys(currentFlash).length > 0) {
+        fireFlashEvent(currentFlash);
+        onFlash?.(currentFlash);
+      }
       const errors = page.get().props.errors || {};
       if (Object.keys(errors).length === 0) {
         onSuccess?.(page.get());
@@ -2512,6 +2569,8 @@ var Router = class {
       }),
       onError: options.onError || (() => {
       }),
+      onFlash: options.onFlash || (() => {
+      }),
       onPrefetched: options.onPrefetched || (() => {
       }),
       onPrefetching: options.onPrefetching || (() => {
@@ -2972,7 +3031,7 @@ var useInfiniteScrollData = (options) => {
   if (typeof window !== "undefined") {
     resetState();
     const rememberedState = router.restore(getRememberKey());
-    if (rememberedState && typeof rememberedState === "object") {
+    if (rememberedState && typeof rememberedState === "object" && rememberedState.lastLoadedPage === getScrollPropFromCurrentPage().currentPage) {
       state.previousPage = rememberedState.previousPage;
       state.nextPage = rememberedState.nextPage;
       state.lastLoadedPage = rememberedState.lastLoadedPage;