fix: add refreshThumb to refresh every time thumbSize, thumbImage or thumbImage change. Remove comments via fb

Author: bdtren

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

@@ -313,19 +313,19 @@ public BitmapDrawable call() {
 
   public void setThumbImage(@Nullable final String uri) {
     mThumbImageUri = uri;
-    updateThumbImage();
+    refreshThumb();
   }
 
   public void setThumbSize(final double size) {
     float density = getResources().getDisplayMetrics().density;
     mThumbSizePx = size > 0 ? Math.round((float) size * density) : 0;
-    updateThumbImage();
+    refreshThumb();
   }
 
   public void setThumbTintColor(@Nullable final Integer color) {
     mThumbTintColor = color;
     if (mThumbImageUri != null || mThumbSizePx > 0) {
-      updateThumbImage();
+      refreshThumb();
     } else {
       applyThumbTintColorFilter();
     }
@@ -343,7 +343,7 @@ private void applyThumbTintColorFilter() {
     }
   }
 
-  private void updateThumbImage() {
+  private void refreshThumb() {
     if (mThumbImageUri != null) {
       BitmapDrawable drawable = getBitmapDrawable(mThumbImageUri);
       if (drawable != null) {

package/ios/RNCSlider.h

@@ -26,6 +26,6 @@
 
 - (float) discreteValue:(float)value;
 - (void) setDisabled:(bool)disabled;
-- (void) updateThumbImage;
+- (void) refreshThumb;
 
 @end

package/ios/RNCSlider.m

@@ -7,6 +7,7 @@ @implementation RNCSlider
   bool _maximumTrackImageSet;
   UIImage *_thumbImage;
   CGFloat _thumbSize;
+  UIColor *_thumbTintColor;
 }
 
 - (instancetype)init {
@@ -119,7 +120,7 @@ - (UIImage *)maximumTrackImage
 - (void)setThumbImage:(UIImage *)thumbImage
 {
   _thumbImage = thumbImage;
-  [self updateThumbImage];
+  [self refreshThumb];
 }
 
 - (UIImage *)thumbImage
@@ -130,11 +131,26 @@ - (UIImage *)thumbImage
 - (void)setThumbSize:(CGFloat)thumbSize
 {
   _thumbSize = thumbSize;
-  [self updateThumbImage];
+  [self refreshThumb];
 }
 
-- (void)updateThumbImage
+- (void)setThumbTintColor:(UIColor *)thumbTintColor
 {
+  _thumbTintColor = thumbTintColor;
+  [super setThumbTintColor:thumbTintColor];
+
+  [self refreshThumb];
+}
+
+- (void)refreshThumb
+{
+  if (![NSThread isMainThread]) {
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [self refreshThumb];
+    });
+    return;
+  }
+
   UIImage *imageToSet = nil;
 
   if (_thumbSize > 0) {
@@ -145,7 +161,7 @@ - (void)updateThumbImage
     if (_thumbImage) {
       [_thumbImage drawInRect:CGRectMake(0, 0, newSize.width, newSize.height)];
     } else {
-      UIColor *fillColor = self.thumbTintColor ?: [UIColor whiteColor];
+      UIColor *fillColor = _thumbTintColor ?: self.thumbTintColor ?: [UIColor whiteColor];
       CGContextSetFillColorWithColor(context, fillColor.CGColor);
       CGContextFillEllipseInRect(context, CGRectMake(0, 0, newSize.width, newSize.height));
 
@@ -167,6 +183,34 @@ - (void)updateThumbImage
     [self setThumbImage:imageToSet forState:UIControlStateHighlighted];
     [self setThumbImage:imageToSet forState:UIControlStateSelected];
   }
+
+  [UIView performWithoutAnimation:^{
+    float currentValue = super.value;
+    float minimumValue = super.minimumValue;
+    float maximumValue = super.maximumValue;
+
+    float eps = (maximumValue - minimumValue) / 1000.0f;
+    if (eps <= 0) {
+      eps = 0.0001f;
+    }
+
+    float nudgedValue = currentValue + eps;
+    if (nudgedValue > maximumValue) {
+      nudgedValue = currentValue - eps;
+    }
+    if (nudgedValue < minimumValue) {
+      nudgedValue = minimumValue;
+    }
+
+    if (nudgedValue != currentValue) {
+      [super setValue:nudgedValue animated:NO];
+    }
+    [super setValue:currentValue animated:NO];
+
+    [self setNeedsLayout];
+    [self layoutSubviews];
+    [self layoutIfNeeded];
+  }];
 }
 
 - (void)setInverted:(BOOL)inverted

package/ios/RNCSliderComponentView.mm

@@ -239,9 +239,6 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
             [self->slider setThumbImage:nil];
         }];
     }
-    if (oldScreenProps.thumbTintColor != newScreenProps.thumbTintColor && slider.thumbSize > 0) {
-        [slider updateThumbImage];
-    }
     if (oldScreenProps.trackImage != newScreenProps.trackImage) {
         [self loadImageFromImageSource:newScreenProps.trackImage completionBlock:^(NSError *error, UIImage *image) {
             dispatch_async(dispatch_get_main_queue(), ^{

package/src/RNCSliderNativeComponent.ts

@@ -34,10 +34,6 @@ export interface NativeProps extends ViewProps {
   testID?: string;
   thumbImage?: ImageSource;
   thumbTintColor?: ColorValue;
-  /**
-   * Sets the size (width and height) of the thumb, in points (dp on Android).
-   * If you also set `thumbImage`, the image will be scaled to this size.
-   */
   thumbSize?: Double;
   trackImage?: ImageSource;
   value?: Float;

package/src/Slider.tsx

@@ -346,7 +346,6 @@ const SliderComponent = (
             ? 'transparent'
             : props.thumbTintColor
         }
-        thumbSize={props.thumbSize}
       />
     </View>
   );

package/typings/index.d.ts

@@ -60,12 +60,6 @@ export interface SliderPropsIOS extends ReactNative.ViewProps {
    */
   thumbImage?: ReactNative.ImageURISource;
 
-  /**
-   * Sets the size (width and height) of the thumb.
-   * If `thumbImage` is provided, it will be scaled to this size.
-   */
-  thumbSize?: number;
-
   /**
    * Assigns a single image for the track. Only static images
    * are supported. The center pixel of the image will be stretched