refactor: judgment grammar simplification

ant-design · Jul 10, 2023 · 21277d4 · 21277d4
1 parent cce2221
commit 21277d4
Show file tree

Hide file tree

Showing 15 changed files with 103 additions and 144 deletions.
diff --git a/src/components/calendar/convert.ts b/src/components/calendar/convert.ts
@@ -7,9 +7,8 @@ export function convertValueToRange(
 ): DateRange {
   if (selectionMode === undefined || value === null) return null
 
-  if (Array.isArray(value)) {
-    return value
-  }
+  if (Array.isArray(value)) return value
+
   return [value, value]
 }
 export function convertPageToDayjs(page: Page) {

diff --git a/src/components/capsule-tabs/capsule-tabs.tsx b/src/components/capsule-tabs/capsule-tabs.tsx
@@ -25,9 +25,7 @@ export type CapsuleTabProps = {
   children?: ReactNode
 } & NativeProps
 
-export const CapsuleTab: FC<CapsuleTabProps> = () => {
-  return null
-}
+export const CapsuleTab: FC<CapsuleTabProps> = () => null
 
 export type CapsuleTabsProps = {
   activeKey?: string | null
@@ -91,9 +89,8 @@ export const CapsuleTabs: FC<CapsuleTabsProps> = props => {
                   onClick={() => {
                     const { key } = pane
                     if (pane.props.disabled) return
-                    if (key === undefined || key === null) {
-                      return
-                    }
+                    if (key === undefined || key === null) return
+
                     setActiveKey(key.toString())
                   }}
                   className={classNames(`${classPrefix}-tab`, {
@@ -109,9 +106,8 @@ export const CapsuleTabs: FC<CapsuleTabsProps> = props => {
         </animated.div>
       </div>
       {panes.map(pane => {
-        if (pane.props.children === undefined) {
-          return null
-        }
+        if (pane.props.children === undefined) return null
+
         const active = pane.key === activeKey
         return (
           <ShouldRender

diff --git a/src/components/card/card.tsx b/src/components/card/card.tsx
@@ -19,9 +19,8 @@ export type CardProps = {
 
 export const Card: FC<CardProps> = props => {
   const renderHeader = () => {
-    if (!(props.title || props.extra)) {
-      return null
-    }
+    if (!(props.title || props.extra)) return null
+
     return (
       <div
         className={classNames(`${classPrefix}-header`, props.headerClassName)}
@@ -35,9 +34,8 @@ export const Card: FC<CardProps> = props => {
   }
 
   const renderBody = () => {
-    if (!props.children) {
-      return null
-    }
+    if (!props.children) return null
+
     return (
       <div
         className={classNames(`${classPrefix}-body`, props.bodyClassName)}

diff --git a/src/components/date-picker/date-picker-date-utils.ts b/src/components/date-picker/date-picker-date-utils.ts
@@ -104,12 +104,10 @@ export function generateDatePickerColumns(
     const upper = maxYear
     const years = generateColumn(lower, upper, 'year')
     ret.push(
-      years.map(v => {
-        return {
-          label: renderLabel('year', v),
-          value: v.toString(),
-        }
-      })
+      years.map(v => ({
+        label: renderLabel('year', v),
+        value: v.toString(),
+      }))
     )
   }
 
@@ -118,64 +116,54 @@ export function generateDatePickerColumns(
     const upper = isInMaxYear ? maxMonth : 12
     const months = generateColumn(lower, upper, 'month')
     ret.push(
-      months.map(v => {
-        return {
-          label: renderLabel('month', v),
-          value: v.toString(),
-        }
-      })
+      months.map(v => ({
+        label: renderLabel('month', v),
+        value: v.toString(),
+      }))
     )
   }
   if (rank >= precisionRankRecord.day) {
     const lower = isInMinMonth ? minDay : 1
     const upper = isInMaxMonth ? maxDay : firstDayInSelectedMonth.daysInMonth()
     const days = generateColumn(lower, upper, 'day')
     ret.push(
-      days.map(v => {
-        return {
-          label: renderLabel('day', v),
-          value: v.toString(),
-        }
-      })
+      days.map(v => ({
+        label: renderLabel('day', v),
+        value: v.toString(),
+      }))
     )
   }
   if (rank >= precisionRankRecord.hour) {
     const lower = isInMinDay ? minHour : 0
     const upper = isInMaxDay ? maxHour : 23
     const hours = generateColumn(lower, upper, 'hour')
     ret.push(
-      hours.map(v => {
-        return {
-          label: renderLabel('hour', v),
-          value: v.toString(),
-        }
-      })
+      hours.map(v => ({
+        label: renderLabel('hour', v),
+        value: v.toString(),
+      }))
     )
   }
   if (rank >= precisionRankRecord.minute) {
     const lower = isInMinHour ? minMinute : 0
     const upper = isInMaxHour ? maxMinute : 59
     const minutes = generateColumn(lower, upper, 'minute')
     ret.push(
-      minutes.map(v => {
-        return {
-          label: renderLabel('minute', v),
-          value: v.toString(),
-        }
-      })
+      minutes.map(v => ({
+        label: renderLabel('minute', v),
+        value: v.toString(),
+      }))
     )
   }
   if (rank >= precisionRankRecord.second) {
     const lower = isInMinMinute ? minSecond : 0
     const upper = isInMaxMinute ? maxSecond : 59
     const seconds = generateColumn(lower, upper, 'second')
     ret.push(
-      seconds.map(v => {
-        return {
-          label: renderLabel('second', v),
-          value: v.toString(),
-        }
-      })
+      seconds.map(v => ({
+        label: renderLabel('second', v),
+        value: v.toString(),
+      }))
     )
   }
 

diff --git a/src/components/date-picker/date-picker-week-utils.ts b/src/components/date-picker/date-picker-week-utils.ts
@@ -77,12 +77,10 @@ export function generateDatePickerColumns(
     const upper = maxYear
     const years = generateColumn(lower, upper, 'year')
     ret.push(
-      years.map(v => {
-        return {
-          label: renderLabel('year', v),
-          value: v.toString(),
-        }
-      })
+      years.map(v => ({
+        label: renderLabel('year', v),
+        value: v.toString(),
+      }))
     )
   }
 
@@ -91,25 +89,21 @@ export function generateDatePickerColumns(
     const upper = isInMaxYear ? maxWeek : selectedYearWeeks
     const weeks = generateColumn(lower, upper, 'week')
     ret.push(
-      weeks.map(v => {
-        return {
-          label: renderLabel('week', v),
-          value: v.toString(),
-        }
-      })
+      weeks.map(v => ({
+        label: renderLabel('week', v),
+        value: v.toString(),
+      }))
     )
   }
   if (rank >= precisionRankRecord['week-day']) {
     const lower = isInMinWeek ? minWeekday : 1
     const upper = isInMaxWeek ? maxWeekday : 7
     const weeks = generateColumn(lower, upper, 'week-day')
     ret.push(
-      weeks.map(v => {
-        return {
-          label: renderLabel('week-day', v),
-          value: v.toString(),
-        }
-      })
+      weeks.map(v => ({
+        label: renderLabel('week-day', v),
+        value: v.toString(),
+      }))
     )
   }
 

diff --git a/src/components/dropdown/dropdown.tsx b/src/components/dropdown/dropdown.tsx
@@ -26,7 +26,6 @@ export type DropdownProps = {
   closeOnMaskClick?: boolean
   closeOnClickAway?: boolean
   onChange?: (key: string | null) => void
-  // mask?: boolean;
   arrow?: React.ReactNode
   getContainer?: PopupProps['getContainer']
 } & NativeProps

diff --git a/src/components/footer/footer.tsx b/src/components/footer/footer.tsx
@@ -60,40 +60,36 @@ export const Footer: FC<FooterProps> = p => {
           <Divider>{label}</Divider>
         </div>
       )}
-      {links && links.length > 0 && (
+      {!!links?.length && (
         <div className={`${classPrefix}-links`}>
-          {links.map((link, index) => {
-            return (
-              <React.Fragment key={index}>
-                <a
-                  href={link.href}
-                  rel='noopener noreferrer'
-                  onClick={event => clickLinkItem(link, index, event)}
-                >
-                  {link.text}
-                </a>
-                {index !== links.length - 1 && <Divider direction='vertical' />}
-              </React.Fragment>
-            )
-          })}
+          {links.map((link, index) => (
+            <React.Fragment key={index}>
+              <a
+                href={link.href}
+                rel='noopener noreferrer'
+                onClick={event => clickLinkItem(link, index, event)}
+              >
+                {link.text}
+              </a>
+              {index !== links.length - 1 && <Divider direction='vertical' />}
+            </React.Fragment>
+          ))}
         </div>
       )}
       {content && <div className={`${classPrefix}-content`}>{content}</div>}
       {chips && chips.length > 0 && (
         <div className={`${classPrefix}-chips`}>
-          {chips.map((chip, index) => {
-            return (
-              <div
-                key={index}
-                onClick={() => clickChipItem(chip, index)}
-                className={classNames(`${classPrefix}-chip`, {
-                  [`${classPrefix}-chip-link`]: chip.type === 'link',
-                })}
-              >
-                {chip.text}
-              </div>
-            )
-          })}
+          {chips.map((chip, index) => (
+            <div
+              key={index}
+              onClick={() => clickChipItem(chip, index)}
+              className={classNames(`${classPrefix}-chip`, {
+                [`${classPrefix}-chip-link`]: chip.type === 'link',
+              })}
+            >
+              {chip.text}
+            </div>
+          ))}
         </div>
       )}
     </div>

diff --git a/src/components/form/form-array.tsx b/src/components/form/form-array.tsx
@@ -16,7 +16,6 @@ export interface FormArrayOperation {
 
 export interface FormArrayProps {
   name: string | number | (string | number)[]
-  // rules?: ValidatorRule[]
   initialValue?: any[]
   renderHeader?: (
     field: FormArrayField,

diff --git a/src/components/grid/grid.tsx b/src/components/grid/grid.tsx
@@ -16,7 +16,7 @@ export const Grid: FC<GridProps> = props => {
     '--columns': props.columns.toString(),
   }
   const { gap } = props
-  if (gap !== undefined) {
+  if (gap) {
     if (Array.isArray(gap)) {
       style['--gap-horizontal'] = toCSSLength(gap[0])
       style['--gap-vertical'] = toCSSLength(gap[1])

diff --git a/src/components/image-uploader/image-uploader.tsx b/src/components/image-uploader/image-uploader.tsx
@@ -159,18 +159,14 @@ export const ImageUploader: FC<ImageUploaderProps> = p => {
     e.target.value = '' // HACK: fix the same file doesn't trigger onChange
 
     if (props.beforeUpload) {
-      const postFiles = files.map(file => {
-        return processFile(file, files)
-      })
+      const postFiles = files.map(file => processFile(file, files))
 
       await Promise.all(postFiles).then(filesList => {
         files = filesList.filter(Boolean) as File[]
       })
     }
 
-    if (files.length === 0) {
-      return
-    }
+    if (files.length === 0) return
 
     if (maxCount > 0) {
       const exceed = value.length + files.length - maxCount
@@ -279,9 +275,8 @@ export const ImageUploader: FC<ImageUploaderProps> = p => {
     <>
       {renderImages()}
       {tasks.map(task => {
-        if (!props.showFailed && task.status === 'fail') {
-          return null
-        }
+        if (!props.showFailed && task.status === 'fail') return null
+
         return (
           <PreviewItem
             key={task.id}

diff --git a/src/components/input/input.tsx b/src/components/input/input.tsx
@@ -136,6 +136,7 @@ export const Input = forwardRef<InputRef, InputProps>((p, ref) => {
 
   const shouldShowClear = (() => {
     if (!props.clearable || !value || props.readOnly) return false
+
     if (props.onlyShowClearWhenFocus) {
       return hasFocus
     } else {

diff --git a/src/components/jumbo-tabs/jumbo-tabs.tsx b/src/components/jumbo-tabs/jumbo-tabs.tsx
@@ -93,9 +93,8 @@ export const JumboTabs: FC<JumboTabsProps> = props => {
                   onClick={() => {
                     const { key } = pane
                     if (pane.props.disabled) return
-                    if (key === undefined || key === null) {
-                      return
-                    }
+                    if (key === undefined || key === null) return
+
                     setActiveKey(key.toString())
                   }}
                   className={classNames(`${classPrefix}-tab`, {
@@ -116,9 +115,8 @@ export const JumboTabs: FC<JumboTabsProps> = props => {
         </animated.div>
       </div>
       {panes.map(pane => {
-        if (pane.props.children === undefined) {
-          return null
-        }
+        if (pane.props.children === undefined) return null
+
         const active = pane.key === activeKey
         return (
           <ShouldRender