From af4707a239bfd9bcb429c3526adf3bc61a17f8f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?= Date: Fri, 8 Dec 2023 15:19:12 +0800 Subject: [PATCH] refactor: rename onCalendarChange to onSelect --- src/NewPicker/PickerPanel/index.tsx | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/NewPicker/PickerPanel/index.tsx b/src/NewPicker/PickerPanel/index.tsx index bc4bc0c0b..60a1a75e9 100644 --- a/src/NewPicker/PickerPanel/index.tsx +++ b/src/NewPicker/PickerPanel/index.tsx @@ -179,22 +179,14 @@ function PickerPanel( // >>> CalendarValue // CalendarValue is a temp value for user operation // which will only trigger `onCalendarChange` but not `onChange` - const [calendarValue, setCalendarValue] = React.useState(mergedValue); - const updateCalendarValue = (newDate: DateType) => { - setCalendarValue(newDate); - + const onInternalSelect = (newDate: DateType) => { onSelect?.(newDate); if (mergedMode === picker) { - // setMergedValue(newDate); triggerChange(newDate); } }; - React.useEffect(() => { - setCalendarValue(mergedValue); - }, [mergedValue]); - // >>> PickerValue // PickerValue is used to control the current displaying panel const [mergedPickerValue, setInternalPickerValue] = useMergedState( @@ -221,7 +213,7 @@ function PickerPanel( }; const onPanelValueChange = (newVal: DateType) => { - updateCalendarValue(newVal); + onInternalSelect(newVal); setPickerValue(newVal); // Update mode if needed @@ -285,7 +277,7 @@ function PickerPanel( // Value pickerValue={mergedPickerValue} onPickerValueChange={setPickerValue} - value={calendarValue} + value={mergedValue} onChange={onPanelValueChange} // Render cellRender={cellRender}