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.

Sign up for GitHub

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

Jump to bottom

fix: navigate callback running after patch #2736

Merged
merged 1 commit into from
Jul 17, 2023
Merged

fix: navigate callback running after patch #2736

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 5 deletions assets/js/phoenix_live_view/live_socket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ export default class LiveSocket {
DOM.findPhxSticky(document).forEach(el => newMainEl.appendChild(el))
this.outgoingMainEl.replaceWith(newMainEl)
this.outgoingMainEl = null
callback && requestAnimationFrame(callback)
callback && requestAnimationFrame(() => callback(linkRef))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alternate approach...would it be possible to not call commitPendingLink on line 405 until later in the callback? Possible problems with that would be all the lines above (406-409) get run even if another navigation event is currently taking place, but not sure of a good example of what that would look like.

onDone()
})
}
Expand Down Expand Up @@ -775,10 +775,12 @@ export default class LiveSocket {
}
let scroll = window.scrollY
this.withPageLoading({to: href, kind: "redirect"}, done => {
this.replaceMain(href, flash, () => {
Browser.pushState(linkState, {type: "redirect", id: this.main.id, scroll: scroll}, href)
DOM.dispatchEvent(window, "phx:navigate", {detail: {href, patch: false, pop: false}})
this.registerNewLocation(window.location)
this.replaceMain(href, flash, (linkRef) => {
if(linkRef === this.linkRef){
Browser.pushState(linkState, {type: "redirect", id: this.main.id, scroll: scroll}, href)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to worry about possibly losing this scroll position if we don't run this?

DOM.dispatchEvent(window, "phx:navigate", {detail: {href, patch: false, pop: false}})
this.registerNewLocation(window.location)
}
done()
})
})
Expand Down