From f3488fbec718d7812ee0b7281f34d415314dc74d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B4=8B?= Date: Mon, 5 Jun 2023 15:30:30 +0800 Subject: [PATCH] feat: support dropdownStyle --- src/Cascader.tsx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Cascader.tsx b/src/Cascader.tsx index 284b1f96..f93be3dc 100644 --- a/src/Cascader.tsx +++ b/src/Cascader.tsx @@ -199,6 +199,7 @@ const Cascader = React.forwardRef((props, re popupClassName, dropdownClassName, + dropdownStyle, dropdownMenuColumnStyle, popupPlacement, @@ -473,15 +474,17 @@ const Cascader = React.forwardRef((props, re // ============================================================== const emptyOptions = !(mergedSearchValue ? searchOptions : mergedOptions).length; - const dropdownStyle: React.CSSProperties = + const mergedDropdownStyle: React.CSSProperties = React.useMemo(() => { // Search to match width - (mergedSearchValue && searchConfig.matchInputWidth) || - // Empty keep the width - emptyOptions - ? {} + return dropdownStyle ?? (mergedSearchValue && searchConfig.matchInputWidth) ?? emptyOptions + ? // Empty keep the width + { + ...dropdownStyle, + } : { minWidth: 'auto', }; + }, [dropdownStyle, mergedSearchValue, searchConfig, emptyOptions]); return ( @@ -492,7 +495,7 @@ const Cascader = React.forwardRef((props, re id={mergedId} prefixCls={prefixCls} dropdownMatchSelectWidth={dropdownMatchSelectWidth} - dropdownStyle={dropdownStyle} + dropdownStyle={mergedDropdownStyle} // Value displayValues={displayValues} onDisplayValuesChange={onDisplayValuesChange}