@vaneui/ui 0.0.17 → 0.0.18

package/dist/index.js

@@ -2990,25 +2990,25 @@ const positionClasses = {
     static: "static"
 };
 const shadowClasses = {
-    xs: "shadow-xs",
-    sm: "shadow-sm",
-    md: "shadow-md",
-    lg: "shadow-lg",
-    xl: "shadow-xl"
+    xs: "shadow-2xs",
+    sm: "shadow-xs",
+    md: "shadow-sm",
+    lg: "shadow-md",
+    xl: "shadow-lg"
 };
 const hoverShadowClasses = {
-    xs: "hover:shadow-sm",
-    sm: "hover:shadow-md",
-    md: "hover:shadow-lg",
-    lg: "hover:shadow-xl",
-    xl: "hover:shadow-2xl"
+    xs: "hover:shadow-xs",
+    sm: "hover:shadow-sm",
+    md: "hover:shadow-md",
+    lg: "hover:shadow-lg",
+    xl: "hover:shadow-xl"
 };
 const activeShadowClasses = {
-    xs: "active:shadow-sm",
-    sm: "active:shadow-md",
-    md: "active:shadow-lg",
-    lg: "active:shadow-xl",
-    xl: "active:shadow-2xl"
+    xs: "active:shadow-xs",
+    sm: "active:shadow-sm",
+    md: "active:shadow-md",
+    lg: "active:shadow-lg",
+    xl: "active:shadow-xl"
 };
 const noRingModeClasses = {
     base: "ring-0",
@@ -3064,75 +3064,6 @@ class HideTheme extends BaseTheme {
 }
 HideTheme.defaultClasses = hideClasses;
 
-const isObject = (item) => {
-    return item !== null && typeof item === 'object' && !Array.isArray(item);
-};
-const deepMerge = (target, source) => {
-    const output = Object.assign(Object.create(Object.getPrototypeOf(target)), target);
-    for (const key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-            const sourceValue = source[key];
-            const targetValue = output[key];
-            if (sourceValue === undefined) {
-                continue;
-            }
-            // Special case: If the key is 'defaults', use the contextual mergeDefaults function.
-            if (key === 'defaults' &&
-                isObject(targetValue) &&
-                isObject(sourceValue)) {
-                output[key] = mergeDefaults(targetValue, sourceValue);
-            }
-            // For all other objects, use the standard recursive deep merge.
-            else if (isObject(targetValue) && isObject(sourceValue)) {
-                output[key] = deepMerge(targetValue, sourceValue);
-            }
-            // For non-object values, just assign the value from the source.
-            else {
-                output[key] = sourceValue;
-            }
-        }
-    }
-    return output;
-};
-const deepClone = (source) => {
-    if (!isObject(source)) {
-        return source;
-    }
-    const output = Object.assign(Object.create(Object.getPrototypeOf(source)), source);
-    for (const key in output) {
-        if (Object.prototype.hasOwnProperty.call(output, key)) {
-            output[key] = deepClone(output[key]);
-        }
-    }
-    return output;
-};
-const findGroup = (key) => EXCLUSIVE_KEY_GROUPS.find(group => group.includes(key));
-const mergeDefaults = (baseDefaults, overrideDefaults) => {
-    const finalDefaults = { ...baseDefaults };
-    // Iterate over the override keys to apply them.
-    for (const key in overrideDefaults) {
-        if (Object.prototype.hasOwnProperty.call(overrideDefaults, key)) {
-            const overrideValue = overrideDefaults[key];
-            // If the override is setting a key to true...
-            if (overrideValue) {
-                // Find the exclusive group this key belongs to (e.g., SIZE_KEYS).
-                const group = findGroup(key);
-                // If the key is part of an exclusive group...
-                if (group) {
-                    // ...set all other keys in that group to false.
-                    group.forEach(groupKey => {
-                        if (groupKey !== key) {
-                            finalDefaults[groupKey] = false;
-                        }
-                    });
-                }
-            }
-            finalDefaults[key] = overrideValue;
-        }
-    }
-    return finalDefaults;
-};
-
 class ItemsTheme extends BaseTheme {
     constructor(initialConfig) {
         super();
@@ -3261,6 +3192,21 @@ const textSizeClasses = {
     xl: "text-xl",
 };
 
+class FontStyleTheme extends BaseTheme {
+    constructor(initial) {
+        super();
+        FONT_STYLE_KEYS.forEach((key) => {
+            var _a;
+            this[key] = (_a = initial === null || initial === void 0 ? void 0 : initial[key]) !== null && _a !== void 0 ? _a : FontStyleTheme.defaultClasses[key];
+        });
+    }
+    getClasses(props, defaults) {
+        const key = pickKey(props, defaults, FONT_STYLE_KEYS);
+        return [key ? this[key] : '']; // No default for font style
+    }
+}
+FontStyleTheme.defaultClasses = fontStyleClasses;
+
 class FontFamilyTheme extends BaseTheme {
     constructor(initial) {
         super();
@@ -3291,21 +3237,6 @@ class FontWeightTheme extends BaseTheme {
 }
 FontWeightTheme.defaultClasses = fontWeightClasses;
 
-class FontStyleTheme extends BaseTheme {
-    constructor(initial) {
-        super();
-        FONT_STYLE_KEYS.forEach((key) => {
-            var _a;
-            this[key] = (_a = initial === null || initial === void 0 ? void 0 : initial[key]) !== null && _a !== void 0 ? _a : FontStyleTheme.defaultClasses[key];
-        });
-    }
-    getClasses(props, defaults) {
-        const key = pickKey(props, defaults, FONT_STYLE_KEYS);
-        return [key ? this[key] : '']; // No default for font style
-    }
-}
-FontStyleTheme.defaultClasses = fontStyleClasses;
-
 class TextDecorationTheme extends BaseTheme {
     constructor(initial) {
         super();
@@ -3351,6 +3282,75 @@ class TextAlignTheme extends BaseTheme {
 }
 TextAlignTheme.defaultClasses = textAlignClasses;
 
+const isObject = (item) => {
+    return item !== null && typeof item === 'object' && !Array.isArray(item);
+};
+const deepMerge = (target, source) => {
+    const output = Object.assign(Object.create(Object.getPrototypeOf(target)), target);
+    for (const key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+            const sourceValue = source[key];
+            const targetValue = output[key];
+            if (sourceValue === undefined) {
+                continue;
+            }
+            // Special case: If the key is 'defaults', use the contextual mergeDefaults function.
+            if (key === 'defaults' &&
+                isObject(targetValue) &&
+                isObject(sourceValue)) {
+                output[key] = mergeDefaults(targetValue, sourceValue);
+            }
+            // For all other objects, use the standard recursive deep merge.
+            else if (isObject(targetValue) && isObject(sourceValue)) {
+                output[key] = deepMerge(targetValue, sourceValue);
+            }
+            // For non-object values, just assign the value from the source.
+            else {
+                output[key] = sourceValue;
+            }
+        }
+    }
+    return output;
+};
+const deepClone = (source) => {
+    if (!isObject(source)) {
+        return source;
+    }
+    const output = Object.assign(Object.create(Object.getPrototypeOf(source)), source);
+    for (const key in output) {
+        if (Object.prototype.hasOwnProperty.call(output, key)) {
+            output[key] = deepClone(output[key]);
+        }
+    }
+    return output;
+};
+const findGroup = (key) => EXCLUSIVE_KEY_GROUPS.find(group => group.includes(key));
+const mergeDefaults = (baseDefaults, overrideDefaults) => {
+    const finalDefaults = { ...baseDefaults };
+    // Iterate over the override keys to apply them.
+    for (const key in overrideDefaults) {
+        if (Object.prototype.hasOwnProperty.call(overrideDefaults, key)) {
+            const overrideValue = overrideDefaults[key];
+            // If the override is setting a key to true...
+            if (overrideValue) {
+                // Find the exclusive group this key belongs to (e.g., SIZE_KEYS).
+                const group = findGroup(key);
+                // If the key is part of an exclusive group...
+                if (group) {
+                    // ...set all other keys in that group to false.
+                    group.forEach(groupKey => {
+                        if (groupKey !== key) {
+                            finalDefaults[groupKey] = false;
+                        }
+                    });
+                }
+            }
+            finalDefaults[key] = overrideValue;
+        }
+    }
+    return finalDefaults;
+};
+
 class ComponentTheme {
     constructor(tag, base, subThemes, defaults = {}) {
         this.tag = tag;
@@ -3517,10 +3517,15 @@ BorderTheme.defaultClasses = {
         active: "active:border",
     },
     noBorder: {
-        base: "border-none",
-        hover: "hover:border-none",
-        active: "active:border-none",
+        base: "",
+        hover: "",
+        active: "",
     },
+    //noBorder: {
+    //  base: "border-none",
+    //  hover: "hover:border-none",
+    //  active: "active:border-none",
+    //},
 };
 
 class RingTheme extends BaseTheme {
@@ -3888,8 +3893,8 @@ const defaultButtonTheme = new ComponentTheme("button", "w-fit h-fit cursor-poin
         px: new PxTheme({
             padding: {
                 xs: 'px-2',
-                sm: 'px-2.5',
-                md: 'px-3.5',
+                sm: 'px-3',
+                md: 'px-4',
                 lg: 'px-5',
                 xl: 'px-6',
             }
@@ -3899,25 +3904,25 @@ const defaultButtonTheme = new ComponentTheme("button", "w-fit h-fit cursor-poin
                 xs: 'py-1',
                 sm: 'py-1.5',
                 md: 'py-2',
-                lg: 'py-3',
-                xl: 'py-4',
+                lg: 'py-2.5',
+                xl: 'py-3',
             }
         }),
         gap: new GapTheme({
             gap: {
-                xs: 'gap-1.5',
-                sm: 'gap-2',
-                md: 'gap-3',
-                lg: 'gap-4',
-                xl: 'gap-5',
+                xs: 'gap-1',
+                sm: 'gap-1.5',
+                md: 'gap-2',
+                lg: 'gap-2.5',
+                xl: 'gap-3',
             }
         }),
         text: new SizeTheme({
-            xs: 'text-xs/5',
-            sm: 'text-sm/5',
+            xs: 'text-xs',
+            sm: 'text-sm',
             md: 'text-base',
-            lg: 'text-lg/6',
-            xl: 'text-xl/6',
+            lg: 'text-lg',
+            xl: 'text-xl',
         }),
         shadow: new ShadowTheme(),
     },
@@ -3960,36 +3965,36 @@ const defaultBadgeTheme = new ComponentTheme("span", "w-fit h-fit inline-flex tr
         px: new PxTheme({
             padding: {
                 xs: "px-2",
-                sm: "px-2.5",
-                md: "px-3.5",
+                sm: "px-3",
+                md: "px-4",
                 lg: "px-5",
                 xl: "px-6"
             }
         }),
         py: new PyTheme({
             padding: {
-                xs: "py-1",
-                sm: "py-1.5",
-                md: "py-2",
-                lg: "py-3",
-                xl: "py-4"
+                xs: 'py-1',
+                sm: 'py-1.5',
+                md: 'py-2',
+                lg: 'py-2.5',
+                xl: 'py-3',
             }
         }),
         gap: new GapTheme({
             gap: {
-                xs: "gap-1",
-                sm: "gap-1.5",
-                md: "gap-2",
-                lg: "gap-2.5",
-                xl: "gap-3"
+                xs: 'gap-1',
+                sm: 'gap-1.5',
+                md: 'gap-2',
+                lg: 'gap-2.5',
+                xl: 'gap-3',
             }
         }),
         text: new SizeTheme({
-            xs: 'text-xs/5',
-            sm: 'text-sm/5',
+            xs: 'text-xs',
+            sm: 'text-sm',
             md: 'text-base',
-            lg: 'text-lg/6',
-            xl: 'text-xl/6',
+            lg: 'text-lg',
+            xl: 'text-xl',
         }),
         shadow: new ShadowTheme(),
     },
@@ -4039,26 +4044,26 @@ const defaultChipTheme = new ComponentTheme("span", "w-fit h-fit inline-flex gap
             padding: {
                 xs: 'px-2',
                 sm: 'px-2.5',
-                md: 'px-3.5',
-                lg: 'px-5',
-                xl: 'px-6',
+                md: 'px-3',
+                lg: 'px-3.5',
+                xl: 'px-4',
             }
         }),
         py: new PyTheme({
             padding: {
-                xs: 'py-1',
-                sm: 'py-1.5',
-                md: 'py-2',
-                lg: 'py-3',
-                xl: 'py-4',
+                xs: 'py-0.5',
+                sm: 'py-1',
+                md: 'py-1.5',
+                lg: 'py-2',
+                xl: 'py-2.5',
             }
         }),
         text: new SizeTheme({
             xs: 'text-xs',
             sm: 'text-sm',
-            md: 'text-sm',
-            lg: 'text-base',
-            xl: 'text-base',
+            md: 'text-base',
+            lg: 'text-lg',
+            xl: 'text-xl',
         }),
         gap: new GapTheme({
             gap: {
@@ -4470,18 +4475,18 @@ const defaultSectionTheme = new ComponentTheme("div", "w-full flex flex-col", {
         }),
         py: new PyTheme({
             padding: {
-                xs: 'py-3',
-                sm: 'py-5',
-                md: 'py-8 max-md:py-5',
+                xs: 'py-4 max-md:py-3',
+                sm: 'py-8 max-md:py-6',
+                md: 'py-12 max-md:py-6',
                 lg: 'py-16 max-lg:py-14 max-md:py-12',
                 xl: 'py-20 max-lg:py-16 max-md:py-12',
             }
         }),
         gap: new GapTheme({
             gap: {
-                xs: 'gap-2',
-                sm: 'gap-4',
-                md: 'gap-6',
+                xs: 'gap-4',
+                sm: 'gap-6',
+                md: 'gap-8',
                 lg: 'gap-12',
                 xl: 'gap-16',
             }
@@ -4565,16 +4570,27 @@ const defaultTheme = {
     list: listTheme,
 };
 const ThemeContext = react.createContext(defaultTheme);
-function ThemeProvider({ children, theme: themeObject = {}, themeOverride }) {
+function ThemeProvider({ children, theme: themeObject = {}, themeDefaults, themeOverride }) {
     const mergedTheme = react.useMemo(() => {
-        let baseTheme = themeObject
+        let finalTheme = themeObject
             ? deepMerge(defaultTheme, themeObject)
             : defaultTheme;
         if (typeof themeOverride === 'function') {
-            const themeToModify = deepClone(baseTheme);
-            return themeOverride(themeToModify);
+            const themeToModify = deepClone(finalTheme);
+            finalTheme = themeOverride(themeToModify);
+        }
+        if (themeDefaults !== undefined) {
+            for (const key in themeDefaults) {
+                const componentKey = key;
+                const componentTheme = finalTheme[componentKey];
+                const themeDefault = themeDefaults[componentKey];
+                if (themeDefault !== undefined) {
+                    finalTheme[componentKey].defaults =
+                        mergeDefaults(componentTheme.defaults, themeDefaults[componentKey]);
+                }
+            }
         }
-        return baseTheme;
+        return finalTheme;
     }, [themeObject, themeOverride]);
     return (jsxRuntime.jsx(ThemeContext.Provider, { value: mergedTheme, children: children }));
 }