@@ -15,7 +15,7 @@ function countDecimals(value: number) {
15
15
if ( Math . floor ( value . valueOf ( ) ) === value . valueOf ( ) ) {
16
16
return 0 ;
17
17
}
18
- return value . toString ( ) . split ( '.' ) [ 1 ] . length || 0 ;
18
+ return value . toString ( ) . split ( '.' ) [ 1 ] . length || 0 ;
19
19
}
20
20
21
21
export function getValueForOffset ( offset : number , span : number , minimum = 0 , maximum = 1 , step = 0 ) {
@@ -39,26 +39,37 @@ function inRange(value: number, min: number, max: number) {
39
39
40
40
export function validateValues ( props : SliderProps ) {
41
41
const { useRange, value, minimumValue = 0 , maximumValue = 1 , initialMinimumValue, initialMaximumValue} = props ;
42
- if ( minimumValue > maximumValue ||
43
- useRange && initialMinimumValue && initialMaximumValue && initialMinimumValue > initialMaximumValue ) {
42
+ if (
43
+ minimumValue > maximumValue ||
44
+ ( useRange && initialMinimumValue && initialMaximumValue && initialMinimumValue > initialMaximumValue )
45
+ ) {
44
46
console . error ( 'Your passed values are invalid. Please check if minimum values are not higher than maximum values' ) ;
45
47
}
46
48
if ( value !== undefined && minimumValue && maximumValue && ! inRange ( value , minimumValue , maximumValue ) ) {
47
49
console . error ( `Your passed value (${ value } ) is invalid.
48
50
Please check that it is in range of the minimum (${ minimumValue } ) and maximum (${ maximumValue } ) values` ) ;
49
51
}
50
52
if ( useRange && initialMinimumValue && initialMaximumValue ) {
51
- if ( ! inRange ( initialMinimumValue , minimumValue , maximumValue ) ||
52
- ! inRange ( initialMaximumValue , minimumValue , maximumValue ) ) {
53
- console . error ( 'Your passed values are invalid. Please check that they are in range of the minimum and maximum values' ) ;
53
+ if (
54
+ ! inRange ( initialMinimumValue , minimumValue , maximumValue ) ||
55
+ ! inRange ( initialMaximumValue , minimumValue , maximumValue )
56
+ ) {
57
+ console . error (
58
+ 'Your passed values are invalid. Please check that they are in range of the minimum and maximum values'
59
+ ) ;
54
60
}
55
61
}
56
62
}
57
63
58
- export function getStepInterpolated ( trackWidth : number , minimumValue : number , maximumValue : number , stepXValue : SharedValue < number > ) {
64
+ export function getStepInterpolated (
65
+ trackWidth : number ,
66
+ minimumValue : number ,
67
+ maximumValue : number ,
68
+ stepXValue : SharedValue < number >
69
+ ) {
59
70
'worklet' ;
60
71
const outputRange = [ 0 , trackWidth ] ;
61
- const inputRange = minimumValue < 0 ?
62
- [ Math . abs ( maximumValue ) , Math . abs ( minimumValue ) ] : [ minimumValue , maximumValue ] ;
72
+ const inputRange =
73
+ minimumValue < 0 ? [ 0 , Math . abs ( minimumValue ) + maximumValue ] : [ 0 , maximumValue - minimumValue ] ;
63
74
return interpolate ( stepXValue . value , inputRange , outputRange ) ;
64
75
}
0 commit comments