Skip to content

Add support for “intensity” modifiers on box and text shadows #17398

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
thecrypticace merged 15 commits into from
Mar 28, 2025
Merged

Add support for “intensity” modifiers on box and text shadows #17398

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fa1c12e
Add support for “intensity” modifiers on text shadows
thecrypticace Mar 26, 2025
510a392
Add support for “intensity” modifiers on box shadows
thecrypticace Mar 26, 2025
22cd1f7
Add support for “intensity” modifiers on inset box shadows
thecrypticace Mar 27, 2025
7484f33
Make sure `inset-shadow-none` is suggested
thecrypticace Mar 27, 2025
4e2eac2
Update tests
thecrypticace Mar 27, 2025
bb26e6b
Update UI tests
thecrypticace Mar 27, 2025
03b5e2a
Add UI tests
thecrypticace Mar 27, 2025
934e428
Refactor
thecrypticace Mar 27, 2025
1253d73
Inline intensity value
thecrypticace Mar 27, 2025
f4a171d
Add more tests
thecrypticace Mar 27, 2025
bbb85f0
Update data type
thecrypticace Mar 27, 2025
af51d4b
Update tests
thecrypticace Mar 27, 2025
331f009
Rename variable
thecrypticace Mar 28, 2025
393c812
Update tests
thecrypticace Mar 28, 2025
c5febd7
Update changelog
thecrypticace Mar 28, 2025
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
Rename variable
  • Loading branch information
@thecrypticace
thecrypticace committed Mar 28, 2025
commit 331f00935ffe91b200756c5d44d052284f28dd2c
88 changes: 36 additions & 52 deletions packages/tailwindcss/src/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4280,7 +4280,7 @@ export function createUtilities(theme: Theme) {
let textShadowProperties = () => {
return atRoot([
property('--tw-text-shadow-color'),
property('--tw-text-shadow-intensity', '100%', '<percentage>'),
property('--tw-text-shadow-alpha', '100%', '<percentage>'),
])
}

Expand All @@ -4290,14 +4290,14 @@ export function createUtilities(theme: Theme) {
])

