-
-
Notifications
You must be signed in to change notification settings - Fork 144
feat: add disabled api for panel #543
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 6 commits
7692626
75fdf31
3f41343
62d5c18
cb771fe
243125a
ef96118
9e13232
9201339
393749a
6610a9b
7691896
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,7 @@ export interface ColumnProps<OptionType extends DefaultOptionType = DefaultOptio | |
| halfCheckedSet: Set<React.Key>; | ||
| loadingKeys: React.Key[]; | ||
| isSelectable: (option: DefaultOptionType) => boolean; | ||
| panelDisabled?: boolean; | ||
| } | ||
|
|
||
| export default function Column<OptionType extends DefaultOptionType = DefaultOptionType>({ | ||
|
|
@@ -38,6 +39,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt | |
| halfCheckedSet, | ||
| loadingKeys, | ||
| isSelectable, | ||
| panelDisabled, | ||
| }: ColumnProps<OptionType>) { | ||
| const menuPrefixCls = `${prefixCls}-menu`; | ||
| const menuItemPrefixCls = `${prefixCls}-menu-item`; | ||
|
|
@@ -54,6 +56,8 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt | |
|
|
||
| const hoverOpen = expandTrigger === 'hover'; | ||
|
|
||
| const isOptionDisabled = (optionDisabled?: boolean) => panelDisabled || optionDisabled; | ||
|
|
||
|
||
| // ============================ Option ============================ | ||
| const optionInfoList = React.useMemo( | ||
| () => | ||
|
|
@@ -115,7 +119,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt | |
| }) => { | ||
| // >>>>> Open | ||
| const triggerOpenPath = () => { | ||
| if (disabled) { | ||
| if (isOptionDisabled(disabled)) { | ||
| return; | ||
| } | ||
| const nextValueCells = [...fullPath]; | ||
|
|
@@ -127,7 +131,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt | |
|
|
||
| // >>>>> Selection | ||
| const triggerSelect = () => { | ||
| if (isSelectable(option)) { | ||
| if (isSelectable(option) && !isOptionDisabled(disabled)) { | ||
| onSelect(fullPath, isMergedLeaf); | ||
| } | ||
| }; | ||
|
|
@@ -148,7 +152,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt | |
| [`${menuItemPrefixCls}-expand`]: !isMergedLeaf, | ||
| [`${menuItemPrefixCls}-active`]: | ||
| activeValue === value || activeValue === fullPathKey, | ||
| [`${menuItemPrefixCls}-disabled`]: disabled, | ||
| [`${menuItemPrefixCls}-disabled`]: isOptionDisabled(disabled), | ||
| [`${menuItemPrefixCls}-loading`]: isLoading, | ||
| })} | ||
| style={dropdownMenuColumnStyle} | ||
|
|
@@ -185,7 +189,7 @@ export default function Column<OptionType extends DefaultOptionType = DefaultOpt | |
| prefixCls={`${prefixCls}-checkbox`} | ||
| checked={checked} | ||
| halfChecked={halfChecked} | ||
| disabled={disabled || disableCheckbox} | ||
| disabled={isOptionDisabled(disabled) || disableCheckbox} | ||
| disableCheckbox={disableCheckbox} | ||
| onClick={(e: React.MouseEvent<HTMLSpanElement>) => { | ||
| if (disableCheckbox) { | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,11 +21,27 @@ import useKeyboard from './useKeyboard'; | |
|
|
||
| export type RawOptionListProps = Pick< | ||
| ReturnType<typeof useBaseProps>, | ||
| 'prefixCls' | 'multiple' | 'searchValue' | 'toggleOpen' | 'notFoundContent' | 'direction' | 'open' | ||
| | 'prefixCls' | ||
| | 'multiple' | ||
| | 'searchValue' | ||
| | 'toggleOpen' | ||
| | 'notFoundContent' | ||
| | 'direction' | ||
| | 'open' | ||
| | 'disabled' | ||
| >; | ||
|
|
||
| const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>((props, ref) => { | ||
| const { prefixCls, multiple, searchValue, toggleOpen, notFoundContent, direction, open } = props; | ||
| const { | ||
| prefixCls, | ||
| multiple, | ||
| searchValue, | ||
| toggleOpen, | ||
| notFoundContent, | ||
| direction, | ||
| open, | ||
| disabled: panelDisabled, | ||
aojunhao123 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } = props; | ||
|
|
||
| const containerRef = React.useRef<HTMLDivElement>(null); | ||
| const rtl = direction === 'rtl'; | ||
|
|
@@ -100,10 +116,11 @@ const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>(( | |
| }; | ||
|
|
||
| const isSelectable = (option: DefaultOptionType) => { | ||
| const { disabled } = option; | ||
| if (panelDisabled) return false; | ||
|
||
|
|
||
| const { disabled: optionDisabled } = option; | ||
| const isMergedLeaf = isLeaf(option, fieldNames); | ||
| return !disabled && (isMergedLeaf || changeOnSelect || multiple); | ||
| return !optionDisabled && (isMergedLeaf || changeOnSelect || multiple); | ||
| }; | ||
|
|
||
| const onPathSelect = (valuePath: SingleValueType, leaf: boolean, fromKeyboard = false) => { | ||
|
|
@@ -203,6 +220,7 @@ const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>(( | |
| halfCheckedSet, | ||
| loadingKeys, | ||
| isSelectable, | ||
| panelDisabled, | ||
| }; | ||
|
|
||
| // >>>>> Columns | ||
|
|
@@ -220,6 +238,7 @@ const RawOptionList = React.forwardRef<RefOptionListProps, RawOptionListProps>(( | |
| options={col.options} | ||
| prevValuePath={prevValuePath} | ||
| activeValue={activeValue} | ||
| panelDisabled={panelDisabled} | ||
aojunhao123 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| /> | ||
| ); | ||
| }); | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
建议提取共同的 Panel 属性
多个
Cascader.Panel组件都使用了相同的disabled属性。建议将共同的属性提取为一个对象,以提高代码的可维护性和减少重复。Also applies to: 101-101, 104-104