From ffc4c28514e09b989503159d0d873545028259ae Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 5 Jun 2023 23:08:26 +0200 Subject: [PATCH] refactor: rename progress prop to buffered for Slider --- src/common/Slider/Slider.js | 10 +++++----- src/routes/Player/ControlBar/SeekBar/SeekBar.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/Slider/Slider.js b/src/common/Slider/Slider.js index 532608b4a..ea9eee41c 100644 --- a/src/common/Slider/Slider.js +++ b/src/common/Slider/Slider.js @@ -8,11 +8,11 @@ const useAnimationFrame = require('stremio/common/useAnimationFrame'); const useLiveRef = require('stremio/common/useLiveRef'); const styles = require('./styles'); -const Slider = ({ className, value, progress, minimumValue, maximumValue, disabled, onSlide, onComplete }) => { +const Slider = ({ className, value, buffered, minimumValue, maximumValue, disabled, onSlide, onComplete }) => { const minimumValueRef = useLiveRef(minimumValue !== null && !isNaN(minimumValue) ? minimumValue : 0); const maximumValueRef = useLiveRef(maximumValue !== null && !isNaN(maximumValue) ? maximumValue : 100); const valueRef = useLiveRef(value !== null && !isNaN(value) ? Math.min(maximumValueRef.current, Math.max(minimumValueRef.current, value)) : 0); - const progressRef = useLiveRef(progress !== null && !isNaN(progress) ? Math.min(maximumValueRef.current, Math.max(minimumValueRef.current, progress)) : 0); + const bufferedRef = useLiveRef(buffered !== null && !isNaN(buffered) ? Math.min(maximumValueRef.current, Math.max(minimumValueRef.current, buffered)) : 0); const onSlideRef = useLiveRef(onSlide); const onCompleteRef = useLiveRef(onComplete); const sliderContainerRef = React.useRef(null); @@ -96,14 +96,14 @@ const Slider = ({ className, value, progress, minimumValue, maximumValue, disabl }; }, []); const thumbPosition = Math.max(0, Math.min(1, (valueRef.current - minimumValueRef.current) / (maximumValueRef.current - minimumValueRef.current))); - const progressPosition = Math.max(0, Math.min(1, (progressRef.current - minimumValueRef.current) / (maximumValueRef.current - minimumValueRef.current))); + const bufferedPosition = Math.max(0, Math.min(1, (bufferedRef.current - minimumValueRef.current) / (maximumValueRef.current - minimumValueRef.current))); return (
-
+
@@ -120,7 +120,7 @@ const Slider = ({ className, value, progress, minimumValue, maximumValue, disabl Slider.propTypes = { className: PropTypes.string, value: PropTypes.number, - progress: PropTypes.number, + buffered: PropTypes.number, minimumValue: PropTypes.number, maximumValue: PropTypes.number, disabled: PropTypes.bool, diff --git a/src/routes/Player/ControlBar/SeekBar/SeekBar.js b/src/routes/Player/ControlBar/SeekBar/SeekBar.js index dbdb51fa2..780ecf568 100644 --- a/src/routes/Player/ControlBar/SeekBar/SeekBar.js +++ b/src/routes/Player/ControlBar/SeekBar/SeekBar.js @@ -49,7 +49,7 @@ const SeekBar = ({ className, time, duration, buffered, onSeekRequested }) => { : 0 } - progress={buffered} + buffered={buffered} minimumValue={0} maximumValue={duration} disabled={disabled}