refactor: remove some lodash function

Garfield550 · Garfield550 · commit 62d1dc1ce741 · 2020-03-28T03:28:47.000+08:00
diff --git a/src/components/action-sheet/body/item/index.tsx b/src/components/action-sheet/body/item/index.tsx
@@ -1,5 +1,4 @@
 import classNames from 'classnames'
-import _isFunction from 'lodash/isFunction'
 import PropTypes, { InferProps } from 'prop-types'
 import { AtActionSheetItemProps } from 'types/action-sheet'
 import { View } from '@tarojs/components'
@@ -13,7 +12,7 @@ export default class AtActionSheetItem extends AtComponent<
   public static propTypes: InferProps<AtActionSheetItemProps>
 
   private handleClick = (args: any): void => {
-    if (_isFunction(this.props.onClick)) {
+    if (typeof this.props.onClick === 'function') {
       this.props.onClick(args)
     }
   }
diff --git a/src/components/action-sheet/footer/index.tsx b/src/components/action-sheet/footer/index.tsx
@@ -1,5 +1,4 @@
 import classNames from 'classnames'
-import _isFunction from 'lodash/isFunction'
 import PropTypes, { InferProps } from 'prop-types'
 import { AtActionSheetFooterProps } from 'types/action-sheet'
 import { View } from '@tarojs/components'
@@ -13,7 +12,7 @@ export default class AtActionSheetFooter extends AtComponent<
   public static propTypes: InferProps<AtActionSheetFooterProps>
 
   private handleClick = (...args: any[]): void => {
-    if (_isFunction(this.props.onClick)) {
+    if (typeof this.props.onClick === 'function') {
       this.props.onClick(...args)
     }
   }
diff --git a/src/components/action-sheet/index.tsx b/src/components/action-sheet/index.tsx
@@ -1,5 +1,4 @@
 import classNames from 'classnames'
-import _isFunction from 'lodash/isFunction'
 import PropTypes, { InferProps } from 'prop-types'
 import { AtActionSheetProps, AtActionSheetState } from 'types/action-sheet'
 import { View } from '@tarojs/components'
@@ -38,13 +37,13 @@ export default class AtActionSheet extends AtComponent<
   }
 
   private handleClose = (): void => {
-    if (_isFunction(this.props.onClose)) {
+    if (typeof this.props.onClose === 'function') {
       this.props.onClose()
     }
   }
 
   private handleCancel = (): void => {
-    if (_isFunction(this.props.onCancel)) {
+    if (typeof this.props.onCancel === 'function') {
       return this.props.onCancel()
     }
     this.close()
diff --git a/src/components/badge/index.tsx b/src/components/badge/index.tsx
@@ -1,5 +1,4 @@
 import classNames from 'classnames'
-import isNaN from 'lodash/isNaN'
 import PropTypes, { InferProps } from 'prop-types'
 import { AtBadgeProps } from 'types/badge'
 import { View } from '@tarojs/components'
@@ -21,7 +20,7 @@ export default class AtBadge extends AtComponent<AtBadgeProps> {
   ): string | number {
     if (value === '' || value === null || value === undefined) return ''
     const numValue = +value
-    if (isNaN(numValue)) {
+    if (Number.isNaN(numValue)) {
       return value
     }
     return numValue > maxValue ? `${maxValue}+` : numValue
diff --git a/src/components/calendar/body/index.tsx b/src/components/calendar/body/index.tsx
@@ -10,7 +10,11 @@ import {
   Calendar
 } from 'types/calendar'
 import { Swiper, SwiperItem, View } from '@tarojs/components'
-import { BaseEvent, ITouch, ITouchEvent } from '@tarojs/components/types/common'
+import {
+  BaseEventOrig,
+  ITouch,
+  ITouchEvent
+} from '@tarojs/components/types/common'
 import Taro from '@tarojs/taro'
 import { delayQuerySelector } from '../../../common/utils'
 import generateCalendarGroup from '../common/helper'
@@ -220,7 +224,12 @@ export default class AtCalendarBody extends Taro.Component<
   }
 
   @bind
-  private handleChange(e: BaseEvent) {
+  private handleChange(
+    e: BaseEventOrig<{
+      current: number
+      source: string
+    }>
+  ) {
     const { current, source } = e.detail
 
     if (source === 'touch') {
diff --git a/src/components/calendar/index.tsx b/src/components/calendar/index.tsx
@@ -1,9 +1,6 @@
 import bind from 'bind-decorator'
 import classnames from 'classnames'
 import dayjs, { Dayjs } from 'dayjs'
-import _isFunction from 'lodash/isFunction'
-import _isObject from 'lodash/isObject'
-import _pick from 'lodash/pick'
 import {
   AtCalendarDefaultProps,
   AtCalendarProps,
@@ -12,7 +9,7 @@ import {
   Calendar
 } from 'types/calendar'
 import { View } from '@tarojs/components'
-import { BaseEvent } from '@tarojs/components/types/common'
+import { BaseEventOrig } from '@tarojs/components/types/common'
 import Taro from '@tarojs/taro'
 import AtCalendarBody from './body/index'
 import AtCalendarController from './controller/index'
@@ -174,7 +171,7 @@ export default class AtCalendar extends Taro.Component<
   private triggerChangeDate(value: Dayjs) {
     const { format } = this.props
 
-    if (!_isFunction(this.props.onMonthChange)) return
+    if (typeof this.props.onMonthChange !== 'function') return
 
     this.props.onMonthChange(value.format(format))
   }
@@ -189,7 +186,7 @@ export default class AtCalendar extends Taro.Component<
       generateDate: _generateDate.valueOf()
     })
 
-    if (vectorCount && _isFunction(this.props.onMonthChange)) {
+    if (vectorCount && typeof this.props.onMonthChange === 'function') {
       this.props.onMonthChange(_generateDate.format(format))
     }
   }
@@ -202,7 +199,7 @@ export default class AtCalendar extends Taro.Component<
 
     this.setMonth(-1)
 
-    if (_isFunction(this.props.onClickPreMonth)) {
+    if (typeof this.props.onClickPreMonth === 'function') {
       this.props.onClickPreMonth()
     }
   }
@@ -215,14 +212,14 @@ export default class AtCalendar extends Taro.Component<
 
     this.setMonth(1)
 
-    if (_isFunction(this.props.onClickNextMonth)) {
+    if (typeof this.props.onClickNextMonth === 'function') {
       this.props.onClickNextMonth()
     }
   }
 
   // picker 选择时间改变时触发
   @bind
-  handleSelectDate(e: BaseEvent & { detail: { value: string } }) {
+  handleSelectDate(e: BaseEventOrig<{ value: string }>) {
     const { value } = e.detail
 
     const _generateDate: Dayjs = dayjs(value)
@@ -257,14 +254,14 @@ export default class AtCalendar extends Taro.Component<
       this.handleSelectedDate()
     })
 
-    if (_isFunction(this.props.onDayClick)) {
+    if (typeof this.props.onDayClick === 'function') {
       this.props.onDayClick({ value: item.value })
     }
   }
 
   handleSelectedDate() {
     const selectDate = this.state.selectedDate
-    if (_isFunction(this.props.onSelectDate)) {
+    if (typeof this.props.onSelectDate === 'function') {
       const info: Calendar.SelectedDate = {
         start: dayjs(selectDate.start).format(this.props.format)
       }
@@ -281,7 +278,7 @@ export default class AtCalendar extends Taro.Component<
 
   @bind
   handleDayLongClick(item: Calendar.Item) {
-    if (_isFunction(this.props.onDayLongClick)) {
+    if (typeof this.props.onDayLongClick === 'function') {
       this.props.onDayLongClick({ value: item.value })
     }
   }
diff --git a/src/components/calendar/ui/date-list/index.tsx b/src/components/calendar/ui/date-list/index.tsx
@@ -1,6 +1,5 @@
 import bind from 'bind-decorator'
 import classnames from 'classnames'
-import _isFunction from 'lodash/isFunction'
 import { Calendar } from 'types/calendar'
 import { Text, View } from '@tarojs/components'
 import Taro from '@tarojs/taro'
@@ -25,14 +24,14 @@ export default class AtCalendarList extends Taro.Component<Props> {
 
   @bind
   handleClick(item) {
-    if (_isFunction(this.props.onClick)) {
+    if (typeof this.props.onClick === 'function') {
       this.props.onClick(item)
     }
   }
 
   @bind
   handleLongClick(item) {
-    if (_isFunction(this.props.onLongClick)) {
+    if (typeof this.props.onLongClick === 'function') {
       this.props.onLongClick(item)
     }
   }
diff --git a/src/components/card/index.tsx b/src/components/card/index.tsx
@@ -1,5 +1,4 @@
 import classNames from 'classnames'
-import _isFunction from 'lodash/isFunction'
 import PropTypes, { InferProps } from 'prop-types'
 import { AtCardProps } from 'types/card'
 import { Image, Text, View } from '@tarojs/components'
@@ -11,7 +10,7 @@ export default class AtCard extends AtComponent<AtCardProps> {
   public static propTypes: InferProps<AtCardProps>
 
   private handleClick = (args: any): void => {
-    if (_isFunction(this.props.onClick)) {
+    if (typeof this.props.onClick === 'function') {
       this.props.onClick(args)
     }
   }
diff --git a/src/components/fab/index.tsx b/src/components/fab/index.tsx
@@ -2,27 +2,30 @@ import classNames from 'classnames'
 import PropTypes, { InferProps } from 'prop-types'
 import { AtFabProps } from 'types/fab'
 import { View } from '@tarojs/components'
+import { CommonEvent } from '@tarojs/components/types/common'
 import Taro from '@tarojs/taro'
 import AtComponent from '../../common/component'
 
 export default class AtFab extends AtComponent<AtFabProps> {
   public static defaultProps: AtFabProps
   public static propTypes: InferProps<AtFabProps>
 
-  private onClick(): void {
-    this.props.onClick && this.props.onClick(arguments as any)
+  private onClick(e: CommonEvent): void {
+    if (typeof this.props.onClick === 'function') {
+      this.props.onClick(e)
+    }
   }
 
   public render(): JSX.Element {
-    const { size, className } = this.props
+    const { size, className, children } = this.props
 
     const rootClass = classNames('at-fab', className, {
       [`at-fab--${size}`]: size
     })
 
     return (
       <View className={rootClass} onClick={this.onClick.bind(this)}>
-        {this.props.children}
+        {children}
       </View>
     )
   }
diff --git a/src/components/float-layout/index.tsx b/src/components/float-layout/index.tsx
@@ -1,5 +1,4 @@
 import classNames from 'classnames'
-import _isFunction from 'lodash/isFunction'
 import PropTypes, { InferProps } from 'prop-types'
 import { AtFloatLayoutProps, AtFloatLayoutState } from 'types/float-layout'
 import { ScrollView, Text, View } from '@tarojs/components'
@@ -39,7 +38,7 @@ export default class AtFloatLayout extends AtComponent<
   }
 
   private handleClose = () => {
-    if (_isFunction(this.props.onClose)) {
+    if (typeof this.props.onClose === 'function') {
       // @ts-ignore // TODO: Fix typings
       this.props.onClose()
     }
diff --git a/src/components/grid/index.tsx b/src/components/grid/index.tsx
@@ -1,9 +1,7 @@
 import classNames from 'classnames'
 import _chunk from 'lodash/chunk'
-import _isFunction from 'lodash/isFunction'
-import _isObject from 'lodash/isObject'
 import PropTypes, { InferProps } from 'prop-types'
-import { AtGridProps, Item } from 'types/grid'
+import { AtGridItem, AtGridProps } from 'types/grid'
 import { Image, Text, View } from '@tarojs/components'
 import { CommonEvent } from '@tarojs/components/types/common'
 import Taro from '@tarojs/taro'
@@ -14,13 +12,13 @@ export default class AtGrid extends AtComponent<AtGridProps> {
   public static propTypes: InferProps<AtGridProps>
 
   private handleClick = (
-    item: Item,
+    item: AtGridItem,
     index: number,
     row: number,
     event: CommonEvent
   ): void => {
     const { onClick, columnNum } = this.props
-    if (_isFunction(onClick)) {
+    if (typeof onClick === 'function') {
       /* prettier-ignore */
       const clickIndex = (row * columnNum!) + index
       onClick(item, clickIndex, event)
@@ -68,7 +66,7 @@ export default class AtGrid extends AtComponent<AtGridProps> {
                           mode='scaleToFill'
                         />
                       )}
-                      {_isObject(childItem.iconInfo) && !childItem.image && (
+                      {childItem.iconInfo && !childItem.image && (
                         <Text
                           className={classNames(
                             childItem.iconInfo.prefixClass || 'at-icon',
diff --git a/src/components/indexes/index.tsx b/src/components/indexes/index.tsx
@@ -1,5 +1,4 @@
 import classNames from 'classnames'
-import _findIndex from 'lodash/findIndex'
 import PropTypes, { InferProps } from 'prop-types'
 import { AtIndexesProps, AtIndexesState, Item } from 'types/indexes'
 import { ScrollView, View } from '@tarojs/components'
@@ -104,7 +103,8 @@ export default class AtIndexes extends AtComponent<
 
   private __jumpTarget(key: string): void {
     const { list } = this.props
-    const index = _findIndex(list, ['key', key])
+    // const index = _findIndex(list, ['key', key])
+    const index = list.findIndex(item => item.key === key)
     const targetView = `at-indexes__list-${key}`
     this.jumpTarget(targetView, index + 1)
   }
diff --git a/src/components/list/item/index.tsx b/src/components/list/item/index.tsx
@@ -1,5 +1,4 @@
 import classNames from 'classnames'
-import _isFunction from 'lodash/isFunction'
 import PropTypes, { InferProps } from 'prop-types'
 import { AtListItemProps } from 'types/list'
 import { Image, Switch, Text, View } from '@tarojs/components'
@@ -13,7 +12,7 @@ export default class AtListItem extends AtComponent<AtListItemProps> {
   public static propTypes: InferProps<AtListItemProps>
 
   private handleClick = (event: ITouchEvent): void => {
-    if (_isFunction(this.props.onClick) && !this.props.disabled) {
+    if (typeof this.props.onClick === 'function' && !this.props.disabled) {
       this.props.onClick(event)
     }
   }
@@ -23,7 +22,10 @@ export default class AtListItem extends AtComponent<AtListItemProps> {
   }
 
   private handleSwitchChange = (event: CommonEvent): void => {
-    if (_isFunction(this.props.onSwitchChange) && !this.props.disabled) {
+    if (
+      typeof this.props.onSwitchChange === 'function' &&
+      !this.props.disabled
+    ) {
       this.props.onSwitchChange(event)
     }
   }
diff --git a/src/components/modal/index.tsx b/src/components/modal/index.tsx
@@ -1,5 +1,4 @@
 import classNames from 'classnames'
-import _isFunction from 'lodash/isFunction'
 import PropTypes, { InferProps } from 'prop-types'
 import { AtModalProps, AtModalState } from 'types/modal'
 import { Button, Text, View } from '@tarojs/components'
@@ -50,19 +49,19 @@ export default class AtModal extends AtComponent<AtModalProps, AtModalState> {
   }
 
   private handleClose = (event?: CommonEvent): void => {
-    if (_isFunction(this.props.onClose)) {
+    if (typeof this.props.onClose === 'function') {
       this.props.onClose(event!)
     }
   }
 
   private handleCancel = (event: CommonEvent): void => {
-    if (_isFunction(this.props.onCancel)) {
+    if (typeof this.props.onCancel === 'function') {
       this.props.onCancel(event)
     }
   }
 
   private handleConfirm = (event: CommonEvent): void => {
-    if (_isFunction(this.props.onConfirm)) {
+    if (typeof this.props.onConfirm === 'function') {
       this.props.onConfirm(event)
     }
   }
@@ -101,6 +100,7 @@ export default class AtModal extends AtComponent<AtModalProps, AtModalState> {
                 <View className='content-simple'>
                   {isWEB ? (
                     <Text
+                      // @ts-ignore
                       dangerouslySetInnerHTML={{
                         __html: content.replace(/\n/g, '<br/>')
                       }}
diff --git a/src/components/nav-bar/index.tsx b/src/components/nav-bar/index.tsx
diff --git a/src/components/swipe-action/index.tsx b/src/components/swipe-action/index.tsx
diff --git a/src/components/switch/index.tsx b/src/components/switch/index.tsx
diff --git a/src/components/toast/index.tsx b/src/components/toast/index.tsx

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import classNames from 'classnames'`
`2`		`-import _isFunction from 'lodash/isFunction'`
`3`	`2`	`import PropTypes, { InferProps } from 'prop-types'`
`4`	`3`	`import { AtActionSheetItemProps } from 'types/action-sheet'`
`5`	`4`	`import { View } from '@tarojs/components'`
`@@ -13,7 +12,7 @@ export default class AtActionSheetItem extends AtComponent<`
`13`	`12`	`public static propTypes: InferProps<AtActionSheetItemProps>`
`14`	`13`
`15`	`14`	`private handleClick = (args: any): void => {`
`16`		`- if (_isFunction(this.props.onClick)) {`
	`15`	`+ if (typeof this.props.onClick === 'function') {`
`17`	`16`	`this.props.onClick(args)`
`18`	`17`	`}`
`19`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`import bind from 'bind-decorator'`
`2`	`2`	`import classnames from 'classnames'`
`3`		`-import _isFunction from 'lodash/isFunction'`
`4`	`3`	`import { Calendar } from 'types/calendar'`
`5`	`4`	`import { Text, View } from '@tarojs/components'`
`6`	`5`	`import Taro from '@tarojs/taro'`
`@@ -25,14 +24,14 @@ export default class AtCalendarList extends Taro.Component<Props> {`
`25`	`24`
`26`	`25`	`@bind`
`27`	`26`	`handleClick(item) {`
`28`		`- if (_isFunction(this.props.onClick)) {`
	`27`	`+ if (typeof this.props.onClick === 'function') {`
`29`	`28`	`this.props.onClick(item)`
`30`	`29`	`}`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`@bind`
`34`	`33`	`handleLongClick(item) {`
`35`		`- if (_isFunction(this.props.onLongClick)) {`
	`34`	`+ if (typeof this.props.onLongClick === 'function') {`
`36`	`35`	`this.props.onLongClick(item)`
`37`	`36`	`}`
`38`	`37`	`}`