From 8d7739fe72669ebd5e71b9874c69c58c0d09b3eb Mon Sep 17 00:00:00 2001
From: Hugo Lextrait <hugo.lextrait@gmail.com>
Date: Fri, 18 Apr 2025 15:08:11 +0200
Subject: [PATCH 1/2] fix: correctly propagate inputstyle through props

---
 src/components/extenders/PaginatedSelect.tsx | 2 +-
 src/components/primitives/Input.tsx          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/extenders/PaginatedSelect.tsx b/src/components/extenders/PaginatedSelect.tsx
index be7d67f65..1d3bd8e2b 100644
--- a/src/components/extenders/PaginatedSelect.tsx
+++ b/src/components/extenders/PaginatedSelect.tsx
@@ -248,7 +248,7 @@ export default function PaginatedSelect({
               type={"string"}
               state={[search, onSearch]}
               placeholder={"Search a token"}
-              className="w-full h-[fit-content]"
+              className={mergeClass(base(), "w-full h-[fit-content]")}
               size="lg"
               prefix={<Icon remix="RiSearch2Line" />}
             />
diff --git a/src/components/primitives/Input.tsx b/src/components/primitives/Input.tsx
index 0cedc93e2..829a00869 100644
--- a/src/components/primitives/Input.tsx
+++ b/src/components/primitives/Input.tsx
@@ -66,8 +66,8 @@ function Input({ look, size, state, inputClassName, className, ...props }: Input
   const { header, footer, prefix, suffix, label, hint, error, ...rest } = props;
   if (extensions.some(extension => !!props?.[extension]))
     return (
-      <Group className={mergeClass("flex-col", className)} size={"xs"}>
-        <label className={mergeClass(inputStyles({ look, size }), className, "flex-col flex")} htmlFor="input">
+      <Group className={mergeClass(inputStyles({ look, size }), "flex-col", className)} size={"xs"}>
+        <label className={mergeClass(className, "flex-col flex")} htmlFor="input">
           {header && (
             <label htmlFor="input" className="w-full flex">
               {header}

From 4be916c3857c59812c07b5427003b857c60c1401 Mon Sep 17 00:00:00 2001
From: Hugo Lextrait <hugo.lextrait@gmail.com>
Date: Fri, 18 Apr 2025 15:14:46 +0200
Subject: [PATCH 2/2] fix: adjust label class for full width in Input component

---
 src/components/primitives/Input.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/primitives/Input.tsx b/src/components/primitives/Input.tsx
index 829a00869..9feae247f 100644
--- a/src/components/primitives/Input.tsx
+++ b/src/components/primitives/Input.tsx
@@ -67,7 +67,7 @@ function Input({ look, size, state, inputClassName, className, ...props }: Input
   if (extensions.some(extension => !!props?.[extension]))
     return (
       <Group className={mergeClass(inputStyles({ look, size }), "flex-col", className)} size={"xs"}>
-        <label className={mergeClass(className, "flex-col flex")} htmlFor="input">
+        <label className={mergeClass(className, "w-full flex-col flex")} htmlFor="input">
           {header && (
             <label htmlFor="input" className="w-full flex">
               {header}