mirror of
https://github.com/Stremio/stremio-web.git
synced 2026-04-21 07:32:02 +00:00
Merge pull request #826 from Stremio/feat/player-on-mute-show-0-volume-on-slider
Some checks are pending
Build / build (push) Waiting to run
Some checks are pending
Build / build (push) Waiting to run
feat: Player - Volume slider - on muted show 0 volume
This commit is contained in:
commit
9cf8a39696
2 changed files with 7 additions and 3 deletions
|
|
@ -138,6 +138,7 @@ const ControlBar = ({
|
||||||
<VolumeSlider
|
<VolumeSlider
|
||||||
className={styles['volume-slider']}
|
className={styles['volume-slider']}
|
||||||
volume={volume}
|
volume={volume}
|
||||||
|
muted={muted}
|
||||||
onVolumeChangeRequested={onVolumeChangeRequested}
|
onVolumeChangeRequested={onVolumeChangeRequested}
|
||||||
/>
|
/>
|
||||||
<div className={styles['spacing']} />
|
<div className={styles['spacing']} />
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ const { useRouteFocused } = require('stremio-router');
|
||||||
const { Slider } = require('stremio/components');
|
const { Slider } = require('stremio/components');
|
||||||
const styles = require('./styles');
|
const styles = require('./styles');
|
||||||
|
|
||||||
const VolumeSlider = ({ className, volume, onVolumeChangeRequested }) => {
|
const VolumeSlider = ({ className, volume, onVolumeChangeRequested, muted }) => {
|
||||||
const disabled = volume === null || isNaN(volume);
|
const disabled = volume === null || isNaN(volume);
|
||||||
const routeFocused = useRouteFocused();
|
const routeFocused = useRouteFocused();
|
||||||
const [slidingVolume, setSlidingVolume] = React.useState(null);
|
const [slidingVolume, setSlidingVolume] = React.useState(null);
|
||||||
|
|
@ -45,7 +45,9 @@ const VolumeSlider = ({ className, volume, onVolumeChangeRequested }) => {
|
||||||
className={classnames(className, styles['volume-slider'], { 'active': slidingVolume !== null })}
|
className={classnames(className, styles['volume-slider'], { 'active': slidingVolume !== null })}
|
||||||
value={
|
value={
|
||||||
!disabled ?
|
!disabled ?
|
||||||
slidingVolume !== null ? slidingVolume : volume
|
!muted ?
|
||||||
|
slidingVolume !== null ? slidingVolume : volume
|
||||||
|
: 0
|
||||||
:
|
:
|
||||||
100
|
100
|
||||||
}
|
}
|
||||||
|
|
@ -61,7 +63,8 @@ const VolumeSlider = ({ className, volume, onVolumeChangeRequested }) => {
|
||||||
VolumeSlider.propTypes = {
|
VolumeSlider.propTypes = {
|
||||||
className: PropTypes.string,
|
className: PropTypes.string,
|
||||||
volume: PropTypes.number,
|
volume: PropTypes.number,
|
||||||
onVolumeChangeRequested: PropTypes.func
|
onVolumeChangeRequested: PropTypes.func,
|
||||||
|
muted: PropTypes.bool,
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = VolumeSlider;
|
module.exports = VolumeSlider;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue