From 731a8c9c0d1f233275c17a08e1e43d229e65f405 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Sun, 8 Jan 2023 09:00:12 +0100 Subject: [PATCH] feat(preset-mini): support `pos-` prefix for z-index --- packages/preset-mini/src/_rules/position.ts | 4 ++-- test/__snapshots__/preset-mini.test.ts.snap | 6 ++++-- test/assets/preset-mini-targets.ts | 10 +++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/packages/preset-mini/src/_rules/position.ts b/packages/preset-mini/src/_rules/position.ts index 468805dc43..3ee8370149 100644 --- a/packages/preset-mini/src/_rules/position.ts +++ b/packages/preset-mini/src/_rules/position.ts @@ -140,8 +140,8 @@ export const floats: Rule[] = [ ] export const zIndexes: Rule[] = [ - [/^z([\d.]+)$/, ([, v]) => ({ 'z-index': h.number(v) })], - [/^z-(.+)$/, ([, v]) => ({ 'z-index': h.bracket.cssvar.global.auto.number(v) }), { autocomplete: 'z-' }], + [/^(?:position-|pos-)?z([\d.]+)$/, ([, v]) => ({ 'z-index': h.number(v) })], + [/^(?:position-|pos-)?z-(.+)$/, ([, v]) => ({ 'z-index': h.bracket.cssvar.global.auto.number(v) }), { autocomplete: 'z-' }], ] export const boxSizing: Rule[] = [ diff --git a/test/__snapshots__/preset-mini.test.ts.snap b/test/__snapshots__/preset-mini.test.ts.snap index b41acfcb0a..d3aed38b0a 100644 --- a/test/__snapshots__/preset-mini.test.ts.snap +++ b/test/__snapshots__/preset-mini.test.ts.snap @@ -829,11 +829,13 @@ unocss .scope-\\\\[unocss\\\\]\\\\:block{display:block;} .clear-revert{clear:revert;} .z-0, .z0{z-index:0;} -.-z-1{z-index:-1;} +.-z-1, +.pos-z--1{z-index:-1;} +.position-z-auto, +.z-auto{z-index:auto;} .z-\\\\$variable{z-index:var(--variable);} .z-1{z-index:1;} .z-100{z-index:100;} -.z-auto{z-index:auto;} .z-inherit{z-index:inherit;} .box-border{box-sizing:border-box;} .box-content{box-sizing:content-box;} diff --git a/test/assets/preset-mini-targets.ts b/test/assets/preset-mini-targets.ts index 433317706a..cdf5aa6178 100644 --- a/test/assets/preset-mini-targets.ts +++ b/test/assets/preset-mini-targets.ts @@ -388,15 +388,19 @@ export const presetMiniTargets: string[] = [ 'clear-both', 'clear-none', 'clear-revert', + 'box-content', + 'box-border', + 'box-inherit', + + // position - z-index 'z0', 'z-0', 'z-1', 'z-100', 'z-auto', 'z-inherit', - 'box-content', - 'box-border', - 'box-inherit', + 'pos-z--1', + 'position-z-auto', // ring, shadow 'ring',