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

Jump to bottom

fix(preset-mini): refactor colorToString #1062

Merged
merged 2 commits into from Jun 4, 2022
Merged

fix(preset-mini): refactor colorToString #1062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a0ff3f
fix(preset-mini): refactor `colorToString`
chu121su12 Jun 3, 2022
dd2167a
lint
chu121su12 Jun 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/preset-mini/src/rules/border.ts
View file
Open in desktop
@@ -1,6 +1,6 @@
import type { CSSEntries, CSSObject, Rule, RuleContext } from '@unocss/core'
import type { Theme } from '../theme'
import { colorToString, cornerMap, directionMap, globalKeywords, handler as h, hasParseableColor, parseColor } from '../utils'
import { colorOpacityToString, colorToString, cornerMap, directionMap, globalKeywords, handler as h, hasParseableColor, parseColor } from '../utils'

const borderStyles = ['solid', 'dashed', 'dotted', 'double', 'hidden', 'none', 'groove', 'ridge', 'inset', 'outset', ...globalKeywords]

Expand Down Expand Up @@ -64,22 +64,22 @@ const borderColorResolver = (direction: string) => ([, body]: string[], theme: T
}
if (direction === '') {
return {
'--un-border-opacity': cssColor.alpha ?? 1,
[`border${direction}-color`]: colorToString(cssColor, `var(--un-border${direction}-opacity)`),
'--un-border-opacity': colorOpacityToString(cssColor),
'border-color': colorToString(cssColor, 'var(--un-border-opacity)'),
}
}
else {
return {
// Separate this return since if `direction` is an empty string, the first key will be overwritten by the second.
'--un-border-opacity': cssColor.alpha ?? 1,
'--un-border-opacity': colorOpacityToString(cssColor),
[`--un-border${direction}-opacity`]: 'var(--un-border-opacity)',
[`border${direction}-color`]: colorToString(cssColor, `var(--un-border${direction}-opacity)`),
}
}
}
else if (color) {
return {
[`border${direction}-color`]: color.replace('%alpha', `${alpha ?? 1}`),
[`border${direction}-color`]: colorToString(color, alpha),
}
}
}
Expand Down
10 changes: 9 additions & 1 deletion packages/preset-mini/src/utils/colors.ts
View file
Open in desktop
Expand Up @@ -34,7 +34,15 @@ export function parseCssColor(str = ''): CSSColorValue | undefined {
return { type, components, alpha }
}

