Skip to content

Fix multi-value arbitrary inset shadow #17523

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
philipp-spiess merged 3 commits into from
Apr 3, 2025
Merged

Fix multi-value arbitrary inset shadow #17523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a348782
Fix multi-value arbitrary inset shadow
wongjn Apr 3, 2025
11e8de3
Update CHANGELOG
wongjn Apr 3, 2025
8c5fc6e
Nitpicks
philipp-spiess Apr 3, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

- Don't rely on `@layer base` for the `@property` polyfills ([#17506](https://github.com/tailwindlabs/tailwindcss/pull/17506))
- Fix multi-value inset shadow ([#17523](https://github.com/tailwindlabs/tailwindcss/pull/17523))

## [4.1.1] - 2025-04-02

Expand Down
19 changes: 19 additions & 0 deletions packages/tailwindcss/src/utilities.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23263,11 +23263,13 @@ test('inset-shadow', async () => {
'inset-shadow-[10px_10px]',
'inset-shadow-[var(--value)]',
'inset-shadow-[shadow:var(--value)]',
'inset-shadow-[12px_12px_#0088cc,12px_12px_var(--value,#0088cc)]',

'inset-shadow-sm/25',
'inset-shadow-[12px_12px_#0088cc]/25',
'inset-shadow-[12px_12px_var(--value)]/25',
'inset-shadow-[10px_10px]/25',
'inset-shadow-[12px_12px_#0088cc,12px_12px_var(--value,#0088cc)]/25',

// Colors
'inset-shadow-red-500',
Expand Down Expand Up @@ -23319,6 +23321,18 @@ test('inset-shadow', async () => {
--color-red-500: #ef4444;
}

.inset-shadow-\\[12px_12px_\\#0088cc\\,12px_12px_var\\(--value\\,\\#0088cc\\)\\]\\/25 {
--tw-inset-shadow-alpha: 25%;
--tw-inset-shadow: inset 12px 12px var(--tw-inset-shadow-color, #08c), inset 12px 12px var(--tw-inset-shadow-color, var(--value, #08c));
box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
}

@supports (color: lab(from red l a b)) {
.inset-shadow-\\[12px_12px_\\#0088cc\\,12px_12px_var\\(--value\\,\\#0088cc\\)\\]\\/25 {
--tw-inset-shadow: inset 12px 12px var(--tw-inset-shadow-color, oklab(59.9824% -.067 -.124 / .25)), inset 12px 12px var(--tw-inset-shadow-color, oklab(from var(--value, #08c) l a b / 25%));
}
}

.inset-shadow-\\[12px_12px_var\\(--value\\)\\]\\/25 {
--tw-inset-shadow-alpha: 25%;
--tw-inset-shadow: inset 12px 12px var(--tw-inset-shadow-color, var(--value));
Expand Down Expand Up @@ -23359,6 +23373,11 @@ test('inset-shadow', async () => {
box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
}

.inset-shadow-\\[12px_12px_\\#0088cc\\,12px_12px_var\\(--value\\,\\#0088cc\\)\\] {
--tw-inset-shadow: inset 12px 12px var(--tw-inset-shadow-color, #08c), inset 12px 12px var(--tw-inset-shadow-color, var(--value, #08c));
box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
}

.inset-shadow-\\[12px_12px_\\#0088cc\\] {
--tw-inset-shadow: inset 12px 12px var(--tw-inset-shadow-color, #08c);
box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
Expand Down
13 changes: 10 additions & 3 deletions packages/tailwindcss/src/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6183,13 +6183,20 @@ function alphaReplacedShadowProperties(
return varInjector(replaceAlpha(color, alpha))
})

function applyPrefix(x: string) {
if (!prefix) return x
return segment(x, ',')
.map((value) => prefix + value)
.join(',')
}

if (requiresFallback) {
return [
decl(property, prefix + replaceShadowColors(value, varInjector)),
rule('@supports (color: lab(from red l a b))', [decl(property, prefix + replacedValue)]),
decl(property, applyPrefix(replaceShadowColors(value, varInjector))),
rule('@supports (color: lab(from red l a b))', [decl(property, applyPrefix(replacedValue))]),
]
} else {
return [decl(property, prefix + replacedValue)]
return [decl(property, applyPrefix(replacedValue))]
}
}

Expand Down