-
-
Notifications
You must be signed in to change notification settings - Fork 458
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
fix: incorrect display when value change from with label to without label #1029
Open
xulingling0
wants to merge
1
commit into
react-component:master
Choose a base branch
from
xulingling0:fix-1028-value
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+20
−9
Open
Changes from all commits
Commits
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,42 +3,36 @@ import type { RawValueType } from '../BaseSelect'; | |
import type { DefaultOptionType, LabelInValueType } from '../Select'; | ||
|
||
/** | ||
* Cache `value` related LabeledValue & options. | ||
* Cache `options` related LabeledValue & options. | ||
*/ | ||
export default ( | ||
labeledValues: LabelInValueType[], | ||
valueOptions: Map<RawValueType, DefaultOptionType>, | ||
): [LabelInValueType[], (val: RawValueType) => DefaultOptionType] => { | ||
const cacheRef = React.useRef({ | ||
values: new Map<RawValueType, LabelInValueType>(), | ||
options: new Map<RawValueType, DefaultOptionType>(), | ||
}); | ||
|
||
const filledLabeledValues = React.useMemo(() => { | ||
const { values: prevValueCache, options: prevOptionCache } = cacheRef.current; | ||
|
||
const { options: prevOptionCache } = cacheRef.current; | ||
// Fill label by cache | ||
const patchedValues = labeledValues.map((item) => { | ||
if (item.label === undefined) { | ||
return { | ||
...item, | ||
label: prevValueCache.get(item.value)?.label, | ||
label: prevOptionCache.get(item.value)?.label, | ||
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. |
||
}; | ||
} | ||
|
||
return item; | ||
}); | ||
|
||
// Refresh cache | ||
const valueCache = new Map<RawValueType, LabelInValueType>(); | ||
const optionCache = new Map<RawValueType, DefaultOptionType>(); | ||
|
||
patchedValues.forEach((item) => { | ||
valueCache.set(item.value, item); | ||
optionCache.set(item.value, valueOptions.get(item.value) || prevOptionCache.get(item.value)); | ||
}); | ||
|
||
cacheRef.current.values = valueCache; | ||
cacheRef.current.options = optionCache; | ||
|
||
return patchedValues; | ||
|
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.
这个不应该删掉,
labelInValue
的时候需要 cache 住之前的label
。只有不设置labelInValue
才应该清理掉。