Skip to content

Commit 4dc3b91

Browse files
authored
Merge branch 'feat/add-scrollbar-gutter' into fix/add-scrollbar-property-order
2 parents b1a2848 + 892af9d commit 4dc3b91

5 files changed

Lines changed: 39 additions & 0 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414
- Allow using `@variant` with stacked variants (e.g. `@variant hover:focus { … }`) ([#19996](https://github.com/tailwindlabs/tailwindcss/pull/19996))
1515
- Allow using `@variant` with compound variants (e.g. `@variant hover, focus { … }`) ([#19996](https://github.com/tailwindlabs/tailwindcss/pull/19996))
1616
- Support `--default(…)` in `--value(…)` and `--modifier(…)` for functional `@utility` definitions ([#19989](https://github.com/tailwindlabs/tailwindcss/pull/19989))
17+
- Add `scrollbar-gutter-*` utilities ([#20018](https://github.com/tailwindlabs/tailwindcss/pull/20018))
1718

1819
### Fixed
1920

packages/tailwindcss/src/__snapshots__/intellisense.test.ts.snap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11014,6 +11014,9 @@ exports[`getClassList 1`] = `
1101411014
"scroll-py-px",
1101511015
"scroll-smooth",
1101611016
"scrollbar-auto",
11017+
"scrollbar-gutter-auto",
11018+
"scrollbar-gutter-both",
11019+
"scrollbar-gutter-stable",
1101711020
"scrollbar-none",
1101811021
"scrollbar-thin",
1101911022
"scrollbar-thumb-current",

packages/tailwindcss/src/property-order.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ export default [
133133

134134
'scrollbar-width',
135135
'scrollbar-color',
136+
'scrollbar-gutter',
136137

137138
'list-style-position',
138139
'list-style-type',

packages/tailwindcss/src/utilities.test.ts

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11439,6 +11439,36 @@ test('scrollbar-width', async () => {
1143911439
).toEqual('')
1144011440
})
1144111441

11442+
test('scrollbar-gutter', async () => {
11443+
expect(await run(['scrollbar-gutter-auto', 'scrollbar-gutter-stable', 'scrollbar-gutter-both']))
11444+
.toMatchInlineSnapshot(`
11445+
"
11446+
.scrollbar-gutter-auto {
11447+
scrollbar-gutter: auto;
11448+
}
11449+
11450+
.scrollbar-gutter-both {
11451+
scrollbar-gutter: stable both-edges;
11452+
}
11453+
11454+
.scrollbar-gutter-stable {
11455+
scrollbar-gutter: stable;
11456+
}
11457+
"
11458+
`)
11459+
expect(
11460+
await run([
11461+
'scrollbar-gutter',
11462+
'-scrollbar-gutter-auto',
11463+
'-scrollbar-gutter-stable',
11464+
'-scrollbar-gutter-both',
11465+
'scrollbar-gutter-auto/foo',
11466+
'scrollbar-gutter-stable/foo',
11467+
'scrollbar-gutter-both/foo',
11468+
]),
11469+
).toEqual('')
11470+
})
11471+
1144211472
test('scrollbar-thumb', async () => {
1144311473
expect(
1144411474
await compileCss(

packages/tailwindcss/src/utilities.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2218,6 +2218,10 @@ export function createUtilities(theme: Theme) {
22182218
staticUtility('scrollbar-thin', [['scrollbar-width', 'thin']])
22192219
staticUtility('scrollbar-none', [['scrollbar-width', 'none']])
22202220

2221+
staticUtility('scrollbar-gutter-auto', [['scrollbar-gutter', 'auto']])
2222+
staticUtility('scrollbar-gutter-stable', [['scrollbar-gutter', 'stable']])
2223+
staticUtility('scrollbar-gutter-both', [['scrollbar-gutter', 'stable both-edges']])
2224+
22212225
{
22222226
let scrollbarColorProperties = () => {
22232227
return atRoot([

0 commit comments

Comments
 (0)