mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-26 15:16:47 +00:00
3fb7fe14c6
* Run eslint --fix * Fix linting issues in video player and reduce divergences with upstream This includes a behavior change of not auto-looping videos anymore. I don't remember loops being ever intended, and they have been removed from upstream a while ago, but we somehow missed the change. * Fix lint issues in `app/javascript/flavours/glitch/selectors/index.js` Those were basically caused by dead code that isn't present upstream, so that brings us closer to upstream as well. * Fix linting issue and bug in streaming/index.js * Fix linting issues in config/webpack/shared.js * Fix unused import in flavours/glitch/features/ui/index.js * Fix linting issues and reduce divergences from upstream in flavours/glitch/features/ui/components/video_modal.jsx * Fix linting issues in flavours/glitch/reducers * Fix linting issues in glitch-soc onboarding modal * Fix linting issues in flavours/glitch/features/ui/components/navigation_panel.jsx * Remove dead code for unused local setting navbar_under * Fix various linting issues * Fix linting issues in flavours/glitch/components/scrollable_list.jsx and reduce divergences with upstream
72 lines
2.2 KiB
JavaScript
72 lines
2.2 KiB
JavaScript
import React from 'react';
|
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
|
import PropTypes from 'prop-types';
|
|
import Video from 'flavours/glitch/features/video';
|
|
import { connect } from 'react-redux';
|
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
|
import Footer from 'flavours/glitch/features/picture_in_picture/components/footer';
|
|
import { getAverageFromBlurhash } from 'flavours/glitch/blurhash';
|
|
|
|
const mapStateToProps = (state, { statusId }) => ({
|
|
language: state.getIn(['statuses', statusId, 'language']),
|
|
});
|
|
|
|
class VideoModal extends ImmutablePureComponent {
|
|
|
|
static propTypes = {
|
|
media: ImmutablePropTypes.map.isRequired,
|
|
statusId: PropTypes.string,
|
|
language: PropTypes.string,
|
|
options: PropTypes.shape({
|
|
startTime: PropTypes.number,
|
|
autoPlay: PropTypes.bool,
|
|
defaultVolume: PropTypes.number,
|
|
}),
|
|
onClose: PropTypes.func.isRequired,
|
|
onChangeBackgroundColor: PropTypes.func.isRequired,
|
|
};
|
|
|
|
componentDidMount () {
|
|
const { media, onChangeBackgroundColor } = this.props;
|
|
|
|
const backgroundColor = getAverageFromBlurhash(media.get('blurhash'));
|
|
|
|
if (backgroundColor) {
|
|
onChangeBackgroundColor(backgroundColor);
|
|
}
|
|
}
|
|
|
|
render () {
|
|
const { media, statusId, language, onClose } = this.props;
|
|
const options = this.props.options || {};
|
|
|
|
return (
|
|
<div className='modal-root__modal video-modal'>
|
|
<div className='video-modal__container'>
|
|
<Video
|
|
preview={media.get('preview_url')}
|
|
frameRate={media.getIn(['meta', 'original', 'frame_rate'])}
|
|
blurhash={media.get('blurhash')}
|
|
src={media.get('url')}
|
|
currentTime={options.startTime}
|
|
autoPlay={options.autoPlay}
|
|
volume={options.defaultVolume}
|
|
onCloseVideo={onClose}
|
|
autoFocus
|
|
detailed
|
|
alt={media.get('description')}
|
|
lang={language}
|
|
/>
|
|
</div>
|
|
|
|
<div className='media-modal__overlay'>
|
|
{statusId && <Footer statusId={statusId} withOpenButton onClose={onClose} />}
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
}
|
|
|
|
export default connect(mapStateToProps, null, null, { forwardRef: true })(VideoModal);
|