Skip to content

Commit 4e9cfec

Browse files
authored
Set flex-basis to auto
1 parent 6197c9a commit 4e9cfec

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

src/transforms/flex.js

+4-8
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,19 @@ const defaultFlexGrow = 1
66
const defaultFlexShrink = 1
77
const defaultFlexBasis = 0
88

9-
const FLEX_BASIS_AUTO = {} // Used for reference equality
10-
119
export default tokenStream => {
1210
let flexGrow
1311
let flexShrink
1412
let flexBasis
1513

1614
if (tokenStream.matches(NONE)) {
1715
tokenStream.expectEmpty()
18-
return { $merge: { flexGrow: 0, flexShrink: 0 } }
16+
return { $merge: { flexGrow: 0, flexShrink: 0, flexBasis: 'auto' } }
1917
}
2018

2119
tokenStream.saveRewindPoint()
2220
if (tokenStream.matches(AUTO) && !tokenStream.hasTokens()) {
23-
return { $merge: { flexGrow: 1, flexShrink: 1 } }
21+
return { $merge: { flexGrow: 1, flexShrink: 1, flexBasis: 'auto' } }
2422
}
2523
tokenStream.rewind()
2624

@@ -40,7 +38,7 @@ export default tokenStream => {
4038
} else if (flexBasis === undefined && tokenStream.matches(LENGTH)) {
4139
flexBasis = tokenStream.lastValue
4240
} else if (flexBasis === undefined && tokenStream.matches(AUTO)) {
43-
flexBasis = FLEX_BASIS_AUTO
41+
flexBasis = 'auto'
4442
} else {
4543
tokenStream.throw()
4644
}
@@ -54,7 +52,5 @@ export default tokenStream => {
5452
if (flexShrink === undefined) flexShrink = defaultFlexShrink
5553
if (flexBasis === undefined) flexBasis = defaultFlexBasis
5654

57-
return flexBasis !== FLEX_BASIS_AUTO
58-
? { $merge: { flexGrow, flexShrink, flexBasis } }
59-
: { $merge: { flexGrow, flexShrink } }
55+
return { $merge: { flexGrow, flexShrink, flexBasis } }
6056
}

0 commit comments

Comments
 (0)