Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

renderWeekDay property #172

Merged
merged 1 commit into from
Jun 2, 2016
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
2 changes: 2 additions & 0 deletions DayPicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
var DayPicker = require('./lib/DayPicker');
var DateUtils = require('./lib/DateUtils');
var LocaleUtils = require('./lib/LocaleUtils');
var Weekday = require('./lib/Weekday');

module.exports = DayPicker.default || DayPicker;
module.exports.DateUtils = DateUtils.default || DateUtils;
module.exports.LocaleUtils = LocaleUtils.default || LocaleUtils;
module.exports.WeekdayPropTypes = Weekday.WeekdayPropTypes;
2 changes: 1 addition & 1 deletion dist/DayPicker.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/DayPicker.js.map

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions docs/APIProps.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,14 @@ See also [this advanced example](../examples/#yearNavigation), showing a year na

Returns the content of a day cell. By default, it renders the day's date: `(day) ⇒ day.getDate()`

#### weekdayComponent `Component`

Custom component to render weekday header. Passed props are:
* `weekday: number` Weekday number
* `className: string` Wrapper class name
* `localeUtils: Object` The [localeUtils](#localeutils-object) object passed to the component.
* `locale: String` The current [locale](#locale-string) passed to the component.

---

#### onDayClick `(e: SyntethicEvent, day: Date, modifiers: Object) ⇒ void`
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-day-picker",
"version": "2.0.3",
"version": "2.0.4",
"description": "Flexible date picker component for React",
"main": "DayPicker.js",
"style": "lib/style.css",
Expand Down
4 changes: 4 additions & 0 deletions src/DayPicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Caption from './Caption';
import Navbar from './Navbar';
import Month from './Month';
import Day from './Day';
import Weekday from './Weekday';

import * as Helpers from './Helpers';
import * as DateUtils from './DateUtils';
Expand Down Expand Up @@ -42,6 +43,7 @@ export default class DayPicker extends Component {
onCaptionClick: PropTypes.func,

renderDay: PropTypes.func,
weekdayComponent: PropTypes.func,

captionElement: PropTypes.element,

Expand All @@ -60,6 +62,7 @@ export default class DayPicker extends Component {
canChangeMonth: true,
reverseMonths: false,
renderDay: day => day.getDate(),
weekdayComponent: Weekday,
captionElement: <Caption />,
};

Expand Down Expand Up @@ -373,6 +376,7 @@ export default class DayPicker extends Component {
className="DayPicker-Month"
wrapperClassName="DayPicker-Body"
weekClassName="DayPicker-Week"
weekdayComponent={this.props.weekdayComponent}
locale={this.props.locale}
localeUtils={this.props.localeUtils}
key={i}
Expand Down
4 changes: 3 additions & 1 deletion src/Month.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export default function Month({
className,
wrapperClassName,
weekClassName,
weekdayComponent,
}) {
const captionProps = {
date: month,
Expand All @@ -25,7 +26,7 @@ export default function Month({
return (
<div className={className}>
{React.cloneElement(captionElement, captionProps)}
<Weekdays locale={locale} localeUtils={localeUtils} />
<Weekdays locale={locale} localeUtils={localeUtils} weekdayComponent={weekdayComponent} />
<div className={wrapperClassName} role="grid">
{
weeks.map((week, j) =>
Expand All @@ -49,4 +50,5 @@ Month.propTypes = {
className: PropTypes.string,
wrapperClassName: PropTypes.string,
weekClassName: PropTypes.string,
weekdayComponent: PropTypes.func.isRequired,
};
21 changes: 21 additions & 0 deletions src/Weekday.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import React, { PropTypes } from 'react';
import DayPickerPropTypes from './PropTypes';

export default function Weekday({ weekday, className, localeUtils, locale }) {
return (
<div className={className}>
<abbr title={localeUtils.formatWeekdayLong(weekday, locale)}>
{localeUtils.formatWeekdayShort(weekday, locale)}
</abbr>
</div>
);
}

export const WeekdayPropTypes = {
weekday: PropTypes.number.isRequired,
className: PropTypes.string,
locale: PropTypes.string.isRequired,
localeUtils: DayPickerPropTypes.localeUtils.isRequired,
};

Weekday.propTypes = WeekdayPropTypes;
14 changes: 9 additions & 5 deletions src/Weekdays.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,18 @@ import DayPickerPropTypes from './PropTypes';
export default function Weekdays({
locale,
localeUtils,
weekdayComponent,
}) {
const days = [];
for (let i = 0; i < 7; i++) {
days.push(
<div key={i} className="DayPicker-Weekday">
<abbr title={localeUtils.formatWeekdayLong(i, locale)}>
{localeUtils.formatWeekdayShort(i, locale)}
</abbr>
</div>
React.createElement(weekdayComponent, {
key: i,
className: 'DayPicker-Weekday',
weekday: i,
localeUtils,
locale,
})
);
}

Expand All @@ -28,4 +31,5 @@ export default function Weekdays({
Weekdays.propTypes = {
locale: PropTypes.string.isRequired,
localeUtils: DayPickerPropTypes.localeUtils.isRequired,
weekdayComponent: PropTypes.func.isRequired,
};
1 change: 1 addition & 0 deletions test/DayPicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ describe('<DayPicker />', () => {
expect(dayPicker.props.canChangeMonth).to.equal(true);
expect(dayPicker.props.reverseMonths).to.equal(false);
expect(dayPicker.props.renderDay).to.be.a('Function');
expect(dayPicker.props.weekdayComponent).to.be.a('Function');
expect(dayPicker.props.tabIndex).to.equal(0);
});
it('should have the DayPicker classes', () => {
Expand Down