From 950c11baca60c9cc3c16061be584e940248d959e Mon Sep 17 00:00:00 2001
From: Wanpan <wanpan96@163.com>
Date: Wed, 26 Feb 2025 15:32:21 +0800
Subject: [PATCH 1/2] fix: clearIcon add tabIndex

---
 src/BaseInput.tsx | 1 +
 src/Input.tsx     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/BaseInput.tsx b/src/BaseInput.tsx
index bf8fcb7..4724858 100644
--- a/src/BaseInput.tsx
+++ b/src/BaseInput.tsx
@@ -84,6 +84,7 @@ const BaseInput = React.forwardRef<HolderRef, BaseInputProps>((props, ref) => {
       clearIcon = (
         <button
           type="button"
+          tabIndex={-1}
           onClick={(event) => {
             handleReset?.(event);
             onClear?.();
diff --git a/src/Input.tsx b/src/Input.tsx
index 4ce793f..1cb3536 100644
--- a/src/Input.tsx
+++ b/src/Input.tsx
@@ -1,6 +1,6 @@
 import clsx from 'classnames';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
-import omit from 'rc-util/lib/omit';
+import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
+import omit from '@rc-component/util/lib/omit';
 import React, {
   forwardRef,
   useEffect,

From bd02998704290afc38b76a8eec723570b269a701 Mon Sep 17 00:00:00 2001
From: Wanpan <wanpan96@163.com>
Date: Wed, 26 Feb 2025 16:11:20 +0800
Subject: [PATCH 2/2] fix: test update

---
 tests/BaseInput.test.tsx                | 40 ++++++++++++-------------
 tests/__snapshots__/index.test.tsx.snap |  6 ++++
 tests/focus.test.tsx                    |  2 +-
 tests/index.test.tsx                    |  2 +-
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/tests/BaseInput.test.tsx b/tests/BaseInput.test.tsx
index a0c51e2..8a237e9 100644
--- a/tests/BaseInput.test.tsx
+++ b/tests/BaseInput.test.tsx
@@ -97,33 +97,33 @@ describe('BaseInput', () => {
       expect(inputEl!.value).toBe('');
     });
 
-    it('By focus and Space', async () => {
-      const { container } = render(<Demo />);
+    // it('By focus and Space', async () => {
+    //   const { container } = render(<Demo />);
 
-      const inputEl = container.querySelector('input');
-      await user.click(inputEl!);
+    //   const inputEl = container.querySelector('input');
+    //   await user.click(inputEl!);
 
-      await user.type(inputEl!, 'some text');
-      expect(inputEl!.value).toBe('some text');
+    //   await user.type(inputEl!, 'some text');
+    //   expect(inputEl!.value).toBe('some text');
 
-      await user.tab();
-      await user.keyboard('[Space]');
-      expect(inputEl!.value).toBe('');
-    });
+    //   await user.tab();
+    //   await user.keyboard('[Space]');
+    //   expect(inputEl!.value).toBe('');
+    // });
 
-    it('By focus and Enter', async () => {
-      const { container } = render(<Demo />);
+    // it('By focus and Enter', async () => {
+    //   const { container } = render(<Demo />);
 
-      const inputEl = container.querySelector('input');
-      await user.click(inputEl!);
+    //   const inputEl = container.querySelector('input');
+    //   await user.click(inputEl!);
 
-      await user.type(inputEl!, 'some text');
-      expect(inputEl!.value).toBe('some text');
+    //   await user.type(inputEl!, 'some text');
+    //   expect(inputEl!.value).toBe('some text');
 
-      await user.tab();
-      await user.keyboard('[Enter]');
-      expect(inputEl!.value).toBe('');
-    });
+    //   await user.tab();
+    //   await user.keyboard('[Enter]');
+    //   expect(inputEl!.value).toBe('');
+    // });
   });
 
   it('should display clearIcon correctly', () => {
diff --git a/tests/__snapshots__/index.test.tsx.snap b/tests/__snapshots__/index.test.tsx.snap
index 598a273..72bc563 100644
--- a/tests/__snapshots__/index.test.tsx.snap
+++ b/tests/__snapshots__/index.test.tsx.snap
@@ -117,6 +117,7 @@ exports[`Input allowClear should change type when click 1`] = `
     >
       <button
         class="rc-input-clear-icon"
+        tabindex="-1"
         type="button"
       >
         ✖
@@ -141,6 +142,7 @@ exports[`Input allowClear should change type when click 2`] = `
     >
       <button
         class="rc-input-clear-icon rc-input-clear-icon-hidden"
+        tabindex="-1"
         type="button"
       >
         ✖
@@ -165,6 +167,7 @@ exports[`Input allowClear should not show icon if defaultValue is undefined or e
     >
       <button
         class="rc-input-clear-icon rc-input-clear-icon-hidden"
+        tabindex="-1"
         type="button"
       >
         ✖
@@ -189,6 +192,7 @@ exports[`Input allowClear should not show icon if defaultValue is undefined or e
     >
       <button
         class="rc-input-clear-icon rc-input-clear-icon-hidden"
+        tabindex="-1"
         type="button"
       >
         ✖
@@ -213,6 +217,7 @@ exports[`Input allowClear should not show icon if value is undefined or empty st
     >
       <button
         class="rc-input-clear-icon rc-input-clear-icon-hidden"
+        tabindex="-1"
         type="button"
       >
         ✖
@@ -237,6 +242,7 @@ exports[`Input allowClear should not show icon if value is undefined or empty st
     >
       <button
         class="rc-input-clear-icon rc-input-clear-icon-hidden"
+        tabindex="-1"
         type="button"
       >
         ✖
diff --git a/tests/focus.test.tsx b/tests/focus.test.tsx
index 44f6f53..6ec1e35 100644
--- a/tests/focus.test.tsx
+++ b/tests/focus.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
+import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
 import Input from '../src';
 import { fireEvent, render } from '@testing-library/react';
 
diff --git a/tests/index.test.tsx b/tests/index.test.tsx
index 6daf791..d6c153f 100644
--- a/tests/index.test.tsx
+++ b/tests/index.test.tsx
@@ -1,6 +1,6 @@
 import { fireEvent, render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
+import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
 import React from 'react';
 import Input from '../src';
 import type { InputRef } from '../src/interface';