Skip to content

Commit 035333c

Browse files
committed
Fixed type error with defaults of old slider
1 parent d8504d7 commit 035333c

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

src/components/slider/GradientSlider.tsx

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ export enum GradientSliderTypes {
1919
SATURATION = 'saturation'
2020
}
2121

22-
export type GradientSliderProps = Omit<SliderProps, 'onValueChange'> & {
22+
export type GradientSliderProps = Omit<
23+
SliderProps,
24+
'onValueChange' | 'value' | 'minimumValue' | 'maximumValue' | 'step' | 'thumbHitSlop' | 'useGap'
25+
> & {
2326
/**
2427
* The gradient color
2528
*/
@@ -48,24 +51,17 @@ export type GradientSliderProps = Omit<SliderProps, 'onValueChange'> & {
4851
* If true the Slider will be disabled and will appear in disabled color
4952
*/
5053
disabled?: boolean;
51-
};
54+
} & Partial<Pick<SliderProps, 'value' | 'minimumValue' | 'maximumValue' | 'step' | 'thumbHitSlop' | 'useGap'>>; // Fixes typing errors with the old slider.
5255

5356
type GradientSliderComponentProps = {
5457
/**
5558
* Context of the slider group
5659
*/
5760
sliderContext: SliderContextProps;
58-
} & GradientSliderProps &
59-
typeof defaultProps;
61+
} & GradientSliderProps;
6062

6163
type Props = GradientSliderComponentProps & ForwardRefInjectedProps;
6264

63-
const defaultProps = {
64-
type: GradientSliderTypes.DEFAULT,
65-
gradientSteps: 120,
66-
color: Colors.$backgroundPrimaryHeavy
67-
};
68-
6965
/**
7066
* @description: A Gradient Slider component
7167
* @example: https://github.com/wix/react-native-ui-lib/blob/master/demo/src/screens/componentScreens/SliderScreen.tsx
@@ -93,10 +89,6 @@ const GradientSlider = (props: Props) => {
9389
setColor(Colors.getHSL(propsColors));
9490
}, [propsColors]);
9591

96-
const reset = () => {
97-
updateColor(initialColor);
98-
};
99-
10092
const getColor = useCallback(() => {
10193
return color || sliderContext.value;
10294
}, [color, sliderContext.value]);
@@ -138,6 +130,10 @@ const GradientSlider = (props: Props) => {
138130
},
139131
[sliderContext, onValueChange]);
140132

133+
const reset = useCallback(() => {
134+
updateColor(initialColor);
135+
}, [initialColor, updateColor]);
136+
141137
const updateAlpha = useCallback((a: number) => {
142138
const color = getColor();
143139
updateColor({...color, a});
@@ -217,4 +213,4 @@ GradientSlider.displayName = 'GradientSlider';
217213
GradientSlider.types = GradientSliderTypes;
218214

219215
// eslint-disable-next-line max-len
220-
export default asBaseComponent<GradientSliderComponentProps, typeof GradientSlider>(forwardRef(asSliderGroupChild(forwardRef(GradientSlider))));
216+
export default asBaseComponent<GradientSliderProps, typeof GradientSlider>(forwardRef(asSliderGroupChild(forwardRef(GradientSlider))));

0 commit comments

Comments
 (0)