From a4543e17f94dd3eb3d35f481aafa95515a4e4d77 Mon Sep 17 00:00:00 2001 From: abhinandan-verma Date: Mon, 22 Jul 2024 02:42:07 +0530 Subject: [PATCH 1/6] fix(navbar): fixed the height when style h-full --- .changeset/brown-days-applaud.md | 5 +++++ packages/core/theme/src/components/navbar.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/brown-days-applaud.md diff --git a/.changeset/brown-days-applaud.md b/.changeset/brown-days-applaud.md new file mode 100644 index 0000000000..4a8909bfc2 --- /dev/null +++ b/.changeset/brown-days-applaud.md @@ -0,0 +1,5 @@ +--- +"@nextui-org/theme": patch +--- + +fixed the navbar height when `h-full`(#1694) diff --git a/packages/core/theme/src/components/navbar.ts b/packages/core/theme/src/components/navbar.ts index e1ef852de2..93a7468020 100644 --- a/packages/core/theme/src/components/navbar.ts +++ b/packages/core/theme/src/components/navbar.ts @@ -52,7 +52,7 @@ const navbar = tv({ "flex", "z-40", "w-full", - "h-auto", + "max-h-[var(--navbar-height)]", "items-center", "justify-center", "data-[menu-open=true]:border-none", From 626e0e0cae4d7d63dd903bac3eefa685b7924466 Mon Sep 17 00:00:00 2001 From: abhinandan-verma Date: Mon, 22 Jul 2024 02:57:20 +0530 Subject: [PATCH 2/6] fix(navbar): fixed the height when style h-full --- packages/core/theme/src/components/navbar.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/theme/src/components/navbar.ts b/packages/core/theme/src/components/navbar.ts index 93a7468020..e1ef852de2 100644 --- a/packages/core/theme/src/components/navbar.ts +++ b/packages/core/theme/src/components/navbar.ts @@ -52,7 +52,7 @@ const navbar = tv({ "flex", "z-40", "w-full", - "max-h-[var(--navbar-height)]", + "h-auto", "items-center", "justify-center", "data-[menu-open=true]:border-none", From 97a40af28276e2acf55bb9637f6f9b78d4af41b5 Mon Sep 17 00:00:00 2001 From: abhinandan-verma Date: Thu, 25 Jul 2024 22:46:56 +0530 Subject: [PATCH 3/6] fix(core): string[] accepted by compoundVariants.variant --- .changeset/nice-beans-thank.md | 5 +++++ packages/core/system-rsc/src/extend-variants.d.ts | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .changeset/nice-beans-thank.md diff --git a/.changeset/nice-beans-thank.md b/.changeset/nice-beans-thank.md new file mode 100644 index 0000000000..c17fb18077 --- /dev/null +++ b/.changeset/nice-beans-thank.md @@ -0,0 +1,5 @@ +--- +"@nextui-org/system-rsc": patch +--- + +Fixed the compoundVariants.variant to accept string[](#3530) diff --git a/packages/core/system-rsc/src/extend-variants.d.ts b/packages/core/system-rsc/src/extend-variants.d.ts index b2dba3fad5..4a69393da8 100644 --- a/packages/core/system-rsc/src/extend-variants.d.ts +++ b/packages/core/system-rsc/src/extend-variants.d.ts @@ -32,10 +32,10 @@ type ComposeVariants = SuggestedVariants | Variants; type VariantValue = { [K in keyof V | keyof SV]?: - | (K extends keyof V ? StringToBoolean : never) + | (K extends keyof V ? StringToBoolean | (keyof V[K])[] : never) | (K extends keyof SV ? ValidateSubtype extends "true" - ? keyof OmitUndefined + ? keyof OmitUndefined | (keyof OmitUndefined)[] | undefined : never : never); }; @@ -47,7 +47,7 @@ type CompoundVariants = Array & ClassProp type Options = { /** * Whether to merge the class names with `tailwind-merge` library. - * It's avoid to have duplicate tailwind classes. (Recommended) + * It's avoided to have duplicate tailwind classes. (Recommended) * @see https://github.com/dcastil/tailwind-merge/blob/v1.8.1/README.md * @default true */ From 8db51572eb900b06015052f2a05e2c20bd974a72 Mon Sep 17 00:00:00 2001 From: Abhinandan Date: Thu, 25 Jul 2024 22:57:24 +0530 Subject: [PATCH 4/6] Delete .changeset/brown-days-applaud.md --- .changeset/brown-days-applaud.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .changeset/brown-days-applaud.md diff --git a/.changeset/brown-days-applaud.md b/.changeset/brown-days-applaud.md deleted file mode 100644 index 4a8909bfc2..0000000000 --- a/.changeset/brown-days-applaud.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@nextui-org/theme": patch ---- - -fixed the navbar height when `h-full`(#1694) From beff335b90d316e26fe5e266680dfa8e71ce8add Mon Sep 17 00:00:00 2001 From: WK Wong Date: Sat, 17 Aug 2024 12:59:08 +0800 Subject: [PATCH 5/6] chore(changeset): revise changeset message --- .changeset/nice-beans-thank.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/nice-beans-thank.md b/.changeset/nice-beans-thank.md index c17fb18077..57bc0e5aba 100644 --- a/.changeset/nice-beans-thank.md +++ b/.changeset/nice-beans-thank.md @@ -2,4 +2,4 @@ "@nextui-org/system-rsc": patch --- -Fixed the compoundVariants.variant to accept string[](#3530) +added missing `StringToBoolean[]` (#3530) From c4592c9a0489d38681ca023ffe26cbf917664fff Mon Sep 17 00:00:00 2001 From: WK Wong Date: Sat, 17 Aug 2024 12:59:29 +0800 Subject: [PATCH 6/6] 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 = SuggestedVariants | Variants; type VariantValue = { [K in keyof V | keyof SV]?: - | (K extends keyof V ? StringToBoolean | (keyof V[K])[] : never) + | (K extends keyof V ? StringToBoolean : never) + | (K extends keyof V ? StringToBoolean[] : never) | (K extends keyof SV ? ValidateSubtype extends "true" - ? keyof OmitUndefined | (keyof OmitUndefined)[] | undefined + ? keyof OmitUndefined : never : never); }; @@ -47,7 +48,7 @@ type CompoundVariants = Array & ClassProp 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 */