Skip to content
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

Add failing test for #2823 #2824

Merged
merged 4 commits into from Nov 26, 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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
74 changes: 56 additions & 18 deletions __tests__/applyAtRule.test.js
Expand Up @@ -1002,14 +1002,10 @@ describe('using apply with the prefix option', () => {

test('a "Did You Mean" suggestion is omitted if a similar class cannot be identified.', () => {
const input = `
.foo { @apply anteater; }
`
.foo { @apply anteater; }
`

const config = resolveConfig([
{
...defaultConfig,
},
])
const config = resolveConfig([{ ...defaultConfig }])

expect.assertions(1)

Expand Down Expand Up @@ -1109,7 +1105,7 @@ test('you can apply classes to a rule with multiple selectors', () => {
@apply float-left opacity-50 hover:opacity-100 md:float-right;
}
}
`
`

const expected = `
@supports (display: grid) {
Expand All @@ -1134,6 +1130,48 @@ test('you can apply classes to a rule with multiple selectors', () => {
})
})

test('you can apply classes to a rule with multiple selectors with important and a prefix enabled', () => {
const input = `
@supports (display: grid) {
.foo, h1 > .bar * {
@apply tw-float-left tw-opacity-50 hover:tw-opacity-100 md:tw-float-right;
}
}
`

const expected = `
@supports (display: grid) {
.foo, h1 > .bar * {
float: left;
opacity: 0.5;
}

.foo:hover, h1 > .bar *:hover {
opacity: 1;
}

@media (min-width: 768px) {
.foo, h1 > .bar * {
float: right;
}
}
}
`

const config = resolveConfig([
{
...defaultConfig,
prefix: 'tw-',
important: true,
},
])

return run(input, config).then((result) => {
expect(result.css).toMatchCss(expected)
expect(result.warnings().length).toBe(0)
})
})

test('you can apply classes in a nested rule', () => {
const input = `
.selector {
Expand Down Expand Up @@ -1241,11 +1279,11 @@ test('declarations within a rule that uses @apply can be !important', () => {
`

const expected = `
.foo {
text-align: center;
float: left;
display: block !important;
}
.foo {
text-align: center;
float: left;
display: block !important;
}
`

expect.assertions(2)
Expand All @@ -1266,11 +1304,11 @@ test('declarations within a rule that uses @apply with !important remain not !im
`

const expected = `
.foo {
text-align: center !important;
float: left;
display: block !important;
}
.foo {
text-align: center !important;
float: left;
display: block !important;
}
`

expect.assertions(2)
Expand Down
1 change: 0 additions & 1 deletion jest/customMatchers.js
Expand Up @@ -2,7 +2,6 @@ import prettier from 'prettier'
import diff from 'jest-diff'

function format(input) {
return input
return prettier.format(input, {
parser: 'css',
printWidth: 100,
Expand Down
14 changes: 12 additions & 2 deletions src/lib/substituteClassApplyAtRules.js
Expand Up @@ -242,11 +242,21 @@ function processApplyAtRules(css, lookupTree, config) {
: (util) => util.rule.nodes.forEach((n) => afterRule.append(n.clone()))
)

const { nodes } = _.tap(postcss.root({ nodes: rulesToInsert }), (root) =>
rulesToInsert.forEach((rule) => {
if (rule.type === 'atrule') {
rule.walkRules((rule) => {
rule.__tailwind = { ...rule.__tailwind, important }
})
} else {
rule.__tailwind = { ...rule.__tailwind, important }
}
})

const { nodes } = _.tap(postcss.root({ nodes: rulesToInsert }), (root) => {
root.walkDecls((d) => {
d.important = important
})
)
})

const mergedRules = mergeAdjacentRules(nearestParentRule, [...nodes, afterRule])

Expand Down