@a-type/ui 1.7.4 → 1.7.6

package/src/uno.preset.ts

@@ -1,5 +1,9 @@
-import { entriesToCss, toArray } from '@unocss/core';
-import { PreflightContext, Preset, presetUno } from 'unocss';
+import { DynamicRule, entriesToCss, toArray } from '@unocss/core';
+import { bgColors as bgColorsRules } from '@unocss/preset-mini/rules';
+import presetWind3 from '@unocss/preset-wind3';
+import { PreflightContext, Preset } from 'unocss';
+
+const baseBgRule = bgColorsRules[0] as unknown as DynamicRule;
 
 const spacing = {
 	sm: 0.125,
@@ -21,7 +25,7 @@ export default function presetAglio({
 	},
 	borderScale = 1,
 	roundedness = 1,
-	saturation = 10,
+	saturation = 15,
 }: {
 	scale?: 'sm' | 'md' | 'lg';
 	interFontLocation?: string;
@@ -428,12 +432,20 @@ export default function presetAglio({
 			],
 			[
 				/^bg-(.*)$/,
-				(match, { theme }) => {
+				(match, ctx) => {
+					const { theme } = ctx;
+					const resolvedColor = resolveThemeColor(match[1], theme);
+					if (resolvedColor === null) {
+						return baseBgRule[1](match, ctx);
+					}
 					return {
 						'background-color': 'var(--v-bg-altered,var(--v-bg))',
 						['--v-bg']: resolveThemeColor(match[1], theme),
 					};
 				},
+				{
+					autocomplete: `bg-$colors`,
+				},
 			],
 			[
 				/^bg-lighten-(\d+\.?\d*)$/,
@@ -556,7 +568,7 @@ export default function presetAglio({
 					--palette-green-20: #246869;
 					--palette-green-10: #274e50;
 					--palette-green-00: #18352e;
-					--palette-yellow-90: #fffbee;
+					--palette-yellow-90: #fff9ee;
 					--palette-yellow-80: #fff1c7;
 					--palette-yellow-70: #ffdf7c;
 					--palette-yellow-60: #ffdb57;
@@ -565,7 +577,7 @@ export default function presetAglio({
 					--palette-yellow-30: #8e5c00;
 					--palette-yellow-20: #714d00;
 					--palette-yellow-10: #634500;
-					--palette-yellow-00: #3b1c00;
+					--palette-yellow-00:rgb(59, 45, 0);
 					--palette-blue-90:rgb(231, 246, 255);
 					--palette-blue-80: #c4e7ff;
 					--palette-blue-70: #87d3fc;
@@ -799,7 +811,22 @@ export default function presetAglio({
 					--color-primary-dark: var(--color-yellow-dark);
 					--color-primary-wash: var(--color-yellow-wash);
 
-					--gray-hue-tweak: -10;
+					--gray-hue-tweak: -20;
+				}
+
+				/* fix yellow hue in dark mode */
+				@media(prefers-color-scheme: dark) {
+					.theme-lemon {
+						--gray-hue-tweak: 0;
+					}
+
+					html.override-light.theme-lemon, html.override-light .theme-lemon {
+						--gray-hue-tweak: -20;
+					}
+				}
+
+				html.override-dark.theme-lemon, html.override-dark .theme-lemon {
+					--gray-hue-tweak: 0;
 				}
 
 				.theme-blueberry {
@@ -841,10 +868,10 @@ export default function presetAglio({
 					--color-attention: var(--color-red);
 					--color-attention-dark: var(--color-red-dark);
 					--color-attention-wash: var(--color-red-wash);
-					--color-accent: var(--color-yellow);
-					--color-accent-wash: var(--color-yellow-wash);
-					--color-accent-light: var(--color-yellow-light);
-					--color-accent-dark: var(--color-yellow-dark);
+					--color-accent: var(--color-blue);
+					--color-accent-wash: var(--color-blue-wash);
+					--color-accent-light: var(--color-blue-light);
+					--color-accent-dark: var(--color-blue-dark);
 					--color-primary: var(--color-green);
 					--color-primary-light: var(--color-green-light);
 					--color-primary-dark: var(--color-green-dark);
@@ -946,7 +973,7 @@ export default function presetAglio({
 		],
 
 		presets: [
-			presetUno({
+			presetWind3({
 				preflight: false,
 			}),
 		],
@@ -1031,6 +1058,10 @@ function resolveThemeColor(color: string, theme: any) {
 		return resolvedColor.DEFAULT;
 	}
 
+	if (!resolvedColor) {
+		return null;
+	}
+
 	return resolvedColor;
 }