Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix unable to adjust volume by clicking on any part of the volume slider #37094

Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from 'prop-types';
import React, {memo, useState} from 'react';
import React, {memo, useCallback, useState} from 'react';
import {View} from 'react-native';
import {Gesture, GestureDetector} from 'react-native-gesture-handler';
import Animated, {runOnJS, useAnimatedStyle, useDerivedValue} from 'react-native-reanimated';
Expand All @@ -9,6 +9,7 @@ import IconButton from '@components/VideoPlayer/IconButton';
import {useVolumeContext} from '@components/VideoPlayerContexts/VolumeContext';
import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import * as NumberUtils from '@libs/NumberUtils';
import stylePropTypes from '@styles/stylePropTypes';

const propTypes = {
Expand Down Expand Up @@ -38,27 +39,35 @@ function VolumeButton({style, small}) {
const [volumeIcon, setVolumeIcon] = useState({icon: getVolumeIcon(volume.value)});
const [isSliderBeingUsed, setIsSliderBeingUsed] = useState(false);

const onSliderLayout = (e) => {
const onSliderLayout = useCallback((e) => {
setSliderHeight(e.nativeEvent.layout.height);
};
}, []);

const changeVolumeOnPan = useCallback(
(event) => {
const val = NumberUtils.roundToTwoDecimalPlaces(1 - event.y / sliderHeight);
volume.value = NumberUtils.clamp(val, 0, 1);
},
[sliderHeight, volume],
);

const pan = Gesture.Pan()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

notable lack of memoization in this component. NAB without benchmarks though

.onBegin(() => {
.onBegin((event) => {
runOnJS(setIsSliderBeingUsed)(true);
changeVolumeOnPan(event);
})
.onChange((event) => {
const val = Math.floor((1 - event.y / sliderHeight) * 100) / 100;
volume.value = Math.min(Math.max(val, 0), 1);
changeVolumeOnPan(event);
})
.onEnd(() => {
.onFinalize(() => {
runOnJS(setIsSliderBeingUsed)(false);
});

const progressBarStyle = useAnimatedStyle(() => ({height: `${volume.value * 100}%`}));

const updateIcon = (vol) => {
const updateIcon = useCallback((vol) => {
setVolumeIcon({icon: getVolumeIcon(vol)});
};
}, []);

useDerivedValue(() => {
runOnJS(updateVolume)(volume.value);
Expand Down
18 changes: 17 additions & 1 deletion src/libs/NumberUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,20 @@ function roundDownToLargestMultiple(p: number, q: number) {
return Math.floor(p / q) * q;
}

export {rand64, generateHexadecimalValue, generateRandomInt, parseFloatAnyLocale, roundDownToLargestMultiple};
/**
* Rounds a number to two decimal places.
* @returns the rounded value
*/
function roundToTwoDecimalPlaces(value: number): number {
return Math.round(value * 100) / 100;
}

/**
* Clamps a value between a minimum and maximum value.
* @returns the clamped value
*/
function clamp(value: number, min: number, max: number): number {
return Math.min(Math.max(value, min), max);
}

export {rand64, generateHexadecimalValue, generateRandomInt, parseFloatAnyLocale, roundDownToLargestMultiple, roundToTwoDecimalPlaces, clamp};
Loading