Skip to content

Commit

Permalink
Merge branch 'main' into hsl
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon-He95 committed Oct 21, 2023
2 parents f6e17d9 + d0e101d commit f1bb5e2
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
4 changes: 2 additions & 2 deletions packages/preset-mini/src/_rules/transform.ts
Expand Up @@ -84,9 +84,9 @@ export const transforms: Rule[] = [
[/^(?:transform-)?rotate-()(.+)$/, handleRotate],
[/^(?:transform-)?rotate-([xyz])-(.+)$/, handleRotate],
[/^(?:transform-)?skew-()(.+)$/, handleSkew],
[/^(?:transform-)?skew-([xy])-(.+)$/, handleSkew, { autocomplete: ['transform-skew-(x|y)-<percent>'] }],
[/^(?:transform-)?skew-([xy])-(.+)$/, handleSkew, { autocomplete: ['transform-skew-(x|y)-<percent>', 'skew-(x|y)-<percent>'] }],
[/^(?:transform-)?scale-()(.+)$/, handleScale],
[/^(?:transform-)?scale-([xyz])-(.+)$/, handleScale, { autocomplete: [`transform-(${transformValues.join('|')})-<percent>`, `transform-(${transformValues.join('|')})-(x|y|z)-<percent>`] }],
[/^(?:transform-)?scale-([xyz])-(.+)$/, handleScale, { autocomplete: [`transform-(${transformValues.join('|')})-<percent>`, `transform-(${transformValues.join('|')})-(x|y|z)-<percent>`, `(${transformValues.join('|')})-<percent>`, `(${transformValues.join('|')})-(x|y|z)-<percent>`] }],

// style
[/^(?:transform-)?preserve-3d$/, () => ({ 'transform-style': 'preserve-3d' })],
Expand Down
4 changes: 2 additions & 2 deletions packages/preset-wind/src/theme.ts
Expand Up @@ -185,8 +185,8 @@ export const theme: Theme = {
low_contrast: '(prefers-contrast: low)',
opacity_ok: '(prefers-reduced-transparency: no-preference)',
opacity_not_ok: '(prefers-reduced-transparency: reduce)',
useData_ok: '(prefers-reduced-data: no-preference)',
useData_not_ok: '(prefers-reduced-data: reduce)',
use_data_ok: '(prefers-reduced-data: no-preference)',
use_data_not_ok: '(prefers-reduced-data: reduce)',
touch: '(hover: none) and (pointer: coarse)',
stylus: '(hover: none) and (pointer: fine)',
pointer: '(hover) and (pointer: coarse)',
Expand Down
5 changes: 5 additions & 0 deletions test/__snapshots__/autocomplete.test.ts.snap
Expand Up @@ -55,9 +55,12 @@ exports[`autocomplete > should provide autocomplete 1`] = `
"outline-": "outline-amber outline-auto outline-black outline-blue outline-bluegray outline-blueGray outline-coolgray outline-coolGray outline-current outline-cyan",
"outline-offset-": "outline-offset-0 outline-offset-1 outline-offset-2 outline-offset-3 outline-offset-4 outline-offset-5 outline-offset-6 outline-offset-8 outline-offset-10 outline-offset-12",
"placeholder-": "placeholder-.dark: placeholder-.light: placeholder-@dark: placeholder-@hover: placeholder-@light: placeholder-absolute placeholder-active: placeholder-after: placeholder-animate-delay placeholder-animate-direction",
"scale-": "scale-0 scale-10 scale-20 scale-30 scale-40 scale-50 scale-60 scale-70 scale-80 scale-90",
"scale-x-": "scale-x-0 scale-x-10 scale-x-20 scale-x-30 scale-x-40 scale-x-50 scale-x-60 scale-x-70 scale-x-80 scale-x-90",
"scroll-": "scroll-auto scroll-block scroll-inherit scroll-initial scroll-inline scroll-m scroll-ma scroll-p scroll-pa scroll-revert",
"scroll-m-": "scroll-m-b scroll-m-be scroll-m-bs scroll-m-ie scroll-m-is scroll-m-l scroll-m-lg scroll-m-none scroll-m-r scroll-m-sm",
"shadow-": "shadow-amber shadow-black shadow-blue shadow-bluegray shadow-blueGray shadow-coolgray shadow-coolGray shadow-current shadow-cyan shadow-dark",
"skew-x-": "skew-x-0 skew-x-10 skew-x-20 skew-x-30 skew-x-40 skew-x-50 skew-x-60 skew-x-70 skew-x-80 skew-x-90",
"space-": "space-block space-block-reverse space-inline space-inline-reverse space-x space-x-reverse space-y space-y-reverse",
"text-r": "text-red text-revert text-revert-layer text-right text-rose",
"text-red-": "text-red-1 text-red-2 text-red-3 text-red-4 text-red-5 text-red-6 text-red-7 text-red-8 text-red-9 text-red-50",
Expand All @@ -68,6 +71,8 @@ exports[`autocomplete > should provide autocomplete 1`] = `
"transform-skew-x-": "transform-skew-x-0 transform-skew-x-10 transform-skew-x-20 transform-skew-x-30 transform-skew-x-40 transform-skew-x-50 transform-skew-x-60 transform-skew-x-70 transform-skew-x-80 transform-skew-x-90",
"transform-skew-y-": "transform-skew-y-0 transform-skew-y-10 transform-skew-y-20 transform-skew-y-30 transform-skew-y-40 transform-skew-y-50 transform-skew-y-60 transform-skew-y-70 transform-skew-y-80 transform-skew-y-90",
"transition-": "transition-all transition-colors transition-inherit transition-initial transition-none transition-opacity transition-revert transition-revert-layer transition-shadow transition-transform",
"translate-": "translate-0 translate-10 translate-20 translate-30 translate-40 translate-50 translate-60 translate-70 translate-80 translate-90",
"translate-x-": "translate-x-0 translate-x-10 translate-x-20 translate-x-30 translate-x-40 translate-x-50 translate-x-60 translate-x-70 translate-x-80 translate-x-90",
"v-": "v-base v-baseline v-bottom v-btm v-end v-inherit v-initial v-mid v-middle v-revert",
"w-": "w-auto w-full w-lg w-md w-none w-prose w-screen w-sm w-xl w-xs",
"z-": "z-0 z-1 z-2 z-3 z-4 z-5 z-6 z-8 z-10 z-12",
Expand Down
5 changes: 5 additions & 0 deletions test/autocomplete.test.ts
Expand Up @@ -91,6 +91,11 @@ describe('autocomplete', () => {
'text-red-',
'touch-',
'transition-',
'translate-',
'translate-x-',
'scale-',
'scale-x-',
'skew-x-',
'transform-scale-z-',
'transform-scale-x-',
'transform-scale-',
Expand Down

0 comments on commit f1bb5e2

Please sign in to comment.