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.

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

Jump to bottom

Don't include .prose in :where pseudos #352

Closed
wants to merge 2 commits into from
Closed

Don't include .prose in :where pseudos #352

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
1626076
Don't include `.prose` in `:where` pseudos
adamwathan Apr 24, 2024
f95d665
Update tests
adamwathan Apr 24, 2024
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
14 changes: 9 additions & 5 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,22 @@ const computed = {

function inWhere(selector, { className, modifier, prefix }) {
let prefixedNot = prefix(`.not-${className}`).slice(1)
let selectorPrefix = selector.startsWith('>')
? `${modifier === 'DEFAULT' ? `.${className}` : `.${className}-${modifier}`} `
: ''
let combinator = ''

// Make sure leading '>' is pulled out of the `:where` pseudo we generate, because it's invalid in that context
if (selector.startsWith('>')) {
selector = selector.slice(1)
combinator = '>'
}

// Parse the selector, if every component ends in the same pseudo element(s) then move it to the end
let [trailingPseudo, rebuiltSelector] = commonTrailingPseudos(selector)

if (trailingPseudo) {
return `:where(${selectorPrefix}${rebuiltSelector}):not(:where([class~="${prefixedNot}"],[class~="${prefixedNot}"] *))${trailingPseudo}`
return `${combinator}:where(${rebuiltSelector}):not(:where([class~="${prefixedNot}"],[class~="${prefixedNot}"] *))${trailingPseudo}`
}

return `:where(${selectorPrefix}${selector}):not(:where([class~="${prefixedNot}"],[class~="${prefixedNot}"] *))`
return `${combinator}:where(${selector}):not(:where([class~="${prefixedNot}"],[class~="${prefixedNot}"] *))`
}

function isObject(value) {
Expand Down
16 changes: 5 additions & 11 deletions src/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,7 @@ test('specificity is reduced with :where', async () => {
font-weight: 400;
color: var(--tw-prose-counters);
}
.prose
:where(.prose > ul > li p):not(:where([class~='not-prose'], [class~='not-prose'] *)) {
.prose > :where(ul > li p):not(:where([class~='not-prose'], [class~='not-prose'] *)) {
margin-top: 16px;
margin-bottom: 16px;
}
Expand Down Expand Up @@ -239,9 +238,7 @@ test('variants', async () => {
color: tomato;
}
.hover\:prose-lg:hover
:where(.hover\:prose-lg:hover
> ul
> li):not(:where([class~='not-prose'], [class~='not-prose'] *)) {
> :where(ul > li):not(:where([class~='not-prose'], [class~='not-prose'] *)) {
color: blue;
}
@media (min-width: 640px) {
Expand All @@ -251,8 +248,7 @@ test('variants', async () => {
.sm\:prose :where(p):not(:where([class~='not-prose'], [class~='not-prose'] *)) {
color: lime;
}
.sm\:prose
:where(.sm\:prose > ul > li):not(:where([class~='not-prose'], [class~='not-prose'] *)) {
.sm\:prose > :where(ul > li):not(:where([class~='not-prose'], [class~='not-prose'] *)) {
color: purple;
}
}
Expand All @@ -264,8 +260,7 @@ test('variants', async () => {
color: tomato;
}
.lg\:prose-lg
:where(.lg\:prose-lg > ul > li):not(:where([class~='not-prose'], [class~='not-prose']
*)) {
> :where(ul > li):not(:where([class~='not-prose'], [class~='not-prose'] *)) {
color: blue;
}
}
Expand Down Expand Up @@ -421,8 +416,7 @@ test('modifiers', async () => {
margin-top: 40px;
margin-bottom: 40px;
}
.prose-lg
:where(.prose-lg > ul > li):not(:where([class~='not-prose'], [class~='not-prose'] *)) {
.prose-lg > :where(ul > li):not(:where([class~='not-prose'], [class~='not-prose'] *)) {
padding-left: 12px;
}
.prose-lg :where(h1):not(:where([class~='not-prose'], [class~='not-prose'] *)) {
Expand Down