-
-
Notifications
You must be signed in to change notification settings - Fork 143
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
feat: add disabled api for panel #543
Merged
zombieJ
merged 12 commits into
react-component:master
from
aojunhao123:feat/panel-disabled
Oct 29, 2024
Merged
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
7692626
feat: add disabled api for panel
75fdf31
feat: add test case
3f41343
docs: add demo
62d5c18
fix: test case fixed
cb771fe
feat: adjust demo position
243125a
feat: improve demo
ef96118
chore: reorganize code for better readability
9e13232
test: update snapshot
aojunhao123 9201339
fix: lint fix
aojunhao123 393749a
chore: adjust code structure
aojunhao123 6610a9b
test: update snapshot
aojunhao123 7691896
chore: code optimization
aojunhao123 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
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; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 拆行 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 这个拆行指的是👀 |
||
|
||
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.
Show resolved
Hide resolved
|
||
/> | ||
); | ||
}); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
上次我尝试解决,也是 props 透传,感觉很丑陋。 或许可以用 context 的方式, 我也拿捏不准
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.
嗯嗯好的,我再去看一下