@@ -16,7 +16,8 @@ export { OverflowContext } from './context';
1616
1717export type { ComponentType } from './RawItem' ;
1818
19- export interface OverflowProps < ItemType > extends Omit < React . HTMLAttributes < any > , 'prefix' > {
19+ export interface OverflowProps < ItemType >
20+ extends Omit < React . HTMLAttributes < any > , 'prefix' > {
2021 prefixCls ?: string ;
2122 className ?: string ;
2223 style ?: React . CSSProperties ;
@@ -377,26 +378,19 @@ function Overflow<ItemType = any>(
377378
378379 const mergedRenderRest = renderRest || defaultRenderRest ;
379380
380- const restNode = renderRawRest ? (
381- < OverflowContext . Provider
382- value = { {
383- ...itemSharedProps ,
384- ...restContextProps ,
385- } }
386- >
387- { renderRawRest ( omittedItems ) }
388- </ OverflowContext . Provider >
389- ) : (
390- < Item
391- { ...itemSharedProps }
392- // When not show, order should be the last
393- { ...restContextProps }
394- >
395- { typeof mergedRenderRest === 'function'
396- ? mergedRenderRest ( omittedItems )
397- : mergedRenderRest }
398- </ Item >
399- ) ;
381+ const restNode = renderRawRest ? (
382+ < OverflowContext . Provider
383+ value = { { ...itemSharedProps , ...restContextProps } }
384+ >
385+ { renderRawRest ( omittedItems ) }
386+ </ OverflowContext . Provider >
387+ ) : (
388+ < Item { ...itemSharedProps } { ...restContextProps } >
389+ { typeof mergedRenderRest === 'function'
390+ ? mergedRenderRest ( omittedItems )
391+ : mergedRenderRest }
392+ </ Item >
393+ ) ;
400394
401395 const overflowNode = (
402396 < Component
@@ -447,7 +441,9 @@ function Overflow<ItemType = any>(
447441 < ResizeObserver onResize = { onOverflowResize } disabled = { ! shouldResponsive } >
448442 { overflowNode }
449443 </ ResizeObserver >
450- ) : overflowNode ;
444+ ) : (
445+ overflowNode
446+ ) ;
451447}
452448
453449const ForwardOverflow = React . forwardRef ( Overflow ) ;
@@ -465,11 +461,13 @@ type FilledOverflowType = ForwardOverflowType & {
465461 INVALIDATE : typeof INVALIDATE ;
466462} ;
467463
468- ForwardOverflow . displayName = 'Overflow' ;
469-
470464( ForwardOverflow as unknown as FilledOverflowType ) . Item = RawItem ;
471465( ForwardOverflow as unknown as FilledOverflowType ) . RESPONSIVE = RESPONSIVE ;
472466( ForwardOverflow as unknown as FilledOverflowType ) . INVALIDATE = INVALIDATE ;
473467
468+ if ( process . env . NODE_ENV !== 'production' ) {
469+ ForwardOverflow . displayName = 'Overflow' ;
470+ }
471+
474472// Convert to generic type
475473export default ForwardOverflow as unknown as FilledOverflowType ;
0 commit comments