@@ -7,7 +7,7 @@ import range from 'lodash/range'
7
7
8
8
let isSegmentInSlot = ( seg , slot ) => seg . left <= slot && seg . right >= slot
9
9
let eventsInSlot = ( segments , slot ) =>
10
- segments . filter ( ( seg ) => isSegmentInSlot ( seg , slot ) ) . length
10
+ segments . filter ( ( seg ) => isSegmentInSlot ( seg , slot ) ) . map ( ( seg ) => seg . event )
11
11
12
12
class EventEndingRow extends React . Component {
13
13
render ( ) {
@@ -68,24 +68,25 @@ class EventEndingRow extends React.Component {
68
68
let { segments } = this . props
69
69
70
70
return range ( slot , slot + span ) . every ( ( s ) => {
71
- let count = eventsInSlot ( segments , s )
71
+ const count = eventsInSlot ( segments , s ) . length
72
72
73
73
return count === 1
74
74
} )
75
75
}
76
76
77
77
renderShowMore ( segments , slot ) {
78
- let { localizer } = this . props
79
- let count = eventsInSlot ( segments , slot )
80
-
78
+ let { localizer, slotMetrics } = this . props
79
+ const events = slotMetrics . getEventsForSlot ( slot )
80
+ const remainingEvents = eventsInSlot ( segments , slot )
81
+ const count = remainingEvents . length
81
82
return count ? (
82
83
< button
83
84
type = "button"
84
85
key = { 'sm_' + slot }
85
86
className = { clsx ( 'rbc-button-link' , 'rbc-show-more' ) }
86
87
onClick = { ( e ) => this . showMore ( slot , e ) }
87
88
>
88
- { localizer . messages . showMore ( count ) }
89
+ { localizer . messages . showMore ( count , remainingEvents , events ) }
89
90
</ button >
90
91
) : (
91
92
false
0 commit comments