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.

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

Add css functions to data types #6258

Merged
merged 4 commits into from Dec 3, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -20,6 +20,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add `portrait` and `landscape` variants ([#6046](https://github.com/tailwindlabs/tailwindcss/pull/6046))
- Add `text-decoration-style`, `text-decoration-thickness`, and `text-underline-offset` utilities ([#6004](https://github.com/tailwindlabs/tailwindcss/pull/6004))
- Add `menu` reset to preflight ([#6213](https://github.com/tailwindlabs/tailwindcss/pull/6213))
- Allow `0` as a valid `length` value ([#6233](https://github.com/tailwindlabs/tailwindcss/pull/6233))
- Add css functions to data types ([#6258](https://github.com/tailwindlabs/tailwindcss/pull/6258))

### Changed

Expand Down
10 changes: 6 additions & 4 deletions src/util/dataTypes.js
@@ -1,6 +1,8 @@
import { parseColor } from './color'
import { parseBoxShadowValue } from './parseBoxShadowValue'

let cssFunctions = ['min', 'max', 'clamp', 'calc']

// Ref: https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Types

let COMMA = /,(?![^(]*\))/g // Comma separator that is not located between brackets. E.g.: `cubiz-bezier(a, b, c)` these don't count.
Expand Down Expand Up @@ -51,11 +53,11 @@ export function url(value) {
}

export function number(value) {
return !isNaN(Number(value))
return !isNaN(Number(value)) || cssFunctions.some((fn) => new RegExp(`^${fn}\\(.+?`).test(value))
}

export function percentage(value) {
return /%$/g.test(value) || /^calc\(.+?%\)/g.test(value)
return /%$/g.test(value) || cssFunctions.some((fn) => new RegExp(`^${fn}\\(.+?%`).test(value))
}

let lengthUnits = [
Expand All @@ -79,9 +81,9 @@ let lengthUnits = [
let lengthUnitsPattern = `(?:${lengthUnits.join('|')})`
export function length(value) {
return (
value === 0 ||
new RegExp(`${lengthUnitsPattern}$`).test(value) ||
new RegExp(`^calc\\(.+?${lengthUnitsPattern}`).test(value) ||
value === 0
cssFunctions.some((fn) => new RegExp(`^${fn}\\(.+?${lengthUnitsPattern}`).test(value))
)
}

Expand Down
6 changes: 6 additions & 0 deletions tests/arbitrary-values.test.css
Expand Up @@ -139,6 +139,9 @@
.min-h-\[var\(--height\)\] {
min-height: var(--height);
}
.w-\[0\] {
width: 0;
}
.w-\[3\.23rem\] {
width: 3.23rem;
}
Expand Down Expand Up @@ -767,6 +770,9 @@
.text-\[length\:var\(--font-size\)\] {
font-size: var(--font-size);
}
.text-\[min\(10vh\2c 100px\)\] {
font-size: min(10vh, 100px);
}
.font-\[300\] {
font-weight: 300;
}
Expand Down
2 changes: 2 additions & 0 deletions tests/arbitrary-values.test.html
Expand Up @@ -60,6 +60,7 @@
<div class="min-h-[calc(100%+1rem)]"></div>
<div class="min-h-[var(--height)]"></div>

<div class="w-[0]"></div>
<div class="w-[3.23rem]"></div>
<div class="w-[calc(100%+1rem)]"></div>
<div class="w-[calc(var(--10-10px,calc(-20px-(-30px--40px)))-50px)]"></div>
Expand Down Expand Up @@ -280,6 +281,7 @@
<div class="text-[2.23rem]"></div>
<div class="text-[length:var(--font-size)]"></div>
<div class="text-[angle:var(--angle)]"></div>
<div class="text-[min(10vh,100px)]"></div>

<div class="font-[300]"></div>
<div class="font-[number:lighter]"></div>
Expand Down