From 74a22335995d7983af62262624a16d35941f6bfe Mon Sep 17 00:00:00 2001 From: Sarah <32873807+sarahdmsi@users.noreply.github.com> Date: Fri, 5 Jul 2019 10:15:11 -0500 Subject: [PATCH] feat: added continuesPrior and continuesAfter props to Event component (#1201) * Added continuesPrior and continuesAfter props to Event component * Added slot metrics to custom Events & EventWrappers --- src/EventCell.js | 6 ++++++ src/EventRowMixin.js | 4 +++- src/Popup.js | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/EventCell.js b/src/EventCell.js index c68d1952f..99f455359 100644 --- a/src/EventCell.js +++ b/src/EventCell.js @@ -20,6 +20,8 @@ class EventCell extends React.Component { getters, children, components: { event: Event, eventWrapper: EventWrapper }, + slotStart, + slotEnd, ...props } = this.props @@ -39,9 +41,13 @@ class EventCell extends React.Component { {Event ? ( ) : ( title diff --git a/src/EventRowMixin.js b/src/EventRowMixin.js index 5e9221715..6c2efb81a 100644 --- a/src/EventRowMixin.js +++ b/src/EventRowMixin.js @@ -52,13 +52,15 @@ export default { onDoubleClick={onDoubleClick} continuesPrior={continuesPrior} continuesAfter={continuesAfter} + slotStart={slotMetrics.first} + slotEnd={slotMetrics.last} selected={isSelected(event, selected)} /> ) }, renderSpan(slots, len, key, content = ' ') { - let per = Math.abs(len) / slots * 100 + '%' + let per = (Math.abs(len) / slots) * 100 + '%' return (
))}