From 6b2d8203168306e6d7d02f26c9c4654e8c8832c1 Mon Sep 17 00:00:00 2001 From: Evan Morikawa Date: Wed, 6 Apr 2016 12:08:05 -0700 Subject: [PATCH] fix(scheduler): fix top banner --- .../lib/calendar/proposed-time-picker.jsx | 7 +++++++ src/components/nylas-calendar/nylas-calendar.jsx | 13 +++++++++++++ src/components/nylas-calendar/top-banner.jsx | 9 ++++++++- src/components/nylas-calendar/week-view.jsx | 10 ++++------ 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/internal_packages/N1-Scheduler/lib/calendar/proposed-time-picker.jsx b/internal_packages/N1-Scheduler/lib/calendar/proposed-time-picker.jsx index 88ec63f6f..b23eb44f0 100644 --- a/internal_packages/N1-Scheduler/lib/calendar/proposed-time-picker.jsx +++ b/internal_packages/N1-Scheduler/lib/calendar/proposed-time-picker.jsx @@ -45,6 +45,12 @@ export default class ProposedTimePicker extends React.Component { return new ProposedTimeCalendarDataSource() } + _bannerComponents = () => { + return { + week: "Click and drag to propose times." + } + } + _footerComponents = () => { return { week: [this._leftFooterComponents(), this._rightFooterComponents()], @@ -114,6 +120,7 @@ export default class ProposedTimePicker extends React.Component { return ( - This is the top banner + {this.props.bannerComponents} ) } diff --git a/src/components/nylas-calendar/week-view.jsx b/src/components/nylas-calendar/week-view.jsx index 47c94165d..85966ceaf 100644 --- a/src/components/nylas-calendar/week-view.jsx +++ b/src/components/nylas-calendar/week-view.jsx @@ -31,6 +31,7 @@ export default class WeekView extends React.Component { static propTypes = { dataSource: React.PropTypes.instanceOf(CalendarDataSource).isRequired, currentMoment: React.PropTypes.instanceOf(moment).isRequired, + bannerComponents: React.PropTypes.node, headerComponents: React.PropTypes.node, footerComponents: React.PropTypes.node, changeCurrentView: React.PropTypes.func, @@ -42,6 +43,7 @@ export default class WeekView extends React.Component { static defaultProps = { changeCurrentView: () => {}, + bannerComponents: false, headerComponents: false, footerComponents: false, } @@ -232,11 +234,7 @@ export default class WeekView extends React.Component { Today ); - const right = ( - - ); + const right = false return [left, right, this.props.headerComponents] } @@ -396,7 +394,7 @@ export default class WeekView extends React.Component { onCalendarMouseDown={this.props.onCalendarMouseDown} onCalendarMouseMove={this.props.onCalendarMouseMove} > - +