npm - @pandacss/generator - Versions diffs - 1.4.2 → 1.4.3 - Mend

@pandacss/generator 1.4.2 → 1.4.3

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.

Files changed (3) hide show

package/dist/index.js CHANGED Viewed

@@ -2639,7 +2639,7 @@ export interface AsProps {
   as?: ElementType | undefined
 }
-export type ElementType<P = any> = keyof JSX.IntrinsicElements | Component<P>
+export type ElementType = keyof JSX.IntrinsicElements | Component<any>
 export interface ${componentName}<T extends ElementType, P extends Dict = {}> {
   (props: JsxHTMLProps<ComponentProps<T> & UnstyledProps & AsProps, Assign<JsxStyleProps, P>>): JSX.Element
@@ -2696,7 +2696,7 @@ function generateSolidCreateStyleContext(ctx) {
     ${ctx.file.import(factoryName, "./factory")}
     ${ctx.file.import("getDisplayName", "./factory-helper")}
     import { createComponent, mergeProps } from 'solid-js/web'
-    import { createContext, useContext, createMemo } from 'solid-js'
+    import { createContext, createMemo, splitProps, useContext } from 'solid-js'
     export function createStyleContext(recipe) {
       const StyleContext = createContext({})
@@ -2707,35 +2707,39 @@ function generateSolidCreateStyleContext(ctx) {
         const { unstyled, ...restProps } = props
         if (unstyled) return restProps
         if (isConfigRecipe) {
-          return { ...restProps, className: cx(slotStyles, restProps.className) }
+          return { ...restProps, class: cx(slotStyles, restProps.class) }
         }
         ${import_outdent34.outdent.string(
       (0, import_ts_pattern11.match)(ctx.config.jsxStyleProps).with("all", () => `return { ...slotStyles, ...restProps }`).with("minimal", () => `return { ...restProps, css: css.raw(slotStyles, restProps.css) }`).with("none", () => `return { ...restProps, class: cx(css(slotStyles), restProps.class) }`).otherwise(() => `return restProps`)
     )}
       }
       const withRootProvider = (Component, options) => {
         const WithRootProvider = (props) => {
-          const finalProps = createMemo(() => {
-            const [variantProps, restProps] = svaFn.splitVariantProps(props)
-            const slotStyles = isConfigRecipe ? svaFn(variantProps) : svaFn.raw(variantProps)
-            slotStyles._classNameMap = svaFn.classNameMap
+          const [variantProps, otherProps] = svaFn.splitVariantProps(props)
+          const [local, propsWithoutChildren] = splitProps(otherProps, ['children'])
+          const slotStyles = createMemo(() => {
+            const styles = isConfigRecipe ? svaFn(variantProps) : svaFn.raw(variantProps)
+            styles._classNameMap = svaFn.classNameMap
+            return styles
+          })
-            const mergedProps = options?.defaultProps ? mergeProps(options.defaultProps, restProps) : restProps
-            return { mergedProps, slotStyles }
+          const mergedProps = createMemo(() => {
+            if (!options?.defaultProps) return propsWithoutChildren
+            return { ...options.defaultProps, ...propsWithoutChildren }
           })
           return createComponent(StyleContext.Provider, {
-            value: finalProps().slotStyles,
+            get value() {
+              return slotStyles()
+            },
             get children() {
               return createComponent(
                 Component,
-                mergeProps(finalProps().mergedProps, {
+                mergeProps(mergedProps, {
                   get children() {
-                    return props.children
+                    return local.children
                   },
                 }),
               )
@@ -2745,7 +2749,6 @@ function generateSolidCreateStyleContext(ctx) {
         const componentName = getDisplayName(Component)
         WithRootProvider.displayName = \`withRootProvider(\${componentName})\`
         return WithRootProvider
       }
@@ -2753,29 +2756,37 @@ function generateSolidCreateStyleContext(ctx) {
         const StyledComponent = ${factoryName}(Component, {}, options)
         const WithProvider = (props) => {
-          const finalProps = createMemo(() => {
-            const [variantProps, restProps] = svaFn.splitVariantProps(props)
+          const [variantProps, restProps] = svaFn.splitVariantProps(props)
+          const [local, propsWithoutChildren] = splitProps(restProps, ["children"])
-            const slotStyles = isConfigRecipe ? svaFn(variantProps) : svaFn.raw(variantProps)
-            slotStyles._classNameMap = svaFn.classNameMap
+          const slotStyles = createMemo(() => {
+            const styles = isConfigRecipe ? svaFn(variantProps) : svaFn.raw(variantProps)
+            styles._classNameMap = svaFn.classNameMap
+            return styles
+          })
-            const propsWithClass = { ...restProps, class: restProps.class ?? options?.defaultProps?.class }
-            const resolvedProps = getResolvedProps(propsWithClass, slotStyles[slot])
-            resolvedProps.class = cx(resolvedProps.class, slotStyles._classNameMap[slot])
-            return { slotStyles, resolvedProps }
+          const resolvedProps = createMemo(() => {
+            const propsWithClass = {
+              ...propsWithoutChildren,
+              class: propsWithoutChildren.class ?? options?.defaultProps?.class,
+            }
+            const resolved = getResolvedProps(propsWithClass, slotStyles()[slot])
+            resolved.class = cx(resolved.class, slotStyles()._classNameMap[slot])
+            return resolved
           })
           return createComponent(StyleContext.Provider, {
-            value: finalProps().slotStyles,
+            get value() {
+              return slotStyles()
+            },
             get children() {
               return createComponent(
                 StyledComponent,
-                mergeProps(finalProps().resolvedProps, {
+                mergeProps(resolvedProps, {
                   get children() {
-                    return props.children
+                    return local.children
                   },
-                }),
+                })
               )
             },
           })
@@ -2783,7 +2794,6 @@ function generateSolidCreateStyleContext(ctx) {
         const componentName = getDisplayName(Component)
         WithProvider.displayName = \`withProvider(\${componentName})\`
         return WithProvider
       }
@@ -2792,19 +2802,30 @@ function generateSolidCreateStyleContext(ctx) {
         const WithContext = (props) => {
           const slotStyles = useContext(StyleContext)
-          const finalProps = createMemo(() => {
-            const propsWithClass = { ...props, class: props.class ?? options?.defaultProps?.class }
-            const resolvedProps = getResolvedProps(propsWithClass, slotStyles[slot])
-            resolvedProps.class = cx(resolvedProps.class, slotStyles._classNameMap?.[slot])
-            return resolvedProps
+          const [local, propsWithoutChildren] = splitProps(props, ["children"])
+          const resolvedProps = createMemo(() => {
+            const propsWithClass = {
+              ...propsWithoutChildren,
+              class: propsWithoutChildren.class ?? options?.defaultProps?.class,
+            }
+            const resolved = getResolvedProps(propsWithClass, slotStyles[slot])
+            resolved.class = cx(resolved.class, slotStyles._classNameMap?.[slot])
+            return resolved
           })
-          return createComponent(StyledComponent, finalProps())
+          return createComponent(
+            StyledComponent,
+            mergeProps(resolvedProps, {
+              get children() {
+                return local.children
+              },
+            })
+          )
         }
         const componentName = getDisplayName(Component)
         WithContext.displayName = \`withContext(\${componentName})\`
         return WithContext
       }
@@ -2825,10 +2846,11 @@ function generateSolidCreateStyleContext(ctx) {
       unstyled?: boolean | undefined
     }
-    interface WithProviderOptions<P = {}> {
+    interface WithProviderOptions<P> {
       defaultProps?: Partial<P> | undefined
     }
-    type ElementType<P extends Record<string, any> = {}> = keyof JSX.IntrinsicElements | Component<P>
+    type ElementType = keyof JSX.IntrinsicElements | Component<any>
     type SvaFn<S extends string = any> = SlotRecipeRuntimeFn<S, any>
     interface SlotRecipeFn {
@@ -2838,7 +2860,11 @@ function generateSolidCreateStyleContext(ctx) {
     }
     type SlotRecipe = SvaFn | SlotRecipeFn
-    type InferSlot<R extends SlotRecipe> = R extends SlotRecipeFn ? R['__slot'] : R extends SvaFn<infer S> ? S : never
+    type InferSlot<R extends SlotRecipe> = R extends SlotRecipeFn
+      ? R['__slot']
+      : R extends SvaFn<infer S>
+        ? S
+        : never
     type StyleContextProvider<T extends ElementType, R extends SlotRecipe> = Component<
       JsxHTMLProps<ComponentProps<T> & UnstyledProps, Assign<RecipeVariantProps<R>, JsxStyleProps>>

package/dist/index.mjs CHANGED Viewed

@@ -2603,7 +2603,7 @@ export interface AsProps {
   as?: ElementType | undefined
 }
-export type ElementType<P = any> = keyof JSX.IntrinsicElements | Component<P>
+export type ElementType = keyof JSX.IntrinsicElements | Component<any>
 export interface ${componentName}<T extends ElementType, P extends Dict = {}> {
   (props: JsxHTMLProps<ComponentProps<T> & UnstyledProps & AsProps, Assign<JsxStyleProps, P>>): JSX.Element
@@ -2660,7 +2660,7 @@ function generateSolidCreateStyleContext(ctx) {
     ${ctx.file.import(factoryName, "./factory")}
     ${ctx.file.import("getDisplayName", "./factory-helper")}
     import { createComponent, mergeProps } from 'solid-js/web'
-    import { createContext, useContext, createMemo } from 'solid-js'
+    import { createContext, createMemo, splitProps, useContext } from 'solid-js'
     export function createStyleContext(recipe) {
       const StyleContext = createContext({})
@@ -2671,35 +2671,39 @@ function generateSolidCreateStyleContext(ctx) {
         const { unstyled, ...restProps } = props
         if (unstyled) return restProps
         if (isConfigRecipe) {
-          return { ...restProps, className: cx(slotStyles, restProps.className) }
+          return { ...restProps, class: cx(slotStyles, restProps.class) }
         }
         ${outdent34.string(
       match11(ctx.config.jsxStyleProps).with("all", () => `return { ...slotStyles, ...restProps }`).with("minimal", () => `return { ...restProps, css: css.raw(slotStyles, restProps.css) }`).with("none", () => `return { ...restProps, class: cx(css(slotStyles), restProps.class) }`).otherwise(() => `return restProps`)
     )}
       }
       const withRootProvider = (Component, options) => {
         const WithRootProvider = (props) => {
-          const finalProps = createMemo(() => {
-            const [variantProps, restProps] = svaFn.splitVariantProps(props)
-            const slotStyles = isConfigRecipe ? svaFn(variantProps) : svaFn.raw(variantProps)
-            slotStyles._classNameMap = svaFn.classNameMap
+          const [variantProps, otherProps] = svaFn.splitVariantProps(props)
+          const [local, propsWithoutChildren] = splitProps(otherProps, ['children'])
+          const slotStyles = createMemo(() => {
+            const styles = isConfigRecipe ? svaFn(variantProps) : svaFn.raw(variantProps)
+            styles._classNameMap = svaFn.classNameMap
+            return styles
+          })
-            const mergedProps = options?.defaultProps ? mergeProps(options.defaultProps, restProps) : restProps
-            return { mergedProps, slotStyles }
+          const mergedProps = createMemo(() => {
+            if (!options?.defaultProps) return propsWithoutChildren
+            return { ...options.defaultProps, ...propsWithoutChildren }
           })
           return createComponent(StyleContext.Provider, {
-            value: finalProps().slotStyles,
+            get value() {
+              return slotStyles()
+            },
             get children() {
               return createComponent(
                 Component,
-                mergeProps(finalProps().mergedProps, {
+                mergeProps(mergedProps, {
                   get children() {
-                    return props.children
+                    return local.children
                   },
                 }),
               )
@@ -2709,7 +2713,6 @@ function generateSolidCreateStyleContext(ctx) {
         const componentName = getDisplayName(Component)
         WithRootProvider.displayName = \`withRootProvider(\${componentName})\`
         return WithRootProvider
       }
@@ -2717,29 +2720,37 @@ function generateSolidCreateStyleContext(ctx) {
         const StyledComponent = ${factoryName}(Component, {}, options)
         const WithProvider = (props) => {
-          const finalProps = createMemo(() => {
-            const [variantProps, restProps] = svaFn.splitVariantProps(props)
+          const [variantProps, restProps] = svaFn.splitVariantProps(props)
+          const [local, propsWithoutChildren] = splitProps(restProps, ["children"])
-            const slotStyles = isConfigRecipe ? svaFn(variantProps) : svaFn.raw(variantProps)
-            slotStyles._classNameMap = svaFn.classNameMap
+          const slotStyles = createMemo(() => {
+            const styles = isConfigRecipe ? svaFn(variantProps) : svaFn.raw(variantProps)
+            styles._classNameMap = svaFn.classNameMap
+            return styles
+          })
-            const propsWithClass = { ...restProps, class: restProps.class ?? options?.defaultProps?.class }
-            const resolvedProps = getResolvedProps(propsWithClass, slotStyles[slot])
-            resolvedProps.class = cx(resolvedProps.class, slotStyles._classNameMap[slot])
-            return { slotStyles, resolvedProps }
+          const resolvedProps = createMemo(() => {
+            const propsWithClass = {
+              ...propsWithoutChildren,
+              class: propsWithoutChildren.class ?? options?.defaultProps?.class,
+            }
+            const resolved = getResolvedProps(propsWithClass, slotStyles()[slot])
+            resolved.class = cx(resolved.class, slotStyles()._classNameMap[slot])
+            return resolved
           })
           return createComponent(StyleContext.Provider, {
-            value: finalProps().slotStyles,
+            get value() {
+              return slotStyles()
+            },
             get children() {
               return createComponent(
                 StyledComponent,
-                mergeProps(finalProps().resolvedProps, {
+                mergeProps(resolvedProps, {
                   get children() {
-                    return props.children
+                    return local.children
                   },
-                }),
+                })
               )
             },
           })
@@ -2747,7 +2758,6 @@ function generateSolidCreateStyleContext(ctx) {
         const componentName = getDisplayName(Component)
         WithProvider.displayName = \`withProvider(\${componentName})\`
         return WithProvider
       }
@@ -2756,19 +2766,30 @@ function generateSolidCreateStyleContext(ctx) {
         const WithContext = (props) => {
           const slotStyles = useContext(StyleContext)
-          const finalProps = createMemo(() => {
-            const propsWithClass = { ...props, class: props.class ?? options?.defaultProps?.class }
-            const resolvedProps = getResolvedProps(propsWithClass, slotStyles[slot])
-            resolvedProps.class = cx(resolvedProps.class, slotStyles._classNameMap?.[slot])
-            return resolvedProps
+          const [local, propsWithoutChildren] = splitProps(props, ["children"])
+          const resolvedProps = createMemo(() => {
+            const propsWithClass = {
+              ...propsWithoutChildren,
+              class: propsWithoutChildren.class ?? options?.defaultProps?.class,
+            }
+            const resolved = getResolvedProps(propsWithClass, slotStyles[slot])
+            resolved.class = cx(resolved.class, slotStyles._classNameMap?.[slot])
+            return resolved
           })
-          return createComponent(StyledComponent, finalProps())
+          return createComponent(
+            StyledComponent,
+            mergeProps(resolvedProps, {
+              get children() {
+                return local.children
+              },
+            })
+          )
         }
         const componentName = getDisplayName(Component)
         WithContext.displayName = \`withContext(\${componentName})\`
         return WithContext
       }
@@ -2789,10 +2810,11 @@ function generateSolidCreateStyleContext(ctx) {
       unstyled?: boolean | undefined
     }
-    interface WithProviderOptions<P = {}> {
+    interface WithProviderOptions<P> {
       defaultProps?: Partial<P> | undefined
     }
-    type ElementType<P extends Record<string, any> = {}> = keyof JSX.IntrinsicElements | Component<P>
+    type ElementType = keyof JSX.IntrinsicElements | Component<any>
     type SvaFn<S extends string = any> = SlotRecipeRuntimeFn<S, any>
     interface SlotRecipeFn {
@@ -2802,7 +2824,11 @@ function generateSolidCreateStyleContext(ctx) {
     }
     type SlotRecipe = SvaFn | SlotRecipeFn
-    type InferSlot<R extends SlotRecipe> = R extends SlotRecipeFn ? R['__slot'] : R extends SvaFn<infer S> ? S : never
+    type InferSlot<R extends SlotRecipe> = R extends SlotRecipeFn
+      ? R['__slot']
+      : R extends SvaFn<infer S>
+        ? S
+        : never
     type StyleContextProvider<T extends ElementType, R extends SlotRecipe> = Component<
       JsxHTMLProps<ComponentProps<T> & UnstyledProps, Assign<RecipeVariantProps<R>, JsxStyleProps>>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@pandacss/generator",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "The css generator for css panda",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -36,14 +36,14 @@
     "javascript-stringify": "2.1.0",
     "outdent": " ^0.8.0",
     "pluralize": "8.0.0",
-    "postcss": "8.4.49",
+    "postcss": "8.5.6",
     "ts-pattern": "5.8.0",
-    "@pandacss/core": "1.4.2",
-    "@pandacss/is-valid-prop": "^1.4.2",
-    "@pandacss/logger": "1.4.2",
-    "@pandacss/shared": "1.4.2",
-    "@pandacss/token-dictionary": "1.4.2",
-    "@pandacss/types": "1.4.2"
+    "@pandacss/core": "1.4.3",
+    "@pandacss/is-valid-prop": "^1.4.3",
+    "@pandacss/logger": "1.4.3",
+    "@pandacss/shared": "1.4.3",
+    "@pandacss/token-dictionary": "1.4.3",
+    "@pandacss/types": "1.4.3"
   },
   "devDependencies": {
     "@types/pluralize": "0.0.33"