1- import cls from 'classnames ' ;
1+ import { clsx } from 'clsx ' ;
22import * as React from 'react' ;
3- import pickAttrs from 'rc-util/lib/pickAttrs' ;
3+ import pickAttrs from '@ rc-component/ util/lib/pickAttrs' ;
44import type { DefaultOptionType , SingleValueType } from '../Cascader' ;
55import CascaderContext from '../context' ;
66import { SEARCH_MARK } from '../hooks/useSearchOptions' ;
@@ -121,7 +121,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
121121 // ============================ Render ============================
122122 return (
123123 < ul
124- className = { cls ( menuPrefixCls , classNames ?. popup ?. list ) }
124+ className = { clsx ( menuPrefixCls , classNames ?. popup ?. list ) }
125125 style = { styles ?. popup ?. list }
126126 ref = { menuRef }
127127 role = "menu"
@@ -140,10 +140,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
140140 fullPathKey,
141141 disableCheckbox,
142142 } ) => {
143- const ariaProps = pickAttrs ( option , {
144- aria : true ,
145- data : true
146- } ) ;
143+ const ariaProps = pickAttrs ( option , { aria : true , data : true } ) ;
147144 // >>>>> Open
148145 const triggerOpenPath = ( ) => {
149146 if ( isOptionDisabled ( disabled ) ) {
@@ -176,7 +173,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt
176173 < li
177174 key = { fullPathKey }
178175 { ...ariaProps }
179- className = { cls ( menuItemPrefixCls , classNames ?. popup ?. listItem , {
176+ className = { clsx ( menuItemPrefixCls , classNames ?. popup ?. listItem , {
180177 [ `${ menuItemPrefixCls } -expand` ] : ! isMergedLeaf ,
181178 [ `${ menuItemPrefixCls } -active` ] :
182179 activeValue === value || activeValue === fullPathKey ,
0 commit comments