Skip to content

fix: remove redundant "enabled" property #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 7, 2022
Merged

fix: remove redundant "enabled" property #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
90a0d25
fix: remove redundant enabled property
slavikdenis Oct 28, 2022
a6e7955
chore: README styling for run example note
slavikdenis Oct 28, 2022
e41c93c
fix: [android-newarch] duplicate "setDisabled" method
slavikdenis Oct 28, 2022
8303f8a
fix: remove unnecessary comment
slavikdenis Oct 28, 2022
5a9aa66
chore: revert changes for README
slavikdenis Nov 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion example/src/Examples.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ export const examples = [
},
{
title: 'Disabled slider',
platform: 'android',
render() {
return <SliderExample disabled value={0.6} />;
},
Expand Down
4 changes: 2 additions & 2 deletions package/android/src/main/java/com/reactnativecommunity/slider/ReactSliderManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 3 additions & 7 deletions package/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) {}

Expand Down
6 changes: 3 additions & 3 deletions package/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion package/src/RNCSliderNativeComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export interface NativeProps extends ViewProps {
accessibilityUnits?: string;
accessibilityIncrements?: ReadonlyArray<string>;
disabled?: WithDefault<boolean, false>;
enabled?: WithDefault<boolean, true>;
inverted?: WithDefault<boolean, false>;
vertical?: WithDefault<boolean, false>;
tapToSeek?: WithDefault<boolean, false>;
Expand Down
8 changes: 4 additions & 4 deletions package/src/RNCSliderNativeComponent.web.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -53,7 +53,7 @@ const RCTSliderWebComponent = React.forwardRef(
thumbStyle = {},
style = {},
inverted = false,
enabled = true,
disabled = false,
trackHeight = 4,
thumbSize = 20,
onRNCSliderSlidingStart = (_: number) => {},
Expand Down Expand Up @@ -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}
Expand Down
1 change: 0 additions & 1 deletion package/src/Slider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ const SliderComponent = (
onRNCSliderSlidingStart={onSlidingStartEvent}
onRNCSliderSlidingComplete={onSlidingCompleteEvent}
onRNCSliderValueChange={onValueChangeEvent}
enabled={!_disabled}
disabled={_disabled}
onStartShouldSetResponder={() => true}
onResponderTerminationRequest={() => false}
Expand Down
6 changes: 0 additions & 6 deletions package/src/__tests__/__snapshots__/Slider.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ exports[`<Slider /> accessibilityState disabled sets disabled={true} 1`] = `
}
}
disabled={true}
enabled={false}
inverted={false}
maximumValue={1}
minimumValue={0}
Expand Down Expand Up @@ -38,7 +37,6 @@ exports[`<Slider /> disabled prop overrides accessibilityState.disabled 1`] = `
}
}
disabled={true}
enabled={false}
inverted={false}
maximumValue={1}
minimumValue={0}
Expand Down Expand Up @@ -68,7 +66,6 @@ exports[`<Slider /> disabled prop overrides accessibilityState.enabled 1`] = `
}
}
disabled={false}
enabled={true}
inverted={false}
maximumValue={1}
minimumValue={0}
Expand All @@ -93,7 +90,6 @@ exports[`<Slider /> disabled prop overrides accessibilityState.enabled 1`] = `
exports[`<Slider /> renders a slider with custom props 1`] = `
<RNCSlider
disabled={false}
enabled={true}
inverted={false}
maximumTrackTintColor="red"
maximumValue={2}
Expand Down Expand Up @@ -126,7 +122,6 @@ exports[`<Slider /> renders disabled slider 1`] = `
}
}
disabled={true}
enabled={false}
inverted={false}
maximumValue={1}
minimumValue={0}
Expand All @@ -151,7 +146,6 @@ exports[`<Slider /> renders disabled slider 1`] = `
exports[`<Slider /> renders enabled slider 1`] = `
<RNCSlider
disabled={false}
enabled={true}
inverted={false}
maximumValue={1}
minimumValue={0}
Expand Down