File tree Expand file tree Collapse file tree 1 file changed +13
-10
lines changed Expand file tree Collapse file tree 1 file changed +13
-10
lines changed Original file line number Diff line number Diff line change @@ -224,19 +224,22 @@ function PickerPanel<DateType>(props: PickerPanelProps<DateType>) {
224224 return nextMode ;
225225 } ;
226226
227- const [ innerMode , setInnerMode ] = React . useState < PanelMode > ( ( ) => {
228- if ( picker === 'time' ) {
229- return 'time' ;
230- }
231- return getInternalNextMode ( 'date' ) ;
232- } ) ;
233-
234227 // Save panel is changed from which panel
235- const [ sourceMode , setSourceMode ] = React . useState < PanelMode > (
236- ( ) => innerMode ,
228+ const [ mergedMode , setInnerMode ] = useMergedState (
229+ ( ) => {
230+ if ( picker === 'time' ) {
231+ return 'time' ;
232+ }
233+ return getInternalNextMode ( 'date' ) ;
234+ } ,
235+ {
236+ value : mode ,
237+ } ,
237238 ) ;
238239
239- const mergedMode : PanelMode = mode || innerMode ;
240+ const [ sourceMode , setSourceMode ] = React . useState < PanelMode > (
241+ ( ) => mergedMode ,
242+ ) ;
240243
241244 const onInternalPanelChange = ( newMode : PanelMode , viewValue : DateType ) => {
242245 const nextMode = getInternalNextMode ( newMode ) ;
You can’t perform that action at this time.
0 commit comments