fix: variant as array when extending (#123)

Co-authored-by: Giuliano Crivelli <giuliano.crivelli@byside.com>
nextui-org · Oct 30, 2023 · 1080de7 · 1080de7
1 parent e07e421
commit 1080de7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/__tests__/tv.test.ts b/src/__tests__/tv.test.ts
@@ -1938,7 +1938,7 @@ describe("Tailwind Variants (TV) - Extends", () => {
           false: "text-2xl",
         },
         color: {
-          red: "text-red-500 bg-red-100",
+          red: "text-red-500 bg-red-100 tracking-normal",
           blue: "text-blue-500",
         },
       },
@@ -1949,7 +1949,7 @@ describe("Tailwind Variants (TV) - Extends", () => {
       base: "text-3xl font-bold",
       variants: {
         color: {
-          red: "text-red-200",
+          red: ["text-red-200", "bg-red-200"],
           green: "text-green-500",
         },
       },
@@ -1960,7 +1960,13 @@ describe("Tailwind Variants (TV) - Extends", () => {
       color: "red",
     });
 
-    const expectedResult = ["font-bold", "text-red-200", "bg-red-100", "text-5xl"];
+    const expectedResult = [
+      "font-bold",
+      "text-red-200",
+      "bg-red-200",
+      "tracking-normal",
+      "text-5xl",
+    ];
 
     expectTv(result, expectedResult);
   });

diff --git a/src/utils.js b/src/utils.js
@@ -37,6 +37,8 @@ export const mergeObjects = (obj1, obj2) => {
 
       if (typeof val1 === "object" && typeof val2 === "object") {
         result[key] = mergeObjects(val1, val2);
+      } else if (Array.isArray(val1) || Array.isArray(val2)) {
+        result[key] = flatMergeArrays(val2, val1);
       } else {
         result[key] = val2 + " " + val1;
       }