From 8db90a469114880698cfaf66809dd63e24a1f885 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 31 Dec 2024 10:36:45 +0800
Subject: [PATCH 1/2] type: fix type

---
 package.json      |  6 +++---
 src/BaseInput.tsx | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index d4cfb90..0e9771f 100644
--- a/package.json
+++ b/package.json
@@ -54,13 +54,13 @@
     "@testing-library/user-event": "^14.0.0-beta",
     "@types/classnames": "^2.2.9",
     "@types/jest": "^29.5.14",
-    "@types/react": "^18.3.12",
+    "@types/react": "^19.0.0",
     "@types/react-dom": "^19.0.1",
-    "@umijs/fabric": "^2.0.8",
+    "@umijs/fabric": "^4.0.0",
     "coveralls": "^3.0.6",
     "cross-env": "^7.0.2",
     "dumi": "^2.1.14",
-    "eslint": "^7.0.0",
+    "eslint": "^8.0.0",
     "father": "^4.3.7",
     "gh-pages": "^6.2.0",
     "husky": "^9.1.7",
diff --git a/src/BaseInput.tsx b/src/BaseInput.tsx
index 96da424..a8253a1 100644
--- a/src/BaseInput.tsx
+++ b/src/BaseInput.tsx
@@ -53,11 +53,12 @@ const BaseInput = React.forwardRef<HolderRef, BaseInputProps>((props, ref) => {
 
   const hasAffix = hasPrefixSuffix(props);
 
-  let element: ReactElement = cloneElement(inputElement, {
+  let element: ReactElement = cloneElement(inputElement as ReactElement<any>, {
     value,
-    className:
-      clsx(inputElement.props.className, !hasAffix && classNames?.variant) ||
-      null,
+    className: clsx(
+      (inputElement as ReactElement<any>).props?.className,
+      !hasAffix && classNames?.variant,
+    ),
   });
 
   // ======================== Ref ======================== //
@@ -191,10 +192,10 @@ const BaseInput = React.forwardRef<HolderRef, BaseInputProps>((props, ref) => {
   }
 
   // `className` and `style` are always on the root element
-  return React.cloneElement(element, {
-    className: clsx(element.props?.className, className) || null,
+  return React.cloneElement(element as ReactElement<any>, {
+    className: clsx((element as ReactElement<any>).props?.className, className),
     style: {
-      ...element.props?.style,
+      ...(element as ReactElement<any>).props?.style,
       ...style,
     },
     hidden,

From 43cd922062d996d0ce5cd92cc14308986ebc58b8 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 31 Dec 2024 10:48:15 +0800
Subject: [PATCH 2/2] type: fix type

---
 src/BaseInput.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/BaseInput.tsx b/src/BaseInput.tsx
index a8253a1..bf8fcb7 100644
--- a/src/BaseInput.tsx
+++ b/src/BaseInput.tsx
@@ -55,10 +55,11 @@ const BaseInput = React.forwardRef<HolderRef, BaseInputProps>((props, ref) => {
 
   let element: ReactElement = cloneElement(inputElement as ReactElement<any>, {
     value,
-    className: clsx(
-      (inputElement as ReactElement<any>).props?.className,
-      !hasAffix && classNames?.variant,
-    ),
+    className:
+      clsx(
+        (inputElement as ReactElement<any>).props?.className,
+        !hasAffix && classNames?.variant,
+      ) || null,
   });
 
   // ======================== Ref ======================== //
@@ -193,7 +194,8 @@ const BaseInput = React.forwardRef<HolderRef, BaseInputProps>((props, ref) => {
 
   // `className` and `style` are always on the root element
   return React.cloneElement(element as ReactElement<any>, {
-    className: clsx((element as ReactElement<any>).props?.className, className),
+    className:
+      clsx((element as ReactElement<any>).props?.className, className) || null,
     style: {
       ...(element as ReactElement<any>).props?.style,
       ...style,