From 2688892b4bfc5ae05fba2007ac522d69b5a0bfea Mon Sep 17 00:00:00 2001 From: "maciej.lodygowski" Date: Mon, 7 Oct 2024 15:37:05 +0200 Subject: [PATCH 1/6] fix: new arch android interface --- example/package.json | 2 +- .../reactnativecommunity/slider/ReactSliderManager.java | 8 ++++---- package/src/RNCSliderNativeComponent.ts | 7 ++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/example/package.json b/example/package.json index 19adefc5..c87fecfa 100644 --- a/example/package.json +++ b/example/package.json @@ -19,7 +19,7 @@ "babel-preset-expo": "^9.2.0", "react": "18.2.0", "react-native": "0.73.5", - "react-native-pager-view": "^6.2.3", + "react-native-pager-view": "^6.4.1", "react-native-windows": "0.73.11" }, "devDependencies": { diff --git a/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java b/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java index 9be02a44..0240b725 100644 --- a/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java +++ b/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java @@ -125,12 +125,12 @@ public void setValue(ReactSlider view, float value) { ReactSliderManagerImpl.setValue(view, value); } - @ReactProp(name = "minimumValue", defaultFloat = 0f) + @ReactProp(name = "minimumValue", defaultDouble = 0f) public void setMinimumValue(ReactSlider view, double value) { ReactSliderManagerImpl.setMinimumValue(view, value); } - @ReactProp(name = "maximumValue", defaultFloat = 1f) + @ReactProp(name = "maximumValue", defaultDouble = 1f) public void setMaximumValue(ReactSlider view, double value) { ReactSliderManagerImpl.setMaximumValue(view, value); } @@ -145,8 +145,8 @@ public void setUpperLimit(ReactSlider view, float value) { ReactSliderManagerImpl.setUpperLimit(view, value); } - @ReactProp(name = "step", defaultFloat = 0f) - public void setStep(ReactSlider view, float value) { + @ReactProp(name = "step", defaultDouble = 0f) + public void setStep(ReactSlider view, double value) { ReactSliderManagerImpl.setStep(view, value); } diff --git a/package/src/RNCSliderNativeComponent.ts b/package/src/RNCSliderNativeComponent.ts index cab4abfb..c63f8d5e 100644 --- a/package/src/RNCSliderNativeComponent.ts +++ b/package/src/RNCSliderNativeComponent.ts @@ -7,6 +7,7 @@ import type { WithDefault, DirectEventHandler, BubblingEventHandler, + Double, } from 'react-native/Libraries/Types/CodegenTypes'; type Event = Readonly<{ @@ -23,15 +24,15 @@ export interface NativeProps extends ViewProps { tapToSeek?: WithDefault; maximumTrackImage?: ImageSource; maximumTrackTintColor?: ColorValue; - maximumValue?: Float; + maximumValue?: Double; minimumTrackImage?: ImageSource; minimumTrackTintColor?: ColorValue; - minimumValue?: Float; + minimumValue?: Double; onChange?: BubblingEventHandler; onRNCSliderSlidingStart?: DirectEventHandler; onRNCSliderSlidingComplete?: DirectEventHandler; onRNCSliderValueChange?: BubblingEventHandler; - step?: Float; + step?: Double; testID?: string; thumbImage?: ImageSource; thumbTintColor?: ColorValue; From 699e74887a5841e25dd76a46dcff6b6d1d9f9909 Mon Sep 17 00:00:00 2001 From: "maciej.lodygowski" Date: Tue, 8 Oct 2024 09:17:28 +0200 Subject: [PATCH 2/6] fix: height on android --- package/src/Slider.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/src/Slider.tsx b/package/src/Slider.tsx index 45983ec4..f164b00a 100644 --- a/package/src/Slider.tsx +++ b/package/src/Slider.tsx @@ -232,7 +232,7 @@ const SliderComponent = ( const defaultStyle = Platform.OS === 'ios' ? styles.defaultSlideriOS : styles.defaultSlider; - const sliderStyle = {zIndex: 1, width: width}; + const sliderStyle = {zIndex: 1, width: width, height: 1}; const style = [props.style, defaultStyle]; const onValueChangeEvent = (event: Event) => { From a9567cd894974d4a7364746583e3355b6084ca86 Mon Sep 17 00:00:00 2001 From: "maciej.lodygowski" Date: Tue, 8 Oct 2024 09:32:23 +0200 Subject: [PATCH 3/6] revert: fix android --- package/src/Slider.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/src/Slider.tsx b/package/src/Slider.tsx index f164b00a..45983ec4 100644 --- a/package/src/Slider.tsx +++ b/package/src/Slider.tsx @@ -232,7 +232,7 @@ const SliderComponent = ( const defaultStyle = Platform.OS === 'ios' ? styles.defaultSlideriOS : styles.defaultSlider; - const sliderStyle = {zIndex: 1, width: width, height: 1}; + const sliderStyle = {zIndex: 1, width: width}; const style = [props.style, defaultStyle]; const onValueChangeEvent = (event: Event) => { From 5a5c829e0406159da77c4851ce7d50c82068e0da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=81odygowski?= Date: Thu, 10 Oct 2024 08:44:14 +0200 Subject: [PATCH 4/6] Update package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java Co-authored-by: Vojtech Novak --- .../com/reactnativecommunity/slider/ReactSliderManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java b/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java index 0240b725..b52b875c 100644 --- a/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java +++ b/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java @@ -125,7 +125,7 @@ public void setValue(ReactSlider view, float value) { ReactSliderManagerImpl.setValue(view, value); } - @ReactProp(name = "minimumValue", defaultDouble = 0f) + @ReactProp(name = "minimumValue", defaultDouble = 0d) public void setMinimumValue(ReactSlider view, double value) { ReactSliderManagerImpl.setMinimumValue(view, value); } From 4b393a72675dce464b0f67ad6dfec94c2935d595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=81odygowski?= Date: Thu, 10 Oct 2024 13:48:46 +0200 Subject: [PATCH 5/6] Update package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java Co-authored-by: Vojtech Novak --- .../com/reactnativecommunity/slider/ReactSliderManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java b/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java index b52b875c..d4a3b5a7 100644 --- a/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java +++ b/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java @@ -130,7 +130,7 @@ public void setMinimumValue(ReactSlider view, double value) { ReactSliderManagerImpl.setMinimumValue(view, value); } - @ReactProp(name = "maximumValue", defaultDouble = 1f) + @ReactProp(name = "maximumValue", defaultDouble = 1d) public void setMaximumValue(ReactSlider view, double value) { ReactSliderManagerImpl.setMaximumValue(view, value); } From a8d8d2132783fa04324b7ea41a9d7a461bf03f47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=81odygowski?= Date: Thu, 10 Oct 2024 13:48:51 +0200 Subject: [PATCH 6/6] Update package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java Co-authored-by: Vojtech Novak --- .../com/reactnativecommunity/slider/ReactSliderManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java b/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java index d4a3b5a7..f964dbac 100644 --- a/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java +++ b/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java @@ -145,7 +145,7 @@ public void setUpperLimit(ReactSlider view, float value) { ReactSliderManagerImpl.setUpperLimit(view, value); } - @ReactProp(name = "step", defaultDouble = 0f) + @ReactProp(name = "step", defaultDouble = 0d) public void setStep(ReactSlider view, double value) { ReactSliderManagerImpl.setStep(view, value); }