@inertiajs/core 2.2.8 → 2.2.10

package/dist/index.js

@@ -476,7 +476,11 @@ var CurrentPage = class {
     this.cleared = false;
     this.pendingDeferredProps = null;
   }
-  init({ initialPage, swapComponent, resolveComponent }) {
+  init({
+    initialPage,
+    swapComponent,
+    resolveComponent
+  }) {
     this.page = initialPage;
     this.swapComponent = swapComponent;
     this.resolveComponent = resolveComponent;
@@ -1405,8 +1409,8 @@ var RequestParams = class _RequestParams {
     return headers;
   }
   setPreserveOptions(page2) {
-    this.params.preserveScroll = this.resolvePreserveOption(this.params.preserveScroll, page2);
-    this.params.preserveState = this.resolvePreserveOption(this.params.preserveState, page2);
+    this.params.preserveScroll = _RequestParams.resolvePreserveOption(this.params.preserveScroll, page2);
+    this.params.preserveState = _RequestParams.resolvePreserveOption(this.params.preserveState, page2);
   }
   runCallbacks() {
     this.callbacks.forEach(({ name, args }) => {
@@ -1428,7 +1432,7 @@ var RequestParams = class _RequestParams {
   recordCallback(name, args) {
     this.callbacks.push({ name, args });
   }
-  resolvePreserveOption(value, page2) {
+  static resolvePreserveOption(value, page2) {
     if (typeof value === "function") {
       return value(page2);
     }
@@ -1907,7 +1911,11 @@ var Router = class {
       interruptible: false
     });
   }
-  init({ initialPage, resolveComponent, swapComponent }) {
+  init({
+    initialPage,
+    resolveComponent,
+    swapComponent
+  }) {
     page.init({
       initialPage,
       resolveComponent,
@@ -2130,18 +2138,18 @@ var Router = class {
     const current = page.get();
     const props = typeof params.props === "function" ? params.props(current.props) : params.props ?? current.props;
     const { onError, onFinish, onSuccess, ...pageParams } = params;
-    page.set(
-      {
-        ...current,
-        ...pageParams,
-        props
-      },
-      {
-        replace,
-        preserveScroll: params.preserveScroll,
-        preserveState: params.preserveState
-      }
-    ).then(() => {
+    const page2 = {
+      ...current,
+      ...pageParams,
+      props
+    };
+    const preserveScroll = RequestParams.resolvePreserveOption(params.preserveScroll ?? false, page2);
+    const preserveState = RequestParams.resolvePreserveOption(params.preserveState ?? false, page2);
+    page.set(page2, {
+      replace,
+      preserveScroll,
+      preserveState
+    }).then(() => {
       const errors = page.get().props.errors || {};
       if (Object.keys(errors).length === 0) {
         return onSuccess?.(page.get());
@@ -2991,13 +2999,16 @@ function useInfiniteScroll(options) {
 }
 
 // src/navigationEvents.ts
+function isContentEditableOrPrevented(event) {
+  return event.target instanceof HTMLElement && event.target.isContentEditable || event.defaultPrevented;
+}
 function shouldIntercept(event) {
   const isLink = event.currentTarget.tagName.toLowerCase() === "a";
-  return !(event.target && (event?.target).isContentEditable || event.defaultPrevented || isLink && event.altKey || isLink && event.ctrlKey || isLink && event.metaKey || isLink && event.shiftKey || isLink && "button" in event && event.button !== 0);
+  return !(isContentEditableOrPrevented(event) || isLink && event.altKey || isLink && event.ctrlKey || isLink && event.metaKey || isLink && event.shiftKey || isLink && "button" in event && event.button !== 0);
 }
 function shouldNavigate(event) {
   const isButton = event.currentTarget.tagName.toLowerCase() === "button";
-  return event.key === "Enter" || isButton && event.key === " ";
+  return !isContentEditableOrPrevented(event) && (event.key === "Enter" || isButton && event.key === " ");
 }
 
 // src/progress-component.ts