Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
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
7 changes: 5 additions & 2 deletions src/BaseSelect/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import type {
RenderDOMFunc,
RenderNode,
} from '../interface';
import type { RefTriggerProps } from '../SelectTrigger';
import type { RefTriggerProps, SelectTriggerProps } from '../SelectTrigger';
import SelectTrigger from '../SelectTrigger';
import { getSeparatedContent, isValidCount } from '../utils/valueUtil';
import Polite from './Polite';
Expand Down Expand Up @@ -129,7 +129,8 @@ export interface BaseSelectPrivateProps {

export type BaseSelectPropsWithoutPrivate = Omit<BaseSelectProps, keyof BaseSelectPrivateProps>;

export interface BaseSelectProps extends BaseSelectPrivateProps, React.AriaAttributes {
export interface BaseSelectProps
extends BaseSelectPrivateProps, React.AriaAttributes, Pick<SelectTriggerProps, 'forceRender'> {
// Style
className?: string;
style?: React.CSSProperties;
Expand Down Expand Up @@ -298,6 +299,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
placement,
builtinPlacements,
getPopupContainer,
forceRender,

// Focus
showAction = [],
Expand Down Expand Up @@ -774,6 +776,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
placement={placement}
builtinPlacements={builtinPlacements}
getPopupContainer={getPopupContainer}
forceRender={forceRender}
empty={emptyOptions}
onPopupVisibleChange={onTriggerVisibleChange}
onPopupMouseEnter={onPopupMouseEnter}
Expand Down
4 changes: 2 additions & 2 deletions src/SelectTrigger.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Trigger, { type TriggerRef } from '@rc-component/trigger';
import Trigger, { type TriggerRef, type TriggerProps } from '@rc-component/trigger';
import type { AlignType, BuildInPlacements } from '@rc-component/trigger/lib/interface';
import { clsx } from 'clsx';
import * as React from 'react';
Expand Down Expand Up @@ -53,7 +53,7 @@ export interface RefTriggerProps {
getPopupElement: () => HTMLDivElement;
}

export interface SelectTriggerProps {
export interface SelectTriggerProps extends Pick<TriggerProps, 'forceRender'> {
prefixCls: string;
children: React.ReactElement;
disabled: boolean;
Expand Down
Loading