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

Support custom values for vertical-align utilities #5487

Merged
merged 1 commit into from
Sep 12, 2021
Merged

Support custom values for vertical-align utilities #5487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion src/corePlugins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1477,7 +1477,7 @@ export let textAlign = ({ addUtilities }) => {

export let textIndent = createUtilityPlugin('textIndent', [['indent', ['text-indent']]])

export let verticalAlign = ({ addUtilities }) => {
export let verticalAlign = ({ addUtilities, matchUtilities }) => {
addUtilities({
'.align-baseline': { 'vertical-align': 'baseline' },
'.align-top': { 'vertical-align': 'top' },
Expand All @@ -1488,6 +1488,15 @@ export let verticalAlign = ({ addUtilities }) => {
'.align-sub': { 'vertical-align': 'sub' },
'.align-super': { 'vertical-align': 'super' },
})

matchUtilities(
{
align: (value) => ({
'vertical-align': value,
}),
},
{ values: {}, type: 'any' }
)
}

export let fontFamily = createUtilityPlugin('fontFamily', [['font', ['fontFamily']]], {
Expand Down
3 changes: 3 additions & 0 deletions tests/arbitrary-values.test.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,9 @@
.indent-\[var\(--indent\)\] {
text-indent: var(--indent);
}
.align-\[10em\] {
vertical-align: 10em;
}
.text-\[2\.23rem\] {
font-size: 2.23rem;
}
Expand Down
84 changes: 59 additions & 25 deletions tests/arbitrary-values.test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<div class="skew-x-[3px]"></div>
<div class="skew-y-[3px]"></div>
<div class="indent-[50%] indent-[var(--indent)]"></div>
<div class="align-[10em]"></div>
<div class="text-[2.23rem]"></div>
<div class="text-[length:var(--font-size)]"></div>
<div class="text-[color:var(--color)]"></div>
Expand All @@ -72,10 +73,20 @@
<div class="mt-[clamp(30px,100px)]"></div>
<div class="rounded-[11px]"></div>
<div
class="rounded-t-[var(--radius)] rounded-r-[var(--radius)] rounded-b-[var(--radius)] rounded-l-[var(--radius)]"
class="
rounded-t-[var(--radius)]
rounded-r-[var(--radius)]
rounded-b-[var(--radius)]
rounded-l-[var(--radius)]
"
></div>
<div
class="rounded-tr-[var(--radius)] rounded-br-[var(--radius)] rounded-bl-[var(--radius)] rounded-tl-[var(--radius)]"
class="
rounded-tr-[var(--radius)]
rounded-br-[var(--radius)]
rounded-bl-[var(--radius)]
rounded-tl-[var(--radius)]
"
></div>
<div class="duration-[var(--app-duration)]"></div>
<div class="p-[var(--app-padding)]"></div>
Expand Down Expand Up @@ -125,28 +136,51 @@
<div class="accent-[var(--accent-color)]"></div>

<!-- Balancing issues, this is not checking the validity of the actual value, but purely syntax-wise -->
<div class="w-[do-not-generate-this]w-[it-is-invalid-syntax]"></div><!-- INVALID -->
<div class="grid-cols-[[linename],1fr,auto]"></div><!-- VALID -->
<div class="w-[{}]"></div><!-- VALID -->
<div class="w-[{{}}]"></div><!-- VALID -->
<div class="w-[[]]"></div><!-- VALID -->
<div class="w-[[[]]]"></div><!-- VALID -->
<div class="w-[()]"></div><!-- VALID -->
<div class="w-[(())]"></div><!-- VALID -->
<div class="w-[][]"></div><!-- INVALID -->
<div class="w-[)(]"></div><!-- INVALID -->
<div class="w-[}{]"></div><!-- INVALID -->
<div class="w-[][]]"></div><!-- INVALID -->
<div class="w-[)()]"></div><!-- INVALID -->
<div class="w-[}{}]"></div><!-- INVALID -->
<div class="w-['][]']"></div><!-- VALID -->
<div class="w-[')()']"></div><!-- VALID -->
<div class="w-['}{}']"></div><!-- VALID -->
<div class="w-[{[}]]"></div><!-- INVALID -->
<div class="w-[[{]}]"></div><!-- INVALID -->
<div class="w-[{(})]"></div><!-- INVALID -->
<div class="w-[({)}]"></div><!-- INVALID -->
<div class="w-[([)]]"></div><!-- INVALID -->
<div class="w-[[(])]"></div><!-- INVALID -->
<div class="w-[do-not-generate-this]w-[it-is-invalid-syntax]"></div>
<!-- INVALID -->
<div class="grid-cols-[[linename],1fr,auto]"></div>
<!-- VALID -->
<div class="w-[{}]"></div>
<!-- VALID -->
<div class="w-[{{}}]"></div>
<!-- VALID -->
<div class="w-[[]]"></div>
<!-- VALID -->
<div class="w-[[[]]]"></div>
<!-- VALID -->
<div class="w-[()]"></div>
<!-- VALID -->
<div class="w-[(())]"></div>
<!-- VALID -->
<div class="w-[][]"></div>
<!-- INVALID -->
<div class="w-[)(]"></div>
<!-- INVALID -->
<div class="w-[}{]"></div>
<!-- INVALID -->
<div class="w-[][]]"></div>
<!-- INVALID -->
<div class="w-[)()]"></div>
<!-- INVALID -->
<div class="w-[}{}]"></div>
<!-- INVALID -->
<div class="w-['][]']"></div>
<!-- VALID -->
<div class="w-[')()']"></div>
<!-- VALID -->
<div class="w-['}{}']"></div>
<!-- VALID -->
<div class="w-[{[}]]"></div>
<!-- INVALID -->
<div class="w-[[{]}]"></div>
<!-- INVALID -->
<div class="w-[{(})]"></div>
<!-- INVALID -->
<div class="w-[({)}]"></div>
<!-- INVALID -->
<div class="w-[([)]]"></div>
<!-- INVALID -->
<div class="w-[[(])]"></div>
<!-- INVALID -->
</body>
</html>