Skip to content
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

Remove bare value support for translate utilities #13289

Merged
merged 10 commits into from
Mar 21, 2024
+7 −12
Merged

Remove bare value support for translate utilities #13289

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e968b15
make `themeKeys` optional and default to `[]`
RobinMalfait Mar 20, 2024
ef3b47a
remove `themeKeys` that already map 1:1 to a number or percentage
RobinMalfait Mar 20, 2024
0a5fc2d
remove fallback theme key lookup
RobinMalfait Mar 20, 2024
7179a19
drop theme keys from suggestions
RobinMalfait Mar 20, 2024
d90d3bb
drop bare value support for `translate-{axis}`
RobinMalfait Mar 20, 2024
7340cdf
add todo
RobinMalfait Mar 20, 2024
9f5d028
Revert "remove `themeKeys` that already map 1:1 to a number or percen…
RobinMalfait Mar 20, 2024
c3b3e12
Revert "remove fallback theme key lookup"
RobinMalfait Mar 20, 2024
434e0b8
Revert "drop theme keys from suggestions"
RobinMalfait Mar 20, 2024
f6a30d4
Revert "add todo"
RobinMalfait Mar 20, 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
19 changes: 7 additions & 12 deletions packages/tailwindcss/src/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ export function createUtilities(theme: Theme) {
type UtilityDescription = {
supportsNegative?: boolean
supportsFractions?: boolean
themeKeys: ThemeKey[]
themeKeys?: ThemeKey[]
defaultValue?: string | null
handleBareValue?: (value: NamedUtilityValue) => string | null
handle: (value: string) => AstNode[] | undefined
Expand All @@ -315,11 +315,14 @@ export function createUtilities(theme: Theme) {
// ever support both of these — `defaultValue` is for things like
// `grayscale` whereas the `DEFAULT` in theme is for things like
// `shadow` or `blur`.
value = desc.defaultValue ?? theme.get(desc.themeKeys)
value = desc.defaultValue ?? theme.get(desc.themeKeys ?? [])
} else if (candidate.value.kind === 'arbitrary') {
value = candidate.value.value
} else {
value = theme.resolve(candidate.value.fraction ?? candidate.value.value, desc.themeKeys)
value = theme.resolve(
candidate.value.fraction ?? candidate.value.value,
desc.themeKeys ?? [],
)

// Automatically handle things like `w-1/2` without requiring `1/2` to
// exist as a theme value.
Expand All @@ -344,7 +347,7 @@ export function createUtilities(theme: Theme) {
suggest(classRoot, () => [
{
supportsNegative: desc.supportsNegative,
valueThemeKeys: desc.themeKeys,
valueThemeKeys: desc.themeKeys ?? [],
hasDefaultValue: desc.defaultValue !== undefined && desc.defaultValue !== null,
},
])
Expand Down Expand Up @@ -638,7 +641,6 @@ export function createUtilities(theme: Theme) {
})
staticUtility('col-span-full', [['grid-column', '1 / -1']])
functionalUtility('col-span', {
themeKeys: [],
handleBareValue: ({ value }) => {
if (!Number.isInteger(Number(value))) return null
return value
Expand Down Expand Up @@ -1063,7 +1065,6 @@ export function createUtilities(theme: Theme) {
*/
functionalUtility('shrink', {
defaultValue: '1',
themeKeys: [],
handleBareValue: ({ value }) => {
if (Number.isNaN(Number(value))) return null
return value
Expand All @@ -1076,7 +1077,6 @@ export function createUtilities(theme: Theme) {
*/
functionalUtility('grow', {
defaultValue: '1',
themeKeys: [],
handleBareValue: ({ value }) => {
if (Number.isNaN(Number(value))) return null
return value
Expand Down Expand Up @@ -1255,10 +1255,6 @@ export function createUtilities(theme: Theme) {
supportsNegative: true,
supportsFractions: true,
themeKeys: ['--translate', '--spacing'],
handleBareValue: ({ value }) => {
if (Number.isNaN(Number(value))) return null
return `${value}%`
},
handle,
})
utilities.static(`translate-${axis}-px`, (candidate) => {
Expand Down Expand Up @@ -2997,7 +2993,6 @@ export function createUtilities(theme: Theme) {
staticUtility('font-stretch-extra-expanded', [['font-stretch', 'extra-expanded']])
staticUtility('font-stretch-ultra-expanded', [['font-stretch', 'ultra-expanded']])
functionalUtility('font-stretch', {
themeKeys: [],
handleBareValue: ({ value }) => {
if (!value.endsWith('%')) return null
let num = Number(value.slice(0, -1))
Expand Down
Loading