Skip to content

Commit 9758aed

Browse files
committed
fix type
1 parent 3b37259 commit 9758aed

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

src/TreeSelect.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import warningProps from './utils/warningPropsUtil';
3131
import type {
3232
LabeledValueType,
3333
SafeKey,
34-
Key,
3534
DataNode,
3635
SimpleModeConfig,
3736
ChangeEventExtra,

src/hooks/useCheckedKeys.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import type { DataEntity } from 'rc-tree/lib/interface';
33
import { conductCheck } from 'rc-tree/lib/utils/conductUtil';
4-
import type { LabeledValueType, SafeKey } from '../interface';
4+
import type { LabeledValueType, SafeKey, Key } from '../interface';
55

66
const useCheckedKeys = (
77
rawLabeledValues: LabeledValueType[],
@@ -10,13 +10,12 @@ const useCheckedKeys = (
1010
keyEntities: Record<SafeKey, DataEntity>,
1111
) => {
1212
return React.useMemo(() => {
13-
const extractValues = (values: LabeledValueType[]): SafeKey[] =>
14-
values.map(({ value }) => value);
13+
const extractValues = (values: LabeledValueType[]): Key[] => values.map(({ value }) => value);
1514

1615
const checkedKeys = extractValues(rawLabeledValues);
1716
const halfCheckedKeys = extractValues(rawHalfCheckedValues);
1817

19-
const missingValues = checkedKeys.filter(key => !keyEntities[key]);
18+
const missingValues = checkedKeys.filter(key => !keyEntities[key as SafeKey]);
2019

2120
let finalCheckedKeys = checkedKeys;
2221
let finalHalfCheckedKeys = halfCheckedKeys;

src/interface.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type * as React from 'react';
2-
import type { SafeKey, Key, DataNode, FieldNames } from 'rc-tree/lib/interface';
2+
import type { SafeKey, Key, DataNode } from 'rc-tree/lib/interface';
33

4-
export type { SafeKey, Key, DataNode, FieldNames };
4+
export type { SafeKey, Key, DataNode };
55

66
export type SelectSource = 'option' | 'selection' | 'input' | 'clear';
77

@@ -55,3 +55,9 @@ export interface ChangeEventExtra {
5555
/** @deprecated This prop not work as react node anymore. */
5656
allCheckedNodes: LegacyCheckedNode[];
5757
}
58+
59+
export interface FieldNames {
60+
value?: string;
61+
label?: string;
62+
children?: string;
63+
}

src/utils/strategyUtil.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import type { FieldNames } from '../TreeSelect';
21
import type { DataEntity } from 'rc-tree/lib/interface';
3-
import type { SafeKey, Key } from '../interface';
2+
import type { SafeKey, FieldNames } from '../interface';
43
import { isCheckDisabled } from './valueUtil';
54

65
export const SHOW_ALL = 'SHOW_ALL';

src/utils/valueUtil.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import type { DataNode, FieldNames, SafeKey } from '../interface';
2-
import type { FieldNames } from '../TreeSelect';
32

43
export const toArray = <T>(value: T | T[]): T[] =>
54
Array.isArray(value) ? value : value !== undefined ? [value] : [];

0 commit comments

Comments
 (0)