@inertiajs/core 2.3.8 → 2.3.10

package/dist/index.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  FormComponentResetSymbol: () => FormComponentResetSymbol,
   UseFormUtils: () => UseFormUtils,
   config: () => config,
   createHeadManager: () => createHeadManager,
@@ -632,7 +633,116 @@ var PrefetchedRequests = class {
 };
 var prefetchedRequests = new PrefetchedRequests();
 
+// src/domUtils.ts
+var elementInViewport = (el) => {
+  if (el.offsetParent === null) {
+    return false;
+  }
+  const rect = el.getBoundingClientRect();
+  const verticallyVisible = rect.top < window.innerHeight && rect.bottom >= 0;
+  const horizontallyVisible = rect.left < window.innerWidth && rect.right >= 0;
+  return verticallyVisible && horizontallyVisible;
+};
+var getScrollableParent = (element) => {
+  const allowsVerticalScroll = (el) => {
+    const computedStyle = window.getComputedStyle(el);
+    if (["scroll", "overlay"].includes(computedStyle.overflowY)) {
+      return true;
+    }
+    if (computedStyle.overflowY !== "auto") {
+      return false;
+    }
+    if (["visible", "clip"].includes(computedStyle.overflowX)) {
+      return true;
+    }
+    return hasDimensionConstraint(computedStyle.maxHeight, el.style.height);
+  };
+  const allowsHorizontalScroll = (el) => {
+    const computedStyle = window.getComputedStyle(el);
+    if (["scroll", "overlay"].includes(computedStyle.overflowX)) {
+      return true;
+    }
+    if (computedStyle.overflowX !== "auto") {
+      return false;
+    }
+    if (["visible", "clip"].includes(computedStyle.overflowY)) {
+      return true;
+    }
+    return hasDimensionConstraint(computedStyle.maxWidth, el.style.width);
+  };
+  const hasDimensionConstraint = (computedMaxDimension, inlineStyleDimension) => {
+    if (computedMaxDimension && computedMaxDimension !== "none" && computedMaxDimension !== "0px") {
+      return true;
+    }
+    if (inlineStyleDimension && inlineStyleDimension !== "auto" && inlineStyleDimension !== "0") {
+      return true;
+    }
+    return false;
+  };
+  let parent = element?.parentElement;
+  while (parent) {
+    const allowsScroll = allowsVerticalScroll(parent) || allowsHorizontalScroll(parent);
+    if (window.getComputedStyle(parent).display !== "contents" && allowsScroll) {
+      return parent;
+    }
+    parent = parent.parentElement;
+  }
+  return null;
+};
+var getElementsInViewportFromCollection = (elements, referenceElement) => {
+  if (!referenceElement) {
+    return elements.filter((element) => elementInViewport(element));
+  }
+  const referenceIndex = elements.indexOf(referenceElement);
+  const upwardElements = [];
+  const downwardElements = [];
+  for (let i = referenceIndex; i >= 0; i--) {
+    const element = elements[i];
+    if (elementInViewport(element)) {
+      upwardElements.push(element);
+    } else {
+      break;
+    }
+  }
+  for (let i = referenceIndex + 1; i < elements.length; i++) {
+    const element = elements[i];
+    if (elementInViewport(element)) {
+      downwardElements.push(element);
+    } else {
+      break;
+    }
+  }
+  return [...upwardElements.reverse(), ...downwardElements];
+};
+var requestAnimationFrame = (cb, times = 1) => {
+  window.requestAnimationFrame(() => {
+    if (times > 1) {
+      requestAnimationFrame(cb, times - 1);
+    } else {
+      cb();
+    }
+  });
+};
+var getInitialPageFromDOM = (id, useScriptElement = false) => {
+  if (typeof window === "undefined") {
+    return null;
+  }
+  if (!useScriptElement) {
+    const el = document.getElementById(id);
+    if (el?.dataset.page) {
+      return JSON.parse(el.dataset.page);
+    }
+  }
+  const scriptEl = document.querySelector(`script[data-page="${id}"][type="application/json"]`);
+  if (scriptEl?.textContent) {
+    return JSON.parse(scriptEl.textContent);
+  }
+  return null;
+};
+
 // src/scroll.ts
