From 9704a49bf1ed3a5332465921d8db76eddb282fd0 Mon Sep 17 00:00:00 2001 From: "mutao.zht" Date: Fri, 2 Feb 2024 15:25:05 +0800 Subject: [PATCH 1/2] feat: showMore message add event info --- src/EventEndingRow.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EventEndingRow.js b/src/EventEndingRow.js index fd2d8a699..910c4d969 100644 --- a/src/EventEndingRow.js +++ b/src/EventEndingRow.js @@ -85,7 +85,7 @@ class EventEndingRow extends React.Component { className={clsx('rbc-button-link', 'rbc-show-more')} onClick={(e) => this.showMore(slot, e)} > - {localizer.messages.showMore(count)} + {localizer.messages.showMore(count, slot)} ) : ( false From f608e45de4c4af816a5c49811493d7194fcc6e31 Mon Sep 17 00:00:00 2001 From: "mutao.zht" Date: Sun, 4 Feb 2024 11:18:01 +0800 Subject: [PATCH 2/2] feat: add remaining events and all events in day --- src/EventEndingRow.js | 13 +++++++------ stories/props/messages.mdx | 8 ++++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/EventEndingRow.js b/src/EventEndingRow.js index 910c4d969..fc32457a7 100644 --- a/src/EventEndingRow.js +++ b/src/EventEndingRow.js @@ -7,7 +7,7 @@ import range from 'lodash/range' let isSegmentInSlot = (seg, slot) => seg.left <= slot && seg.right >= slot let eventsInSlot = (segments, slot) => - segments.filter((seg) => isSegmentInSlot(seg, slot)).length + segments.filter((seg) => isSegmentInSlot(seg, slot)).map((seg) => seg.event) class EventEndingRow extends React.Component { render() { @@ -68,16 +68,17 @@ class EventEndingRow extends React.Component { let { segments } = this.props return range(slot, slot + span).every((s) => { - let count = eventsInSlot(segments, s) + const count = eventsInSlot(segments, s).length return count === 1 }) } renderShowMore(segments, slot) { - let { localizer } = this.props - let count = eventsInSlot(segments, slot) - + let { localizer, slotMetrics } = this.props + const events = slotMetrics.getEventsForSlot(slot) + const remainingEvents = eventsInSlot(segments, slot) + const count = remainingEvents.length return count ? ( ) : ( false diff --git a/stories/props/messages.mdx b/stories/props/messages.mdx index 2bd0e8be1..d23cbd4b1 100644 --- a/stories/props/messages.mdx +++ b/stories/props/messages.mdx @@ -27,8 +27,12 @@ defualts agenda: 'Agenda', noEventsInRange: 'There are no events in this range.', - - showMore: total => `+${total} more`, + /** + * params {total} count of remaining events + * params {remainingEvents} remaining events + * params {events} all events in day + */ + showMore: (total, remainingEvents, events) => `+${total} más`, } ```