Merge branch 'master' into src-directory-organization

Author: arqex

src/DateTime.js

@@ -73,7 +73,8 @@ export default class Datetime extends React.Component {
 		strictParsing: true,
 		closeOnSelect: false,
 		closeOnTab: true,
-		closeOnClickOutside: true
+		closeOnClickOutside: true,
+		renderView: ( _, renderFunc ) => renderFunc(),
 	}
 
 	// Make moment accessible through the Datetime class
@@ -123,10 +124,7 @@ export default class Datetime extends React.Component {
 	}
 
 	renderView() {
-		if ( this.props.renderView ) {
-			return this.props.renderView( this.state.currentView, this._renderCalendar );
-		}
-		return this._renderCalendar();
+		return this.props.renderView( this.state.currentView, this._renderCalendar );
 	}
 
 	_renderCalendar = () => {
@@ -597,7 +595,6 @@ export default class Datetime extends React.Component {
 		// Focus event should open the calendar, but there is some case where
 		// the input is already focused and the picker is closed, so clicking the input
 		// should open it again see https://github.com/arqex/react-datetime/issues/717
-		console.log('CLICKING 2!');
 		if ( !this.callHandler( this.props.inputProps.onClick, e ) ) return;
 		this._openCalendar();
 	}

src/views/DaysView.js

@@ -3,7 +3,8 @@ import ViewNavigation from '../parts/ViewNavigation';
 
 export default class DaysView extends React.Component {
 	static defaultProps = {
-		isValidDate: () => true
+		isValidDate: () => true,
+		renderDay: ( props, date ) => <td { ...props }>{ date.date() }</td>,
 	}
 
 	render() {
@@ -110,14 +111,8 @@ export default class DaysView extends React.Component {
 
 		dayProps.className = className;
 
-		if ( this.props.renderDay ) {
-			return this.props.renderDay(
-				dayProps, date.clone(), selectedDate && selectedDate.clone()
-			);
-		}
-
-		return (
-			<td { ...dayProps }>{ date.date() }</td>
+		return this.props.renderDay(
+			dayProps, date.clone(), selectedDate && selectedDate.clone()
 		);
 	}
 

src/views/YearsView.js

@@ -2,6 +2,10 @@ import React from 'react';
 import ViewNavigation from '../parts/ViewNavigation';
 
 export default class YearsView extends React.Component {
+	static defaultProps = {
+		renderYear: ( props, year ) => <td { ...props }>{ year }</td>,
+	};
+
 	render() {
 		return (
 			<div className="rdtYears">
@@ -66,18 +70,10 @@ export default class YearsView extends React.Component {
 
 		let props = {key: year, className, 'data-value': year, onClick };
 
-		if ( this.props.renderYear ) {
-			return this.props.renderYear(
-				props,
-				year,
-				this.props.selectedDate && this.props.selectedDate.clone()
-			);
-		}
-
-		return (
-			<td { ...props }>
-				{ year }
-			</td>
+		return this.props.renderYear(
+			props,
+			year,
+			this.props.selectedDate && this.props.selectedDate.clone()
 		);
 	}