Skip to content

Fix font size theme bug #2144

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.

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
Aug 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 1 addition & 14 deletions __tests__/fixtures/tailwind-output-flagged.css
Original file line number Diff line number Diff line change
Expand Up @@ -25573,32 +25573,19 @@ video {
}

@keyframes spin {
from {
transform: rotate(0deg);
}

to {
transform: rotate(360deg);
}
}

@keyframes ping {
0% {
transform: scale(1);
opacity: 1;
}

75%, 100% {
transform: scale(2);
opacity: 0;
}
}

@keyframes pulse {
0%, 100% {
opacity: 1;
}

50% {
opacity: .5;
}
Expand All @@ -25611,7 +25598,7 @@ video {
}

50% {
transform: translateY(0);
transform: none;
animation-timing-function: cubic-bezier(0,0,0.2,1);
}
}
Expand Down
45 changes: 45 additions & 0 deletions __tests__/themeFunction.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,48 @@ test('an unquoted list is valid as a default value', () => {
expect(result.warnings().length).toBe(0)
})
})

test('array values are joined by default', () => {
const input = `
.heading { font-family: theme('fontFamily.sans'); }
`

const output = `
.heading { font-family: Inter, Helvetica, sans-serif; }
`

return run(input, {
theme: {
fontFamily: {
sans: ['Inter', 'Helvetica', 'sans-serif'],
},
},
}).then(result => {
expect(result.css).toEqual(output)
expect(result.warnings().length).toBe(0)
})
})

test('font sizes are retrieved without default line-heights or letter-spacing', () => {
const input = `
.heading-1 { font-size: theme('fontSize.lg'); }
.heading-2 { font-size: theme('fontSize.xl'); }
`

const output = `
.heading-1 { font-size: 20px; }
.heading-2 { font-size: 24px; }
`

return run(input, {
theme: {
fontSize: {
lg: ['20px', '28px'],
xl: ['24px', { lineHeight: '32px', letterSpacing: '-0.01em' }],
},
},
}).then(result => {
expect(result.css).toEqual(output)
expect(result.warnings().length).toBe(0)
})
})
17 changes: 15 additions & 2 deletions src/lib/evaluateTailwindFunctions.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
import _ from 'lodash'
import functions from 'postcss-functions'

const themeTransforms = {
fontSize(value) {
return Array.isArray(value) ? value[0] : value
},
}

function defaultTransform(value) {
return Array.isArray(value) ? value.join(', ') : value
}

export default function(config) {
return functions({
functions: {
theme: (path, ...defaultValue) => {
return _.thru(_.get(config.theme, _.trim(path, `'"`), defaultValue), value => {
return Array.isArray(value) ? value.join(', ') : value
const trimmedPath = _.trim(path, `'"`)
return _.thru(_.get(config.theme, trimmedPath, defaultValue), value => {
const [themeSection] = trimmedPath.split('.')

return _.get(themeTransforms, themeSection, defaultTransform)(value)
})
},
},
Expand Down