Skip to content
Open
Show file tree
Hide file tree
Changes from 3 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
13 changes: 9 additions & 4 deletions packages/react-native-ui-lib/src/incubator/slider/Thumb.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ interface ThumbProps extends ViewProps {
onSeekStart?: () => void;
onSeekEnd?: () => void;
enableShadow?: boolean;
isActive?: SharedValue<boolean>;
}

const SHADOW_RADIUS = 4;
Expand Down Expand Up @@ -53,7 +54,9 @@ const Thumb = (props: ThumbProps) => {
stepInterpolatedValue,
gap = 0,
secondary,
enableShadow
enableShadow,
pointerEvents,
isActive
} = props;

const rtlFix = Constants.isRTL ? -1 : 1;
Expand Down Expand Up @@ -93,15 +96,16 @@ const Thumb = (props: ThumbProps) => {
offset.value = Math.round(offset.value / stepInterpolatedValue.value) * stepInterpolatedValue.value;
}
});
gesture.enabled(!disabled);
gesture.enabled(!disabled && pointerEvents !== 'none');

const animatedStyle = useAnimatedStyle(() => {
const customStyle = isPressed.value ? activeStyle?.value : defaultStyle?.value;
const active = isPressed.value || isActive?.value;
Comment thread
M-i-k-e-l marked this conversation as resolved.
Outdated
const customStyle = active ? activeStyle?.value : defaultStyle?.value;
return {
...customStyle,
transform: [
{translateX: (offset.value - thumbSize.value.width / 2) * rtlFix},
{scale: withSpring(!disableActiveStyling && isPressed.value ? 1.3 : 1)}
{scale: withSpring(!disableActiveStyling && active ? 1.3 : 1)}
]
};
});
Expand All @@ -117,6 +121,7 @@ const Thumb = (props: ThumbProps) => {
<GestureDetector gesture={gesture}>
<View
reanimated
pointerEvents={pointerEvents}
Comment thread
M-i-k-e-l marked this conversation as resolved.
Outdated
style={[styles.thumbPosition, enableShadow && styles.thumbShadow, animatedStyle]}
hitSlop={hitSlop}
onLayout={onThumbLayout}
Expand Down
77 changes: 70 additions & 7 deletions packages/react-native-ui-lib/src/incubator/slider/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import _ from 'lodash';
import React, {ReactElement, useImperativeHandle, useCallback, useMemo, useEffect, useRef} from 'react';
import {StyleSheet, AccessibilityRole, StyleProp, ViewStyle, GestureResponderEvent, LayoutChangeEvent, ViewProps, AccessibilityProps} from 'react-native';
import {useSharedValue, useAnimatedStyle, runOnJS, useAnimatedReaction, withTiming} from 'react-native-reanimated';
import {GestureHandlerRootView} from 'react-native-gesture-handler';
import {GestureHandlerRootView, GestureDetector, Gesture} from 'react-native-gesture-handler';
import {forwardRef, ForwardRefInjectedProps, Constants} from '../../commons/new';
import {extractAccessibilityProps} from '../../commons/modifiers';
import {Colors, Spacings} from '../../style';
Expand All @@ -15,6 +15,7 @@ import {
getValueForOffset,
getStepInterpolated
} from './SliderPresenter';
import View from '../../components/view';
import Thumb from './Thumb';
import Track from './Track';

Expand Down Expand Up @@ -135,11 +136,16 @@ export interface SliderProps extends AccessibilityProps {
* The slider's test identifier
*/
testID?: string;
/**
/**
* Whether to use the new Slider implementation using Reanimated
*/
migrate?: boolean;
/**
/**
* If true, dragging anywhere on the slider moves the thumb relative to its current position
* instead of snapping to the touch point. Designed for single-thumb mode.
*/
useRelativeDrag?: boolean;
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

slider.api.json note updated

/**
* Control the throttle time of the onValueChange and onRangeChange callbacks
*/
throttleTime?: number;
Expand Down Expand Up @@ -193,6 +199,7 @@ const Slider = React.memo((props: Props) => {
accessible = true,
testID,
enableThumbShadow = true,
useRelativeDrag,
throttleTime = 200
} = themeProps;

Expand Down Expand Up @@ -373,6 +380,42 @@ const Slider = React.memo((props: Props) => {
}
};

const containerDragStartOffset = useSharedValue(0);
const isContainerDragging = useSharedValue(false);

const clampOffset = (offset: number) => {
'worklet';
return Math.max(0, Math.min(trackSize.value.width, offset));
};

const snapToStep = () => {
'worklet';
if (shouldBounceToStep) {
const step = stepInterpolatedValue.value;
defaultThumbOffset.value = Math.round(defaultThumbOffset.value / step) * step;
}
};

const containerGesture = Gesture.Pan()
.onBegin(() => {
containerDragStartOffset.value = defaultThumbOffset.value;
isContainerDragging.value = true;
_onSeekStart();
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Double onSeekStart when starting on the thumb (only on thumb)

Move _onSeekStart to onStart, also move the one in thumb to onStart

})
.onUpdate(e => {
if (trackSize.value.width === 0) {
return;
}
const dx = e.translationX * (shouldDisableRTL ? 1 : rtlFix);
defaultThumbOffset.value = clampOffset(containerDragStartOffset.value + dx);
})
.onEnd(() => _onSeekEnd())
.onFinalize(() => {
isContainerDragging.value = false;
snapToStep();
});
containerGesture.enabled(!disabled && !!useRelativeDrag);

const trackAnimatedStyles = useAnimatedStyle(() => {
if (useRange) {
return {
Expand All @@ -399,6 +442,8 @@ const Slider = React.memo((props: Props) => {
onSeekEnd={_onSeekEnd}
shouldDisableRTL={shouldDisableRTL}
disabled={disabled}
pointerEvents={useRelativeDrag ? 'none' : undefined}
isActive={useRelativeDrag ? isContainerDragging : undefined}
disableActiveStyling={disableActiveStyling}
defaultStyle={_thumbStyle}
activeStyle={_activeThumbStyle}
Expand All @@ -415,7 +460,7 @@ const Slider = React.memo((props: Props) => {
<Track
renderTrack={renderTrack}
onLayout={onTrackLayout}
onPress={onTrackPress}
onPress={useRelativeDrag ? undefined : onTrackPress}
animatedStyle={trackAnimatedStyles}
disabled={disabled}
maximumTrackTintColor={maximumTrackTintColor}
Expand All @@ -425,15 +470,29 @@ const Slider = React.memo((props: Props) => {
);
};

const renderSliderContent = () => (
<>
{_renderTrack()}
{renderThumb(ThumbType.DEFAULT)}
{useRange && renderThumb(ThumbType.RANGE)}
</>
);

return (
<GestureHandlerRootView
style={[styles.container, containerStyle, shouldDisableRTL && styles.disableRTL]}
testID={testID}
{...accessibilityProps}
>
{_renderTrack()}
{renderThumb(ThumbType.DEFAULT)}
{useRange && renderThumb(ThumbType.RANGE)}
{useRelativeDrag ? (
<GestureDetector gesture={containerGesture}>
<View style={styles.gestureContainer}>
{renderSliderContent()}
</View>
</GestureDetector>
) : (
renderSliderContent()
)}
</GestureHandlerRootView>
);
});
Expand All @@ -446,6 +505,10 @@ const styles = StyleSheet.create({
height: THUMB_SIZE + SHADOW_RADIUS,
justifyContent: 'center'
},
gestureContainer: {
flex: 1,
justifyContent: 'center'
},
disableRTL: {
transform: [{scaleX: -1}]
},
Expand Down
Loading