diff --git a/src/packages/animatingnumbers/countup.taro.tsx b/src/packages/animatingnumbers/countup.taro.tsx index 9a67b6affd..26f3a1ab9d 100644 --- a/src/packages/animatingnumbers/countup.taro.tsx +++ b/src/packages/animatingnumbers/countup.taro.tsx @@ -141,5 +141,5 @@ export const CountUp: FunctionComponent> = (props) => { ) } -CountUp.defaultProps = defaultProps +CountUp.defaultProps = defaultProps // 不可删除 CountUp.displayName = 'NutCountUp' diff --git a/src/packages/animatingnumbers/countup.tsx b/src/packages/animatingnumbers/countup.tsx index ae89582c1d..c54dc05d33 100644 --- a/src/packages/animatingnumbers/countup.tsx +++ b/src/packages/animatingnumbers/countup.tsx @@ -122,5 +122,5 @@ export const CountUp: FunctionComponent> = (props) => { ) } -CountUp.defaultProps = defaultProps +CountUp.defaultProps = defaultProps // 不可删除 CountUp.displayName = 'NutCountUp' diff --git a/src/packages/audio/audio.taro.tsx b/src/packages/audio/audio.taro.tsx index 021896a9bd..0ee6a0c1d7 100644 --- a/src/packages/audio/audio.taro.tsx +++ b/src/packages/audio/audio.taro.tsx @@ -88,20 +88,20 @@ export const Audio: FunctionComponent< audioCtx.autoplay = autoplay || false audioCtx.loop = loop || false audioCtx.onPause(() => { - props.onPause && props.onPause(audioCtx) + onPause?.(audioCtx) }) audioCtx.onEnded(() => { - if (props.loop) { + if (loop) { console.warn(locale.audio.tips || 'onPlayEnd事件在loop=false时才会触发') } else { - props.onPlayEnd && props.onPlayEnd(audioCtx) + onPlayEnd?.(audioCtx) } }) audioCtx.onPlay(() => { const { duration } = audioCtx setTotalSeconds(Math.floor(duration)) - props.onPlay && props.onPlay(audioCtx) + onPlay?.(audioCtx) }) audioCtx.onCanplay(() => { const intervalID = setInterval(function () { @@ -111,7 +111,7 @@ export const Audio: FunctionComponent< } }, 500) setIsCanPlay(true) - props.onCanPlay && props.onCanPlay(audioCtx) + onCanPlay?.(audioCtx) }) audioCtx.onTimeUpdate(() => { const time = parseInt(`${audioCtx.currentTime}`) @@ -146,7 +146,7 @@ export const Audio: FunctionComponent< statusRef.current.currentTime = Math.max(currentTime - 1, 0) setCurrentDuration(formatSeconds(statusRef.current.currentTime.toString())) audioCtx.seek(statusRef.current.currentTime) - props.onFastBack && props.onFastBack(audioCtx) + onFastBack?.(audioCtx) } const handleForward = () => { @@ -154,7 +154,7 @@ export const Audio: FunctionComponent< statusRef.current.currentTime = Math.min(currentTime + 1, audioCtx.duration) setCurrentDuration(formatSeconds(statusRef.current.currentTime.toString())) audioCtx.seek(statusRef.current.currentTime) - props.onForward && props.onForward(audioCtx) + onForward?.(audioCtx) } const handleStatusChange = () => { @@ -267,5 +267,4 @@ export const Audio: FunctionComponent< ) } -Audio.defaultProps = defaultProps Audio.displayName = 'NutAudio' diff --git a/src/packages/audio/audio.tsx b/src/packages/audio/audio.tsx index b7c4189cb9..0a6b7ab996 100644 --- a/src/packages/audio/audio.tsx +++ b/src/packages/audio/audio.tsx @@ -76,16 +76,16 @@ export const Audio: FunctionComponent< percent: 0, duration: '00:00:00', second: 0, - hanMuted: props.muted, - playing: props.autoPlay, + hanMuted: muted, + playing: autoPlay, handPlaying: false, }) const classPrefix = 'nut-audio' const handleEnded = (e: SyntheticEvent) => { - if (props.loop) { + if (loop) { console.warn(locale.audio.tips || 'onPlayEnd事件在loop=false时才会触发') } else { - props.onEnd && props.onEnd(e) + onEnd?.(e) } } @@ -130,25 +130,25 @@ export const Audio: FunctionComponent< if (statusRef.current.currentTime > 0 && AudioRef.current) { statusRef.current.currentTime-- AudioRef.current.currentTime = statusRef.current.currentTime - props.onBack && props.onBack(AudioRef.current) + onBack?.(AudioRef.current) } } const handleForward = () => { if (AudioRef.current) { statusRef.current.currentTime++ AudioRef.current.currentTime = statusRef.current.currentTime - props.onForward && props.onForward(AudioRef.current) + onForward?.(AudioRef.current) } } const handleMute = () => { if (AudioRef.current) { AudioRef.current.muted = !AudioRef.current.muted - props.onMute && props.onMute(AudioRef.current) + onMute?.(AudioRef.current) } } const handlePause = (e: SyntheticEvent) => { setPlaying(false) - props.onPause && props.onPause(e) + onPause?.(e) } const formatSeconds = (value: string) => { @@ -252,12 +252,12 @@ export const Audio: FunctionComponent< const handleCanplay = (e: SyntheticEvent) => { setIsCanPlay(true) - if (props.autoPlay && !playing) { + if (autoPlay && !playing) { AudioRef && AudioRef.current && AudioRef.current.play() } if (AudioRef.current) { statusRef.current.second = AudioRef.current.duration || 0 - props.onCanPlay && props.onCanPlay(e) + onCanPlay?.(e) } } const onTimeupdate = (e: SyntheticEvent) => { @@ -290,5 +290,4 @@ export const Audio: FunctionComponent< ) } -Audio.defaultProps = defaultProps Audio.displayName = 'NutAudio' diff --git a/src/packages/checkboxgroup/checkboxgroup.taro.tsx b/src/packages/checkboxgroup/checkboxgroup.taro.tsx index 3856929018..73a2e3ab32 100644 --- a/src/packages/checkboxgroup/checkboxgroup.taro.tsx +++ b/src/packages/checkboxgroup/checkboxgroup.taro.tsx @@ -47,15 +47,15 @@ export const CheckboxGroup = React.forwardRef( className, disabled, list, - onChange, value, defaultValue, max, min, - onLimit, labelPosition, direction, options, + onChange, + onLimit, ...rest } = { ...defaultProps, ...props } @@ -86,8 +86,8 @@ export const CheckboxGroup = React.forwardRef( })) const [_value, setValue] = usePropsValue({ - value: props.value, - defaultValue: props.defaultValue, + value, + defaultValue, finalValue: [] as string[], onChange, }) @@ -137,7 +137,7 @@ export const CheckboxGroup = React.forwardRef( className={classNames( classPrefix, { - [`nut-checkboxgroup-${props.direction}`]: props.direction, + [`nut-checkboxgroup-${direction}`]: direction, [`nut-checkboxgroup-list`]: list, }, className @@ -151,5 +151,4 @@ export const CheckboxGroup = React.forwardRef( } ) -CheckboxGroup.defaultProps = defaultProps CheckboxGroup.displayName = 'NutCheckboxGroup' diff --git a/src/packages/checkboxgroup/checkboxgroup.tsx b/src/packages/checkboxgroup/checkboxgroup.tsx index c9ecc9d80b..636545da48 100644 --- a/src/packages/checkboxgroup/checkboxgroup.tsx +++ b/src/packages/checkboxgroup/checkboxgroup.tsx @@ -47,15 +47,15 @@ export const CheckboxGroup = React.forwardRef( className, disabled, list, - onChange, value, defaultValue, max, min, - onLimit, labelPosition, direction, options, + onChange, + onLimit, ...rest } = { ...defaultProps, ...props } @@ -86,8 +86,8 @@ export const CheckboxGroup = React.forwardRef( })) const [_value, setValue] = usePropsValue({ - value: props.value, - defaultValue: props.defaultValue, + value, + defaultValue, finalValue: [] as string[], onChange, }) @@ -137,7 +137,7 @@ export const CheckboxGroup = React.forwardRef( className={classNames( classPrefix, { - [`nut-checkboxgroup-${props.direction}`]: props.direction, + [`nut-checkboxgroup-${direction}`]: direction, [`nut-checkboxgroup-list`]: list, }, className @@ -151,5 +151,4 @@ export const CheckboxGroup = React.forwardRef( } ) -CheckboxGroup.defaultProps = defaultProps CheckboxGroup.displayName = 'NutCheckboxGroup' diff --git a/src/packages/datepicker/datepicker.taro.tsx b/src/packages/datepicker/datepicker.taro.tsx index 6bfb3183ca..7ea74b5165 100644 --- a/src/packages/datepicker/datepicker.taro.tsx +++ b/src/packages/datepicker/datepicker.taro.tsx @@ -226,16 +226,15 @@ export const DatePicker: FunctionComponent< if (!isEqual) { setSelectedDate(formatValue(newDate as Date)) } - props.onChange && - props.onChange( - selectedOptions, - [ - String(newDate.getFullYear()), - String(newDate.getMonth() + 1), - String(newDate.getDate()), - ], - index - ) + onChange?.( + selectedOptions, + [ + String(newDate.getFullYear()), + String(newDate.getMonth() + 1), + String(newDate.getDate()), + ], + index + ) } } const handlePickerChange = ( @@ -350,8 +349,8 @@ export const DatePicker: FunctionComponent< pickerValue[columnIndex] = arr[index]?.value setPickerValue([...pickerValue]) - if (props.filter && props.filter(type, arr)) { - return props.filter(type, arr) + if (filter?.(type, arr)) { + return filter?.(type, arr) } return arr } @@ -428,5 +427,4 @@ export const DatePicker: FunctionComponent< ) } -DatePicker.defaultProps = defaultProps DatePicker.displayName = 'NutDatePicker' diff --git a/src/packages/datepicker/datepicker.tsx b/src/packages/datepicker/datepicker.tsx index 1cd851a52b..3528381302 100644 --- a/src/packages/datepicker/datepicker.tsx +++ b/src/packages/datepicker/datepicker.tsx @@ -226,16 +226,15 @@ export const DatePicker: FunctionComponent< if (!isEqual) { setSelectedDate(formatValue(newDate as Date)) } - props.onChange && - props.onChange( - selectedOptions, - [ - String(newDate.getFullYear()), - String(newDate.getMonth() + 1), - String(newDate.getDate()), - ], - index - ) + onChange?.( + selectedOptions, + [ + String(newDate.getFullYear()), + String(newDate.getMonth() + 1), + String(newDate.getDate()), + ], + index + ) } } const handlePickerChange = ( @@ -350,8 +349,8 @@ export const DatePicker: FunctionComponent< pickerValue[columnIndex] = arr[index]?.value setPickerValue([...pickerValue]) - if (props.filter && props.filter(type, arr)) { - return props.filter(type, arr) + if (filter?.(type, arr)) { + return filter?.(type, arr) } return arr } @@ -423,5 +422,4 @@ export const DatePicker: FunctionComponent< ) } -DatePicker.defaultProps = defaultProps DatePicker.displayName = 'NutDatePicker' diff --git a/src/packages/dialog/dialog.taro.tsx b/src/packages/dialog/dialog.taro.tsx index 24776cbfc1..ace7a0445d 100644 --- a/src/packages/dialog/dialog.taro.tsx +++ b/src/packages/dialog/dialog.taro.tsx @@ -225,7 +225,7 @@ export function close(selector: string) { customEvents.trigger(path, { status: false }) } -BaseDialog.defaultProps = defaultProps +BaseDialog.defaultProps = defaultProps // 不可删除 BaseDialog.displayName = 'NutDialog' BaseDialog.open = open BaseDialog.close = close diff --git a/src/packages/dialog/dialog.tsx b/src/packages/dialog/dialog.tsx index 9ec4a62ede..58e7c95e7f 100644 --- a/src/packages/dialog/dialog.tsx +++ b/src/packages/dialog/dialog.tsx @@ -161,5 +161,5 @@ Dialog.confirm = (props: DialogConfirmProps): DialogReturnProps => { } }) -Dialog.defaultProps = defaultProps +Dialog.defaultProps = defaultProps // 不可删除 Dialog.displayName = 'NutDialog' diff --git a/src/packages/dialog/dialogwrap.tsx b/src/packages/dialog/dialogwrap.tsx index 2e98bcb2b4..1ab9ec188c 100644 --- a/src/packages/dialog/dialogwrap.tsx +++ b/src/packages/dialog/dialogwrap.tsx @@ -78,5 +78,4 @@ export const DialogWrap: FunctionComponent< ) } -DialogWrap.defaultProps = defaultDialogProps DialogWrap.displayName = 'NutDialogWrap' diff --git a/src/packages/notify/notify.taro.tsx b/src/packages/notify/notify.taro.tsx index f1ced03da5..a4f25afeaa 100644 --- a/src/packages/notify/notify.taro.tsx +++ b/src/packages/notify/notify.taro.tsx @@ -130,7 +130,7 @@ export function close(selector: string) { customEvents.trigger(path, false) } -Notify.defaultProps = defaultProps +Notify.defaultProps = defaultProps // 不可删除 Notify.displayName = 'NutNotify' Notify.open = open Notify.close = close diff --git a/src/packages/pulltorefresh/pulltorefresh.taro.tsx b/src/packages/pulltorefresh/pulltorefresh.taro.tsx index a2dc9a8167..83ba9fdfcb 100644 --- a/src/packages/pulltorefresh/pulltorefresh.taro.tsx +++ b/src/packages/pulltorefresh/pulltorefresh.taro.tsx @@ -180,5 +180,4 @@ export const PullToRefresh: FunctionComponent> = ( ) } -PullToRefresh.defaultProps = defaultProps PullToRefresh.displayName = 'NutPullToRefresh' diff --git a/src/packages/pulltorefresh/pulltorefresh.tsx b/src/packages/pulltorefresh/pulltorefresh.tsx index b747b5d547..50a39c263f 100644 --- a/src/packages/pulltorefresh/pulltorefresh.tsx +++ b/src/packages/pulltorefresh/pulltorefresh.tsx @@ -226,5 +226,4 @@ export const PullToRefresh: FunctionComponent> = ( ) } -PullToRefresh.defaultProps = defaultProps PullToRefresh.displayName = 'NutPullToRefresh' diff --git a/src/packages/radio/radio.taro.tsx b/src/packages/radio/radio.taro.tsx index 51ce4022c0..86656aea4d 100644 --- a/src/packages/radio/radio.taro.tsx +++ b/src/packages/radio/radio.taro.tsx @@ -172,6 +172,5 @@ export const Radio: FunctionComponent< ) } -Radio.defaultProps = defaultProps Radio.displayName = 'NutRadio' Radio.Group = RadioGroup diff --git a/src/packages/radio/radio.tsx b/src/packages/radio/radio.tsx index 7f79b71c1b..42daba2b96 100644 --- a/src/packages/radio/radio.tsx +++ b/src/packages/radio/radio.tsx @@ -168,6 +168,5 @@ export const Radio: FunctionComponent< ) } -Radio.defaultProps = defaultProps Radio.displayName = 'NutRadio' Radio.Group = RadioGroup diff --git a/src/packages/radiogroup/radiogroup.taro.tsx b/src/packages/radiogroup/radiogroup.taro.tsx index 1b1ecaad57..8548414972 100644 --- a/src/packages/radiogroup/radiogroup.taro.tsx +++ b/src/packages/radiogroup/radiogroup.taro.tsx @@ -106,5 +106,4 @@ export const RadioGroup = React.forwardRef( } ) -RadioGroup.defaultProps = defaultProps RadioGroup.displayName = 'NutRadioGroup' diff --git a/src/packages/radiogroup/radiogroup.tsx b/src/packages/radiogroup/radiogroup.tsx index 69b2b35f77..0df2c66f60 100644 --- a/src/packages/radiogroup/radiogroup.tsx +++ b/src/packages/radiogroup/radiogroup.tsx @@ -106,5 +106,4 @@ export const RadioGroup = React.forwardRef( } ) -RadioGroup.defaultProps = defaultProps RadioGroup.displayName = 'NutRadioGroup' diff --git a/src/packages/swipe/swipe.taro.tsx b/src/packages/swipe/swipe.taro.tsx index b9cd5edab5..c8e1c88ee8 100644 --- a/src/packages/swipe/swipe.taro.tsx +++ b/src/packages/swipe/swipe.taro.tsx @@ -108,7 +108,6 @@ export const Swipe = forwardRef< transitionDuration: state.dragging ? '0s' : '.6s', } const leftWidth = actionWidth.left - const rightWidth = actionWidth.right const onTouchStart = async (event: BaseEventOrig) => { @@ -275,5 +274,4 @@ export const Swipe = forwardRef< ) }) -Swipe.defaultProps = defaultProps Swipe.displayName = 'NutSwipe' diff --git a/src/packages/swipe/swipe.tsx b/src/packages/swipe/swipe.tsx index aded5680a5..74872b846f 100644 --- a/src/packages/swipe/swipe.tsx +++ b/src/packages/swipe/swipe.tsx @@ -270,5 +270,4 @@ export const Swipe = forwardRef< ) }) -Swipe.defaultProps = defaultProps Swipe.displayName = 'NutSwipe' diff --git a/src/packages/swiper/swiper.taro.tsx b/src/packages/swiper/swiper.taro.tsx index 8e07a00588..69e3b5d63a 100644 --- a/src/packages/swiper/swiper.taro.tsx +++ b/src/packages/swiper/swiper.taro.tsx @@ -167,5 +167,4 @@ export const Swiper = forwardRef((props: Partial, ref) => { ) }) -Swiper.defaultProps = defaultProps Swiper.displayName = 'NutSwiper' diff --git a/src/packages/swiper/swiper.tsx b/src/packages/swiper/swiper.tsx index 853ca00bd7..da370c5278 100644 --- a/src/packages/swiper/swiper.tsx +++ b/src/packages/swiper/swiper.tsx @@ -315,5 +315,5 @@ export const Swiper = React.forwardRef>( ) } ) -Swiper.defaultProps = defaultProps + Swiper.displayName = 'NutSwiper' diff --git a/src/packages/swiperitem/swiperitem.taro.tsx b/src/packages/swiperitem/swiperitem.taro.tsx index af633ac97c..8b52bb3b2f 100644 --- a/src/packages/swiperitem/swiperitem.taro.tsx +++ b/src/packages/swiperitem/swiperitem.taro.tsx @@ -17,5 +17,4 @@ export const SwiperItem: FunctionComponent> = ( const { children, ...rest } = props return <>{children} } -SwiperItem.defaultProps = defaultProps SwiperItem.displayName = 'NutSwiperItem' diff --git a/src/packages/swiperitem/swiperitem.tsx b/src/packages/swiperitem/swiperitem.tsx index 728311818a..38e171b577 100644 --- a/src/packages/swiperitem/swiperitem.tsx +++ b/src/packages/swiperitem/swiperitem.tsx @@ -21,5 +21,4 @@ export const SwiperItem = (props: SwiperItemProps) => { ) } -SwiperItem.defaultProps = defaultProps SwiperItem.displayName = 'NutSwiperItem' diff --git a/src/packages/toast/toast.taro.tsx b/src/packages/toast/toast.taro.tsx index 9956997a7b..9ae3723fd8 100644 --- a/src/packages/toast/toast.taro.tsx +++ b/src/packages/toast/toast.taro.tsx @@ -222,7 +222,7 @@ export function hide(selector: string) { customEvents.trigger(path, { status: false }) } -Toast.defaultProps = defaultProps +Toast.defaultProps = defaultProps // 不可删除 Toast.displayName = 'NutToast' Toast.show = show Toast.hide = hide