fix: prevent scrolling when focus trap cycles back into the modal #82
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
also fixes a small issue with the `alertdialog` role
jquense
commented
Apr 24, 2023
| @@ -51,6 +55,11 @@ class ModalManager { | |||
| return getBodyScrollbarWidth(this.ownerDocument); | |||
| } | |||
|
|
|||
| protected getScollingElement() { | |||
| const element = getScrollParent(this.getElement()); | |||
| return isDocument(element) ? element.defaultView! : element; | |||
There was a problem hiding this comment.
maybe this is over complicating things? people shouldn't actually be rendering modals into not-the-body
kyletsang
reviewed
Apr 25, 2023
| @@ -299,9 +300,7 @@ const Modal: React.ForwardRefExoticComponent< | |||
| removeFocusListenerRef.current = listen( | |||
| document as any, | |||
| 'focus', | |||
| // the timeout is necessary b/c this will run before the new modal is mounted | |||
There was a problem hiding this comment.
Looks like this was necessary to resolve the TypeError: Converting circular structure to JSON error in the tests
There was a problem hiding this comment.
Yeah I'm confused why tho. It doesn't seem necessary in real life. Gotta dig in a bit
| @@ -51,6 +55,11 @@ class ModalManager { | |||
| return getBodyScrollbarWidth(this.ownerDocument); | |||
| } | |||
|
|
|||
| protected getScollingElement() { | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
also fixes a small issue with the
alertdialogrole fixing #81 and addresses the bug noted in react-bootstrap/react-bootstrap#6579I was hoping the scroll thing would be as simple as
preventDefaulton the incomingfocusevent but that doesn't seem to cut it in Chrome at least, so back to good ol manual scroll position setting.