Improve visiting same url (#86)

* No interception of visits as we can't grab the events
inertiaui · Jan 22, 2025 · f28c150 · f28c150
1 parent 8f144e6
commit f28c150
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 129 deletions.
diff --git a/demo-app/resources/js/Pages/EditUser.jsx b/demo-app/resources/js/Pages/EditUser.jsx
@@ -112,7 +112,7 @@ export default function EditUser({ user, roles, randomKey }) {
                         </div>
 
                         <div className="flex justify-end">
-                            <Link href={route('users.edit', { user, navigate: 1, randomKey })}>
+                            <Link replace href={route('users.edit', { user, navigate: 1, randomKey })}>
                                 Edit again!
                             </Link>
                             <button

diff --git a/demo-app/resources/js/Pages/EditUser.vue b/demo-app/resources/js/Pages/EditUser.vue
@@ -85,7 +85,7 @@ function onMessage(message) {
             </div>
 
             <div class="flex justify-end">
-                <Link :href="route('users.edit', { user, navigate: 1, randomKey })">
+                <Link replace :href="route('users.edit', { user, navigate: 1, randomKey })">
                     Edit again!
                 </Link>
                 <button type="button" @click="close" class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md text-white bg-gray-600 hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500">

diff --git a/react/src/ModalRoot.jsx b/react/src/ModalRoot.jsx
@@ -475,70 +475,6 @@ export const ModalRoot = ({ children }) => {
     let isNavigating = false
     let previousModalOnBase = false
 
-    useEffect(
-        () =>
-            router.on('before', ($event) => {
-                if (!sameUrlPath(window.location.href, $event.detail.visit.url)) {
-                    // Not navigating to the same base url
-                    return true
-                }
-
-                if ($event.detail.visit.replace) {
-                    // Prevent replacing again if we are already replacing
-                    return true
-                }
-
-                if (context.length() !== 1) {
-                    // Only replace the first modal
-                    return true
-                }
-
-                if (!previousModalOnBase) {
-                    // No modal on base
-                    return true
-                }
-
-                const {
-                    method,
-                    data,
-                    only,
-                    except,
-                    headers,
-                    errorBag,
-                    forceFormData,
-                    queryStringArrayFormat,
-                    async,
-                    showProgress,
-                    prefetch,
-                    fresh,
-                    reset,
-                    preserveUrl,
-                } = $event.detail.visit
-
-                router.visit($event.detail.visit.url, {
-                    replace: true,
-                    preserveScroll: true,
-                    preserveState: true,
-                    method,
-                    data,
-                    only,
-                    except,
-                    headers,
-                    errorBag,
-                    forceFormData,
-                    queryStringArrayFormat,
-                    async,
-                    showProgress,
-                    prefetch,
-                    fresh,
-                    reset,
-                    preserveUrl,
-                })
-
-                return false
-            }),
-        [],
-    )
     useEffect(() => router.on('start', () => (isNavigating = true)), [])
     useEffect(() => router.on('finish', () => (isNavigating = false)), [])
     useEffect(

diff --git a/vue/src/ModalRoot.vue b/vue/src/ModalRoot.vue
@@ -11,69 +11,6 @@ const modalStack = useModalStack()
 const isNavigating = ref(false)
 const previousModalOnBase = ref(null)
 
-onUnmounted(
-    router.on('before', ($event) => {
-        if (!sameUrlPath(window.location.href, $event.detail.visit.url)) {
-            // Not navigating to the same base url
-            return true
-        }
-
-        if ($event.detail.visit.replace) {
-            // Prevent replacing again if we are already replacing
-            return true
-        }
-
-        if (modalStack.stack.value.length !== 1) {
-            // Only replace the first modal
-            return true
-        }
-
-        if (!usePage().props?._inertiaui_modal) {
-            // No modal on base
-            return true
-        }
-
-        const {
-            method,
-            data,
-            only,
-            except,
-            headers,
-            errorBag,
-            forceFormData,
-            queryStringArrayFormat,
-            async,
-            showProgress,
-            prefetch,
-            fresh,
-            reset,
-            preserveUrl,
-        } = $event.detail.visit
-
-        router.visit($event.detail.visit.url, {
-            replace: true,
-            preserveScroll: true,
-            preserveState: true,
-            method,
-            data,
-            only,
-            except,
-            headers,
-            errorBag,
-            forceFormData,
-            queryStringArrayFormat,
-            async,
-            showProgress,
-            prefetch,
-            fresh,
-            reset,
-            preserveUrl,
-        })
-
-        return false
-    }),
-)
-
 onUnmounted(router.on('start', () => (isNavigating.value = true)))
 onUnmounted(router.on('finish', () => (isNavigating.value = false)))
 onUnmounted(