chore: back of dropdownStyle

react-component · Dec 21, 2021 · 6c0a047 · 6c0a047 · vercel · Dec 21, 2021
1 parent 10eacf7
commit 6c0a047
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/examples/debug.tsx b/examples/debug.tsx
@@ -109,15 +109,15 @@ const Demo = () => {
       </label>
       <Cascader
         style={{ width: 200 }}
-        options={addressOptions}
+        // options={addressOptions}
         onChange={onChange}
         checkable={multiple}
         allowClear
         // defaultValue={multiple ? [defaultValue] : defaultValue}
         defaultValue={[['not', 'yet'], ['exist']]}
         showSearch
         // showSearch={{ limit: 1 }}
-        // open
+        open
         // direction="rtl"
         // searchValue="福a"
         // changeOnSelect

diff --git a/src/Cascader.tsx b/src/Cascader.tsx
@@ -270,7 +270,7 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
     mergedSearchValue,
     mergedOptions,
     mergedFieldNames,
-    prefixCls,
+    dropdownPrefixCls || prefixCls,
     searchConfig,
     changeOnSelect,
   );
@@ -460,6 +460,18 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
   // ==============================================================
   // ==                          Render                          ==
   // ==============================================================
+  const emptyOptions = !(mergedSearchValue ? searchOptions : mergedOptions).length;
+
+  const dropdownStyle: React.CSSProperties =
+    // Search to match width
+    (mergedSearchValue && searchConfig.matchInputWidth) ||
+    // Empty keep the width
+    emptyOptions
+      ? {}
+      : {
+          minWidth: 'auto',
+        };
+
   return (
     <CascaderContext.Provider value={cascaderContext}>
       <BaseSelect
@@ -469,7 +481,7 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
         id={mergedId}
         prefixCls={prefixCls}
         dropdownMatchSelectWidth={false}
-        dropdownStyle={{ minWidth: 'auto' }}
+        dropdownStyle={dropdownStyle}
         // Value
         displayValues={displayValues}
         onDisplayValuesChange={onDisplayValuesChange}
@@ -480,7 +492,7 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
         showSearch={mergedShowSearch}
         // Options
         OptionList={OptionList}
-        emptyOptions={!(mergedSearchValue ? searchOptions : mergedOptions).length}
+        emptyOptions={emptyOptions}
         // Open
         open={mergedOpen}
         dropdownClassName={mergedDropdownClassName}