fix: correct update option's label when update value (equal label) in…

… options
react-component · Dec 23, 2020 · be51210 · be51210
1 parent d393076
commit be51210
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/src/hooks/useCacheDisplayValue.ts b/src/hooks/useCacheDisplayValue.ts
@@ -17,7 +17,7 @@ export default function useCacheDisplayValue(
 
     const resultValues = values.map(item => {
       const cacheLabel = valueLabels.get(item.value);
-      if (item.value === item.label && cacheLabel) {
+      if (item.isCacheable && cacheLabel) {
         return {
           ...item,
           label: cacheLabel,

diff --git a/src/interface/generator.ts b/src/interface/generator.ts
@@ -13,6 +13,7 @@ export interface LabelValueType {
   key?: Key;
   value?: RawValueType;
   label?: React.ReactNode;
+  isCacheable?: Boolean;
 }
 export type DefaultValueType = RawValueType | RawValueType[] | LabelValueType | LabelValueType[];
 

diff --git a/src/utils/valueUtil.ts b/src/utils/valueUtil.ts
@@ -153,6 +153,7 @@ export const getLabeledValue: GetLabeledValue<FlattenOptionData[]> = (
     result.label = item[optionLabelProp];
   } else {
     result.label = value;
+    result.isCacheable = true;
   }
 
   // Used for motion control

diff --git a/tests/Select.test.tsx b/tests/Select.test.tsx
@@ -1612,6 +1612,9 @@ describe('Select.Basic', () => {
 
     wrapper.setProps({ options: [] });
     expect(findSelection(wrapper).text()).toEqual('Bamboo');
+
+    wrapper.setProps({ options: [{ value: 903, label: 903 }] });
+    expect(findSelection(wrapper).text()).toEqual('903');
   });
 
   // https://github.com/ant-design/ant-design/issues/24747