chore: rename

ant-design · Dec 22, 2022 · 104a917 · 104a917
1 parent c3df6b6
commit 104a917
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/components/_util/withDefaultProps.ts → components/_util/extendsObject.ts b/components/_util/withDefaultProps.ts → components/_util/extendsObject.ts
@@ -1,8 +1,7 @@
-/* eslint-disable no-redeclare */
-export function mergeProps<A, B>(a: A, b: B): B & A;
-export function mergeProps<A, B, C>(a: A, b: B, c: C): C & B & A;
-export function mergeProps(...list: any[]) {
-  const result = { ...list[0] };
+type RecordType = Record<string, any>;
+
+function extendsObject<T extends RecordType>(...list: T[]) {
+  const result: RecordType = { ...list[0] };
 
   for (let i = 1; i < list.length; i++) {
     const obj = list[i];
@@ -18,3 +17,5 @@ export function mergeProps(...list: any[]) {
 
   return result;
 }
+
+export default extendsObject;
diff --git a/components/list/index.tsx b/components/list/index.tsx
@@ -12,7 +12,7 @@ import type { SpinProps } from '../spin';
 import Spin from '../spin';
 import type { Breakpoint } from '../_util/responsiveObserve';
 import { responsiveArray } from '../_util/responsiveObserve';
-import { mergeProps } from '../_util/withDefaultProps';
+import extendsObject from '../_util/extendsObject';
 import Item from './Item';
 
 // CSSINJS
@@ -191,7 +191,7 @@ function List<T>({
     hashId,
   );
 
-  const paginationProps = mergeProps(
+  const paginationProps = extendsObject<PaginationConfig>(
     defaultPaginationProps,
     {
       total: dataSource.length,

diff --git a/components/table/hooks/usePagination.ts b/components/table/hooks/usePagination.ts
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import type { PaginationProps } from '../../pagination';
 import type { TablePaginationConfig } from '../interface';
-import { mergeProps } from '../../_util/withDefaultProps';
+import extendsObject from '../../_util/extendsObject';
 
 export const DEFAULT_PAGE_SIZE = 10;
 
@@ -44,9 +44,13 @@ export default function usePagination(
   }));
 
   // ============ Basic Pagination Config ============
-  const mergedPagination = mergeProps(innerPagination, paginationObj, {
-    total: paginationTotal > 0 ? paginationTotal : total,
-  });
+  const mergedPagination = extendsObject<Partial<TablePaginationConfig>>(
+    innerPagination,
+    paginationObj,
+    {
+      total: paginationTotal > 0 ? paginationTotal : total,
+    },
+  );
 
   // Reset `current` if data length or pageSize changed
   const maxPage = Math.ceil((paginationTotal || total) / mergedPagination.pageSize!);