mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Fix page incorrectly scrolling when bringing up dropdown menus 

Port 77ec0875ea to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
pull/1324/head
ThibG 2020-04-28 13:19:39 +02:00 committed by Thibaut Girka
parent 9e5a216878
commit 7ea8b07b93
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/components/dropdown_menu.js
View File

@ -46,7 +46,7 @@ class DropdownMenu extends React.PureComponent {
document.addEventListener('keydown', this.handleKeyDown, false); document.addEventListener('keydown', this.handleKeyDown, false);
document.addEventListener('touchend', this.handleDocumentClick, listenerOptions); document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
if (this.focusedItem && this.props.openedViaKeyboard) { if (this.focusedItem && this.props.openedViaKeyboard) {
this.focusedItem.focus(); this.focusedItem.focus({ preventScroll: true });
} }
this.setState({ mounted: true }); this.setState({ mounted: true });
} }

4
app/javascript/flavours/glitch/features/compose/components/dropdown_menu.js
View File

@ -64,9 +64,9 @@ export default class ComposerOptionsDropdownContent extends React.PureComponent
document.addEventListener('click', this.handleDocumentClick, false); document.addEventListener('click', this.handleDocumentClick, false);
document.addEventListener('touchend', this.handleDocumentClick, withPassive); document.addEventListener('touchend', this.handleDocumentClick, withPassive);
if (this.focusedItem) { if (this.focusedItem) {
this.focusedItem.focus(); this.focusedItem.focus({ preventScroll: true });
} else { } else {
this.node.firstChild.focus(); this.node.firstChild.focus({ preventScroll: true });
} }
this.setState({ mounted: true }); this.setState({ mounted: true });
} }