Skip to content

Commit 29df609

Browse files
authored
fix: remove redundant "enabled" property (#449)
* fix: remove redundant enabled property * chore: README styling for run example note * fix: [android-newarch] duplicate "setDisabled" method * fix: remove unnecessary comment * chore: revert changes for README
1 parent 3bb27a6 commit 29df609

File tree

8 files changed

+12
-25
lines changed

8 files changed

+12
-25
lines changed

example/src/Examples.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ export const examples = [
182182
},
183183
{
184184
title: 'Disabled slider',
185-
platform: 'android',
186185
render() {
187186
return <SliderExample disabled value={0.6} />;
188187
},

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ public static void setStep(ReactSlider view, float value) {
5656
view.setStep(value);
5757
}
5858

59-
public static void setEnabled(ReactSlider view, boolean enabled) {
60-
view.setEnabled(enabled);
59+
public static void setDisabled(ReactSlider view, boolean disabled) {
60+
view.setEnabled(!disabled);
6161
}
6262

6363
public static void setThumbTintColor(ReactSlider view, Integer color) {

package/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ protected ReactSlider createViewInstance(ThemedReactContext context) {
8989
}
9090

9191
@Override
92-
@ReactProp(name = ViewProps.ENABLED, defaultBoolean = true)
93-
public void setEnabled(ReactSlider view, boolean enabled) {
94-
ReactSliderManagerImpl.setEnabled(view, enabled);
92+
@ReactProp(name = "disabled", defaultBoolean = false)
93+
public void setDisabled(ReactSlider view, boolean disabled) {
94+
ReactSliderManagerImpl.setDisabled(view, disabled);
9595
}
9696

9797
@Override
@@ -176,10 +176,6 @@ public Map getExportedCustomDirectEventTypeConstants() {
176176
}
177177

178178
// these props are not available on Android, however we must override their setters
179-
@Override
180-
@ReactProp(name = "disabled")
181-
public void setDisabled(ReactSlider view, boolean disabled) {}
182-
183179
@Override
184180
public void setMinimumTrackImage(ReactSlider view, @Nullable ReadableMap readableMap) {}
185181

package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ protected ReactSlider createViewInstance(ThemedReactContext context) {
116116
return ReactSliderManagerImpl.createViewInstance(context);
117117
}
118118

119-
@ReactProp(name = ViewProps.ENABLED, defaultBoolean = true)
120-
public void setEnabled(ReactSlider view, boolean enabled) {
121-
ReactSliderManagerImpl.setEnabled(view, enabled);
119+
@ReactProp(name = "disabled", defaultBoolean = false)
120+
public void setDisabled(ReactSlider view, boolean disabled) {
121+
ReactSliderManagerImpl.setDisabled(view, disabled);
122122
}
123123

124124
@ReactProp(name = "value", defaultFloat = 0f)

package/src/RNCSliderNativeComponent.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ export interface NativeProps extends ViewProps {
1818
accessibilityUnits?: string;
1919
accessibilityIncrements?: ReadonlyArray<string>;
2020
disabled?: WithDefault<boolean, false>;
21-
enabled?: WithDefault<boolean, true>;
2221
inverted?: WithDefault<boolean, false>;
2322
vertical?: WithDefault<boolean, false>;
2423
tapToSeek?: WithDefault<boolean, false>;

package/src/RNCSliderNativeComponent.web.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export interface Props {
3232
thumbStyle: ViewStyle;
3333
style: ViewStyle;
3434
inverted: boolean;
35-
enabled: boolean;
35+
disabled: boolean;
3636
trackHeight: number;
3737
thumbSize: number;
3838
onRNCSliderSlidingStart: (value: number) => void;
@@ -53,7 +53,7 @@ const RCTSliderWebComponent = React.forwardRef(
5353
thumbStyle = {},
5454
style = {},
5555
inverted = false,
56-
enabled = true,
56+
disabled = false,
5757
trackHeight = 4,
5858
thumbSize = 20,
5959
onRNCSliderSlidingStart = (_: number) => {},
@@ -273,8 +273,8 @@ const RCTSliderWebComponent = React.forwardRef(
273273
accessible={true}
274274
accessibilityRole={'adjustable'}
275275
style={containerStyle}
276-
onStartShouldSetResponder={() => enabled}
277-
onMoveShouldSetResponder={() => enabled}
276+
onStartShouldSetResponder={() => !disabled}
277+
onMoveShouldSetResponder={() => !disabled}
278278
onResponderGrant={() => onSlidingStart(value)}
279279
onResponderRelease={onTouchEnd}
280280
onResponderMove={onMove}

package/src/Slider.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ const SliderComponent = (
238238
onRNCSliderSlidingStart={onSlidingStartEvent}
239239
onRNCSliderSlidingComplete={onSlidingCompleteEvent}
240240
onRNCSliderValueChange={onValueChangeEvent}
241-
enabled={!_disabled}
242241
disabled={_disabled}
243242
onStartShouldSetResponder={() => true}
244243
onResponderTerminationRequest={() => false}

package/src/__tests__/__snapshots__/Slider.test.tsx.snap

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ exports[`<Slider /> accessibilityState disabled sets disabled={true} 1`] = `
88
}
99
}
1010
disabled={true}
11-
enabled={false}
1211
inverted={false}
1312
maximumValue={1}
1413
minimumValue={0}
@@ -38,7 +37,6 @@ exports[`<Slider /> disabled prop overrides accessibilityState.disabled 1`] = `
3837
}
3938
}
4039
disabled={true}
41-
enabled={false}
4240
inverted={false}
4341
maximumValue={1}
4442
minimumValue={0}
@@ -68,7 +66,6 @@ exports[`<Slider /> disabled prop overrides accessibilityState.enabled 1`] = `
6866
}
6967
}
7068
disabled={false}
71-
enabled={true}
7269
inverted={false}
7370
maximumValue={1}
7471
minimumValue={0}
@@ -93,7 +90,6 @@ exports[`<Slider /> disabled prop overrides accessibilityState.enabled 1`] = `
9390
exports[`<Slider /> renders a slider with custom props 1`] = `
9491
<RNCSlider
9592
disabled={false}
96-
enabled={true}
9793
inverted={false}
9894
maximumTrackTintColor="red"
9995
maximumValue={2}
@@ -126,7 +122,6 @@ exports[`<Slider /> renders disabled slider 1`] = `
126122
}
127123
}
128124
disabled={true}
129-
enabled={false}
130125
inverted={false}
131126
maximumValue={1}
132127
minimumValue={0}
@@ -151,7 +146,6 @@ exports[`<Slider /> renders disabled slider 1`] = `
151146
exports[`<Slider /> renders enabled slider 1`] = `
152147
<RNCSlider
153148
disabled={false}
154-
enabled={true}
155149
inverted={false}
156150
maximumValue={1}
157151
minimumValue={0}

0 commit comments

Comments
 (0)