Skip to content

Commit 3607f83

Browse files
philipp-spiessphilipp-spiess
committed
Move suggestion into utility helper
1 parent 05f9708 commit 3607f83

File tree

1 file changed

+22
-153
lines changed

1 file changed

+22
-153
lines changed

‎packages/tailwindcss/src/utilities.ts‎

Lines changed: 22 additions & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -708,8 +708,7 @@ export function createUtilities(theme: Theme) {
708708
auto: [decl('grid-column', 'auto')],
709709
},
710710
})
711-
// Ensure discoverability for `col-auto` after converting to fallback
712-
suggest('col', () => [{ values: ['auto'], valueThemeKeys: ['--grid-column'] }])
711+
713712
functionalUtility('col-span', {
714713
handleBareValue: ({ value }) => {
715714
if (!isPositiveInteger(value)) return null
@@ -755,13 +754,12 @@ export function createUtilities(theme: Theme) {
755754

756755
suggest('col-span', () => [
757756
{
758-
values: ['full', ...Array.from({ length: 12 }, (_, i) => `${i + 1}`)],
757+
values: Array.from({ length: 12 }, (_, i) => `${i + 1}`),
759758
valueThemeKeys: [],
760759
},
761760
])
762761

763762
suggest('col-start', () => [
764-
{ values: ['auto'], valueThemeKeys: ['--grid-column-start'] },
765763
{
766764
supportsNegative: true,
767765
values: Array.from({ length: 13 }, (_, i) => `${i + 1}`),
@@ -770,7 +768,6 @@ export function createUtilities(theme: Theme) {
770768
])
771769

772770
suggest('col-end', () => [
773-
{ values: ['auto'], valueThemeKeys: ['--grid-column-end'] },
774771
{
775772
supportsNegative: true,
776773
values: Array.from({ length: 13 }, (_, i) => `${i + 1}`),
@@ -793,8 +790,7 @@ export function createUtilities(theme: Theme) {
793790
auto: [decl('grid-row', 'auto')],
794791
},
795792
})
796-
// Ensure discoverability for `row-auto` after converting to fallback
797-
suggest('row', () => [{ values: ['auto'], valueThemeKeys: ['--grid-row'] }])
793+
798794
functionalUtility('row-span', {
799795
themeKeys: [],
800796
handleBareValue: ({ value }) => {
@@ -841,13 +837,12 @@ export function createUtilities(theme: Theme) {
841837

842838
suggest('row-span', () => [
843839
{
844-
values: ['full', ...Array.from({ length: 12 }, (_, i) => `${i + 1}`)],
840+
values: Array.from({ length: 12 }, (_, i) => `${i + 1}`),
845841
valueThemeKeys: [],
846842
},
847843
])
848844

849845
suggest('row-start', () => [
850-
{ values: ['auto'], valueThemeKeys: ['--grid-row-start'] },
851846
{
852847
supportsNegative: true,
853848
values: Array.from({ length: 13 }, (_, i) => `${i + 1}`),
@@ -856,7 +851,6 @@ export function createUtilities(theme: Theme) {
856851
])
857852

858853
suggest('row-end', () => [
859-
{ values: ['auto'], valueThemeKeys: ['--grid-row-end'] },
860854
{
861855
supportsNegative: true,
862856
values: Array.from({ length: 13 }, (_, i) => `${i + 1}`),
@@ -936,7 +930,7 @@ export function createUtilities(theme: Theme) {
936930

937931
suggest('line-clamp', () => [
938932
{
939-
values: ['none', '1', '2', '3', '4', '5', '6'],
933+
values: ['1', '2', '3', '4', '5', '6'],
940934
valueThemeKeys: ['--line-clamp'],
941935
},
942936
])
@@ -991,13 +985,7 @@ export function createUtilities(theme: Theme) {
991985
},
992986
})
993987

994-
// Suggest only the keyword aspect values (no fraction burst)
995-
suggest('aspect', () => [
996-
{
997-
values: ['auto', 'square'],
998-
valueThemeKeys: ['--aspect'],
999-
},
1000-
])
988+
1001989

1002990
/**
1003991
* @css `size`
@@ -1245,23 +1233,7 @@ export function createUtilities(theme: Theme) {
12451233
},
12461234
})
12471235

1248-
// Suggest keyword origin values to match snapshot
1249-
suggest('origin', () => [
1250-
{
1251-
values: [
1252-
'center',
1253-
'top',
1254-
'top-right',
1255-
'right',
1256-
'bottom-right',
1257-
'bottom',
1258-
'bottom-left',
1259-
'left',
1260-
'top-left',
1261-
],
1262-
valueThemeKeys: ['--transform-origin'],
1263-
},
1264-
])
1236+
12651237

12661238
functionalUtility('perspective-origin', {
12671239
themeKeys: ['--perspective-origin'],
@@ -1279,23 +1251,7 @@ export function createUtilities(theme: Theme) {
12791251
},
12801252
})
12811253

1282-
// Suggest keyword perspective-origin values to match snapshot
1283-
suggest('perspective-origin', () => [
1284-
{
1285-
values: [
1286-
'center',
1287-
'top',
1288-
'top-right',
1289-
'right',
1290-
'bottom-right',
1291-
'bottom',
1292-
'bottom-left',
1293-
'left',
1294-
'top-left',
1295-
],
1296-
valueThemeKeys: ['--perspective-origin'],
1297-
},
1298-
])
1254+
12991255

13001256
/**
13011257
* @css `perspective`
@@ -1308,13 +1264,7 @@ export function createUtilities(theme: Theme) {
13081264
},
13091265
})
13101266

1311-
// Suggest `perspective-none` to match snapshot
1312-
suggest('perspective', () => [
1313-
{
1314-
values: ['none'],
1315-
valueThemeKeys: ['--perspective'],
1316-
},
1317-
])
1267+
13181268

13191269
let translateProperties = () =>
13201270
atRoot([
@@ -1875,12 +1825,7 @@ export function createUtilities(theme: Theme) {
18751825
},
18761826
})
18771827

1878-
suggest('list', () => [
1879-
{
1880-
values: ['none', 'disc', 'decimal'],
1881-
valueThemeKeys: ['--list-style-type'],
1882-
},
1883-
])
1828+
18841829

18851830
// list-image-*
18861831

@@ -1892,12 +1837,7 @@ export function createUtilities(theme: Theme) {
18921837
},
18931838
})
18941839

1895-
suggest('list-image', () => [
1896-
{
1897-
values: ['none'],
1898-
valueThemeKeys: ['--list-style-image'],
1899-
},
1900-
])
1840+
19011841

19021842
staticUtility('appearance-none', [['appearance', 'none']])
19031843
staticUtility('appearance-auto', [['appearance', 'auto']])
@@ -1923,7 +1863,7 @@ export function createUtilities(theme: Theme) {
19231863

19241864
suggest('columns', () => [
19251865
{
1926-
values: ['auto', ...Array.from({ length: 12 }, (_, i) => `${i + 1}`)],
1866+
values: Array.from({ length: 12 }, (_, i) => `${i + 1}`),
19271867
valueThemeKeys: ['--columns', '--container'],
19281868
},
19291869
])
@@ -1957,12 +1897,7 @@ export function createUtilities(theme: Theme) {
19571897
},
19581898
})
19591899

1960-
suggest('auto-cols', () => [
1961-
{
1962-
values: ['auto', 'min', 'max', 'fr'],
1963-
valueThemeKeys: ['--grid-auto-columns'],
1964-
},
1965-
])
1900+
19661901

19671902
functionalUtility('auto-rows', {
19681903
themeKeys: ['--grid-auto-rows'],
@@ -1975,12 +1910,7 @@ export function createUtilities(theme: Theme) {
19751910
},
19761911
})
19771912

1978-
suggest('auto-rows', () => [
1979-
{
1980-
values: ['auto', 'min', 'max', 'fr'],
1981-
valueThemeKeys: ['--grid-auto-rows'],
1982-
},
1983-
])
1913+
19841914

19851915
functionalUtility('grid-cols', {
19861916
themeKeys: ['--grid-template-columns'],
@@ -2010,14 +1940,14 @@ export function createUtilities(theme: Theme) {
20101940

20111941
suggest('grid-cols', () => [
20121942
{
2013-
values: ['none', 'subgrid', ...Array.from({ length: 12 }, (_, i) => `${i + 1}`)],
1943+
values: Array.from({ length: 12 }, (_, i) => `${i + 1}`),
20141944
valueThemeKeys: ['--grid-template-columns'],
20151945
},
20161946
])
20171947

20181948
suggest('grid-rows', () => [
20191949
{
2020-
values: ['none', 'subgrid', ...Array.from({ length: 12 }, (_, i) => `${i + 1}`)],
1950+
values: Array.from({ length: 12 }, (_, i) => `${i + 1}`),
20211951
valueThemeKeys: ['--grid-template-rows'],
20221952
},
20231953
])
@@ -2280,31 +2210,7 @@ export function createUtilities(theme: Theme) {
22802210
})
22812211
}
22822212

2283-
// Ensure IntelliSense continues to suggest `none` and `full` for all rounded-* roots
2284-
for (let root of [
2285-
'rounded',
2286-
'rounded-s',
2287-
'rounded-e',
2288-
'rounded-t',
2289-
'rounded-r',
2290-
'rounded-b',
2291-
'rounded-l',
2292-
'rounded-ss',
2293-
'rounded-se',
2294-
'rounded-ee',
2295-
'rounded-es',
2296-
'rounded-tl',
2297-
'rounded-tr',
2298-
'rounded-br',
2299-
'rounded-bl',
2300-
]) {
2301-
suggest(root, () => [
2302-
{
2303-
values: ['none', 'full'],
2304-
valueThemeKeys: ['--radius'],
2305-
},
2306-
])
2307-
}
2213+
23082214
}
23092215

23102216
staticUtility('border-solid', [
@@ -3812,22 +3718,7 @@ export function createUtilities(theme: Theme) {
38123718
})
38133719

38143720
// Keep keyword object-position values discoverable in IntelliSense
3815-
suggest('object', () => [
3816-
{
3817-
values: [
3818-
'top',
3819-
'top-left',
3820-
'top-right',
3821-
'bottom',
3822-
'bottom-left',
3823-
'bottom-right',
3824-
'left',
3825-
'right',
3826-
'center',
3827-
],
3828-
valueThemeKeys: ['--object-position'],
3829-
},
3830-
])
3721+
38313722

38323723
for (let [name, property] of [
38333724
['p', 'padding'],
@@ -4062,12 +3953,7 @@ export function createUtilities(theme: Theme) {
40623953
},
40633954
})
40643955

4065-
suggest('animate', () => [
4066-
{
4067-
values: ['none'],
4068-
valueThemeKeys: ['--animate'],
4069-
},
4070-
])
3956+
40713957

40723958
{
40733959
let cssFilterValue = [
@@ -4179,12 +4065,7 @@ export function createUtilities(theme: Theme) {
41794065
},
41804066
})
41814067

4182-
suggest('blur', () => [
4183-
{
4184-
values: ['none'],
4185-
valueThemeKeys: ['--blur'],
4186-
},
4187-
])
4068+
41884069

41894070
functionalUtility('backdrop-blur', {
41904071
themeKeys: ['--backdrop-blur', '--blur'],
@@ -4204,12 +4085,7 @@ export function createUtilities(theme: Theme) {
42044085
},
42054086
})
42064087

4207-
suggest('backdrop-blur', () => [
4208-
{
4209-
values: ['none'],
4210-
valueThemeKeys: ['--backdrop-blur', '--blur'],
4211-
},
4212-
])
4088+
42134089

42144090
functionalUtility('brightness', {
42154091
themeKeys: ['--brightness'],
@@ -4931,13 +4807,7 @@ export function createUtilities(theme: Theme) {
49314807
},
49324808
)
49334809

4934-
// Ensure `leading-none` remains suggested
4935-
suggest('leading', () => [
4936-
{
4937-
values: ['none'],
4938-
valueThemeKeys: ['--leading', '--spacing'],
4939-
},
4940-
])
4810+
49414811

49424812
functionalUtility('tracking', {
49434813
supportsNegative: true,
@@ -5190,7 +5060,6 @@ export function createUtilities(theme: Theme) {
51905060
})
51915061

51925062
suggest('underline-offset', () => [
5193-
{ values: ['auto'], valueThemeKeys: ['--text-underline-offset'] },
51945063
{
51955064
supportsNegative: true,
51965065
values: ['0', '1', '2', '4', '8'],

0 commit comments

Comments
 (0)