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
46 changes: 43 additions & 3 deletions src/Cascader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export interface DefaultOptionType extends BaseOptionType {
children?: DefaultOptionType[];
}

export interface CascaderProps<OptionType extends BaseOptionType = DefaultOptionType>
interface BaseCascaderProps<OptionType extends BaseOptionType = DefaultOptionType>
extends Omit<
BaseSelectPropsWithoutPrivate,
'tokenSeparators' | 'labelInValue' | 'mode' | 'showSearch'
Expand Down Expand Up @@ -109,6 +109,40 @@ export interface CascaderProps<OptionType extends BaseOptionType = DefaultOption
loadingIcon?: React.ReactNode;
}

type OnSingleChange<OptionType> = (value: SingleValueType, selectOptions: OptionType[]) => void;
type OnMultipleChange<OptionType> = (
value: SingleValueType[],
selectOptions: OptionType[][],
) => void;

export interface SingleCascaderProps<OptionType extends BaseOptionType = DefaultOptionType>
extends BaseCascaderProps<OptionType> {
checkable?: false;

onChange?: OnSingleChange<OptionType>;
}

export interface MultipleCascaderProps<OptionType extends BaseOptionType = DefaultOptionType>
extends BaseCascaderProps<OptionType> {
checkable: true | React.ReactNode;

onChange?: OnMultipleChange<OptionType>;
}

export type CascaderProps<OptionType extends BaseOptionType = DefaultOptionType> =
| SingleCascaderProps<OptionType>
| MultipleCascaderProps<OptionType>;

type InternalCascaderProps<OptionType extends BaseOptionType = DefaultOptionType> = Omit<
SingleCascaderProps<OptionType> | MultipleCascaderProps<OptionType>,
'onChange'
> & {
onChange?: (
value: SingleValueType | SingleValueType[],
selectOptions: OptionType[] | OptionType[][],
) => void;
};

export type CascaderRef = Omit<BaseSelectRef, 'scrollTo'>;

function isMultipleValue(value: ValueType): value is SingleValueType[] {
Expand All @@ -127,7 +161,7 @@ function toRawValues(value: ValueType): SingleValueType[] {
return value.length === 0 ? [] : [value];
}

const Cascader = React.forwardRef<CascaderRef, CascaderProps>((props, ref) => {
const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, ref) => {
const {
// MISC
id,
Expand Down Expand Up @@ -455,7 +489,13 @@ const Cascader = React.forwardRef<CascaderRef, CascaderProps>((props, ref) => {
/>
</CascaderContext.Provider>
);
});
}) as (<OptionType extends BaseOptionType | DefaultOptionType = DefaultOptionType>(
props: React.PropsWithChildren<CascaderProps<OptionType>> & {
ref?: React.Ref<BaseSelectRef>;
},
) => React.ReactElement) & {
displayName?: string;
};

if (process.env.NODE_ENV !== 'production') {
Cascader.displayName = 'Cascader';
Expand Down
9 changes: 7 additions & 2 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import Cascader from './Cascader';

export type { CascaderProps } from './Cascader';
export type { FieldNames, DataNode, ShowSearchType } from './interface';
export type {
CascaderProps,
FieldNames,
ShowSearchType,
DefaultOptionType,
BaseOptionType,
} from './Cascader';
export default Cascader;
47 changes: 0 additions & 47 deletions src/interface.ts

This file was deleted.