diff options
| author | ThibG <thib@sitedethib.com> | 2020-08-21 14:14:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 14:14:28 +0200 |
| commit | c7cfd4e67aedb38cba3ee452e18bd086e30e2e5d (patch) | |
| tree | 831a5cf5a202c053e4af69bd1bc3d4f13912dd7c | |
| parent | 9b2648b30adfa57dc12153c7a4e0fd9ac2f187dd (diff) | |
Fix scrolling issues when closing some dropdown menus (#14606)
| -rw-r--r-- | app/javascript/mastodon/components/dropdown_menu.js | 2 | ||||
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/privacy_dropdown.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/mastodon/components/dropdown_menu.js b/app/javascript/mastodon/components/dropdown_menu.js index 4734e0f3f..09e3c9df8 100644 --- a/app/javascript/mastodon/components/dropdown_menu.js +++ b/app/javascript/mastodon/components/dropdown_menu.js @@ -205,7 +205,7 @@ export default class Dropdown extends React.PureComponent { handleClose = () => { if (this.activeElement) { - this.activeElement.focus(); + this.activeElement.focus({ preventScroll: true }); this.activeElement = null; } this.props.onClose(this.state.id); diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js index 96028e042..5223025fb 100644 --- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js +++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js @@ -179,7 +179,7 @@ class PrivacyDropdown extends React.PureComponent { } else { const { top } = target.getBoundingClientRect(); if (this.state.open && this.activeElement) { - this.activeElement.focus(); + this.activeElement.focus({ preventScroll: true }); } this.setState({ placement: top * 2 < innerHeight ? 'bottom' : 'top' }); this.setState({ open: !this.state.open }); @@ -220,7 +220,7 @@ class PrivacyDropdown extends React.PureComponent { handleClose = () => { if (this.state.open && this.activeElement) { - this.activeElement.focus(); + this.activeElement.focus({ preventScroll: true }); } this.setState({ open: false }); } |