Skip to content

WIP: Set flex-basis to auto #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2018
Merged

WIP: Set flex-basis to auto #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e9cfec
Set flex-basis to `auto`
jacobp100 Oct 18, 2018
f48a256
Update tests
jacobp100 Oct 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/__tests__/flex.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,27 +73,31 @@ it('transforms flex shorthand with flex-basis set to auto', () => {
expect(transformCss([['flex', '0 1 auto']])).toEqual({
flexGrow: 0,
flexShrink: 1,
flexBasis: 'auto',
})
})

it('transforms flex shorthand with flex-basis set to auto appearing first', () => {
expect(transformCss([['flex', 'auto 0 1']])).toEqual({
flexGrow: 0,
flexShrink: 1,
flexBasis: 'auto',
})
})

it('transforms flex auto keyword', () => {
expect(transformCss([['flex', 'auto']])).toEqual({
flexGrow: 1,
flexShrink: 1,
flexBasis: 'auto',
})
})

it('transforms flex none keyword', () => {
expect(transformCss([['flex', 'none']])).toEqual({
flexGrow: 0,
flexShrink: 0,
flexBasis: 'auto',
})
})

Expand Down
12 changes: 4 additions & 8 deletions src/transforms/flex.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,19 @@ const defaultFlexGrow = 1
const defaultFlexShrink = 1
const defaultFlexBasis = 0

const FLEX_BASIS_AUTO = {} // Used for reference equality

export default tokenStream => {
let flexGrow
let flexShrink
let flexBasis

if (tokenStream.matches(NONE)) {
tokenStream.expectEmpty()
return { $merge: { flexGrow: 0, flexShrink: 0 } }
return { $merge: { flexGrow: 0, flexShrink: 0, flexBasis: 'auto' } }
}

tokenStream.saveRewindPoint()
if (tokenStream.matches(AUTO) && !tokenStream.hasTokens()) {
return { $merge: { flexGrow: 1, flexShrink: 1 } }
return { $merge: { flexGrow: 1, flexShrink: 1, flexBasis: 'auto' } }
}
tokenStream.rewind()

Expand All @@ -40,7 +38,7 @@ export default tokenStream => {
} else if (flexBasis === undefined && tokenStream.matches(LENGTH)) {
flexBasis = tokenStream.lastValue
} else if (flexBasis === undefined && tokenStream.matches(AUTO)) {
flexBasis = FLEX_BASIS_AUTO
flexBasis = 'auto'
} else {
tokenStream.throw()
}
Expand All @@ -54,7 +52,5 @@ export default tokenStream => {
if (flexShrink === undefined) flexShrink = defaultFlexShrink
if (flexBasis === undefined) flexBasis = defaultFlexBasis

return flexBasis !== FLEX_BASIS_AUTO
? { $merge: { flexGrow, flexShrink, flexBasis } }
: { $merge: { flexGrow, flexShrink } }
return { $merge: { flexGrow, flexShrink, flexBasis } }
}