fix: Select value={0} should not be filtered

afc163 · afc163 · commit 51a498c81aed · 2021-04-07T10:45:57.000+08:00
#590 (comment)
diff --git a/examples/custom-tags.tsx b/examples/custom-tags.tsx
@@ -2,7 +2,7 @@
 import React from 'react';
 import Select, { Option } from '../src';
 import '../assets/index.less';
-import { CustomTagProps } from '../src/interface/generator';
+import type { CustomTagProps } from '../src/interface/generator';
 
 const children = [];
 for (let i = 10; i < 36; i += 1) {
diff --git a/src/OptGroup.tsx b/src/OptGroup.tsx
@@ -1,6 +1,6 @@
 /* istanbul ignore file */
-import * as React from 'react';
-import { OptionGroupData } from './interface';
+import type * as React from 'react';
+import type { OptionGroupData } from './interface';
 
 export interface OptGroupProps extends Omit<OptionGroupData, 'options'> {
   children?: React.ReactNode;
diff --git a/src/Option.tsx b/src/Option.tsx
@@ -1,6 +1,6 @@
 /* istanbul ignore file */
-import * as React from 'react';
-import { OptionCoreData } from './interface';
+import type * as React from 'react';
+import type { OptionCoreData } from './interface';
 
 export interface OptionProps extends Omit<OptionCoreData, 'label'> {
   children: React.ReactNode;
diff --git a/src/OptionList.tsx b/src/OptionList.tsx
@@ -3,16 +3,17 @@ import KeyCode from 'rc-util/lib/KeyCode';
 import pickAttrs from 'rc-util/lib/pickAttrs';
 import useMemo from 'rc-util/lib/hooks/useMemo';
 import classNames from 'classnames';
-import List, { ListRef } from 'rc-virtual-list';
+import type { ListRef } from 'rc-virtual-list';
+import List from 'rc-virtual-list';
 import TransBtn from './TransBtn';
-import {
+import type {
   OptionsType as SelectOptionsType,
   FlattenOptionData as SelectFlattenOptionData,
   OptionData,
   RenderNode,
   OnActiveValue,
 } from './interface';
-import { RawValueType, FlattenOptionsType } from './interface/generator';
+import type { RawValueType, FlattenOptionsType } from './interface/generator';
 
 export interface OptionListProps<OptionsType extends object[]> {
   prefixCls: string;
@@ -89,7 +90,7 @@ const OptionList: React.RefForwardingComponent<
   // =========================== List ===========================
   const listRef = React.useRef<ListRef>(null);
 
-  const onListMouseDown: React.MouseEventHandler<HTMLDivElement> = event => {
+  const onListMouseDown: React.MouseEventHandler<HTMLDivElement> = (event) => {
     event.preventDefault();
   };
 
@@ -176,7 +177,7 @@ const OptionList: React.RefForwardingComponent<
 
   // ========================= Keyboard =========================
   React.useImperativeHandle(ref, () => ({
-    onKeyDown: event => {
+    onKeyDown: (event) => {
       const { which } = event;
       switch (which) {
         // >>> Arrow keys
@@ -226,7 +227,7 @@ const OptionList: React.RefForwardingComponent<
     },
     onKeyUp: () => {},
 
-    scrollTo: index => {
+    scrollTo: (index) => {
       scrollIntoView(index);
     },
   }));
diff --git a/src/Select.tsx b/src/Select.tsx
@@ -30,7 +30,7 @@
  */
 
 import * as React from 'react';
-import { OptionsType as SelectOptionsType } from './interface';
+import type { OptionsType as SelectOptionsType } from './interface';
 import SelectOptionList from './OptionList';
 import Option from './Option';
 import OptGroup from './OptGroup';
@@ -43,8 +43,9 @@ import {
   flattenOptions,
   fillOptionsWithMissingValue,
 } from './utils/valueUtil';
-import generateSelector, { SelectProps, RefSelectProps } from './generate';
-import { DefaultValueType } from './interface/generator';
+import type { SelectProps, RefSelectProps } from './generate';
+import generateSelector from './generate';
+import type { DefaultValueType } from './interface/generator';
 import warningProps from './utils/warningPropsUtil';
 
 const RefSelect = generateSelector<SelectOptionsType>({
diff --git a/src/SelectTrigger.tsx b/src/SelectTrigger.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import Trigger from 'rc-trigger';
 import classNames from 'classnames';
-import { RenderDOMFunc } from './interface';
+import type { RenderDOMFunc } from './interface';
 
 const getBuiltInPlacements = (dropdownMatchSelectWidth: number | boolean) => {
   // Enable horizontal overflow auto-adjustment when a custom dropdown width is provided
diff --git a/src/Selector/MultipleSelector.tsx b/src/Selector/MultipleSelector.tsx
@@ -4,15 +4,15 @@ import classNames from 'classnames';
 import pickAttrs from 'rc-util/lib/pickAttrs';
 import Overflow from 'rc-overflow';
 import TransBtn from '../TransBtn';
-import {
+import type {
   LabelValueType,
   DisplayLabelValueType,
   RawValueType,
   CustomTagProps,
   DefaultValueType,
 } from '../interface/generator';
-import { RenderNode } from '../interface';
-import { InnerSelectorProps } from '.';
+import type { RenderNode } from '../interface';
+import type { InnerSelectorProps } from '.';
 import Input from './Input';
 import useLayoutEffect from '../hooks/useLayoutEffect';
 
@@ -39,7 +39,7 @@ const onPreventMouseDown = (event: React.MouseEvent) => {
   event.preventDefault();
   event.stopPropagation();
 };
-const SelectSelector: React.FC<SelectorProps> = props => {
+const SelectSelector: React.FC<SelectorProps> = (props) => {
   const {
     id,
     prefixCls,
diff --git a/src/Selector/SingleSelector.tsx b/src/Selector/SingleSelector.tsx
@@ -1,15 +1,15 @@
 import * as React from 'react';
 import pickAttrs from 'rc-util/lib/pickAttrs';
 import Input from './Input';
-import { InnerSelectorProps } from '.';
+import type { InnerSelectorProps } from '.';
 
 interface SelectorProps extends InnerSelectorProps {
   inputElement: React.ReactElement;
   activeValue: string;
   backfill?: boolean;
 }
 
-const SingleSelector: React.FC<SelectorProps> = props => {
+const SingleSelector: React.FC<SelectorProps> = (props) => {
   const {
     inputElement,
     prefixCls,
@@ -80,7 +80,7 @@ const SingleSelector: React.FC<SelectorProps> = props => {
           value={inputValue}
           onKeyDown={onInputKeyDown}
           onMouseDown={onInputMouseDown}
-          onChange={e => {
+          onChange={(e) => {
             setInputChanged(true);
             onInputChange(e as any);
           }}
diff --git a/src/TransBtn.tsx b/src/TransBtn.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import classNames from 'classnames';
-import { RenderNode } from './interface';
+import type { RenderNode } from './interface';
 
 export interface TransBtnProps {
   className: string;
@@ -30,7 +30,7 @@ const TransBtn: React.FC<TransBtnProps> = ({
   return (
     <span
       className={className}
-      onMouseDown={event => {
+      onMouseDown={(event) => {
         event.preventDefault();
         if (onMouseDown) {
           onMouseDown(event);
@@ -47,7 +47,7 @@ const TransBtn: React.FC<TransBtnProps> = ({
       {icon !== undefined ? (
         icon
       ) : (
-        <span className={classNames(className.split(/\s+/).map(cls => `${cls}-icon`))}>
+        <span className={classNames(className.split(/\s+/).map((cls) => `${cls}-icon`))}>
           {children}
         </span>
       )}
diff --git a/src/hooks/useCacheDisplayValue.ts b/src/hooks/useCacheDisplayValue.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { DisplayLabelValueType } from '../interface/generator';
+import type { DisplayLabelValueType } from '../interface/generator';
 
 export default function useCacheDisplayValue(
   values: DisplayLabelValueType[],
@@ -15,7 +15,7 @@ export default function useCacheDisplayValue(
       }
     });
 
-    const resultValues = values.map(item => {
+    const resultValues = values.map((item) => {
       const cacheLabel = valueLabels.get(item.value);
       if (item.isCacheable && cacheLabel) {
         return {
diff --git a/src/hooks/useCacheOptions.ts b/src/hooks/useCacheOptions.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { RawValueType, FlattenOptionsType, Key } from '../interface/generator';
+import type { RawValueType, FlattenOptionsType, Key } from '../interface/generator';
 
 export default function useCacheOptions<
   OptionsType extends {
@@ -15,7 +15,7 @@ export default function useCacheOptions<
 
   const optionMap = React.useMemo(() => {
     const map: Map<RawValueType, FlattenOptionsType<OptionsType>[number]> = new Map();
-    options.forEach(item => {
+    options.forEach((item) => {
       const {
         data: { value },
       } = item;
@@ -27,7 +27,7 @@ export default function useCacheOptions<
   prevOptionMapRef.current = optionMap;
 
   const getValueOption = (vals: RawValueType[]): FlattenOptionsType<OptionsType> =>
-    vals.map(value => prevOptionMapRef.current.get(value)).filter(Boolean);
+    vals.map((value) => prevOptionMapRef.current.get(value)).filter(Boolean);
 
   return getValueOption;
 }
diff --git a/src/interface/generator.ts b/src/interface/generator.ts
@@ -1,4 +1,4 @@
-import { SelectProps, RefSelectProps } from '../generate';
+import type { SelectProps, RefSelectProps } from '../generate';
 
 export type SelectSource = 'option' | 'selection' | 'input';
 
@@ -13,7 +13,7 @@ export interface LabelValueType {
   key?: Key;
   value?: RawValueType;
   label?: React.ReactNode;
-  isCacheable?: Boolean;
+  isCacheable?: boolean;
 }
 export type DefaultValueType = RawValueType | RawValueType[] | LabelValueType | LabelValueType[];
 
diff --git a/src/interface/index.ts b/src/interface/index.ts
@@ -1,5 +1,5 @@
-import * as React from 'react';
-import { Key, RawValueType } from './generator';
+import type * as React from 'react';
+import type { Key, RawValueType } from './generator';
 
 export type RenderDOMFunc = (props: any) => HTMLElement;
 
diff --git a/src/utils/commonUtil.ts b/src/utils/commonUtil.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   RawValueType,
   GetLabeledValue,
   LabelValueType,
@@ -22,10 +22,7 @@ export function toInnerValue(
 ): [RawValueType[], Map<RawValueType, LabelValueType>] {
   const valueMap = new Map<RawValueType, LabelValueType>();
 
-  if (
-    value === undefined ||
-    (value === '' && combobox)
-  ) {
+  if (value === undefined || (value === '' && combobox)) {
     return [[], valueMap];
   }
 
@@ -34,7 +31,7 @@ export function toInnerValue(
 
   if (labelInValue) {
     rawValues = (values as LabelValueType[])
-      .filter(item => !!item)
+      .filter((item) => item !== null)
       .map((itemValue: LabelValueType) => {
         const { key, value: val } = itemValue;
         const finalVal = val !== undefined ? val : key;
@@ -68,7 +65,7 @@ export function toOuterValues<FOT extends FlattenOptionsType>(
   let values: DefaultValueType = valueList;
 
   if (labelInValue) {
-    values = values.map(val =>
+    values = values.map((val) =>
       getLabeledValue(val, {
         options,
         prevValueMap,
diff --git a/src/utils/legacyUtil.ts b/src/utils/legacyUtil.ts
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import toArray from 'rc-util/lib/Children/toArray';
-import { OptionData, OptionGroupData, OptionsType } from '../interface';
+import type { OptionData, OptionGroupData, OptionsType } from '../interface';
 
 function convertNodeToOption(node: React.ReactElement): OptionData {
   const {
@@ -40,5 +40,5 @@ export function convertChildrenToData(
         options: convertChildrenToData(children),
       };
     })
-    .filter(data => data);
+    .filter((data) => data);
 }
diff --git a/src/utils/valueUtil.ts b/src/utils/valueUtil.ts
diff --git a/src/utils/warningPropsUtil.ts b/src/utils/warningPropsUtil.ts
