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

Fix col-span-full class missing in default config #267

Merged
merged 2 commits into from
Jun 30, 2023
Merged

Fix col-span-full class missing in default config #267

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
184b279
add test case for missing col-span class
dcastil Jun 30, 2023
baf880a
add missing class col-span-full
dcastil Jun 30, 2023
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
2 changes: 1 addition & 1 deletion src/lib/default-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ export function getDefaultConfig() {
* Grid Column Start / End
* @see https://tailwindcss.com/docs/grid-column
*/
'col-start-end': [{ col: ['auto', { span: [isInteger] }, isArbitraryValue] }],
'col-start-end': [{ col: ['auto', { span: ['full', isInteger] }, isArbitraryValue] }],
/**
* Grid Column Start
* @see https://tailwindcss.com/docs/grid-column
Expand Down
1 change: 1 addition & 0 deletions tests/class-group-conflicts.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ test('merges classes from same group correctly', () => {
expect(
twMerge('overflow-x-auto hover:overflow-x-hidden hover:overflow-x-auto overflow-x-scroll'),
).toBe('hover:overflow-x-auto overflow-x-scroll')
expect(twMerge('col-span-1 col-span-full')).toBe('col-span-full')
})

test('merges classes from Font Variant Numeric section correctly', () => {
Expand Down