nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent scrolling main frame when navigating in image gallery with arrow keys (#8073)

This commit is contained in:
ThibG 2018-07-26 04:50:50 +02:00 committed by Eugen Rochko
parent c9739ca86b
commit d199806969
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/mastodon/features/ui/components/media_modal.js
View File

@ -54,19 +54,23 @@ export default class MediaModal extends ImmutablePureComponent {
this.setState({ index: index % this.props.media.size }); this.setState({ index: index % this.props.media.size });
} }
handleKeyUp = (e) => { handleKeyDown = (e) => {
switch(e.key) { switch(e.key) {
case 'ArrowLeft': case 'ArrowLeft':
this.handlePrevClick(); this.handlePrevClick();
e.preventDefault();
e.stopPropagation();
break; break;
case 'ArrowRight': case 'ArrowRight':
this.handleNextClick(); this.handleNextClick();
e.preventDefault();
e.stopPropagation();
break; break;
} }
} }
componentDidMount () { componentDidMount () {
window.addEventListener('keyup', this.handleKeyUp, false); window.addEventListener('keydown', this.handleKeyDown, false);
if (this.context.router) { if (this.context.router) {
const history = this.context.router.history; const history = this.context.router.history;
history.push(history.location.pathname, previewState); history.push(history.location.pathname, previewState);
@ -77,7 +81,7 @@ export default class MediaModal extends ImmutablePureComponent {
} }
componentWillUnmount () { componentWillUnmount () {
window.removeEventListener('keyup', this.handleKeyUp); window.removeEventListener('keydown', this.handleKeyDown);
if (this.context.router) { if (this.context.router) {
this.unlistenHistory(); this.unlistenHistory();