type: fix master CI fail (ant-design#48044)

Author: li-jia-nan

components/table/__tests__/Table.test.tsx

@@ -153,11 +153,7 @@ describe('Table', () => {
   it('should not crash when dataSource is array with none-object items', () => {
     render(
       <Table
-        columns={[
-          {
-            title: 'name',
-          },
-        ]}
+        columns={[{ title: 'name' }]}
         dataSource={['1', 2, undefined, {}, null, true, false, 0] as TableProps<any>['dataSource']}
       />,
     );
@@ -245,28 +241,28 @@ describe('Table', () => {
 
   it('warn about rowKey when using index parameter', () => {
     warnSpy.mockReset();
-    const columns = [
+    const columns: TableProps<any>['columns'] = [
       {
         title: 'Name',
         key: 'name',
         dataIndex: 'name',
       },
     ];
-    render(<Table columns={columns} rowKey={(record, index) => record.key + index} />);
+    render(<Table columns={columns} rowKey={(record, index) => `${record.key}${index}`} />);
     expect(warnSpy).toHaveBeenCalledWith(
       'Warning: [antd: Table] `index` parameter of `rowKey` function is deprecated. There is no guarantee that it will work as expected.',
     );
   });
   it('not warn about rowKey', () => {
     warnSpy.mockReset();
-    const columns = [
+    const columns: TableProps<any>['columns'] = [
       {
         title: 'Name',
         key: 'name',
         dataIndex: 'name',
       },
     ];
-    render(<Table columns={columns} rowKey={(record) => record.key} />);
+    render(<Table columns={columns} rowKey={(record) => record.key as string} />);
     expect(warnSpy).not.toHaveBeenCalled();
   });
 

components/table/hooks/useSorter.tsx

@@ -1,8 +1,9 @@
+import * as React from 'react';
 import CaretDownOutlined from '@ant-design/icons/CaretDownOutlined';
 import CaretUpOutlined from '@ant-design/icons/CaretUpOutlined';
 import classNames from 'classnames';
 import KeyCode from 'rc-util/lib/KeyCode';
-import * as React from 'react';
+
 import type { TooltipProps } from '../../tooltip';
 import Tooltip from '../../tooltip';
 import type {
@@ -257,21 +258,26 @@ function injectSorter<RecordType>(
   });
 }
 
-function stateToInfo<RecordType>(sorterStates: SortState<RecordType>) {
+const stateToInfo = <RecordType extends any>(
+  sorterStates: SortState<RecordType>,
+): SorterResult<RecordType> => {
   const { column, sortOrder } = sorterStates;
   return { column, order: sortOrder, field: column.dataIndex, columnKey: column.key };
-}
+};
 
 function generateSorterInfo<RecordType>(
   sorterStates: SortState<RecordType>[],
 ): SorterResult<RecordType> | SorterResult<RecordType>[] {
-  const list = sorterStates.filter(({ sortOrder }) => sortOrder).map(stateToInfo);
+  const list = sorterStates
+    .filter(({ sortOrder }) => sortOrder)
+    .map<SorterResult<RecordType>>(stateToInfo);
 
   // =========== Legacy compatible support ===========
   // https://github.com/ant-design/ant-design/pull/19226
   if (list.length === 0 && sorterStates.length) {
+    const lastIndex = sorterStates.length - 1;
     return {
-      ...stateToInfo(sorterStates[sorterStates.length - 1]),
+      ...stateToInfo(sorterStates[lastIndex]),
       column: undefined,
     };
   }
@@ -366,7 +372,7 @@ export default function useFilterSorter<RecordType>({
     collectSortStates(mergedColumns, true),
   );
 
-  const mergedSorterStates = React.useMemo(() => {
+  const mergedSorterStates = React.useMemo<SortState<RecordType>[]>(() => {
     let validate = true;
     const collectedStates = collectSortStates(mergedColumns, false);
 
@@ -426,9 +432,8 @@ export default function useFilterSorter<RecordType>({
     };
   }, [mergedSorterStates]);
 
-  function triggerSorter(sortState: SortState<RecordType>) {
-    let newSorterStates;
-
+  const triggerSorter = (sortState: SortState<RecordType>) => {
+    let newSorterStates: SortState<RecordType>[];
     if (
       sortState.multiplePriority === false ||
       !mergedSorterStates.length ||
@@ -441,10 +446,9 @@ export default function useFilterSorter<RecordType>({
         sortState,
       ];
     }
-
     setSortStates(newSorterStates);
     onSorterChange(generateSorterInfo(newSorterStates), newSorterStates);
-  }
+  };
 
   const transformColumns = (innerColumns: ColumnsType<RecordType>) =>
     injectSorter(