inertiaui
diff --git a/‎demo-app/package-lock.json‎
Lines changed: 381 additions & 337 deletions b/‎demo-app/package-lock.json‎
Lines changed: 381 additions & 337 deletions
diff --git a/‎demo-app/tests/Browser/ProgressBarTest.php‎
Lines changed: 27 additions & 0 deletions b/‎demo-app/tests/Browser/ProgressBarTest.php‎
Lines changed: 27 additions & 0 deletions
diff --git a/‎react/package-lock.json‎
Lines changed: 380 additions & 321 deletions b/‎react/package-lock.json‎
Lines changed: 380 additions & 321 deletions
diff --git a/‎react/package.json‎
Lines changed: 2 additions & 2 deletions b/‎react/package.json‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎react/src/ModalRoot.jsx‎
Lines changed: 19 additions & 3 deletions b/‎react/src/ModalRoot.jsx‎
Lines changed: 19 additions & 3 deletions
diff --git a/‎react/src/helpers.js‎
Lines changed: 7 additions & 1 deletion b/‎react/src/helpers.js‎
Lines changed: 7 additions & 1 deletion
@@ -0,0 +1,27 @@
+<?php
+
+namespace Tests\Browser;
+
+use InertiaUI\Modal\Support;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\DuskTestCase;
+
+class ProgressBarTest extends DuskTestCase
+{
+    #[Test]
+    public function it_shows_the_inertia_progress_bar()
+    {
+        if (Support::isInertiaV1()) {
+            return $this->markTestSkipped('Proress Bar API not supported in Inertia v1');
+        }
+
+        $this->browse(function (Browser $browser) {
+            $browser->visit('/loading-prop')
+                ->waitForText('Loading Prop')
+                ->clickLink('Open Slideover')
+                ->assertPresent('#nprogress')
+                ->waitForModal()
+                ->waitUntilMissing('#nprogress');
+        });
+    }
+}
@@ -27,7 +27,7 @@
     "devDependencies": {
         "@headlessui/react": "^2.1.0",
         "@heroicons/react": "^2.1.4",
-        "@inertiajs/react": "^1.3.0||^2.0.0",
+        "@inertiajs/react": "^1.3.0||^2.1.11",
         "@vitejs/plugin-react": "^4.3.1",
         "axios": "^1.6.0",
         "clsx": "^2.1.1",
@@ -46,7 +46,7 @@
         "vite": "^6.1"
     },
     "peerDependencies": {
-        "@inertiajs/react": "^1.3.0||^2.0.0",
+        "@inertiajs/react": "^1.3.0||^2.1.11",
         "axios": "^1.6.0",
         "react": "^18.2.0||^19.0.0",
         "react-dom": "^18.2.0||^19.0.0"
 
@@ -1,7 +1,8 @@
 import { createElement, useEffect, useState, useRef } from 'react'
 import { default as Axios } from 'axios'
-import { except, kebabCase, generateId, sameUrlPath } from './helpers'
+import { except, kebabCase, generateId, sameUrlPath, isInertiaV2 } from './helpers'
 import { router, usePage } from '@inertiajs/react'
+import * as InertiaReact from '@inertiajs/react'
 import { mergeDataIntoQueryString } from '@inertiajs/core'
 import { createContext, useContext } from 'react'
 import ModalRenderer from './ModalRenderer'
@@ -413,10 +414,22 @@ export const ModalStackProvider = ({ children }) => {
                 })
             }
 
-            //
-
             onStart?.()
 
+            const withProgress = (callback) => {
+                if (!isInertiaV2()) {
+                    return
+                }
+
+                try {
+                    callback(InertiaReact.progress)
+                } catch (e) {
+                    // ignore
+                }
+            }
+
+            withProgress((progress) => progress.start())
+
             Axios({
                 url,
                 method,
@@ -431,6 +444,9 @@ export const ModalStackProvider = ({ children }) => {
                     onError?.(...args)
                     reject(...args)
                 })
+                .finally(() => {
+                    withProgress((progress) => progress.finish())
+                })
         })
     }
 
 
@@ -1,2 +1,8 @@
+import { router } from '@inertiajs/react'
 import { generateId, sameUrlPath, except, only, rejectNullValues, kebabCase, isStandardDomEvent } from './../../vue/src/helpers.js'
-export { generateId, sameUrlPath, except, only, rejectNullValues, kebabCase, isStandardDomEvent }
+
+function isInertiaV2() {
+    return router.push && typeof router.push === 'function'
+}
+
+export { generateId, sameUrlPath, except, only, rejectNullValues, kebabCase, isStandardDomEvent, isInertiaV2 }