@@ -357,18 +357,25 @@ function Overflow<ItemType = any>(
357357 } ;
358358
359359 // >>>>> Rest node
360- let restNode : React . ReactNode ;
361360 const restContextProps = {
362361 order : displayRest ? mergedDisplayCount : Number . MAX_SAFE_INTEGER ,
363362 className : `${ itemPrefixCls } -rest` ,
364363 registerSize : registerOverflowSize ,
365364 display : displayRest ,
366365 } ;
367366
368- if ( ! renderRawRest ) {
369- const mergedRenderRest = renderRest || defaultRenderRest ;
367+ const mergedRenderRest = renderRest || defaultRenderRest ;
370368
371- restNode = (
369+ const restNode = renderRawRest ? (
370+ < OverflowContext . Provider
371+ value = { {
372+ ...itemSharedProps ,
373+ ...restContextProps ,
374+ } }
375+ >
376+ { renderRawRest ( omittedItems ) }
377+ </ OverflowContext . Provider >
378+ ) : (
372379 < Item
373380 { ...itemSharedProps }
374381 // When not show, order should be the last
@@ -379,20 +386,8 @@ function Overflow<ItemType = any>(
379386 : mergedRenderRest }
380387 </ Item >
381388 ) ;
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- }
394389
395- let overflowNode = (
390+ const overflowNode = (
396391 < Component
397392 className = { classNames ( ! invalidate && prefixCls , className ) }
398393 style = { style }
@@ -422,15 +417,11 @@ function Overflow<ItemType = any>(
422417 </ Component >
423418 ) ;
424419
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 ;
434425}
435426
436427const ForwardOverflow = React . forwardRef ( Overflow ) ;
0 commit comments