clava 0.1.5 → 0.1.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/dist/index.d.ts +5 -0
- package/dist/index.js +41 -5
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +76 -21
- package/src/test.ts +55 -11
- package/src/types.ts +7 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# clava
|
|
2
2
|
|
|
3
|
+
## 0.1.7
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 9a232c0: Fixed computed default variants not overriding static default variants from child components.
|
|
8
|
+
|
|
9
|
+
## 0.1.6
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- b62c04b: To guarantee consistency, `splitProps` does not assign default variants anymore.
|
|
14
|
+
|
|
3
15
|
## 0.1.5
|
|
4
16
|
|
|
5
17
|
### Patch Changes
|
package/dist/index.d.ts
CHANGED
|
@@ -63,6 +63,11 @@ interface ModalComponent<V$1, R extends ComponentResult> {
|
|
|
63
63
|
propKeys: (keyof V$1 | keyof R)[];
|
|
64
64
|
/** @internal Base class without variants */
|
|
65
65
|
_baseClass: string;
|
|
66
|
+
/**
|
|
67
|
+
* @internal Returns resolved variants after running the computed function.
|
|
68
|
+
* Used by child components to get parent's setDefaultVariants effects.
|
|
69
|
+
*/
|
|
70
|
+
_resolveDefaults: (propsVariants: Record<string, unknown>) => Record<string, unknown>;
|
|
66
71
|
}
|
|
67
72
|
interface CVComponent<V$1 extends Variants = {}, CV$1 extends ComputedVariants = {}, E$1 extends AnyComponent[] = [], R extends ComponentResult = ComponentResult> extends ModalComponent<MergeVariants<V$1, CV$1, E$1>, R> {
|
|
68
73
|
jsx: ModalComponent<MergeVariants<V$1, CV$1, E$1>, JSXProps>;
|
package/dist/index.js
CHANGED
|
@@ -213,10 +213,11 @@ function collectVariantKeys(config) {
|
|
|
213
213
|
return Array.from(keys);
|
|
214
214
|
}
|
|
215
215
|
/**
|
|
216
|
-
* Collects default variants from extended components and the current
|
|
217
|
-
* Also handles implicit boolean defaults (when only `false` key
|
|
216
|
+
* Collects static default variants from extended components and the current
|
|
217
|
+
* config. Also handles implicit boolean defaults (when only `false` key
|
|
218
|
+
* exists).
|
|
218
219
|
*/
|
|
219
|
-
function
|
|
220
|
+
function collectStaticDefaults(config) {
|
|
220
221
|
let defaults = {};
|
|
221
222
|
if (config.extend) for (const ext of config.extend) {
|
|
222
223
|
const extDefaults = ext.getVariants();
|
|
@@ -238,6 +239,25 @@ function collectDefaultVariants(config) {
|
|
|
238
239
|
return defaults;
|
|
239
240
|
}
|
|
240
241
|
/**
|
|
242
|
+
* Collects default variants from extended components and the current config.
|
|
243
|
+
* This includes both static defaults and computed defaults (from
|
|
244
|
+
* setDefaultVariants in extended components' computed functions).
|
|
245
|
+
* Priority: parent static < child static < parent computed < child computed.
|
|
246
|
+
*/
|
|
247
|
+
function collectDefaultVariants(config) {
|
|
248
|
+
let defaults = collectStaticDefaults(config);
|
|
249
|
+
if (config.extend) {
|
|
250
|
+
for (const ext of config.extend) if (ext._resolveDefaults) {
|
|
251
|
+
const extComputedDefaults = ext._resolveDefaults({});
|
|
252
|
+
defaults = {
|
|
253
|
+
...defaults,
|
|
254
|
+
...extComputedDefaults
|
|
255
|
+
};
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
return defaults;
|
|
259
|
+
}
|
|
260
|
+
/**
|
|
241
261
|
* Filters out keys with undefined values from an object.
|
|
242
262
|
*/
|
|
243
263
|
function filterUndefined(obj) {
|
|
@@ -410,13 +430,11 @@ function splitPropsImpl(selfKeys, selfVariantKeys, selfDefaults, selfIsComponent
|
|
|
410
430
|
const results = [];
|
|
411
431
|
let stylingClaimed = selfIsComponent;
|
|
412
432
|
const selfResult = {};
|
|
413
|
-
for (const [key, value] of Object.entries(selfDefaults)) if (selfKeys.includes(key)) selfResult[key] = value;
|
|
414
433
|
for (const key of selfKeys) if (key in props) selfResult[key] = props[key];
|
|
415
434
|
results.push(selfResult);
|
|
416
435
|
for (const source of sources) {
|
|
417
436
|
const sourceResult = {};
|
|
418
437
|
const effectiveKeys = source.isComponent && stylingClaimed ? source.variantKeys : source.keys;
|
|
419
|
-
for (const [key, value] of Object.entries(source.defaults)) if (effectiveKeys.includes(key)) sourceResult[key] = value;
|
|
420
438
|
for (const key of effectiveKeys) {
|
|
421
439
|
allUsedKeys.add(key);
|
|
422
440
|
if (key in props) sourceResult[key] = props[key];
|
|
@@ -540,6 +558,24 @@ function create({ defaultMode = "jsx", transformClass = (className) => className
|
|
|
540
558
|
const extendedBaseClasses = [];
|
|
541
559
|
if (config.extend) for (const ext of config.extend) extendedBaseClasses.push(ext._baseClass);
|
|
542
560
|
component$1._baseClass = cx$1(...extendedBaseClasses, config.class);
|
|
561
|
+
component$1._resolveDefaults = (propsVariants) => {
|
|
562
|
+
const resolvedVariants = {
|
|
563
|
+
...collectStaticDefaults(config),
|
|
564
|
+
...filterUndefined(propsVariants)
|
|
565
|
+
};
|
|
566
|
+
const computedDefaults = {};
|
|
567
|
+
if (config.computed) {
|
|
568
|
+
const context = {
|
|
569
|
+
variants: resolvedVariants,
|
|
570
|
+
setVariants: () => {},
|
|
571
|
+
setDefaultVariants: (newDefaults) => {
|
|
572
|
+
for (const [key, value] of Object.entries(newDefaults)) if (propsVariants[key] === void 0) computedDefaults[key] = value;
|
|
573
|
+
}
|
|
574
|
+
};
|
|
575
|
+
config.computed(context);
|
|
576
|
+
}
|
|
577
|
+
return computedDefaults;
|
|
578
|
+
};
|
|
543
579
|
return component$1;
|
|
544
580
|
};
|
|
545
581
|
const defaultComponent = createModalComponent(defaultMode);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["cx","clsx","cv","component"],"sources":["../../../node_modules/.pnpm/clsx@2.1.1/node_modules/clsx/dist/clsx.mjs","../src/utils.ts","../src/index.ts"],"sourcesContent":["function r(e){var t,f,n=\"\";if(\"string\"==typeof e||\"number\"==typeof e)n+=e;else if(\"object\"==typeof e)if(Array.isArray(e)){var o=e.length;for(t=0;t<o;t++)e[t]&&(f=r(e[t]))&&(n&&(n+=\" \"),n+=f)}else for(f in e)e[f]&&(n&&(n+=\" \"),n+=f);return n}export function clsx(){for(var e,t,f=0,n=\"\",o=arguments.length;f<o;f++)(e=arguments[f])&&(t=r(e))&&(n&&(n+=\" \"),n+=t);return n}export default clsx;","import type * as CSS from \"csstype\";\nimport type {\n HTMLCSSProperties,\n JSXCSSProperties,\n StyleValue,\n} from \"./types.ts\";\n\nexport const MODES = [\"jsx\", \"html\", \"htmlObj\"] as const;\nexport type Mode = (typeof MODES)[number];\n\n/**\n * Returns the appropriate class property name based on the mode.\n * @example\n * getClassPropertyName(\"jsx\") // \"className\"\n * getClassPropertyName(\"html\") // \"class\"\n */\nexport function getClassPropertyName(mode: Mode) {\n return mode === \"jsx\" ? \"className\" : \"class\";\n}\n\n/**\n * Converts a hyphenated CSS property name to camelCase.\n * @example\n * hyphenToCamel(\"background-color\") // \"backgroundColor\"\n * hyphenToCamel(\"--custom-var\") // \"--custom-var\" (CSS variables are preserved)\n */\nexport function hyphenToCamel(str: string) {\n // CSS custom properties (variables) should not be converted\n if (str.startsWith(\"--\")) {\n return str;\n }\n return str.replace(/-([a-z])/gi, (_, letter) => letter.toUpperCase());\n}\n\n/**\n * Converts a camelCase CSS property name to hyphenated form.\n * @example\n * camelToHyphen(\"backgroundColor\") // \"background-color\"\n * camelToHyphen(\"--customVar\") // \"--customVar\" (CSS variables are preserved)\n */\nexport function camelToHyphen(str: string) {\n // CSS custom properties (variables) should not be converted\n if (str.startsWith(\"--\")) {\n return str;\n }\n return str.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`);\n}\n\n/**\n * Parses a length value, adding \"px\" if it's a number.\n * @example\n * parseLengthValue(16); // \"16px\"\n * parseLengthValue(\"2em\"); // \"2em\"\n */\nexport function parseLengthValue(value: string | number) {\n if (typeof value === \"string\") return value;\n return `${value}px`;\n}\n\n/**\n * Parses a CSS style string into a StyleValue object.\n * @example\n * htmlStyleToStyleValue(\"background-color: red; font-size: 16px;\");\n * // { backgroundColor: \"red\", fontSize: \"16px\" }\n */\nexport function htmlStyleToStyleValue(styleString: string) {\n if (!styleString) return {};\n\n const result: StyleValue = {};\n const declarations = styleString.split(\";\");\n\n for (const declaration of declarations) {\n const trimmed = declaration.trim();\n if (!trimmed) continue;\n\n const colonIndex = trimmed.indexOf(\":\");\n if (colonIndex === -1) continue;\n\n const property = trimmed.slice(0, colonIndex).trim();\n const value = trimmed.slice(colonIndex + 1).trim();\n if (!property) continue;\n if (!value) continue;\n\n const camelProperty = hyphenToCamel(property) as any;\n result[camelProperty] = value;\n }\n\n return result;\n}\n\n/**\n * Converts a hyphenated style object to a camelCase StyleValue object.\n * @example\n * htmlObjStyleToStyleValue({ \"background-color\": \"red\", \"font-size\": \"16px\" });\n * // { backgroundColor: \"red\", fontSize: \"16px\" }\n */\nexport function htmlObjStyleToStyleValue(style: HTMLCSSProperties) {\n const result: StyleValue = {};\n for (const [key, value] of Object.entries(style)) {\n if (value == null) continue;\n const property = hyphenToCamel(key) as any;\n result[property] = parseLengthValue(value);\n }\n return result;\n}\n\n/**\n * Converts a camelCase style object to a StyleValue object.\n * @example\n * jsxStyleToStyleValue({ backgroundColor: \"red\", fontSize: 16 });\n * // { backgroundColor: \"red\", fontSize: \"16px\" }\n */\nexport function jsxStyleToStyleValue(style: JSXCSSProperties) {\n const result: StyleValue = {};\n for (const [key, value] of Object.entries(style)) {\n if (value == null) continue;\n result[key as any] = parseLengthValue(value);\n }\n return result;\n}\n\n/**\n * Converts a StyleValue object to a CSS style string.\n * @example\n * styleValueToHTMLStyle({ backgroundColor: \"red\", fontSize: \"16px\" });\n * // \"background-color: red; font-size: 16px;\"\n */\nexport function styleValueToHTMLStyle(style: StyleValue): string {\n const parts: string[] = [];\n for (const [key, value] of Object.entries(style)) {\n if (value == null) continue;\n parts.push(`${camelToHyphen(key)}: ${value}`);\n }\n if (!parts.length) return \"\";\n return `${parts.join(\"; \")};`;\n}\n\n/**\n * Converts a StyleValue object to a hyphenated style object.\n * @example\n * styleValueToHTMLObjStyle({ backgroundColor: \"red\", fontSize: \"16px\" });\n * // { \"background-color\": \"red\", \"font-size\": \"16px\" }\n */\nexport function styleValueToHTMLObjStyle(style: StyleValue) {\n const result: CSS.PropertiesHyphen = {};\n for (const [key, value] of Object.entries(style)) {\n if (value == null) continue;\n const property = camelToHyphen(key) as keyof HTMLCSSProperties;\n result[property] = value;\n }\n return result;\n}\n\n/**\n * Converts a StyleValue object to a camelCase style object.\n * @example\n * styleValueToJSXStyle({ backgroundColor: \"red\", fontSize: \"16px\" });\n * // { backgroundColor: \"red\", fontSize: \"16px\" }\n */\nexport function styleValueToJSXStyle(style: StyleValue) {\n return style as JSXCSSProperties;\n}\n\n/**\n * Type guard to check if a style object has hyphenated keys.\n * @example\n * isHTMLObjStyle({ \"background-color\": \"red\" }); // true\n * isHTMLObjStyle({ backgroundColor: \"red\" }); // false\n */\nexport function isHTMLObjStyle(\n style: CSS.Properties<any> | CSS.PropertiesHyphen<any>,\n): style is CSS.PropertiesHyphen {\n return Object.keys(style).some(\n (key) => key.includes(\"-\") && !key.startsWith(\"--\"),\n );\n}\n","import clsx, { type ClassValue as ClsxClassValue } from \"clsx\";\nimport type {\n AnyComponent,\n CVComponent,\n ClassValue,\n ComponentProps,\n ComponentResult,\n Computed,\n ComputedVariants,\n ExtendableVariants,\n HTMLObjProps,\n HTMLProps,\n JSXProps,\n MergeVariants,\n ModalComponent,\n SplitPropsFunction,\n StyleClassValue,\n StyleProps,\n StyleValue,\n VariantValues,\n Variants,\n} from \"./types.ts\";\nimport {\n type Mode,\n getClassPropertyName,\n htmlObjStyleToStyleValue,\n htmlStyleToStyleValue,\n isHTMLObjStyle,\n jsxStyleToStyleValue,\n styleValueToHTMLObjStyle,\n styleValueToHTMLStyle,\n styleValueToJSXStyle,\n} from \"./utils.ts\";\n\nexport type {\n ClassValue,\n StyleValue,\n StyleClassValue,\n JSXProps,\n HTMLProps,\n HTMLObjProps,\n CVComponent,\n};\n\nexport type VariantProps<T extends Pick<AnyComponent, \"getVariants\">> =\n ReturnType<T[\"getVariants\"]>;\n\nexport interface CVConfig<\n V extends Variants = {},\n CV extends ComputedVariants = {},\n E extends AnyComponent[] = [],\n> {\n extend?: E;\n class?: ClassValue;\n style?: StyleValue;\n variants?: ExtendableVariants<V, E>;\n computedVariants?: CV;\n defaultVariants?: VariantValues<MergeVariants<V, CV, E>>;\n computed?: Computed<MergeVariants<V, CV, E>>;\n}\n\ninterface CreateParams<M extends Mode> {\n defaultMode?: M;\n transformClass?: (className: string) => string;\n}\n\n/**\n * Checks if a value is a style-class object (has style properties, not just a\n * class value).\n */\nfunction isStyleClassValue(value: unknown): value is StyleClassValue {\n if (typeof value !== \"object\") return false;\n if (value == null) return false;\n if (Array.isArray(value)) return false;\n return true;\n}\n\n/**\n * Converts any style input (string, JSX object, or HTML object) to a\n * normalized StyleValue.\n */\nfunction normalizeStyle(style: unknown): StyleValue {\n if (typeof style === \"string\") {\n return htmlStyleToStyleValue(style);\n }\n if (typeof style === \"object\" && style != null) {\n if (isHTMLObjStyle(style as Record<string, unknown>)) {\n return htmlObjStyleToStyleValue(style as Record<string, string | number>);\n }\n return jsxStyleToStyleValue(style as Record<string, string | number>);\n }\n return {};\n}\n\n/**\n * Extracts class and style from a style-class value object.\n */\nfunction extractStyleClass(value: StyleClassValue): {\n class: ClassValue;\n style: StyleValue;\n} {\n const { class: cls, ...style } = value;\n return { class: cls, style };\n}\n\n/**\n * Processes a variant value to extract class and style.\n */\nfunction processVariantValue(value: unknown): {\n class: ClassValue;\n style: StyleValue;\n} {\n if (isStyleClassValue(value)) {\n return extractStyleClass(value);\n }\n return { class: value as ClassValue, style: {} };\n}\n\n/**\n * Gets all variant keys from a component's config, including extended\n * components.\n */\nfunction collectVariantKeys(\n config: CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n): string[] {\n const keys = new Set<string>();\n\n // Collect from extended components\n if (config.extend) {\n for (const ext of config.extend) {\n for (const key of ext.variantKeys) {\n keys.add(key as string);\n }\n }\n }\n\n // Collect from variants\n if (config.variants) {\n for (const key of Object.keys(config.variants)) {\n keys.add(key);\n }\n }\n\n // Collect from computedVariants\n if (config.computedVariants) {\n for (const key of Object.keys(config.computedVariants)) {\n keys.add(key);\n }\n }\n\n return Array.from(keys);\n}\n\n/**\n * Collects default variants from extended components and the current config.\n * Also handles implicit boolean defaults (when only `false` key exists).\n */\nfunction collectDefaultVariants(\n config: CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n): Record<string, unknown> {\n let defaults: Record<string, unknown> = {};\n\n // Collect from extended components\n if (config.extend) {\n for (const ext of config.extend) {\n const extDefaults = ext.getVariants();\n defaults = { ...defaults, ...extDefaults };\n }\n }\n\n // Handle implicit boolean defaults from variants\n // If a variant only has a `false` key and no `true` key, default to false\n if (config.variants) {\n for (const [variantName, variantDef] of Object.entries(config.variants)) {\n if (isStyleClassValue(variantDef)) {\n const keys = Object.keys(variantDef);\n const hasFalseOnly = keys.includes(\"false\") && !keys.includes(\"true\");\n if (hasFalseOnly && defaults[variantName] === undefined) {\n defaults[variantName] = false;\n }\n }\n }\n }\n\n // Override with current config's defaults\n if (config.defaultVariants) {\n defaults = { ...defaults, ...config.defaultVariants };\n }\n\n return defaults;\n}\n\n/**\n * Filters out keys with undefined values from an object.\n */\nfunction filterUndefined(\n obj: Record<string, unknown>,\n): Record<string, unknown> {\n const result: Record<string, unknown> = {};\n for (const [key, value] of Object.entries(obj)) {\n if (value !== undefined) {\n result[key] = value;\n }\n }\n return result;\n}\n\n/**\n * Resolves variant values by merging defaults with provided props.\n * Props with undefined values are filtered out so they don't override defaults.\n */\nfunction resolveVariants(\n config: CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n props: Record<string, unknown> = {},\n): Record<string, unknown> {\n const defaults = collectDefaultVariants(config);\n return { ...defaults, ...filterUndefined(props) };\n}\n\n/**\n * Gets the value for a single variant based on the variant definition and the\n * selected value.\n */\nfunction getVariantResult(\n variantDef: unknown,\n selectedValue: unknown,\n): { class: ClassValue; style: StyleValue } {\n // Shorthand variant: `disabled: \"disabled-class\"` means { true: \"...\" }\n if (!isStyleClassValue(variantDef)) {\n if (selectedValue === true) {\n return processVariantValue(variantDef);\n }\n return { class: null, style: {} };\n }\n\n // Object variant: { sm: \"...\", lg: \"...\" }\n const key = String(selectedValue);\n const value = (variantDef as Record<string, unknown>)[key];\n if (value === undefined) return { class: null, style: {} };\n\n return processVariantValue(value);\n}\n\n/**\n * Processes extended components and returns base classes and variant classes separately.\n * Base classes should come before current component's base, variant classes come after.\n * When overrideVariantKeys is provided, those variant keys are excluded from the extended\n * component's result (used when current component's computedVariants overrides them).\n */\nfunction processExtended(\n config: CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n resolvedVariants: Record<string, unknown>,\n overrideVariantKeys: Set<string> = new Set(),\n): {\n baseClasses: ClassValue[];\n variantClasses: ClassValue[];\n style: StyleValue;\n} {\n const baseClasses: ClassValue[] = [];\n const variantClasses: ClassValue[] = [];\n let style: StyleValue = {};\n\n if (config.extend) {\n for (const ext of config.extend) {\n // Filter out variant keys that are being overridden by current component's computedVariants\n const filteredVariants = { ...resolvedVariants };\n for (const key of overrideVariantKeys) {\n delete filteredVariants[key];\n }\n\n // Get the result with filtered variants (excluding overridden keys)\n const extResult = ext({ ...filteredVariants });\n\n // Only merge style for non-overridden keys\n const extStyle = normalizeStyle(extResult.style);\n style = { ...style, ...extStyle };\n\n // Get base class from internal property (no variants)\n const baseClass = ext._baseClass;\n baseClasses.push(baseClass);\n\n // Get full class with variants\n const fullClass =\n \"className\" in extResult ? extResult.className : extResult.class;\n\n // Extract variant portion (full class minus base class)\n if (fullClass && baseClass) {\n const baseClassSet = new Set(baseClass.split(\" \").filter(Boolean));\n const variantPortion = fullClass\n .split(\" \")\n .filter((c: string) => c && !baseClassSet.has(c))\n .join(\" \");\n if (variantPortion) {\n variantClasses.push(variantPortion);\n }\n } else if (fullClass && !baseClass) {\n variantClasses.push(fullClass);\n }\n }\n }\n\n return { baseClasses, variantClasses, style };\n}\n\n/**\n * Processes all variants (not extended) and returns accumulated class and\n * style.\n */\nfunction processVariants(\n config: CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n resolvedVariants: Record<string, unknown>,\n): { classes: ClassValue[]; style: StyleValue } {\n const classes: ClassValue[] = [];\n let style: StyleValue = {};\n\n // Process current component's variants\n if (config.variants) {\n for (const [variantName, variantDef] of Object.entries(config.variants)) {\n const selectedValue = resolvedVariants[variantName];\n if (selectedValue === undefined) continue;\n\n const result = getVariantResult(variantDef, selectedValue);\n classes.push(result.class);\n style = { ...style, ...result.style };\n }\n }\n\n // Process computedVariants\n if (config.computedVariants) {\n for (const [variantName, computeFn] of Object.entries(\n config.computedVariants,\n )) {\n const selectedValue = resolvedVariants[variantName];\n if (selectedValue === undefined) continue;\n\n const computedResult = computeFn(selectedValue);\n const result = processVariantValue(computedResult);\n classes.push(result.class);\n style = { ...style, ...result.style };\n }\n }\n\n return { classes, style };\n}\n\n/**\n * Processes the computed function if present.\n */\nfunction processComputed(\n config: CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n resolvedVariants: Record<string, unknown>,\n propsVariants: Record<string, unknown>,\n): {\n classes: ClassValue[];\n style: StyleValue;\n updatedVariants: Record<string, unknown>;\n} {\n const classes: ClassValue[] = [];\n let style: StyleValue = {};\n let updatedVariants = { ...resolvedVariants };\n\n if (config.computed) {\n const context = {\n variants: resolvedVariants,\n setVariants: (newVariants: VariantValues<Record<string, unknown>>) => {\n updatedVariants = { ...updatedVariants, ...newVariants };\n },\n setDefaultVariants: (\n newDefaults: VariantValues<Record<string, unknown>>,\n ) => {\n // Only apply defaults for variants not explicitly set in props\n for (const [key, value] of Object.entries(newDefaults)) {\n if (propsVariants[key] === undefined) {\n updatedVariants[key] = value;\n }\n }\n },\n };\n\n const computedResult = config.computed(context);\n if (computedResult != null) {\n const result = processVariantValue(computedResult);\n classes.push(result.class);\n style = { ...style, ...result.style };\n }\n }\n\n return { classes, style, updatedVariants };\n}\n\ninterface NormalizedSource {\n keys: string[];\n variantKeys: string[];\n defaults: Record<string, unknown>;\n isComponent: boolean;\n}\n\n/**\n * Normalizes a key source (array or component) to an object with keys, variantKeys, defaults, and isComponent flag.\n */\nfunction normalizeKeySource(source: unknown): NormalizedSource {\n if (Array.isArray(source)) {\n return {\n keys: source as string[],\n variantKeys: source as string[],\n defaults: {},\n isComponent: false,\n };\n }\n // Components are functions with keys and variantKeys properties\n if (\n source &&\n (typeof source === \"object\" || typeof source === \"function\") &&\n \"keys\" in source &&\n \"variantKeys\" in source\n ) {\n const keys = [...(source as { keys: string[] }).keys] as string[];\n const variantKeys = [\n ...(source as { variantKeys: string[] }).variantKeys,\n ] as string[];\n const defaults =\n \"getVariants\" in source\n ? (\n source as { getVariants: () => Record<string, unknown> }\n ).getVariants()\n : {};\n return { keys, variantKeys, defaults, isComponent: true };\n }\n return { keys: [], variantKeys: [], defaults: {}, isComponent: false };\n}\n\n/**\n * Splits props into multiple groups based on key sources.\n * Only the first component claims styling props (class/className/style).\n * Subsequent components only receive variant props.\n * Arrays always receive their listed keys but don't claim styling props.\n */\nfunction splitPropsImpl(\n selfKeys: string[],\n selfVariantKeys: string[],\n selfDefaults: Record<string, unknown>,\n selfIsComponent: boolean,\n props: Record<string, unknown>,\n sources: NormalizedSource[],\n): Record<string, unknown>[] {\n const allUsedKeys = new Set<string>(selfKeys);\n const results: Record<string, unknown>[] = [];\n\n // Track if styling has been claimed by a component\n let stylingClaimed = selfIsComponent;\n\n // Self result with defaults\n const selfResult: Record<string, unknown> = {};\n // First apply defaults\n for (const [key, value] of Object.entries(selfDefaults)) {\n if (selfKeys.includes(key)) {\n selfResult[key] = value;\n }\n }\n // Then override with props\n for (const key of selfKeys) {\n if (key in props) {\n selfResult[key] = props[key];\n }\n }\n results.push(selfResult);\n\n // Process each source\n for (const source of sources) {\n const sourceResult: Record<string, unknown> = {};\n\n // Determine which keys this source should use\n // Components use variantKeys if styling has already been claimed\n // Arrays always use their listed keys\n const effectiveKeys =\n source.isComponent && stylingClaimed ? source.variantKeys : source.keys;\n\n // First apply defaults (only for variant keys if component and styling claimed)\n for (const [key, value] of Object.entries(source.defaults)) {\n if (effectiveKeys.includes(key)) {\n sourceResult[key] = value;\n }\n }\n\n // Then override with props\n for (const key of effectiveKeys) {\n allUsedKeys.add(key);\n if (key in props) {\n sourceResult[key] = props[key];\n }\n }\n results.push(sourceResult);\n\n // If this is a component that hasn't claimed styling yet, mark styling as claimed\n if (source.isComponent && !stylingClaimed) {\n stylingClaimed = true;\n }\n }\n\n // Rest - keys not used by anyone\n const rest: Record<string, unknown> = {};\n for (const [key, value] of Object.entries(props)) {\n if (!allUsedKeys.has(key)) {\n rest[key] = value;\n }\n }\n results.push(rest);\n\n return results;\n}\n\n/**\n * Splits props into multiple groups based on key sources.\n * Each source gets its own result object containing all its matching keys.\n * The first component source claims styling props (class/className/style).\n * Subsequent components only receive variant props.\n * Arrays receive their listed keys but don't claim styling props.\n * The last element is always the \"rest\" containing keys not claimed by any source.\n *\n * @example\n * ```ts\n * const [buttonProps, inputProps, rest] = splitProps(\n * props,\n * buttonComponent,\n * inputComponent,\n * );\n * // buttonProps has class/style + button variants\n * // inputProps has only input variants (no class/style)\n * ```\n */\nexport const splitProps: SplitPropsFunction = ((\n props: Record<string, unknown>,\n source1: unknown,\n ...sources: unknown[]\n) => {\n const normalizedSource1 = normalizeKeySource(source1);\n const normalizedSources = sources.map(normalizeKeySource);\n return splitPropsImpl(\n normalizedSource1.keys,\n normalizedSource1.variantKeys,\n normalizedSource1.defaults,\n normalizedSource1.isComponent,\n props,\n normalizedSources,\n );\n}) as SplitPropsFunction;\n\nexport function create<M extends Mode = \"jsx\">({\n defaultMode = \"jsx\" as M,\n transformClass = (className) => className,\n}: CreateParams<M> = {}) {\n const cx = (...classes: ClsxClassValue[]) => transformClass(clsx(...classes));\n\n const cv = <\n V extends Variants = {},\n CV extends ComputedVariants = {},\n const E extends AnyComponent[] = [],\n >(\n config: CVConfig<V, CV, E> = {},\n ): CVComponent<V, CV, E, StyleProps[M]> => {\n type MergedVariants = MergeVariants<V, CV, E>;\n\n const variantKeys = collectVariantKeys(\n config as CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n );\n\n const getPropsKeys = (mode: Mode) => [\n getClassPropertyName(mode),\n \"style\",\n ...variantKeys,\n ];\n\n const computeResult = (\n props: ComponentProps<MergedVariants> = {},\n ): { className: string; style: StyleValue } => {\n const allClasses: ClassValue[] = [];\n let allStyle: StyleValue = {};\n\n // Extract variant props from input\n const variantProps: Record<string, unknown> = {};\n for (const key of variantKeys) {\n if (key in props) {\n variantProps[key] = (props as Record<string, unknown>)[key];\n }\n }\n\n // Resolve variants with defaults\n let resolvedVariants = resolveVariants(\n config as CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n variantProps,\n );\n\n // Process computed first to potentially update variants\n const computedResult = processComputed(\n config as CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n resolvedVariants,\n variantProps,\n );\n resolvedVariants = computedResult.updatedVariants;\n\n // Collect computedVariants keys that will override extended variants\n const computedVariantKeys = new Set<string>(\n config.computedVariants ? Object.keys(config.computedVariants) : [],\n );\n\n // Process extended components (separates base and variant classes)\n const extendedResult = processExtended(\n config as CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n resolvedVariants,\n computedVariantKeys,\n );\n\n // 1. Extended base classes first\n allClasses.push(...extendedResult.baseClasses);\n allStyle = { ...allStyle, ...extendedResult.style };\n\n // 2. Current component's base class\n allClasses.push(config.class);\n\n // 3. Add base style\n if (config.style) {\n allStyle = { ...allStyle, ...config.style };\n }\n\n // 4. Extended variant classes\n allClasses.push(...extendedResult.variantClasses);\n\n // 5. Current component's variants\n const variantsResult = processVariants(\n config as CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n resolvedVariants,\n );\n allClasses.push(...variantsResult.classes);\n allStyle = { ...allStyle, ...variantsResult.style };\n\n // Add computed results\n allClasses.push(...computedResult.classes);\n allStyle = { ...allStyle, ...computedResult.style };\n\n // Merge class from props\n if (\"class\" in props) {\n allClasses.push(props.class);\n }\n if (\"className\" in props) {\n allClasses.push(props.className);\n }\n\n // Merge style from props\n if (props.style != null) {\n allStyle = { ...allStyle, ...normalizeStyle(props.style) };\n }\n\n return {\n className: cx(...(allClasses as ClsxClassValue[])),\n style: allStyle,\n };\n };\n\n const createModalComponent = <R extends ComponentResult>(\n mode: Mode,\n ): ModalComponent<MergedVariants, R> => {\n const propsKeys = getPropsKeys(mode);\n\n const component = ((props: ComponentProps<MergedVariants> = {}) => {\n const { className, style } = computeResult(props);\n\n if (mode === \"jsx\") {\n return { className, style: styleValueToJSXStyle(style) } as R;\n }\n if (mode === \"html\") {\n return {\n class: className,\n style: styleValueToHTMLStyle(style),\n } as R;\n }\n // htmlObj\n return {\n class: className,\n style: styleValueToHTMLObjStyle(style),\n } as R;\n }) as ModalComponent<MergedVariants, R>;\n\n component.class = (props: ComponentProps<MergedVariants> = {}) => {\n return computeResult(props).className;\n };\n\n component.style = ((props: ComponentProps<MergedVariants> = {}) => {\n const { style } = computeResult(props);\n if (mode === \"jsx\") return styleValueToJSXStyle(style);\n if (mode === \"html\") return styleValueToHTMLStyle(style);\n return styleValueToHTMLObjStyle(style);\n }) as ModalComponent<MergedVariants, R>[\"style\"];\n\n component.getVariants = (\n variants?: VariantValues<MergedVariants>,\n ): VariantValues<MergedVariants> => {\n return resolveVariants(\n config as CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n variants as VariantValues<Record<string, unknown>>,\n ) as VariantValues<MergedVariants>;\n };\n\n component.keys = propsKeys as (keyof MergedVariants | keyof R)[];\n\n component.variantKeys = variantKeys as (keyof MergedVariants)[];\n\n component.propKeys = propsKeys as (keyof MergedVariants | keyof R)[];\n\n // Compute base class (without variants) - includes extended base classes\n const extendedBaseClasses: ClassValue[] = [];\n if (config.extend) {\n for (const ext of config.extend) {\n extendedBaseClasses.push(ext._baseClass);\n }\n }\n component._baseClass = cx(\n ...(extendedBaseClasses as ClsxClassValue[]),\n config.class as ClsxClassValue,\n );\n\n return component;\n };\n\n // Create the default modal component\n const defaultComponent = createModalComponent<StyleProps[M]>(defaultMode);\n\n // Create all modal variants\n const jsxComponent = createModalComponent<JSXProps>(\"jsx\");\n const htmlComponent = createModalComponent<HTMLProps>(\"html\");\n const htmlObjComponent = createModalComponent<HTMLObjProps>(\"htmlObj\");\n\n // Build the final component\n const component = defaultComponent as CVComponent<V, CV, E, StyleProps[M]>;\n component.jsx = jsxComponent;\n component.html = htmlComponent;\n component.htmlObj = htmlObjComponent;\n\n return component;\n };\n\n return { cv, cx };\n}\n\nexport const { cv, cx } = create();\n"],"x_google_ignoreList":[0],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","names":["cx","clsx","cv","component"],"sources":["../../../node_modules/.pnpm/clsx@2.1.1/node_modules/clsx/dist/clsx.mjs","../src/utils.ts","../src/index.ts"],"sourcesContent":["function r(e){var t,f,n=\"\";if(\"string\"==typeof e||\"number\"==typeof e)n+=e;else if(\"object\"==typeof e)if(Array.isArray(e)){var o=e.length;for(t=0;t<o;t++)e[t]&&(f=r(e[t]))&&(n&&(n+=\" \"),n+=f)}else for(f in e)e[f]&&(n&&(n+=\" \"),n+=f);return n}export function clsx(){for(var e,t,f=0,n=\"\",o=arguments.length;f<o;f++)(e=arguments[f])&&(t=r(e))&&(n&&(n+=\" \"),n+=t);return n}export default clsx;","import type * as CSS from \"csstype\";\nimport type {\n HTMLCSSProperties,\n JSXCSSProperties,\n StyleValue,\n} from \"./types.ts\";\n\nexport const MODES = [\"jsx\", \"html\", \"htmlObj\"] as const;\nexport type Mode = (typeof MODES)[number];\n\n/**\n * Returns the appropriate class property name based on the mode.\n * @example\n * getClassPropertyName(\"jsx\") // \"className\"\n * getClassPropertyName(\"html\") // \"class\"\n */\nexport function getClassPropertyName(mode: Mode) {\n return mode === \"jsx\" ? \"className\" : \"class\";\n}\n\n/**\n * Converts a hyphenated CSS property name to camelCase.\n * @example\n * hyphenToCamel(\"background-color\") // \"backgroundColor\"\n * hyphenToCamel(\"--custom-var\") // \"--custom-var\" (CSS variables are preserved)\n */\nexport function hyphenToCamel(str: string) {\n // CSS custom properties (variables) should not be converted\n if (str.startsWith(\"--\")) {\n return str;\n }\n return str.replace(/-([a-z])/gi, (_, letter) => letter.toUpperCase());\n}\n\n/**\n * Converts a camelCase CSS property name to hyphenated form.\n * @example\n * camelToHyphen(\"backgroundColor\") // \"background-color\"\n * camelToHyphen(\"--customVar\") // \"--customVar\" (CSS variables are preserved)\n */\nexport function camelToHyphen(str: string) {\n // CSS custom properties (variables) should not be converted\n if (str.startsWith(\"--\")) {\n return str;\n }\n return str.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`);\n}\n\n/**\n * Parses a length value, adding \"px\" if it's a number.\n * @example\n * parseLengthValue(16); // \"16px\"\n * parseLengthValue(\"2em\"); // \"2em\"\n */\nexport function parseLengthValue(value: string | number) {\n if (typeof value === \"string\") return value;\n return `${value}px`;\n}\n\n/**\n * Parses a CSS style string into a StyleValue object.\n * @example\n * htmlStyleToStyleValue(\"background-color: red; font-size: 16px;\");\n * // { backgroundColor: \"red\", fontSize: \"16px\" }\n */\nexport function htmlStyleToStyleValue(styleString: string) {\n if (!styleString) return {};\n\n const result: StyleValue = {};\n const declarations = styleString.split(\";\");\n\n for (const declaration of declarations) {\n const trimmed = declaration.trim();\n if (!trimmed) continue;\n\n const colonIndex = trimmed.indexOf(\":\");\n if (colonIndex === -1) continue;\n\n const property = trimmed.slice(0, colonIndex).trim();\n const value = trimmed.slice(colonIndex + 1).trim();\n if (!property) continue;\n if (!value) continue;\n\n const camelProperty = hyphenToCamel(property) as any;\n result[camelProperty] = value;\n }\n\n return result;\n}\n\n/**\n * Converts a hyphenated style object to a camelCase StyleValue object.\n * @example\n * htmlObjStyleToStyleValue({ \"background-color\": \"red\", \"font-size\": \"16px\" });\n * // { backgroundColor: \"red\", fontSize: \"16px\" }\n */\nexport function htmlObjStyleToStyleValue(style: HTMLCSSProperties) {\n const result: StyleValue = {};\n for (const [key, value] of Object.entries(style)) {\n if (value == null) continue;\n const property = hyphenToCamel(key) as any;\n result[property] = parseLengthValue(value);\n }\n return result;\n}\n\n/**\n * Converts a camelCase style object to a StyleValue object.\n * @example\n * jsxStyleToStyleValue({ backgroundColor: \"red\", fontSize: 16 });\n * // { backgroundColor: \"red\", fontSize: \"16px\" }\n */\nexport function jsxStyleToStyleValue(style: JSXCSSProperties) {\n const result: StyleValue = {};\n for (const [key, value] of Object.entries(style)) {\n if (value == null) continue;\n result[key as any] = parseLengthValue(value);\n }\n return result;\n}\n\n/**\n * Converts a StyleValue object to a CSS style string.\n * @example\n * styleValueToHTMLStyle({ backgroundColor: \"red\", fontSize: \"16px\" });\n * // \"background-color: red; font-size: 16px;\"\n */\nexport function styleValueToHTMLStyle(style: StyleValue): string {\n const parts: string[] = [];\n for (const [key, value] of Object.entries(style)) {\n if (value == null) continue;\n parts.push(`${camelToHyphen(key)}: ${value}`);\n }\n if (!parts.length) return \"\";\n return `${parts.join(\"; \")};`;\n}\n\n/**\n * Converts a StyleValue object to a hyphenated style object.\n * @example\n * styleValueToHTMLObjStyle({ backgroundColor: \"red\", fontSize: \"16px\" });\n * // { \"background-color\": \"red\", \"font-size\": \"16px\" }\n */\nexport function styleValueToHTMLObjStyle(style: StyleValue) {\n const result: CSS.PropertiesHyphen = {};\n for (const [key, value] of Object.entries(style)) {\n if (value == null) continue;\n const property = camelToHyphen(key) as keyof HTMLCSSProperties;\n result[property] = value;\n }\n return result;\n}\n\n/**\n * Converts a StyleValue object to a camelCase style object.\n * @example\n * styleValueToJSXStyle({ backgroundColor: \"red\", fontSize: \"16px\" });\n * // { backgroundColor: \"red\", fontSize: \"16px\" }\n */\nexport function styleValueToJSXStyle(style: StyleValue) {\n return style as JSXCSSProperties;\n}\n\n/**\n * Type guard to check if a style object has hyphenated keys.\n * @example\n * isHTMLObjStyle({ \"background-color\": \"red\" }); // true\n * isHTMLObjStyle({ backgroundColor: \"red\" }); // false\n */\nexport function isHTMLObjStyle(\n style: CSS.Properties<any> | CSS.PropertiesHyphen<any>,\n): style is CSS.PropertiesHyphen {\n return Object.keys(style).some(\n (key) => key.includes(\"-\") && !key.startsWith(\"--\"),\n );\n}\n","import clsx, { type ClassValue as ClsxClassValue } from \"clsx\";\nimport type {\n AnyComponent,\n CVComponent,\n ClassValue,\n ComponentProps,\n ComponentResult,\n Computed,\n ComputedContext,\n ComputedVariants,\n ExtendableVariants,\n HTMLObjProps,\n HTMLProps,\n JSXProps,\n MergeVariants,\n ModalComponent,\n SplitPropsFunction,\n StyleClassValue,\n StyleProps,\n StyleValue,\n VariantValues,\n Variants,\n} from \"./types.ts\";\nimport {\n type Mode,\n getClassPropertyName,\n htmlObjStyleToStyleValue,\n htmlStyleToStyleValue,\n isHTMLObjStyle,\n jsxStyleToStyleValue,\n styleValueToHTMLObjStyle,\n styleValueToHTMLStyle,\n styleValueToJSXStyle,\n} from \"./utils.ts\";\n\nexport type {\n ClassValue,\n StyleValue,\n StyleClassValue,\n JSXProps,\n HTMLProps,\n HTMLObjProps,\n CVComponent,\n};\n\nexport type VariantProps<T extends Pick<AnyComponent, \"getVariants\">> =\n ReturnType<T[\"getVariants\"]>;\n\nexport interface CVConfig<\n V extends Variants = {},\n CV extends ComputedVariants = {},\n E extends AnyComponent[] = [],\n> {\n extend?: E;\n class?: ClassValue;\n style?: StyleValue;\n variants?: ExtendableVariants<V, E>;\n computedVariants?: CV;\n defaultVariants?: VariantValues<MergeVariants<V, CV, E>>;\n computed?: Computed<MergeVariants<V, CV, E>>;\n}\n\ninterface CreateParams<M extends Mode> {\n defaultMode?: M;\n transformClass?: (className: string) => string;\n}\n\n/**\n * Checks if a value is a style-class object (has style properties, not just a\n * class value).\n */\nfunction isStyleClassValue(value: unknown): value is StyleClassValue {\n if (typeof value !== \"object\") return false;\n if (value == null) return false;\n if (Array.isArray(value)) return false;\n return true;\n}\n\n/**\n * Converts any style input (string, JSX object, or HTML object) to a\n * normalized StyleValue.\n */\nfunction normalizeStyle(style: unknown): StyleValue {\n if (typeof style === \"string\") {\n return htmlStyleToStyleValue(style);\n }\n if (typeof style === \"object\" && style != null) {\n if (isHTMLObjStyle(style as Record<string, unknown>)) {\n return htmlObjStyleToStyleValue(style as Record<string, string | number>);\n }\n return jsxStyleToStyleValue(style as Record<string, string | number>);\n }\n return {};\n}\n\n/**\n * Extracts class and style from a style-class value object.\n */\nfunction extractStyleClass(value: StyleClassValue): {\n class: ClassValue;\n style: StyleValue;\n} {\n const { class: cls, ...style } = value;\n return { class: cls, style };\n}\n\n/**\n * Processes a variant value to extract class and style.\n */\nfunction processVariantValue(value: unknown): {\n class: ClassValue;\n style: StyleValue;\n} {\n if (isStyleClassValue(value)) {\n return extractStyleClass(value);\n }\n return { class: value as ClassValue, style: {} };\n}\n\n/**\n * Gets all variant keys from a component's config, including extended\n * components.\n */\nfunction collectVariantKeys(\n config: CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n): string[] {\n const keys = new Set<string>();\n\n // Collect from extended components\n if (config.extend) {\n for (const ext of config.extend) {\n for (const key of ext.variantKeys) {\n keys.add(key as string);\n }\n }\n }\n\n // Collect from variants\n if (config.variants) {\n for (const key of Object.keys(config.variants)) {\n keys.add(key);\n }\n }\n\n // Collect from computedVariants\n if (config.computedVariants) {\n for (const key of Object.keys(config.computedVariants)) {\n keys.add(key);\n }\n }\n\n return Array.from(keys);\n}\n\n/**\n * Collects static default variants from extended components and the current\n * config. Also handles implicit boolean defaults (when only `false` key\n * exists).\n */\nfunction collectStaticDefaults(\n config: CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n): Record<string, unknown> {\n let defaults: Record<string, unknown> = {};\n\n // Collect static defaults from extended components\n if (config.extend) {\n for (const ext of config.extend) {\n const extDefaults = ext.getVariants();\n defaults = { ...defaults, ...extDefaults };\n }\n }\n\n // Handle implicit boolean defaults from variants\n // If a variant only has a `false` key and no `true` key, default to false\n if (config.variants) {\n for (const [variantName, variantDef] of Object.entries(config.variants)) {\n if (isStyleClassValue(variantDef)) {\n const keys = Object.keys(variantDef);\n const hasFalseOnly = keys.includes(\"false\") && !keys.includes(\"true\");\n if (hasFalseOnly && defaults[variantName] === undefined) {\n defaults[variantName] = false;\n }\n }\n }\n }\n\n // Override with current config's static defaults\n if (config.defaultVariants) {\n defaults = { ...defaults, ...config.defaultVariants };\n }\n\n return defaults;\n}\n\n/**\n * Collects default variants from extended components and the current config.\n * This includes both static defaults and computed defaults (from\n * setDefaultVariants in extended components' computed functions).\n * Priority: parent static < child static < parent computed < child computed.\n */\nfunction collectDefaultVariants(\n config: CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n): Record<string, unknown> {\n // Start with static defaults (parent static < child static)\n let defaults = collectStaticDefaults(config);\n\n // Apply computed defaults from extended components\n // Parent's setDefaultVariants should override child's static defaults\n if (config.extend) {\n for (const ext of config.extend) {\n // _resolveDefaults returns the resolved variants after running the\n // parent's computed function, including setDefaultVariants effects\n if (ext._resolveDefaults) {\n const extComputedDefaults = ext._resolveDefaults({});\n defaults = { ...defaults, ...extComputedDefaults };\n }\n }\n }\n\n return defaults;\n}\n\n/**\n * Filters out keys with undefined values from an object.\n */\nfunction filterUndefined(\n obj: Record<string, unknown>,\n): Record<string, unknown> {\n const result: Record<string, unknown> = {};\n for (const [key, value] of Object.entries(obj)) {\n if (value !== undefined) {\n result[key] = value;\n }\n }\n return result;\n}\n\n/**\n * Resolves variant values by merging defaults with provided props.\n * Props with undefined values are filtered out so they don't override defaults.\n */\nfunction resolveVariants(\n config: CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n props: Record<string, unknown> = {},\n): Record<string, unknown> {\n const defaults = collectDefaultVariants(config);\n return { ...defaults, ...filterUndefined(props) };\n}\n\n/**\n * Gets the value for a single variant based on the variant definition and the\n * selected value.\n */\nfunction getVariantResult(\n variantDef: unknown,\n selectedValue: unknown,\n): { class: ClassValue; style: StyleValue } {\n // Shorthand variant: `disabled: \"disabled-class\"` means { true: \"...\" }\n if (!isStyleClassValue(variantDef)) {\n if (selectedValue === true) {\n return processVariantValue(variantDef);\n }\n return { class: null, style: {} };\n }\n\n // Object variant: { sm: \"...\", lg: \"...\" }\n const key = String(selectedValue);\n const value = (variantDef as Record<string, unknown>)[key];\n if (value === undefined) return { class: null, style: {} };\n\n return processVariantValue(value);\n}\n\n/**\n * Processes extended components and returns base classes and variant classes separately.\n * Base classes should come before current component's base, variant classes come after.\n * When overrideVariantKeys is provided, those variant keys are excluded from the extended\n * component's result (used when current component's computedVariants overrides them).\n */\nfunction processExtended(\n config: CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n resolvedVariants: Record<string, unknown>,\n overrideVariantKeys: Set<string> = new Set(),\n): {\n baseClasses: ClassValue[];\n variantClasses: ClassValue[];\n style: StyleValue;\n} {\n const baseClasses: ClassValue[] = [];\n const variantClasses: ClassValue[] = [];\n let style: StyleValue = {};\n\n if (config.extend) {\n for (const ext of config.extend) {\n // Filter out variant keys that are being overridden by current component's computedVariants\n const filteredVariants = { ...resolvedVariants };\n for (const key of overrideVariantKeys) {\n delete filteredVariants[key];\n }\n\n // Get the result with filtered variants (excluding overridden keys)\n const extResult = ext({ ...filteredVariants });\n\n // Only merge style for non-overridden keys\n const extStyle = normalizeStyle(extResult.style);\n style = { ...style, ...extStyle };\n\n // Get base class from internal property (no variants)\n const baseClass = ext._baseClass;\n baseClasses.push(baseClass);\n\n // Get full class with variants\n const fullClass =\n \"className\" in extResult ? extResult.className : extResult.class;\n\n // Extract variant portion (full class minus base class)\n if (fullClass && baseClass) {\n const baseClassSet = new Set(baseClass.split(\" \").filter(Boolean));\n const variantPortion = fullClass\n .split(\" \")\n .filter((c: string) => c && !baseClassSet.has(c))\n .join(\" \");\n if (variantPortion) {\n variantClasses.push(variantPortion);\n }\n } else if (fullClass && !baseClass) {\n variantClasses.push(fullClass);\n }\n }\n }\n\n return { baseClasses, variantClasses, style };\n}\n\n/**\n * Processes all variants (not extended) and returns accumulated class and\n * style.\n */\nfunction processVariants(\n config: CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n resolvedVariants: Record<string, unknown>,\n): { classes: ClassValue[]; style: StyleValue } {\n const classes: ClassValue[] = [];\n let style: StyleValue = {};\n\n // Process current component's variants\n if (config.variants) {\n for (const [variantName, variantDef] of Object.entries(config.variants)) {\n const selectedValue = resolvedVariants[variantName];\n if (selectedValue === undefined) continue;\n\n const result = getVariantResult(variantDef, selectedValue);\n classes.push(result.class);\n style = { ...style, ...result.style };\n }\n }\n\n // Process computedVariants\n if (config.computedVariants) {\n for (const [variantName, computeFn] of Object.entries(\n config.computedVariants,\n )) {\n const selectedValue = resolvedVariants[variantName];\n if (selectedValue === undefined) continue;\n\n const computedResult = computeFn(selectedValue);\n const result = processVariantValue(computedResult);\n classes.push(result.class);\n style = { ...style, ...result.style };\n }\n }\n\n return { classes, style };\n}\n\n/**\n * Processes the computed function if present.\n */\nfunction processComputed(\n config: CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n resolvedVariants: Record<string, unknown>,\n propsVariants: Record<string, unknown>,\n): {\n classes: ClassValue[];\n style: StyleValue;\n updatedVariants: Record<string, unknown>;\n} {\n const classes: ClassValue[] = [];\n let style: StyleValue = {};\n let updatedVariants = { ...resolvedVariants };\n\n if (config.computed) {\n const context = {\n variants: resolvedVariants,\n setVariants: (newVariants: VariantValues<Record<string, unknown>>) => {\n updatedVariants = { ...updatedVariants, ...newVariants };\n },\n setDefaultVariants: (\n newDefaults: VariantValues<Record<string, unknown>>,\n ) => {\n // Only apply defaults for variants not explicitly set in props\n for (const [key, value] of Object.entries(newDefaults)) {\n if (propsVariants[key] === undefined) {\n updatedVariants[key] = value;\n }\n }\n },\n };\n\n const computedResult = config.computed(context);\n if (computedResult != null) {\n const result = processVariantValue(computedResult);\n classes.push(result.class);\n style = { ...style, ...result.style };\n }\n }\n\n return { classes, style, updatedVariants };\n}\n\ninterface NormalizedSource {\n keys: string[];\n variantKeys: string[];\n defaults: Record<string, unknown>;\n isComponent: boolean;\n}\n\n/**\n * Normalizes a key source (array or component) to an object with keys, variantKeys, defaults, and isComponent flag.\n */\nfunction normalizeKeySource(source: unknown): NormalizedSource {\n if (Array.isArray(source)) {\n return {\n keys: source as string[],\n variantKeys: source as string[],\n defaults: {},\n isComponent: false,\n };\n }\n // Components are functions with keys and variantKeys properties\n if (\n source &&\n (typeof source === \"object\" || typeof source === \"function\") &&\n \"keys\" in source &&\n \"variantKeys\" in source\n ) {\n const keys = [...(source as { keys: string[] }).keys] as string[];\n const variantKeys = [\n ...(source as { variantKeys: string[] }).variantKeys,\n ] as string[];\n const defaults =\n \"getVariants\" in source\n ? (\n source as { getVariants: () => Record<string, unknown> }\n ).getVariants()\n : {};\n return { keys, variantKeys, defaults, isComponent: true };\n }\n return { keys: [], variantKeys: [], defaults: {}, isComponent: false };\n}\n\n/**\n * Splits props into multiple groups based on key sources.\n * Only the first component claims styling props (class/className/style).\n * Subsequent components only receive variant props.\n * Arrays always receive their listed keys but don't claim styling props.\n */\nfunction splitPropsImpl(\n selfKeys: string[],\n selfVariantKeys: string[],\n selfDefaults: Record<string, unknown>,\n selfIsComponent: boolean,\n props: Record<string, unknown>,\n sources: NormalizedSource[],\n): Record<string, unknown>[] {\n const allUsedKeys = new Set<string>(selfKeys);\n const results: Record<string, unknown>[] = [];\n\n // Track if styling has been claimed by a component\n let stylingClaimed = selfIsComponent;\n\n // Self result\n const selfResult: Record<string, unknown> = {};\n for (const key of selfKeys) {\n if (key in props) {\n selfResult[key] = props[key];\n }\n }\n results.push(selfResult);\n\n // Process each source\n for (const source of sources) {\n const sourceResult: Record<string, unknown> = {};\n\n // Determine which keys this source should use\n // Components use variantKeys if styling has already been claimed\n // Arrays always use their listed keys\n const effectiveKeys =\n source.isComponent && stylingClaimed ? source.variantKeys : source.keys;\n\n for (const key of effectiveKeys) {\n allUsedKeys.add(key);\n if (key in props) {\n sourceResult[key] = props[key];\n }\n }\n results.push(sourceResult);\n\n // If this is a component that hasn't claimed styling yet, mark styling as claimed\n if (source.isComponent && !stylingClaimed) {\n stylingClaimed = true;\n }\n }\n\n // Rest - keys not used by anyone\n const rest: Record<string, unknown> = {};\n for (const [key, value] of Object.entries(props)) {\n if (!allUsedKeys.has(key)) {\n rest[key] = value;\n }\n }\n results.push(rest);\n\n return results;\n}\n\n/**\n * Splits props into multiple groups based on key sources.\n * Each source gets its own result object containing all its matching keys.\n * The first component source claims styling props (class/className/style).\n * Subsequent components only receive variant props.\n * Arrays receive their listed keys but don't claim styling props.\n * The last element is always the \"rest\" containing keys not claimed by any source.\n *\n * @example\n * ```ts\n * const [buttonProps, inputProps, rest] = splitProps(\n * props,\n * buttonComponent,\n * inputComponent,\n * );\n * // buttonProps has class/style + button variants\n * // inputProps has only input variants (no class/style)\n * ```\n */\nexport const splitProps: SplitPropsFunction = ((\n props: Record<string, unknown>,\n source1: unknown,\n ...sources: unknown[]\n) => {\n const normalizedSource1 = normalizeKeySource(source1);\n const normalizedSources = sources.map(normalizeKeySource);\n return splitPropsImpl(\n normalizedSource1.keys,\n normalizedSource1.variantKeys,\n normalizedSource1.defaults,\n normalizedSource1.isComponent,\n props,\n normalizedSources,\n );\n}) as SplitPropsFunction;\n\nexport function create<M extends Mode = \"jsx\">({\n defaultMode = \"jsx\" as M,\n transformClass = (className) => className,\n}: CreateParams<M> = {}) {\n const cx = (...classes: ClsxClassValue[]) => transformClass(clsx(...classes));\n\n const cv = <\n V extends Variants = {},\n CV extends ComputedVariants = {},\n const E extends AnyComponent[] = [],\n >(\n config: CVConfig<V, CV, E> = {},\n ): CVComponent<V, CV, E, StyleProps[M]> => {\n type MergedVariants = MergeVariants<V, CV, E>;\n\n const variantKeys = collectVariantKeys(\n config as CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n );\n\n const getPropsKeys = (mode: Mode) => [\n getClassPropertyName(mode),\n \"style\",\n ...variantKeys,\n ];\n\n const computeResult = (\n props: ComponentProps<MergedVariants> = {},\n ): { className: string; style: StyleValue } => {\n const allClasses: ClassValue[] = [];\n let allStyle: StyleValue = {};\n\n // Extract variant props from input\n const variantProps: Record<string, unknown> = {};\n for (const key of variantKeys) {\n if (key in props) {\n variantProps[key] = (props as Record<string, unknown>)[key];\n }\n }\n\n // Resolve variants with defaults\n let resolvedVariants = resolveVariants(\n config as CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n variantProps,\n );\n\n // Process computed first to potentially update variants\n const computedResult = processComputed(\n config as CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n resolvedVariants,\n variantProps,\n );\n resolvedVariants = computedResult.updatedVariants;\n\n // Collect computedVariants keys that will override extended variants\n const computedVariantKeys = new Set<string>(\n config.computedVariants ? Object.keys(config.computedVariants) : [],\n );\n\n // Process extended components (separates base and variant classes)\n const extendedResult = processExtended(\n config as CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n resolvedVariants,\n computedVariantKeys,\n );\n\n // 1. Extended base classes first\n allClasses.push(...extendedResult.baseClasses);\n allStyle = { ...allStyle, ...extendedResult.style };\n\n // 2. Current component's base class\n allClasses.push(config.class);\n\n // 3. Add base style\n if (config.style) {\n allStyle = { ...allStyle, ...config.style };\n }\n\n // 4. Extended variant classes\n allClasses.push(...extendedResult.variantClasses);\n\n // 5. Current component's variants\n const variantsResult = processVariants(\n config as CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n resolvedVariants,\n );\n allClasses.push(...variantsResult.classes);\n allStyle = { ...allStyle, ...variantsResult.style };\n\n // Add computed results\n allClasses.push(...computedResult.classes);\n allStyle = { ...allStyle, ...computedResult.style };\n\n // Merge class from props\n if (\"class\" in props) {\n allClasses.push(props.class);\n }\n if (\"className\" in props) {\n allClasses.push(props.className);\n }\n\n // Merge style from props\n if (props.style != null) {\n allStyle = { ...allStyle, ...normalizeStyle(props.style) };\n }\n\n return {\n className: cx(...(allClasses as ClsxClassValue[])),\n style: allStyle,\n };\n };\n\n const createModalComponent = <R extends ComponentResult>(\n mode: Mode,\n ): ModalComponent<MergedVariants, R> => {\n const propsKeys = getPropsKeys(mode);\n\n const component = ((props: ComponentProps<MergedVariants> = {}) => {\n const { className, style } = computeResult(props);\n\n if (mode === \"jsx\") {\n return { className, style: styleValueToJSXStyle(style) } as R;\n }\n if (mode === \"html\") {\n return {\n class: className,\n style: styleValueToHTMLStyle(style),\n } as R;\n }\n // htmlObj\n return {\n class: className,\n style: styleValueToHTMLObjStyle(style),\n } as R;\n }) as ModalComponent<MergedVariants, R>;\n\n component.class = (props: ComponentProps<MergedVariants> = {}) => {\n return computeResult(props).className;\n };\n\n component.style = ((props: ComponentProps<MergedVariants> = {}) => {\n const { style } = computeResult(props);\n if (mode === \"jsx\") return styleValueToJSXStyle(style);\n if (mode === \"html\") return styleValueToHTMLStyle(style);\n return styleValueToHTMLObjStyle(style);\n }) as ModalComponent<MergedVariants, R>[\"style\"];\n\n component.getVariants = (\n variants?: VariantValues<MergedVariants>,\n ): VariantValues<MergedVariants> => {\n return resolveVariants(\n config as CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n variants as VariantValues<Record<string, unknown>>,\n ) as VariantValues<MergedVariants>;\n };\n\n component.keys = propsKeys as (keyof MergedVariants | keyof R)[];\n\n component.variantKeys = variantKeys as (keyof MergedVariants)[];\n\n component.propKeys = propsKeys as (keyof MergedVariants | keyof R)[];\n\n // Compute base class (without variants) - includes extended base classes\n const extendedBaseClasses: ClassValue[] = [];\n if (config.extend) {\n for (const ext of config.extend) {\n extendedBaseClasses.push(ext._baseClass);\n }\n }\n component._baseClass = cx(\n ...(extendedBaseClasses as ClsxClassValue[]),\n config.class as ClsxClassValue,\n );\n\n // Returns only the variants set via setDefaultVariants in the computed\n // function. Used by child components to get parent's computed defaults.\n component._resolveDefaults = (\n propsVariants: Record<string, unknown>,\n ): Record<string, unknown> => {\n // Get static defaults (including from extended components)\n const staticDefaults = collectStaticDefaults(\n config as CVConfig<Variants, ComputedVariants, AnyComponent[]>,\n );\n\n // Merge with provided props\n const resolvedVariants = {\n ...staticDefaults,\n ...filterUndefined(propsVariants),\n };\n\n // Track which keys are set via setDefaultVariants\n const computedDefaults: Record<string, unknown> = {};\n\n if (config.computed) {\n const context: ComputedContext<MergedVariants> = {\n variants: resolvedVariants as VariantValues<MergedVariants>,\n setVariants: () => {\n // Not relevant for collecting defaults\n },\n setDefaultVariants: (newDefaults) => {\n // Only apply defaults for variants not explicitly set in props\n for (const [key, value] of Object.entries(newDefaults)) {\n if (propsVariants[key] === undefined) {\n computedDefaults[key] = value;\n }\n }\n },\n };\n config.computed(context);\n }\n\n return computedDefaults;\n };\n\n return component;\n };\n\n // Create the default modal component\n const defaultComponent = createModalComponent<StyleProps[M]>(defaultMode);\n\n // Create all modal variants\n const jsxComponent = createModalComponent<JSXProps>(\"jsx\");\n const htmlComponent = createModalComponent<HTMLProps>(\"html\");\n const htmlObjComponent = createModalComponent<HTMLObjProps>(\"htmlObj\");\n\n // Build the final component\n const component = defaultComponent as CVComponent<V, CV, E, StyleProps[M]>;\n component.jsx = jsxComponent;\n component.html = htmlComponent;\n component.htmlObj = htmlObjComponent;\n\n return component;\n };\n\n return { cv, cx };\n}\n\nexport const { cv, cx } = create();\n"],"x_google_ignoreList":[0],"mappings":"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"}
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -6,6 +6,7 @@ import type {
|
|
|
6
6
|
ComponentProps,
|
|
7
7
|
ComponentResult,
|
|
8
8
|
Computed,
|
|
9
|
+
ComputedContext,
|
|
9
10
|
ComputedVariants,
|
|
10
11
|
ExtendableVariants,
|
|
11
12
|
HTMLObjProps,
|
|
@@ -152,15 +153,16 @@ function collectVariantKeys(
|
|
|
152
153
|
}
|
|
153
154
|
|
|
154
155
|
/**
|
|
155
|
-
* Collects default variants from extended components and the current
|
|
156
|
-
* Also handles implicit boolean defaults (when only `false` key
|
|
156
|
+
* Collects static default variants from extended components and the current
|
|
157
|
+
* config. Also handles implicit boolean defaults (when only `false` key
|
|
158
|
+
* exists).
|
|
157
159
|
*/
|
|
158
|
-
function
|
|
160
|
+
function collectStaticDefaults(
|
|
159
161
|
config: CVConfig<Variants, ComputedVariants, AnyComponent[]>,
|
|
160
162
|
): Record<string, unknown> {
|
|
161
163
|
let defaults: Record<string, unknown> = {};
|
|
162
164
|
|
|
163
|
-
// Collect from extended components
|
|
165
|
+
// Collect static defaults from extended components
|
|
164
166
|
if (config.extend) {
|
|
165
167
|
for (const ext of config.extend) {
|
|
166
168
|
const extDefaults = ext.getVariants();
|
|
@@ -182,7 +184,7 @@ function collectDefaultVariants(
|
|
|
182
184
|
}
|
|
183
185
|
}
|
|
184
186
|
|
|
185
|
-
// Override with current config's defaults
|
|
187
|
+
// Override with current config's static defaults
|
|
186
188
|
if (config.defaultVariants) {
|
|
187
189
|
defaults = { ...defaults, ...config.defaultVariants };
|
|
188
190
|
}
|
|
@@ -190,6 +192,34 @@ function collectDefaultVariants(
|
|
|
190
192
|
return defaults;
|
|
191
193
|
}
|
|
192
194
|
|
|
195
|
+
/**
|
|
196
|
+
* Collects default variants from extended components and the current config.
|
|
197
|
+
* This includes both static defaults and computed defaults (from
|
|
198
|
+
* setDefaultVariants in extended components' computed functions).
|
|
199
|
+
* Priority: parent static < child static < parent computed < child computed.
|
|
200
|
+
*/
|
|
201
|
+
function collectDefaultVariants(
|
|
202
|
+
config: CVConfig<Variants, ComputedVariants, AnyComponent[]>,
|
|
203
|
+
): Record<string, unknown> {
|
|
204
|
+
// Start with static defaults (parent static < child static)
|
|
205
|
+
let defaults = collectStaticDefaults(config);
|
|
206
|
+
|
|
207
|
+
// Apply computed defaults from extended components
|
|
208
|
+
// Parent's setDefaultVariants should override child's static defaults
|
|
209
|
+
if (config.extend) {
|
|
210
|
+
for (const ext of config.extend) {
|
|
211
|
+
// _resolveDefaults returns the resolved variants after running the
|
|
212
|
+
// parent's computed function, including setDefaultVariants effects
|
|
213
|
+
if (ext._resolveDefaults) {
|
|
214
|
+
const extComputedDefaults = ext._resolveDefaults({});
|
|
215
|
+
defaults = { ...defaults, ...extComputedDefaults };
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
return defaults;
|
|
221
|
+
}
|
|
222
|
+
|
|
193
223
|
/**
|
|
194
224
|
* Filters out keys with undefined values from an object.
|
|
195
225
|
*/
|
|
@@ -449,15 +479,8 @@ function splitPropsImpl(
|
|
|
449
479
|
// Track if styling has been claimed by a component
|
|
450
480
|
let stylingClaimed = selfIsComponent;
|
|
451
481
|
|
|
452
|
-
// Self result
|
|
482
|
+
// Self result
|
|
453
483
|
const selfResult: Record<string, unknown> = {};
|
|
454
|
-
// First apply defaults
|
|
455
|
-
for (const [key, value] of Object.entries(selfDefaults)) {
|
|
456
|
-
if (selfKeys.includes(key)) {
|
|
457
|
-
selfResult[key] = value;
|
|
458
|
-
}
|
|
459
|
-
}
|
|
460
|
-
// Then override with props
|
|
461
484
|
for (const key of selfKeys) {
|
|
462
485
|
if (key in props) {
|
|
463
486
|
selfResult[key] = props[key];
|
|
@@ -475,14 +498,6 @@ function splitPropsImpl(
|
|
|
475
498
|
const effectiveKeys =
|
|
476
499
|
source.isComponent && stylingClaimed ? source.variantKeys : source.keys;
|
|
477
500
|
|
|
478
|
-
// First apply defaults (only for variant keys if component and styling claimed)
|
|
479
|
-
for (const [key, value] of Object.entries(source.defaults)) {
|
|
480
|
-
if (effectiveKeys.includes(key)) {
|
|
481
|
-
sourceResult[key] = value;
|
|
482
|
-
}
|
|
483
|
-
}
|
|
484
|
-
|
|
485
|
-
// Then override with props
|
|
486
501
|
for (const key of effectiveKeys) {
|
|
487
502
|
allUsedKeys.add(key);
|
|
488
503
|
if (key in props) {
|
|
@@ -718,6 +733,46 @@ export function create<M extends Mode = "jsx">({
|
|
|
718
733
|
config.class as ClsxClassValue,
|
|
719
734
|
);
|
|
720
735
|
|
|
736
|
+
// Returns only the variants set via setDefaultVariants in the computed
|
|
737
|
+
// function. Used by child components to get parent's computed defaults.
|
|
738
|
+
component._resolveDefaults = (
|
|
739
|
+
propsVariants: Record<string, unknown>,
|
|
740
|
+
): Record<string, unknown> => {
|
|
741
|
+
// Get static defaults (including from extended components)
|
|
742
|
+
const staticDefaults = collectStaticDefaults(
|
|
743
|
+
config as CVConfig<Variants, ComputedVariants, AnyComponent[]>,
|
|
744
|
+
);
|
|
745
|
+
|
|
746
|
+
// Merge with provided props
|
|
747
|
+
const resolvedVariants = {
|
|
748
|
+
...staticDefaults,
|
|
749
|
+
...filterUndefined(propsVariants),
|
|
750
|
+
};
|
|
751
|
+
|
|
752
|
+
// Track which keys are set via setDefaultVariants
|
|
753
|
+
const computedDefaults: Record<string, unknown> = {};
|
|
754
|
+
|
|
755
|
+
if (config.computed) {
|
|
756
|
+
const context: ComputedContext<MergedVariants> = {
|
|
757
|
+
variants: resolvedVariants as VariantValues<MergedVariants>,
|
|
758
|
+
setVariants: () => {
|
|
759
|
+
// Not relevant for collecting defaults
|
|
760
|
+
},
|
|
761
|
+
setDefaultVariants: (newDefaults) => {
|
|
762
|
+
// Only apply defaults for variants not explicitly set in props
|
|
763
|
+
for (const [key, value] of Object.entries(newDefaults)) {
|
|
764
|
+
if (propsVariants[key] === undefined) {
|
|
765
|
+
computedDefaults[key] = value;
|
|
766
|
+
}
|
|
767
|
+
}
|
|
768
|
+
},
|
|
769
|
+
};
|
|
770
|
+
config.computed(context);
|
|
771
|
+
}
|
|
772
|
+
|
|
773
|
+
return computedDefaults;
|
|
774
|
+
};
|
|
775
|
+
|
|
721
776
|
return component;
|
|
722
777
|
};
|
|
723
778
|
|
package/src/test.ts
CHANGED
|
@@ -1143,6 +1143,52 @@ for (const config of Object.values(CONFIGS)) {
|
|
|
1143
1143
|
expect(getStyleClass(props)).toEqual({ class: cls("lg red") });
|
|
1144
1144
|
});
|
|
1145
1145
|
|
|
1146
|
+
test("computed setDefaultVariants from parent overrides child defaultVariants", () => {
|
|
1147
|
+
const base = cv({
|
|
1148
|
+
variants: { size: { sm: "sm", lg: "lg" } },
|
|
1149
|
+
defaultVariants: { size: "sm" },
|
|
1150
|
+
computed: ({ setDefaultVariants }) => {
|
|
1151
|
+
setDefaultVariants({ size: "lg" });
|
|
1152
|
+
},
|
|
1153
|
+
});
|
|
1154
|
+
const component = getModalComponent(
|
|
1155
|
+
mode,
|
|
1156
|
+
cv({
|
|
1157
|
+
extend: [base],
|
|
1158
|
+
variants: { color: { red: "red", blue: "blue" } },
|
|
1159
|
+
defaultVariants: { size: "sm", color: "red" },
|
|
1160
|
+
}),
|
|
1161
|
+
);
|
|
1162
|
+
const props = component();
|
|
1163
|
+
expect(getStyleClass(props)).toEqual({ class: cls("lg red") });
|
|
1164
|
+
});
|
|
1165
|
+
|
|
1166
|
+
test("child computed setDefaultVariants overrides parent computed setDefaultVariants", () => {
|
|
1167
|
+
const base = cv({
|
|
1168
|
+
variants: { size: { sm: "sm", lg: "lg" } },
|
|
1169
|
+
defaultVariants: { size: "sm" },
|
|
1170
|
+
computed: ({ setDefaultVariants }) => {
|
|
1171
|
+
setDefaultVariants({ size: "lg" });
|
|
1172
|
+
},
|
|
1173
|
+
});
|
|
1174
|
+
const component = getModalComponent(
|
|
1175
|
+
mode,
|
|
1176
|
+
cv({
|
|
1177
|
+
extend: [base],
|
|
1178
|
+
variants: { color: { red: "red", blue: "blue" } },
|
|
1179
|
+
defaultVariants: { size: "sm", color: "red" },
|
|
1180
|
+
computed: ({ setDefaultVariants }) => {
|
|
1181
|
+
setDefaultVariants({ size: "sm" });
|
|
1182
|
+
},
|
|
1183
|
+
}),
|
|
1184
|
+
);
|
|
1185
|
+
const props = component();
|
|
1186
|
+
// Order: parent defaultVariants (sm) -> child defaultVariants (sm)
|
|
1187
|
+
// -> parent computed.setDefaultVariants (lg)
|
|
1188
|
+
// -> child computed.setDefaultVariants (sm)
|
|
1189
|
+
expect(getStyleClass(props)).toEqual({ class: cls("sm red") });
|
|
1190
|
+
});
|
|
1191
|
+
|
|
1146
1192
|
test("computed setDefaultVariants when explicitly passing undefined", () => {
|
|
1147
1193
|
const component = getModalComponent(
|
|
1148
1194
|
mode,
|
|
@@ -1506,7 +1552,7 @@ for (const config of Object.values(CONFIGS)) {
|
|
|
1506
1552
|
expect(component.propKeys).toEqual([classNameProp, "style", "size"]);
|
|
1507
1553
|
});
|
|
1508
1554
|
|
|
1509
|
-
test("splitProps
|
|
1555
|
+
test("splitProps does not include defaultVariants", () => {
|
|
1510
1556
|
const component = getModalComponent(
|
|
1511
1557
|
mode,
|
|
1512
1558
|
cv({
|
|
@@ -1524,7 +1570,6 @@ for (const config of Object.values(CONFIGS)) {
|
|
|
1524
1570
|
>();
|
|
1525
1571
|
expect(variantProps).toEqual({
|
|
1526
1572
|
size: "lg",
|
|
1527
|
-
color: "red",
|
|
1528
1573
|
});
|
|
1529
1574
|
expectTypeOf(otherProps).toEqualTypeOf<{ id?: string }>();
|
|
1530
1575
|
expect(otherProps).toEqual({ id: "test" });
|
|
@@ -1606,7 +1651,7 @@ for (const config of Object.values(CONFIGS)) {
|
|
|
1606
1651
|
expect(otherProps).toEqual({ id: "test" });
|
|
1607
1652
|
});
|
|
1608
1653
|
|
|
1609
|
-
test("splitProps with component parameter
|
|
1654
|
+
test("splitProps with component parameter does not include component defaults", () => {
|
|
1610
1655
|
const component1 = getModalComponent(
|
|
1611
1656
|
mode,
|
|
1612
1657
|
cv({ variants: { size: { sm: "sm", lg: "lg" } } }),
|
|
@@ -1630,9 +1675,8 @@ for (const config of Object.values(CONFIGS)) {
|
|
|
1630
1675
|
);
|
|
1631
1676
|
// First component gets variant props
|
|
1632
1677
|
expect(comp1Props).toEqual({ size: "lg" });
|
|
1633
|
-
// Second component
|
|
1634
|
-
|
|
1635
|
-
expect(comp2Props).toEqual({ color: "red" });
|
|
1678
|
+
// Second component gets empty object (no defaults applied)
|
|
1679
|
+
expect(comp2Props).toEqual({});
|
|
1636
1680
|
expect(otherProps).toEqual({ id: "test" });
|
|
1637
1681
|
});
|
|
1638
1682
|
|
|
@@ -1745,7 +1789,7 @@ for (const config of Object.values(CONFIGS)) {
|
|
|
1745
1789
|
expect(otherProps).toEqual({ id: "test" });
|
|
1746
1790
|
});
|
|
1747
1791
|
|
|
1748
|
-
test("splitProps with defaultVariants from multiple components", () => {
|
|
1792
|
+
test("splitProps with defaultVariants from multiple components does not include defaults", () => {
|
|
1749
1793
|
const component1 = getModalComponent(
|
|
1750
1794
|
mode,
|
|
1751
1795
|
cv({
|
|
@@ -1765,18 +1809,18 @@ for (const config of Object.values(CONFIGS)) {
|
|
|
1765
1809
|
component1,
|
|
1766
1810
|
component2,
|
|
1767
1811
|
);
|
|
1768
|
-
//
|
|
1812
|
+
// Neither gets defaults - only props that are actually in the input
|
|
1769
1813
|
expectTypeOf(comp1Props).branded.toEqualTypeOf<{ size?: "sm" | "lg" }>();
|
|
1770
|
-
expect(comp1Props).toEqual({
|
|
1814
|
+
expect(comp1Props).toEqual({});
|
|
1771
1815
|
expectTypeOf(comp2Props).branded.toEqualTypeOf<{
|
|
1772
1816
|
color?: "red" | "blue";
|
|
1773
1817
|
}>();
|
|
1774
|
-
expect(comp2Props).toEqual({
|
|
1818
|
+
expect(comp2Props).toEqual({});
|
|
1775
1819
|
expectTypeOf(otherProps).toEqualTypeOf<{ id: string }>();
|
|
1776
1820
|
expect(otherProps).toEqual({ id: "test" });
|
|
1777
1821
|
});
|
|
1778
1822
|
|
|
1779
|
-
test("variantKeys splitProps
|
|
1823
|
+
test("variantKeys splitProps does not include defaultVariants", () => {
|
|
1780
1824
|
const component = getModalComponent(
|
|
1781
1825
|
mode,
|
|
1782
1826
|
cv({
|
package/src/types.ts
CHANGED
|
@@ -337,6 +337,13 @@ export interface ModalComponent<V, R extends ComponentResult> {
|
|
|
337
337
|
propKeys: (keyof V | keyof R)[];
|
|
338
338
|
/** @internal Base class without variants */
|
|
339
339
|
_baseClass: string;
|
|
340
|
+
/**
|
|
341
|
+
* @internal Returns resolved variants after running the computed function.
|
|
342
|
+
* Used by child components to get parent's setDefaultVariants effects.
|
|
343
|
+
*/
|
|
344
|
+
_resolveDefaults: (
|
|
345
|
+
propsVariants: Record<string, unknown>,
|
|
346
|
+
) => Record<string, unknown>;
|
|
340
347
|
}
|
|
341
348
|
|
|
342
349
|
export interface CVComponent<
|