Skip to content

Commit c275269

Browse files
committed
fix(slider-native): address styling override issue
fix(range-slider-native): address styling override issue
1 parent c466861 commit c275269

4 files changed

Lines changed: 24 additions & 32 deletions

File tree

packages/pluggableWidgets/range-slider-native/src/RangeSlider.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ export function RangeSlider(props: Props): ReactElement {
6565
step={validProps ? toNumber(props.stepSize) ?? 1 : 1}
6666
disabled={!isEnabled}
6767
trackStyle={isEnabled ? styles.track : styles.trackDisabled}
68-
minimumTrackStyle={isEnabled ? styles.minimumTrack : styles.minimumTrackDisabled}
69-
maximumTrackStyle={isEnabled ? styles.maximumTrack : styles.maximumTrackDisabled}
70-
thumbStyle={isEnabled ? styles.thumb : styles.thumbDisabled}
68+
minimumTrackStyle={isEnabled ? styles.highlight : styles.highlightDisabled}
69+
maximumTrackStyle={isEnabled ? styles.track : styles.tracktDisabled}
70+
thumbStyle={isEnabled ? styles.marker : styles.markerDisabled}
7171
onValueChange={onValueChange}
7272
onSlidingComplete={onSlidingComplete}
7373
/>

packages/pluggableWidgets/range-slider-native/src/ui/Styles.ts

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ export interface RangeSliderStyle extends Style {
55
container: ViewStyle;
66
track: ViewStyle;
77
trackDisabled: ViewStyle;
8-
minimumTrack: ViewStyle;
9-
minimumTrackDisabled: ViewStyle;
10-
maximumTrack: ViewStyle;
11-
maximumTrackDisabled: ViewStyle;
12-
thumb: ViewStyle;
13-
thumbActive: ViewStyle;
14-
thumbDisabled: ViewStyle;
8+
highlight: ViewStyle;
9+
highlightDisabled: ViewStyle;
10+
marker: ViewStyle;
11+
markerActive: ViewStyle;
12+
markerDisabled: ViewStyle;
1513
validationMessage: TextStyle;
1614
}
1715

@@ -40,12 +38,10 @@ export const defaultRangeSliderStyle: RangeSliderStyle = {
4038
container: {},
4139
track: trackBase,
4240
trackDisabled: { ...trackBase, opacity: 0.4 },
43-
minimumTrack: { backgroundColor: blue },
44-
minimumTrackDisabled: { backgroundColor: blue },
45-
maximumTrack: { backgroundColor: "#E7E7E7" },
46-
maximumTrackDisabled: { backgroundColor: "#E7E7E7" },
47-
thumb: thumbBase,
48-
thumbActive: thumbBase,
49-
thumbDisabled: thumbBase,
41+
highlight: { backgroundColor: blue },
42+
highlightDisabled: { backgroundColor: blue },
43+
marker: thumbBase,
44+
markerActive: { ...thumbBase, backgroundColor: blue },
45+
markerDisabled: thumbBase,
5046
validationMessage: { color: "#ed1c24" }
5147
};

packages/pluggableWidgets/slider-native/src/Slider.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ export function Slider(props: Props): ReactElement {
6060
step={validProps ? toNumber(props.stepSize) ?? 1 : 1}
6161
disabled={!editable}
6262
trackStyle={editable ? styles.track : styles.trackDisabled}
63-
minimumTrackStyle={editable ? styles.minimumTrack : styles.minimumTrackDisabled}
64-
maximumTrackStyle={editable ? styles.maximumTrack : styles.maximumTrackDisabled}
65-
thumbStyle={editable ? styles.thumb : styles.thumbDisabled}
63+
minimumTrackStyle={editable ? styles.highlight : styles.highlightDisabled}
64+
maximumTrackStyle={editable ? styles.track : styles.trackDisabled}
65+
thumbStyle={editable ? styles.marker : styles.markerDisabled}
6666
onValueChange={onValueChange}
6767
onSlidingComplete={onSlidingComplete}
6868
/>

packages/pluggableWidgets/slider-native/src/ui/Styles.ts

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ export interface SliderStyle extends Style {
55
container: ViewStyle;
66
track: ViewStyle;
77
trackDisabled: ViewStyle;
8-
minimumTrack: ViewStyle;
9-
minimumTrackDisabled: ViewStyle;
10-
maximumTrack: ViewStyle;
11-
maximumTrackDisabled: ViewStyle;
12-
thumb: ViewStyle;
13-
thumbDisabled: ViewStyle;
8+
highlight: ViewStyle;
9+
highlightDisabled: ViewStyle;
10+
marker: ViewStyle;
11+
markerDisabled: ViewStyle;
1412
validationMessage: TextStyle;
1513
}
1614

@@ -39,11 +37,9 @@ export const defaultSliderStyle: SliderStyle = {
3937
container: {},
4038
track: trackBase,
4139
trackDisabled: { ...trackBase, opacity: 0.4 },
42-
minimumTrack: { backgroundColor: blue },
43-
minimumTrackDisabled: { backgroundColor: blue },
44-
maximumTrack: { backgroundColor: "#E7E7E7" },
45-
maximumTrackDisabled: { backgroundColor: "#E7E7E7" },
46-
thumb: thumbBase,
47-
thumbDisabled: thumbBase,
40+
highlight: { backgroundColor: blue },
41+
highlightDisabled: { backgroundColor: blue },
42+
marker: thumbBase,
43+
markerDisabled: thumbBase,
4844
validationMessage: { color: "#ed1c24" }
4945
};

0 commit comments

Comments
 (0)