Skip to content

Commit d95d28e

Browse files
committed
Fix code style
1 parent 2342d72 commit d95d28e

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

__tests__/resolveConfig.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ test('theme values in the extend section extend the existing theme', () => {
442442
backgroundColors: {
443443
customBackground: '#bada55',
444444
},
445-
}
445+
},
446446
},
447447
}
448448

@@ -520,7 +520,7 @@ test('theme values in the extend section extend the user theme', () => {
520520
height: {
521521
customHeight: '500vh',
522522
},
523-
}
523+
},
524524
},
525525
}
526526

@@ -536,7 +536,7 @@ test('theme values in the extend section extend the user theme', () => {
536536
},
537537
height: {
538538
'0': 0,
539-
'full': '100%',
539+
full: '100%',
540540
},
541541
width: {
542542
'0': 0,
@@ -604,7 +604,7 @@ test('theme values in the extend section can extend values that are depended on
604604
backgroundColors: {
605605
customBackground: '#bada55',
606606
},
607-
}
607+
},
608608
},
609609
}
610610

src/util/resolveConfig.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@ function resolveFunctionKeys(object) {
1313
}
1414

1515
function without(object, key) {
16-
return (({[key]: _, ...rest }) => rest)(object)
16+
/* eslint-disable no-unused-vars */
17+
return (({ [key]: _, ...rest }) => rest)(object)
1718
}
1819

1920
function mergeExtensions(theme) {
2021
return mergeWith({}, without(theme, 'extend'), theme.extend, (_, extensions, key) => {
2122
return isFunction(theme[key])
2223
? mergedTheme => ({
2324
...theme[key](mergedTheme),
24-
...extensions
25+
...extensions,
2526
})
2627
: {
2728
...theme[key],

0 commit comments

Comments
 (0)