Skip to content
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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -160,4 +160,7 @@ cython_debug/
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
.idea/
.DS_Store
.DS_Store

# Claude Code guidance file
CLAUDE.md
2 changes: 2 additions & 0 deletions tailwind_merge/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ def __init__(self):
('border_opacity', ['border-opacity-']),
# Text Opacity
('text_opacity', ['text-opacity-']),
# Placeholder Color
('placeholder_color', ['placeholder-']),


# Box Shadow
Expand Down
29 changes: 28 additions & 1 deletion tests/test_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,31 @@ def test_with_modifiers():
"hover:text-red-500",
"hover:text-green-500"
)
assert result == "hover:text-green-500"
assert result == "hover:text-green-500"

def test_placeholder_merge():
"""Test that placeholder colors merge correctly"""
twmerge = TailwindMerge()
result = twmerge.merge(
"placeholder-gray-400",
"placeholder-red-500"
)
assert result == "placeholder-red-500"

def test_dark_placeholder_merge():
"""Test that dark:placeholder-* variants merge correctly - Issue #6"""
twmerge = TailwindMerge()
result = twmerge.merge(
"dark:placeholder-gray-400",
"dark:placeholder-red-500"
)
assert result == "dark:placeholder-red-500"

def test_multiple_modifier_placeholder_merge():
"""Test placeholder with multiple modifiers"""
twmerge = TailwindMerge()
result = twmerge.merge(
"hover:dark:placeholder-gray-400",
"hover:dark:placeholder-red-500"
)
assert result == "hover:dark:placeholder-red-500"