Skip to content

Commit 845d7ba

Browse files
authored
Fix styles order (#702)
* fix(Slider): change order styles are applied * test(Slider): update snapshots
1 parent 6d7c286 commit 845d7ba

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

package/src/Slider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ const SliderComponent = (
233233
const defaultStyle =
234234
Platform.OS === 'ios' ? styles.defaultSlideriOS : styles.defaultSlider;
235235
const sliderStyle = {zIndex: 1, width: width};
236-
const style = [props.style, defaultStyle];
236+
const style = [defaultStyle, props.style];
237237

238238
const onValueChangeEvent = (event: Event) => {
239239
onValueChange && onValueChange(event.nativeEvent.value);

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ exports[`<Slider /> accessibilityState disabled sets disabled={true} 1`] = `
66
style={
77
[
88
[
9-
undefined,
109
{
1110
"height": 40,
1211
},
12+
undefined,
1313
],
1414
{
1515
"justifyContent": "center",
@@ -63,10 +63,10 @@ exports[`<Slider /> disabled prop overrides accessibilityState.disabled 1`] = `
6363
style={
6464
[
6565
[
66-
undefined,
6766
{
6867
"height": 40,
6968
},
69+
undefined,
7070
],
7171
{
7272
"justifyContent": "center",
@@ -120,10 +120,10 @@ exports[`<Slider /> disabled prop overrides accessibilityState.enabled 1`] = `
120120
style={
121121
[
122122
[
123-
undefined,
124123
{
125124
"height": 40,
126125
},
126+
undefined,
127127
],
128128
{
129129
"justifyContent": "center",
@@ -177,10 +177,10 @@ exports[`<Slider /> renders a slider with custom props 1`] = `
177177
style={
178178
[
179179
[
180-
undefined,
181180
{
182181
"height": 40,
183182
},
183+
undefined,
184184
],
185185
{
186186
"justifyContent": "center",
@@ -233,10 +233,10 @@ exports[`<Slider /> renders a slider with custom stepMaker 1`] = `
233233
style={
234234
[
235235
[
236-
undefined,
237236
{
238237
"height": 40,
239238
},
239+
undefined,
240240
],
241241
{
242242
"justifyContent": "center",
@@ -32337,10 +32337,10 @@ exports[`<Slider /> renders disabled slider 1`] = `
3233732337
style={
3233832338
[
3233932339
[
32340-
undefined,
3234132340
{
3234232341
"height": 40,
3234332342
},
32343+
undefined,
3234432344
],
3234532345
{
3234632346
"justifyContent": "center",
@@ -32394,10 +32394,10 @@ exports[`<Slider /> renders enabled slider 1`] = `
3239432394
style={
3239532395
[
3239632396
[
32397-
undefined,
3239832397
{
3239932398
"height": 40,
3240032399
},
32400+
undefined,
3240132401
],
3240232402
{
3240332403
"justifyContent": "center",

0 commit comments

Comments
 (0)