vueless 0.0.566 → 0.0.567

package/composables/useUI.ts

@@ -34,7 +34,7 @@ import type {
  */
 export default function useUI<T>(
   defaultConfig: T & Component,
-  propsConfigGetter?: () => (T & Component) | undefined,
+  propsConfigGetter?: () => T & Component,
   topLevelClassKey?: string,
   mutatedProps?: ComputedRef,
 ): UseUI<T> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vueless",
-  "version": "0.0.566",
+  "version": "0.0.567",
   "license": "MIT",
   "description": "Vue Styleless UI Component Library, powered by Tailwind CSS.",
   "keywords": [

package/ui.button/UButton.vue

@@ -4,7 +4,7 @@ import { computed, ref, watchEffect, useId, watch, useSlots } from "vue";
 import useUI from "../composables/useUI.ts";
 import { useDarkMode } from "../composables/useDarkMode.ts";
 import { hasSlotContent } from "../utils/helper.ts";
-import { getDefault } from "../utils/ui.ts";
+import { getDefaults } from "../utils/ui.ts";
 
 import ULoader from "../ui.loader/ULoader.vue";
 import UIcon from "../ui.image-icon/UIcon.vue";
@@ -17,19 +17,7 @@ import type { UButtonProps, LoaderSize, IconSize, Config } from "./types.ts";
 defineOptions({ inheritAttrs: false });
 
 const props = withDefaults(defineProps<UButtonProps>(), {
-  variant: getDefault<UButtonProps>(defaultConfig, UButton).variant,
-  color: getDefault<UButtonProps>(defaultConfig, UButton).color,
-  size: getDefault<UButtonProps>(defaultConfig, UButton).size,
-  tag: getDefault<UButtonProps>(defaultConfig, UButton).tag,
-  tabindex: getDefault<UButtonProps>(defaultConfig, UButton).tabindex,
-  filled: getDefault<UButtonProps>(defaultConfig, UButton).filled,
-  disabled: getDefault<UButtonProps>(defaultConfig, UButton).disabled,
-  block: getDefault<UButtonProps>(defaultConfig, UButton).block,
-  round: getDefault<UButtonProps>(defaultConfig, UButton).round,
-  square: getDefault<UButtonProps>(defaultConfig, UButton).square,
-  loading: getDefault<UButtonProps>(defaultConfig, UButton).loading,
-  noRing: getDefault<UButtonProps>(defaultConfig, UButton).noRing,
-  dataTest: "",
+  ...getDefaults<UButtonProps>(defaultConfig, UButton),
 });
 
 const slots = useSlots();

package/ui.button/types.ts

@@ -1,6 +1,7 @@
 import defaultConfig from "./config.ts";
+import type { Component } from "../types.ts";
 
-export type Config = Partial<typeof defaultConfig>;
+export type Config = Partial<typeof defaultConfig> & Component;
 
 export type LoaderSize = "sm" | "md" | "lg";
 export type IconSize = "2xs" | "xs" | "sm" | "md";

package/utils/ui.ts

@@ -94,9 +94,11 @@ export const cva = ({ base = "", variants = {}, compoundVariants = [], defaultVa
   });
 
 /**
+ * @deprecated
+ * TODO: remove if after all components migration into getDefaults()
  * Return default values for component props, icons, etc..
  */
-export function getDefault<T>(defaultConfig: Component, name: ComponentNames): T {
+export function getDefault<T>(defaultConfig: Component, name: ComponentNames) {
   const componentDefaults = cloneDeep(defaultConfig.defaults) || {};
   const globalDefaults = cloneDeep(vuelessConfig.component?.[name]?.defaults) || {};
 
@@ -106,7 +108,31 @@ export function getDefault<T>(defaultConfig: Component, name: ComponentNames): T
     defaults.color = getColor(defaults.color as BrandColors);
   }
 
-  return defaults;
+  return {
+    ...defaults,
+    dataTest: "",
+    config: () => {},
+  };
+}
+
+/**
+ * Return default values for component props, icons, etc..
+ */
+export function getDefaults<T>(defaultConfig: Component, name: ComponentNames) {
+  const componentDefaults = cloneDeep(defaultConfig.defaults) || {};
+  const globalDefaults = cloneDeep(vuelessConfig.component?.[name]?.defaults) || {};
+
+  const defaults = merge(componentDefaults, globalDefaults) as T & Defaults;
+
+  if (defaults.color) {
+    defaults.color = getColor(defaults.color as BrandColors);
+  }
+
+  return {
+    ...defaults,
+    dataTest: "",
+    config: () => ({}),
+  };
 }
 
 /**

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "framework": "vue",
   "name": "vueless",
-  "version": "0.0.566",
+  "version": "0.0.567",
   "contributions": {
     "html": {
       "description-markup": "markdown",
@@ -1027,8 +1027,7 @@
               "value": {
                 "kind": "expression",
                 "type": "string"
-              },
-              "default": "\"\""
+              }
             }
           ],
           "slots": [