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(ui): #2368 add slider tap gesture #2369

Merged
merged 1 commit into from
Nov 27, 2024
Merged

fix(ui): #2368 add slider tap gesture #2369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 44 additions & 22 deletions src/components/Slider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,36 @@ const Slider = ({
panX.value = stepPositions[valueIndex];
}, [sliderWidth, value, steps, stepPositions, panX]);

const gesture = Gesture.Pan()
const findClosestStep = (currentPosition: number): number => {
'worklet';
return stepPositions.reduce((closestStep, currentStep) => {
// Calculate the difference between the current step and the current position
const currentDifference = Math.abs(currentStep - currentPosition);
const closestDifference = Math.abs(closestStep - currentPosition);

// If the current step is closer, update the closest step
return currentDifference < closestDifference ? currentStep : closestStep;
});
};

const tapGesture = Gesture.Tap().onStart((event) => {
const closestStep = findClosestStep(event.x);
panX.value = closestStep;

if (onValueChange) {
const stepIndex = stepPositions.indexOf(closestStep);
runOnJS(onValueChange)(steps[stepIndex]);
}
});

const panGesture = Gesture.Pan()
.onStart(() => {
prevPanX.value = panX.value;
})
.onUpdate((event) => {
panX.value = clamp(prevPanX.value + event.translationX, 0, sliderWidth);
})
.onEnd(() => {
const findClosestStep = (currentPosition: number): number => {
return stepPositions.reduce((prev, curr) => {
return Math.abs(curr - currentPosition) <
Math.abs(prev - currentPosition)
? curr
: prev;
});
};

const closestStep = findClosestStep(panX.value);
panX.value = withSpring(closestStep);

Expand All @@ -90,19 +103,23 @@ const Slider = ({
style={styles.container}
onLayout={(e): void => setSliderWidth(e.nativeEvent.layout.width)}>
<View style={styles.sliderContainer}>
<ThemedView style={styles.track} color="green32" />
<Animated.View style={[styles.track, trailStyle]} />
{stepPositions.map((pos, index) => (
<View
key={`step-${index}`}
style={[styles.stepContainer, { left: pos - 2 }]}>
<ThemedView style={styles.stepMarker} color="white" />
<Text13UP style={styles.stepLabel} numberOfLines={1}>
${steps[index]}
</Text13UP>
<GestureDetector gesture={tapGesture}>
<View style={styles.trackHitbox}>
<ThemedView style={styles.track} color="green32" />
<Animated.View style={[styles.track, trailStyle]} />
{stepPositions.map((pos, index) => (
<View
key={`step-${index}`}
style={[styles.stepContainer, { left: pos - 2 }]}>
<ThemedView style={styles.stepMarker} color="white" />
<Text13UP style={styles.stepLabel} numberOfLines={1}>
${steps[index]}
</Text13UP>
</View>
))}
</View>
))}
<GestureDetector gesture={gesture}>
</GestureDetector>
<GestureDetector gesture={panGesture}>
<Animated.View style={[styles.knob, animatedStyle]}>
<ThemedView style={styles.knobOuter} color="green">
<ThemedView style={styles.knobInner} color="white" />
Expand All @@ -126,6 +143,11 @@ const styles = StyleSheet.create({
alignItems: 'center',
justifyContent: 'center',
},
trackHitbox: {
justifyContent: 'center',
height: 30,
width: '100%',
},
track: {
borderRadius: 3,
height: 8,
Expand Down
Loading