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.

Sign up for GitHub

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
merged 5 commits into from
Feb 28, 2024
Merged

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

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
21be35d
Add on begin pan gesture event
kowczarz Feb 22, 2024
4726489
Cleanup
kowczarz Feb 22, 2024
9112cce
Add review changes
Skalakid Feb 26, 2024
075507a
Merge branch 'main' into video-player-followups/fix-not-adjusting-vol…
Skalakid Feb 26, 2024
f3cdd23
Fix volume button on iOS/Safari
Skalakid Feb 28, 2024
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
13 changes: 9 additions & 4 deletions src/components/VideoPlayer/VideoPlayerControls/VolumeButton/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,20 @@ function VolumeButton({style, small}) {
setSliderHeight(e.nativeEvent.layout.height);
};

const gestureEventHandler = (event) => {
Copy link
Contributor

Choose a reason for hiding this comment

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

This name is against the Expensify guidelines. I believe it should be handleGestureEvent.

Copy link
Contributor

Choose a reason for hiding this comment

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

Or, even better, changeVolumeOnPan

Copy link
Contributor

Choose a reason for hiding this comment

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

@kowczarz Bump! 🙂

const val = Math.floor((1 - event.y / sliderHeight) * 100) / 100;
roryabraham marked this conversation as resolved.
Show resolved Hide resolved
volume.value = Math.min(Math.max(val, 0), 1);
};

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);
gestureEventHandler(event);
})
.onChange((event) => {
const val = Math.floor((1 - event.y / sliderHeight) * 100) / 100;
volume.value = Math.min(Math.max(val, 0), 1);
gestureEventHandler(event);
})
.onEnd(() => {
.onFinalize(() => {
runOnJS(setIsSliderBeingUsed)(false);
});

Expand Down
Loading