Skip to content

Commit 18012b7

Browse files
authored
feat: showMore message add event info (jquense#2496)
* feat: showMore message add event info * feat: add remaining events and all events in day --------- authored-by: mutao.zht <[email protected]>
1 parent 0eda44e commit 18012b7

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

src/EventEndingRow.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import range from 'lodash/range'
77

88
let isSegmentInSlot = (seg, slot) => seg.left <= slot && seg.right >= slot
99
let eventsInSlot = (segments, slot) =>
10-
segments.filter((seg) => isSegmentInSlot(seg, slot)).length
10+
segments.filter((seg) => isSegmentInSlot(seg, slot)).map((seg) => seg.event)
1111

1212
class EventEndingRow extends React.Component {
1313
render() {
@@ -68,24 +68,25 @@ class EventEndingRow extends React.Component {
6868
let { segments } = this.props
6969

7070
return range(slot, slot + span).every((s) => {
71-
let count = eventsInSlot(segments, s)
71+
const count = eventsInSlot(segments, s).length
7272

7373
return count === 1
7474
})
7575
}
7676

7777
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
8182
return count ? (
8283
<button
8384
type="button"
8485
key={'sm_' + slot}
8586
className={clsx('rbc-button-link', 'rbc-show-more')}
8687
onClick={(e) => this.showMore(slot, e)}
8788
>
88-
{localizer.messages.showMore(count)}
89+
{localizer.messages.showMore(count, remainingEvents, events)}
8990
</button>
9091
) : (
9192
false

stories/props/messages.mdx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@ defualts
2727
agenda: 'Agenda',
2828

2929
noEventsInRange: 'There are no events in this range.',
30-
31-
showMore: total => `+${total} more`,
30+
/**
31+
* params {total} count of remaining events
32+
* params {remainingEvents} remaining events
33+
* params {events} all events in day
34+
*/
35+
showMore: (total, remainingEvents, events) => `+${total} más`,
3236
}
3337
```
3438

0 commit comments

Comments
 (0)