chore: replace method

ant-design · Dec 22, 2022 · 04bb673 · 04bb673
1 parent 3a9b577
commit 04bb673
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 49 deletions.
diff --git a/components/list/index.tsx b/components/list/index.tsx
@@ -12,6 +12,7 @@ import type { SpinProps } from '../spin';
 import Spin from '../spin';
 import type { Breakpoint } from '../_util/responsiveObserver';
 import { responsiveArray } from '../_util/responsiveObserver';
+import { mergeProps } from '../_util/withDefaultProps';
 import Item from './Item';
 
 // CSSINJS
@@ -74,26 +75,6 @@ export const ListContext = React.createContext<ListConsumerProps>({});
 
 export const ListConsumer = ListContext.Consumer;
 
-/**
- * copy https://github.com/ant-design/ant-design/blob/536b8f8cd985dedb4419817b6430ada0494ce44e/components/table/hooks/usePagination.ts#L28-L43
- */
-function extendsObject<T extends Object>(...list: T[]) {
-  const result: T = {} as T;
-
-  list.forEach((obj) => {
-    if (obj) {
-      Object.keys(obj).forEach((key) => {
-        const val = (obj as any)[key];
-        if (val !== undefined) {
-          (result as any)[key] = val;
-        }
-      });
-    }
-  });
-
-  return result;
-}
-
 function List<T>({
   pagination = false as ListProps<any>['pagination'],
   prefixCls: customizePrefixCls,
@@ -210,7 +191,7 @@ function List<T>({
     hashId,
   );
 
-  const paginationProps = extendsObject<PaginationConfig>(
+  const paginationProps = mergeProps(
     defaultPaginationProps,
     {
       total: dataSource.length,
@@ -220,8 +201,8 @@ function List<T>({
     pagination || {},
   );
 
-  const largestPage = Math.ceil(paginationProps.total! / paginationProps.pageSize!);
-  if (paginationProps.current! > largestPage) {
+  const largestPage = Math.ceil(paginationProps.total / paginationProps.pageSize);
+  if (paginationProps.current > largestPage) {
     paginationProps.current = largestPage;
   }
   const paginationContent = pagination ? (
@@ -236,9 +217,9 @@ function List<T>({
 
   let splitDataSource = [...dataSource];
   if (pagination) {
-    if (dataSource.length > (paginationProps.current! - 1) * paginationProps.pageSize!) {
+    if (dataSource.length > (paginationProps.current - 1) * paginationProps.pageSize) {
       splitDataSource = [...dataSource].splice(
-        (paginationProps.current! - 1) * paginationProps.pageSize!,
+        (paginationProps.current - 1) * paginationProps.pageSize,
         paginationProps.pageSize,
       );
     }

diff --git a/components/table/hooks/usePagination.ts b/components/table/hooks/usePagination.ts
@@ -1,6 +1,7 @@
 import { useState } from 'react';
 import type { PaginationProps } from '../../pagination';
 import type { TablePaginationConfig } from '../interface';
+import { mergeProps } from '../../_util/withDefaultProps';
 
 export const DEFAULT_PAGE_SIZE = 10;
 
@@ -25,23 +26,6 @@ export function getPaginationParam(
   return param;
 }
 
-function extendsObject<T extends Object>(...list: T[]) {
-  const result: T = {} as T;
-
-  list.forEach((obj) => {
-    if (obj) {
-      Object.keys(obj).forEach((key) => {
-        const val = (obj as any)[key];
-        if (val !== undefined) {
-          (result as any)[key] = val;
-        }
-      });
-    }
-  });
-
-  return result;
-}
-
 export default function usePagination(
   total: number,
   pagination: TablePaginationConfig | false | undefined,
@@ -60,13 +44,9 @@ export default function usePagination(
   }));
 
   // ============ Basic Pagination Config ============
-  const mergedPagination = extendsObject<Partial<TablePaginationConfig>>(
-    innerPagination,
-    paginationObj,
-    {
-      total: paginationTotal > 0 ? paginationTotal : total,
-    },
-  );
+  const mergedPagination = mergeProps(innerPagination, paginationObj, {
+    total: paginationTotal > 0 ? paginationTotal : total,
+  });
 
   // Reset `current` if data length or pageSize changed
   const maxPage = Math.ceil((paginationTotal || total) / mergedPagination.pageSize!);