From c4592c9a0489d38681ca023ffe26cbf917664fff Mon Sep 17 00:00:00 2001
From: WK Wong <wingkwong.code@gmail.com>
Date: Sat, 17 Aug 2024 12:59:29 +0800
Subject: [PATCH] fix(system-rsc): incorrect VariantValue typing and typo in
 Options

---
 packages/core/system-rsc/src/extend-variants.d.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/core/system-rsc/src/extend-variants.d.ts b/packages/core/system-rsc/src/extend-variants.d.ts
index 4a69393da8..3ef30a7bee 100644
--- a/packages/core/system-rsc/src/extend-variants.d.ts
+++ b/packages/core/system-rsc/src/extend-variants.d.ts
@@ -32,10 +32,11 @@ type ComposeVariants<CP, S> = SuggestedVariants<CP, S> | Variants<S>;
 
 type VariantValue<V, SV> = {
   [K in keyof V | keyof SV]?:
-    | (K extends keyof V ? StringToBoolean<keyof V[K]> | (keyof V[K])[] : never)
+    | (K extends keyof V ? StringToBoolean<keyof V[K]> : never)
+    | (K extends keyof V ? StringToBoolean<keyof V[K]>[] : never)
     | (K extends keyof SV
         ? ValidateSubtype<SV[K], object> extends "true"
-          ? keyof OmitUndefined<SV[K]> | (keyof OmitUndefined<SV[K]>)[] | undefined
+          ? keyof OmitUndefined<SV[K]>
           : never
         : never);
 };
@@ -47,7 +48,7 @@ type CompoundVariants<V, SV> = Array<VariantValue<V, SV> & ClassProp<ClassValue>
 type Options = {
   /**
    * Whether to merge the class names with `tailwind-merge` library.
-   * It's avoided to have duplicate tailwind classes. (Recommended)
+   * It avoids to have duplicate tailwind classes. (Recommended)
    * @see https://github.com/dcastil/tailwind-merge/blob/v1.8.1/README.md
    * @default true
    */