Skip to content

Commit 820a097

Browse files
chore(deps-dev): bump @types/react from 17.0.53 to 18.0.28 (#952)
* chore(deps-dev): bump @types/react from 17.0.53 to 18.0.28 Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 17.0.53 to 18.0.28. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Update package.json * Update useCellRender.ts * Update valueUtil.tsx --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: lijianan <[email protected]>
1 parent 32ff755 commit 820a097

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
"@testing-library/jest-dom": "^5.16.5",
6666
"@testing-library/react": "^12.1.5",
6767
"@types/enzyme": "^3.10.5",
68+
"@types/react": "^18.0.28",
6869
"@types/jest": "^29.5.0",
69-
"@types/react": "^17.0.35",
7070
"@types/react-dom": "^18.0.5",
7171
"@types/responselike": "^1.0.0",
7272
"@types/styled-components": "^5.1.32",

src/Cell/useCellRender.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export default function useCellRender<RecordType>(
4040
? dataIndex
4141
: [dataIndex];
4242

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

4545
// Customize render node
4646
let returnChildNode = value;

src/utils/valueUtil.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ interface GetColumnKeyColumn {
1616

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

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

2424
let mergedKey = key || toArray(dataIndex).join('-') || INTERNAL_KEY_PREFIX;
25-
while (keys[mergedKey]) {
25+
while (keys[mergedKey as string]) {
2626
mergedKey = `${mergedKey}_next`;
2727
}
28-
keys[mergedKey] = true;
28+
keys[mergedKey as string] = true;
2929

3030
columnKeys.push(mergedKey);
3131
});

0 commit comments

Comments
 (0)