utilities.functional('text-shadow', (candidate) => {
let intensity: string | undefined
let alpha: string | undefined

if (candidate.modifier) {
if (candidate.modifier.kind === 'arbitrary') {
intensity = candidate.modifier.value
alpha = candidate.modifier.value
} else {
if (isPositiveInteger(candidate.modifier.value)) {
intensity = `${candidate.modifier.value}%`
alpha = `${candidate.modifier.value}%`
}
}
}
Expand All @@ -4308,14 +4308,10 @@ export function createUtilities(theme: Theme) {

return [
textShadowProperties(),
decl('--tw-text-shadow-intensity', intensity),
decl('--tw-text-shadow-alpha', alpha),
decl(
'text-shadow',
replaceShadowColors(
value,
intensity,
(color) => `var(--tw-text-shadow-color, ${color})`,
),
replaceShadowColors(value, alpha, (color) => `var(--tw-text-shadow-color, ${color})`),
),
]
}
Expand All @@ -4330,18 +4326,18 @@ export function createUtilities(theme: Theme) {
if (value === null) return
return [
textShadowProperties(),
decl('--tw-text-shadow-color', withAlpha(value, 'var(--tw-text-shadow-intensity)')),
decl('--tw-text-shadow-color', withAlpha(value, 'var(--tw-text-shadow-alpha)')),
]
}
default: {
return [
textShadowProperties(),
decl('--tw-text-shadow-intensity', intensity),
decl('--tw-text-shadow-alpha', alpha),
decl(
'text-shadow',
replaceShadowColors(
value,
intensity,
alpha,
(color) => `var(--tw-text-shadow-color, ${color})`,
),
),
Expand All @@ -4362,14 +4358,10 @@ export function createUtilities(theme: Theme) {
if (value) {
return [
textShadowProperties(),
decl('--tw-text-shadow-intensity', intensity),
decl('--tw-text-shadow-alpha', alpha),
decl(
'text-shadow',
replaceShadowColors(
value,
intensity,
(color) => `var(--tw-text-shadow-color, ${color})`,
),
replaceShadowColors(value, alpha, (color) => `var(--tw-text-shadow-color, ${color})`),
),
]
}
Expand All @@ -4381,7 +4373,7 @@ export function createUtilities(theme: Theme) {
if (value) {
return [
textShadowProperties(),
decl('--tw-text-shadow-color', withAlpha(value, 'var(--tw-text-shadow-intensity)')),
decl('--tw-text-shadow-color', withAlpha(value, 'var(--tw-text-shadow-alpha)')),
]
}
}
Expand Down Expand Up @@ -4418,10 +4410,10 @@ export function createUtilities(theme: Theme) {
return atRoot([
property('--tw-shadow', nullShadow),
property('--tw-shadow-color'),
property('--tw-shadow-intensity', '100%', '<percentage>'),
property('--tw-shadow-alpha', '100%', '<percentage>'),
property('--tw-inset-shadow', nullShadow),
property('--tw-inset-shadow-color'),
property('--tw-inset-shadow-intensity', '100%', '<percentage>'),
property('--tw-inset-shadow-alpha', '100%', '<percentage>'),
property('--tw-ring-color'),
property('--tw-ring-shadow', nullShadow),
property('--tw-inset-ring-color'),
Expand All @@ -4438,14 +4430,14 @@ export function createUtilities(theme: Theme) {
staticUtility('shadow-initial', [boxShadowProperties, ['--tw-shadow-color', 'initial']])

utilities.functional('shadow', (candidate) => {
let intensity: string | undefined
let alpha: string | undefined

if (candidate.modifier) {
if (candidate.modifier.kind === 'arbitrary') {
intensity = candidate.modifier.value
alpha = candidate.modifier.value
} else {
if (isPositiveInteger(candidate.modifier.value)) {
intensity = `${candidate.modifier.value}%`
alpha = `${candidate.modifier.value}%`
}
}
}
Expand All @@ -4456,10 +4448,10 @@ export function createUtilities(theme: Theme) {

return [
boxShadowProperties(),
decl('--tw-shadow-intensity', intensity),
decl('--tw-shadow-alpha', alpha),
decl(
'--tw-shadow',
replaceShadowColors(value, intensity, (color) => `var(--tw-shadow-color, ${color})`),
replaceShadowColors(value, alpha, (color) => `var(--tw-shadow-color, ${color})`),
),
decl('box-shadow', cssBoxShadowValue),
]
Expand All @@ -4476,20 +4468,16 @@ export function createUtilities(theme: Theme) {

return [
boxShadowProperties(),
decl('--tw-shadow-color', withAlpha(value, 'var(--tw-shadow-intensity)')),
decl('--tw-shadow-color', withAlpha(value, 'var(--tw-shadow-alpha)')),
]
}
default: {
return [
boxShadowProperties(),
decl('--tw-shadow-intensity', intensity),
decl('--tw-shadow-alpha', alpha),
decl(
'--tw-shadow',
replaceShadowColors(
value,
intensity,
(color) => `var(--tw-shadow-color, ${color})`,
),
replaceShadowColors(value, alpha, (color) => `var(--tw-shadow-color, ${color})`),
),
decl('box-shadow', cssBoxShadowValue),
]
Expand All @@ -4513,10 +4501,10 @@ export function createUtilities(theme: Theme) {
if (value) {
return [
boxShadowProperties(),
decl('--tw-shadow-intensity', intensity),
decl('--tw-shadow-alpha', alpha),
decl(
'--tw-shadow',
replaceShadowColors(value, intensity, (color) => `var(--tw-shadow-color, ${color})`),
replaceShadowColors(value, alpha, (color) => `var(--tw-shadow-color, ${color})`),
),
decl('box-shadow', cssBoxShadowValue),
]
Expand All @@ -4529,7 +4517,7 @@ export function createUtilities(theme: Theme) {
if (value) {
return [
boxShadowProperties(),
decl('--tw-shadow-color', withAlpha(value, 'var(--tw-shadow-intensity)')),
decl('--tw-shadow-color', withAlpha(value, 'var(--tw-shadow-alpha)')),
]
}
}
Expand Down Expand Up @@ -4557,14 +4545,14 @@ export function createUtilities(theme: Theme) {
])

utilities.functional('inset-shadow', (candidate) => {
let intensity: string | undefined
let alpha: string | undefined

if (candidate.modifier) {
if (candidate.modifier.kind === 'arbitrary') {
intensity = candidate.modifier.value
alpha = candidate.modifier.value
} else {
if (isPositiveInteger(candidate.modifier.value)) {
intensity = `${candidate.modifier.value}%`
alpha = `${candidate.modifier.value}%`
}
}
}
Expand All @@ -4575,14 +4563,10 @@ export function createUtilities(theme: Theme) {

return [
boxShadowProperties(),
decl('--tw-inset-shadow-intensity', intensity),
decl('--tw-inset-shadow-alpha', alpha),
decl(
'--tw-inset-shadow',
replaceShadowColors(
value,
intensity,
(color) => `var(--tw-inset-shadow-color, ${color})`,
),
replaceShadowColors(value, alpha, (color) => `var(--tw-inset-shadow-color, ${color})`),
),
decl('box-shadow', cssBoxShadowValue),
]
Expand All @@ -4599,18 +4583,18 @@ export function createUtilities(theme: Theme) {

return [
boxShadowProperties(),
decl('--tw-inset-shadow-color', withAlpha(value, 'var(--tw-inset-shadow-intensity)')),
decl('--tw-inset-shadow-color', withAlpha(value, 'var(--tw-inset-shadow-alpha)')),
]
}
default: {
return [
boxShadowProperties(),
decl('--tw-inset-shadow-intensity', intensity),
decl('--tw-inset-shadow-alpha', alpha),
decl(
'--tw-inset-shadow',
`inset ${replaceShadowColors(
value,
intensity,
alpha,
(color) => `var(--tw-inset-shadow-color, ${color})`,
)}`,
),
Expand All @@ -4637,12 +4621,12 @@ export function createUtilities(theme: Theme) {
if (value) {
return [
boxShadowProperties(),
decl('--tw-inset-shadow-intensity', intensity),
decl('--tw-inset-shadow-alpha', alpha),
decl(
'--tw-inset-shadow',
replaceShadowColors(
value,
intensity,
alpha,
(color) => `var(--tw-inset-shadow-color, ${color})`,
),
),
Expand All @@ -4657,7 +4641,7 @@ export function createUtilities(theme: Theme) {
if (value) {
return [
boxShadowProperties(),
decl('--tw-inset-shadow-color', withAlpha(value, 'var(--tw-inset-shadow-intensity)')),
decl('--tw-inset-shadow-color', withAlpha(value, 'var(--tw-inset-shadow-alpha)')),
]
}
}
Expand Down