Skip to content

Commit ffe8596

Browse files
author
maciej.lodygowski
committed
chore: pr improvements
1 parent 7988085 commit ffe8596

File tree

3 files changed

+17
-21
lines changed

3 files changed

+17
-21
lines changed

package/android/src/main/java/com/reactnativecommunity/slider/ReactSlider.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,10 @@ private void updateLowerLimit() {
239239
double limit = Math.max(mRealLowerLimit, mMinValue);
240240
int lowerLimit = (int) Math.round((limit - mMinValue) / (mMaxValue - mMinValue) * getTotalSteps());
241241
if(lowerLimit > mUpperLimit) {
242-
Log.w("Invalid configuration", "reverting lower limit to upper limit");
242+
Log.d("Invalid configuration", "upperLimit < lowerLimit; lowerLimit not set");
243+
}else {
244+
mLowerLimit = Math.min(lowerLimit, mUpperLimit);
243245
}
244-
mLowerLimit = Math.min(lowerLimit, mUpperLimit);
245246
}
246247

247248
/** Update limit based on props limit, max and min
@@ -250,10 +251,11 @@ private void updateLowerLimit() {
250251
private void updateUpperLimit() {
251252
double limit = Math.min(mRealUpperLimit, mMaxValue);
252253
int upperLimit = (int) Math.round((limit - mMinValue) / (mMaxValue - mMinValue) * getTotalSteps());
253-
if(mLowerLimit > upperLimit) {
254-
Log.w("Invalid configuration", "reverting upper limit to equal to lower limit");
254+
if (mLowerLimit > upperLimit) {
255+
Log.d("Invalid configuration", "upperLimit < lowerLimit; upperLimit not set");
256+
} else {
257+
mUpperLimit = upperLimit;
255258
}
256-
mUpperLimit = Math.max(upperLimit, mLowerLimit);
257259
}
258260

259261
/** Update value only (optimization in case only value is set). */

package/ios/RNCSliderManager.m

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -162,21 +162,19 @@ - (void)sliderTouchEnd:(RNCSlider *)sender
162162
float lowerLimit = [RCTConvert float:json];
163163

164164
if (lowerLimit > view.upperLimit) {
165-
lowerLimit = view.upperLimit;
166-
NSLog(@"Invalid configuration: reverting upper limit to equal to lower limit")
167-
}
168-
169-
view.lowerLimit = lowerLimit;
165+
NSLog(@"Invalid configuration: upperLimit < lowerLimit; lowerLimit not set")
166+
} else {
167+
view.lowerLimit = lowerLimit;
168+
}
170169
}
171170
RCT_CUSTOM_VIEW_PROPERTY(upperLimit, float, RNCSlider) {
172171
float upperLimit = [RCTConvert float:json];
173172

174173
if (upperLimit < view.lowerLimit) {
175-
upperLimit = view.lowerLimit;
176-
NSLog(@"Invalid configuration: reverting lower limit to equal to upper limit")
177-
}
178-
179-
view.upperLimit = upperLimit;
174+
NSLog(@"Invalid configuration: upperLimit < lowerLimit; upperLimit not set")
175+
} else {
176+
view.upperLimit = upperLimit;
177+
}
180178
}
181179
RCT_EXPORT_VIEW_PROPERTY(minimumTrackTintColor, UIColor);
182180
RCT_EXPORT_VIEW_PROPERTY(maximumTrackTintColor, UIColor);

package/src/Slider.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, {useCallback, useEffect, useState} from 'react';
1+
import React, {useEffect, useState} from 'react';
22
import {
33
Image,
44
Platform,
@@ -281,18 +281,14 @@ const SliderComponent = (
281281
default: constants.LIMIT_MAX_VALUE,
282282
});
283283

284-
const limitCheck = useCallback(() => {
284+
useEffect(() => {
285285
if (lowerLimit >= upperLimit) {
286286
console.warn(
287287
'Invalid configuration: lower limit is supposed to me smaller than upper limit',
288288
);
289289
}
290290
}, [lowerLimit, upperLimit]);
291291

292-
useEffect(() => {
293-
limitCheck();
294-
}, [limitCheck, localProps]);
295-
296292
return (
297293
<View
298294
onLayout={(event) => {

0 commit comments

Comments
 (0)