From c97446575e12874266a72bd39a18109e72ec3f4d Mon Sep 17 00:00:00 2001 From: Sanna Jammeh <50969683+sannajammeh@users.noreply.github.com> Date: Thu, 14 Dec 2023 19:44:18 +0100 Subject: [PATCH 1/2] chore: cleanup --- packages/core/src/classed.ts | 3 --- packages/react/src/classed.tsx | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/core/src/classed.ts b/packages/core/src/classed.ts index b3c28e16..fe010bef 100644 --- a/packages/core/src/classed.ts +++ b/packages/core/src/classed.ts @@ -23,12 +23,10 @@ const internalClassed = ( classes: Array, { merger = cn }: ClassedCoreConfig = {} ) => { - // Parse classNames and variants const { className, variants, defaultVariants, compoundVariants } = parseClassNames(classes); const producer = ((variantProps: any) => { - // Map variant props to className const variantClassName = mapPropsToVariantClass( { variants, defaultVariants, compoundVariants }, variantProps @@ -41,7 +39,6 @@ const internalClassed = ( return merger(className, variantClassName, ...extra); }) as ClassedProducer; - // Add variants to the classed producer Reflect.set(producer, TW_VARS, { className, variants, diff --git a/packages/react/src/classed.tsx b/packages/react/src/classed.tsx index 141f64a5..736c0431 100644 --- a/packages/react/src/classed.tsx +++ b/packages/react/src/classed.tsx @@ -87,14 +87,13 @@ export const internalClassed = < /> ); } - ) as unknown as ClassedComponentType; // Add variant types + ) as unknown as ClassedComponentType; Comp.displayName = typeof elementType !== "string" ? elementType.displayName || elementType.name || "Compoonent" : `TwComponent(${elementType})`; - // Set variables to check if component is classed Reflect.set(Comp, TW_VARS, { className, variants, From c2ca2eda64e75e712f80240ecd5698d8a9ac0a68 Mon Sep 17 00:00:00 2001 From: Malte Hecht Date: Tue, 13 Feb 2024 14:11:24 +0100 Subject: [PATCH 2/2] fix html output of data-variant example I guess the svg won't have an attribute `data-group-data="[color=dark]:text-white"` but the class `group-data-[color=dark]:text-white`, right? --- apps/docs/pages/docs/data-variants.mdx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/docs/pages/docs/data-variants.mdx b/apps/docs/pages/docs/data-variants.mdx index 67d80e8a..bfc8bf1a 100644 --- a/apps/docs/pages/docs/data-variants.mdx +++ b/apps/docs/pages/docs/data-variants.mdx @@ -88,8 +88,7 @@ Output: ```html