Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^12.1.5",
"@types/enzyme": "^3.10.5",
"@types/react": "^18.0.28",
"@types/jest": "^29.5.0",
"@types/react": "^17.0.35",
"@types/react-dom": "^18.0.5",
"@types/responselike": "^1.0.0",
"@types/styled-components": "^5.1.32",
Expand Down
2 changes: 1 addition & 1 deletion src/Cell/useCellRender.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default function useCellRender<RecordType>(
? dataIndex
: [dataIndex];

const value: Record<string, unknown> | React.ReactNode = getValue(record, path);
const value: React.ReactNode = getValue(record, path);

// Customize render node
let returnChildNode = value;
Expand Down
6 changes: 3 additions & 3 deletions src/utils/valueUtil.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ interface GetColumnKeyColumn {

export function getColumnsKey(columns: readonly GetColumnKeyColumn[]) {
const columnKeys: React.Key[] = [];
const keys: Record<React.Key, boolean> = {};
const keys: Record<PropertyKey, boolean> = {};

columns.forEach(column => {
const { key, dataIndex } = column || {};

let mergedKey = key || toArray(dataIndex).join('-') || INTERNAL_KEY_PREFIX;
while (keys[mergedKey]) {
while (keys[mergedKey as string]) {
mergedKey = `${mergedKey}_next`;
}
keys[mergedKey] = true;
keys[mergedKey as string] = true;

columnKeys.push(mergedKey);
});
Expand Down