@pandacss/studio 0.15.2 → 0.15.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pandacss/studio",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "description": "The automated token documentation for Panda CSS",
   "main": "dist/studio.js",
   "module": "dist/studio.mjs",
@@ -33,19 +33,19 @@
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "vite": "4.4.9",
-    "@pandacss/config": "0.15.2",
-    "@pandacss/logger": "0.15.2",
-    "@pandacss/node": "0.15.2",
-    "@pandacss/shared": "0.15.2",
-    "@pandacss/token-dictionary": "0.15.2",
-    "@pandacss/types": "0.15.2"
+    "@pandacss/config": "0.15.3",
+    "@pandacss/logger": "0.15.3",
+    "@pandacss/node": "0.15.3",
+    "@pandacss/shared": "0.15.3",
+    "@pandacss/token-dictionary": "0.15.3",
+    "@pandacss/types": "0.15.3"
   },
   "devDependencies": {
     "@types/react": "18.2.22",
     "@types/react-dom": "18.2.7",
     "@vitejs/plugin-react": "4.0.4",
     "execa": "7.2.0",
-    "@pandacss/dev": "0.15.2"
+    "@pandacss/dev": "0.15.3"
   },
   "scripts": {
     "codegen": "panda",

package/styled-system/jsx/factory.mjs

@@ -1,5 +1,5 @@
 import { createElement, forwardRef, useMemo } from 'react'
-import { css, cx, cva, assignCss } from '../css/index.mjs';
+import { css, cx, cva } from '../css/index.mjs';
 import { splitProps, normalizeHTMLProps } from '../helpers.mjs';
 import { isCssProperty } from './is-valid-prop.mjs';
 
@@ -15,15 +15,14 @@ function styledFn(Dynamic, configOrCva = {}) {
 
 function recipeClass() {
   const { css: cssStyles, ...propStyles } = styleProps
-  const styles = assignCss(propStyles, cssStyles)
-  return cx(cvaFn(variantProps), css(styles), elementProps.className)
+  const compoundVariantStyles = cvaFn.__getCompoundVariantCss__?.(variantProps);
+  return cx(cvaFn(variantProps, false), css(compoundVariantStyles, propStyles, cssStyles), elementProps.className)
 }
 
 function cvaClass() {
   const { css: cssStyles, ...propStyles } = styleProps
   const cvaStyles = cvaFn.raw(variantProps)
-  const styles = assignCss(cvaStyles, propStyles, cssStyles)
-  return cx(css(styles), elementProps.className)
+  return cx(css(cvaStyles, propStyles, cssStyles), elementProps.className)
 }
 
 

package/styled-system/types/recipe.d.ts

@@ -38,11 +38,13 @@ export interface RecipeRuntimeFn<T extends RecipeVariantRecord> extends RecipeVa
   ): [RecipeSelection<T>, Pretty<DistributiveOmit<Props, keyof T>>]
 }
 
-export type RecipeCompoundSelection<T extends RecipeVariantRecord> = {
-  [K in keyof T]?: StringToBoolean<keyof T[K]> | Array<StringToBoolean<keyof T[K]>>
+type OneOrMore<T> = T | Array<T>
+
+export type RecipeCompoundSelection<T> = {
+  [K in keyof T]?: OneOrMore<StringToBoolean<keyof T[K]>>
 }
 
-export type RecipeCompoundVariant<T extends RecipeVariantRecord> = RecipeCompoundSelection<T> & {
+export type RecipeCompoundVariant<T> = T & {
   css: SystemStyleObject
 }
 
@@ -54,7 +56,7 @@ export interface RecipeDefinition<T extends RecipeVariantRecord> {
   /**
    * The multi-variant styles of the recipe.
    */
-  variants?: T | RecipeVariantRecord
+  variants?: T
   /**
    * The default variants of the recipe.
    */
@@ -62,7 +64,7 @@ export interface RecipeDefinition<T extends RecipeVariantRecord> {
   /**
    * The styles to apply when a combination of variants is selected.
    */
-  compoundVariants?: Array<RecipeCompoundVariant<T>>
+  compoundVariants?: Pretty<RecipeCompoundVariant<RecipeCompoundSelection<T>>>[]
 }
 
 export type RecipeCreatorFn = <T extends RecipeVariantRecord>(config: RecipeDefinition<T>) => RecipeRuntimeFn<T>
@@ -109,7 +111,7 @@ export interface SlotRecipeRuntimeFn<S extends string, T extends SlotRecipeVaria
   splitVariantProps<Props extends RecipeSelection<T>>(props: Props): [RecipeSelection<T>, Pretty<Omit<Props, keyof T>>]
 }
 
-export type SlotRecipeCompoundVariant<S extends string, T extends RecipeVariantRecord> = RecipeCompoundSelection<T> & {
+export type SlotRecipeCompoundVariant<S extends string, T> = T & {
   css: SlotRecord<S, SystemStyleObject>
 }
 
@@ -125,7 +127,7 @@ export interface SlotRecipeDefinition<S extends string, T extends SlotRecipeVari
   /**
    * The multi-variant styles of the recipe.
    */
-  variants?: T | SlotRecipeVariantRecord<S>
+  variants?: T
   /**
    * The default variants of the recipe.
    */
@@ -133,7 +135,7 @@ export interface SlotRecipeDefinition<S extends string, T extends SlotRecipeVari
   /**
    * The styles to apply when a combination of variants is selected.
    */
-  compoundVariants?: Array<SlotRecipeCompoundVariant<S, T>>
+  compoundVariants?: Pretty<SlotRecipeCompoundVariant<S, RecipeCompoundSelection<T>>>[]
 }
 
 export type SlotRecipeCreatorFn = <S extends string, T extends SlotRecipeVariantRecord<S>>(