+var isServer = typeof window === "undefined";
+var isFirefox = !isServer && /Firefox/i.test(window.navigator.userAgent);
 var Scroll = class {
   static save() {
     history.saveScrollPositions(this.getScrollRegions());
@@ -646,10 +756,16 @@ var Scroll = class {
   static regions() {
     return document.querySelectorAll("[scroll-region]");
   }
+  static scrollToTop() {
+    if (isFirefox && getComputedStyle(document.documentElement).scrollBehavior === "smooth") {
+      return requestAnimationFrame(() => window.scrollTo(0, 0), 2);
+    }
+    window.scrollTo(0, 0);
+  }
   static reset() {
-    const anchorHash = typeof window !== "undefined" ? window.location.hash : null;
+    const anchorHash = isServer ? null : window.location.hash;
     if (!anchorHash) {
-      window.scrollTo(0, 0);
+      this.scrollToTop();
     }
     this.regions().forEach((region) => {
       if (typeof region.scrollTo === "function") {
@@ -663,16 +779,16 @@ var Scroll = class {
     this.scrollToAnchor();
   }
   static scrollToAnchor() {
-    const anchorHash = typeof window !== "undefined" ? window.location.hash : null;
+    const anchorHash = isServer ? null : window.location.hash;
     if (anchorHash) {
       setTimeout(() => {
         const anchorElement = document.getElementById(anchorHash.slice(1));
-        anchorElement ? anchorElement.scrollIntoView() : window.scrollTo(0, 0);
+        anchorElement ? anchorElement.scrollIntoView() : this.scrollToTop();
       });
     }
   }
   static restore(scrollRegions) {
-    if (typeof window === "undefined") {
+    if (isServer) {
       return;
     }
     window.requestAnimationFrame(() => {
@@ -681,7 +797,7 @@ var Scroll = class {
     });
   }
   static restoreScrollRegions(scrollRegions) {
-    if (typeof window === "undefined") {
+    if (isServer) {
       return;
     }
     this.regions().forEach((region, index) => {
@@ -874,6 +990,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;
@@ -885,9 +1004,9 @@ var CurrentPage = class {
         return;
       }
       page2.rememberedState ?? (page2.rememberedState = {});
-      const isServer2 = typeof window === "undefined";
-      const location = !isServer2 ? window.location : new URL(page2.url);
-      const scrollRegions = !isServer2 && preserveScroll ? Scroll.getScrollRegions() : [];
+      const isServer3 = typeof window === "undefined";
+      const location = !isServer3 ? window.location : new URL(page2.url);
+      const scrollRegions = !isServer3 && preserveScroll ? Scroll.getScrollRegions() : [];
       replace = replace || isSameUrlWithoutHash(hrefToUrl(page2.url), location);
       const pageForHistory = { ...page2, flash: {} };
       return new Promise(
@@ -1047,9 +1166,9 @@ var Queue = class {
 };
 
 // src/history.ts
-var isServer = typeof window === "undefined";
+var isServer2 = typeof window === "undefined";
 var queue = new Queue();
-var isChromeIOS = !isServer && /CriOS/.test(window.navigator.userAgent);
+var isChromeIOS = !isServer2 && /CriOS/.test(window.navigator.userAgent);
 var History = class {
   constructor() {
     this.rememberedState = "rememberedState";
@@ -1069,12 +1188,12 @@ var History = class {
     });
   }
   restore(key) {
-    if (!isServer) {
+    if (!isServer2) {
       return this.current[this.rememberedState]?.[key] !== void 0 ? this.current[this.rememberedState]?.[key] : this.initialState?.[this.rememberedState]?.[key];
     }
   }
   pushState(page2, cb = null) {
-    if (isServer) {
+    if (isServer2) {
       return;
     }
     if (this.preserveUrl) {
@@ -1115,7 +1234,7 @@ var History = class {
     return queue.process();
   }
   decrypt(page2 = null) {
-    if (isServer) {
+    if (isServer2) {
       return Promise.resolve(page2 ?? page.get());
     }
     const pageData = page2 ?? window.history.state?.page;
@@ -1178,7 +1297,7 @@ var History = class {
       return;
     }
     page.merge(page2);
-    if (isServer) {
+    if (isServer2) {
       return;
     }
     if (this.preserveUrl) {
@@ -1256,7 +1375,7 @@ var History = class {
     }
   }
   browserHasHistoryEntry() {
-    return !isServer && !!window.history.state?.page;
+    return !isServer2 && !!window.history.state?.page;
   }
   clear() {
     SessionStorage.remove(historySessionStorageKeys.key);
@@ -1334,10 +1453,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();
@@ -1570,6 +1700,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;
   }
@@ -1839,7 +1972,10 @@ var Response = class _Response {
   }
   getPageResponse() {
     const data = this.getDataFromResponse(this.response.data);
-    return this.response.data = { ...data, flash: data.flash ?? {} };
+    if (typeof data === "object") {
+      return this.response.data = { ...data, flash: data.flash ?? {} };
+    }
+    return this.response.data = data;
   }
   async handleNonInertiaResponse() {
     if (this.isLocationVisit()) {
@@ -2023,6 +2159,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 : [];
@@ -2096,6 +2236,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());
@@ -2212,20 +2355,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;
   }
 };
@@ -2315,12 +2455,19 @@ var Router = class {
     }
     return eventHandler.onGlobalEvent(type, callback);
   }
+  /**
+   * @deprecated Use cancelAll() instead.
+   */
   cancel() {
     this.syncRequestStream.cancelInFlight();
   }
-  cancelAll() {
-    this.asyncRequestStream.cancelInFlight();
-    this.syncRequestStream.cancelInFlight();
+  cancelAll({ async = true, prefetch = true, sync = true } = {}) {
+    if (async) {
+      this.asyncRequestStream.cancelInFlight({ prefetch });
+    }
+    if (sync) {
+      this.syncRequestStream.cancelInFlight();
+    }
   }
   poll(interval, requestOptions = {}, options = {}) {
     return polls.add(interval, () => this.reload(requestOptions), {
@@ -2337,8 +2484,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();
     }
@@ -2352,6 +2503,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()));
     }
   }
@@ -2497,7 +2649,10 @@ var Router = class {
   }
   performClientVisit(params, { replace = false } = {}) {
     const current = page.get();
-    const props = typeof params.props === "function" ? params.props(current.props) : params.props ?? current.props;
+    const onceProps = typeof params.props === "function" ? Object.fromEntries(
+      Object.values(current.onceProps ?? {}).map((onceProp) => [onceProp.prop, current.props[onceProp.prop]])
+    ) : {};
+    const props = typeof params.props === "function" ? params.props(current.props, onceProps) : params.props ?? current.props;
     const flash = typeof params.flash === "function" ? params.flash(current.flash) : params.flash;
     const { viewTransition, onError, onFinish, onFlash, onSuccess, ...pageParams } = params;
     const page2 = {
@@ -2731,113 +2886,6 @@ var UseFormUtils = class {
   }
 };
 
-// src/domUtils.ts
-var elementInViewport = (el) => {
-  if (el.offsetParent === null) {
-    return false;
-  }
-  const rect = el.getBoundingClientRect();
-  const verticallyVisible = rect.top < window.innerHeight && rect.bottom >= 0;
-  const horizontallyVisible = rect.left < window.innerWidth && rect.right >= 0;
-  return verticallyVisible && horizontallyVisible;
-};
-var getScrollableParent = (element) => {
-  const allowsVerticalScroll = (el) => {
-    const computedStyle = window.getComputedStyle(el);
-    if (["scroll", "overlay"].includes(computedStyle.overflowY)) {
-      return true;
-    }
-    if (computedStyle.overflowY !== "auto") {
-      return false;
-    }
-    if (["visible", "clip"].includes(computedStyle.overflowX)) {
-      return true;
-    }
-    return hasDimensionConstraint(computedStyle.maxHeight, el.style.height);
-  };
-  const allowsHorizontalScroll = (el) => {
-    const computedStyle = window.getComputedStyle(el);
-    if (["scroll", "overlay"].includes(computedStyle.overflowX)) {
-      return true;
-    }
-    if (computedStyle.overflowX !== "auto") {
-      return false;
-    }
-    if (["visible", "clip"].includes(computedStyle.overflowY)) {
-      return true;
-    }
-    return hasDimensionConstraint(computedStyle.maxWidth, el.style.width);
-  };
-  const hasDimensionConstraint = (computedMaxDimension, inlineStyleDimension) => {
-    if (computedMaxDimension && computedMaxDimension !== "none" && computedMaxDimension !== "0px") {
-      return true;
-    }
-    if (inlineStyleDimension && inlineStyleDimension !== "auto" && inlineStyleDimension !== "0") {
-      return true;
-    }
-    return false;
-  };
-  let parent = element?.parentElement;
-  while (parent) {
-    const allowsScroll = allowsVerticalScroll(parent) || allowsHorizontalScroll(parent);
-    if (window.getComputedStyle(parent).display !== "contents" && allowsScroll) {
-      return parent;
-    }
-    parent = parent.parentElement;
-  }
-  return null;
-};
-var getElementsInViewportFromCollection = (elements, referenceElement) => {
-  if (!referenceElement) {
-    return elements.filter((element) => elementInViewport(element));
-  }
-  const referenceIndex = elements.indexOf(referenceElement);
-  const upwardElements = [];
-  const downwardElements = [];
-  for (let i = referenceIndex; i >= 0; i--) {
-    const element = elements[i];
-    if (elementInViewport(element)) {
-      upwardElements.push(element);
-    } else {
-      break;
-    }
-  }
-  for (let i = referenceIndex + 1; i < elements.length; i++) {
-    const element = elements[i];
-    if (elementInViewport(element)) {
-      downwardElements.push(element);
-    } else {
-      break;
-    }
-  }
-  return [...upwardElements.reverse(), ...downwardElements];
-};
-var requestAnimationFrame = (cb, times = 1) => {
-  window.requestAnimationFrame(() => {
-    if (times > 1) {
-      requestAnimationFrame(cb, times - 1);
-    } else {
-      cb();
-    }
-  });
-};
-var getInitialPageFromDOM = (id, useScriptElement = false) => {
-  if (typeof window === "undefined") {
-    return null;
-  }
-  if (!useScriptElement) {
-    const el = document.getElementById(id);
-    if (el?.dataset.page) {
-      return JSON.parse(el.dataset.page);
-    }
-  }
-  const scriptEl = document.querySelector(`script[data-page="${id}"][type="application/json"]`);
-  if (scriptEl?.textContent) {
-    return JSON.parse(scriptEl.textContent);
-  }
-  return null;
-};
-
 // src/formObject.ts
 var import_lodash_es6 = require("lodash-es");
 function undotKey(key) {
@@ -2974,7 +3022,7 @@ var Renderer = {
     sourceElements.forEach((element) => document.head.appendChild(element));
   }, 1)
 };
-function createHeadManager(isServer2, titleCallback, onUpdate) {
+function createHeadManager(isServer3, titleCallback, onUpdate) {
   const states = {};
   let lastProviderId = 0;
   function connect() {
@@ -3026,7 +3074,7 @@ function createHeadManager(isServer2, titleCallback, onUpdate) {
     return Object.values(elements);
   }
   function commit() {
-    isServer2 ? onUpdate(collect()) : Renderer.update(collect());
+    isServer3 ? onUpdate(collect()) : Renderer.update(collect());
   }
   commit();
   return {
@@ -3923,6 +3971,7 @@ function setupProgress({
 }
 
 // src/resetFormFields.ts
+var FormComponentResetSymbol = Symbol("FormComponentReset");
 function isFormElement(element) {
   return element instanceof HTMLInputElement || element instanceof HTMLSelectElement || element instanceof HTMLTextAreaElement;
 }
@@ -4053,7 +4102,9 @@ function resetFormFields(formElement, defaults, fieldNames) {
     }
   });
   if (hasChanged && resetEntireForm) {
-    formElement.dispatchEvent(new Event("reset", { bubbles: true }));
+    formElement.dispatchEvent(
+      new CustomEvent("reset", { bubbles: true, cancelable: true, detail: { [FormComponentResetSymbol]: true } })
+    );
   }
 }