@yahoo/uds 3.157.0 → 3.158.0

package/dist/automated-config/dist/generated/universalTokensConfigAuto.js

@@ -9565,7 +9565,7 @@ const defaultUniversalTokensConfigAuto = {
 		variables: {
 			"size/lg/icon": { size: { rest: {
 				type: "iconSizes",
-				value: "md",
+				value: "sm",
 				valueType: "alias"
 			} } },
 			"size/lg/root": { spacing: { rest: {
@@ -12069,30 +12069,23 @@ const defaultUniversalTokensConfigAuto = {
 					valueType: "alias"
 				}
 			} },
-			"item/variant/default/active/off/text": {
-				color: {
-					focused: {
-						type: "foregroundPaletteColors",
-						value: "brand",
-						valueType: "alias"
-					},
-					hover: {
-						type: "foregroundPaletteColors",
-						value: "brand",
-						valueType: "alias"
-					},
-					rest: {
-						type: "foregroundPaletteColors",
-						value: "brand",
-						valueType: "alias"
-					}
+			"item/variant/default/active/off/text": { color: {
+				focused: {
+					type: "foregroundPaletteColors",
+					value: "brand",
+					valueType: "alias"
 				},
-				textVariant: { rest: {
-					type: "textVariants",
-					value: "label2",
+				hover: {
+					type: "foregroundPaletteColors",
+					value: "brand",
 					valueType: "alias"
-				} }
-			},
+				},
+				rest: {
+					type: "foregroundPaletteColors",
+					value: "brand",
+					valueType: "alias"
+				}
+			} },
 			"item/variant/default/active/on/icon": { color: {
 				focused: {
 					type: "foregroundPaletteColors",
@@ -12127,30 +12120,23 @@ const defaultUniversalTokensConfigAuto = {
 					valueType: "alias"
 				}
 			} },
-			"item/variant/default/active/on/text": {
-				color: {
-					focused: {
-						type: "foregroundPaletteColors",
-						value: "brand",
-						valueType: "alias"
-					},
-					hover: {
-						type: "foregroundPaletteColors",
-						value: "brand",
-						valueType: "alias"
-					},
-					rest: {
-						type: "foregroundPaletteColors",
-						value: "brand",
-						valueType: "alias"
-					}
+			"item/variant/default/active/on/text": { color: {
+				focused: {
+					type: "foregroundPaletteColors",
+					value: "brand",
+					valueType: "alias"
 				},
-				textVariant: { rest: {
-					type: "textVariants",
-					value: "label2",
+				hover: {
+					type: "foregroundPaletteColors",
+					value: "brand",
 					valueType: "alias"
-				} }
-			},
+				},
+				rest: {
+					type: "foregroundPaletteColors",
+					value: "brand",
+					valueType: "alias"
+				}
+			} },
 			"itemCheckbox/variant/default/active/off/endIcon": { color: {
 				focused: {
 					type: "foregroundPaletteColors",
@@ -12311,6 +12297,11 @@ const defaultUniversalTokensConfigAuto = {
 				type: "iconSizes",
 				value: "sm",
 				valueType: "alias"
+			} } },
+			"size/default/text": { textVariant: { rest: {
+				type: "textVariants",
+				value: "label2",
+				valueType: "alias"
 			} } }
 		}
 	},
@@ -14027,6 +14018,246 @@ const defaultUniversalTokensConfigAuto = {
 			} }
 		} }
 	},
+	select: {
+		defaults: {
+			size: "md",
+			variant: "default"
+		},
+		variables: { "variant/default/root": {} }
+	},
+	selectContent: {
+		defaults: {
+			size: "default",
+			variant: "default"
+		},
+		variables: {
+			"size/default/root": {
+				borderRadius: { rest: {
+					type: "borderRadii",
+					value: "md",
+					valueType: "alias"
+				} },
+				borderWidth: { rest: {
+					type: "borderWidths",
+					value: "thin",
+					valueType: "alias"
+				} },
+				gap: { rest: {
+					type: "spacingAliases",
+					value: "0",
+					valueType: "alias"
+				} },
+				shadow: { rest: {
+					type: "shadowVariants",
+					value: "lg",
+					valueType: "alias"
+				} },
+				spacingHorizontal: { rest: {
+					type: "spacingAliases",
+					value: "0",
+					valueType: "alias"
+				} },
+				spacingVertical: { rest: {
+					type: "spacingAliases",
+					value: "0",
+					valueType: "alias"
+				} }
+			},
+			"variant/default/root": {
+				backgroundColor: { rest: {
+					type: "backgroundPaletteColors",
+					value: "primary",
+					valueType: "alias"
+				} },
+				borderColor: { rest: {
+					type: "spectrumColors",
+					value: "gray-3",
+					valueType: "alias"
+				} }
+			}
+		}
+	},
+	selectItem: {
+		defaults: {
+			size: "default",
+			variant: "default"
+		},
+		variables: {
+			"divider/variant/default/line": {
+				borderColor: { rest: {
+					type: "linePaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				} },
+				borderWidth: { rest: {
+					type: "borderWidths",
+					value: "thin",
+					valueType: "alias"
+				} }
+			},
+			"divider/variant/default/root": {},
+			"divider/variant/default/text": {
+				color: { rest: {
+					type: "foregroundPaletteColors",
+					value: "muted",
+					valueType: "alias"
+				} },
+				textVariant: { rest: {
+					type: "textVariants",
+					value: "caption2",
+					valueType: "alias"
+				} }
+			},
+			"item/variant/default/active/off/icon": { color: {
+				focused: {
+					type: "foregroundPaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				},
+				hover: {
+					type: "foregroundPaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				},
+				pressed: {
+					type: "foregroundPaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				},
+				rest: {
+					type: "foregroundPaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				}
+			} },
+			"item/variant/default/active/off/root": { backgroundColor: {
+				focused: {
+					type: "backgroundPaletteColors",
+					value: "primary",
+					valueType: "alias"
+				},
+				hover: {
+					type: "backgroundPaletteColors",
+					value: "primary",
+					valueType: "alias"
+				},
+				pressed: {
+					type: "backgroundPaletteColors",
+					value: "primary",
+					valueType: "alias"
+				},
+				rest: {
+					type: "backgroundPaletteColors",
+					value: "primary",
+					valueType: "alias"
+				}
+			} },
+			"item/variant/default/active/off/text": { color: {
+				focused: {
+					type: "foregroundPaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				},
+				hover: {
+					type: "foregroundPaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				},
+				pressed: {
+					type: "foregroundPaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				},
+				rest: {
+					type: "foregroundPaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				}
+			} },
+			"item/variant/default/active/on/icon": { color: {
+				focused: {
+					type: "foregroundPaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				},
+				hover: {
+					type: "foregroundPaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				},
+				pressed: {
+					type: "foregroundPaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				},
+				rest: {
+					type: "foregroundPaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				}
+			} },
+			"item/variant/default/active/on/root": { backgroundColor: {
+				focused: {
+					type: "backgroundPaletteColors",
+					value: "primary",
+					valueType: "alias"
+				},
+				hover: {
+					type: "backgroundPaletteColors",
+					value: "primary",
+					valueType: "alias"
+				},
+				pressed: {
+					type: "backgroundPaletteColors",
+					value: "primary",
+					valueType: "alias"
+				},
+				rest: {
+					type: "backgroundPaletteColors",
+					value: "primary",
+					valueType: "alias"
+				}
+			} },
+			"item/variant/default/active/on/text": { color: {
+				focused: {
+					type: "foregroundPaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				},
+				hover: {
+					type: "foregroundPaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				},
+				pressed: {
+					type: "foregroundPaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				},
+				rest: {
+					type: "foregroundPaletteColors",
+					value: "secondary",
+					valueType: "alias"
+				}
+			} },
+			"size/default/endIcon": { size: { rest: {
+				type: "iconSizes",
+				value: "sm",
+				valueType: "alias"
+			} } },
+			"size/default/root": {},
+			"size/default/startIcon": { size: { rest: {
+				type: "iconSizes",
+				value: "sm",
+				valueType: "alias"
+			} } },
+			"size/default/text": { textVariant: { rest: {
+				type: "textVariants",
+				value: "ui1",
+				valueType: "alias"
+			} } }
+		}
+	},
 	switch: {
 		defaults: {
 			size: "md",

package/dist/automated-config/dist/properties.cjs

@@ -433,6 +433,12 @@ const paginationWidthVar = {
 	possibleFixtures: ["positiveIntegers"],
 	twThemePath: (_, value) => `${value}px`
 };
+const controlHeight = {
+	name: "controlHeight",
+	cssProperties: [],
+	possibleFixtures: ["positiveIntegers"],
+	twThemePath: (_, value) => `${value}px`
+};
 const publicProperties = {
 	backgroundColor,
 	borderWidth,
@@ -529,7 +535,8 @@ const publicProperties = {
 		twThemePath: () => "",
 		customValueRenderer: ({ value }) => `${String(value)}%`
 	},
-	paginationWidthVar
+	paginationWidthVar,
+	controlHeight
 };
 const internalProperties = {
 	outlineWidth,

package/dist/automated-config/dist/properties.d.cts

@@ -70,6 +70,7 @@ declare const publicProperties: {
   readonly scrimBackgroundColor: ConfigurableProperty<"backgroundPaletteColors" | "spectrumColors" | "alwaysPaletteAliases", unknown>;
   readonly scrimOpacity: ConfigurableProperty<"opacitySteps", unknown>;
   readonly paginationWidthVar: ConfigurableProperty<"positiveIntegers", unknown>;
+  readonly controlHeight: ConfigurableProperty<"positiveIntegers", unknown>;
 };
 declare const configurableProperties: {
   outlineWidth: ConfigurableProperty<"borderWidths" | "spacingAliases", unknown>;
@@ -122,6 +123,7 @@ declare const configurableProperties: {
   scrimBackgroundColor: ConfigurableProperty<"backgroundPaletteColors" | "spectrumColors" | "alwaysPaletteAliases", unknown>;
   scrimOpacity: ConfigurableProperty<"opacitySteps", unknown>;
   paginationWidthVar: ConfigurableProperty<"positiveIntegers", unknown>;
+  controlHeight: ConfigurableProperty<"positiveIntegers", unknown>;
 };
 type ExtendablePropertiesName = keyof typeof configurableProperties;
 type ConfigurablePropertiesName = keyof typeof publicProperties;
@@ -131,6 +133,12 @@ interface SelectedConfigurableProperty<C extends ConfigurablePropertiesName, O e
   typeOfFixture: T;
   values: V;
   skipRestState?: boolean;
+  /**
+   * When true, the property is omitted from `buildConfigSchema()` output and
+   * optional in stored branch configs. Used for opt-in-only vars (e.g.
+   * IconButton `controlHeight`) that are written at runtime, not seeded.
+   */
+  optionalInDefaultSchema?: boolean;
   /**
    * Per-property pseudo state list (legacy). New components should declare
    * atomic states at the layer level via `atomicStates` and use

package/dist/automated-config/dist/properties.d.ts

@@ -70,6 +70,7 @@ declare const publicProperties: {
   readonly scrimBackgroundColor: ConfigurableProperty<"backgroundPaletteColors" | "spectrumColors" | "alwaysPaletteAliases", unknown>;
   readonly scrimOpacity: ConfigurableProperty<"opacitySteps", unknown>;
   readonly paginationWidthVar: ConfigurableProperty<"positiveIntegers", unknown>;
+  readonly controlHeight: ConfigurableProperty<"positiveIntegers", unknown>;
 };
 declare const configurableProperties: {
   outlineWidth: ConfigurableProperty<"borderWidths" | "spacingAliases", unknown>;
@@ -122,6 +123,7 @@ declare const configurableProperties: {
   scrimBackgroundColor: ConfigurableProperty<"backgroundPaletteColors" | "spectrumColors" | "alwaysPaletteAliases", unknown>;
   scrimOpacity: ConfigurableProperty<"opacitySteps", unknown>;
   paginationWidthVar: ConfigurableProperty<"positiveIntegers", unknown>;
+  controlHeight: ConfigurableProperty<"positiveIntegers", unknown>;
 };
 type ExtendablePropertiesName = keyof typeof configurableProperties;
 type ConfigurablePropertiesName = keyof typeof publicProperties;
@@ -131,6 +133,12 @@ interface SelectedConfigurableProperty<C extends ConfigurablePropertiesName, O e
   typeOfFixture: T;
   values: V;
   skipRestState?: boolean;
+  /**
+   * When true, the property is omitted from `buildConfigSchema()` output and
+   * optional in stored branch configs. Used for opt-in-only vars (e.g.
+   * IconButton `controlHeight`) that are written at runtime, not seeded.
+   */
+  optionalInDefaultSchema?: boolean;
   /**
    * Per-property pseudo state list (legacy). New components should declare
    * atomic states at the layer level via `atomicStates` and use

package/dist/automated-config/dist/properties.js

@@ -433,6 +433,12 @@ const paginationWidthVar = {
 	possibleFixtures: ["positiveIntegers"],
 	twThemePath: (_, value) => `${value}px`
 };
+const controlHeight = {
+	name: "controlHeight",
+	cssProperties: [],
+	possibleFixtures: ["positiveIntegers"],
+	twThemePath: (_, value) => `${value}px`
+};
 const publicProperties = {
 	backgroundColor,
 	borderWidth,
@@ -529,7 +535,8 @@ const publicProperties = {
 		twThemePath: () => "",
 		customValueRenderer: ({ value }) => `${String(value)}%`
 	},
-	paginationWidthVar
+	paginationWidthVar,
+	controlHeight
 };
 const internalProperties = {
 	outlineWidth,

package/dist/automated-config/dist/types/ComponentConfig.d.cts

@@ -15,7 +15,7 @@ type AllPossibleProperties = Exclude<keyof typeof index_d_exports, 'iconButtonSi
  * generator must still resolve their selectors. Drop entries as components
  * migrate to layer-level `atomicStates`.
  */
-type LegacyStateLiteral = 'disabled' | 'focused' | 'focused-keyboard';
+type LegacyStateLiteral = 'disabled' | 'focused' | 'focused-keyboard' | 'selected';
 /**
  * All possible state keys a property can be styled for. Encoded structure
  * matches the resolver's enumeration and the StateBuilder's depth cap: 0..3
@@ -64,6 +64,8 @@ interface ComponentStateConfig {
   options: readonly string[];
   /** Pseudo-states to omit for specific component state options (e.g. active/on). */
   excludePseudoStatesForOptions?: Partial<Record<string, readonly PossibleStates[]>>;
+  /** Layers to omit from the configurator for specific component state options. */
+  excludeLayersForOptions?: Partial<Record<string, readonly string[]>>;
   /**
    * @deprecated Per-state property overrides are now authored at the schema
    * level (Configurator UI, migrations), not in source configs. Each

package/dist/automated-config/dist/types/ComponentConfig.d.ts

@@ -15,7 +15,7 @@ type AllPossibleProperties = Exclude<keyof typeof index_d_exports, 'iconButtonSi
  * generator must still resolve their selectors. Drop entries as components
  * migrate to layer-level `atomicStates`.
  */
-type LegacyStateLiteral = 'disabled' | 'focused' | 'focused-keyboard';
+type LegacyStateLiteral = 'disabled' | 'focused' | 'focused-keyboard' | 'selected';
 /**
  * All possible state keys a property can be styled for. Encoded structure
  * matches the resolver's enumeration and the StateBuilder's depth cap: 0..3
@@ -64,6 +64,8 @@ interface ComponentStateConfig {
   options: readonly string[];
   /** Pseudo-states to omit for specific component state options (e.g. active/on). */
   excludePseudoStatesForOptions?: Partial<Record<string, readonly PossibleStates[]>>;
+  /** Layers to omit from the configurator for specific component state options. */
+  excludeLayersForOptions?: Partial<Record<string, readonly string[]>>;
   /**
    * @deprecated Per-state property overrides are now authored at the schema
    * level (Configurator UI, migrations), not in source configs. Each

package/dist/automated-config/dist/utils/buildConfigSchema.cjs

@@ -70,6 +70,9 @@ function buildPropertyStateMap(layer, property, variantOption, excludedStates =
 function propertyVariesOnlyAtRest(property) {
 	return property.name === "textVariant";
 }
+function isOptionalInDefaultSchema(property) {
+	return property.optionalInDefaultSchema === true;
+}
 /** Resolves the fixture type by finding which value set contains the given value */
 function findFixtureTypeForValue(property, value) {
 	const index = property.values.findIndex((arr) => arr.includes(value));
@@ -99,6 +102,7 @@ function emitUniversalLayerSchema(result, layers, variantKey, variantOption, sub
 		result.variables[schemaKey] = {};
 		for (const propertyKey in layer.properties) {
 			const property = layer.properties[propertyKey];
+			if (isOptionalInDefaultSchema(property)) continue;
 			result.variables[schemaKey] = {
 				...result.variables[schemaKey],
 				[propertyKey]: buildPropertyStateMap(layer, property, variantOption)
@@ -120,22 +124,27 @@ function buildConfigSchema(config) {
 			const componentStates = variantConfig.componentStates;
 			for (const componentStateKey in componentStates) {
 				const componentState = componentStates[componentStateKey];
-				for (const componentStateOption of componentState.options) for (const layerKey in componentState.layers) {
-					const layer = componentState.layers[layerKey];
-					const schemaKey = require_generateSchemaKey.generateSchemaKey({
-						variantKey,
-						variantValue: variantOption,
-						componentStateKey,
-						componentStateValue: componentStateOption,
-						layer: layerKey
-					});
-					result.variables[schemaKey] = {};
-					for (const propertyKey in layer.properties) {
-						const property = layer.properties[propertyKey];
-						result.variables[schemaKey] = {
-							...result.variables[schemaKey],
-							[propertyKey]: buildPropertyStateMap(layer, property, variantOption, require_componentStatePseudoStates.getExcludedPseudoStatesForComponentStateOption(componentState, componentStateOption))
-						};
+				for (const componentStateOption of componentState.options) {
+					const excludedLayers = new Set(require_componentStatePseudoStates.getExcludedLayersForComponentStateOption(componentState, componentStateOption));
+					for (const layerKey in componentState.layers) {
+						if (excludedLayers.has(layerKey)) continue;
+						const layer = componentState.layers[layerKey];
+						const schemaKey = require_generateSchemaKey.generateSchemaKey({
+							variantKey,
+							variantValue: variantOption,
+							componentStateKey,
+							componentStateValue: componentStateOption,
+							layer: layerKey
+						});
+						result.variables[schemaKey] = {};
+						for (const propertyKey in layer.properties) {
+							const property = layer.properties[propertyKey];
+							if (isOptionalInDefaultSchema(property)) continue;
+							result.variables[schemaKey] = {
+								...result.variables[schemaKey],
+								[propertyKey]: buildPropertyStateMap(layer, property, variantOption, require_componentStatePseudoStates.getExcludedPseudoStatesForComponentStateOption(componentState, componentStateOption))
+							};
+						}
 					}
 				}
 			}
@@ -145,6 +154,7 @@ function buildConfigSchema(config) {
 				result.variables[variantSchemaKey] = result.variables[variantSchemaKey] ?? {};
 				for (const propertyKey in variantConfig.variantProperties) {
 					const property = variantConfig.variantProperties[propertyKey];
+					if (isOptionalInDefaultSchema(property)) continue;
 					result.variables[variantSchemaKey] = {
 						...result.variables[variantSchemaKey],
 						[propertyKey]: buildPropertyStateMap({
@@ -167,23 +177,28 @@ function buildConfigSchema(config) {
 				const componentStates = variantConfig.componentStates;
 				for (const componentStateKey in componentStates) {
 					const componentState = componentStates[componentStateKey];
-					for (const componentStateOption of componentState.options) for (const layerKey in componentState.layers) {
-						const layer = componentState.layers[layerKey];
-						const schemaKey = require_generateSchemaKey.generateSchemaKey({
-							variantKey,
-							variantValue: variantOption,
-							componentStateKey,
-							componentStateValue: componentStateOption,
-							layer: layerKey,
-							subComponentName: subComponentKey
-						});
-						result.variables[schemaKey] = {};
-						for (const propertyKey in layer.properties) {
-							const property = layer.properties[propertyKey];
-							result.variables[schemaKey] = {
-								...result.variables[schemaKey],
-								[propertyKey]: buildPropertyStateMap(layer, property, variantOption, require_componentStatePseudoStates.getExcludedPseudoStatesForComponentStateOption(componentState, componentStateOption))
-							};
+					for (const componentStateOption of componentState.options) {
+						const excludedLayers = new Set(require_componentStatePseudoStates.getExcludedLayersForComponentStateOption(componentState, componentStateOption));
+						for (const layerKey in componentState.layers) {
+							if (excludedLayers.has(layerKey)) continue;
+							const layer = componentState.layers[layerKey];
+							const schemaKey = require_generateSchemaKey.generateSchemaKey({
+								variantKey,
+								variantValue: variantOption,
+								componentStateKey,
+								componentStateValue: componentStateOption,
+								layer: layerKey,
+								subComponentName: subComponentKey
+							});
+							result.variables[schemaKey] = {};
+							for (const propertyKey in layer.properties) {
+								const property = layer.properties[propertyKey];
+								if (isOptionalInDefaultSchema(property)) continue;
+								result.variables[schemaKey] = {
+									...result.variables[schemaKey],
+									[propertyKey]: buildPropertyStateMap(layer, property, variantOption, require_componentStatePseudoStates.getExcludedPseudoStatesForComponentStateOption(componentState, componentStateOption))
+								};
+							}
 						}
 					}
 				}

package/dist/automated-config/dist/utils/buildConfigSchema.d.cts

@@ -8,6 +8,13 @@ import { SchemaStateValue } from "../types/ConfigSchema.cjs";
 import { OmitIndexSignature, SimplifyDeep, UnionToIntersection, WritableDeep } from "type-fest";
 
 //#region ../automated-config/dist/utils/buildConfigSchema.d.ts
+type OptionalInDefaultSchemaPropKeys<Props extends Record<string, SelectedConfigurableProperty<ConfigurablePropertiesName, string>>> = { [K in keyof Props]: Props[K] extends {
+  optionalInDefaultSchema: true;
+} ? K : never }[keyof Props];
+type RequiredInDefaultSchemaPropKeys<Props extends Record<string, SelectedConfigurableProperty<ConfigurablePropertiesName, string>>> = { [K in keyof Props]: Props[K] extends {
+  optionalInDefaultSchema: true;
+} ? never : K }[keyof Props];
+type InferredLayerPropertyMap<Props extends Record<string, SelectedConfigurableProperty<ConfigurablePropertiesName, string>>, Layer> = { [PropKey in RequiredInDefaultSchemaPropKeys<Props>]: InferredPropertyStates<Props[PropKey], Layer> } & { [PropKey in OptionalInDefaultSchemaPropKeys<Props>]?: InferredPropertyStates<Props[PropKey], Layer> };
 /** Infers default option values from all component variants */
 type InferredDefaults<C extends ComponentConfig> = (C['variants'] extends NonNullable<ComponentConfig['variants']> ? { [VarKey in keyof C['variants']]: C['variants'][VarKey]['options'][number] } : {}) & (C['subComponents'] extends NonNullable<ComponentConfig['subComponents']> ? UnionToIntersection<{ [SubCompKey in keyof C['subComponents']]: { [VarKey in keyof C['subComponents'][SubCompKey]['variants']]: C['subComponents'][SubCompKey]['variants'][VarKey]['options'][number] } }[keyof C['subComponents']]> : {});
 /** Infers type-safe schema value structure for a configurable property */
@@ -45,6 +52,9 @@ type InferredPropertyStates<Prop extends SelectedConfigurableProperty<Configurab
 type GetExcludedPseudoStatesForOption<StateConfig extends ComponentStateConfig, StateOption extends string> = StateConfig extends {
   excludePseudoStatesForOptions?: infer Exclusions extends Partial<Record<string, readonly PossibleStates[]>>;
 } ? StateOption extends keyof Exclusions ? Exclusions[StateOption] : undefined : undefined;
+type GetExcludedLayersForOption<StateConfig extends ComponentStateConfig, StateOption extends string> = StateConfig extends {
+  excludeLayersForOptions?: infer Exclusions extends Partial<Record<string, readonly string[]>>;
+} ? StateOption extends keyof Exclusions ? Exclusions[StateOption] extends readonly (infer Layer extends string)[] ? Layer : never : never : never;
 /** Property states after applying per-option pseudo-state exclusions */
 type InferredPropertyStatesForOption<Prop extends SelectedConfigurableProperty<ConfigurablePropertiesName, string>, ExcludedPseudoStates extends readonly PossibleStates[] | undefined> = (Prop['skipRestState'] extends true ? {} : {
   rest: InferredPropertySchema<Prop>;
@@ -54,13 +64,13 @@ type InferredPropertyStatesForOption<Prop extends SelectedConfigurableProperty<C
 /** Infers property-to-states mappings for a layer's properties */
 type InferredLayerProperties<Layer> = Layer extends LayerConfig ? Layer extends {
   properties: infer Props extends LayerConfig['properties'];
-} ? { [PropKey in keyof Props]: InferredPropertyStates<Props[PropKey], Layer> } : {} : {};
+} ? InferredLayerPropertyMap<Props, Layer> : {} : {};
 type InferredLayerPropertiesForOption<Layer, ExcludedPseudoStates extends readonly PossibleStates[] | undefined> = Layer extends LayerConfig ? Layer extends {
   properties: infer Props extends LayerConfig['properties'];
-} ? { [PropKey in keyof Props]: InferredPropertyStatesForOption<Props[PropKey], ExcludedPseudoStates> } : {} : {};
+} ? { [PropKey in RequiredInDefaultSchemaPropKeys<Props>]: InferredPropertyStatesForOption<Props[PropKey], ExcludedPseudoStates> } & { [PropKey in OptionalInDefaultSchemaPropKeys<Props>]?: InferredPropertyStatesForOption<Props[PropKey], ExcludedPseudoStates> } : {} : {};
 /** Generates schema key → properties mappings for a variant's layers or component states */
-type InferredSchemaMap<VarKey extends string, VarConfig extends VariantConfig, LayersOrStates extends NonNullable<VariantConfigWithComponentStates['componentStates']> | NonNullable<VariantConfigWithProperties['layers']>, Prefix extends string = ''> = LayersOrStates extends NonNullable<VariantConfigWithComponentStates['componentStates']> ? UnionToIntersection<{ [StateKey in keyof OmitIndexSignature<LayersOrStates>]: UnionToIntersection<{ [StateOption in LayersOrStates[StateKey]['options'][number]]: { [LayerKey in keyof OmitIndexSignature<LayersOrStates[StateKey]['layers']> as `${Prefix}${VarKey}/${VarConfig['options'][number]}/${StateKey & string}/${StateOption}/${LayerKey & string}`]: InferredLayerPropertiesForOption<LayersOrStates[StateKey]['layers'][LayerKey], GetExcludedPseudoStatesForOption<LayersOrStates[StateKey], StateOption>> } }[LayersOrStates[StateKey]['options'][number]]> }[keyof OmitIndexSignature<LayersOrStates>]> : { [LayerKey in keyof OmitIndexSignature<LayersOrStates> as `${Prefix}${VarKey}/${VarConfig['options'][number]}/${LayerKey & string}`]: InferredLayerProperties<LayersOrStates[LayerKey]> };
-type InferredVariantLevelProperties<Props extends Record<string, SelectedConfigurableProperty<ConfigurablePropertiesName, string>>> = { [PropKey in keyof Props]: InferredPropertyStates<Props[PropKey]> };
+type InferredSchemaMap<VarKey extends string, VarConfig extends VariantConfig, LayersOrStates extends NonNullable<VariantConfigWithComponentStates['componentStates']> | NonNullable<VariantConfigWithProperties['layers']>, Prefix extends string = ''> = LayersOrStates extends NonNullable<VariantConfigWithComponentStates['componentStates']> ? UnionToIntersection<{ [StateKey in keyof OmitIndexSignature<LayersOrStates>]: UnionToIntersection<{ [StateOption in LayersOrStates[StateKey]['options'][number]]: { [LayerKey in Exclude<keyof OmitIndexSignature<LayersOrStates[StateKey]['layers']>, GetExcludedLayersForOption<LayersOrStates[StateKey], StateOption>> as `${Prefix}${VarKey}/${VarConfig['options'][number]}/${StateKey & string}/${StateOption}/${LayerKey & string}`]: InferredLayerPropertiesForOption<LayersOrStates[StateKey]['layers'][LayerKey], GetExcludedPseudoStatesForOption<LayersOrStates[StateKey], StateOption>> } }[LayersOrStates[StateKey]['options'][number]]> }[keyof OmitIndexSignature<LayersOrStates>]> : { [LayerKey in keyof OmitIndexSignature<LayersOrStates> as `${Prefix}${VarKey}/${VarConfig['options'][number]}/${LayerKey & string}`]: InferredLayerProperties<LayersOrStates[LayerKey]> };
+type InferredVariantLevelProperties<Props extends Record<string, SelectedConfigurableProperty<ConfigurablePropertiesName, string>>> = { [PropKey in RequiredInDefaultSchemaPropKeys<Props>]: InferredPropertyStates<Props[PropKey]> } & { [PropKey in OptionalInDefaultSchemaPropKeys<Props>]?: InferredPropertyStates<Props[PropKey]> };
 type InferredVariantPropertiesMap<VarKey extends string, VarConfig extends VariantConfigWithProperties, Prefix extends string = ''> = VarConfig extends {
   variantProperties: infer Props extends Record<string, SelectedConfigurableProperty<ConfigurablePropertiesName, string>>;
 } ? { [Option in VarConfig['options'][number] as `${Prefix}${VarKey}/${Option}`]: InferredVariantLevelProperties<Props> } : {};