Skip to content

Support combining arbitrary shadows without a color with shadow color utilities #13876

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
adamwathan merged 2 commits into from
Jun 21, 2024
+46 −12
Merged

Support combining arbitrary shadows without a color with shadow color utilities #13876

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5ae2a5
Support combining arbitrary shadows without a color with shadow color…
adamwathan Jun 21, 2024
46bbd1e
Update changelog
adamwathan Jun 21, 2024
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
4 changes: 2 additions & 2 deletions packages/tailwindcss/src/utilities.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12019,7 +12019,7 @@ test('shadow', () => {

.shadow-\\[10px_10px\\] {
--tw-shadow: 10px 10px;
--tw-shadow-colored: 10px 10px;
--tw-shadow-colored: 10px 10px var(--tw-shadow-color);
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 Expand Up @@ -12271,7 +12271,7 @@ test('inset-shadow', () => {

.inset-shadow-\\[10px_10px\\] {
--tw-inset-shadow: inset 10px 10px;
--tw-inset-shadow-colored: inset 10px 10px;
--tw-inset-shadow-colored: inset 10px 10px var(--tw-inset-shadow-color);
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
26 changes: 19 additions & 7 deletions packages/tailwindcss/src/utils/replace-shadow-colors.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,35 @@ import { replaceShadowColors } from './replace-shadow-colors'

const table = [
{
input: ['var(--my-shadow)'],
input: 'var(--my-shadow)',
output: 'var(--my-shadow)',
},
{
input: ['1px var(--my-shadow)'],
input: '1px var(--my-shadow)',
output: '1px var(--my-shadow)',
},
{
input: ['1px 1px var(--my-color)'],
input: '1px 1px var(--my-color)',
output: '1px 1px var(--tw-shadow-color)',
},
{
input: ['0 0 0 var(--my-color)'],
input: '0 0 0 var(--my-color)',
output: '0 0 0 var(--tw-shadow-color)',
},
{
input: ['var(--my-shadow)', '1px 1px var(--my-color)', '0 0 1px var(--my-color)'],
input: '1px 2px',
output: '1px 2px var(--tw-shadow-color)',
},
{
input: '1px 2px 3px',
output: '1px 2px 3px var(--tw-shadow-color)',
},
{
input: '1px 2px 3px 4px',
output: '1px 2px 3px 4px var(--tw-shadow-color)',
},
{
input: ['var(--my-shadow)', '1px 1px var(--my-color)', '0 0 1px var(--my-color)'].join(', '),
output: [
'var(--my-shadow)',
'1px 1px var(--tw-shadow-color)',
Expand All @@ -29,9 +41,9 @@ const table = [
]

it.each(table)(
'should be possible to get the names for an animation: $output',
'should replace the color of box-shadow $input with $output',
({ input, output }) => {
let parsed = replaceShadowColors(input.join(', '), 'var(--tw-shadow-color)')
let parsed = replaceShadowColors(input, 'var(--tw-shadow-color)')
expect(parsed).toEqual(output)
},
)
14 changes: 11 additions & 3 deletions packages/tailwindcss/src/utils/replace-shadow-colors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,18 @@ export function replaceShadowColors(input: string, replacement: string): string
}
}

// Only replace if we found an x-offset, y-offset, and color, otherwise we
// may be replacing the wrong part of the box-shadow.
if (offsetX !== null && offsetY !== null && color !== null) {
// If the x and y offsets were not detected, the shadow is either invalid or
// using a variable to represent more than one field in the shadow value, so
// we can't know what to replace.
if (offsetX === null || offsetY === null) continue

if (color !== null) {
// If a color was found, replace the color.
input = input.replace(color, replacement)
} else {
// If no color was found, assume the shadow is relying on the browser
// default shadow color and append the replacement color.
input = `${input} ${replacement}`
}
}

Expand Down
10 changes: 10 additions & 0 deletions packages/tailwindcss/tests/ui.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ test('shadow colors', async ({ page }) => {
html`
<div id="x" class="shadow shadow-red-500"></div>
<div id="y" class="shadow-xl shadow-red-500"></div>
<div id="z" class="shadow-[0px_2px_4px] shadow-red-500"></div>
`,
)

Expand All @@ -187,6 +188,15 @@ test('shadow colors', async ({ page }) => {
'rgb(239, 68, 68) 0px 20px 25px -5px, rgb(239, 68, 68) 0px 8px 10px -6px',
].join(', '),
)
expect(await getPropertyValue('#z', 'box-shadow')).toEqual(
[
'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
'rgb(239, 68, 68) 0px 2px 4px 0px',
].join(', '),
)
})

test('outline style is optional', async ({ page }) => {
Expand Down