fix: mix logic (#51)

react-component · Sep 28, 2023 · db5525c · db5525c
1 parent 117dd80
commit db5525c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/src/hooks/useCount.ts b/src/hooks/useCount.ts
@@ -25,17 +25,20 @@ export default function useCount(
   showCount?: InputProps['showCount'],
 ) {
   return React.useMemo<ForcedCountConfig>(() => {
-    let mergedConfig = count;
-
-    if (!count) {
-      mergedConfig = {
-        show:
-          typeof showCount === 'object' && showCount.formatter
-            ? showCount.formatter
-            : !!showCount,
-      };
+    let mergedConfig: CountConfig = {};
+
+    if (showCount) {
+      mergedConfig.show =
+        typeof showCount === 'object' && showCount.formatter
+          ? showCount.formatter
+          : !!showCount;
     }
 
+    mergedConfig = {
+      ...mergedConfig,
+      ...count,
+    };
+
     const { show, ...rest } = mergedConfig!;
 
     return {

diff --git a/src/interface.ts b/src/interface.ts
@@ -114,7 +114,7 @@ export interface InputProps
     string
   >;
   onPressEnter?: KeyboardEventHandler<HTMLInputElement>;
-  /** @deprecated Use `count.show` instead */
+  /** It's better to use `count.show` instead */
   showCount?:
     | boolean
     | {

diff --git a/tests/count.test.tsx b/tests/count.test.tsx
@@ -110,5 +110,20 @@ describe('Input.Count', () => {
 
       expect(container.querySelector('.rc-input-out-of-range')).toBeTruthy();
     });
+
+    it('mix usage', () => {
+      const { container } = render(
+        <Input
+          showCount
+          count={{
+            max: 10,
+          }}
+          defaultValue="bamboo"
+        />,
+      );
+      expect(
+        container.querySelector('.rc-input-show-count-suffix')?.textContent,
+      ).toEqual('6 / 10');
+    });
   });
 });