Fixes conflicts

arqex · Sep 23, 2020 · 8c3b88f · 8c3b88f
2 parents c27287a + b2ba100
commit 8c3b88f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/dist/react-datetime.cjs.js b/dist/react-datetime.cjs.js
diff --git a/dist/react-datetime.cjs.js.map b/dist/react-datetime.cjs.js.map
diff --git a/dist/react-datetime.umd.js b/dist/react-datetime.umd.js
diff --git a/dist/react-datetime.umd.js.map b/dist/react-datetime.umd.js.map
diff --git a/src/datetime/DateTime.js b/src/datetime/DateTime.js
@@ -384,8 +384,7 @@ export default class Datetime extends React.Component {
 	}
 
 	_setTime = ( type, value ) => {
-		const state = this.state;
-		let date = (state.selectedDate || state.viewDate).clone();
+		let date = (this.getSelectedDate() || this.state.viewDate).clone();
 
 		date[ type ]( value );
 
@@ -397,7 +396,7 @@ export default class Datetime extends React.Component {
 			});
 		}
 
-		this.props.onChange( date.clone() );
+		this.props.onChange( date );
 	}
 
 	_openCalendar = () => {