diff --git a/src/renderer/component/video/index.js b/src/renderer/component/video/index.js index a4063b057..9ce5f62e0 100644 --- a/src/renderer/component/video/index.js +++ b/src/renderer/component/video/index.js @@ -12,11 +12,9 @@ import { makeSelectFileInfoForUri, makeSelectLoadingForUri, makeSelectDownloadingForUri, + selectSearchBarFocused, } from 'lbry-redux'; -import { - makeSelectClientSetting, - selectShowNsfw -} from 'redux/selectors/settings'; +import { makeSelectClientSetting, selectShowNsfw } from 'redux/selectors/settings'; import { selectMediaPaused, makeSelectMediaPositionForUri } from 'redux/selectors/media'; import { selectPlayingUri } from 'redux/selectors/content'; import Video from './view'; @@ -34,7 +32,8 @@ const select = (state, props) => ({ volume: selectVolume(state), mediaPaused: selectMediaPaused(state), mediaPosition: makeSelectMediaPositionForUri(props.uri)(state), - autoplay: makeSelectClientSetting(settings.AUTOPLAY)(state) + autoplay: makeSelectClientSetting(settings.AUTOPLAY)(state), + searchBarFocused: selectSearchBarFocused(state), }); const perform = dispatch => ({ diff --git a/src/renderer/component/video/internal/play-button.jsx b/src/renderer/component/video/internal/play-button.jsx index 74e16cf7a..e2df7d455 100644 --- a/src/renderer/component/video/internal/play-button.jsx +++ b/src/renderer/component/video/internal/play-button.jsx @@ -3,40 +3,22 @@ import React from 'react'; import Button from 'component/button'; type Props = { - play: string => void, + play: () => void, isLoading: boolean, - uri: string, mediaType: string, fileInfo: ?{}, }; class VideoPlayButton extends React.PureComponent { - watch: () => void; - - constructor() { - super(); - this.watch = this.watch.bind(this); - } - - watch() { - this.props.play(this.props.uri); - } - render() { - const { fileInfo, mediaType, isLoading } = this.props; + const { fileInfo, mediaType, isLoading, play } = this.props; const disabled = isLoading || fileInfo === undefined; const doesPlayback = ['audio', 'video'].indexOf(mediaType) !== -1; const icon = doesPlayback ? 'Play' : 'Folder'; const label = doesPlayback ? 'Play' : 'View'; return ( -