Skip to content

Commit 2786464

Browse files
author
maciej.lodygowski
committed
fix: pr improvements
1 parent ffe8596 commit 2786464

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

package/ios/RNCSliderComponentView.mm

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,20 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
176176
if (oldScreenProps.maximumValue != newScreenProps.maximumValue) {
177177
[slider setMaximumValue:newScreenProps.maximumValue];
178178
}
179-
updateLimits(slider, newScreenProps.lowerLimit, newScreenProps.upperLimit);
179+
if (slider.lowerLimit != newScreenProps.lowerLimit) {
180+
if(newScreenProps.lowerLimit > slider.upperLimit){
181+
NSLog(@"Invalid configuration: upperLimit < lowerLimit; lowerLimit not set");
182+
} else {
183+
slider.lowerLimit = newScreenProps.lowerLimit;
184+
}
185+
}
186+
if (slider.upperLimit != newScreenProps.upperLimit) {
187+
if(newScreenProps.upperLimit < slider.lowerLimit){
188+
NSLog(@"Invalid configuration: upperLimit < lowerLimit; upperLimit not set");
189+
} else {
190+
slider.upperLimit = newScreenProps.upperLimit;
191+
}
192+
}
180193
if (oldScreenProps.tapToSeek != newScreenProps.tapToSeek) {
181194
slider.tapToSeek = newScreenProps.tapToSeek;
182195
}
@@ -267,21 +280,6 @@ - (void)loadImageFromImageSource:(ImageSource)source completionBlock:(RNCLoadIma
267280
}
268281
}
269282

270-
void updateLimits(RNCSlider *slider, float newLowerLimit, float newUpperLimit) {
271-
if (slider.lowerLimit != newLowerLimit) {
272-
slider.lowerLimit = newLowerLimit;
273-
}
274-
275-
if (slider.upperLimit != newUpperLimit) {
276-
slider.upperLimit = newUpperLimit;
277-
}
278-
279-
if (slider.lowerLimit > slider.upperLimit) {
280-
NSLog(@"Invalid configuration: lowerLimit > upperLimit, reverting lowerLimit to upperLimit.");
281-
slider.lowerLimit = slider.upperLimit;
282-
}
283-
}
284-
285283
- (void)setInverted:(BOOL)inverted
286284
{
287285
if (inverted) {

package/ios/RNCSliderManager.m

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

164164
if (lowerLimit > view.upperLimit) {
165-
NSLog(@"Invalid configuration: upperLimit < lowerLimit; lowerLimit not set")
165+
NSLog(@"Invalid configuration: upperLimit < lowerLimit; lowerLimit not set");
166166
} else {
167167
view.lowerLimit = lowerLimit;
168168
}
@@ -171,7 +171,7 @@ - (void)sliderTouchEnd:(RNCSlider *)sender
171171
float upperLimit = [RCTConvert float:json];
172172

173173
if (upperLimit < view.lowerLimit) {
174-
NSLog(@"Invalid configuration: upperLimit < lowerLimit; upperLimit not set")
174+
NSLog(@"Invalid configuration: upperLimit < lowerLimit; upperLimit not set");
175175
} else {
176176
view.upperLimit = upperLimit;
177177
}

0 commit comments

Comments
 (0)