From 90a0d257a056593ee0a42ad2d8e79c7f2596d52e Mon Sep 17 00:00:00 2001 From: Denis Slavik Date: Fri, 28 Oct 2022 16:50:47 +0200 Subject: [PATCH 1/5] fix: remove redundant enabled property --- README.md | 4 ++-- example/src/Examples.tsx | 1 - .../slider/ReactSliderManagerImpl.java | 4 ++-- .../reactnativecommunity/slider/ReactSliderManager.java | 6 +++--- .../reactnativecommunity/slider/ReactSliderManager.java | 6 +++--- package/src/RNCSliderNativeComponent.ts | 1 - package/src/RNCSliderNativeComponent.web.tsx | 8 ++++---- package/src/Slider.tsx | 1 - package/src/__tests__/__snapshots__/Slider.test.tsx.snap | 6 ------ 9 files changed, 14 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index d139c34b..e8cfa69b 100644 --- a/README.md +++ b/README.md @@ -146,11 +146,11 @@ You can also do this manually by: In order to use the new architecture some extra steps are needed. #### iOS - Install pods with new arch flag inside `example/ios` folder: `RCT_NEW_ARCH_ENABLED=1 pod install` -- Run `npm run example-ios` +- Run `npm run ios` in `example/ios` folder #### Android - Set `newArchEnabled` to true inside `example/android/gradle.properties` -- Run `npm run example-android` +- Run `npm run example-android` (first run might fail, try to run it again)
diff --git a/example/src/Examples.tsx b/example/src/Examples.tsx index cd955552..6a02f786 100644 --- a/example/src/Examples.tsx +++ b/example/src/Examples.tsx @@ -182,7 +182,6 @@ export const examples = [ }, { title: 'Disabled slider', - platform: 'android', render() { return ; }, diff --git a/package/android/src/main/java/com/reactnativecommunity/slider/ReactSliderManagerImpl.java b/package/android/src/main/java/com/reactnativecommunity/slider/ReactSliderManagerImpl.java index f59e9bb2..f07beb5d 100644 --- a/package/android/src/main/java/com/reactnativecommunity/slider/ReactSliderManagerImpl.java +++ b/package/android/src/main/java/com/reactnativecommunity/slider/ReactSliderManagerImpl.java @@ -56,8 +56,8 @@ public static void setStep(ReactSlider view, float value) { view.setStep(value); } - public static void setEnabled(ReactSlider view, boolean enabled) { - view.setEnabled(enabled); + public static void setDisabled(ReactSlider view, boolean disabled) { + view.setEnabled(!disabled); } public static void setThumbTintColor(ReactSlider view, Integer color) { diff --git a/package/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java b/package/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java index e82cd08e..d49fefbf 100644 --- a/package/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java +++ b/package/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java @@ -89,9 +89,9 @@ protected ReactSlider createViewInstance(ThemedReactContext context) { } @Override - @ReactProp(name = ViewProps.ENABLED, defaultBoolean = true) - public void setEnabled(ReactSlider view, boolean enabled) { - ReactSliderManagerImpl.setEnabled(view, enabled); + @ReactProp(name = "disabled", defaultBoolean = false) + public void setDisabled(ReactSlider view, boolean disabled) { + ReactSliderManagerImpl.setDisabled(view, disabled); } @Override 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 83c4a5ff..af1ed1e0 100644 --- a/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java +++ b/package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java @@ -116,9 +116,9 @@ protected ReactSlider createViewInstance(ThemedReactContext context) { return ReactSliderManagerImpl.createViewInstance(context); } - @ReactProp(name = ViewProps.ENABLED, defaultBoolean = true) - public void setEnabled(ReactSlider view, boolean enabled) { - ReactSliderManagerImpl.setEnabled(view, enabled); + @ReactProp(name = "disabled", defaultBoolean = false) + public void setDisabled(ReactSlider view, boolean disabled) { + ReactSliderManagerImpl.setDisabled(view, disabled); } @ReactProp(name = "value", defaultFloat = 0f) diff --git a/package/src/RNCSliderNativeComponent.ts b/package/src/RNCSliderNativeComponent.ts index 3d3e28a1..5708106c 100644 --- a/package/src/RNCSliderNativeComponent.ts +++ b/package/src/RNCSliderNativeComponent.ts @@ -18,7 +18,6 @@ export interface NativeProps extends ViewProps { accessibilityUnits?: string; accessibilityIncrements?: ReadonlyArray; disabled?: WithDefault; - enabled?: WithDefault; inverted?: WithDefault; vertical?: WithDefault; tapToSeek?: WithDefault; diff --git a/package/src/RNCSliderNativeComponent.web.tsx b/package/src/RNCSliderNativeComponent.web.tsx index fbf21400..4d877937 100644 --- a/package/src/RNCSliderNativeComponent.web.tsx +++ b/package/src/RNCSliderNativeComponent.web.tsx @@ -32,7 +32,7 @@ export interface Props { thumbStyle: ViewStyle; style: ViewStyle; inverted: boolean; - enabled: boolean; + disabled: boolean; trackHeight: number; thumbSize: number; onRNCSliderSlidingStart: (value: number) => void; @@ -53,7 +53,7 @@ const RCTSliderWebComponent = React.forwardRef( thumbStyle = {}, style = {}, inverted = false, - enabled = true, + disabled = false, trackHeight = 4, thumbSize = 20, onRNCSliderSlidingStart = (_: number) => {}, @@ -273,8 +273,8 @@ const RCTSliderWebComponent = React.forwardRef( accessible={true} accessibilityRole={'adjustable'} style={containerStyle} - onStartShouldSetResponder={() => enabled} - onMoveShouldSetResponder={() => enabled} + onStartShouldSetResponder={() => !disabled} + onMoveShouldSetResponder={() => !disabled} onResponderGrant={() => onSlidingStart(value)} onResponderRelease={onTouchEnd} onResponderMove={onMove} diff --git a/package/src/Slider.tsx b/package/src/Slider.tsx index 66b63c1d..e3039b9b 100644 --- a/package/src/Slider.tsx +++ b/package/src/Slider.tsx @@ -238,7 +238,6 @@ const SliderComponent = ( onRNCSliderSlidingStart={onSlidingStartEvent} onRNCSliderSlidingComplete={onSlidingCompleteEvent} onRNCSliderValueChange={onValueChangeEvent} - enabled={!_disabled} disabled={_disabled} onStartShouldSetResponder={() => true} onResponderTerminationRequest={() => false} diff --git a/package/src/__tests__/__snapshots__/Slider.test.tsx.snap b/package/src/__tests__/__snapshots__/Slider.test.tsx.snap index 4c0c44b8..aec986b4 100644 --- a/package/src/__tests__/__snapshots__/Slider.test.tsx.snap +++ b/package/src/__tests__/__snapshots__/Slider.test.tsx.snap @@ -8,7 +8,6 @@ exports[` accessibilityState disabled sets disabled={true} 1`] = ` } } disabled={true} - enabled={false} inverted={false} maximumValue={1} minimumValue={0} @@ -38,7 +37,6 @@ exports[` disabled prop overrides accessibilityState.disabled 1`] = ` } } disabled={true} - enabled={false} inverted={false} maximumValue={1} minimumValue={0} @@ -68,7 +66,6 @@ exports[` disabled prop overrides accessibilityState.enabled 1`] = ` } } disabled={false} - enabled={true} inverted={false} maximumValue={1} minimumValue={0} @@ -93,7 +90,6 @@ exports[` disabled prop overrides accessibilityState.enabled 1`] = ` exports[` renders a slider with custom props 1`] = ` renders disabled slider 1`] = ` } } disabled={true} - enabled={false} inverted={false} maximumValue={1} minimumValue={0} @@ -151,7 +146,6 @@ exports[` renders disabled slider 1`] = ` exports[` renders enabled slider 1`] = ` Date: Fri, 28 Oct 2022 16:54:22 +0200 Subject: [PATCH 2/5] chore: README styling for run example note --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e8cfa69b..c0346594 100644 --- a/README.md +++ b/README.md @@ -150,7 +150,7 @@ In order to use the new architecture some extra steps are needed. #### Android - Set `newArchEnabled` to true inside `example/android/gradle.properties` -- Run `npm run example-android` (first run might fail, try to run it again) +- Run `npm run example-android` _(first run might fail, try to run it again)_
From e41c93cc829e4b09fc52e2c425ba167dfd3b0035 Mon Sep 17 00:00:00 2001 From: Denis Slavik Date: Fri, 28 Oct 2022 17:00:53 +0200 Subject: [PATCH 3/5] fix: [android-newarch] duplicate "setDisabled" method --- .../com/reactnativecommunity/slider/ReactSliderManager.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java b/package/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java index d49fefbf..ff522858 100644 --- a/package/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java +++ b/package/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java @@ -176,10 +176,6 @@ public Map getExportedCustomDirectEventTypeConstants() { } // these props are not available on Android, however we must override their setters - @Override - @ReactProp(name = "disabled") - public void setDisabled(ReactSlider view, boolean disabled) {} - @Override public void setMinimumTrackImage(ReactSlider view, @Nullable ReadableMap readableMap) {} From 8303f8af7a29b4ba8b48d85d622c4a91f6f86e8b Mon Sep 17 00:00:00 2001 From: Denis Slavik Date: Fri, 28 Oct 2022 23:35:43 +0200 Subject: [PATCH 4/5] fix: remove unnecessary comment --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c0346594..fd1ee1f9 100644 --- a/README.md +++ b/README.md @@ -150,7 +150,7 @@ In order to use the new architecture some extra steps are needed. #### Android - Set `newArchEnabled` to true inside `example/android/gradle.properties` -- Run `npm run example-android` _(first run might fail, try to run it again)_ +- Run `npm run example-android`
From 5a9aa66b9b256ca2f2e5a1963bcfdce71172eb0f Mon Sep 17 00:00:00 2001 From: Denis Slavik Date: Mon, 7 Nov 2022 18:52:02 +0100 Subject: [PATCH 5/5] chore: revert changes for README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fd1ee1f9..d139c34b 100644 --- a/README.md +++ b/README.md @@ -146,7 +146,7 @@ You can also do this manually by: In order to use the new architecture some extra steps are needed. #### iOS - Install pods with new arch flag inside `example/ios` folder: `RCT_NEW_ARCH_ENABLED=1 pod install` -- Run `npm run ios` in `example/ios` folder +- Run `npm run example-ios` #### Android - Set `newArchEnabled` to true inside `example/android/gradle.properties`