From 634b71ed1d551ee569e5ff5b858ea7eb07c824bd Mon Sep 17 00:00:00 2001 From: Sorin Davidoi Date: Fri, 28 Jul 2017 22:55:19 +0200 Subject: [PATCH] Accessability fixes (#4432) * fix(modal_root): Read type from props, not from component * fix(status_list): Do not user event.path --- app/javascript/mastodon/components/status_list.js | 4 ++-- app/javascript/mastodon/features/ui/components/modal_root.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/javascript/mastodon/components/status_list.js b/app/javascript/mastodon/components/status_list.js index d87fe3ea16a..e945e878c96 100644 --- a/app/javascript/mastodon/components/status_list.js +++ b/app/javascript/mastodon/components/status_list.js @@ -109,9 +109,9 @@ export default class StatusList extends ImmutablePureComponent { const article = (() => { switch (e.key) { case 'PageDown': - return e.nativeEvent.path[0].nodeName === 'ARTICLE' && e.nativeEvent.path[0].nextElementSibling; + return e.target.nodeName === 'ARTICLE' && e.target.nextElementSibling; case 'PageUp': - return e.nativeEvent.path[0].nodeName === 'ARTICLE' && e.nativeEvent.path[0].previousElementSibling; + return e.target.nodeName === 'ARTICLE' && e.target.previousElementSibling; case 'End': return this.node.querySelector('[role="feed"] > article:last-of-type'); case 'Home': diff --git a/app/javascript/mastodon/features/ui/components/modal_root.js b/app/javascript/mastodon/features/ui/components/modal_root.js index 3ca19e4d572..5b598bddf3f 100644 --- a/app/javascript/mastodon/features/ui/components/modal_root.js +++ b/app/javascript/mastodon/features/ui/components/modal_root.js @@ -53,7 +53,7 @@ export default class ModalRoot extends React.PureComponent { } componentDidUpdate (prevProps) { - if (!this.type && !!prevProps.type) { + if (!this.props.type && !!prevProps.type) { this.getSiblings().forEach(sibling => sibling.removeAttribute('inert')); this.activeElement.focus(); this.activeElement = null;