export function colorToString(color: CSSColorValue, alphaOverride?: string | number) {
export function colorOpacityToString(color: CSSColorValue) {
const alpha = color.alpha ?? 1
return alpha === '%alpha' ? 1 : alpha
}

export function colorToString(color: CSSColorValue | string, alphaOverride?: string | number) {
if (typeof color === 'string')
return color.replace('%alpha', `${alphaOverride ?? 1}`)

const { components } = color
let { alpha, type } = color
alpha = alphaOverride ?? alpha
Expand Down
6 changes: 3 additions & 3 deletions packages/preset-mini/src/utils/utilities.ts
View file
Open in desktop
@@ -1,7 +1,7 @@
import type { CSSEntries, CSSObject, ParsedColorValue, RuleContext, VariantContext } from '@unocss/core'
import { toArray } from '@unocss/core'
import type { Theme } from '../theme'
import { colorToString, getComponents, parseCssColor } from './colors'
import { colorOpacityToString, colorToString, getComponents, parseCssColor } from './colors'
import { handler as h } from './handlers'
import { directionMap } from './mappings'

Expand Down Expand Up @@ -147,14 +147,14 @@ export const colorResolver = (property: string, varName: string) => ([, body]: s
}
else {
return {
[`--un-${varName}-opacity`]: cssColor.alpha ?? 1,
[`--un-${varName}-opacity`]: colorOpacityToString(cssColor),
[property]: colorToString(cssColor, `var(--un-${varName}-opacity)`),
}
}
}
else if (color) {
return {
[property]: color.replace('%alpha', `${alpha ?? 1}`),
[property]: colorToString(color, alpha),
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/preset-wind/src/rules/background.ts
View file
Open in desktop
@@ -1,5 +1,5 @@
import type { Rule, RuleContext } from '@unocss/core'
import { colorToString, handler as h, parseColor, positionMap } from '@unocss/preset-mini/utils'
import { colorOpacityToString, colorToString, handler as h, parseColor, positionMap } from '@unocss/preset-mini/utils'
import type { Theme } from '@unocss/preset-mini'

const bgGradientColorResolver = (mode: 'from' | 'to' | 'via') =>
Expand All @@ -19,7 +19,7 @@ const bgGradientColorResolver = (mode: 'from' | 'to' | 'via') =>
if (alpha != null)
colorString = colorToString(cssColor, alpha)
else
colorString = colorToString(cssColor, `var(--un-${mode}-opacity, ${cssColor.alpha ?? 1})`)
colorString = colorToString(cssColor, `var(--un-${mode}-opacity, ${colorOpacityToString(cssColor)})`)
}

switch (mode) {
Expand Down
9 changes: 9 additions & 0 deletions test/__snapshots__/preset-uno.test.ts.snap
View file
Open in desktop
Expand Up @@ -6,6 +6,15 @@ exports[`targets 1`] = `
.border-custom-b\\\\/0{border-color:rgba(var(--custom), 0);}
.border-custom-b\\\\/10{border-color:rgba(var(--custom), 0.1);}
.bg-custom-b{background-color:rgba(var(--custom), 1);}
.bg-custom-c{--un-bg-opacity:1;background-color:rgba(var(--custom-c),var(--un-bg-opacity));}
.bg-custom-c\\\\/10{background-color:rgba(var(--custom-c),0.1);}
.bg-custom-d{background-color:hsl(var(--custom-d), 1);}
.bg-custom-d\\\\/20{background-color:hsl(var(--custom-d), 0.2);}
.bg-custom-e{--un-bg-opacity:1;background-color:hsla(var(--custom-e),var(--un-bg-opacity));}
.bg-custom-e\\\\/30{background-color:hsla(var(--custom-e),0.3);}
.bg-custom-f{--un-bg-opacity:1;background-color:lch(var(--custom-f) / var(--un-bg-opacity));}
.bg-custom-f\\\\/\\\\[var\\\\(--f-op\\\\)\\\\]{background-color:lch(var(--custom-f) / var(--f-op));}
.bg-custom-f\\\\/30{background-color:lch(var(--custom-f) / 0.3);}
.bg-info{--un-bg-opacity:1;background-color:hsla(200.1,100%,54.3%,var(--un-bg-opacity));}
.bg-info\\\\/\\\\[10\\\\%\\\\]{background-color:hsla(200.1,100%,54.3%,10%);}
.bg-info\\\\/10{background-color:hsla(200.1,100%,54.3%,0.1);}
Expand Down
13 changes: 13 additions & 0 deletions test/preset-uno.test.ts
View file
Open in desktop
Expand Up @@ -18,6 +18,15 @@ const targets = [
'border-custom-b',
'border-custom-b/0',
'border-custom-b/10',
'bg-custom-c',
'bg-custom-c/10',
'bg-custom-d',
'bg-custom-d/20',
'bg-custom-e',
'bg-custom-e/30',
'bg-custom-f',
'bg-custom-f/30',
'bg-custom-f/[var(--f-op)]',

// wind - placeholder
'placeholder-red-400',
Expand Down Expand Up @@ -119,6 +128,10 @@ const uno = createGenerator({
custom: {
a: 'var(--custom)',
b: 'rgba(var(--custom), %alpha)',
c: 'rgba(var(--custom-c) / %alpha)',
d: 'hsl(var(--custom-d), %alpha)',
e: 'hsl(var(--custom-e) / %alpha)',
f: 'lch(var(--custom-f) / %alpha)',
},
info: 'hsl(200.1, 100%, 54.3%)',
},
Expand Down