Skip to content
This repository was archived by the owner on May 19, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions src/Calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,21 @@ class Calendar extends Component {
const { styles } = this;

return (
<div style={styles['MonthAndYear']}>
<div style={styles['MonthAndYear']} className='rdr-MonthAndYear-innerWrapper'>
<button
style={{ ...styles['MonthButton'], float : 'left' }}
className='rdr-MonthAndYear-button prev'
onClick={this.changeMonth.bind(this, -1, false)}>
<i style={{ ...styles['MonthArrow'], ...styles['MonthArrowPrev'] }}></i>
</button>
<span>{month} - {year}</span>
<span>
<span className='rdr-MonthAndYear-month'>{month}</span>
<span className='rdr-MonthAndYear-divider'> - </span>
<span className='rdr-MonthAndYear-year'>{year}</span>
</span>
<button
style={{ ...styles['MonthButton'], float : 'right' }}
className='rdr-MonthAndYear-button next'
onClick={this.changeMonth.bind(this, +1, false)}>
<i style={{ ...styles['MonthArrow'], ...styles['MonthArrowNext'] }}></i>
</button>
Expand All @@ -109,7 +115,7 @@ class Calendar extends Component {
const day = moment.weekdaysMin(i);

weekdays.push(
<span style={styles['Weekday']} key={day}>{day}</span>
<span style={styles['Weekday']} className='rdr-WeekDay' key={day}>{day}</span>
);
}

Expand Down Expand Up @@ -181,10 +187,10 @@ class Calendar extends Component {
const { styles } = this;

return (
<div style={{ ...styles['Calendar'], ...this.props.style }}>
<div>{ this.renderMonthAndYear() }</div>
<div>{ this.renderWeekdays() }</div>
<div>{ this.renderDays() }</div>
<div style={{ ...styles['Calendar'], ...this.props.style }} className='rdr-Calendar'>
<div className='rdr-MonthAndYear'>{ this.renderMonthAndYear() }</div>
<div className='rdr-WeekDays'>{ this.renderWeekdays() }</div>
<div className='rdr-Days'>{ this.renderDays() }</div>
</div>
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/DateRange.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class DateRange extends Component {
const { styles } = this;

return (
<div style={{ ...styles['DateRange'], ...style }}>
<div style={{ ...styles['DateRange'], ...style }} className='rdr-DateRange'>
{ ranges && (
<PredefinedRanges
format={ format }
Expand Down
14 changes: 14 additions & 0 deletions src/DayCell.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,23 @@ class DayCell extends Component {
};
}

getClassNames() {
const { isSelected, isInRange, isPassive } = this.props;

let classNames = 'rdr-Day ';

classNames = (isSelected) ? classNames + 'is-selected ' : classNames;
classNames = (isInRange) ? classNames + 'is-inRange ' : classNames;
classNames = (isPassive) ? classNames + 'is-passive ' : classNames;

return classNames;
}

render() {
const { styles } = this;
const { dayMoment } = this.props;
const stateStyle = this.getStateStyles();
const classNames = this.getClassNames();

return (
<span
Expand All @@ -79,6 +92,7 @@ class DayCell extends Component {
onMouseDown={ this.handleMouseEvent.bind(this) }
onMouseUp={ this.handleMouseEvent.bind(this) }
onClick={ this.handleSelect.bind(this) }
className={ classNames }
style={{...styles['Day'], ...stateStyle}}>
{ dayMoment.date() }
</span>
Expand Down
3 changes: 2 additions & 1 deletion src/PredefinedRanges.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class PredefinedRanges extends Component {
<a
href='#'
key={'range-' + name}
className='rdr-PredefinedRangeItem'
style={styles['PredefinedRangeItem']}
onClick={this.handleSelect.bind(this, name)}>
{name}
Expand All @@ -44,7 +45,7 @@ class PredefinedRanges extends Component {
const { styles } = this;

return (
<div style={{ ...styles['PredefinedRanges'], ...style }}>
<div style={{ ...styles['PredefinedRanges'], ...style }} className='rdr-PredefinedRanges'>
{this.renderRangeList()}
</div>
);
Expand Down