@vaneui/ui 0.2.1-alpha.20250820172812.236c9ec → 0.2.1-alpha.20250820182348.d8e8551

package/dist/components/ui/theme/layout/borderTheme.d.ts

@@ -1,10 +1,10 @@
 import { BaseTheme } from "../common/baseTheme";
 import type { CategoryProps } from "../../props";
-import { ModeKey, BorderKey } from "../../props";
-export interface BorderTheme extends Record<BorderKey, Record<ModeKey, string>> {
+import { ModeKey } from "../../props";
+export interface BorderTheme extends Record<ModeKey, string> {
 }
 export declare class BorderTheme extends BaseTheme {
-    static readonly defaultClasses: Record<BorderKey, Record<ModeKey, string>>;
-    constructor(initial?: Partial<Record<BorderKey, Record<ModeKey, string>>>);
+    readonly defaultClasses: Record<ModeKey, string>;
+    constructor(initial?: Partial<Record<ModeKey, string>>);
     getClasses(extractedKeys: CategoryProps): string[];
 }

package/dist/components/ui/theme/layout/ringTheme.d.ts

@@ -1,10 +1,10 @@
 import { BaseTheme } from "../common/baseTheme";
 import type { CategoryProps } from "../../props";
-import { ModeKey, RingKey } from "../../props";
-export interface RingTheme extends Record<RingKey, Record<ModeKey, string>> {
+import { ModeKey } from "../../props";
+export interface RingTheme extends Record<ModeKey, string> {
 }
 export declare class RingTheme extends BaseTheme {
-    static readonly defaultClasses: Record<RingKey, Record<ModeKey, string>>;
-    constructor(initial?: Partial<Record<RingKey, Record<ModeKey, string>>>);
+    readonly defaultClasses: Record<ModeKey, string>;
+    constructor(initial?: Partial<Record<ModeKey, string>>);
     getClasses(extractedKeys: CategoryProps): string[];
 }

package/dist/components/ui/theme/size/paddingTheme.d.ts

@@ -1,10 +1,10 @@
-import { SizeKey, PaddingKey } from "../../props";
+import { SizeKey } from "../../props";
 import { BaseTheme } from "../common/baseTheme";
 import type { CategoryProps } from "../../props";
-export interface PaddingTheme extends Record<PaddingKey, string | Record<SizeKey, string>> {
+export interface PaddingTheme extends Record<SizeKey, string> {
 }
 export declare class PaddingTheme extends BaseTheme {
-    readonly defaultClasses: Record<PaddingKey, string | Record<SizeKey, string>>;
-    constructor(initial?: Partial<Record<PaddingKey, string | Record<SizeKey, string>>>);
+    readonly defaultClasses: Record<SizeKey, string>;
+    constructor(initial?: Partial<Record<SizeKey, string>>);
     getClasses(extractedKeys: CategoryProps): string[];
 }

package/dist/components/ui/theme/size/plTheme.d.ts

@@ -1,8 +1,8 @@
-import { SizeKey, PaddingKey } from "../../props";
+import { SizeKey } from "../../props";
 import { PaddingTheme } from "./paddingTheme";
-export interface PlTheme extends Record<PaddingKey, string | Record<SizeKey, string>> {
+export interface PlTheme extends Record<SizeKey, string> {
 }
 export declare class PlTheme extends PaddingTheme {
-    readonly defaultClasses: Record<PaddingKey, string | Record<SizeKey, string>>;
-    constructor(initial?: Partial<Record<PaddingKey, string | Record<SizeKey, string>>>);
+    readonly defaultClasses: Record<SizeKey, string>;
+    constructor(sizeMap?: Record<SizeKey, string>);
 }

package/dist/components/ui/theme/size/pxTheme.d.ts

@@ -1,8 +1,8 @@
-import { SizeKey, PaddingKey } from "../../props";
+import { SizeKey } from "../../props";
 import { PaddingTheme } from "./paddingTheme";
-export interface PxTheme extends Record<PaddingKey, string | Record<SizeKey, string>> {
+export interface PxTheme extends Record<SizeKey, string> {
 }
 export declare class PxTheme extends PaddingTheme {
-    readonly defaultClasses: Record<PaddingKey, string | Record<SizeKey, string>>;
+    readonly defaultClasses: Record<SizeKey, string>;
     constructor(sizeMap?: Record<SizeKey, string>);
 }

package/dist/components/ui/theme/size/pyTheme.d.ts

@@ -1,8 +1,8 @@
-import { SizeKey, PaddingKey } from "../../props";
+import { SizeKey } from "../../props";
 import { PaddingTheme } from "./paddingTheme";
-export interface PyTheme extends Record<PaddingKey, string | Record<SizeKey, string>> {
+export interface PyTheme extends Record<SizeKey, string> {
 }
 export declare class PyTheme extends PaddingTheme {
-    readonly defaultClasses: Record<PaddingKey, string | Record<SizeKey, string>>;
+    readonly defaultClasses: Record<SizeKey, string>;
     constructor(sizeMap?: Record<SizeKey, string>);
 }

package/dist/index.esm.js

@@ -3322,133 +3322,112 @@ class RadiusTheme extends BaseTheme {
 class BorderTheme extends BaseTheme {
     constructor(initial) {
         super();
-        ComponentKeys.border.forEach((key) => {
-            this[key] = {
-                ...BorderTheme.defaultClasses[key],
-                ...((initial === null || initial === void 0 ? void 0 : initial[key]) || {}),
-            };
+        this.defaultClasses = {
+            base: "border",
+            hover: "",
+            active: "",
+        };
+        ComponentKeys.mode.forEach((key) => {
+            var _a;
+            this[key] = (_a = initial === null || initial === void 0 ? void 0 : initial[key]) !== null && _a !== void 0 ? _a : this.defaultClasses[key];
         });
     }
     getClasses(extractedKeys) {
-        const key = extractedKeys === null || extractedKeys === void 0 ? void 0 : extractedKeys.border;
-        if (!key || !this[key]) {
-            return ComponentKeys.mode.map(() => '');
+        const border = extractedKeys === null || extractedKeys === void 0 ? void 0 : extractedKeys.border;
+        // If noBorder is true, return empty array (no border classes)
+        if (border === 'noBorder') {
+            return [];
+        }
+        // Only apply border classes if border is explicitly true
+        if (border === 'border') {
+            return ComponentKeys.mode.map(mode => this[mode] || '').filter(Boolean);
         }
-        return ComponentKeys.mode.map(mode => this[key][mode] || '');
+        return [];
     }
 }
-BorderTheme.defaultClasses = {
-    border: {
-        base: "border",
-        hover: "", //"hover:border",
-        active: "", //"active:border",
-    },
-    noBorder: {
-        base: "",
-        hover: "",
-        active: "",
-    },
-};
 
 class RingTheme extends BaseTheme {
     constructor(initial) {
         super();
-        ComponentKeys.ring.forEach((key) => {
-            this[key] = {
-                ...RingTheme.defaultClasses[key],
-                ...((initial === null || initial === void 0 ? void 0 : initial[key]) || {}),
-            };
+        this.defaultClasses = {
+            base: "ring ring-inset",
+            hover: "hover:ring hover:ring-inset",
+            active: "active:ring active:ring-inset",
+        };
+        ComponentKeys.mode.forEach((key) => {
+            var _a;
+            this[key] = (_a = initial === null || initial === void 0 ? void 0 : initial[key]) !== null && _a !== void 0 ? _a : this.defaultClasses[key];
         });
     }
     getClasses(extractedKeys) {
-        const key = extractedKeys === null || extractedKeys === void 0 ? void 0 : extractedKeys.ring;
-        if (!key || !this[key]) {
-            return ComponentKeys.mode.map(() => '');
+        const ring = extractedKeys === null || extractedKeys === void 0 ? void 0 : extractedKeys.ring;
+        // If noRing is true, return empty array (no ring classes)
+        if (ring === 'noRing') {
+            return [];
         }
-        return ComponentKeys.mode.map(mode => this[key][mode] || '');
+        // Only apply ring classes if ring is explicitly true
+        if (ring === 'ring') {
+            return ComponentKeys.mode.map(mode => this[mode] || '').filter(Boolean);
+        }
+        return [];
     }
 }
-RingTheme.defaultClasses = {
-    ring: {
-        base: "ring ring-inset",
-        hover: "hover:ring hover:ring-inset",
-        active: "active:ring active:ring-inset",
-    },
-    noRing: {
-        base: "",
-        hover: "",
-        active: "",
-    },
-    //noRing: {
-    //  base: "ring-0",
-    //  hover: "hover:ring-0",
-    //  active: "active:ring-0",
-    //},
-};
 
 class PaddingTheme extends BaseTheme {
     constructor(initial) {
         super();
         this.defaultClasses = {
-            padding: { xs: "", sm: "", md: "", lg: "", xl: "" },
-            noPadding: ""
+            xs: "", sm: "", md: "", lg: "", xl: ""
         };
-        ComponentKeys.padding.forEach((key) => {
+        ComponentKeys.size.forEach((key) => {
             var _a;
             this[key] = (_a = initial === null || initial === void 0 ? void 0 : initial[key]) !== null && _a !== void 0 ? _a : this.defaultClasses[key];
         });
     }
     getClasses(extractedKeys) {
-        var _a, _b;
+        var _a;
         const size = (_a = extractedKeys === null || extractedKeys === void 0 ? void 0 : extractedKeys.size) !== null && _a !== void 0 ? _a : 'md';
-        const key = (_b = extractedKeys === null || extractedKeys === void 0 ? void 0 : extractedKeys.padding) !== null && _b !== void 0 ? _b : 'padding';
-        const paddingValue = this[key];
-        if (paddingValue === undefined) {
-            return [''];
+        const padding = extractedKeys === null || extractedKeys === void 0 ? void 0 : extractedKeys.padding;
+        // If noPadding is true, return empty array (no padding classes)
+        if (padding === 'noPadding') {
+            return [];
+        }
+        // If padding is true or undefined, apply padding classes based on size
+        if (padding === 'padding' || padding === undefined) {
+            const paddingClass = this[size];
+            return paddingClass ? [paddingClass] : [];
         }
-        return [typeof paddingValue === 'string' ? paddingValue : paddingValue[size] || ''];
+        return [];
     }
 }
 
 class PxTheme extends PaddingTheme {
     constructor(sizeMap) {
-        // If a simple size map is provided, convert it to the expected format
-        const initial = sizeMap ? { padding: sizeMap } : undefined;
-        super(initial);
+        super(sizeMap);
         this.defaultClasses = {
-            padding: { xs: "px-2", sm: "px-4", md: "px-6", lg: "px-8", xl: "px-10" },
-            noPadding: "px-0"
+            xs: "px-2", sm: "px-4", md: "px-6", lg: "px-8", xl: "px-10"
         };
-        // Override with PxTheme's default classes
-        ComponentKeys.padding.forEach((key) => {
-            if (key === 'padding' && (initial === null || initial === void 0 ? void 0 : initial.padding)) {
-                this[key] = initial.padding;
-            }
-            else {
+        // Override with PxTheme's default classes if no custom sizeMap provided
+        if (!sizeMap) {
+            ComponentKeys.size.forEach((key) => {
                 this[key] = this.defaultClasses[key];
-            }
-        });
+            });
+        }
     }
 }
 
 class PyTheme extends PaddingTheme {
     constructor(sizeMap) {
-        // If a simple size map is provided, convert it to the expected format
-        const initial = sizeMap ? { padding: sizeMap } : undefined;
-        super(initial);
+        super(sizeMap);
         this.defaultClasses = {
-            padding: { xs: "py-2", sm: "py-4", md: "py-6", lg: "py-8", xl: "py-10" },
-            noPadding: "py-0"
+            xs: "py-2", sm: "py-4", md: "py-6", lg: "py-8", xl: "py-10"
         };
-        // Override with PyTheme's default classes
-        ComponentKeys.padding.forEach((key) => {
-            if (key === 'padding' && (initial === null || initial === void 0 ? void 0 : initial.padding)) {
-                this[key] = initial.padding;
-            }
-            else {
+        // Override with PyTheme's default classes if no custom sizeMap provided
+        if (!sizeMap) {
+            ComponentKeys.size.forEach((key) => {
                 this[key] = this.defaultClasses[key];
-            }
-        });
+            });
+        }
     }
 }
 
@@ -4399,17 +4378,17 @@ const mergeDefaults = (baseDefaults, overrideDefaults) => {
 };
 
 class PlTheme extends PaddingTheme {
-    constructor(initial) {
-        super(initial);
+    constructor(sizeMap) {
+        super(sizeMap);
         this.defaultClasses = {
-            padding: { xs: "pl-2", sm: "pl-4", md: "pl-6", lg: "pl-8", xl: "pl-10" },
-            noPadding: "pl-0"
+            xs: "pl-2", sm: "pl-4", md: "pl-6", lg: "pl-8", xl: "pl-10"
         };
-        // Override with PlTheme's default classes
-        ComponentKeys.padding.forEach((key) => {
-            var _a;
-            this[key] = (_a = initial === null || initial === void 0 ? void 0 : initial[key]) !== null && _a !== void 0 ? _a : this.defaultClasses[key];
-        });
+        // Override with PlTheme's default classes if no custom sizeMap provided
+        if (!sizeMap) {
+            ComponentKeys.size.forEach((key) => {
+                this[key] = this.defaultClasses[key];
+            });
+        }
     }
 }