Skip to content
Merged
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
17 changes: 12 additions & 5 deletions src/BaseSelect/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,8 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
placement,
builtinPlacements,
getPopupContainer,
styles: baseSelectStyles,
classNames: baseSelectClassNames,

// Focus
showAction = [],
Expand Down Expand Up @@ -412,9 +414,12 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
maxCount,
rawValues,
classNames: selectClassNames,
styles,
styles: selectStyles,
} = React.useContext<SelectContextProps>(SelectContext) || {};

const contextClassNames = baseSelectClassNames ?? selectClassNames;
const contextStyles = baseSelectStyles ?? selectStyles;

const onInternalSearch = (searchText: string, fromTyping: boolean, isCompositing: boolean) => {
if (multiple && isValidCount(maxCount) && rawValues?.size >= maxCount) {
return;
Expand Down Expand Up @@ -703,6 +708,8 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
multiple,
toggleOpen: onToggleOpen,
showScrollBar,
styles: contextStyles,
classNames: contextClassNames,
}),
[
props,
Expand All @@ -728,10 +735,10 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
if (showSuffixIcon) {
arrowNode = (
<TransBtn
className={classNames(`${prefixCls}-arrow`, selectClassNames?.suffix, {
className={classNames(`${prefixCls}-arrow`, contextClassNames?.suffix, {
[`${prefixCls}-arrow-loading`]: loading,
})}
style={styles?.suffix}
style={contextStyles?.suffix}
customizeIcon={suffixIcon}
customizeIconProps={{
loading,
Expand Down Expand Up @@ -821,8 +828,8 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
) : (
<Selector
{...props}
prefixClassName={selectClassNames?.prefix}
prefixStyle={styles?.prefix}
prefixClassName={contextClassNames?.prefix}
prefixStyle={contextStyles?.prefix}
domRef={selectorDomRef}
prefixCls={prefixCls}
inputElement={customizeInputElement}
Expand Down
6 changes: 5 additions & 1 deletion src/Selector/Input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import classNames from 'classnames';
import { composeRef } from '@rc-component/util/lib/ref';
import { warning } from '@rc-component/util/lib/warning';
import SelectContext from '../SelectContext';
import useBaseProps from '../hooks/useBaseProps';
type InputRef = HTMLInputElement | HTMLTextAreaElement;

interface InputProps {
Expand Down Expand Up @@ -57,8 +58,11 @@ const Input: React.ForwardRefRenderFunction<InputRef, InputProps> = (props, ref)
open,
attrs,
} = props;
const { classNames: contextClassNames, styles: contextStyles } =
const { classNames: selectClassNames, styles: selectStyles } =
React.useContext(SelectContext) || {};
const { classNames: baseSelectClassNames, styles: baseSelectStyles } = useBaseProps() || {};
const contextClassNames = selectClassNames ?? baseSelectClassNames;
const contextStyles = selectStyles ?? baseSelectStyles;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这两个是 ?? 关系?是不需要合并的么


let inputNode: React.ComponentElement<any, any> = inputElement || <input />;

Expand Down
Loading