Skip to content

Add support for Tailwind v3.1 #103

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
dcastil merged 13 commits into from
Jun 12, 2022
Merged

Add support for Tailwind v3.1 #103

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fb83181
update support message in README
dcastil Jun 10, 2022
fe77f2b
add text-start amd text-end utilities
dcastil Jun 10, 2022
8e58925
add border-spacing utilities
dcastil Jun 10, 2022
c001fc8
add grid-flow-dense utility
dcastil Jun 10, 2022
4eda918
add mix-blend-plus-lighter utility
dcastil Jun 10, 2022
a473214
move important modifier in internal modifier string to better position
dcastil Jun 12, 2022
3c44743
add tests for arbitrary variants
dcastil Jun 12, 2022
43b9dfa
use splitModifiers function instead of regex to support arbitrary var…
dcastil Jun 12, 2022
947aa04
add support for arbitrary variants in modifier sorting
dcastil Jun 12, 2022
90cdd69
add test for arbitrary variants with arbitrary properties
dcastil Jun 12, 2022
5fca754
add arbitrary variants to docs
dcastil Jun 12, 2022
772c997
add more clarity to docs
dcastil Jun 12, 2022
7bf25cf
fix README test
dcastil Jun 12, 2022
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
Prev Previous commit
Next Next commit
add test for arbitrary variants with arbitrary properties
  • Loading branch information
@dcastil
dcastil committed Jun 12, 2022
commit 90cdd69a554a5fd5f4b01453e0f616718f37a43e
9 changes: 9 additions & 0 deletions tests/arbitrary-variants.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,12 @@ test('multiple arbitrary variants', () => {
'hover:dark:[&>*]:focus:[&_div]:disabled:underline dark:hover:[&>*]:disabled:focus:[&_div]:line-through'
)
})

test('arbitrary variants with arbitrary properties', () => {
expect(twMerge('[&>*]:[color:red] [&>*]:[color:blue]')).toBe('[&>*]:[color:blue]')
expect(
twMerge(
'[&[data-foo][data-bar]:not([data-baz])]:nod:noa:[color:red] [&[data-foo][data-bar]:not([data-baz])]:noa:nod:[color:blue]'
)
).toBe('[&[data-foo][data-bar]:not([data-baz])]:noa:nod:[color:blue]')
})