@@ -357,18 +357,25 @@ function Overflow<ItemType = any>(
357
357
} ;
358
358
359
359
// >>>>> Rest node
360
- let restNode : React . ReactNode ;
361
360
const restContextProps = {
362
361
order : displayRest ? mergedDisplayCount : Number . MAX_SAFE_INTEGER ,
363
362
className : `${ itemPrefixCls } -rest` ,
364
363
registerSize : registerOverflowSize ,
365
364
display : displayRest ,
366
365
} ;
367
366
368
- if ( ! renderRawRest ) {
369
- const mergedRenderRest = renderRest || defaultRenderRest ;
367
+ const mergedRenderRest = renderRest || defaultRenderRest ;
370
368
371
- restNode = (
369
+ const restNode = renderRawRest ? (
370
+ < OverflowContext . Provider
371
+ value = { {
372
+ ...itemSharedProps ,
373
+ ...restContextProps ,
374
+ } }
375
+ >
376
+ { renderRawRest ( omittedItems ) }
377
+ </ OverflowContext . Provider >
378
+ ) : (
372
379
< Item
373
380
{ ...itemSharedProps }
374
381
// When not show, order should be the last
@@ -379,20 +386,8 @@ function Overflow<ItemType = any>(
379
386
: mergedRenderRest }
380
387
</ Item >
381
388
) ;
382
- } else if ( renderRawRest ) {
383
- restNode = (
384
- < OverflowContext . Provider
385
- value = { {
386
- ...itemSharedProps ,
387
- ...restContextProps ,
388
- } }
389
- >
390
- { renderRawRest ( omittedItems ) }
391
- </ OverflowContext . Provider >
392
- ) ;
393
- }
394
389
395
- let overflowNode = (
390
+ const overflowNode = (
396
391
< Component
397
392
className = { classNames ( ! invalidate && prefixCls , className ) }
398
393
style = { style }
@@ -422,15 +417,11 @@ function Overflow<ItemType = any>(
422
417
</ Component >
423
418
) ;
424
419
425
- if ( isResponsive ) {
426
- overflowNode = (
427
- < ResizeObserver onResize = { onOverflowResize } disabled = { ! shouldResponsive } >
428
- { overflowNode }
429
- </ ResizeObserver >
430
- ) ;
431
- }
432
-
433
- return overflowNode ;
420
+ return isResponsive ? (
421
+ < ResizeObserver onResize = { onOverflowResize } disabled = { ! shouldResponsive } >
422
+ { overflowNode }
423
+ </ ResizeObserver >
424
+ ) : overflowNode ;
434
425
}
435
426
436
427
const ForwardOverflow = React . forwardRef ( Overflow ) ;
0 commit comments