chore: adjust some logic and clean code

Author: aojunhao123

src/Select.tsx

@@ -257,7 +257,6 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
         return valueList.map((val) => {
           let rawValue: RawValueType;
           let rawLabel: React.ReactNode;
-          let rawKey: React.Key;
           let rawDisabled: boolean | undefined;
           let rawTitle: string;
 
@@ -266,15 +265,14 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
             rawValue = val;
           } else {
             rawLabel = val.label;
-            rawValue = val.value ?? (rawKey as RawValueType);
+            rawValue = val.value;
           }
 
           const option = valueOptions.get(rawValue);
           if (option) {
             // Fill missing props
             if (rawLabel === undefined)
               rawLabel = option?.[optionLabelProp || mergedFieldNames.label];
-            if (rawKey === undefined) rawKey = option?.key ?? rawValue;
             rawDisabled = option?.disabled;
             rawTitle = option?.title;
 
@@ -295,7 +293,7 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
           return {
             label: rawLabel,
             value: rawValue,
-            key: rawKey,
+            key: rawValue,
             disabled: rawDisabled,
             title: rawTitle,
           };
@@ -466,7 +464,10 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
         (labeledValues.length !== mergedValues.length ||
           labeledValues.some((newVal, index) => mergedValues[index]?.value !== newVal?.value))
       ) {
-        const returnValues = labelInValue ? labeledValues : labeledValues.map((v) => v.value);
+        const returnValues = labelInValue
+          ? labeledValues.map(({ label, value }) => ({ label, value }))
+          : labeledValues.map((v) => v.value);
+
         const returnOptions = labeledValues.map((v) =>
           injectPropsWithOption(getMixedOption(v.value)),
         );

tests/Multiple.test.tsx

@@ -375,10 +375,12 @@ describe('Select.Multiple', () => {
   });
 
   it('show static prefix', () => {
-    render(<Select mode="multiple" value={['']} prefix="Foobar">
-      <Option value={1}>1</Option>
-      <Option value={2}>2</Option>
-    </Select>);
+    render(
+      <Select mode="multiple" value={['']} prefix="Foobar">
+        <Option value={1}>1</Option>
+        <Option value={2}>2</Option>
+      </Select>,
+    );
 
     expect(screen.findByText('Foobar')).toBeTruthy();
   });
@@ -459,7 +461,7 @@ describe('Select.Multiple', () => {
     toggleOpen(container);
     selectItem(container, 0);
     expect(onChange).toHaveBeenCalledWith(
-      [{ label: 'Light', value: 'light', key: 'light' }],
+      [{ label: 'Light', value: 'light' }],
       [{ label: 'Light', value: 'light', option: 2333 }],
     );
     onChange.mockReset();
@@ -470,8 +472,8 @@ describe('Select.Multiple', () => {
     selectItem(container, 0);
     expect(onChange).toHaveBeenCalledWith(
       [
-        { label: 'Light', value: 'light', key: 'light' },
-        { label: 'Bamboo', value: 'bamboo', key: 'bamboo' },
+        { label: 'Light', value: 'light' },
+        { label: 'Bamboo', value: 'bamboo' },
       ],
       [
         { label: 'Light', value: 'light', option: 2333 },

tests/Select.test.tsx

@@ -487,7 +487,7 @@ describe('Select.Basic', () => {
     toggleOpen(container);
     selectItem(container);
     expect(handleChange).toHaveBeenCalledWith(
-      { key: '1', value: '1', label: 'One' },
+      { value: '1', label: 'One' },
       { children: 'One', key: null, testprop: 'test', value: '1' },
     );
   });
@@ -508,7 +508,7 @@ describe('Select.Basic', () => {
     toggleOpen(container);
     selectItem(container);
     expect(handleChange).toHaveBeenCalledWith(
-      { key: '1', label: 'One', value: '1' },
+      { label: 'One', value: '1' },
       { children: 'One', key: null, testprop: 'test', value: '1' },
     );
   });

tests/shared/removeSelectedTest.tsx

@@ -50,7 +50,7 @@ export default function removeSelectedTest(mode: any) {
       const handleChange = jest.fn();
       const { container } = render(
         <Select
-          value={[{ key: '1' }, { key: '2' }]}
+          value={[{ value: '1' }, { value: '2' }]}
           onChange={handleChange}
           onDeselect={handleDeselect}
           labelInValue
@@ -63,12 +63,12 @@ export default function removeSelectedTest(mode: any) {
       removeSelection(container);
 
       expect(handleDeselect).toHaveBeenCalledWith(
-        expect.objectContaining({ key: '1', label: '1' }),
+        expect.objectContaining({ value: '1', label: '1' }),
         expect.objectContaining({ value: '1' }),
       );
 
       expect(handleChange).toHaveBeenCalledWith(
-        [expect.objectContaining({ key: '2', label: '2' })],
+        [expect.objectContaining({ value: '2', label: '2' })],
         [expect.objectContaining({ value: '2' })],
       );
     });