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.

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

fix(preset-mini): support composite props #3810

Merged
merged 12 commits into from
Jun 11, 2024
4 changes: 3 additions & 1 deletion packages/preset-mini/src/_rules/transition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ const transitionPropertyGroup: Record<string, string> = {
}

function transitionProperty(prop: string): string | undefined {
return h.properties(prop) ?? transitionPropertyGroup[prop]
const props = prop.split(',').flatMap(p => h.properties(p) ?? transitionPropertyGroup[p])
if (props.length > 0 && props.every(Boolean))
return props.join(',')
}

export const transitions: Rule<Theme>[] = [
Expand Down
2 changes: 1 addition & 1 deletion playground/src/components.d.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* eslint-disable */
/* prettier-ignore */
// @ts-nocheck
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
export {}

/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
Analyzer: typeof import('./../../packages/inspector/client/components/Analyzer.vue')['default']
Expand Down
3 changes: 3 additions & 0 deletions test/assets/output/preset-mini-targets.css
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,9 @@ unocss .scope-\[unocss\]\:block{display:block;}
.transition-200{transition-property:color,background-color,border-color,outline-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-timing-function:cubic-bezier(0.4, 0, 0.2, 1);transition-duration:200ms;}
.transition-background-color\,color-200{transition-property:background-color,color;transition-timing-function:cubic-bezier(0.4, 0, 0.2, 1);transition-duration:200ms;}
.transition-color\,background-color-200{transition-property:color,background-color;transition-timing-function:cubic-bezier(0.4, 0, 0.2, 1);transition-duration:200ms;}
.transition-colors{transition-property:color,background-color,border-color,outline-color,text-decoration-color,fill,stroke;transition-timing-function:cubic-bezier(0.4, 0, 0.2, 1);transition-duration:150ms;}
.transition-colors\,opacity{transition-property:color,background-color,border-color,outline-color,text-decoration-color,fill,stroke,opacity;transition-timing-function:cubic-bezier(0.4, 0, 0.2, 1);transition-duration:150ms;}
.transition-colors\,opacity-200{transition-property:color,background-color,border-color,outline-color,text-decoration-color,fill,stroke,opacity;transition-timing-function:cubic-bezier(0.4, 0, 0.2, 1);transition-duration:200ms;}
.transition-opacity-200{transition-property:opacity;transition-timing-function:cubic-bezier(0.4, 0, 0.2, 1);transition-duration:200ms;}
.duration-111{transition-duration:111ms;}
.transition-duration-\$variable{transition-duration:var(--variable);}
Expand Down
3 changes: 3 additions & 0 deletions test/assets/preset-mini-targets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -842,6 +842,9 @@ export const presetMiniTargets: string[] = [
'transition-property-[border]',
'transition-200',
'transition-opacity-200',
'transition-colors',
'transition-colors,opacity',
'transition-colors,opacity-200',
'transition-color,background-color-200',
'transition-background-color,color-200',
'transition',
Expand Down
Loading