Skip to content

Commit aee1e44

Browse files
committed
Fix code style
1 parent 509b698 commit aee1e44

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

src/util/resolveConfig.js

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,13 @@ import defaults from 'lodash/defaults'
44
import map from 'lodash/map'
55
import get from 'lodash/get'
66

7-
function resolveConfig(configs) {
8-
return defaults(
9-
{
10-
theme: resolveFunctionKeys(mergeExtensions(defaults(...map(configs, 'theme')))),
11-
variants: defaults(...map(configs, 'variants')),
12-
},
13-
...configs
14-
)
7+
function value(valueToResolve, ...args) {
8+
return isFunction(valueToResolve) ? valueToResolve(...args) : valueToResolve
159
}
1610

1711
function mergeExtensions({ extend, ...theme }) {
18-
return mergeWith(theme, extend, (themeValue, extensions, key) => {
19-
if (!isFunction(themeValue) && !(isFunction(extensions))) {
12+
return mergeWith(theme, extend, (themeValue, extensions) => {
13+
if (!isFunction(themeValue) && !isFunction(extensions)) {
2014
return {
2115
...themeValue,
2216
...extensions,
@@ -41,8 +35,12 @@ function resolveFunctionKeys(object) {
4135
}, {})
4236
}
4337

44-
function value(valueToResolve, ...args) {
45-
return isFunction(valueToResolve) ? valueToResolve(...args) : valueToResolve
38+
export default function resolveConfig(configs) {
39+
return defaults(
40+
{
41+
theme: resolveFunctionKeys(mergeExtensions(defaults(...map(configs, 'theme')))),
42+
variants: defaults(...map(configs, 'variants')),
43+
},
44+
...configs
45+
)
4646
}
47-
48-
export default resolveConfig

0 commit comments

Comments
 (0)