vueless 0.0.74 → 0.0.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vueless",
-  "version": "0.0.74",
+  "version": "0.0.75",
   "license": "MIT",
   "description": "Vue Styleless Component Framework.",
   "homepage": "https://vueless.com",

package/preset.tailwind/index.js

@@ -3,9 +3,10 @@ import forms from "@tailwindcss/forms";
 import vuelessConfig from "../../../vueless.config.js";
 
 export const GRAY_COLORS = ["slate", "gray", "zinc", "neutral", "stone"];
-export const GRAYSCALE_BRAND_COLOR = "grayscale";
+export const GRAYSCALE_COLOR = "grayscale";
+export const BRAND_COLOR = "brand";
 export const BRAND_COLORS = [
-  "brand",
+  BRAND_COLOR,
   "red",
   "orange",
   "amber",
@@ -37,7 +38,7 @@ export function vuelessPreset() {
   let brandPalette = BRAND_COLORS.includes(brand) ? colors[brand] : colors.green;
   let grayPalette = GRAY_COLORS.includes(gray) ? colors[gray] : colors.zinc;
 
-  if (brand === GRAYSCALE_BRAND_COLOR) {
+  if (brand === GRAYSCALE_COLOR) {
     brandPalette = grayPalette;
   }
 

package/service.ui/index.js

@@ -2,7 +2,7 @@ import { merge } from "lodash-es";
 import { defineConfig } from "cva";
 import { twMerge } from "tailwind-merge";
 import colors from "tailwindcss/colors";
-import { BRAND_COLORS, GRAY_COLORS, GRAYSCALE_BRAND_COLOR } from "../preset.tailwind";
+import { BRAND_COLORS, GRAY_COLORS, GRAYSCALE_COLOR, BRAND_COLOR } from "../preset.tailwind";
 import vuelessConfig from "../../../vueless.config.js";
 
 /*
@@ -105,7 +105,7 @@ export default class UIServiceDefault {
   // TODO: This should be rewrote to support all set of brand colors (not only one).
   setBrandColor(brandColor) {
     function getBrandColor(color, grayColor, brandColors) {
-      if (color === GRAYSCALE_BRAND_COLOR) {
+      if (color === GRAYSCALE_COLOR) {
         return grayColor;
       }
 
@@ -166,12 +166,17 @@ export default class UIServiceDefault {
     @returns { Object }
   */
   static get(defaultConfig, name) {
+    const defaultVariants = merge(
+      defaultConfig.defaultVariants,
+      globalComponentConfig[name]?.defaultVariants,
+    );
+
+    if (brand === GRAYSCALE_COLOR && defaultVariants.color === BRAND_COLOR) {
+      defaultVariants.color = GRAYSCALE_COLOR;
+    }
+
     return {
-      default: merge(
-        defaultConfig.defaultVariants,
-        brand === GRAYSCALE_BRAND_COLOR && { color: GRAYSCALE_BRAND_COLOR },
-        globalComponentConfig[name]?.defaultVariants,
-      ),
+      default: defaultVariants,
     };
   }
 }

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "framework": "vue",
   "name": "vueless",
-  "version": "0.0.74",
+  "version": "0.0.75",
   "contributions": {
     "html": {
       "description-markup": "markdown",