don't start view file flow until costInfo exists
This commit is contained in:
parent
b2409a8c48
commit
b347d3fc5b
2 changed files with 7 additions and 2 deletions
|
@ -8,6 +8,7 @@ import {
|
|||
makeSelectMediaTypeForUri,
|
||||
makeSelectUriIsStreamable,
|
||||
} from 'lbry-redux';
|
||||
import { makeSelectCostInfoForUri } from 'lbryinc';
|
||||
import { makeSelectClientSetting } from 'redux/selectors/settings';
|
||||
import { makeSelectIsPlaying, makeSelectShouldObscurePreview, selectPlayingUri } from 'redux/selectors/content';
|
||||
import FileViewer from './view';
|
||||
|
@ -22,6 +23,7 @@ const select = (state, props) => ({
|
|||
streamingUrl: makeSelectStreamingUrlForUri(props.uri)(state),
|
||||
isStreamable: makeSelectUriIsStreamable(props.uri)(state),
|
||||
autoplay: makeSelectClientSetting(SETTINGS.AUTOPLAY)(state),
|
||||
hasCostInfo: Boolean(makeSelectCostInfoForUri(props.uri)(state)),
|
||||
});
|
||||
|
||||
const perform = dispatch => ({
|
||||
|
|
|
@ -22,6 +22,7 @@ type Props = {
|
|||
isStreamable: boolean,
|
||||
thumbnail?: string,
|
||||
autoplay: boolean,
|
||||
hasCostInfo: boolean,
|
||||
};
|
||||
|
||||
export default function FileViewer(props: Props) {
|
||||
|
@ -36,6 +37,7 @@ export default function FileViewer(props: Props) {
|
|||
thumbnail,
|
||||
autoplay,
|
||||
isStreamable,
|
||||
hasCostInfo,
|
||||
} = props;
|
||||
|
||||
const isPlayable = ['audio', 'video'].indexOf(mediaType) !== -1;
|
||||
|
@ -75,13 +77,14 @@ export default function FileViewer(props: Props) {
|
|||
|
||||
useEffect(() => {
|
||||
const videoOnPage = document.querySelector('video');
|
||||
if (autoplay && !videoOnPage && isStreamable) {
|
||||
if (autoplay && !videoOnPage && isStreamable && hasCostInfo) {
|
||||
viewFile();
|
||||
}
|
||||
}, [autoplay, viewFile, isStreamable]);
|
||||
}, [autoplay, viewFile, isStreamable, hasCostInfo]);
|
||||
|
||||
return (
|
||||
<div
|
||||
disabled={!hasCostInfo}
|
||||
onClick={viewFile}
|
||||
style={!obscurePreview && thumbnail ? { backgroundImage: `url("${thumbnail}")` } : {}}
|
||||
className={classnames('content__cover', {
|
||||
|
|
Loading…
Add table
Reference in a new issue