focusable renamed to focusRoute

This commit is contained in:
svetlagasheva 2019-10-31 16:47:16 +02:00
parent da26b20c18
commit 29b55484ed
3 changed files with 9 additions and 9 deletions

View file

@ -9,7 +9,7 @@ const styles = require('./styles');
const SharePrompt = ({ className, label, url, close, onClick }) => {
const inputRef = React.useRef(null);
const focusable = useRouteFocused();
const focusRoute = useRouteFocused();
const copyToClipboard = React.useCallback(() => {
inputRef.current.select();
document.execCommand('copy');
@ -20,13 +20,13 @@ const SharePrompt = ({ className, label, url, close, onClick }) => {
close();
}
};
if (focusable) {
if (focusRoute) {
window.addEventListener('keyup', onKeyUp);
}
return () => {
window.removeEventListener('keyup', onKeyUp);
};
}, [close, focusable]);
}, [close, focusRoute]);
return (
<div className={classnames(className, styles['share-prompt-container'])} onClick={onClick}>
<Button className={styles['close-button-container']} title={'Close'} tabIndex={-1} onClick={close}>

View file

@ -7,20 +7,20 @@ const { Button } = require('stremio/common');
const styles = require('./styles');
const AddonPrompt = ({ className, id, name, logo, description, types, catalogs, version, transportUrl, installed, official, cancel, onClick, toggle }) => {
const focusable = useRouteFocused();
const focusRoute = useRouteFocused();
React.useEffect(() => {
const onKeyUp = (event) => {
if (event.key === 'Escape') {
cancel();
}
};
if (focusable) {
if (focusRoute) {
window.addEventListener('keyup', onKeyUp);
}
return () => {
window.removeEventListener('keyup', onKeyUp);
};
}, [cancel, focusable]);
}, [cancel, focusRoute]);
return (
<div className={classnames(className, styles['addon-prompt-container'])} onClick={onClick}>
<Button className={styles['close-button-container']} title={'Close'} tabIndex={-1} onClick={cancel}>

View file

@ -11,7 +11,7 @@ const styles = require('./styles');
const Addons = ({ urlParams, queryParams }) => {
const inputRef = React.useRef(null);
const focusable = useRouteFocused();
const focusRoute = useRouteFocused();
const [query, setQuery] = React.useState('');
const queryOnChange = React.useCallback((event) => {
setQuery(event.currentTarget.value);
@ -35,13 +35,13 @@ const Addons = ({ urlParams, queryParams }) => {
setAddAddonModalOpened(false);
}
};
if (focusable) {
if (focusRoute) {
window.addEventListener('keyup', onKeyUp);
}
return () => {
window.removeEventListener('keyup', onKeyUp);
};
}, [close, focusable]);
}, [close, focusRoute]);
const promptModalBackgroundOnClick = React.useCallback((event) => {
if (!event.nativeEvent.clearSelectedAddonPrevented) {
clearSelectedAddon();