@inertiajs/core 2.2.15 → 2.2.16

package/dist/index.esm.js

@@ -349,27 +349,33 @@ var Scroll = class {
 import * as qs from "qs";
 
 // src/files.ts
+var isFile = (value) => typeof File !== "undefined" && value instanceof File || value instanceof Blob || typeof FileList !== "undefined" && value instanceof FileList && value.length > 0;
 function hasFiles(data) {
-  return data instanceof File || data instanceof Blob || data instanceof FileList && data.length > 0 || data instanceof FormData && Array.from(data.values()).some((value) => hasFiles(value)) || typeof data === "object" && data !== null && Object.values(data).some((value) => hasFiles(value));
+  return isFile(data) || data instanceof FormData && Array.from(data.values()).some((value) => hasFiles(value)) || typeof data === "object" && data !== null && Object.values(data).some((value) => hasFiles(value));
 }
 
 // src/formData.ts
 var isFormData = (value) => value instanceof FormData;
-function objectToFormData(source, form = new FormData(), parentKey = null) {
+function objectToFormData(source, form = new FormData(), parentKey = null, queryStringArrayFormat = "brackets") {
   source = source || {};
   for (const key in source) {
     if (Object.prototype.hasOwnProperty.call(source, key)) {
-      append(form, composeKey(parentKey, key), source[key]);
+      append(form, composeKey(parentKey, key, "indices"), source[key], queryStringArrayFormat);
     }
   }
   return form;
 }
-function composeKey(parent, key) {
-  return parent ? parent + "[" + key + "]" : key;
+function composeKey(parent, key, format) {
+  if (!parent) {
+    return key;
+  }
+  return format === "brackets" ? `${parent}[]` : `${parent}[${key}]`;
 }
-function append(form, key, value) {
+function append(form, key, value, format) {
   if (Array.isArray(value)) {
-    return Array.from(value.keys()).forEach((index) => append(form, composeKey(key, index.toString()), value[index]));
+    return Array.from(value.keys()).forEach(
+      (index) => append(form, composeKey(key, index.toString(), format), value[index], format)
+    );
   } else if (value instanceof Date) {
     return form.append(key, value.toISOString());
   } else if (value instanceof File) {
@@ -385,7 +391,7 @@ function append(form, key, value) {
   } else if (value === null || value === void 0) {
     return form.append(key, "");
   }
-  objectToFormData(value, form, key);
+  objectToFormData(value, form, key, format);
 }
 
 // src/url.ts
@@ -395,7 +401,7 @@ function hrefToUrl(href) {
 var transformUrlAndData = (href, data, method, forceFormData, queryStringArrayFormat) => {
   let url = typeof href === "string" ? hrefToUrl(href) : href;
   if ((hasFiles(data) || forceFormData) && !isFormData(data)) {
-    data = objectToFormData(data);
+    data = objectToFormData(data, new FormData(), null, queryStringArrayFormat);
   }
   if (isFormData(data)) {
     return [url, data];
@@ -654,7 +660,7 @@ var History = class {
   }
   restore(key) {
     if (!isServer) {
-      return this.current[this.rememberedState] ? this.current[this.rememberedState]?.[key] : this.initialState?.[this.rememberedState]?.[key];
+      return this.current[this.rememberedState]?.[key] !== void 0 ? this.current[this.rememberedState]?.[key] : this.initialState?.[this.rememberedState]?.[key];
     }
   }
   pushState(page2, cb = null) {
@@ -1302,6 +1308,8 @@ var PrefetchedRequests = class {
         "showProgress",
         "replace",
         "prefetch",
+        "preserveScroll",
+        "preserveState",
         "onBefore",
         "onBeforeUpdate",
         "onStart",
@@ -2348,6 +2356,9 @@ var Router = 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;
@@ -2399,7 +2410,10 @@ var getScrollableParent = (element) => {
   }
   return null;
 };
-var getElementsInViewportFromCollection = (referenceElement, elements) => {
+var getElementsInViewportFromCollection = (elements, referenceElement) => {
+  if (!referenceElement) {
+    return elements.filter((element) => elementInViewport(element));
+  }
   const referenceIndex = elements.indexOf(referenceElement);
   const upwardElements = [];
   const downwardElements = [];
@@ -2421,6 +2435,15 @@ var getElementsInViewportFromCollection = (referenceElement, elements) => {
   }
   return [...upwardElements.reverse(), ...downwardElements];
 };
+var requestAnimationFrame = (cb, times = 1) => {
+  window.requestAnimationFrame(() => {
+    if (times > 1) {
+      requestAnimationFrame(cb, times - 1);
+    } else {
+      cb();
+    }
+  });
+};
 
 // src/formObject.ts
 import { get as get4, set as set4 } from "lodash-es";
@@ -2449,6 +2472,41 @@ function parseKey(key) {
   }
   return path;
 }
+function setNestedObject(obj, path, value) {
+  let current = obj;
+  for (let i = 0; i < path.length - 1; i++) {
+    if (!(path[i] in current)) {
+      current[path[i]] = {};
+    }
+    current = current[path[i]];
+  }
+  current[path[path.length - 1]] = value;
+}
+function objectHasSequentialNumericKeys(value) {
+  const keys = Object.keys(value);
+  const numericKeys = keys.filter((k) => /^\d+$/.test(k)).map(Number).sort((a, b) => a - b);
+  return keys.length === numericKeys.length && numericKeys.length > 0 && numericKeys[0] === 0 && numericKeys.every((n, i) => n === i);
+}
+function convertSequentialObjectsToArrays(value) {
+  if (Array.isArray(value)) {
+    return value.map(convertSequentialObjectsToArrays);
+  }
+  if (typeof value !== "object" || value === null || isFile(value)) {
+    return value;
+  }
+  if (objectHasSequentialNumericKeys(value)) {
+    const result2 = [];
+    for (let i = 0; i < Object.keys(value).length; i++) {
+      result2[i] = convertSequentialObjectsToArrays(value[i]);
+    }
+    return result2;
+  }
+  const result = {};
+  for (const key in value) {
+    result[key] = convertSequentialObjectsToArrays(value[key]);
+  }
+  return result;
+}
 function formDataToObject(source) {
   const form = {};
   for (const [key, value] of source.entries()) {
@@ -2461,14 +2519,17 @@ function formDataToObject(source) {
       const existing = get4(form, arrayPath);
       if (Array.isArray(existing)) {
         existing.push(value);
+      } else if (existing && typeof existing === "object" && !isFile(existing)) {
+        const numericKeys = Object.keys(existing).filter((k) => /^\d+$/.test(k)).map(Number).sort((a, b) => a - b);
+        set4(form, arrayPath, numericKeys.length > 0 ? [...numericKeys.map((k) => existing[k]), value] : [value]);
       } else {
         set4(form, arrayPath, [value]);
       }
       continue;
     }
-    set4(form, path, value);
+    setNestedObject(form, path.map(String), value);
   }
-  return form;
+  return convertSequentialObjectsToArrays(form);
 }
 
 // src/head.ts
@@ -2943,7 +3004,7 @@ var useInfiniteScrollQueryString = (options) => {
     }
     const pageMap = /* @__PURE__ */ new Map();
     const elements = [...itemsElement.children];
-    getElementsInViewportFromCollection(itemElement, elements).forEach((element) => {
+    getElementsInViewportFromCollection(elements, itemElement).forEach((element) => {
       const page2 = getPageFromElement(element) ?? "1";
       if (pageMap.has(page2)) {
         pageMap.set(page2, pageMap.get(page2) + 1);
@@ -2973,10 +3034,7 @@ var useInfiniteScrollPreservation = (options) => {
       const scrollableContainer = options.getScrollableParent();
       const itemsElement = options.getItemsElement();
       currentScrollTop = scrollableContainer?.scrollTop || window.scrollY;
-      const visibleElements = getElementsInViewportFromCollection(
-        itemsElement.firstElementChild,
-        [...itemsElement.children]
-      );
+      const visibleElements = getElementsInViewportFromCollection([...itemsElement.children]);
       if (visibleElements.length > 0) {
         referenceElement = visibleElements[0];
         const containerRect = scrollableContainer?.getBoundingClientRect() || { top: 0 };
@@ -3013,7 +3071,7 @@ var useInfiniteScrollPreservation = (options) => {
         }
         restored = true;
       };
-      restore();
+      window.requestAnimationFrame(restore);
     };
     return {
       captureScrollPosition,
@@ -3043,18 +3101,18 @@ function useInfiniteScroll(options) {
     onBeforeUpdate: elementManager.processManuallyAddedElements,
     // After successful request, tag new server content
     onCompletePreviousRequest: (loadedPage) => {
-      setTimeout(() => {
+      options.onCompletePreviousRequest();
+      requestAnimationFrame(() => {
         elementManager.processServerLoadedElements(loadedPage);
-        options.onCompletePreviousRequest();
-        window.queueMicrotask(elementManager.refreshTriggers);
-      });
+        elementManager.refreshTriggers();
+      }, 2);
     },
     onCompleteNextRequest: (loadedPage) => {
-      setTimeout(() => {
+      options.onCompleteNextRequest();
+      requestAnimationFrame(() => {
         elementManager.processServerLoadedElements(loadedPage);
-        options.onCompleteNextRequest();
-        window.queueMicrotask(elementManager.refreshTriggers);
-      });
+        elementManager.refreshTriggers();
+      }, 2);
     }
   });
   const addScrollPreservationCallbacks = (reloadOptions) => {