Redesign video player (#4911)
* Redesign video player * Use new video player on static public pages too * Use media gallery component on static public pages too * Pause video when hiding it * Full-screen sizing on WebKit * Add aria labels to video player buttons * Display link card on public status page * Fix fullscreen from modal sizing issue * Remove contain: strict property to fix fullscreen from columnsmaster
Eugen Rochko
7 years ago
committed by
GitHub
parent
af00220d79
commit
2bbf987a0a
@ -0,0 +1,18 @@ |
||||
import React from 'react'; |
||||
import PropTypes from 'prop-types'; |
||||
import Card from '../features/status/components/card'; |
||||
import { fromJS } from 'immutable'; |
||||
|
||||
export default class CardContainer extends React.PureComponent { |
||||
|
||||
static propTypes = { |
||||
locale: PropTypes.string, |
||||
card: PropTypes.array.isRequired, |
||||
}; |
||||
|
||||
render () { |
||||
const { card, ...props } = this.props; |
||||
return <Card card={fromJS(card)} {...props} />; |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,34 @@ |
||||
import React from 'react'; |
||||
import PropTypes from 'prop-types'; |
||||
import { IntlProvider, addLocaleData } from 'react-intl'; |
||||
import { getLocale } from '../locales'; |
||||
import MediaGallery from '../components/media_gallery'; |
||||
import { fromJS } from 'immutable'; |
||||
|
||||
const { localeData, messages } = getLocale(); |
||||
addLocaleData(localeData); |
||||
|
||||
export default class MediaGalleryContainer extends React.PureComponent { |
||||
|
||||
static propTypes = { |
||||
locale: PropTypes.string.isRequired, |
||||
media: PropTypes.array.isRequired, |
||||
}; |
||||
|
||||
handleOpenMedia = () => {} |
||||
|
||||
render () { |
||||
const { locale, media, ...props } = this.props; |
||||
|
||||
return ( |
||||
<IntlProvider locale={locale} messages={messages}> |
||||
<MediaGallery |
||||
{...props} |
||||
media={fromJS(media)} |
||||
onOpenMedia={this.handleOpenMedia} |
||||
/> |
||||
</IntlProvider> |
||||
); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,26 @@ |
||||
import React from 'react'; |
||||
import PropTypes from 'prop-types'; |
||||
import { IntlProvider, addLocaleData } from 'react-intl'; |
||||
import { getLocale } from '../locales'; |
||||
import Video from '../features/video'; |
||||
|
||||
const { localeData, messages } = getLocale(); |
||||
addLocaleData(localeData); |
||||
|
||||
export default class VideoContainer extends React.PureComponent { |
||||
|
||||
static propTypes = { |
||||
locale: PropTypes.string.isRequired, |
||||
}; |
||||
|
||||
render () { |
||||
const { locale, ...props } = this.props; |
||||
|
||||
return ( |
||||
<IntlProvider locale={locale} messages={messages}> |
||||
<Video {...props} /> |
||||
</IntlProvider> |
||||
); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,304 @@ |
||||
import React from 'react'; |
||||
import PropTypes from 'prop-types'; |
||||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; |
||||
import { throttle } from 'lodash'; |
||||
import classNames from 'classnames'; |
||||
|
||||
const messages = defineMessages({ |
||||
play: { id: 'video.play', defaultMessage: 'Play' }, |
||||
pause: { id: 'video.pause', defaultMessage: 'Pause' }, |
||||
mute: { id: 'video.mute', defaultMessage: 'Mute sound' }, |
||||
unmute: { id: 'video.unmute', defaultMessage: 'Unmute sound' }, |
||||
hide: { id: 'video.hide', defaultMessage: 'Hide video' }, |
||||
expand: { id: 'video.expand', defaultMessage: 'Expand video' }, |
||||
close: { id: 'video.close', defaultMessage: 'Close video' }, |
||||
fullscreen: { id: 'video.fullscreen', defaultMessage: 'Full screen' }, |
||||
exit_fullscreen: { id: 'video.exit_fullscreen', defaultMessage: 'Exit full screen' }, |
||||
}); |
||||
|
||||
const findElementPosition = el => { |
||||
let box; |
||||
|
||||
if (el.getBoundingClientRect && el.parentNode) { |
||||
box = el.getBoundingClientRect(); |
||||
} |
||||
|
||||
if (!box) { |
||||
return { |
||||
left: 0, |
||||
top: 0, |
||||
}; |
||||
} |
||||
|
||||
const docEl = document.documentElement; |
||||
const body = document.body; |
||||
|
||||
const clientLeft = docEl.clientLeft || body.clientLeft || 0; |
||||
const scrollLeft = window.pageXOffset || body.scrollLeft; |
||||
const left = (box.left + scrollLeft) - clientLeft; |
||||
|
||||
const clientTop = docEl.clientTop || body.clientTop || 0; |
||||
const scrollTop = window.pageYOffset || body.scrollTop; |
||||
const top = (box.top + scrollTop) - clientTop; |
||||
|
||||
return { |
||||
left: Math.round(left), |
||||
top: Math.round(top), |
||||
}; |
||||
}; |
||||
|
||||
const getPointerPosition = (el, event) => { |
||||
const position = {}; |
||||
const box = findElementPosition(el); |
||||
const boxW = el.offsetWidth; |
||||
const boxH = el.offsetHeight; |
||||
const boxY = box.top; |
||||
const boxX = box.left; |
||||
|
||||
let pageY = event.pageY; |
||||
let pageX = event.pageX; |
||||
|
||||
if (event.changedTouches) { |
||||
pageX = event.changedTouches[0].pageX; |
||||
pageY = event.changedTouches[0].pageY; |
||||
} |
||||
|
||||
position.y = Math.max(0, Math.min(1, ((boxY - pageY) + boxH) / boxH)); |
||||
position.x = Math.max(0, Math.min(1, (pageX - boxX) / boxW)); |
||||
|
||||
return position; |
||||
}; |
||||
|
||||
const isFullscreen = () => document.fullscreenElement || |
||||
document.webkitFullscreenElement || |
||||
document.mozFullScreenElement || |
||||
document.msFullscreenElement; |
||||
|
||||
const exitFullscreen = () => { |
||||
if (document.exitFullscreen) { |
||||
document.exitFullscreen(); |
||||
} else if (document.webkitExitFullscreen) { |
||||
document.webkitExitFullscreen(); |
||||
} else if (document.mozCancelFullScreen) { |
||||
document.mozCancelFullScreen(); |
||||
} else if (document.msExitFullscreen) { |
||||
document.msExitFullscreen(); |
||||
} |
||||
}; |
||||
|
||||
const requestFullscreen = el => { |
||||
if (el.requestFullscreen) { |
||||
el.requestFullscreen(); |
||||
} else if (el.webkitRequestFullscreen) { |
||||
el.webkitRequestFullscreen(); |
||||
} else if (el.mozRequestFullScreen) { |
||||
el.mozRequestFullScreen(); |
||||
} else if (el.msRequestFullscreen) { |
||||
el.msRequestFullscreen(); |
||||
} |
||||
}; |
||||
|
||||
@injectIntl |
||||
export default class Video extends React.PureComponent { |
||||
|
||||
static propTypes = { |
||||
preview: PropTypes.string, |
||||
src: PropTypes.string.isRequired, |
||||
width: PropTypes.number, |
||||
height: PropTypes.number, |
||||
sensitive: PropTypes.bool, |
||||
startTime: PropTypes.number, |
||||
onOpenVideo: PropTypes.func, |
||||
onCloseVideo: PropTypes.func, |
||||
intl: PropTypes.object.isRequired, |
||||
}; |
||||
|
||||
state = { |
||||
progress: 0, |
||||
paused: true, |
||||
dragging: false, |
||||
fullscreen: false, |
||||
hovered: false, |
||||
muted: false, |
||||
revealed: !this.props.sensitive, |
||||
}; |
||||
|
||||
setPlayerRef = c => { |
||||
this.player = c; |
||||
} |
||||
|
||||
setVideoRef = c => { |
||||
this.video = c; |
||||
} |
||||
|
||||
setSeekRef = c => { |
||||
this.seek = c; |
||||
} |
||||
|
||||
handlePlay = () => { |
||||
this.setState({ paused: false }); |
||||
} |
||||
|
||||
handlePause = () => { |
||||
this.setState({ paused: true }); |
||||
} |
||||
|
||||
handleTimeUpdate = () => { |
||||
this.setState({ progress: 100 * (this.video.currentTime / this.video.duration) }); |
||||
} |
||||
|
||||
handleMouseDown = e => { |
||||
document.addEventListener('mousemove', this.handleMouseMove, true); |
||||
document.addEventListener('mouseup', this.handleMouseUp, true); |
||||
document.addEventListener('touchmove', this.handleMouseMove, true); |
||||
document.addEventListener('touchend', this.handleMouseUp, true); |
||||
|
||||
this.setState({ dragging: true }); |
||||
this.video.pause(); |
||||
this.handleMouseMove(e); |
||||
} |
||||
|
||||
handleMouseUp = () => { |
||||
document.removeEventListener('mousemove', this.handleMouseMove, true); |
||||
document.removeEventListener('mouseup', this.handleMouseUp, true); |
||||
document.removeEventListener('touchmove', this.handleMouseMove, true); |
||||
document.removeEventListener('touchend', this.handleMouseUp, true); |
||||
|
||||
this.setState({ dragging: false }); |
||||
this.video.play(); |
||||
} |
||||
|
||||
handleMouseMove = throttle(e => { |
||||
const { x } = getPointerPosition(this.seek, e); |
||||
this.video.currentTime = this.video.duration * x; |
||||
this.setState({ progress: x * 100 }); |
||||
}, 60); |
||||
|
||||
togglePlay = () => { |
||||
if (this.state.paused) { |
||||
this.video.play(); |
||||
} else { |
||||
this.video.pause(); |
||||
} |
||||
} |
||||
|
||||
toggleFullscreen = () => { |
||||
if (isFullscreen()) { |
||||
exitFullscreen(); |
||||
} else { |
||||
requestFullscreen(this.player); |
||||
} |
||||
} |
||||
|
||||
componentDidMount () { |
||||
document.addEventListener('fullscreenchange', this.handleFullscreenChange, true); |
||||
document.addEventListener('webkitfullscreenchange', this.handleFullscreenChange, true); |
||||
document.addEventListener('mozfullscreenchange', this.handleFullscreenChange, true); |
||||
document.addEventListener('MSFullscreenChange', this.handleFullscreenChange, true); |
||||
} |
||||
|
||||
componentWillUnmount () { |
||||
document.removeEventListener('fullscreenchange', this.handleFullscreenChange, true); |
||||
document.removeEventListener('webkitfullscreenchange', this.handleFullscreenChange, true); |
||||
document.removeEventListener('mozfullscreenchange', this.handleFullscreenChange, true); |
||||
document.removeEventListener('MSFullscreenChange', this.handleFullscreenChange, true); |
||||
} |
||||
|
||||
handleFullscreenChange = () => { |
||||
this.setState({ fullscreen: isFullscreen() }); |
||||
} |
||||
|
||||
handleMouseEnter = () => { |
||||
this.setState({ hovered: true }); |
||||
} |
||||
|
||||
handleMouseLeave = () => { |
||||
this.setState({ hovered: false }); |
||||
} |
||||
|
||||
toggleMute = () => { |
||||
this.video.muted = !this.video.muted; |
||||
this.setState({ muted: this.video.muted }); |
||||
} |
||||
|
||||
toggleReveal = () => { |
||||
if (this.state.revealed) { |
||||
this.video.pause(); |
||||
} |
||||
|
||||
this.setState({ revealed: !this.state.revealed }); |
||||
} |
||||
|
||||
handleLoadedData = () => { |
||||
if (this.props.startTime) { |
||||
this.video.currentTime = this.props.startTime; |
||||
this.video.play(); |
||||
} |
||||
} |
||||
|
||||
handleOpenVideo = () => { |
||||
this.video.pause(); |
||||
this.props.onOpenVideo(this.video.currentTime); |
||||
} |
||||
|
||||
handleCloseVideo = () => { |
||||
this.video.pause(); |
||||
this.props.onCloseVideo(); |
||||
} |
||||
|
||||
render () { |
||||
const { preview, src, width, height, startTime, onOpenVideo, onCloseVideo, intl } = this.props; |
||||
const { progress, dragging, paused, fullscreen, hovered, muted, revealed } = this.state; |
||||
|
||||
return ( |
||||
<div className={classNames('video-player', { inactive: !revealed, inline: width && height && !fullscreen, fullscreen })} style={{ width, height }} ref={this.setPlayerRef} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}> |
||||
<video |
||||
ref={this.setVideoRef} |
||||
src={src} |
||||
poster={preview} |
||||
preload={!!startTime} |
||||
loop |
||||
role='button' |
||||
tabIndex='0' |
||||
width={width} |
||||
height={height} |
||||
onClick={this.togglePlay} |
||||
onPlay={this.handlePlay} |
||||
onPause={this.handlePause} |
||||
onTimeUpdate={this.handleTimeUpdate} |
||||
onLoadedData={this.handleLoadedData} |
||||
/> |
||||
|
||||
<button className={classNames('video-player__spoiler', { active: !revealed })} onClick={this.toggleReveal}> |
||||
<span className='video-player__spoiler__title'><FormattedMessage id='status.sensitive_warning' defaultMessage='Sensitive content' /></span> |
||||
<span className='video-player__spoiler__subtitle'><FormattedMessage id='status.sensitive_toggle' defaultMessage='Click to view' /></span> |
||||
</button> |
||||
|
||||
<div className={classNames('video-player__controls', { active: paused || hovered })}> |
||||
<div className='video-player__seek' onMouseDown={this.handleMouseDown} ref={this.setSeekRef}> |
||||
<div className='video-player__seek__progress' style={{ width: `${progress}%` }} /> |
||||
|
||||
<span |
||||
className={classNames('video-player__seek__handle', { active: dragging })} |
||||
tabIndex='0' |
||||
style={{ left: `${progress}%` }} |
||||
/> |
||||
</div> |
||||
|
||||
<div className='video-player__buttons left'> |
||||
<button aria-label={intl.formatMessage(paused ? messages.play : messages.pause)} onClick={this.togglePlay}><i className={classNames('fa fa-fw', { 'fa-play': paused, 'fa-pause': !paused })} /></button> |
||||
<button aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} onClick={this.toggleMute}><i className={classNames('fa fa-fw', { 'fa-volume-off': muted, 'fa-volume-up': !muted })} /></button> |
||||
{!onCloseVideo && <button aria-label={intl.formatMessage(messages.hide)} onClick={this.toggleReveal}><i className='fa fa-fw fa-eye' /></button>} |
||||
</div> |
||||
|
||||
<div className='video-player__buttons right'> |
||||
{(!fullscreen && onOpenVideo) && <button aria-label={intl.formatMessage(messages.expand)} onClick={this.handleOpenVideo}><i className='fa fa-fw fa-expand' /></button>} |
||||
{onCloseVideo && <button aria-label={intl.formatMessage(messages.close)} onClick={this.handleCloseVideo}><i className='fa fa-fw fa-times' /></button>} |
||||
<button aria-label={intl.formatMessage(fullscreen ? messages.exit_fullscreen : messages.fullscreen)} onClick={this.toggleFullscreen}><i className={classNames('fa fa-fw', { 'fa-arrows-alt': !fullscreen, 'fa-compress': fullscreen })} /></button> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
); |
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue