Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions packages/core/src/initialVisit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export class InitialVisit {
Scroll.restore(scrollRegions)
}

fireNavigateEvent(currentPage.get())
this.fireInitialEvents()
})
})
.catch(() => {
Expand All @@ -100,15 +100,17 @@ export class InitialVisit {
Scroll.scrollToAnchor()
}

const page = currentPage.get()
this.fireInitialEvents()
})
}

fireNavigateEvent(page)
protected static fireInitialEvents(): void {
const page = currentPage.get()

const flash = page.flash
fireNavigateEvent(page)

if (Object.keys(flash).length > 0) {
queueMicrotask(() => fireFlashEvent(flash))
}
})
if (Object.keys(page.flash).length > 0) {
queueMicrotask(() => fireFlashEvent(page.flash))
}
}
}
1 change: 1 addition & 0 deletions tests/app/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -2436,6 +2436,7 @@ app.get('/flash/initial', (req, res) =>
flash: { message: 'Hello from server' },
}),
)
app.get('/flash/location-visit', (req, res) => inertia.location(res, '/flash/initial'))
app.get('/flash/with-infinite-scroll', (req, res) => {
const page = req.query.page ? parseInt(req.query.page) : 1
const partialReload = !!req.headers['x-inertia-partial-data']
Expand Down
11 changes: 11 additions & 0 deletions tests/flash.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ test.describe('Flash Data', () => {
await expect(page.locator('#flash-events')).toContainText('Hello from server')
})

test('fires flash event after a location visit triggers a full page reload', async ({ page }) => {
await page.goto('/flash/initial')
await expect(page.locator('#flash-events')).toContainText('Hello from server')

await page.evaluate(() => (window as any).testing.Inertia.visit('/flash/location-visit'))
await page.waitForURL('**/flash/initial')

await expect(page.locator('#flash')).toContainText('Hello from server')
await expect(page.locator('#flash-events')).toContainText('Hello from server')
})

test('preserves flash data after deferred props load and does not fire event again', async ({ page }) => {
// Set up response listener before navigating to catch the deferred request
const deferredResponse = page.waitForResponse((res) => res.url().includes('/flash/with-deferred'))
Expand Down
Loading