File tree Expand file tree Collapse file tree 1 file changed +19
-13
lines changed
packages-presets/preset-wind4/src/rules Expand file tree Collapse file tree 1 file changed +19
-13
lines changed Original file line number Diff line number Diff line change @@ -16,23 +16,29 @@ function getPropName(minmax: string, hw: string) {
16
16
function getSizeValue ( theme : Theme , hw : string , prop : string ) {
17
17
let v : string | undefined
18
18
19
- if ( theme . container ?. [ prop ] ) {
20
- themeTracking ( 'container' , prop )
21
- v = generateThemeVariable ( 'container' , prop )
19
+ const keys : ( keyof Theme ) [ ] = [ 'container' , 'spacing' ]
20
+ for ( const key of keys ) {
21
+ if ( ( theme [ key ] as Record < string , any > ) ?. [ prop ] ) {
22
+ themeTracking ( key , prop )
23
+ v = generateThemeVariable ( key , prop )
24
+ break
25
+ }
22
26
}
23
27
24
- switch ( prop ) {
25
- case 'fit' :
26
- case 'max' :
27
- case 'min' :
28
- v = `${ prop } -content`
29
- break
30
- case 'screen' :
31
- v = hw === 'w' ? '100vw' : '100vh'
32
- break
28
+ if ( ! v ) {
29
+ switch ( prop ) {
30
+ case 'fit' :
31
+ case 'max' :
32
+ case 'min' :
33
+ v = `${ prop } -content`
34
+ break
35
+ case 'screen' :
36
+ v = hw === 'w' ? '100vw' : '100vh'
37
+ break
38
+ }
33
39
}
34
40
35
- if ( h . number ( prop ) != null ) {
41
+ if ( ! v && h . number ( prop ) != null ) {
36
42
themeTracking ( `spacing` )
37
43
v = `calc(var(--spacing) * ${ h . number ( prop ) } )`
38
44
}
You can’t perform that action at this time.
0 commit comments