Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: Don't use Bardo during morphing frame render (its only for non-morphing renders) #1303

Closed
Closed
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
12 changes: 9 additions & 3 deletions src/core/frames/frame_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ export class FrameController {
if (this.element.shouldReloadWithMorph) {
this.element.addEventListener("turbo:before-frame-render", ({ detail }) => {
detail.render = MorphingFrameRenderer.renderElement
detail.preservingPermanentElements = MorphingFrameRenderer.preservingPermanentElements
}, { once: true })
}

Expand Down Expand Up @@ -266,11 +267,16 @@ export class FrameController {

const {
defaultPrevented,
detail: { render }
detail: { render, preservingPermanentElements }
} = event

if (this.view.renderer && render) {
this.view.renderer.renderElement = render
if (this.view.renderer) {
if (render) {
this.view.renderer.renderElement = render
}
if (preservingPermanentElements) {
this.view.renderer.preservingPermanentElements = preservingPermanentElements
}
}

return !defaultPrevented
Expand Down
3 changes: 3 additions & 0 deletions src/core/frames/morphing_frame_renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,7 @@ export class MorphingFrameRenderer extends FrameRenderer {

morphChildren(currentElement, newElement)
}
static async preservingPermanentElements(callback) {
return await callback()
}
}
1 change: 1 addition & 0 deletions src/tests/fixtures/frames.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ <h2>Frames: #frame</h2>
<a id="link-frame-with-search-params" href="/src/tests/fixtures/frames/frame.html?key=value">Navigate #frame with ?key=value</a>
<a id="link-nested-frame-action-advance" href="/src/tests/fixtures/frames/frame.html" data-turbo-action="advance">Navigate #frame from within with a[data-turbo-action="advance"]</a>
<a id="link-top" href="/src/tests/fixtures/one.html" data-turbo-frame="_top">Visit one.html</a>
<input id="permanent-input" data-turbo-permanent>
<form action="/src/tests/fixtures/one.html" data-turbo-frame="_top">
<button id="form-submit-top">Visit one.html</button>
</form>
Expand Down
12 changes: 12 additions & 0 deletions src/tests/functional/frame_tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,18 @@ test("calling reload on a frame[refresh=morph] morphs the contents", async ({ pa
expect(await nextEventOnTarget(page, "frame", "turbo:before-frame-morph")).toBeTruthy()
})

test("calling reload on a frame[refresh=morph] preserves [data-turbo-permanent] elements", async ({ page }) => {
await page.click("#add-src-to-frame")
await page.click("#add-refresh-morph-to-frame")
const input = await page.locator("#permanent-input")

await input.fill("Preserve me")
await page.evaluate(() => document.getElementById("frame").reload())

await expect(input).toBeFocused()
await expect(input).toHaveValue("Preserve me")
})

test("following a link in rapid succession cancels the previous request", async ({ page }) => {
await page.click("#outside-frame-form")
await page.click("#outer-frame-link")
Expand Down
Loading